@mcurros2/microm 1.1.319-0 → 1.1.321-0

package/dist/index.js

@@ -826,6 +826,7 @@ class $16abd72d1aa9b62d$export$6118e57c65bf19ee {
             if (data?.requires_two_factor && data?.two_factor_challenge_id) return data;
             if (data && data.access_token) {
                 const token = new (0, $78KzE.MicroMToken)(data.access_token, data.expires_in, data['refresh-token'], data.token_type, data);
+                await this.#deleteEnabledMenus();
                 await this.#setToken(token);
                 try {
                     await this.#DATA_STORAGE.saveData(this.#APP_ID, $16abd72d1aa9b62d$var$REMEMBER_USER_DATA_KEY, rememberme ? username : null);
@@ -884,6 +885,7 @@ class $16abd72d1aa9b62d$export$6118e57c65bf19ee {
             const data = await response.json();
             if (data && data.access_token) {
                 const token = new (0, $78KzE.MicroMToken)(data.access_token, data.expires_in, data['refresh-token'], data.token_type, data);
+                await this.#deleteEnabledMenus();
                 await this.#setToken(token);
                 try {
                     await this.#DATA_STORAGE.saveData(this.#APP_ID, $16abd72d1aa9b62d$var$REMEMBER_USER_DATA_KEY, rememberme ? username ?? null : null);
@@ -1267,6 +1269,10 @@ class $16abd72d1aa9b62d$export$6118e57c65bf19ee {
     }
     async #loadToken() {
         if (!this.#TOKEN) this.#TOKEN = await this.#TOKEN_STORAGE.readToken(this.#APP_ID);
+        if (!this.#TOKEN) {
+            console.warn('No token found, clearing enabled menus');
+            this.#ENABLED_MENUS.clear();
+        }
     }
     async #setToken(token) {
         await this.#TOKEN_STORAGE.saveToken(this.#APP_ID, token);
@@ -1371,12 +1377,8 @@ class $16abd72d1aa9b62d$export$6118e57c65bf19ee {
         return result;
     }
     //*** Enabled menus
-    async getMenus() {
-        if (this.#ENABLED_MENUS.size === 0) {
-            const data = await this.#readEnabledMenus();
-            this.#ENABLED_MENUS = data ? new Set(data) : new Set();
-        }
-        return this.#ENABLED_MENUS;
+    getMenus() {
+        return new Set(this.#ENABLED_MENUS);
     }
     async #getAPIEnabledMenus(username, abort_signal = null) {
         if (!this.#TOKEN) return;
@@ -1400,6 +1402,7 @@ class $16abd72d1aa9b62d$export$6118e57c65bf19ee {
         return await this.#DATA_STORAGE.readData(this.#APP_ID, $16abd72d1aa9b62d$var$ENABLED_MENUS_DATA_KEY);
     }
     async #deleteEnabledMenus() {
+        this.#ENABLED_MENUS.clear();
         await this.#DATA_STORAGE.deleteData(this.#APP_ID, $16abd72d1aa9b62d$var$ENABLED_MENUS_DATA_KEY);
     }
     //*** File upload/download
@@ -37060,24 +37063,15 @@ function $85ebd7a43eb2f762$export$3c1a5eed89d78dce(props) {
 
 parcelRegister("dZWTZ", function(module, exports) {
 
-$parcel$export(module.exports, "UseMenuContentDefaultProps", function () { return $468dbc1019a115f1$export$5920af2d37d82a1b; });
 $parcel$export(module.exports, "useMenuContent", function () { return $468dbc1019a115f1$export$48c6e824f65803ea; });
 
 
-
-
 var $e8sJv = parcelRequire("e8sJv");
 
 var $4jQJd = parcelRequire("4jQJd");
-const $468dbc1019a115f1$export$5920af2d37d82a1b = {
-    enableMenuSecurity: true,
-    defaultLoadingComponent: /*#__PURE__*/ (0, $b4te3$reactjsxruntime.jsx)((0, $b4te3$mantinecore.Skeleton), {}),
-    searchMenuItemsWithContentOnly: true
-};
 const $468dbc1019a115f1$var$triggerItemAction = async (props)=>{
     const { item: item, setOpened: setOpened, onActiveChange: onActiveChange, onSubitemActiveChange: onSubitemActiveChange, autoHideNavBarOnClick: autoHideNavBarOnClick } = props;
     if (!item.noActive) {
-        // MMC: TODO, change the activeIDState to a single state
         onActiveChange(item.ID);
         onSubitemActiveChange(item.ID);
     } else {
@@ -37088,7 +37082,7 @@ const $468dbc1019a115f1$var$triggerItemAction = async (props)=>{
     if ((item.content || item.subitems) && item.menuPath) (0, $e8sJv.navigateToRoute)(item.menuPath);
     if (autoHideNavBarOnClick && !item.subitems) setOpened(false);
 };
-const $468dbc1019a115f1$var$populateMenuPaths = (items, parentPath = '', parentDescription = '', menuId = '')=>{
+const $468dbc1019a115f1$var$populateMenuPaths = (items, parentPath, parentDescription, menuId)=>{
     items.forEach((item)=>{
         item.menuId = menuId;
         const currentPath = `${parentPath}/${item.ID}`;
@@ -37117,10 +37111,10 @@ const $468dbc1019a115f1$var$filterEnabledItems = (items, menuId, enabled)=>{
         return item;
     });
 };
-const $468dbc1019a115f1$var$CreateSpotlightActions = (items, baseActionProps, searchMenuItemsWithContentOnly, actions = [])=>{
+const $468dbc1019a115f1$var$createSpotlightActions = (items, baseActionProps, searchMenuItemsWithContentOnly, actions = [])=>{
     for (const item of items)if (item.section === 'items') {
         const group = item.menuPathDescription?.split("/").map((part)=>part.trim()).filter(Boolean)[0];
-        if (!searchMenuItemsWithContentOnly || searchMenuItemsWithContentOnly && (item.content || item.onClick)) actions.push({
+        if (!searchMenuItemsWithContentOnly || item.content || item.onClick) actions.push({
             id: item.ID,
             title: item.label,
             description: `${item.menuPathDescription}${item.description ? ` - ${item.description}` : ""}`,
@@ -37131,125 +37125,121 @@ const $468dbc1019a115f1$var$CreateSpotlightActions = (items, baseActionProps, se
                     item: item
                 })
         });
-        if (item.subitems) $468dbc1019a115f1$var$CreateSpotlightActions(item.subitems, baseActionProps, searchMenuItemsWithContentOnly, actions);
+        if (item.subitems) $468dbc1019a115f1$var$createSpotlightActions(item.subitems, baseActionProps, searchMenuItemsWithContentOnly, actions);
     }
     return actions;
 };
-function $468dbc1019a115f1$export$48c6e824f65803ea(props) {
-    const { client: client, setContent: setContent, isLoggedIn: isLoggedIn, setIsLoggedIn: setIsLoggedIn, menuContent: menuContent, setOpened: setOpened, loggedInInfo: loggedInInfo, menuId: menuId, enableMenuSecurity: enableMenuSecurity, searchMenuItemsWithContentOnly: searchMenuItemsWithContentOnly } = (0, $b4te3$mantinecore.useComponentDefaultProps)('useMenuContent', $468dbc1019a115f1$export$5920af2d37d82a1b, props);
-    const activeIDState = (0, $b4te3$react.useState)('');
-    const [, setActiveID] = activeIDState;
-    const subitemActiveIDState = (0, $b4te3$react.useState)('');
-    const [, setSubitemActiveID] = subitemActiveIDState;
-    const [items, setItems] = (0, $b4te3$react.useState)([]);
-    const [actions, setActions] = (0, $b4te3$react.useState)([]);
-    const [menuDictionary, setMenuDictionary] = (0, $b4te3$react.useState)({});
-    const [isLoading, setIsLoading] = (0, $b4te3$react.useState)(true);
-    const internal_items = (0, $b4te3$react.useMemo)(()=>{
-        const items = menuContent({
+const $468dbc1019a115f1$var$createMenuStateSetters = (menuIds, setState)=>Object.fromEntries(menuIds.map((menuId)=>[
+            menuId,
+            (value)=>{
+                setState((current)=>{
+                    const currentValue = current[menuId] ?? '';
+                    const nextValue = typeof value === 'function' ? value(currentValue) : value;
+                    return nextValue === currentValue ? current : {
+                        ...current,
+                        [menuId]: nextValue
+                    };
+                });
+            }
+        ]));
+function $468dbc1019a115f1$export$48c6e824f65803ea({ menus: menuConfig, client: client, setContent: setContent, setOpened: setOpened, isLoggedIn: isLoggedIn, setIsLoggedIn: setIsLoggedIn, loggedInInfo: loggedInInfo, theme: theme, enableMenuSecurity: enableMenuSecurity = true, searchMenuItemsWithContentOnly: searchMenuItemsWithContentOnly = true }) {
+    const menuIds = (0, $b4te3$react.useMemo)(()=>Object.keys(menuConfig), [
+        menuConfig
+    ]);
+    const mainMenuId = (0, $b4te3$react.useMemo)(()=>{
+        const mainMenuIds = Object.entries(menuConfig).filter(([, config])=>config.isMain).map(([menuId])=>menuId);
+        if (mainMenuIds.length !== 1) throw new Error(`useMenuContent requires exactly one main menu; received ${mainMenuIds.length}.`);
+        return mainMenuIds[0];
+    }, [
+        menuConfig
+    ]);
+    const [activeIds, setActiveIds] = (0, $b4te3$react.useState)({});
+    const [subitemActiveIds, setSubitemActiveIds] = (0, $b4te3$react.useState)({});
+    const activeSetters = (0, $b4te3$react.useMemo)(()=>$468dbc1019a115f1$var$createMenuStateSetters(menuIds, setActiveIds), [
+        menuIds
+    ]);
+    const subitemActiveSetters = (0, $b4te3$react.useMemo)(()=>$468dbc1019a115f1$var$createMenuStateSetters(menuIds, setSubitemActiveIds), [
+        menuIds
+    ]);
+    const materializedMenus = (0, $b4te3$react.useMemo)(()=>{
+        const enabledMenus = client.getMenus();
+        const menuProps = {
             client: client,
             setContent: setContent,
             setOpened: setOpened,
             isLoggedIn: isLoggedIn,
             setIsLoggedIn: setIsLoggedIn,
             loggedInInfo: loggedInInfo,
-            menuId: menuId
-        });
-        $468dbc1019a115f1$var$populateMenuPaths(items, `/${menuId}`, '', menuId);
-        return items;
+            theme: theme
+        };
+        return Object.fromEntries(Object.entries(menuConfig).map(([menuId, config])=>{
+            const allItems = config.menu(menuProps);
+            $468dbc1019a115f1$var$populateMenuPaths(allItems, `/${menuId}`, '', menuId);
+            const items = isLoggedIn ? enableMenuSecurity ? $468dbc1019a115f1$var$filterEnabledItems(allItems, menuId, enabledMenus) : allItems : [];
+            return [
+                menuId,
+                {
+                    items: items,
+                    menuPathsDictionary: $468dbc1019a115f1$var$createMenuDictionary(items)
+                }
+            ];
+        }));
     }, [
-        menuContent,
+        menuConfig,
         client,
         setContent,
         setOpened,
         isLoggedIn,
         setIsLoggedIn,
         loggedInInfo,
-        menuId
+        theme,
+        enableMenuSecurity
     ]);
-    // MMC: returns an array of mantine SpotLightAction from items
-    const internal_actions = (0, $b4te3$react.useMemo)(()=>{
-        const baseActionProps = {
-            setContent: setContent,
-            setOpened: setOpened,
-            clearContent: true,
-            onActiveChange: setActiveID,
-            onSubitemActiveChange: setSubitemActiveID
-        };
-        const actionList = $468dbc1019a115f1$var$CreateSpotlightActions(internal_items, baseActionProps, searchMenuItemsWithContentOnly);
-        return actionList;
-    }, [
+    const menus = (0, $b4te3$react.useMemo)(()=>Object.fromEntries(menuIds.map((menuId)=>{
+            const materializedMenu = materializedMenus[menuId];
+            const baseActionProps = {
+                setContent: setContent,
+                setOpened: setOpened,
+                clearContent: true,
+                onActiveChange: activeSetters[menuId],
+                onSubitemActiveChange: subitemActiveSetters[menuId]
+            };
+            const result = {
+                activeIDState: [
+                    activeIds[menuId] ?? '',
+                    activeSetters[menuId]
+                ],
+                subitemActiveIDState: [
+                    subitemActiveIds[menuId] ?? '',
+                    subitemActiveSetters[menuId]
+                ],
+                items: materializedMenu.items,
+                actions: $468dbc1019a115f1$var$createSpotlightActions(materializedMenu.items, baseActionProps, searchMenuItemsWithContentOnly),
+                menuPathsDictionary: materializedMenu.menuPathsDictionary
+            };
+            return [
+                menuId,
+                result
+            ];
+        })), [
+        menuIds,
+        materializedMenus,
         setContent,
         setOpened,
-        setActiveID,
-        setSubitemActiveID,
-        internal_items,
+        activeIds,
+        activeSetters,
+        subitemActiveIds,
+        subitemActiveSetters,
         searchMenuItemsWithContentOnly
     ]);
-    // Menus are materialized when the login/security lifecycle changes. Keep the
-    // latest static definitions available without making rendering inputs effect triggers.
-    const internalItemsRef = (0, $b4te3$react.useRef)(internal_items);
-    const internalActionsRef = (0, $b4te3$react.useRef)(internal_actions);
-    internalItemsRef.current = internal_items;
-    internalActionsRef.current = internal_actions;
-    (0, $b4te3$react.useEffect)(()=>{
-        let mounted = true;
-        const get = async ()=>{
-            setIsLoading(true);
-            try {
-                const menuItems = internalItemsRef.current;
-                const menuActions = internalActionsRef.current;
-                if (isLoggedIn) {
-                    if (enableMenuSecurity) {
-                        const enabled = await client.getMenus();
-                        const enabled_items = $468dbc1019a115f1$var$filterEnabledItems(menuItems, menuId, enabled);
-                        const enabled_actions = menuActions.filter((item)=>enabled.has(`${menuId}_${item.id}`));
-                        if (!mounted) return;
-                        setMenuDictionary($468dbc1019a115f1$var$createMenuDictionary(enabled_items));
-                        setItems(enabled_items);
-                        setActions(enabled_actions);
-                    } else {
-                        if (!mounted) return;
-                        setMenuDictionary($468dbc1019a115f1$var$createMenuDictionary(menuItems));
-                        setItems(menuItems);
-                        setActions(menuActions);
-                    }
-                } else {
-                    if (!mounted) return;
-                    setItems([]);
-                    setActions([]);
-                    setMenuDictionary({});
-                }
-            } finally{
-                if (mounted) setIsLoading(false);
-            }
-        };
-        get();
-        return ()=>{
-            mounted = false;
-        };
-    }, [
-        client,
-        isLoggedIn,
-        menuId,
-        enableMenuSecurity
-    ]);
-    const result = (0, $b4te3$react.useMemo)(()=>({
-            activeIDState: activeIDState,
-            subitemActiveIDState: subitemActiveIDState,
-            items: items,
-            actions: actions,
-            menuPathsDictionary: menuDictionary,
-            isLoading: isLoading
+    return (0, $b4te3$react.useMemo)(()=>({
+            menus: menus,
+            mainMenuId: mainMenuId,
+            mainMenu: menus[mainMenuId]
         }), [
-        activeIDState,
-        subitemActiveIDState,
-        items,
-        actions,
-        menuDictionary,
-        isLoading
+        menus,
+        mainMenuId
     ]);
-    return result;
 }
 
 });