Merge pull request #2603 from headlamp-k8s/fix-broken-menu

frontend: TopBar: Hide menu on mobile when empty
headlamp-k8s · Jan 7, 2025 · 4da085f · 4da085f
2 parents 5422d68 + c49aada
commit 4da085f
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/frontend/src/components/App/TopBar.tsx b/frontend/src/components/App/TopBar.tsx
@@ -399,6 +399,12 @@ export const PureTopBar = memo(
         ),
       },
     ];
+
+    const visibleMobileActions = processAppBarActions(
+      allAppBarActionsMobile,
+      appBarActionsProcessors
+    ).filter(action => React.isValidElement(action.action) || typeof action === 'function');
+
     return (
       <>
         <AppBar
@@ -429,16 +435,18 @@ export const PureTopBar = memo(
                 <HeadlampButton open={openSideBar} onToggleOpen={onToggleOpen} />
                 <Box sx={{ flexGrow: 1 }} />
                 <GlobalSearch isIconButton />
-                <IconButton
-                  aria-label={t('show more')}
-                  aria-controls={mobileMenuId}
-                  aria-haspopup="true"
-                  onClick={handleMobileMenuOpen}
-                  color="inherit"
-                  size="medium"
-                >
-                  <Icon icon="mdi:more-vert" />
-                </IconButton>
+                {visibleMobileActions.length > 0 && (
+                  <IconButton
+                    aria-label={t('show more')}
+                    aria-controls={mobileMenuId}
+                    aria-haspopup="true"
+                    onClick={handleMobileMenuOpen}
+                    color="inherit"
+                    size="medium"
+                  >
+                    <Icon icon="mdi:more-vert" />
+                  </IconButton>
+                )}
               </>
             ) : (
               <>