@antscorp/antsomi-ui 1.3.5-beta.370 → 1.3.5-beta.371

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

@@ -74,7 +74,7 @@ export const ChildMenu = memo(props => {
                     setOpenKeys(prev => [...prev, parentKey]);
                 }
                 // Active App Item having code matching url
-                const matchAppCode = findActiveAppCodeByUrl({ menuItems, url, auth });
+                const matchAppCode = findActiveAppCodeByUrl({ menuItems, url, auth, env });
                 if (matchAppCode && matchAppCode !== activeAppCode) {
                     setLeftMenuState({ activeAppCode: matchAppCode });
                 }
@@ -92,6 +92,7 @@ export const ChildMenu = memo(props => {
         isCustomized,
         customActiveCurrentKey,
         customItems,
+        env,
     ]);
     const onClick = e => {
         onMenuClick === null || onMenuClick === void 0 ? void 0 : onMenuClick(e.key, e.keyPath);

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

@@ -21,7 +21,7 @@ export const useLeftMenu = (props) => {
     const activeAppCode = useLeftMenuStore(store => store.state.activeAppCode);
     const customActiveAppKey = useLeftMenuStore(store => store.state.customActiveAppKey);
     const setLeftMenuState = useLeftMenuStore(store => store.setState);
-    const { auth } = appConfig || {};
+    const { auth, env } = appConfig || {};
     const [state, setState] = useState(initialState);
     const { mappingChildrenMenu, flattenMenuPermission, permissionMenu, activeItemPath } = usePermission();
     useEffect(() => {
@@ -74,12 +74,26 @@ export const useLeftMenu = (props) => {
         if (!isCustomized) {
             const url = `${pathname}${hash}`;
             // Active App Item having code matching url
-            const matchAppCode = findActiveAppCodeByUrl({ url, menuItems: mappingChildrenMenu, auth });
+            const matchAppCode = findActiveAppCodeByUrl({
+                url,
+                menuItems: mappingChildrenMenu,
+                auth,
+                env,
+            });
             if (matchAppCode && matchAppCode !== activeAppCode) {
                 setLeftMenuState({ activeAppCode: matchAppCode });
             }
         }
-    }, [activeAppCode, auth, hash, isCustomized, mappingChildrenMenu, pathname, setLeftMenuState]);
+    }, [
+        activeAppCode,
+        auth,
+        env,
+        hash,
+        isCustomized,
+        mappingChildrenMenu,
+        pathname,
+        setLeftMenuState,
+    ]);
     useEffect(() => {
         if (!isCustomized) {
             // Callback function using at Layout when url change

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

@@ -77,6 +77,7 @@ export declare const findActiveAppCodeByUrl: (args: {
     url: string;
     menuItems: TFeatureMenu[];
     auth?: Partial<PayloadInfo>;
+    env?: string;
 }) => string | undefined;
 export declare const findLastMatchedItemByUrl: (args: {
     url: string;

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

@@ -215,13 +215,13 @@ export const getMappingAppChildren = (args) => {
  */
 export const findActiveAppCodeByUrl = (args) => {
     try {
-        const { url, menuItems, auth } = args;
+        const { url, menuItems, auth, env } = args;
         let matchAppCode;
         const recursiveCheckHasActiveChild = (items) => {
             let matchAppCode = false;
             for (const item of items) {
                 if (!!(item === null || item === void 0 ? void 0 : item.menu_item_path) &&
-                    url.includes(getComparePath(getGeneratePath(item.menu_item_path, auth)))) {
+                    url.includes(getComparePath(getGeneratePath(item.menu_item_path, auth), env))) {
                     matchAppCode = true;
                     break;
                 }
@@ -236,7 +236,7 @@ export const findActiveAppCodeByUrl = (args) => {
         };
         for (const menuItem of menuItems) {
             if (!!(menuItem === null || menuItem === void 0 ? void 0 : menuItem.menu_item_path) &&
-                url.includes(getComparePath(getGeneratePath(menuItem.menu_item_path, auth)))) {
+                url.includes(getComparePath(getGeneratePath(menuItem.menu_item_path, auth), env))) {
                 matchAppCode = menuItem.menu_item_code;
                 break;
             }
@@ -258,12 +258,12 @@ export const findActiveAppCodeByUrl = (args) => {
 };
 export const findLastMatchedItemByUrl = (args) => {
     try {
-        const { url, menuItems, auth } = args;
+        const { url, menuItems, auth, env } = args;
         const matchedItems = [];
         const recursiveFindActiveItem = (items, parentId) => {
             for (const item of items) {
                 if ((item === null || item === void 0 ? void 0 : item.menu_item_path) &&
-                    url.includes(getComparePath(getGeneratePath(item.menu_item_path, auth))) &&
+                    url.includes(getComparePath(getGeneratePath(item.menu_item_path, auth), env)) &&
                     (!parentId || item.menu_item_parent === parentId)) {
                     matchedItems.push(item);
                 }

package/package.json

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