@iapps/ng-dhis2-ui 1.3.4 → 1.3.5

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

@@ -11939,6 +11939,9 @@ class ProgramEntryFormFieldUtil {
         });
     }
     get dataElements() {
+        if (this.config.excludeProgramStages) {
+            return [];
+        }
         const programStages = this.config.programStage
             ? this.program.programStages?.filter((programStage) => programStage.id === this.config.programStage)
             : this.program.programStages;
@@ -12920,7 +12923,7 @@ class ProgramEntryFormMetaData {
         });
     }
     get programStageSections() {
-        if (!this.program) {
+        if (!this.program || this.config.excludeProgramStages) {
             return [];
         }
         const { displayType, formType } = this.config;
@@ -13094,15 +13097,16 @@ class ProgramEntryFormModule {
             if (!this.instance()) {
                 return {};
             }
-            const trackedEntity = this.trackedEntityInstance();
-            const attributeValues = Object.keys(trackedEntity?.attributeEntities ?? {}).reduce((acc, key) => {
-                acc[key] = trackedEntity?.attributeEntities?.[key]?.value;
-                return acc;
-            }, {});
+            const attributeDataValues = this.trackedEntityInstance()
+                ? this.#getTrackedEntityDataValues(this.trackedEntityInstance())
+                : {};
+            // TODO: Consider refactoring this logic to avoid potential issues with nested data values. The current implementation may not handle deeply nested structures correctly, which could lead to unexpected behavior when updating the instance with new data values.
+            const currentInstanceDataValues = this.config().formType === 'TRACKER'
+                ? this.#getTrackedEntityDataValues(this.instance())
+                : this.instance();
             return {
-                ...attributeValues,
-                ...(trackedEntity?.reportEntities ?? {}),
-                ...(this.instance() || {}),
+                ...attributeDataValues,
+                ...(currentInstanceDataValues || {}),
             };
         }, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "dataEntities" }] : /* istanbul ignore next */ []));
@@ -13140,6 +13144,16 @@ class ProgramEntryFormModule {
         }, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "FormActionButtons" }] : /* istanbul ignore next */ []));
     }
+    #getTrackedEntityDataValues(trackedEntity) {
+        const attributeDataValues = Object.keys(trackedEntity?.attributeEntities ?? {}).reduce((acc, key) => {
+            acc[key] = trackedEntity?.attributeEntities?.[key]?.value;
+            return acc;
+        }, {});
+        return {
+            ...attributeDataValues,
+            ...(trackedEntity?.reportEntities ?? {}),
+        };
+    }
     async ngOnInit() {
         this.loading.set(true);
         try {