@antscorp/antsomi-ui 2.0.13 → 2.0.15

package/es/components/organism/LeftMenu/index.d.ts

@@ -23,4 +23,4 @@ export interface LeftMenuProps {
     onClickLogo?: () => void;
     onActiveMenuCodeChange?: (activeItemPath: TFeatureMenu[], flattenPermissionList?: FeatureMenuPermission[], menuListPermission?: FeatureMenuPermission[]) => void;
 }
-export declare const LeftMenu: React.MemoExoticComponent<(props: LeftMenuProps) => React.JSX.Element | null>;
+export declare const LeftMenu: React.MemoExoticComponent<(props: LeftMenuProps) => import("react/jsx-runtime").JSX.Element | null>;

package/es/components/organism/LeftMenu/index.js

@@ -1,6 +1,7 @@
+import { jsx as _jsx } from "react/jsx-runtime";
 /* eslint-disable react/function-component-definition */
 // Libraries
-import React, { memo, useRef } from 'react';
+import { memo, useRef } from 'react';
 import isEqual from 'react-fast-compare';
 import { CookiesProvider } from 'react-cookie';
 // Providers
@@ -16,7 +17,5 @@ export const LeftMenu = memo((props) => {
     }
     if (!storeRef.current)
         return null;
-    return (React.createElement(LeftMenuProvider, { store: storeRef.current },
-        React.createElement(CookiesProvider, null,
-            React.createElement(LeftMenuComponent, Object.assign({}, props)))));
+    return (_jsx(LeftMenuProvider, { store: storeRef.current, children: _jsx(CookiesProvider, { children: _jsx(LeftMenuComponent, { ...props }) }) }));
 }, (prevProps, nextProps) => isEqual(prevProps, nextProps));

package/es/components/organism/LeftMenu/providers/index.js

@@ -1,8 +1,7 @@
-// Libraries
-import React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 // Contexts
 import { LeftMenuContext } from '../contexts';
 export const LeftMenuProvider = props => {
     const { children, store } = props;
-    return React.createElement(LeftMenuContext.Provider, { value: store }, children);
+    return _jsx(LeftMenuContext.Provider, { value: store, children: children });
 };

package/es/components/organism/LeftMenu/stores/index.js

@@ -18,4 +18,8 @@ const DEFAULT_PROPS = {
         isGrouped: DASHBOARD_MODULE_CONFIG.isGrouped,
     },
 };
-export const createLeftMenuStore = (initProps) => createStore()(set => (Object.assign(Object.assign(Object.assign({}, DEFAULT_PROPS), initProps), { setState: newState => set(state => (Object.assign(Object.assign({}, state), newState))) })));
+export const createLeftMenuStore = (initProps) => createStore()(set => ({
+    ...DEFAULT_PROPS,
+    ...initProps,
+    setState: newState => set(state => ({ ...state, ...newState })),
+}));

package/es/components/organism/LeftMenu/styled.js

@@ -5,7 +5,7 @@ import { globalToken } from '@antscorp/antsomi-ui/es/constants';
 import { HEADER_HEIGHT } from '../../molecules/HeaderV2/constants';
 import { ICON_SIZE } from './constants';
 // Components
-import { Flex } from '../../atoms';
+import { Flex } from '@antscorp/antsomi-ui/es/components/atoms/Flex';
 const { bw8, bw3, borderRadiusXL, blue1_2, blue7 } = globalToken || {};
 export const IconWrapper = styled.div `
   width: 30px;
@@ -166,7 +166,7 @@ export const FeatureMenuItem = styled.div `
     }
 
     .menu-item__icon {
-      color: ${globalToken === null || globalToken === void 0 ? void 0 : globalToken.bw8};
+      color: ${globalToken?.bw8};
       margin-bottom: 3px;
     }
 

package/es/components/organism/LeftMenu/utils/index.js

@@ -1,16 +1,6 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
+import { jsx as _jsx } from "react/jsx-runtime";
 // Libraries
-import React, { Suspense } from 'react';
+import { Suspense } from 'react';
 import { cloneDeep, isArray, isEmpty, isNil, sortBy } from 'lodash';
 // Components
 import { LazyIcon as Icons } from '@antscorp/antsomi-ui/es/components/icons/LazyIcon';
@@ -34,8 +24,14 @@ const PATH = 'src/components/organism/LeftMenu/utils/index.ts';
  * @returns {TMenuItem} The converted menu item.
  */
 export const getMenuItem = (featureMenu) => {
-    const { menu_item_code, component_icon_name, menu_item_name, children, icon_name } = featureMenu, restOfFeatureMenu = __rest(featureMenu, ["menu_item_code", "component_icon_name", "menu_item_name", "children", "icon_name"]);
-    return Object.assign({ key: menu_item_code, label: menu_item_name, icon: component_icon_name || icon_name, children: children === null || children === void 0 ? void 0 : children.map(item => getMenuItem(item)) }, restOfFeatureMenu);
+    const { menu_item_code, component_icon_name, menu_item_name, children, icon_name, ...restOfFeatureMenu } = featureMenu;
+    return {
+        key: menu_item_code,
+        label: menu_item_name,
+        icon: component_icon_name || icon_name,
+        children: children?.map(item => getMenuItem(item)),
+        ...restOfFeatureMenu,
+    };
 };
 /**
  * Flatten a nested array of menu items by flatten @alias childKey into a single-level array.
@@ -51,8 +47,12 @@ export const flattenMenuArray = (menuItems, childKey, parentAppCode) => {
         if (!!item.app_code && APP_EXCLUDED_KEYS.includes(item.app_code)) {
             continue;
         }
-        const children = (item === null || item === void 0 ? void 0 : item[childKey]) || [];
-        result.push(Object.assign(Object.assign(Object.assign({}, item), (parentAppCode ? { parent_app_code: parentAppCode } : {})), { [childKey]: [] }));
+        const children = item?.[childKey] || [];
+        result.push({
+            ...item,
+            ...(parentAppCode ? { parent_app_code: parentAppCode } : {}),
+            [childKey]: [],
+        });
         if (children.length > 0) {
             result = [...result, ...flattenMenuArray(children, childKey, item.app_code)];
         }
@@ -64,12 +64,12 @@ export const flattenMenuArray = (menuItems, childKey, parentAppCode) => {
  * check permission if menu item has menu_type of @alias MENU_ITEM_TYPE.MENU
  */
 export const recursivePermissionMenu = (menuItems, menuPermissions) => {
-    var _a, _b;
-    const menu = (_b = (_a = menuItems === null || menuItems === void 0 ? void 0 : menuItems.filter(({ permission_code, menu_item_type, menu_item_code }) => {
+    const menu = menuItems
+        ?.filter(({ permission_code, menu_item_type, menu_item_code }) => {
         if (Number(menu_item_type) !== MENU_ITEM_TYPE.MENU) {
             return true;
         }
-        return !!(menuPermissions === null || menuPermissions === void 0 ? void 0 : menuPermissions.find(({ menu_code = '', parent_app_code }) => {
+        return !!menuPermissions?.find(({ menu_code = '', parent_app_code }) => {
             if (permission_code) {
                 const parentAppCode = MAP_MENU_TO_PARENT_APP_CODE[menu_item_code];
                 // If parent app code is exist in the MAP_MENU_TO_PARENT_APP_CODE then check with parent app code
@@ -80,12 +80,17 @@ export const recursivePermissionMenu = (menuItems, menuPermissions) => {
                 return [menu_code].includes(permission_code);
             }
             return false;
-        }));
-    })) === null || _a === void 0 ? void 0 : _a.map(item => (Object.assign(Object.assign({}, item), (isArray(item.children)
-        ? {
-            children: recursivePermissionMenu(sortBy(item.children || [], ['level_position']), menuPermissions),
-        }
-        : {}))))) === null || _b === void 0 ? void 0 : _b.filter(item => !(isArray(item.children) && isEmpty(item.children)));
+        });
+    })
+        ?.map(item => ({
+        ...item,
+        ...(isArray(item.children)
+            ? {
+                children: recursivePermissionMenu(sortBy(item.children || [], ['level_position']), menuPermissions),
+            }
+            : {}),
+    }))
+        ?.filter(item => !(isArray(item.children) && isEmpty(item.children)));
     return menu;
 };
 /**
@@ -96,11 +101,11 @@ export const getGeneratePath = (path, params) => {
     try {
         const { portalId, userId, dashboardId, channelId } = params || {};
         const paramsObjects = {
-            user_id: userId !== null && userId !== void 0 ? userId : '-1',
-            networkId: portalId !== null && portalId !== void 0 ? portalId : -1,
-            portalId: portalId !== null && portalId !== void 0 ? portalId : -1,
-            dashboardId: dashboardId !== null && dashboardId !== void 0 ? dashboardId : '-1',
-            channelId: channelId !== null && channelId !== void 0 ? channelId : -1,
+            user_id: userId ?? '-1',
+            networkId: portalId ?? -1,
+            portalId: portalId ?? -1,
+            dashboardId: dashboardId ?? '-1',
+            channelId: channelId ?? -1,
         };
         Object.keys(paramsObjects).forEach(key => {
             path = path.replace(`:${key}`, paramsObjects[key]);
@@ -121,12 +126,11 @@ export const getGeneratePath = (path, params) => {
  * the purpose of which is to compare with the url to activate the app
  */
 export const getComparePath = (path, env) => {
-    var _a;
     if (env !== ENV.DEV) {
         return path;
     }
-    if (path === null || path === void 0 ? void 0 : path.includes('#')) {
-        const customPath = ((_a = path === null || path === void 0 ? void 0 : path.split('#')) === null || _a === void 0 ? void 0 : _a[1]) || '';
+    if (path?.includes('#')) {
+        const customPath = path?.split('#')?.[1] || '';
         return customPath;
     }
     return path;
@@ -136,8 +140,43 @@ export const getComparePath = (path, env) => {
  * @param {Partial<TFeatureMenu>} featureMenuItem - The partial feature menu item object.
  * @returns {TFeatureMenu} The initial feature menu item object.
  */
-export const getInitialFeatureMenuItem = (featureMenuItem) => (Object.assign({ menu_item: '', network_id: -1, menu_item_name: '', component_icon_name: null, level_position: 0, icon_name: null, menu_item_path: null, menu_item_code: '', permission_code: null, menu_item_type: 3, menu_item_parent: 0, render_option: null, menu_item_domain: null, total_row: 0, ctime: null, utime: null }, featureMenuItem));
-export const recursiveGetInitialFeatureMenuItem = (featureMenuItem) => (Object.assign({ menu_item: '', network_id: -1, menu_item_name: '', level_position: 0, icon_name: null, menu_item_path: null, menu_item_code: '', permission_code: null, menu_item_type: 3, menu_item_parent: 0, render_option: null, menu_item_domain: null, total_row: 0, ctime: null, utime: null }, featureMenuItem));
+export const getInitialFeatureMenuItem = (featureMenuItem) => ({
+    menu_item: '',
+    network_id: -1,
+    menu_item_name: '',
+    component_icon_name: null,
+    level_position: 0,
+    icon_name: null,
+    menu_item_path: null,
+    menu_item_code: '',
+    permission_code: null,
+    menu_item_type: 3,
+    menu_item_parent: 0,
+    render_option: null,
+    menu_item_domain: null,
+    total_row: 0,
+    ctime: null,
+    utime: null,
+    ...featureMenuItem,
+});
+export const recursiveGetInitialFeatureMenuItem = (featureMenuItem) => ({
+    menu_item: '',
+    network_id: -1,
+    menu_item_name: '',
+    level_position: 0,
+    icon_name: null,
+    menu_item_path: null,
+    menu_item_code: '',
+    permission_code: null,
+    menu_item_type: 3,
+    menu_item_parent: 0,
+    render_option: null,
+    menu_item_domain: null,
+    total_row: 0,
+    ctime: null,
+    utime: null,
+    ...featureMenuItem,
+});
 /**
  * Recursively converts a feature menu item to a menu item, including children,
  * based on permissions.
@@ -145,23 +184,19 @@ export const recursiveGetInitialFeatureMenuItem = (featureMenuItem) => (Object.a
  * @param {TFeatureMenu} featureMenuItem - The feature menu item to convert.
  * @returns {TMenuItem} - The converted menu item with permissions.
  */
-export const recursiveGetMenuItemByPermission = (featureMenuItem) => {
-    var _a;
-    return ({
-        key: featureMenuItem.permission_code || featureMenuItem.menu_item_code || 'null',
-        label: featureMenuItem.menu_item_name,
-        icon: featureMenuItem.icon_name,
-        logo_url: featureMenuItem.logo_url,
-        children: (_a = featureMenuItem === null || featureMenuItem === void 0 ? void 0 : featureMenuItem.children) === null || _a === void 0 ? void 0 : _a.map(child => recursiveGetMenuItemByPermission(child)),
-    });
-};
+export const recursiveGetMenuItemByPermission = (featureMenuItem) => ({
+    key: featureMenuItem.permission_code || featureMenuItem.menu_item_code || 'null',
+    label: featureMenuItem.menu_item_name,
+    icon: featureMenuItem.icon_name,
+    logo_url: featureMenuItem.logo_url,
+    children: featureMenuItem?.children?.map(child => recursiveGetMenuItemByPermission(child)),
+});
 /** Map children to each App Item */
 export const getMappingAppChildren = (args) => {
     const { menuList, dashboardList, auth, destinationChannelEntries, destinationChannelGen2Entries, isRecommendation, userPermission, } = args;
     const recursiveAddRenderOption = (menuItem) => {
-        var _a;
         const cloneMenuItem = cloneDeep(menuItem);
-        switch (cloneMenuItem === null || cloneMenuItem === void 0 ? void 0 : cloneMenuItem.render_option) {
+        switch (cloneMenuItem?.render_option) {
             case RENDER_OPTION.CHANNEL: {
                 const path = (() => {
                     switch (menuItem.menu_item_code) {
@@ -172,14 +207,19 @@ export const getMappingAppChildren = (args) => {
                     }
                 })();
                 cloneMenuItem.children =
-                    (destinationChannelEntries === null || destinationChannelEntries === void 0 ? void 0 : destinationChannelEntries.map(item => (Object.assign({}, getInitialFeatureMenuItem({
-                        menu_item_code: item.channelCode,
-                        menu_item_name: item.translateLabel,
-                        menu_item_domain: cloneMenuItem.menu_item_domain,
-                        logo_url: item.logoUrl,
-                        menu_item_parent: menuItem.menu_item,
-                        menu_item_path: getGeneratePath(path, Object.assign(Object.assign({}, auth), { channelId: item.channelId })),
-                    }))))) || [];
+                    destinationChannelEntries?.map(item => ({
+                        ...getInitialFeatureMenuItem({
+                            menu_item_code: item.channelCode,
+                            menu_item_name: item.translateLabel,
+                            menu_item_domain: cloneMenuItem.menu_item_domain,
+                            logo_url: item.logoUrl,
+                            menu_item_parent: menuItem.menu_item,
+                            menu_item_path: getGeneratePath(path, {
+                                ...auth,
+                                channelId: item.channelId,
+                            }),
+                        }),
+                    })) || [];
                 break;
             }
             case RENDER_OPTION.CHANNEL_GEN2: {
@@ -192,75 +232,90 @@ export const getMappingAppChildren = (args) => {
                     }
                 })();
                 cloneMenuItem.children =
-                    (destinationChannelGen2Entries === null || destinationChannelGen2Entries === void 0 ? void 0 : destinationChannelGen2Entries.map(item => (Object.assign({}, getInitialFeatureMenuItem({
-                        menu_item_domain: cloneMenuItem.menu_item_domain,
-                        menu_item_code: `${menuItem.menu_item_code}_${item.channelCode}`,
-                        menu_item_name: item.translateLabel,
-                        logo_url: item.logoUrl,
-                        menu_item_parent: menuItem.menu_item,
-                        menu_item_path: getGeneratePath(path, Object.assign(Object.assign({}, auth), { channelId: item.channelId })),
-                    }))))) || [];
+                    destinationChannelGen2Entries?.map(item => ({
+                        ...getInitialFeatureMenuItem({
+                            menu_item_domain: cloneMenuItem.menu_item_domain,
+                            menu_item_code: `${menuItem.menu_item_code}_${item.channelCode}`,
+                            menu_item_name: item.translateLabel,
+                            logo_url: item.logoUrl,
+                            menu_item_parent: menuItem.menu_item,
+                            menu_item_path: getGeneratePath(path, {
+                                ...auth,
+                                channelId: item.channelId,
+                            }),
+                        }),
+                    })) || [];
                 break;
             }
             default:
                 break;
         }
-        if (cloneMenuItem === null || cloneMenuItem === void 0 ? void 0 : cloneMenuItem.children) {
-            cloneMenuItem.children = (_a = cloneMenuItem.children) === null || _a === void 0 ? void 0 : _a.map(item => recursiveAddRenderOption(item));
+        if (cloneMenuItem?.children) {
+            cloneMenuItem.children = cloneMenuItem.children?.map(item => recursiveAddRenderOption(item));
         }
         return cloneMenuItem;
     };
-    return menuList === null || menuList === void 0 ? void 0 : menuList.map(appItem => {
-        var _a, _b;
+    return menuList?.map(appItem => {
         switch (appItem.menu_item_code) {
             case APP_KEYS.HOME: {
-                appItem.children = (_a = appItem.children) === null || _a === void 0 ? void 0 : _a.map(childMenuItem => {
-                    var _a;
-                    return (Object.assign(Object.assign({}, childMenuItem), { children: (_a = (childMenuItem.menu_item_code === HOME_MENU_ITEMS.DASHBOARD
-                            ? dashboardList
-                            : undefined)) === null || _a === void 0 ? void 0 : _a.map(item => {
-                            const { shareAccess } = item || {};
-                            const dashboardEditable = (() => {
-                                var _a, _b, _c;
-                                switch ((_a = userPermission === null || userPermission === void 0 ? void 0 : userPermission.permissions) === null || _a === void 0 ? void 0 : _a.edit) {
-                                    case USER_PERMISSIONS.EVERYTHING:
+                appItem.children = appItem.children?.map(childMenuItem => ({
+                    ...childMenuItem,
+                    children: (childMenuItem.menu_item_code === HOME_MENU_ITEMS.DASHBOARD
+                        ? dashboardList
+                        : undefined)?.map(item => {
+                        const { shareAccess } = item || {};
+                        const dashboardEditable = (() => {
+                            switch (userPermission?.permissions?.edit) {
+                                case USER_PERMISSIONS.EVERYTHING:
+                                    return true;
+                                case USER_PERMISSIONS.NONE:
+                                    return false;
+                                default: {
+                                    if (isEmpty(shareAccess))
+                                        return true;
+                                    const { is_public, public_role } = shareAccess || {};
+                                    // Check view public before list access
+                                    if (!!is_public && public_role === PUBLIC_ROLE.ONLY_EDITOR) {
                                         return true;
-                                    case USER_PERMISSIONS.NONE:
-                                        return false;
-                                    default: {
-                                        if (isEmpty(shareAccess))
-                                            return true;
-                                        const { is_public, public_role } = shareAccess || {};
-                                        // Check view public before list access
-                                        if (!!is_public && public_role === PUBLIC_ROLE.ONLY_EDITOR) {
-                                            return true;
-                                        }
-                                        return Boolean(Number(((_c = (_b = shareAccess === null || shareAccess === void 0 ? void 0 : shareAccess.list_access) === null || _b === void 0 ? void 0 : _b.find(item => item.user_id === (auth === null || auth === void 0 ? void 0 : auth.userId))) === null || _c === void 0 ? void 0 : _c.allow_edit) || '0'));
                                     }
+                                    return Boolean(Number(shareAccess?.list_access?.find(item => item.user_id === auth?.userId)
+                                        ?.allow_edit || '0'));
                                 }
-                            })();
-                            return Object.assign({}, getInitialFeatureMenuItem({
+                            }
+                        })();
+                        return {
+                            ...getInitialFeatureMenuItem({
                                 page_title: appItem.page_title,
                                 menu_item_domain: childMenuItem.menu_item_domain,
                                 menu_item: String(item.dashboardId),
                                 menu_item_code: String(item.dashboardId),
                                 menu_item_name: item.dashboardName,
                                 menu_item_parent: childMenuItem.menu_item,
-                                menu_item_path: getGeneratePath(HOME_REPORT_ROUTES.DETAIL, Object.assign(Object.assign({}, auth), { dashboardId: String(item.dashboardId) })),
+                                menu_item_path: getGeneratePath(HOME_REPORT_ROUTES.DETAIL, {
+                                    ...auth,
+                                    dashboardId: String(item.dashboardId),
+                                }),
                                 dashboardEditable,
-                            }));
-                        }) }));
-                });
+                            }),
+                        };
+                    }),
+                }));
                 break;
             }
             case APP_KEYS.MARKETING: {
-                appItem.children = (_b = appItem.children) === null || _b === void 0 ? void 0 : _b.map(childMenuItem => {
+                appItem.children = appItem.children?.map(childMenuItem => {
                     switch (childMenuItem.menu_item_code) {
                         case MARKETING_CHANNEL_CODE.ALL_CHANNEL:
-                            childMenuItem.menu_item_path = getGeneratePath(childMenuItem.menu_item_path || '', Object.assign(Object.assign({}, auth), { channelId: MARKETING_CHANNEL_KEY.ALL_CHANNEL }));
+                            childMenuItem.menu_item_path = getGeneratePath(childMenuItem.menu_item_path || '', {
+                                ...auth,
+                                channelId: MARKETING_CHANNEL_KEY.ALL_CHANNEL,
+                            });
                             break;
                         case MARKETING_CHANNEL_CODE.ORCHESTRATION:
-                            childMenuItem.menu_item_path = getGeneratePath(childMenuItem.menu_item_path || '', Object.assign(Object.assign({}, auth), { channelId: MARKETING_CHANNEL_KEY.JOURNEY_ORCHESTRATION }));
+                            childMenuItem.menu_item_path = getGeneratePath(childMenuItem.menu_item_path || '', {
+                                ...auth,
+                                channelId: MARKETING_CHANNEL_KEY.JOURNEY_ORCHESTRATION,
+                            });
                             break;
                         default:
                             break;
@@ -293,7 +348,7 @@ export const findActiveAppCodeByUrl = (args) => {
         const recursiveCheckHasActiveChild = (items) => {
             let matchAppCode = false;
             for (const item of items) {
-                if (item === null || item === void 0 ? void 0 : item.menu_item_path) {
+                if (item?.menu_item_path) {
                     const comparePath = KEEP_HASH_PATH_DEV.includes(item.menu_item_code)
                         ? getGeneratePath(item.menu_item_path, auth)
                         : getComparePath(getGeneratePath(item.menu_item_path, auth), env);
@@ -302,7 +357,7 @@ export const findActiveAppCodeByUrl = (args) => {
                         break;
                     }
                 }
-                if ((item === null || item === void 0 ? void 0 : item.children) && item.children.length) {
+                if (item?.children && item.children.length) {
                     matchAppCode = recursiveCheckHasActiveChild(item.children);
                     if (matchAppCode) {
                         break;
@@ -312,12 +367,12 @@ export const findActiveAppCodeByUrl = (args) => {
             return matchAppCode;
         };
         for (const menuItem of menuItems) {
-            if (!!(menuItem === null || menuItem === void 0 ? void 0 : menuItem.menu_item_path) &&
+            if (!!menuItem?.menu_item_path &&
                 url.includes(getComparePath(getGeneratePath(menuItem.menu_item_path, auth), env))) {
                 matchAppCode = menuItem.menu_item_code;
                 break;
             }
-            const hasActiveChild = recursiveCheckHasActiveChild((menuItem === null || menuItem === void 0 ? void 0 : menuItem.children) || []);
+            const hasActiveChild = recursiveCheckHasActiveChild(menuItem?.children || []);
             if (hasActiveChild) {
                 matchAppCode = menuItem.menu_item_code;
                 break;
@@ -349,7 +404,7 @@ export const findLastMatchedItemByUrl = (args) => {
         const matchedItems = [];
         const recursiveFindActiveItem = (items, parentId) => {
             for (const item of items) {
-                if (item === null || item === void 0 ? void 0 : item.menu_item_path) {
+                if (item?.menu_item_path) {
                     const comparePath = KEEP_HASH_PATH_DEV.includes(item.menu_item_code)
                         ? getGeneratePath(item.menu_item_path, auth)
                         : getComparePath(getGeneratePath(item.menu_item_path, auth), env);
@@ -357,7 +412,7 @@ export const findLastMatchedItemByUrl = (args) => {
                         matchedItems.push(item);
                     }
                 }
-                if ((item === null || item === void 0 ? void 0 : item.children) && item.children.length) {
+                if (item?.children && item.children.length) {
                     recursiveFindActiveItem(item.children, String(item.menu_item));
                 }
             }
@@ -367,7 +422,7 @@ export const findLastMatchedItemByUrl = (args) => {
         if (recommendationItem) {
             return recommendationItem;
         }
-        return matchedItems === null || matchedItems === void 0 ? void 0 : matchedItems.pop();
+        return matchedItems?.pop();
     }
     catch (error) {
         handleError(error, {
@@ -391,12 +446,12 @@ export const findPathOfActiveItem = (args) => {
         const recursiveFindPathOfActiveItem = (menuItems, parentId) => {
             let path = [];
             for (const item of menuItems) {
-                if (item.menu_item_code === (activeMenuItem === null || activeMenuItem === void 0 ? void 0 : activeMenuItem.menu_item_code) &&
-                    (!parentId || (activeMenuItem === null || activeMenuItem === void 0 ? void 0 : activeMenuItem.menu_item_parent) === parentId)) {
+                if (item.menu_item_code === activeMenuItem?.menu_item_code &&
+                    (!parentId || activeMenuItem?.menu_item_parent === parentId)) {
                     path.push(item);
                     break;
                 }
-                const childPath = recursiveFindPathOfActiveItem((item === null || item === void 0 ? void 0 : item.children) || [], String(item.menu_item));
+                const childPath = recursiveFindPathOfActiveItem(item?.children || [], String(item.menu_item));
                 if (childPath.length) {
                     path = [item, ...childPath];
                     break;
@@ -443,7 +498,7 @@ export const findActiveAppCodeByChild = (args) => {
                         break;
                     }
                 }
-                if ((item === null || item === void 0 ? void 0 : item.children) && item.children.length) {
+                if (item?.children && item.children.length) {
                     matchedAppCode = recursiveCheckHasActiveChild(item.children, item.key);
                     if (matchedAppCode) {
                         break;
@@ -457,7 +512,7 @@ export const findActiveAppCodeByChild = (args) => {
                 activeAppCode = activeCurrentKey;
                 break;
             }
-            const hasActiveChild = recursiveCheckHasActiveChild((menuItem === null || menuItem === void 0 ? void 0 : menuItem.children) || [], menuItem.key);
+            const hasActiveChild = recursiveCheckHasActiveChild(menuItem?.children || [], menuItem.key);
             if (hasActiveChild) {
                 activeAppCode = menuItem.key;
                 break;
@@ -491,7 +546,7 @@ export const getCustomActiveAppCode = (args) => {
                 matchedAppCode = true;
                 break;
             }
-            if ((item === null || item === void 0 ? void 0 : item.children) && item.children.length) {
+            if (item?.children && item.children.length) {
                 matchedAppCode = recursiveCheckHasActiveChild(item.children);
                 if (matchedAppCode) {
                     break;
@@ -505,7 +560,7 @@ export const getCustomActiveAppCode = (args) => {
             activeAppCode = activeKey;
             break;
         }
-        const hasActiveChild = recursiveCheckHasActiveChild((menuItem === null || menuItem === void 0 ? void 0 : menuItem.children) || []);
+        const hasActiveChild = recursiveCheckHasActiveChild(menuItem?.children || []);
         if (hasActiveChild) {
             activeAppCode = menuItem.key;
             break;
@@ -522,10 +577,9 @@ export const renderMenuIcon = (iconName) => {
     try {
         // const ComponentIcon = iconName && Icons[iconName];
         const ComponentIcon = iconName && Icons[iconName];
-        return ComponentIcon ? (React.createElement(Suspense, { fallback: null },
-            React.createElement(ComponentIcon, { className: "menu-item__icon", size: 30 }))) : (React.createElement(IconWrapper, null, isNil(iconName) ? null : React.createElement(Icon, { type: iconName })));
+        return ComponentIcon ? (_jsx(Suspense, { fallback: null, children: _jsx(ComponentIcon, { className: "menu-item__icon", size: 30 }) })) : (_jsx(IconWrapper, { children: isNil(iconName) ? null : _jsx(Icon, { type: iconName }) }));
     }
     catch (error) {
-        return React.createElement(IconWrapper, null, isNil(iconName) ? null : React.createElement(Icon, { type: iconName }));
+        return _jsx(IconWrapper, { children: isNil(iconName) ? null : _jsx(Icon, { type: iconName }) });
     }
 };