Merge pull request #36 from EyeSeeTea/fix/sort-order

Fix sort order of data elements and tracked entity attrubutes
EyeSeeTea · Apr 25, 2024 · 200ff35 · 200ff35
2 parents b4210d1 + 2e83ad2
commit 200ff35
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/src/data/entities/D2Program.ts b/src/data/entities/D2Program.ts
@@ -73,6 +73,11 @@ export interface TrackedEntityAttibute {
     optionSet?: { id: string };
     value?: string;
 }
+
+export interface ProgramTrackedEntityAttibute {
+    trackedEntityAttribute: { id: string };
+    sortOrder: number;
+}
 export interface ProgramMetadata {
     programs: Program[];
     programStageDataElements: ProgramStageDataElement[];
@@ -81,6 +86,7 @@ export interface ProgramMetadata {
     optionSets: OptionSet[];
     options: Option[];
     trackedEntityAttributes?: TrackedEntityAttibute[];
+    programTrackedEntityAttributes: ProgramTrackedEntityAttibute[];
     programStages: ProgramStage[];
     programRules: D2ProgramRule[];
     programRuleVariables: D2ProgramRuleVariable[];

diff --git a/src/data/repositories/SurveyFormD2Repository.ts b/src/data/repositories/SurveyFormD2Repository.ts
@@ -28,7 +28,7 @@ import {
     PREVALENCE_SURVEY_NAME_DATAELEMENT_ID,
     PPS_COUNTRY_QUESTIONNAIRE_ID,
 } from "../entities/D2Survey";
-import { ProgramDataElement, ProgramMetadata } from "../entities/D2Program";
+import { ProgramMetadata } from "../entities/D2Program";
 import {
     mapProgramToQuestionnaire,
     mapQuestionnaireToEvent,
@@ -48,24 +48,28 @@ export class SurveyD2Repository implements SurveyRepository {
         return apiToFuture(
             this.api.request<ProgramMetadata>({
                 method: "get",
-                url: `/programs/${programId}/metadata.json?fields=programs,dataElements,programStageDataElements,programStageSections,trackedEntityAttributes,programStages,programRules,programRuleVariables,programRuleActions`,
+                url: `/programs/${programId}/metadata.json?fields=programs,dataElements,programStageDataElements.dataElement,programStageSections,programTrackedEntityAttributes,trackedEntityAttributes,programStages,programRules,programRuleVariables,programRuleActions`,
             })
         ).flatMap(resp => {
             if (resp.programs[0]) {
                 const programDataElements = resp.programStageDataElements.map(
                     psde => psde.dataElement
                 );
 
-                const dataElementsWithSortOrder: ProgramDataElement[] = resp.dataElements.map(
-                    de => {
-                        return {
-                            ...de,
-                            sortOrder: resp.programStageDataElements.find(
-                                psde => psde.dataElement.id === de.id
-                            )?.sortOrder,
-                        };
-                    }
-                );
+                const sortedTrackedentityAttr = resp.programTrackedEntityAttributes
+                    ? _(
+                          _(resp.programTrackedEntityAttributes)
+                              .sortBy(te => te.sortOrder)
+                              .value()
+                              .map(pste =>
+                                  resp.trackedEntityAttributes?.find(
+                                      te => te.id === pste.trackedEntityAttribute.id
+                                  )
+                              )
+                      )
+                          .compact()
+                          .value()
+                    : resp.trackedEntityAttributes;
 
                 //If event specified,populate the form
                 if (eventId) {
@@ -80,11 +84,11 @@ export class SurveyD2Repository implements SurveyRepository {
                                             undefined,
                                             trackedEntity,
                                             programDataElements,
-                                            dataElementsWithSortOrder,
+                                            resp.dataElements,
                                             resp.options,
                                             resp.programStages,
                                             resp.programStageSections,
-                                            resp.trackedEntityAttributes,
+                                            sortedTrackedentityAttr,
                                             resp.programRules,
                                             resp.programRuleVariables,
                                             resp.programRuleActions
@@ -106,11 +110,11 @@ export class SurveyD2Repository implements SurveyRepository {
                                         event,
                                         undefined,
                                         programDataElements,
-                                        dataElementsWithSortOrder,
+                                        resp.dataElements,
                                         resp.options,
                                         resp.programStages,
                                         resp.programStageSections,
-                                        resp.trackedEntityAttributes,
+                                        sortedTrackedentityAttr,
                                         resp.programRules,
                                         resp.programRuleVariables,
                                         resp.programRuleActions
@@ -130,11 +134,11 @@ export class SurveyD2Repository implements SurveyRepository {
                             undefined,
                             undefined,
                             programDataElements,
-                            dataElementsWithSortOrder,
+                            resp.dataElements,
                             resp.options,
                             resp.programStages,
                             resp.programStageSections,
-                            resp.trackedEntityAttributes,
+                            sortedTrackedentityAttr,
                             resp.programRules,
                             resp.programRuleVariables,
                             resp.programRuleActions

diff --git a/src/data/utils/questionHelper.ts b/src/data/utils/questionHelper.ts
@@ -282,7 +282,6 @@ export const mapProgramDataElementToQuestions = (
         })
     )
         .compact()
-        .sortBy(q => q.sortOrder)
         .value();
 
     return questions;
@@ -320,7 +319,6 @@ export const mapRepeatedStageEventToQuestions = (
         })
     )
         .compact()
-        .sortBy(q => q.sortOrder)
         .value();
 
     return questions;
@@ -363,7 +361,6 @@ export const mapTrackedAttributesToQuestions = (
         })
     )
         .compact()
-        .sortBy(q => q.sortOrder)
         .value();
 
     return questions;