Merge pull request #2104 from ChildMindInstitute/release/2025.06.5

Release/2025.06.5

Author: aweiland

src/modules/Builder/features/ActivityItems/LeftBar/Item/Item.styles.ts

@@ -37,8 +37,8 @@ export const StyledItem = styled(StyledFlexTopCenter, shouldForwardProp)`
         stroke: ${variables.palette.on_surface_variant};
       }
 
-      ${isActive && `background-color: ${variables.palette.secondary_container};`}
-      ${hasError && `background-color: ${variables.palette.error_container};`}
+      ${isActive && `background-color: ${variables.palette.secondary_container}`};
+      ${hasError && `background-color: ${variables.palette.error_container}`};
       ${
         isDragging &&
         `background-color: ${blendColorsNormal(

src/shared/features/AppletSettings/ExportDataSetting/Popups/DataExportPopup/DataExportPopup_old.tsx

@@ -35,9 +35,11 @@ import {
   variables,
 } from 'shared/styles';
 import {
+  ExportDataSuccessfulEvent,
   exportEncryptedDataSucceed,
   Mixpanel,
   MixpanelEventType,
+  MixpanelFeature,
   MixpanelProps,
   sendLogFile,
 } from 'shared/utils';
@@ -101,6 +103,11 @@ export const DataExportPopup = ({
   const executeAllPagesOfExportData = useCallback(
     async ({ appletId, targetSubjectIds }: ExecuteAllPagesOfExportData) => {
       try {
+        const analyticsEvent: ExportDataSuccessfulEvent = {
+          action: MixpanelEventType.ExportDataSuccessful,
+          [MixpanelProps.AppletId]: appletId,
+        };
+
         dataExportingRef.current = true;
         setDataIsExporting(true);
 
@@ -212,7 +219,7 @@ export const DataExportPopup = ({
           const respondentId = filters?.sourceSubjectId;
           const subjectId = targetSubjectIds ?? filters?.targetSubjectId;
 
-          await new EHRDataExporter().exportData({
+          const { size } = await new EHRDataExporter().exportData({
             appletId,
             fromDate,
             toDate,
@@ -221,13 +228,15 @@ export const DataExportPopup = ({
             respondentIds: respondentId ? [respondentId] : undefined,
             subjectIds: subjectId ? [subjectId] : undefined,
           });
+
+          if (size) {
+            analyticsEvent[MixpanelProps.Feature] = [MixpanelFeature.EHR];
+            analyticsEvent[MixpanelProps.EHRFileSize] = size;
+          }
         }
 
+        Mixpanel.track(analyticsEvent);
         handlePopupClose();
-        Mixpanel.track({
-          action: MixpanelEventType.ExportDataSuccessful,
-          [MixpanelProps.AppletId]: appletId,
-        });
       } catch (e) {
         const error = e as TypeError;
         console.warn('Error while export data', error);

src/shared/utils/exportData/exporters/EHRDataExporter.ts

@@ -39,7 +39,7 @@ export class EHRDataExporter {
     flowIds,
     respondentIds,
     subjectIds,
-  }: EHRDataExporterOptions) {
+  }: EHRDataExporterOptions): Promise<{ size?: number }> {
     // Build the URL with query parameters
     const queryParams = new URLSearchParams();
     if (fromDate) queryParams.append('fromDate', fromDate);
@@ -72,7 +72,7 @@ export class EHRDataExporter {
     if (!response.ok) throw new Error(`EHR data download failed for ${url}`);
 
     // No EHR data matching the query parameters found
-    if (response.status === 204) return;
+    if (response.status === 204) return {};
 
     // Get the filename from the Content-Disposition header or use default
     const contentDisposition = response.headers.get('Content-Disposition');
@@ -90,5 +90,7 @@ export class EHRDataExporter {
     a.click();
     window.URL.revokeObjectURL(downloadUrl);
     document.body.removeChild(a);
+
+    return { size: blob.size };
   }
 }

src/shared/utils/mixpanel/mixpanel.types.ts

@@ -32,11 +32,13 @@ export enum MixpanelProps {
   AutoAssignedFlowCount = 'Auto-assigned flow count',
   ManuallyAssignedActivityCount = 'Manually-assigned activity count',
   ManuallyAssignedFlowCount = 'Manually-assigned flow count',
+  EHRFileSize = 'EHR File Size',
 }
 
 export enum MixpanelFeature {
   MultiInformant = 'Multi-informant',
   SSI = 'SSI',
+  EHR = 'EHR',
 }
 
 export enum MixpanelEventType {
@@ -373,6 +375,8 @@ export type EditLimitedAccountClickedEvent = WithAppletId<{
 
 export type ExportDataSuccessfulEvent = WithAppletId<{
   action: MixpanelEventType.ExportDataSuccessful;
+  [MixpanelProps.Feature]?: MixpanelFeature[];
+  [MixpanelProps.EHRFileSize]?: number;
 }>;
 
 export type FullAccountEditedSuccessfullyEvent = WithAppletId<{