@iapps/ng-dhis2-ui 1.3.4 → 1.3.6

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

@@ -9139,7 +9139,7 @@ class BaseFormFieldComponent extends ReactWrapperModule {
                     case 'transfer':
                         return (React__default.createElement(Transfer, { filterable: true, filterPlaceholder: "Search", selected: selected, leftHeader: React__default.createElement("div", { style: { fontSize: 14, padding: '8px 4px' } }, f.availableOptionsLabel), rightHeader: React__default.createElement("div", { style: { fontSize: 14, padding: '8px 4px' } }, f.selectedOptionsLabel), options: f.options, onChange: (event) => onValueChange(event.selected) }));
                     case 'checkbox':
-                        return (React__default.createElement(Checkbox, { checked: Boolean(value), error: hasError, label: this.label(), name: f.id, disabled: disabled, onChange: (event) => onValueChange(event.checked), onBlur: () => checkValueUniqueness() }));
+                        return (React__default.createElement(Checkbox, { checked: Boolean(value), error: hasError, label: this.label(), name: f.id, disabled: disabled, onChange: (event) => onValueChange(event.checked ? true : null), onBlur: () => checkValueUniqueness() }));
                     case 'dropdown':
                         return (React__default.createElement(FieldSet, null,
                             React__default.createElement(FormFieldLabel, { field: this.field(), fieldConfig: this.fieldConfig() }),
@@ -11895,6 +11895,7 @@ class ProgramEntryFormConfig {
         this.cancelButtonLabel = 'Cancel';
         this.fieldDescriptionLabel = 'Description';
         this.updateTeiOrgUnit = false;
+        this.enableCustomFieldConfigurations = false;
         Object.assign(this, config);
     }
 }
@@ -11939,6 +11940,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 +12924,7 @@ class ProgramEntryFormMetaData {
         });
     }
     get programStageSections() {
-        if (!this.program) {
+        if (!this.program || this.config.excludeProgramStages) {
             return [];
         }
         const { displayType, formType } = this.config;
@@ -12978,8 +12982,10 @@ class ProgramEntryFormMetaData {
         };
     }
     async #getCustomFieldConfigurations() {
+        console.log('Fetching custom field configurations...');
         try {
             const response = await this.d2.httpInstance.get('dataStore/field-extensions?fields=id,fieldOptionsDependsOn,optionSet&paging=false', { useIndexDb: true });
+            console.log('Fetching custom field configurations...', response?.data);
             const responseData = response?.data;
             const entries = Array.isArray(responseData)
                 ? responseData
@@ -13009,8 +13015,9 @@ class ProgramEntryFormMetaData {
             if (program) {
                 this.program = program;
                 // TODO FIND ANOTHER WAY TO PASS IN CUSTOM FIELD CONFIGURATIONS, AVOID TIGHT COUPLING HERE
-                // this.customFieldConfigurations =
-                //   await this.#getCustomFieldConfigurations();
+                this.customFieldConfigurations = this.config.enableCustomFieldConfigurations === true
+                    ? await this.#getCustomFieldConfigurations()
+                    : {};
                 if (this.config?.formFieldExtensions &&
                     this.config.formFieldExtensions.length > 0 &&
                     this.config.formFieldExtensions[0]?.optionsSourceCode) {
@@ -13094,15 +13101,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 +13148,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 {