@iapps/ng-dhis2-ui 1.2.112 → 1.2.113

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

@@ -6499,66 +6499,13 @@ const buildReadableFullName = (unit) => {
     return pathParts.join(' / ');
 };
 const OrgUnitFormField = (props) => {
-    // const { onSelectOrgUnit, label, required, selected, disabled, key, customOrgUnitRoots } = props;
-    // const d2 = (window as unknown as D2Window)?.d2Web;
-    // const classes = useDynamicStyles(orgUnitFieldStyles);
-    // const config = useMemo(() => {
-    //   return d2.systemInfo?.toInitObject();
-    // }, []);
-    // TODO: Improvements
     const { onSelectOrgUnit, label, required, selected, disabled, key, field, customOrgUnitRoots, } = props;
     const d2 = window?.d2Web;
     const classes = useDynamicStyles$2(orgUnitFieldStyles);
     const config = useMemo(() => d2.systemInfo?.toInitObject(), []);
-    // TODO: Improvements
-    // New state to hold full orgUnit info from customOrgUnitRoots
-    // const [configuredRootInfo, setConfiguredRootInfo] = useState<
-    //   { id: string; name: string; code?: string; path: string; level: number }[]
-    // >([]);
     const [configuredRootInfo, setConfiguredRootInfo] = useState([]);
     const [configuredRootsLoading, setConfiguredRootsLoading] = useState(false);
-    // Strike-through (fallback) current user roots
     const [useCustomRoots, setUseCustomRoots] = useState(customOrgUnitRoots && customOrgUnitRoots.length ? true : false);
-    // TODO: START | Deprecated Approach that doesn't support passing ID of Organisation Unit as root
-    // const rootOrgUnits = useMemo(() => {
-    //   return d2.currentUser?.organisationUnits || [];
-    // }, []);
-    // TODO: END | Deprecated Approach that doesn't support passing ID of Organisation Unit as root
-    // TODO: Improvements
-    // Fetch matching configured roots on mount or when key changes:
-    // useEffect(() => {
-    //   const matchList =
-    //     customOrgUnitRoots?.filter((entry) => entry.field === (field || key)) ||
-    //     [];
-    //   if (matchList?.length > 0) {
-    //     setUseCustomRoots(true);
-    //     Promise.all(
-    //       (matchList || []).map((entry) =>
-    //         d2.httpInstance
-    //           .get(
-    //             `organisationUnits/${entry.orgUnit}.json?fields=id,displayName,name,code,path,level`
-    //           )
-    //           .then((res) => {
-    //             const u = res.data as OrgUnitResponse;
-    //             return {
-    //               id: u.id,
-    //               name: u.displayName || u.name,
-    //               code: u.code,
-    //               path: u.path,
-    //               level: u.level,
-    //             };
-    //           })
-    //       )
-    //     )
-    //       .then(setConfiguredRootInfo)
-    //       .catch((err) =>
-    //         console.warn(
-    //           `[OrgUnitFormField] Failed to fetch customOrgUnitRoots:`,
-    //           err
-    //         )
-    //       );
-    //   }
-    // }, [customOrgUnitRoots, key, field, d2.httpInstance]);
     useEffect(() => {
         const matchList = customOrgUnitRoots?.filter((entry) => entry.field === (field || key)) ||
             [];
@@ -6567,7 +6514,7 @@ const OrgUnitFormField = (props) => {
             setConfiguredRootsLoading(true);
             Promise.allSettled(matchList.map(async (orgUnitConfig) => {
                 try {
-                    const orgUnitResponse = await d2.httpInstance.get(`organisationUnits/${orgUnitConfig.orgUnit}.json?fields=id,displayName,name,code,path,level,ancestors[displayName],children[id,displayName,name,code,path,level,ancestors[displayName],children[id,displayName,name,code,path,level,ancestors[displayName]]]&paging=false`);
+                    const orgUnitResponse = await d2.httpInstance.get(`organisationUnits/${orgUnitConfig.orgUnit}.json?fields=id,displayName,name,code,path,level,ancestors[displayName],children[id,displayName,name,code,path,level,ancestors[displayName],children[id,displayName,name,code,path,level,ancestors[displayName],children[id,displayName,name,code,path,level,ancestors[displayName]]]]&paging=false`);
                     const rootOrgUnitData = orgUnitResponse.data;
                     const allDescendantOrgUnits = flattenChildren([rootOrgUnitData]);
                     const matchingConfig = customOrgUnitRoots?.find((config) => config.orgUnit === orgUnitConfig.orgUnit);
@@ -6599,6 +6546,7 @@ const OrgUnitFormField = (props) => {
                 const allFacilities = settledResults
                     .filter((result) => result.status === 'fulfilled')
                     .flatMap((result) => result.value);
+                console.log("ALL FACILITIES::: ", allFacilities);
                 setConfiguredRootInfo(allFacilities);
                 setConfiguredRootsLoading(false);
             })
@@ -6608,28 +6556,6 @@ const OrgUnitFormField = (props) => {
             });
         }
     }, [customOrgUnitRoots, key, field, d2.httpInstance]);
-    // const rootOrgUnits = useMemo(() => {
-    //   if (customOrgUnitRoots && customOrgUnitRoots.length > 0) {
-    //     return customOrgUnitRoots.map((id) => ({ id }));
-    //   }
-    //   return d2.currentUser?.organisationUnits || [];
-    // }, [customOrgUnitRoots]);
-    // const getExpandedItems = () => {
-    //   if (rootOrgUnits && rootOrgUnits.length === 1) {
-    //     return [`/${rootOrgUnits[0].id}`];
-    //   } else if (rootOrgUnits?.length > 1) {
-    //     return rootOrgUnits.map((root) => root.path);
-    //   }
-    //   return undefined;
-    // };
-    // TODO: Improvements
-    // Decide which roots to render
-    // const rootOrgUnits = useMemo(() => {
-    //   if (useCustomRoots && configuredRootInfo.length > 0) {
-    //     return configuredRootInfo.map((u) => u);
-    //   }
-    //   return d2.currentUser?.organisationUnits || [];
-    // }, [useCustomRoots, configuredRootInfo, d2.currentUser]);
     const rootOrgUnits = useMemo(() => {
         if (useCustomRoots) {
             if (configuredRootsLoading) {
@@ -6749,9 +6675,6 @@ const OrgUnitFormField = (props) => {
                 onSelectOrgUnit(event.id);
             } })));
     };
-    const handleBlur = () => {
-        // onBlur && onBlur(null);
-    };
     return (config && (React__default.createElement(Provider, { config: config, plugin: false, parentAlertsAdd: undefined, showAlertsInPlugin: false },
         React__default.createElement("div", null,
             label && (React__default.createElement("div", { className: classes.orgUnitFieldLabel },