@antscorp/antsomi-ui 2.0.40 → 2.0.41

package/es/components/molecules/HeaderV2/HeaderV2.js

@@ -26,7 +26,11 @@ export const HeaderV2 = memo(props => {
     // * Prefer to use Header in AppConfigContext
     const { show = true, className, style, breadcrumbs, showLogo = false, rightContent, pageTitle = '', accountSelection = {}, helpConfig, notificationConfig = {}, accountSharingConfig, useURLParam, config, onCLickLogo, } = props;
     /** General config for children component */
-    const { env = envContext, language = languageCode, userId = isNaN(Number(auth?.userId)) ? 0 : Number(auth?.userId), portalId = auth?.portalId, token = auth?.token, permissionDomain = PERMISSION_API, iamDomain = IAM_API, appCode = contextAppCode, menuCode = contextMenuCode, } = config || {};
+    const { env = envContext, language = languageCode, 
+    // NOTE: Just hot fix for change userId to accountId
+    userId = isNaN(Number(auth?.accountId || auth?.userId))
+        ? 0
+        : Number(auth?.accountId || auth?.userId), portalId = auth?.portalId, token = auth?.token, permissionDomain = PERMISSION_API, iamDomain = IAM_API, appCode = contextAppCode, menuCode = contextMenuCode, } = config || {};
     const { currentAccount, inputStyle = 'select', onSelectAccount, ...accountSelectionProps } = accountSelection;
     const urlParams = useMemo(() => new URLSearchParams(search), [search]);
     const oidParam = urlParams.get('oid') || currentAccount || 'all';

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

@@ -101,7 +101,9 @@ export const usePermission = () => {
             auth: {
                 token: auth?.token,
                 url: permissionDomain || PERMISSION_API,
-                userId: auth?.userId,
+                // NOTE: Hot fix for case menu permission working wrong
+                // userId: auth?.userId,
+                userId: auth?.accountId,
                 accountId: auth?.accountId,
             },
             params: {

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

@@ -99,9 +99,10 @@ export const recursivePermissionMenu = (menuItems, menuPermissions) => {
  */
 export const getGeneratePath = (path, params) => {
     try {
-        const { portalId, userId, dashboardId, channelId } = params || {};
+        const { portalId, userId, accountId, dashboardId, channelId } = params || {};
         const paramsObjects = {
-            user_id: userId ?? '-1',
+            // NOTE: Hot fix for account_id (login account)
+            user_id: accountId ?? userId ?? '-1',
             networkId: portalId ?? -1,
             portalId: portalId ?? -1,
             dashboardId: dashboardId ?? '-1',

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

@@ -198,7 +198,8 @@ export const Layout = memo(props => {
         permissionDomain,
         socketDomain: SOCKET_API,
         token,
-        accountId: userId,
+        // accountId: userId,
+        accountId,
         userId,
         lang: languageCode,
         networkId: portalId,
@@ -222,6 +223,12 @@ export const Layout = memo(props => {
             : menu_item_name);
         setActiveMenu(activeMenuItem);
         onActiveMenuChange?.(menu_item_code);
+        console.log({
+            activeItemPath: cloneDeep(activeItemPath),
+            flattenPermissionList,
+            menuListPermission,
+            appItem: activeItemPath[0],
+        });
         const hasRole = hasSelectAccountPermission({
             activeItemPath: cloneDeep(activeItemPath),
             flattenPermissionList,
@@ -251,10 +258,10 @@ export const Layout = memo(props => {
     /** Handle replace current userId in params if current userId is not match */
     useDeepCompareEffect(() => {
         const { userId: userIdParam } = (params || {});
-        if (userIdParam && userId && +userIdParam !== +userId && location.pathname) {
-            replace(`${location.pathname.replace(userIdParam, `${userId}`)}${location.search}`);
+        if (userIdParam && accountId && +userIdParam !== +accountId && location.pathname) {
+            replace(`${location.pathname.replace(userIdParam, `${accountId}`)}${location.search}`);
         }
-    }, [params, location.pathname, userId, replace]);
+    }, [params, location.pathname, accountId, replace]);
     /** If left menu props has customization then set layout loading to false, because we don't need check permission here */
     useDeepCompareEffect(() => {
         if (mergeLeftMenuProps.customization) {

package/es/components/template/Layout/components/RecommendationWorkspace/components/MenuMapping/components/OldLeftMenu/index.js

@@ -43,7 +43,9 @@ export const OldLeftMenu = memo(props => {
             auth: {
                 token: auth?.token,
                 url: PERMISSION_API,
-                userId: auth?.userId,
+                // NOTE: Hot fix for case menu permission working wrong
+                // userId: auth?.userId,
+                userId: auth?.accountId,
                 accountId: auth?.accountId,
             },
             params: {

package/package.json

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