@iapps/ng-dhis2-ui 1.2.162 → 1.2.164

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

@@ -7403,7 +7403,7 @@ function getNumericLevelForSemanticLevel(level, keywordToLevel = DEFAULT_KEYWORD
     return keyword ? keywordToLevel[keyword] : undefined;
 }
 const OrgUnitFormField = (props) => {
-    const { onSelectOrgUnit, label, required, selected, disabled, key, field, customOrgUnitRoots, } = props;
+    const { onSelectOrgUnit, label, required, selected, disabled, key, field, customOrgUnitRoots, orgUnitRoots, } = props;
     const d2 = window?.d2Web;
     const classes = useDynamicStyles$2(orgUnitFieldStyles);
     const config = useMemo(() => d2.systemInfo?.toInitObject(), []);
@@ -7673,11 +7673,15 @@ const OrgUnitFormField = (props) => {
             }
             return configuredRootInfo;
         }
+        if (orgUnitRoots?.length) {
+            return orgUnitRoots.map((id) => ({ id }));
+        }
         return d2.currentUser?.organisationUnits || [];
     }, [
         useCustomRoots,
         configuredRootsLoading,
         configuredRootInfo,
+        orgUnitRoots,
         d2.currentUser,
     ]);
     const getExpandedItems = () => {
@@ -8956,10 +8960,16 @@ class BaseFormFieldComponent extends ReactWrapperModule {
             const [checkingUniqueness, setCheckingUniqueness] = useState(false);
             useEffect(() => {
                 const sub = this.programRuleOptions$.subscribe((options) => {
+                    if (!options)
+                        return;
+                    if (field.controlType !== 'dropdown' &&
+                        field.controlType !== 'multi-dropdown') {
+                        return;
+                    }
                     const cascade = this.#resolveCascadeForCurrentField();
                     if (cascade?.kind === 'OPTIONS_PATH')
                         return;
-                    const nextOptions = options ?? this.field().options ?? [];
+                    const nextOptions = options;
                     setFilteredOptions(nextOptions);
                     const currentCtrl = this.#getCurrentFieldControl(fg);
                     const currentValue = String(currentCtrl?.value ?? '').trim();
@@ -9151,7 +9161,7 @@ class BaseFormFieldComponent extends ReactWrapperModule {
                     case 'textarea':
                         return (React__default.createElement(TextAreaField, { error: hasError, validationText: validationError, inputWidth: this.fieldConfig()?.inputWidth, required: f.required, name: f.id, disabled: disabled, label: this.label(), rows: 5, placeholder: this.placeholder(), value: value, onChange: (event) => onValueChange(event.value), onBlur: () => checkValueUniqueness() }));
                     case 'org-unit':
-                        return (React__default.createElement(OrgUnitFormField, { label: this.label(), key: f.id, field: f.id, required: f.required, disabled: disabled, customOrgUnitRoots: this.customOrgUnitRoots(), onSelectOrgUnit: (selectedOrgUnit) => onValueChange(selectedOrgUnit), selected: value }));
+                        return (React__default.createElement(OrgUnitFormField, { label: this.label(), key: f.id, field: f.id, required: f.required, disabled: disabled, customOrgUnitRoots: this.customOrgUnitRoots(), orgUnitRoots: f.extension?.orgUnitRoots, onSelectOrgUnit: (selectedOrgUnit) => onValueChange(selectedOrgUnit), selected: value }));
                     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':