fix: adjustments to rules engine input in profile widget

dhis2 · Nov 15, 2023 · d7b168b · d7b168b
1 parent 29e9c70
commit d7b168b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/...re_modules/capture-core/components/WidgetProfile/DataEntry/ProgramRules/rulesContainer.js b/...re_modules/capture-core/components/WidgetProfile/DataEntry/ProgramRules/rulesContainer.js
@@ -1,13 +1,12 @@
 // @flow
 import type { ProgramRulesContainer } from '@dhis2/rules-engine-javascript';
-import { getTrackedEntityAttributeId, getProgramId, getProgramRuleActions, getProgramStageId } from '../helpers';
+import { getProgramId, getProgramRuleActions, getProgramStageId } from '../helpers';
 import { getRulesAndVariablesFromProgramIndicators } from '../../../../metaDataMemoryStoreBuilders/programs/getRulesAndVariablesFromIndicators';
 
 const addProgramVariables = (program, programRuleVariables) => {
     program.programRuleVariables = programRuleVariables.map(programRulesVariable => ({
         ...programRulesVariable,
         programId: getProgramId(programRulesVariable),
-        trackedEntityAttributeId: getTrackedEntityAttributeId(programRulesVariable),
     }));
 };
 

diff --git a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/hooks/useEvents.js b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/hooks/useEvents.js
@@ -10,7 +10,7 @@ const getClientFormattedDataValuesAsObject = (dataValues, elementsById) =>
     dataValues.reduce((acc, { dataElement: id, value }) => {
         const dataElement = elementsById[id];
         if (dataElement) {
-            acc[id] = convertValue(value, elementsById[id].type);
+            acc[id] = convertValue(value, dataElement.valueType);
         }
         return acc;
     }, {});
@@ -39,8 +39,8 @@ export const useEvents = (enrollment: any, elementsById: Array<any>) => {
                 enrollmentId: event.enrollment,
                 enrollmentStatus: event.enrollmentStatus,
                 status: event.status,
-                eventDate: convertDate(event.eventDate),
-                dueDate: convertDate(event.dueDate),
+                occurredAt: convertDate(event.occurredAt),
+                scheduledAt: convertDate(event.scheduledAt),
                 ...getClientFormattedDataValuesAsObject(event.dataValues, elementsById),
             })),
         [elementsById, enrollment, orgUnitNames],

diff --git a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/hooks/useLifecycle.js b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/hooks/useLifecycle.js
@@ -49,7 +49,7 @@ export const useLifecycle = ({
     const state = useSelector(stateArg => stateArg);
     const enrollment = useSelector(({ enrollmentDomain }) => enrollmentDomain?.enrollment);
     const dataElements: DataElements = useDataElements(programAPI);
-    const otherEvents = useEvents(enrollment, programAPI);
+    const otherEvents = useEvents(enrollment, dataElements);
     const orgUnit: ?OrgUnit = useOrganisationUnit(orgUnitId).orgUnit;
     const rulesContainer: ProgramRulesContainer = useRulesContainer(programAPI);
     const formFoundation: RenderFoundation = useFormFoundation(programAPI);

diff --git a/src/core_modules/capture-core/components/WidgetProfile/hooks/useProgram.js b/src/core_modules/capture-core/components/WidgetProfile/hooks/useProgram.js
@@ -35,5 +35,26 @@ export const useProgram = (programId: string) => {
         ),
     );
 
-    return { error, loading, program: !loading && data?.programs };
+    const program = useMemo(() => {
+        if (data) {
+            const adaptedProgram = data.programs;
+            if (adaptedProgram.programRuleVariables) {
+                adaptedProgram.programRuleVariables = adaptedProgram.programRuleVariables.map(
+                    ({ trackedEntityAttribute, dataElement, ...variable }) => {
+                        if (dataElement) {
+                            variable.dataElementId = dataElement.id;
+                        }
+                        if (trackedEntityAttribute) {
+                            variable.trackedEntityAttributeId = trackedEntityAttribute.id;
+                        }
+                        return variable;
+                    },
+                );
+            }
+            return adaptedProgram;
+        }
+        return data;
+    }, [data]);
+
+    return { error, loading, program: !loading && program };
 };