addressed review comments

Signed-off-by: Yi Cai <[email protected]>

Author: ciiay

dynamic-plugins/wrappers/red-hat-developer-hub-backstage-plugin-global-header/package.json

@@ -1,6 +1,6 @@
 {
   "name": "red-hat-developer-hub-backstage-plugin-global-header",
-  "version": "0.0.2",
+  "version": "0.0.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",

packages/app/src/components/DynamicRoot/CommonIcons.tsx

@@ -12,6 +12,8 @@ import Home from '@mui/icons-material/HomeOutlined';
 import InsertChart from '@mui/icons-material/InsertChartOutlined';
 import Layers from '@mui/icons-material/Layers';
 import List from '@mui/icons-material/List';
+import Logout from '@mui/icons-material/LogoutOutlined';
+import ManageAccounts from '@mui/icons-material/ManageAccountsOutlined';
 import MonitorHeart from '@mui/icons-material/MonitorHeartOutlined';
 import Notifications from '@mui/icons-material/NotificationsOutlined';
 import People from '@mui/icons-material/People';
@@ -21,8 +23,6 @@ import School from '@mui/icons-material/SchoolOutlined';
 import Star from '@mui/icons-material/Star';
 import Storefront from '@mui/icons-material/StorefrontOutlined';
 import Textsms from '@mui/icons-material/TextsmsOutlined';
-import ManageAccounts from '@mui/icons-material/ManageAccountsOutlined';
-import Logout from '@mui/icons-material/LogoutOutlined';
 
 const CommonIcons: {
   [k: string]: React.ComponentType<{}>;

packages/app/src/components/Root/Root.tsx

@@ -28,7 +28,7 @@ import { makeStyles } from 'tss-react/mui';
 
 import { policyEntityReadPermission } from '@janus-idp/backstage-plugin-rbac-common';
 
-import { useDisplayedSidebarItems } from '../../utils/dynamicUI/useDisplayedSidebarItems';
+import { useDynamicSidebarConfiguration } from '../../utils/dynamicUI/useDynamicSidebarConfiguration';
 import { ResolvedMenuItem } from '../DynamicRoot/DynamicRootContext';
 import { ApplicationHeaders } from './ApplicationHeaders';
 import { MenuIcon } from './MenuIcon';
@@ -102,11 +102,8 @@ const getMenuItem = (menuItem: ResolvedMenuItem, isNestedMenuItem = false) => {
 };
 
 export const Root = ({ children }: PropsWithChildren<{}>) => {
-  const {
-    showSearchBar,
-    displayedDynamicRoutes: dynamicRoutes,
-    displayedMenuItems: menuItems,
-  } = useDisplayedSidebarItems();
+  const { showSearchBar, showSettingsButton, dynamicRoutes, menuItems } =
+    useDynamicSidebarConfiguration();
   const [openItems, setOpenItems] = useState<{ [key: string]: boolean }>({});
 
   const { loading: loadingPermission, allowed: canDisplayRBACMenuItem } =
@@ -291,13 +288,15 @@ export const Root = ({ children }: PropsWithChildren<{}>) => {
             {renderMenuItems(false, true)}
           </SidebarGroup>
           <SidebarDivider />
-          <SidebarGroup
-            label="Settings"
-            to="/settings"
-            icon={<AccountCircleOutlinedIcon />}
-          >
-            <SidebarSettings icon={AccountCircleOutlinedIcon} />
-          </SidebarGroup>
+          {showSettingsButton && (
+            <SidebarGroup
+              label="Settings"
+              to="/settings"
+              icon={<AccountCircleOutlinedIcon />}
+            >
+              <SidebarSettings icon={AccountCircleOutlinedIcon} />
+            </SidebarGroup>
+          )}
         </Sidebar>
         {children}
       </SidebarPage>

packages/app/src/utils/dynamicUI/useDisplayedSidebarItems.ts

@@ -0,0 +1,21 @@
+import { useContext } from 'react';
+
+import DynamicRootContext from '../../components/DynamicRoot/DynamicRootContext';
+
+export const useDynamicSidebarConfiguration = () => {
+  const { dynamicRoutes, menuItems, mountPoints } =
+    useContext(DynamicRootContext);
+  const headerComponents = mountPoints['global.header/component'] ?? [];
+  const profileMountPoints = mountPoints['global.header/profile'] ?? [];
+
+  return {
+    showSearchBar: !headerComponents.some(
+      ({ config }) => (config as any)?.type === 'search',
+    ),
+    showSettingsButton: !profileMountPoints.some(
+      ({ config }) => (config as any)?.props.link === '/settings',
+    ),
+    dynamicRoutes,
+    menuItems,
+  };
+};