@iapps/ng-dhis2-ui 1.4.4 → 1.4.5

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

@@ -12326,7 +12326,7 @@ class FormUtil {
                     });
                 if (field.referenceKey) {
                     const value = dataEntities
-                        ? dataEntities[field.referenceKey] || ''
+                        ? dataEntities[field.referenceKey] ?? ''
                         : '';
                     group[field.referenceKey] = field.required
                         ? new UntypedFormControl({ value, disabled: field.disabled }, {
@@ -12354,7 +12354,7 @@ class FormUtil {
     }
     static getFieldValue(field, dataEntities) {
         const fieldValue = dataEntities
-            ? dataEntities[field.id] || dataEntities[field.key] || ''
+            ? dataEntities[field.id] ?? dataEntities[field.key] ?? ''
             : '';
         return isArray(fieldValue) ? JSON.stringify(fieldValue) : fieldValue;
     }
@@ -13646,7 +13646,14 @@ class FlatFormComponent extends BaseFormWrapperComponent {
         this.onFormUpdate(this.dataValues());
     }
     onFormUpdate(dataValues) {
-        this.updateDataValues(dataValues ?? this.formGroup.getRawValue());
+        // Controls can be omitted from a FLAT form when their fields are hidden.
+        // Keep their initial values while letting rendered controls override them,
+        // including intentional clears (null or empty string).
+        const updatedValues = dataValues ?? this.formGroup.getRawValue();
+        this.updateDataValues({
+            ...this.dataValues(),
+            ...updatedValues,
+        });
         this.updateFormValidity(this.formGroup.valid);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: FlatFormComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
@@ -15348,7 +15355,6 @@ class ProgramEntryFormMetaData {
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// eslint-disable-next-line @angular-eslint/component-class-suffix
 class ProgramEntryFormModule {
     constructor() {
         this.config = input.required(/* @ts-ignore */
@@ -15382,6 +15388,14 @@ class ProgramEntryFormModule {
         ...(ngDevMode ? [{ debugName: "instance" }] : /* istanbul ignore next */ []));
         this.trackedEntityInstance = signal(null, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "trackedEntityInstance" }] : /* istanbul ignore next */ []));
+        // SDK instances are mutable class objects. A revision signal ensures that
+        // dependent computed values refresh after updateDataValues() mutates one.
+        this.instanceRevision = signal(0, /* @ts-ignore */
+        ...(ngDevMode ? [{ debugName: "instanceRevision" }] : /* istanbul ignore next */ []));
+        // Maintain configured defaults independently of the rendered field list.
+        // hideCustomAssignedFields can remove their controls from the FormGroup.
+        this.initialAutoAssignedValues = signal({}, /* @ts-ignore */
+        ...(ngDevMode ? [{ debugName: "initialAutoAssignedValues" }] : /* istanbul ignore next */ []));
         this.preprocess = input(/* @ts-ignore */
         ...(ngDevMode ? [undefined, { debugName: "preprocess" }] : /* istanbul ignore next */ []));
         this.instanceSave = new EventEmitter();
@@ -15403,6 +15417,7 @@ class ProgramEntryFormModule {
         }, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "dataId" }] : /* istanbul ignore next */ []));
         this.dataEntities = computed(() => {
+            this.instanceRevision();
             if (!this.instance()) {
                 return {};
             }
@@ -15414,6 +15429,9 @@ class ProgramEntryFormModule {
                 ? this.#getTrackedEntityDataValues(this.instance())
                 : this.instance();
             return {
+                // Fallback for assignments hidden from the rendered form metadata.
+                // Values held by the SDK instance take precedence when present.
+                ...this.initialAutoAssignedValues(),
                 ...attributeDataValues,
                 ...(currentInstanceDataValues || {}),
             };
@@ -15480,11 +15498,13 @@ class ProgramEntryFormModule {
                 console.error('Failed to create or load instance for program entry form');
                 return;
             }
-            this.instance.set(instance);
+            // Apply assignments BEFORE publishing the instance to the form. This
+            // prevents a child form from initializing with pre-assignment values.
             const autoAssigned = config.autoAssignedValues;
             if (autoAssigned?.length) {
-                this.#updateInstanceWithAutoAssignedValues(autoAssigned);
+                this.#updateInstanceWithAutoAssignedValues(instance, autoAssigned);
             }
+            this.instance.set(instance);
         }
         catch (error) {
             console.error('Error during ProgramEntryForm initialization', error);
@@ -15494,7 +15514,35 @@ class ProgramEntryFormModule {
         }
     }
     onFormUpdate(dataValues) {
-        this.#updateInstance(dataValues);
+        // Hidden auto-assigned fields may be absent from the FormGroup. Preserve
+        // their CURRENT values (not repeatedly their initial defaults), so later
+        // programmatic updates are not accidentally rolled back by another field.
+        const preservedAssignedValues = {};
+        if (this.config().hideCustomAssignedFields) {
+            // Read the mutable SDK instance directly: a cached computed signal may
+            // not yet reflect values modified by external SDK/preprocess code.
+            const currentInstance = this.instance();
+            const attributeValues = this.trackedEntityInstance()
+                ? this.#getTrackedEntityDataValues(this.trackedEntityInstance())
+                : {};
+            const currentInstanceValues = this.config().formType === 'TRACKER' && currentInstance
+                ? this.#getTrackedEntityDataValues(currentInstance)
+                : currentInstance ?? {};
+            const currentValues = {
+                ...attributeValues,
+                ...currentInstanceValues,
+            };
+            for (const [key, initialValue] of Object.entries(this.initialAutoAssignedValues())) {
+                // orgUnit has its own registration control and precedence rules.
+                if (key === 'orgUnit')
+                    continue;
+                preservedAssignedValues[key] = Object.prototype.hasOwnProperty.call(currentValues, key)
+                    ? currentValues[key]
+                    : initialValue;
+            }
+        }
+        // Explicit user edits and clears (including null/empty string) win.
+        this.#updateInstance({ ...preservedAssignedValues, ...dataValues });
         if (this.instance()) {
             this.instanceUpdate.emit(this.instance());
         }
@@ -15526,10 +15574,11 @@ class ProgramEntryFormModule {
         }
         return configuredKey;
     }
-    #updateInstanceWithAutoAssignedValues(autoAssignedValues) {
+    #updateInstanceWithAutoAssignedValues(instance, autoAssignedValues) {
         const trackedEntityId = this.trackedEntity?.();
         if (
-        // Event forms also receive a trackedEntity ID checking the ID alone prevented their auto-assigned fields from being populated since its passed even in creation of the events. 
+        // Existing TRACKER records must not have their stored attributes replaced.
+        // EVENT forms may legitimately have an existing tracked entity ID.
         this.config().formType === 'TRACKER' &&
             typeof trackedEntityId === 'string' &&
             trackedEntityId.trim().length > 0) {
@@ -15543,6 +15592,14 @@ class ProgramEntryFormModule {
         const aggregatedValues = {};
         for (let index = 0; index < valueCount; index++) {
             const { field: configuredKey, value } = autoAssignedValues[index];
+            if (!configuredKey)
+                continue;
+            // An explicit orgUnit input takes precedence over the optional
+            // auto-assignment fallback used for new TRACKER registration.
+            if (configuredKey === 'orgUnit' && this.orgUnit()?.trim()) {
+                aggregatedValues['orgUnit'] = this.orgUnit().trim();
+                continue;
+            }
             const semanticKey = metaData
                 ? this.#resolveFieldRuntimeId(configuredKey, metaData)
                 : configuredKey;
@@ -15554,26 +15611,30 @@ class ProgramEntryFormModule {
         if (Object.keys(aggregatedValues).length === 0) {
             return;
         }
-        this.#updateInstance(aggregatedValues);
+        this.initialAutoAssignedValues.set(aggregatedValues);
+        this.#applyDataValues(instance, aggregatedValues);
+    }
+    #applyDataValues(instance, dataValues) {
+        for (const key in dataValues) {
+            if (Object.prototype.hasOwnProperty.call(dataValues, key)) {
+                // Keep the existing SDK integration behavior for other consumers.
+                instance[key] = dataValues[key];
+            }
+        }
+        instance.updateDataValues(dataValues, this.config().updateTeiOrgUnit);
     }
     #updateInstance(dataValues) {
         if (!dataValues || Object.keys(dataValues).length === 0) {
             return;
         }
-        const shouldUpdateOrgUnit = this.config().updateTeiOrgUnit;
-        this.instance.update((instance) => {
-            if (!instance) {
-                return instance;
-            }
-            for (const key in dataValues) {
-                if (Object.prototype.hasOwnProperty.call(dataValues, key)) {
-                    instance[key] =
-                        dataValues[key];
-                }
-            }
-            instance.updateDataValues(dataValues, shouldUpdateOrgUnit);
-            return instance;
-        });
+        const instance = this.instance();
+        if (!instance) {
+            return;
+        }
+        this.#applyDataValues(instance, dataValues);
+        // The SDK model is a class, so do not spread/clone it just to change the
+        // signal reference (that would discard its prototype methods).
+        this.instanceRevision.update((revision) => revision + 1);
     }
     async #saveInstance() {
         if (this.preprocess() && this.instance()) {
@@ -15603,7 +15664,7 @@ class ProgramEntryFormModule {
         }
     }
     async #setReservedValuesForCodeGeneration(instance) {
-        const orgUnitForCodeGeneration = this.codeGeneratorOrgUnit() || this.orgUnit();
+        const orgUnitForCodeGeneration = this.codeGeneratorOrgUnit() || this.#resolveTrackerOrgUnit();
         const reservedValueQuery = this.d2.trackerModule.trackedEntity.setProgram(this.config().program);
         if (orgUnitForCodeGeneration) {
             reservedValueQuery.setOrgUnit(orgUnitForCodeGeneration);
@@ -15614,13 +15675,28 @@ class ProgramEntryFormModule {
         });
         return instance;
     }
+    #resolveTrackerOrgUnit() {
+        const explicitOrgUnit = this.orgUnit()?.trim();
+        if (explicitOrgUnit) {
+            return explicitOrgUnit;
+        }
+        // For new TRACKER records, an orgUnit auto-assignment must also be used
+        // when creating the instance/query, not only after it has been created.
+        if (this.config().formType !== 'TRACKER' || this.trackedEntity()?.trim()) {
+            return undefined;
+        }
+        const assignedOrgUnit = this.config().autoAssignedValues?.find((item) => item.field === 'orgUnit')?.value;
+        return typeof assignedOrgUnit === 'string' && assignedOrgUnit.trim()
+            ? assignedOrgUnit.trim()
+            : undefined;
+    }
     #getQuery(instanceType) {
         const d2 = window.d2Web;
         switch (instanceType) {
             case 'TRACKER':
                 return d2.trackerModule.trackedEntity
                     .setProgram(this.config().program)
-                    .setOrgUnit(this.orgUnit());
+                    .setOrgUnit(this.#resolveTrackerOrgUnit());
             case 'EVENT':
                 return d2.eventModule.event
                     .setProgram(this.config().program)