chore: merge with v41 upgrade

EyeSeeTea · Feb 4, 2025 · 79d7804 · 79d7804
2 parents 27262ec + 814e5fa
commit 79d7804
Show file tree

Hide file tree

Showing 13 changed files with 402 additions and 783 deletions.
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
         "@dhis2/ui": "6.12.0",
         "@emotion/react": "^11.11.1",
         "@emotion/styled": "^11.11.0",
-        "@eyeseetea/d2-api": "1.14.0",
+        "@eyeseetea/d2-api": "1.18.0-beta.1",
         "@eyeseetea/d2-ui-components": "2.7.0",
         "@eyeseetea/feedback-component": "0.0.3",
         "@material-ui/core": "4.12.4",

diff --git a/src/data/repositories/PaginatedSurveyD2Repository.ts b/src/data/repositories/PaginatedSurveyD2Repository.ts
@@ -16,7 +16,11 @@ import {
     SURVEY_PATIENT_ID_TEA_ID,
     WARD_ID_TEA_ID,
 } from "../entities/D2Survey";
-import { mapEventToSurvey, mapTrackedEntityToSurvey } from "../utils/surveyListMappers";
+import {
+    mapEventToSurvey,
+    mapTrackedEntityToSurvey,
+    trackedEntityFields,
+} from "../utils/surveyListMappers";
 import { getSurveyChildCount, SurveyChildCountType } from "../utils/surveyChildCountHelper";
 
 export class PaginatedSurveyD2Repository implements PaginatedSurveyRepository {
@@ -57,13 +61,13 @@ export class PaginatedSurveyD2Repository implements PaginatedSurveyRepository {
         page: number,
         pageSize: number
     ): FutureData<PaginatedReponse<Survey[]>> {
-        const ouMode = undefined;
+        const ouMode = "SELECTED";
 
         const filterParentDEId = getParentDataElementForProgram(programId);
 
         return apiToFuture(
             this.api.tracker.trackedEntities.get({
-                fields: { attributes: true, enrollments: true, trackedEntity: true, orgUnit: true },
+                fields: trackedEntityFields,
                 program: programId,
                 orgUnit: orgUnitId,
                 ouMode: ouMode,
@@ -73,7 +77,8 @@ export class PaginatedSurveyD2Repository implements PaginatedSurveyRepository {
                 filter: `${filterParentDEId}:eq:${parentId}`,
             })
         ).flatMap(trackedEntities => {
-            const surveys = mapTrackedEntityToSurvey(trackedEntities, surveyFormType);
+            const instances = trackedEntities.instances;
+            const surveys = mapTrackedEntityToSurvey(instances, surveyFormType);
 
             const paginatedSurveys: PaginatedReponse<Survey[]> = {
                 pager: {
@@ -96,7 +101,7 @@ export class PaginatedSurveyD2Repository implements PaginatedSurveyRepository {
         page: number,
         pageSize: number
     ): FutureData<PaginatedReponse<Survey[]>> {
-        const ouMode = undefined;
+        const ouMode = "SELECTED";
         return apiToFuture(
             this.api.tracker.events.get({
                 fields: { $all: true },
@@ -133,15 +138,17 @@ export class PaginatedSurveyD2Repository implements PaginatedSurveyRepository {
     ): FutureData<PaginatedReponse<Survey[]>> {
         return apiToFuture(
             this.api.tracker.trackedEntities.get({
-                fields: { attributes: true, enrollments: true, trackedEntity: true, orgUnit: true },
+                fields: trackedEntityFields,
                 program: PPS_PATIENT_REGISTER_ID,
                 orgUnit: orgUnitId,
+                ouMode: "SELECTED",
                 pageSize: 10,
                 totalPages: true,
                 filter: ` ${SURVEY_PATIENT_ID_TEA_ID}:like:${keyword}, ${WARD_ID_TEA_ID}:eq:${parentId}`,
             })
         ).flatMap(trackedEntities => {
-            const surveys = mapTrackedEntityToSurvey(trackedEntities, "PPSPatientRegister");
+            const instances = trackedEntities.instances;
+            const surveys = mapTrackedEntityToSurvey(instances, "PPSPatientRegister");
 
             const paginatedSurveys: PaginatedReponse<Survey[]> = {
                 pager: {
@@ -163,15 +170,17 @@ export class PaginatedSurveyD2Repository implements PaginatedSurveyRepository {
     ): FutureData<PaginatedReponse<Survey[]>> {
         return apiToFuture(
             this.api.tracker.trackedEntities.get({
-                fields: { attributes: true, enrollments: true, trackedEntity: true, orgUnit: true },
+                fields: trackedEntityFields,
                 program: PPS_PATIENT_REGISTER_ID,
                 orgUnit: orgUnitId,
+                ouMode: "SELECTED",
                 pageSize: 10,
                 totalPages: true,
                 filter: ` ${SURVEY_PATIENT_CODE_TEA_ID}:like:${keyword}, ${WARD_ID_TEA_ID}:eq:${parentId}`,
             })
         ).flatMap(trackedEntities => {
-            const surveys = mapTrackedEntityToSurvey(trackedEntities, "PPSPatientRegister");
+            const instances = trackedEntities.instances;
+            const surveys = mapTrackedEntityToSurvey(instances, "PPSPatientRegister");
 
             const paginatedSurveys: PaginatedReponse<Survey[]> = {
                 pager: {
@@ -193,15 +202,17 @@ export class PaginatedSurveyD2Repository implements PaginatedSurveyRepository {
     ): FutureData<PaginatedReponse<Survey[]>> {
         return apiToFuture(
             this.api.tracker.trackedEntities.get({
-                fields: { attributes: true, enrollments: true, trackedEntity: true, orgUnit: true },
+                fields: trackedEntityFields,
                 program: PREVALENCE_CASE_REPORT_FORM_ID,
                 orgUnit: orgUnitId,
+                ouMode: "SELECTED",
                 pageSize: 10,
                 totalPages: true,
                 filter: ` ${AMR_SURVEYS_PREVALENCE_TEA_UNIQUE_PATIENT_ID}:like:${keyword}, ${AMR_SURVEYS_PREVALENCE_TEA_SURVEY_ID_CRF}:eq:${parentId}`,
             })
         ).flatMap(trackedEntities => {
-            const surveys = mapTrackedEntityToSurvey(trackedEntities, "PrevalenceCaseReportForm");
+            const instances = trackedEntities.instances;
+            const surveys = mapTrackedEntityToSurvey(instances, "PrevalenceCaseReportForm");
 
             const paginatedSurveys: PaginatedReponse<Survey[]> = {
                 pager: {