@iapps/ng-dhis2-ui 1.1.64 → 1.1.65

package/fesm2022/iapps-ng-dhis2-ui.mjs

@@ -3338,8 +3338,12 @@ class LineListService {
         const dateFilter = [
             startDate ? `enrollmentEnrolledAfter=${startDate}` : '',
             endDate ? `enrollmentEnrolledBefore=${endDate}` : '',
-        ].filter(Boolean).join('&');
-        const ouModeIdentifier = ouMode && useOuModeWithOlderDHIS2Instance ? `&ouMode=${ouMode}` : `&orgUnitMode=${ouMode}`;
+        ]
+            .filter(Boolean)
+            .join('&');
+        const ouModeIdentifier = ouMode && useOuModeWithOlderDHIS2Instance
+            ? `&ouMode=${ouMode}`
+            : `&orgUnitMode=${ouMode}`;
         return this.httpClient
             .get(`tracker/trackedEntities.json?program=${programId}&orgUnit=${orgUnit}${ouModeIdentifier}&page=${page}&pageSize=${pageSize}&fields=trackedEntity,orgUnit,attributes[*],enrollments[*]&totalPages=true&${filterParams}${dateFilter}&order=createdAt:desc`)
             .pipe(switchMap((response) => {
@@ -3348,13 +3352,27 @@ class LineListService {
             }
             // **Step 1:** Extract unique orgUnits from enrollments
             const uniqueOrgUnitIds = new Set();
-            response.trackedEntities.forEach((tei) => {
-                tei.enrollments?.forEach((enrollment) => {
-                    if (enrollment.program === programId) {
-                        uniqueOrgUnitIds.add(enrollment.orgUnit);
-                    }
+            if (response && response.trackedEntities) {
+                console.log('THIS IS HERE', JSON.stringify(response));
+                response.trackedEntities.forEach((tei) => {
+                    tei.enrollments?.forEach((enrollment) => {
+                        if (enrollment.program === programId) {
+                            uniqueOrgUnitIds.add(enrollment.orgUnit);
+                        }
+                    });
                 });
-            });
+            }
+            else {
+                if (response && response.instances) {
+                    response?.instances?.forEach((tei) => {
+                        tei.enrollments?.forEach((enrollment) => {
+                            if (enrollment.program === programId) {
+                                uniqueOrgUnitIds.add(enrollment?.orgUnit);
+                            }
+                        });
+                    });
+                }
+            }
             // If no unique orgUnits found, return immediately
             if (uniqueOrgUnitIds.size === 0) {
                 return of({ ...response, orgUnitsMap: new Map() });
@@ -3385,7 +3403,9 @@ class LineListService {
     getEvents(programId, orgUnit, page, pageSize, filters = [], startDate, endDate, ouMode, useOuModeWithOlderDHIS2Instance) {
         const filterParams = buildFilters(filters);
         const dateFilter = startDate && endDate ? `&startDate=${startDate}&endDate=${endDate}` : '';
-        const ouModeIdentifier = ouMode && useOuModeWithOlderDHIS2Instance ? `&ouMode=${ouMode}` : `&ouMode=${ouMode}`;
+        const ouModeIdentifier = ouMode && useOuModeWithOlderDHIS2Instance
+            ? `&ouMode=${ouMode}`
+            : `&ouMode=${ouMode}`;
         // const ouModeIdentifier = ouMode ? `&ouMode=${ouMode}`: ``;
         return this.httpClient.get(`events.json?program=${programId}&orgUnit=${orgUnit}${ouModeIdentifier}&page=${page}&pageSize=${pageSize}&fields=*&totalPages=true&${filterParams}${dateFilter}`);
     }
@@ -3407,7 +3427,7 @@ class LineListService {
                 return this.getTrackedEntityInstances(programId, orgUnit, page, pageSize, filters, startDate, endDate, ouMode, filterRootOrgUnit, useOuModeWithOlderDHIS2Instance).pipe(map$1((teis) => ({
                     metadata: programMetadata,
                     data: teis,
-                    orgUnits: teis.orgUnitsMap
+                    orgUnits: teis.orgUnitsMap,
                 })));
             }
             else {
@@ -3440,7 +3460,7 @@ const getProgramStageData = (response, programStageId, pager) => {
         key: dataElementId,
     }));
     const dataElementsData = events.map((event, idx) => {
-        let row = {
+        const row = {
             event: event.event,
             index: (pager.page - 1) * pager.pageSize + idx + 1,
         };
@@ -3451,9 +3471,10 @@ const getProgramStageData = (response, programStageId, pager) => {
     return { columns: entityColumns, data: dataElementsData };
 };
 const getTrackedEntityData = (response, programId, pager, filters) => {
-    let teis = response.data
-        .trackedEntities;
-    let programMetaData = response.metadata.programTrackedEntityAttributes;
+    let teis = response.data?.trackedEntities ??
+        response.data?.instances ??
+        [];
+    const programMetaData = response.metadata.programTrackedEntityAttributes;
     // //organisation units from metadata
     // let orgUnitsFromMetaData = response.metadata.organisationUnits;
     // //a Map to efficiently look up orgUnit names by ID
@@ -3520,7 +3541,7 @@ const getTrackedEntityData = (response, programId, pager, filters) => {
     // Filter entityColumns to keep only those whose key exists in searchableAttributes
     const filteredEntityColumns = entityColumns.filter((column) => searchableKeys.has(column.key));
     const attributesData = teis.map((tei, idx) => {
-        let row = {
+        const row = {
             trackedEntityInstance: tei.trackedEntity,
             index: (pager.page - 1) * pager.pageSize + idx + 1,
         };
@@ -3550,15 +3571,15 @@ const getTrackedEntityData = (response, programId, pager, filters) => {
 const getEventData = (response, pager) => {
     const events = response.data.events;
     const uniqueDataElements = new Set();
-    events.forEach((event) => {
-        event.dataValues.forEach((dv) => uniqueDataElements.add(dv.dataElement));
+    events?.forEach((event) => {
+        event?.dataValues.forEach((dv) => uniqueDataElements.add(dv.dataElement));
     });
     const entityColumns = Array.from(uniqueDataElements).map((dataElement) => ({
         label: response.metadata.programStages[0].programStageDataElements.find((psde) => psde.dataElement.id === dataElement)?.dataElement.name || dataElement,
         key: dataElement,
     }));
     const dataElementsData = events.map((event, idx) => {
-        let row = {
+        const row = {
             event: event.event,
             index: (pager.page - 1) * pager.pageSize + idx + 1,
         };
@@ -3836,8 +3857,15 @@ class LineListTableComponent extends ReactWrapperModule {
                         entityColumns = columns;
                         entityData = data;
                     }
-                    else if ('trackedEntities' in response.data) {
-                        responsePager = response.data.pager;
+                    else if ('trackedEntities' in response.data ||
+                        'instances' in response.data) {
+                        const responseData = response.data;
+                        responsePager = response.data.pager || {
+                            page: responseData.page,
+                            pageSize: responseData.pageSize,
+                            total: responseData.total,
+                            pageCount: responseData.pageCount,
+                        };
                         const { columns, data, filteredEntityColumns } = getTrackedEntityData(response, this.programId, pager, this.filters);
                         entityColumns = columns;
                         entityData = data;
@@ -3845,7 +3873,10 @@ class LineListTableComponent extends ReactWrapperModule {
                         const checkValues = [
                             ...new Set(response.data?.trackedEntities?.[0]?.enrollments?.[0]?.events?.flatMap((event) => event.dataValues
                                 .filter((dataValue) => /^[A-Za-z]{3}$/.test(dataValue.value))
-                                .map((dataValue) => dataValue.value))),
+                                .map((dataValue) => dataValue.value)) ??
+                                response.data?.instances?.[0]?.enrollments?.[0]?.events?.flatMap((event) => event.dataValues
+                                    .filter((dataValue) => /^[A-Za-z]{3}$/.test(dataValue.value))
+                                    .map((dataValue) => dataValue.value))),
                         ];
                         if (checkValues) {
                             // this.firstValue.emit(firstTei);
@@ -3894,7 +3925,8 @@ class LineListTableComponent extends ReactWrapperModule {
                 this.lineListService
                     .getLineListData(this.programId, this.orgUnit, this.programStageId, pager.page, 1000, this.attributeFilters, this.startDate, this.endDate, this.ouMode)
                     .subscribe((response) => {
-                    if ('trackedEntities' in response.data) {
+                    if ('trackedEntities' in response.data ||
+                        'instances' in response.data) {
                         const trackedEntityInstances = response.data.trackedEntities;
                         // Map TEIs to objects with teiId and enrollmentId
                         const teiEnrollmentList = trackedEntityInstances
@@ -6757,7 +6789,6 @@ class SelectionFiltersComponent extends ReactWrapperModule {
                     } },
                     React__default.createElement("div", { style: { width: '100%' } },
                         React__default.createElement(InputField$1, { value: displayValue, label: "Organization Unit", readOnly: false, onFocus: () => setShowOrgUnit(true), onBlur: () => {
-                                this.ngZone.run(() => console.log('THIS IS IT::: '));
                                 setTouched(true);
                             } }),
                         showOrgUnit && (React__default.createElement(this.FieldOrgUnitSelector, { onCancelOrgUnit: () => {