@pinnacle0/web-ui 0.4.8 → 0.4.9

package/admin/AdminApp/Menu.d.ts

@@ -1,54 +1,16 @@
-import React from "react";
-import { AdminAppContext } from "./context";
-import type { RouteComponentProps } from "react-router-dom";
-import "antd/es/menu/style";
+/// <reference types="react" />
 import type { NavigationGroupItem } from "../../util/AdminNavigationUtil";
-interface Props<Feature, Field> extends RouteComponentProps {
+import "antd/es/menu/style";
+interface Badges {
+    [key: string]: number;
+}
+interface Props<Feature, Field> {
     siteName: string;
     permissions: Feature[];
     superAdminPermission: Feature;
     navigationGroups: Array<NavigationGroupItem<Feature, Field>>;
     menuExpanded: boolean;
-    badges?: {
-        [key: string]: number;
-    };
-}
-interface State {
-    currentOpenedMenuKey: string | null;
-    currentSelectedMenuKey: string | null;
-}
-declare class RouterAwareMenu<Feature, Field> extends React.PureComponent<Props<Feature, Field>, State> {
-    static displayName: string;
-    static contextType: React.Context<import("./context").AdminAppContextType>;
-    context: React.ContextType<typeof AdminAppContext>;
-    private readonly soundEnabledKey;
-    constructor(props: Props<Feature, Field>);
-    componentDidUpdate(prevProps: Props<Feature, Field>): void;
-    /**
-     * Return true if any field of currentBadges > prevBadges.
-     */
-    shouldAlertNewBadge: (prevBadges: {
-        [key: string]: number;
-    }, currentBadges: {
-        [key: string]: number;
-    }) => boolean;
-    calculateTotalBadge: (badges: {
-        [key: string]: number;
-    }) => number;
-    calculateMenuKeyByURL: (prevBadges?: {
-        [key: string]: number;
-    } | undefined) => State;
-    onMenuOpenChange: (openKeys: string[]) => void;
-    renderMenuGroup: (groupItem: NavigationGroupItem<any, any>) => {
-        children: {
-            label: JSX.Element;
-            key: string;
-            onClick(): void;
-        }[];
-        label: JSX.Element;
-        key: string;
-    };
-    render(): JSX.Element;
+    badges?: Badges;
 }
-export declare const Menu: React.ComponentClass<Pick<Props<unknown, unknown>, "navigationGroups" | "siteName" | "permissions" | "superAdminPermission" | "menuExpanded" | "badges">, any> & import("react-router").WithRouterStatics<typeof RouterAwareMenu>;
+export declare function Menu<Feature, Field>({ siteName, permissions, superAdminPermission, navigationGroups, menuExpanded, badges }: Props<Feature, Field>): JSX.Element;
 export {};

package/admin/AdminApp/Menu.js

@@ -1,29 +1,3 @@
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -40,137 +14,139 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 import React from "react";
-import { withRouter } from "react-router-dom";
+import { useHistory, useLocation } from "react-router-dom";
 import AntMenu from "antd/es/menu";
 import { LocalStorageUtil } from "../../util/LocalStorageUtil";
 import { MediaUtil } from "../../util/MediaUtil";
 import { Badge } from "../../core/Badge";
-import { AdminAppContext } from "./context";
-import "antd/es/menu/style";
 import { AdminNavigationUtil } from "../../util/AdminNavigationUtil";
-var RouterAwareMenu = /** @class */ (function (_super) {
-    __extends(RouterAwareMenu, _super);
-    function RouterAwareMenu(props) {
-        var _this = _super.call(this, props) || this;
-        _this.soundEnabledKey = "admin-sound-enabled";
-        /**
-         * Return true if any field of currentBadges > prevBadges.
-         */
-        _this.shouldAlertNewBadge = function (prevBadges, currentBadges) {
-            var e_1, _a;
-            try {
-                for (var _b = __values(Object.entries(currentBadges)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var _d = __read(_c.value, 2), key = _d[0], badge = _d[1];
-                    if (prevBadges[key] === undefined || badge > prevBadges[key]) {
-                        return true;
-                    }
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-            return false;
-        };
-        _this.calculateTotalBadge = function (badges) {
-            var _a = _this.props, navigationGroups = _a.navigationGroups, permissions = _a.permissions, superAdminPermission = _a.superAdminPermission;
-            var totalCount = 0;
-            AdminNavigationUtil.groups(navigationGroups, permissions, superAdminPermission, false).forEach(function (_a) {
-                var modules = _a.modules;
-                modules.forEach(function (_) { return (totalCount += badges[_.url] || 0); });
-            });
-            return totalCount;
-        };
-        _this.calculateMenuKeyByURL = function (prevBadges) {
-            var _a;
-            var _b = _this.props, location = _b.location, menuExpanded = _b.menuExpanded, siteName = _b.siteName, badges = _b.badges, navigationGroups = _b.navigationGroups, permissions = _b.permissions, superAdminPermission = _b.superAdminPermission;
-            var allNavigationGroups = AdminNavigationUtil.groups(navigationGroups, permissions, superAdminPermission, true);
-            var currentOpenedMenuKey = ((_a = allNavigationGroups === null || allNavigationGroups === void 0 ? void 0 : allNavigationGroups[0]) === null || _a === void 0 ? void 0 : _a.title) || null; // Fallback opened key
-            var currentSelectedMenuKey = null;
-            var currentModule = AdminNavigationUtil.moduleByURL(location.pathname, navigationGroups, permissions, superAdminPermission);
-            var totalBadgeCount = badges ? _this.calculateTotalBadge(badges) : 0;
-            var titlePrefix = (totalBadgeCount > 0 ? "(".concat(totalBadgeCount, ") ") : "") + siteName;
-            var soundEnabled = LocalStorageUtil.getBool(_this.soundEnabledKey, true);
-            if (soundEnabled && prevBadges && badges && _this.shouldAlertNewBadge(prevBadges, badges)) {
-                MediaUtil.playAudio(require("./asset/alert.mp3"));
-            }
-            if (currentModule) {
-                var matchedGroup = allNavigationGroups.find(function (_) { return _.modules.includes(currentModule); });
-                if (matchedGroup) {
-                    currentOpenedMenuKey = matchedGroup.title;
-                    currentSelectedMenuKey = currentModule.url;
+import "antd/es/menu/style";
+var SOUND_ENABLED_KEY = "admin-sound-enabled";
+export function Menu(_a) {
+    var siteName = _a.siteName, permissions = _a.permissions, superAdminPermission = _a.superAdminPermission, navigationGroups = _a.navigationGroups, menuExpanded = _a.menuExpanded, badges = _a.badges;
+    var _b = __read(React.useState(null), 2), currentOpenedMenuKey = _b[0], setCurrentOpenedMenuKey = _b[1];
+    var _c = __read(React.useState(null), 2), currentSelectedMenuKey = _c[0], setCurrentSelectedMenuKey = _c[1];
+    var _d = __read(React.useState(undefined), 2), prevBadges = _d[0], setPrevBadges = _d[1];
+    var history = useHistory();
+    var location = useLocation();
+    var shownNavigationGroups = React.useMemo(function () { return AdminNavigationUtil.groups(navigationGroups, permissions, superAdminPermission, false); }, [navigationGroups, permissions, superAdminPermission]);
+    var modules = React.useMemo(function () { return AdminNavigationUtil.modules(shownNavigationGroups); }, [shownNavigationGroups]);
+    /**
+     * Return true if any field of currentBadges > prevBadges.
+     */
+    var shouldAlertNewBadge = React.useCallback(function (badges) {
+        var e_1, _a;
+        try {
+            for (var _b = __values(Object.entries(badges)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var _d = __read(_c.value, 2), key = _d[0], badge = _d[1];
+                if (prevBadges && (prevBadges[key] === undefined || badge > prevBadges[key])) {
+                    return true;
                 }
-                document.title = titlePrefix + " - " + currentModule.title;
-            }
-            else {
-                document.title = titlePrefix;
             }
-            if (!menuExpanded) {
-                currentOpenedMenuKey = null; // Otherwise, AntD will pop this menu
-            }
-            return { currentOpenedMenuKey: currentOpenedMenuKey, currentSelectedMenuKey: currentSelectedMenuKey };
-        };
-        _this.onMenuOpenChange = function (openKeys) {
-            var length = openKeys.length;
-            if (length === 0) {
-                _this.setState({ currentOpenedMenuKey: null });
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            else if (length === 1) {
-                _this.setState({ currentOpenedMenuKey: openKeys[0] });
+            finally { if (e_1) throw e_1.error; }
+        }
+        return false;
+    }, [prevBadges]);
+    var calculateTotalBadge = React.useCallback(function (badges) {
+        var totalCount = 0;
+        shownNavigationGroups.forEach(function (_a) {
+            var modules = _a.modules;
+            modules.forEach(function (_) { return (totalCount += badges[_.url] || 0); });
+        });
+        return totalCount;
+    }, [shownNavigationGroups]);
+    var calculateMenuKeyByURL = React.useCallback(function () {
+        var _a;
+        var currentOpenedMenuKey = ((_a = shownNavigationGroups === null || shownNavigationGroups === void 0 ? void 0 : shownNavigationGroups[0]) === null || _a === void 0 ? void 0 : _a.title) || null; // Fallback opened key
+        var currentSelectedMenuKey = null;
+        var currentModule = AdminNavigationUtil.moduleByURL(location.pathname, modules);
+        var totalBadgeCount = badges ? calculateTotalBadge(badges) : 0;
+        var titlePrefix = (totalBadgeCount > 0 ? "(".concat(totalBadgeCount, ") ") : "") + siteName;
+        var soundEnabled = LocalStorageUtil.getBool(SOUND_ENABLED_KEY, true);
+        if (soundEnabled && prevBadges && badges && shouldAlertNewBadge(badges)) {
+            MediaUtil.playAudio(require("./asset/alert.mp3"));
+        }
+        if (currentModule) {
+            var matchedGroup = shownNavigationGroups.find(function (_) { return _.modules.includes(currentModule); });
+            if (matchedGroup) {
+                currentOpenedMenuKey = matchedGroup.title;
+                currentSelectedMenuKey = currentModule.url;
             }
-            else {
-                var index = openKeys.indexOf(_this.state.currentOpenedMenuKey); // By logic, index should be 0/1 (length should be 2)
-                if (index >= 0) {
-                    _this.setState({ currentOpenedMenuKey: openKeys[length - 1 - index] });
-                }
+            document.title = titlePrefix + " - " + currentModule.title;
+        }
+        else {
+            document.title = titlePrefix;
+        }
+        if (!menuExpanded) {
+            currentOpenedMenuKey = null; // Otherwise, AntD will pop this menu
+        }
+        return { currentOpenedMenuKey: currentOpenedMenuKey, currentSelectedMenuKey: currentSelectedMenuKey };
+    }, [shownNavigationGroups, location, modules, badges, calculateTotalBadge, menuExpanded, prevBadges, shouldAlertNewBadge, siteName]);
+    var onMenuOpenChange = function (openKeys) {
+        var length = openKeys.length;
+        if (length === 0) {
+            setCurrentOpenedMenuKey(null);
+        }
+        else if (length === 1) {
+            setCurrentOpenedMenuKey(openKeys[0]);
+        }
+        else {
+            var index = openKeys.indexOf(currentOpenedMenuKey); // By logic, index should be 0/1 (length should be 2)
+            if (index >= 0) {
+                setCurrentOpenedMenuKey(openKeys[length - 1 - index]);
             }
-        };
-        _this.renderMenuGroup = function (groupItem) {
-            var _a = _this.props, history = _a.history, badges = _a.badges, menuExpanded = _a.menuExpanded;
-            var totalCount = 0;
-            var children = groupItem.modules.map(function (_a) {
-                var title = _a.title, url = _a.url;
-                var count = (badges === null || badges === void 0 ? void 0 : badges[url]) || 0;
-                totalCount += count;
-                return {
-                    label: React.createElement(Badge, { count: count }, title),
-                    key: url,
-                    onClick: function () {
-                        history.push(url);
-                    },
-                };
-            });
-            var label = (React.createElement(Badge, { count: totalCount },
-                groupItem.icon,
-                " ",
-                menuExpanded ? groupItem.title : ""));
+        }
+    };
+    var renderMenuGroup = function (groupItem) {
+        var totalCount = 0;
+        var children = groupItem.modules.map(function (_a) {
+            var title = _a.title, url = _a.url;
+            var count = (badges === null || badges === void 0 ? void 0 : badges[url]) || 0;
+            totalCount += count;
             return {
-                children: children,
-                label: label,
-                key: groupItem.title,
+                label: React.createElement(Badge, { count: count }, title),
+                key: url,
+                onClick: function () {
+                    history.push(url);
+                },
             };
+        });
+        var label = (React.createElement(Badge, { count: totalCount },
+            groupItem.icon,
+            " ",
+            menuExpanded ? groupItem.title : ""));
+        return {
+            children: children,
+            label: label,
+            key: groupItem.title,
         };
-        _this.state = _this.calculateMenuKeyByURL();
-        return _this;
-    }
-    RouterAwareMenu.prototype.componentDidUpdate = function (prevProps) {
-        var _a = this.props, location = _a.location, menuExpanded = _a.menuExpanded, badges = _a.badges;
-        if (prevProps.location.pathname !== location.pathname || prevProps.menuExpanded !== menuExpanded || prevProps.badges !== badges) {
-            this.setState(this.calculateMenuKeyByURL(prevProps.badges));
-        }
-    };
-    RouterAwareMenu.prototype.render = function () {
-        var _a = this.props, navigationGroups = _a.navigationGroups, permissions = _a.permissions, superAdminPermission = _a.superAdminPermission;
-        var _b = this.state, currentOpenedMenuKey = _b.currentOpenedMenuKey, currentSelectedMenuKey = _b.currentSelectedMenuKey;
-        return (React.createElement(AntMenu, { theme: "dark", mode: "inline", openKeys: currentOpenedMenuKey ? [currentOpenedMenuKey] : [], selectedKeys: currentSelectedMenuKey ? [currentSelectedMenuKey] : [], onOpenChange: this.onMenuOpenChange, items: AdminNavigationUtil.groups(navigationGroups, permissions, superAdminPermission, false).map(this.renderMenuGroup) }));
     };
-    RouterAwareMenu.displayName = "Menu";
-    RouterAwareMenu.contextType = AdminAppContext;
-    return RouterAwareMenu;
-}(React.PureComponent));
-export var Menu = withRouter(RouterAwareMenu);
+    React.useEffect(function () {
+        var _a = calculateMenuKeyByURL(), currentOpenedMenuKey = _a.currentOpenedMenuKey, currentSelectedMenuKey = _a.currentSelectedMenuKey;
+        setCurrentOpenedMenuKey(currentOpenedMenuKey);
+        setCurrentSelectedMenuKey(currentSelectedMenuKey);
+    }, [location.pathname, menuExpanded, badges, calculateMenuKeyByURL]);
+    React.useEffect(function () {
+        setPrevBadges(badges);
+    }, [badges]);
+    return (React.createElement(AntMenu, { theme: "dark", mode: "inline", openKeys: currentOpenedMenuKey ? [currentOpenedMenuKey] : [], selectedKeys: currentSelectedMenuKey ? [currentSelectedMenuKey] : [], onOpenChange: onMenuOpenChange, items: shownNavigationGroups.map(renderMenuGroup) }));
+}
 //# sourceMappingURL=Menu.js.map

package/admin/AdminApp/Menu.js.map

@@ -1 +1 @@
-{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../src/admin/AdminApp/Menu.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../src/admin/AdminApp/Menu.tsx"],"names":[],"mappings":"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"}

package/admin/AdminApp/Navigator.d.ts

@@ -1,32 +1,9 @@
-import React from "react";
-import type { RouteComponentProps } from "react-router-dom";
-import { AdminAppContext } from "./context";
-import type { NavigationGroupItem, NavigationModuleItem } from "../../util/AdminNavigationUtil";
-interface NavigatorTabItem {
-    url: string;
-    module: NavigationModuleItem<any, any>;
-    historyState?: any;
-    customTitle?: string | null;
-}
-interface Props<Feature, Field> extends RouteComponentProps {
+/// <reference types="react" />
+import type { NavigationGroupItem } from "../../util/AdminNavigationUtil";
+interface Props<Feature, Field> {
+    navigationGroups: Array<NavigationGroupItem<Feature, Field>>;
     permissions: Feature[];
     superAdminPermission: Feature;
-    navigationGroups: Array<NavigationGroupItem<Feature, Field>>;
-}
-interface State {
-    tabs: NavigatorTabItem[];
-}
-declare class RouterAwareNavigator<Feature, Field> extends React.PureComponent<Props<Feature, Field>, State> {
-    static displayName: string;
-    static contextType: React.Context<import("./context").AdminAppContextType>;
-    context: React.ContextType<typeof AdminAppContext>;
-    constructor(props: Props<Feature, Field>);
-    componentDidMount(): void;
-    componentDidUpdate(prevProps: Props<Feature, Field>): void;
-    computeIndexByURL: (url: string) => number;
-    onTabClose: (key: string | React.MouseEvent | React.KeyboardEvent) => void;
-    onTabChange: (url: string) => void;
-    render(): JSX.Element;
 }
-export declare const Navigator: React.ComponentClass<Pick<Props<unknown, unknown>, "navigationGroups" | "permissions" | "superAdminPermission">, any> & import("react-router").WithRouterStatics<typeof RouterAwareNavigator>;
+export declare function Navigator<Feature, Field>({ permissions, superAdminPermission, navigationGroups }: Props<Feature, Field>): JSX.Element;
 export {};

package/admin/AdminApp/Navigator.js

@@ -1,18 +1,3 @@
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -40,115 +25,87 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import React from "react";
 import { Tabs } from "../../core/Tabs";
-import { withRouter } from "react-router-dom";
+import { useHistory, useLocation } from "react-router-dom";
 import { AdminAppContext } from "./context";
 import { i18n } from "../../internal/i18n/admin";
 import { Spin } from "../../core/Spin";
 import { AdminNavigationUtil } from "../../util/AdminNavigationUtil";
-var RouterAwareNavigator = /** @class */ (function (_super) {
-    __extends(RouterAwareNavigator, _super);
-    function RouterAwareNavigator(props) {
-        var _this = _super.call(this, props) || this;
-        _this.computeIndexByURL = function (url) {
-            // If url is null, then use current URL
-            var _a = _this.props, navigationGroups = _a.navigationGroups, permissions = _a.permissions, superAdminPermission = _a.superAdminPermission;
-            var tabs = _this.state.tabs;
-            var matchedModule = AdminNavigationUtil.moduleByURL(url, navigationGroups, permissions, superAdminPermission);
-            if (matchedModule) {
-                if (matchedModule.separateTab) {
-                    return tabs.findIndex(function (_) { return _.url === url; });
-                }
-                else {
-                    return tabs.findIndex(function (_) { return _.module === matchedModule; });
-                }
+import { useDidMountEffect } from "../../hooks";
+export function Navigator(_a) {
+    var permissions = _a.permissions, superAdminPermission = _a.superAdminPermission, navigationGroups = _a.navigationGroups;
+    var _b = __read(React.useState([]), 2), tabs = _b[0], setTabs = _b[1];
+    var location = useLocation();
+    var history = useHistory();
+    var t = i18n();
+    var context = React.useContext(AdminAppContext);
+    var groups = React.useMemo(function () { return AdminNavigationUtil.groups(navigationGroups, permissions, superAdminPermission, true); }, [navigationGroups, permissions, superAdminPermission]);
+    var modules = React.useMemo(function () { return AdminNavigationUtil.modules(groups); }, [groups]);
+    var computeIndexByURL = React.useCallback(function (url, tabs) {
+        // If url is null, then use current URL
+        var matchedModule = AdminNavigationUtil.moduleByURL(url, modules);
+        if (matchedModule) {
+            if (matchedModule.separateTab) {
+                return tabs.findIndex(function (_) { return _.url === url; });
             }
             else {
-                return -1;
+                return tabs.findIndex(function (_) { return _.module === matchedModule; });
             }
-        };
-        _this.onTabClose = function (key) {
-            var _a = _this.props, history = _a.history, location = _a.location;
-            var tabs = _this.state.tabs;
-            var currentURL = location.pathname;
-            var closedURL = key;
-            var closedIndex = _this.computeIndexByURL(closedURL);
-            if (closedIndex >= 0) {
-                var newTabs = __spreadArray([], __read(tabs), false);
-                newTabs.splice(closedIndex, 1);
-                _this.setState({ tabs: newTabs });
-                if (currentURL === closedURL) {
-                    // Close current tab, then re-open the previous tab, or the first tab
-                    var followingItem = newTabs[closedIndex - 1];
-                    if (followingItem) {
-                        history.push(followingItem.url, followingItem.historyState);
-                    }
-                    else {
-                        history.push("/");
-                    }
+        }
+        else {
+            return -1;
+        }
+    }, [modules]);
+    var onTabClose = function (key) {
+        var currentURL = location.pathname;
+        var closedURL = key;
+        var closedIndex = computeIndexByURL(closedURL, tabs);
+        if (closedIndex >= 0) {
+            var newTabs = __spreadArray([], __read(tabs), false);
+            newTabs.splice(closedIndex, 1);
+            setTabs(newTabs);
+            if (currentURL === closedURL) {
+                // Close current tab, then re-open the previous tab, or the first tab
+                var followingItem = newTabs[closedIndex - 1];
+                if (followingItem) {
+                    history.push(followingItem.url, followingItem.historyState);
+                }
+                else {
+                    history.push("/");
                 }
             }
-        };
-        _this.onTabChange = function (url) {
-            var history = _this.props.history;
-            var index = _this.computeIndexByURL(url);
-            if (index >= 0) {
-                // Trigger URL change, then the flow will go to componentDidUpdate
-                var existedItem = _this.state.tabs[index];
-                history.push(existedItem.url, existedItem.historyState);
-            }
-            else {
-                // Open homepage tab
-                history.push("/");
-            }
-        };
-        _this.state = { tabs: [] };
-        return _this;
-    }
-    RouterAwareNavigator.prototype.componentDidMount = function () {
-        var _this = this;
+        }
+    };
+    var onTabChange = function (url) {
+        var index = computeIndexByURL(url, tabs);
+        if (index >= 0) {
+            // Trigger URL change, then the flow will go to componentDidUpdate
+            var existedItem = tabs[index];
+            history.push(existedItem.url, existedItem.historyState);
+        }
+        else {
+            // Open homepage tab
+            history.push("/");
+        }
+    };
+    useDidMountEffect(function () {
         // Register context
-        this.context.registerTitleUpdater(function (title) {
-            var url = _this.props.location.pathname;
-            var index = _this.computeIndexByURL(url);
+        context.registerTitleUpdater(function (title) {
+            var url = location.pathname;
+            var index = computeIndexByURL(url, tabs);
             if (index >= 0) {
-                var newTabs = __spreadArray([], __read(_this.state.tabs), false);
+                var newTabs = __spreadArray([], __read(tabs), false);
                 newTabs[index].customTitle = title;
-                _this.setState({ tabs: newTabs });
+                setTabs(newTabs);
             }
         });
-        // Create initial tab, unless homepage or 404
-        var _a = this.props, location = _a.location, navigationGroups = _a.navigationGroups, permissions = _a.permissions, superAdminPermission = _a.superAdminPermission;
-        var url = location.pathname;
-        var targetModule = AdminNavigationUtil.moduleByURL(url, navigationGroups, permissions, superAdminPermission);
-        if (targetModule) {
-            this.setState({
-                tabs: [
-                    {
-                        url: url,
-                        module: targetModule,
-                        historyState: location.state,
-                    },
-                ],
-            });
-        }
-    };
-    RouterAwareNavigator.prototype.componentDidUpdate = function (prevProps) {
-        if (prevProps.location !== this.props.location) {
-            var tabs = this.state.tabs;
+    });
+    React.useEffect(function () {
+        setTabs(function (tabs) {
             var newTabs = __spreadArray([], __read(tabs), false);
-            // Save the previous tab (both URL and history state)
-            var prevURL = prevProps.location.pathname;
-            var prevHistoryState = prevProps.location.state;
-            var prevItemIndex = this.computeIndexByURL(prevURL);
-            if (prevItemIndex >= 0) {
-                newTabs[prevItemIndex].url = prevURL;
-                newTabs[prevItemIndex].historyState = prevHistoryState;
-            }
-            // Then determine whether create a new tab, or update the existing tab
-            var _a = this.props, location_1 = _a.location, navigationGroups = _a.navigationGroups, permissions = _a.permissions, superAdminPermission = _a.superAdminPermission;
-            var newURL = location_1.pathname;
-            var newHistoryState = location_1.state;
-            var newIndex = this.computeIndexByURL(newURL);
+            // Determine whether create a new tab, or update the existing tab
+            var newURL = location.pathname;
+            var newHistoryState = location.state;
+            var newIndex = computeIndexByURL(newURL, newTabs);
             if (newIndex >= 0) {
                 // Update the existing tab
                 newTabs[newIndex].url = newURL;
@@ -157,7 +114,7 @@ var RouterAwareNavigator = /** @class */ (function (_super) {
             else {
                 // If module exists, create a new tab
                 // Else, it means, the user goes to the homepage tab, so just do nothing
-                var targetModule = AdminNavigationUtil.moduleByURL(newURL, navigationGroups, permissions, superAdminPermission);
+                var targetModule = AdminNavigationUtil.moduleByURL(newURL, modules);
                 if (targetModule) {
                     newTabs.push({
                         url: newURL,
@@ -166,36 +123,26 @@ var RouterAwareNavigator = /** @class */ (function (_super) {
                     });
                 }
             }
-            // Finalize the component state
-            this.setState({ tabs: newTabs });
-        }
-    };
-    RouterAwareNavigator.prototype.render = function () {
-        var location = this.props.location;
-        var tabs = this.state.tabs;
-        var t = i18n();
-        return (React.createElement(Tabs, { className: "navigator-bar", hideAdd: true, onEdit: this.onTabClose, type: "editable-card", activeKey: location.pathname, onChange: this.onTabChange },
-            React.createElement(Tabs.TabPane, { tab: t.homePageTitle, key: "/", closable: false }),
-            tabs.map(function (_a) {
-                var customTitle = _a.customTitle, url = _a.url, module = _a.module;
-                var tab;
-                if (customTitle) {
-                    tab = customTitle;
-                }
-                else if (module.separateTab) {
-                    tab = (React.createElement(React.Fragment, null,
-                        module.title,
-                        React.createElement(Spin, { spinning: true, size: "small" })));
-                }
-                else {
-                    tab = module.title;
-                }
-                return React.createElement(Tabs.TabPane, { tab: tab, key: url, closable: true });
-            })));
-    };
-    RouterAwareNavigator.displayName = "Navigator";
-    RouterAwareNavigator.contextType = AdminAppContext;
-    return RouterAwareNavigator;
-}(React.PureComponent));
-export var Navigator = withRouter(RouterAwareNavigator);
+            return newTabs;
+        });
+    }, [location, modules, computeIndexByURL]);
+    return (React.createElement(Tabs, { className: "navigator-bar", hideAdd: true, onEdit: onTabClose, type: "editable-card", activeKey: location.pathname, onChange: onTabChange },
+        React.createElement(Tabs.TabPane, { tab: t.homePageTitle, key: "/", closable: false }),
+        tabs.map(function (_a) {
+            var customTitle = _a.customTitle, url = _a.url, module = _a.module;
+            var tab;
+            if (customTitle) {
+                tab = customTitle;
+            }
+            else if (module.separateTab) {
+                tab = (React.createElement(React.Fragment, null,
+                    module.title,
+                    React.createElement(Spin, { spinning: true, size: "small" })));
+            }
+            else {
+                tab = module.title;
+            }
+            return React.createElement(Tabs.TabPane, { tab: tab, key: url, closable: true });
+        })));
+}
 //# sourceMappingURL=Navigator.js.map

package/admin/AdminApp/Navigator.js.map

@@ -1 +1 @@
-{"version":3,"file":"Navigator.js","sourceRoot":"","sources":["../../../src/admin/AdminApp/Navigator.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Navigator.js","sourceRoot":"","sources":["../../../src/admin/AdminApp/Navigator.tsx"],"names":[],"mappings":"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"}

package/admin/AdminApp/RouteSwitch.js

@@ -43,7 +43,8 @@ var RouteSwitch = /** @class */ (function (_super) {
             return (React.createElement(AdminPage, null,
                 React.createElement(AdminPage.Result, { type: "success", title: TextUtil.interpolate(t.welcome, name), subtitle: t.homePageSubtitle, hideButton: true })));
         };
-        _this.navigationModules = AdminNavigationUtil.modules(props.navigationGroups, props.permissions, props.superAdminPermission);
+        var enabledNavigationGroups = AdminNavigationUtil.groups(props.navigationGroups, props.permissions, props.superAdminPermission, false);
+        _this.navigationModules = AdminNavigationUtil.modules(enabledNavigationGroups);
         return _this;
     }
     RouteSwitch.prototype.render = function () {

package/admin/AdminApp/RouteSwitch.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouteSwitch.js","sourceRoot":"","sources":["../../../src/admin/AdminApp/RouteSwitch.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,mBAAmB,EAAC,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EAAC,KAAK,EAAE,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,IAAI,EAAC,MAAM,2BAA2B,CAAC;AAC/C,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAC,eAAe,EAAC,MAAM,WAAW,CAAC;AAW1C;IAAiD,+BAA0C;IAOvF,qBAAY,KAA4B;QAAxC,YACI,kBAAM,KAAK,CAAC,SAEf;QAED,mBAAa,GAAG;YACL,IAAA,IAAI,GAAI,KAAI,CAAC,OAAO,KAAhB,CAAiB;YAC5B,IAAM,CAAC,GAAG,IAAI,EAAE,CAAC;YACjB,OAAO,CACH,oBAAC,SAAS;gBACN,oBAAC,SAAS,CAAC,MAAM,IAAC,IAAI,EAAC,SAAS,EAAC,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,gBAAgB,EAAE,UAAU,SAAG,CAClH,CACf,CAAC;QACN,CAAC,CAAC;QAXE,KAAI,CAAC,iBAAiB,GAAG,mBAAmB,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;;IAChI,CAAC;IAYD,4BAAM,GAAN;QACU,IAAA,KAAmD,IAAI,CAAC,KAAK,EAA5D,gBAAgB,sBAAA,EAAE,gBAAgB,sBAAA,EAAE,UAAU,gBAAc,CAAC;QACpE,OAAO,CACH,oBAAC,MAAM;YACH,oBAAC,KAAK,IAAC,KAAK,QAAC,IAAI,EAAC,GAAG,EAAC,SAAS,EAAE,gBAAgB,IAAI,IAAI,CAAC,aAAa,GAAI;YAC1E,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAC,EAAgD;oBAA/C,GAAG,SAAA,EAAE,UAAU,gBAAA,EAAiB,cAAc,mBAAA;gBAAM,OAAA,CAC9E,oBAAC,KAAK,IACF,KAAK,QACL,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,EACzC,SAAS,EAAE,UAAC,KAAU,IAAK,OAAA,CACvB,oBAAC,iBAAiB,IAAC,gBAAgB,EAAE,gBAAgB;wBACjD,oBAAC,cAAc,eAAK,KAAK,EAAI,CACb,CACvB,EAJ0B,CAI1B,GACH,CACL;YAXiF,CAWjF,CAAC;YACF,oBAAC,KAAK,IAAC,SAAS,EAAE,cAAM,OAAA,oBAAC,QAAQ,IAAC,UAAU,EAAE,UAAU,GAAI,EAApC,CAAoC,GAAI,CAC3D,CACZ,CAAC;IACN,CAAC;IAzCM,uBAAW,GAAG,aAAa,CAAC;IAC5B,uBAAW,GAAG,eAAe,CAAC;IAyCzC,kBAAC;CAAA,AA3CD,CAAiD,KAAK,CAAC,aAAa,GA2CnE;SA3CY,WAAW"}
+{"version":3,"file":"RouteSwitch.js","sourceRoot":"","sources":["../../../src/admin/AdminApp/RouteSwitch.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,mBAAmB,EAAC,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EAAC,KAAK,EAAE,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,IAAI,EAAC,MAAM,2BAA2B,CAAC;AAC/C,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAC,eAAe,EAAC,MAAM,WAAW,CAAC;AAW1C;IAAiD,+BAA0C;IAOvF,qBAAY,KAA4B;QAAxC,YACI,kBAAM,KAAK,CAAC,SAGf;QAED,mBAAa,GAAG;YACL,IAAA,IAAI,GAAI,KAAI,CAAC,OAAO,KAAhB,CAAiB;YAC5B,IAAM,CAAC,GAAG,IAAI,EAAE,CAAC;YACjB,OAAO,CACH,oBAAC,SAAS;gBACN,oBAAC,SAAS,CAAC,MAAM,IAAC,IAAI,EAAC,SAAS,EAAC,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,gBAAgB,EAAE,UAAU,SAAG,CAClH,CACf,CAAC;QACN,CAAC,CAAC;QAZE,IAAM,uBAAuB,GAAG,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;QACzI,KAAI,CAAC,iBAAiB,GAAG,mBAAmB,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;;IAClF,CAAC;IAYD,4BAAM,GAAN;QACU,IAAA,KAAmD,IAAI,CAAC,KAAK,EAA5D,gBAAgB,sBAAA,EAAE,gBAAgB,sBAAA,EAAE,UAAU,gBAAc,CAAC;QACpE,OAAO,CACH,oBAAC,MAAM;YACH,oBAAC,KAAK,IAAC,KAAK,QAAC,IAAI,EAAC,GAAG,EAAC,SAAS,EAAE,gBAAgB,IAAI,IAAI,CAAC,aAAa,GAAI;YAC1E,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAC,EAAgD;oBAA/C,GAAG,SAAA,EAAE,UAAU,gBAAA,EAAiB,cAAc,mBAAA;gBAAM,OAAA,CAC9E,oBAAC,KAAK,IACF,KAAK,QACL,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,EACzC,SAAS,EAAE,UAAC,KAAU,IAAK,OAAA,CACvB,oBAAC,iBAAiB,IAAC,gBAAgB,EAAE,gBAAgB;wBACjD,oBAAC,cAAc,eAAK,KAAK,EAAI,CACb,CACvB,EAJ0B,CAI1B,GACH,CACL;YAXiF,CAWjF,CAAC;YACF,oBAAC,KAAK,IAAC,SAAS,EAAE,cAAM,OAAA,oBAAC,QAAQ,IAAC,UAAU,EAAE,UAAU,GAAI,EAApC,CAAoC,GAAI,CAC3D,CACZ,CAAC;IACN,CAAC;IA1CM,uBAAW,GAAG,aAAa,CAAC;IAC5B,uBAAW,GAAG,eAAe,CAAC;IA0CzC,kBAAC;CAAA,AA5CD,CAAiD,KAAK,CAAC,aAAa,GA4CnE;SA5CY,WAAW"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinnacle0/web-ui",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "author": "Pinnacle",
   "license": "MIT",
   "sideEffects": [
@@ -51,8 +51,8 @@
     "react-dom": "18.2.0",
     "react-router-dom": "5.3.0",
     "typescript": "4.9.4",
-    "@pinnacle0/webpack-util": "0.3.42",
-    "@pinnacle0/devtool-util": "1.1.5"
+    "@pinnacle0/devtool-util": "1.1.5",
+    "@pinnacle0/webpack-util": "0.3.42"
   },
   "publishConfig": {
     "directory": "build"

package/util/AdminNavigationUtil.d.ts

@@ -48,8 +48,8 @@ export interface NavigationGroupItem<Feature, Field = never> {
     modules: Array<NavigationModuleItem<Feature, Field>>;
 }
 export declare class AdminNavigationUtil {
-    static groups<Feature, Field>(navigationGroupItems: NavigationGroupItem<Feature, Field>[], permissions: Feature[], superAdminPermission: Feature, showHidden: boolean): Array<NavigationGroupItem<Feature, Field>>;
-    static modules<Feature, Field>(navigationGroupItems: NavigationGroupItem<Feature, Field>[], permissions: Feature[], superAdminPermission: Feature): Array<NavigationModuleItem<Feature, Field>>;
-    static moduleByURL<Feature, Field>(url: string, navigationGroupItems: NavigationGroupItem<Feature, Field>[], permissions: Feature[], superAdminPermission: Feature): NavigationModuleItem<Feature, Field> | undefined;
+    static groups<Feature, Field>(navigationGroupItems: Array<NavigationGroupItem<Feature, Field>>, permissions: Feature[], superAdminPermission: Feature, showHidden: boolean): Array<NavigationGroupItem<Feature, Field>>;
+    static modules<Feature, Field>(navigationGroupItems: NavigationGroupItem<Feature, Field>[]): Array<NavigationModuleItem<Feature, Field>>;
+    static moduleByURL<Feature, Field>(url: string, modules: Array<NavigationModuleItem<Feature, Field>>): NavigationModuleItem<Feature, Field> | undefined;
     private static canAccessModule;
 }

package/util/AdminNavigationUtil.js

@@ -9,15 +9,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -44,7 +35,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 import { matchPath } from "react-router-dom";
-import { Memo } from "../internal/Memo";
 var AdminNavigationUtil = /** @class */ (function () {
     function AdminNavigationUtil() {
     }
@@ -56,12 +46,12 @@ var AdminNavigationUtil = /** @class */ (function () {
         })
             .filter(function (_) { return _; });
     };
-    AdminNavigationUtil.modules = function (navigationGroupItems, permissions, superAdminPermission) {
+    AdminNavigationUtil.modules = function (navigationGroupItems) {
         var list = [];
-        AdminNavigationUtil.groups(navigationGroupItems, permissions, superAdminPermission, true).forEach(function (_) { return list.push.apply(list, __spreadArray([], __read(_.modules), false)); });
+        navigationGroupItems.forEach(function (_) { return list.push.apply(list, __spreadArray([], __read(_.modules), false)); });
         return list;
     };
-    AdminNavigationUtil.moduleByURL = function (url, navigationGroupItems, permissions, superAdminPermission) {
+    AdminNavigationUtil.moduleByURL = function (url, modules) {
         var isMatched = function (item) {
             return matchPath(url, {
                 path: item.routeParam ? item.url + item.routeParam : item.url,
@@ -69,24 +59,11 @@ var AdminNavigationUtil = /** @class */ (function () {
                 strict: false,
             }) !== null;
         };
-        return AdminNavigationUtil.modules(navigationGroupItems, permissions, superAdminPermission).find(isMatched);
+        return modules.find(isMatched);
     };
     AdminNavigationUtil.canAccessModule = function (module, permissions, superAdminPermission) {
         return permissions.includes(superAdminPermission) || !module.featurePermissions || module.featurePermissions.some(function (_) { return permissions.includes(_); });
     };
-    var _a, _b;
-    __decorate([
-        Memo(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Array, Array, typeof (_a = typeof Feature !== "undefined" && Feature) === "function" ? _a : Object, Boolean]),
-        __metadata("design:returntype", Array)
-    ], AdminNavigationUtil, "groups", null);
-    __decorate([
-        Memo(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Array, Array, typeof (_b = typeof Feature !== "undefined" && Feature) === "function" ? _b : Object]),
-        __metadata("design:returntype", Array)
-    ], AdminNavigationUtil, "modules", null);
     return AdminNavigationUtil;
 }());
 export { AdminNavigationUtil };

package/util/AdminNavigationUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"AdminNavigationUtil.js","sourceRoot":"","sources":["../../src/util/AdminNavigationUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAC,IAAI,EAAC,MAAM,kBAAkB,CAAC;AAoDtC;IAAA;IA2CA,CAAC;IAzCU,0BAAM,GAAN,UACH,oBAA2D,EAC3D,WAAsB,EACtB,oBAA6B,EAC7B,UAAmB;QAEnB,OAAO,oBAAoB;aACtB,GAAG,CAAC,UAAA,CAAC;YACF,IAAM,gBAAgB,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CACrC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,OAAO,KAAK,UAAU,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC,IAAI,mBAAmB,CAAC,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,oBAAoB,CAAC,EAA9J,CAA8J,CAC3K,CAAC;YACF,OAAO,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,uBAAK,CAAC,KAAE,OAAO,EAAE,gBAAgB,IAAE,CAAC,CAAC,IAAI,CAAC;QAClF,CAAC,CAAC;aACD,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,EAAD,CAAC,CAA+C,CAAC;IACtE,CAAC;IAGM,2BAAO,GAAP,UAAwB,oBAA2D,EAAE,WAAsB,EAAE,oBAA6B;QAC7I,IAAM,IAAI,GAAgD,EAAE,CAAC;QAC7D,mBAAmB,CAAC,MAAM,CAAC,oBAAoB,EAAE,WAAW,EAAE,oBAAoB,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,UAAA,CAAC,IAAI,OAAA,IAAI,CAAC,IAAI,OAAT,IAAI,2BAAS,CAAC,CAAC,OAAO,YAAtB,CAAuB,CAAC,CAAC;QAChI,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,+BAAW,GAAlB,UACI,GAAW,EACX,oBAA2D,EAC3D,WAAsB,EACtB,oBAA6B;QAE7B,IAAM,SAAS,GAAG,UAAC,IAA0C;YACzD,OAAA,SAAS,CAAC,GAAG,EAAE;gBACX,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG;gBAC7D,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,KAAK;aAChB,CAAC,KAAK,IAAI;QAJX,CAIW,CAAC;QAChB,OAAO,mBAAmB,CAAC,OAAO,CAAC,oBAAoB,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAChH,CAAC;IAEc,mCAAe,GAA9B,UAA+C,MAA4C,EAAE,WAAsB,EAAE,oBAA6B;QAC9I,OAAO,WAAW,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAvB,CAAuB,CAAC,CAAC;IACpJ,CAAC;;IAxCM;QADN,IAAI,EAAE;;2EAImB,OAAO,oBAAP,OAAO;wCAE9B,KAAK;2CASP;IAGM;QADN,IAAI,EAAE;;2EACmI,OAAO,oBAAP,OAAO;wCAAG,KAAK;4CAIxJ;IAoBL,0BAAC;CAAA,AA3CD,IA2CC;SA3CY,mBAAmB"}
+{"version":3,"file":"AdminNavigationUtil.js","sourceRoot":"","sources":["../../src/util/AdminNavigationUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAC;AAoD3C;IAAA;IAoCA,CAAC;IAnCU,0BAAM,GAAb,UACI,oBAAgE,EAChE,WAAsB,EACtB,oBAA6B,EAC7B,UAAmB;QAEnB,OAAO,oBAAoB;aACtB,GAAG,CAAC,UAAA,CAAC;YACF,IAAM,gBAAgB,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CACrC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,OAAO,KAAK,UAAU,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC,IAAI,mBAAmB,CAAC,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,oBAAoB,CAAC,EAA9J,CAA8J,CAC3K,CAAC;YACF,OAAO,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,uBAAK,CAAC,KAAE,OAAO,EAAE,gBAAgB,IAAE,CAAC,CAAC,IAAI,CAAC;QAClF,CAAC,CAAC;aACD,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,EAAD,CAAC,CAA+C,CAAC;IACtE,CAAC;IAEM,2BAAO,GAAd,UAA+B,oBAA2D;QACtF,IAAM,IAAI,GAAgD,EAAE,CAAC;QAC7D,oBAAoB,CAAC,OAAO,CAAC,UAAA,CAAC,IAAI,OAAA,IAAI,CAAC,IAAI,OAAT,IAAI,2BAAS,CAAC,CAAC,OAAO,YAAtB,CAAuB,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,+BAAW,GAAlB,UAAmC,GAAW,EAAE,OAAoD;QAChG,IAAM,SAAS,GAAG,UAAC,IAA0C;YACzD,OAAA,SAAS,CAAC,GAAG,EAAE;gBACX,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG;gBAC7D,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,KAAK;aAChB,CAAC,KAAK,IAAI;QAJX,CAIW,CAAC;QAChB,OAAO,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IAEc,mCAAe,GAA9B,UAA+C,MAA4C,EAAE,WAAsB,EAAE,oBAA6B;QAC9I,OAAO,WAAW,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAvB,CAAuB,CAAC,CAAC;IACpJ,CAAC;IACL,0BAAC;AAAD,CAAC,AApCD,IAoCC"}