addressed review comments

Signed-off-by: Yi Cai <[email protected]>
redhat-developer · Jan 14, 2025 · d4a06d4 · d4a06d4
1 parent 314e8f0
commit d4a06d4
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/packages/app/src/components/Root/Root.tsx b/packages/app/src/components/Root/Root.tsx
@@ -102,18 +102,24 @@ const getMenuItem = (menuItem: ResolvedMenuItem, isNestedMenuItem = false) => {
   );
 };
 
-const GlobalHeader = ({ mountPoints }: { mountPoints: MountPoints }) =>
+const ApplicationHeader = ({ mountPoints }: { mountPoints: MountPoints }) =>
   mountPoints['application/header']?.map(({ Component, config }) => (
-    <Component key="global-header" {...config?.props} />
+    <Component
+      key={`app-header-${config?.layout?.position}`}
+      {...config?.props}
+    />
   ));
 
 export const Root = ({ children }: PropsWithChildren<{}>) => {
   const { dynamicRoutes, menuItems, mountPoints } =
     useContext(DynamicRootContext);
   const [openItems, setOpenItems] = useState<{ [key: string]: boolean }>({});
 
-  const { position: globalHeaderPosition } =
-    mountPoints['application/header']?.[0]?.config?.layout ?? {};
+  const headerPositions = mountPoints['application/header']?.map(
+    ({ config }) => {
+      return config?.layout?.position;
+    },
+  );
 
   const { loading: loadingPermission, allowed: canDisplayRBACMenuItem } =
     usePermission({
@@ -259,12 +265,12 @@ export const Root = ({ children }: PropsWithChildren<{}>) => {
   };
   return (
     <>
-      {globalHeaderPosition === 'above-sidebar' && (
-        <GlobalHeader mountPoints={mountPoints} />
+      {headerPositions.includes('above-sidebar') && (
+        <ApplicationHeader mountPoints={mountPoints} />
       )}
       <SidebarPage>
-        {globalHeaderPosition === 'above-main-content' && (
-          <GlobalHeader mountPoints={mountPoints} />
+        {headerPositions.includes('above-main-content') && (
+          <ApplicationHeader mountPoints={mountPoints} />
         )}
         <Sidebar>
           <SidebarLogo />