diff --git a/studio/src/components/GlobalNav/Sidebar.js b/studio/src/components/GlobalNav/Sidebar.js index 24a09c33..2db04171 100644 --- a/studio/src/components/GlobalNav/Sidebar.js +++ b/studio/src/components/GlobalNav/Sidebar.js @@ -109,7 +109,7 @@ function Sidebar({ superOrg, permission, orgs, loading, applications, services, children.map((route, childIndex) => { return resource.includes(route.title.toLowerCase()) ? ( ['Events', 'Permissions'].indexOf(route.title) !== -1 && - route.isAdmin !== superOrg.is_admin ? null : ( + route.isAdmin !== superOrg.is_admin ? null : ( {route.title} @@ -180,14 +180,19 @@ function Sidebar({ superOrg, permission, orgs, loading, applications, services, background: '#F1F1F1', }} > -
+
{collapsed ? ( logo @@ -214,7 +219,7 @@ function Sidebar({ superOrg, permission, orgs, loading, applications, services, @@ -239,14 +244,14 @@ function Sidebar({ superOrg, permission, orgs, loading, applications, services, return menu.title === 'CORE' && !showCoreMenu ? null : !menu.isService - ? !menu.isAdmin - ? getSubMenuItems(menu, index, Icon) - : permission.filter((each) => each.resource === 'admin').length > 0 - ? getSubMenuItems(menu, index, Icon) - : null - : services?.includes(maker(menu.title)) - ? getSubMenuItems(menu, index, Icon) - : null; + ? !menu.isAdmin + ? getSubMenuItems(menu, index, Icon) + : permission.filter((each) => each.resource === 'admin').length > 0 + ? getSubMenuItems(menu, index, Icon) + : null + : services?.includes(maker(menu.title)) + ? getSubMenuItems(menu, index, Icon) + : null; })} {!collapsed ? ( @@ -265,9 +270,11 @@ function Sidebar({ superOrg, permission, orgs, loading, applications, services, >
- + + + {applications.length > 0 ? ( <> -
)} - + ); }