@iapps/ng-dhis2-ui 1.2.113 → 1.2.115

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

@@ -5456,7 +5456,17 @@ class FieldDropdown {
             order: this.order,
         };
     }
-    static getDropdownOptions(field, locale) {
+    static getDropdownOptions(field, locale, extension) {
+        if (extension?.organisationUnits &&
+            extension.organisationUnits.length > 0) {
+            return sortBy(extension.organisationUnits.map((orgUnit) => {
+                return new FieldDropdown({
+                    key: orgUnit.id,
+                    value: orgUnit.id,
+                    label: orgUnit.name,
+                });
+            }), 'label');
+        }
         if (field?.valueType === FieldType.BOOLEAN) {
             return [
                 {
@@ -8322,9 +8332,9 @@ class ProgramEntryFormFieldUtil {
     get fields() {
         const fields = [...this.attributes, ...this.dataElements]
             .map((field) => {
-            const options = FieldDropdown.getDropdownOptions(field);
-            const hasOptions = options?.length > 0;
             const extension = this.config.formFieldExtensions?.find((fieldExtension) => fieldExtension?.id === field.id);
+            const options = FieldDropdown.getDropdownOptions(field, undefined, extension);
+            const hasOptions = options?.length > 0;
             const autoAssignedValue = this.#getAutoAssignedValue(field);
             if (!isUndefined(autoAssignedValue) &&
                 this.config.hideCustomAssignedFields) {
@@ -8530,6 +8540,14 @@ class ProgramEntryFormMetaData {
             const program = await this.#getProgramMetaData();
             if (program) {
                 this.program = program;
+                if (this.config?.formFieldExtensions &&
+                    this.config.formFieldExtensions.length > 0 &&
+                    this.config.formFieldExtensions[0]?.optionSetGroup) {
+                    const orgUnitResponse = await this.d2.httpInstance.get(`organisationUnits.json?fields=id,name,code&paging=false&filter=organisationUnitGroups.code:eq:${this.config.formFieldExtensions[0].optionSetGroup}`);
+                    const orgUnitsResponse = orgUnitResponse?.data?.['organisationUnits'];
+                    const organisationUnits = Array.isArray(orgUnitsResponse) ? orgUnitsResponse : [];
+                    this.config.formFieldExtensions[0].organisationUnits = organisationUnits;
+                }
                 return this.toJson();
             }
             return null;
@@ -8579,9 +8597,6 @@ class ProgramEntryFormModule {
         this.FormLoader = () => {
             return React__default.createElement(CircularLoader$1, { small: true });
         };
-        // dataId = computed(() => {
-        //   return this.instance()?.trackedEntity || this.instance()?.event;
-        // });
         this.dataId = computed(() => {
             if (this.config().formType === 'EVENT') {
                 return this.instance()?.event;