@iapps/ng-dhis2-ui 1.3.1 → 1.3.2

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

@@ -11317,6 +11317,7 @@ class BaseFormWrapperComponent {
         this.formValidityUpdate.emit(isFormValid);
     }
     executeRules() {
+        console.log(this.#updatedDataValues());
         this.ruleActions.set(new ProgramRuleEngine()
             .setRules(this.rules())
             .setDataValues(this.#updatedDataValues())
@@ -12825,7 +12826,7 @@ class ProgramEntryFormMetaData {
                 .with(this.d2.programModule.programStageDataElement.with(this.d2.dataElementModule.dataElement.with(this.d2.optionSetModule.optionSet.with(this.d2.optionSetModule.option), 'ToOne'), 'ToOne'));
             programQuery.with(programStageQuery);
         }
-        return programQuery.get({ useIndexDb: true });
+        return programQuery.get();
     }
     async #getProgramMetaData() {
         const program = this.config.program;
@@ -12885,7 +12886,7 @@ class ProgramEntryFormMetaData {
                 'displayName',
             ]), 'ToOne'))
                 .paginate(new Pager({ paging: false }))
-                .get({ useIndexDb: true }),
+                .get(),
         ]);
         const [programResponse, programRuleResponse] = metaDataResponse;
         const metaData = programResponse.data;
@@ -13061,7 +13062,7 @@ class ProgramEntryFormMetaData {
                 if (this.config?.formFieldExtensions &&
                     this.config.formFieldExtensions.length > 0 &&
                     this.config.formFieldExtensions[0]?.optionsSourceCode) {
-                    const orgUnitResponse = await this.d2.httpInstance.get(`organisationUnits.json?fields=id,name,code&paging=false&filter=organisationUnitGroups.code:eq:${this.config.formFieldExtensions[0].optionsSourceCode}`, { useIndexDb: true });
+                    const orgUnitResponse = await this.d2.httpInstance.get(`organisationUnits.json?fields=id,name,code&paging=false&filter=organisationUnitGroups.code:eq:${this.config.formFieldExtensions[0].optionsSourceCode}`);
                     const orgUnitsResponse = orgUnitResponse?.data?.['organisationUnits'];
                     const organisationUnits = Array.isArray(orgUnitsResponse)
                         ? orgUnitsResponse
@@ -13169,27 +13170,6 @@ class ProgramEntryFormModule {
         }, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "FormActionButtons" }] : /* istanbul ignore next */ []));
     }
-    // async ngOnInit() {
-    //   this.loading.set(true);
-    //   try {
-    //     // Loading metadata
-    //     const metaData = await new ProgramEntryFormMetaData()
-    //       .setConfig(this.config())
-    //       .get();
-    //     this.metaData.set(metaData);
-    //     // Load initial instance information
-    //     const instance = await this.#getInstance();
-    //     this.instance.set(instance);
-    //     if (this.config().autoAssignedValues) {
-    //       this.#updateInstanceWithAutoAssignedValues(
-    //         this.config().autoAssignedValues || []
-    //       );
-    //     }
-    //     this.loading.set(false);
-    //   } catch (err) {
-    //     this.loading.set(false);
-    //   }
-    // }
     async ngOnInit() {
         this.loading.set(true);
         try {
@@ -13392,22 +13372,24 @@ class ProgramEntryFormModule {
         return instance;
     }
     async #getTrackerInstance() {
-        this.instanceQuery = this.d2.trackerModule.trackedEntity
-            .setProgram(this.config().program)
-            .setOrgUnit(this.orgUnit());
+        const d2 = window.d2Web;
+        this.instanceQuery = d2?.trackerModule?.trackedEntity
+            ?.setProgram(this.config().program)
+            ?.setOrgUnit(this.orgUnit());
+        if (!this.instanceQuery) {
+            throw new Error('Could not initialize tracker query');
+        }
         if (!this.trackedEntity()) {
-            const instance = await this.instanceQuery.create();
-            return await this.#setReservedValuesForCodeGeneration(instance);
+            return await this.instanceQuery.create();
         }
         const instanceResult = (await this.instanceQuery
             .setTrackedEntity(this.trackedEntity())
             .get()).data;
         if (!instanceResult) {
-            const instance = await this.instanceQuery.create();
-            return await this.#setReservedValuesForCodeGeneration(instance);
+            return await this.instanceQuery.create();
         }
         this.instanceQuery.setInstanceFields(this.metaData()?.program);
-        const instance = await this.#setReservedValuesForCodeGeneration(this.instanceQuery.instance);
+        const instance = await this.instanceQuery.setReservedValues();
         if (this.orgUnit()) {
             instance.setOrgUnit(this.orgUnit());
         }