@antscorp/antsomi-ui 1.3.5-beta.469 → 1.3.5-beta.470

package/es/components/organism/LeftMenu/hooks/useNavigatePath.js

@@ -19,7 +19,7 @@ export const useNavigatePath = () => {
     const { search } = useLocation();
     const isDev = env === ENV.DEV;
     const { activeItemPath, flattenMenuPermission } = usePermission();
-    const hasRole = useDeepCompareMemo(() => hasSelectAccountPermission(activeItemPath, flattenMenuPermission), [activeItemPath, flattenMenuPermission]);
+    const hasRole = useDeepCompareMemo(() => hasSelectAccountPermission({ activeItemPath, flattenPermissionList: flattenMenuPermission }), [activeItemPath, flattenMenuPermission]);
     const urlParams = useMemo(() => new URLSearchParams(search), [search]);
     const oidParam = hasRole ? urlParams.get('oid') : null;
     const searchParams = oidParam ? `?oid=${oidParam}` : '';

package/es/components/template/Layout/Layout.js

@@ -126,7 +126,12 @@ export const Layout = memo(props => {
         const activeMenuCode = (_a = activeItemPath === null || activeItemPath === void 0 ? void 0 : activeItemPath[(activeItemPath === null || activeItemPath === void 0 ? void 0 : activeItemPath.length) - 1]) === null || _a === void 0 ? void 0 : _a.menu_item_code;
         setActiveMenuCode(activeMenuCode);
         onActiveMenuChange === null || onActiveMenuChange === void 0 ? void 0 : onActiveMenuChange(activeMenuCode);
-        const hasRole = hasSelectAccountPermission(activeItemPath, flattenPermissionList, menuListPermission);
+        const hasRole = hasSelectAccountPermission({
+            activeItemPath: cloneDeep(activeItemPath),
+            flattenPermissionList,
+            menuListPermission,
+            appItem: activeItemPath[0],
+        });
         setShowAccountSelection(hasRole);
     }, [onActiveMenuChange]);
     return (React.createElement(LayoutWrapper, { showLeftMenu: !!showLeftMenu },

package/es/components/template/Layout/constants/menuCode.d.ts

@@ -28,5 +28,5 @@ export declare const MENU_CODE: {
     JOURNEY_TACTIC: string;
     BATCH_STREAMING: string;
     REALTIME_STREAMING: string;
-    DATA_SOURCE: string;
+    DATASOURCES: string;
 };

package/es/components/template/Layout/constants/menuCode.js

@@ -29,5 +29,5 @@ export const MENU_CODE = {
     JOURNEY_TACTIC: 'JOURNEY_TACTIC',
     BATCH_STREAMING: 'BATCH_STREAMING',
     REALTIME_STREAMING: 'REALTIME_STREAMING',
-    DATA_SOURCE: 'DATA_SOURCE',
+    DATASOURCES: 'DATASOURCES',
 };

package/es/components/template/Layout/utils/permission.d.ts

@@ -14,4 +14,9 @@ export declare const checkingRoleScope: (args: {
     scope?: number;
     isExactly?: boolean;
 }) => boolean;
-export declare const hasSelectAccountPermission: (activeItemPath: TFeatureMenu[], flattenPermissionList?: FeatureMenuPermission[], menuListPermission?: FeatureMenuPermission[]) => boolean;
+export declare const hasSelectAccountPermission: (args: {
+    activeItemPath: TFeatureMenu[];
+    flattenPermissionList?: FeatureMenuPermission[];
+    menuListPermission?: FeatureMenuPermission[];
+    appItem?: TFeatureMenu;
+}) => boolean;

package/es/components/template/Layout/utils/permission.js

@@ -19,7 +19,7 @@ export const checkingRoleScope = (args) => {
         MENU_CODE.EMAIL_TEMPLATE,
         MENU_CODE.BATCH_STREAMING,
         MENU_CODE.REALTIME_STREAMING,
-        MENU_CODE.DATA_SOURCE,
+        MENU_CODE.DATASOURCES,
         // MENU_CODE.SEGMENT,
         // MENU_CODE.DESTINATIONS_HUB,
         MENU_CODE.BUSINESS_OBJECT,
@@ -50,7 +50,8 @@ export const checkingRoleScope = (args) => {
     }
     return isOK;
 };
-export const hasSelectAccountPermission = (activeItemPath, flattenPermissionList, menuListPermission) => {
+export const hasSelectAccountPermission = (args) => {
+    const { activeItemPath, flattenPermissionList, menuListPermission, appItem } = args;
     if (isEmpty(activeItemPath))
         return false;
     let roleScope = false;
@@ -72,8 +73,21 @@ export const hasSelectAccountPermission = (activeItemPath, flattenPermissionList
             permissionCode = activeItem.permission_code;
         }
         const menuPermission = (() => {
+            var _a;
             if (KEEP_HASH_PATH_CODE.includes(activeItem.menu_item_code)) {
-                // return;
+                if (appItem) {
+                    const appPermission = (() => {
+                        switch (appItem === null || appItem === void 0 ? void 0 : appItem.permission_code) {
+                            case 'SQL_WORKSPACE':
+                                return 'APP_ANTALYSER';
+                            default:
+                                return appItem === null || appItem === void 0 ? void 0 : appItem.permission_code;
+                        }
+                    })();
+                    const parentMenu = menuListPermission === null || menuListPermission === void 0 ? void 0 : menuListPermission.find(item => item.app_code === appPermission);
+                    return (_a = parentMenu === null || parentMenu === void 0 ? void 0 : parentMenu.childs) === null || _a === void 0 ? void 0 : _a.find(item => item.menu_code === permissionCode);
+                }
+                return;
             }
             return flattenPermissionList === null || flattenPermissionList === void 0 ? void 0 : flattenPermissionList.find(item => permissionCode === item.menu_code);
         })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antscorp/antsomi-ui",
-  "version": "1.3.5-beta.469",
+  "version": "1.3.5-beta.470",
   "description": "An enterprise-class UI design language and React UI library.",
   "sideEffects": [
     "dist/*",