From 104bd6157687d8224c1570260203e97105fe3f7c Mon Sep 17 00:00:00 2001 From: maggieyyy <61950669+maggieyyy@users.noreply.github.com> Date: Fri, 1 Nov 2024 14:45:32 +0800 Subject: [PATCH] fix: consumer menu access bug --- .../management/ManagementInsidePage.tsx | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/frontend/packages/market/src/pages/serviceHub/management/ManagementInsidePage.tsx b/frontend/packages/market/src/pages/serviceHub/management/ManagementInsidePage.tsx index 73e567bf..fa6fcedb 100644 --- a/frontend/packages/market/src/pages/serviceHub/management/ManagementInsidePage.tsx +++ b/frontend/packages/market/src/pages/serviceHub/management/ManagementInsidePage.tsx @@ -39,21 +39,17 @@ export default function ManagementInsidePage(){ const menuData = useMemo(()=>{ - const filterMenu = (menu:MenuItemGroupType[])=>{ + const filterMenu = (menu:(MenuItemType&{access:string})[])=>{ const newMenu = cloneDeep(menu) - return newMenu!.filter((m:MenuItemGroupType )=>{ - if(m&&m.children && m.children.length > 0){ - m.children = m.children.filter( - (c)=>{ - if(!c) return false - return (((c as MenuItemType&{access:string} ).access ? - checkPermission((c as MenuItemType&{access:string} ).access as keyof typeof PERMISSION_DEFINITION[0]): - true))}) - } - return m.children && m.children.length > 0 - }) - } + console.log(newMenu) + return newMenu!.filter((c:MenuItemType&{access:string} )=>{ + if(!c) return false + return (((c as MenuItemType&{access:string} ).access ? + checkPermission((c as MenuItemType&{access:string} ).access as keyof typeof PERMISSION_DEFINITION[0]): + true)) + })} const filteredMenu = filterMenu(TENANT_MANAGEMENT_APP_MENU as MenuItemGroupType[]) + console.log(filteredMenu) const menu = activeMenu ?? filteredMenu[0]?.children ? filteredMenu[0]?.children?.[0]?.key : filteredMenu[0]?.key if(menu && currentUrl.split('/')[-1] !== menu) navigateTo(`/consumer/${teamId}/inside/${appId}/${menu}`) return filteredMenu || []