From 1759511bfb84d7dda6fda78c2a768ebfaf11d9ac Mon Sep 17 00:00:00 2001 From: PeterYurkovich Date: Wed, 13 May 2026 11:15:40 -0400 Subject: [PATCH 1/2] fix: show disabled project bar while loading --- .../perses/project/ProjectDropdown.tsx | 45 +++++++++++++------ 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/web/src/components/dashboards/perses/project/ProjectDropdown.tsx b/web/src/components/dashboards/perses/project/ProjectDropdown.tsx index 54e522754..f12a9f98d 100644 --- a/web/src/components/dashboards/perses/project/ProjectDropdown.tsx +++ b/web/src/components/dashboards/perses/project/ProjectDropdown.tsx @@ -13,6 +13,8 @@ import { TextInput, EmptyStateActions, EmptyStateFooter, + Tooltip, + TooltipPosition, } from '@patternfly/react-core'; import fuzzysearch from 'fuzzysearch'; import { useTranslation } from 'react-i18next'; @@ -201,25 +203,40 @@ const ProjectDropdown: React.FC = ({ menuRef, }; - if (permissionsLoading || permissionsError || !allProjects || allProjects.length === 0) { - return null; + let title = t('All Projects'); + // While loading permissions, or if there is a permission error fallback to the "selected" value + // 'All Projects' is the user friendly ALL_NAMESPACES_KEY + if ( + selected && + (allProjects?.includes(selected) || permissionsLoading || !!permissionsError) && + selected !== ALL_NAMESPACES_KEY + ) { + title = selected; } - const title = selected && allProjects.includes(selected) ? selected : t('All Projects'); + const toggle = ( + } + menuRef={menuRef} + isOpen={isOpen} + title={`${t('Project')}: ${title}`} + onToggle={(menuState) => { + setOpen(menuState); + }} + shortCut={shortCut} + /> + ); return (
- } - menuRef={menuRef} - isOpen={isOpen} - title={`${t('Project')}: ${title}`} - onToggle={(menuState) => { - setOpen(menuState); - }} - shortCut={shortCut} - /> + {permissionsLoading ? ( + + {toggle} + + ) : ( + toggle + )}
); }; From d8a86b5297725b473f4eabac9f1037c8a9d87526 Mon Sep 17 00:00:00 2001 From: Peter Yurkovich <47438010+PeterYurkovich@users.noreply.github.com> Date: Wed, 13 May 2026 12:01:58 -0400 Subject: [PATCH 2/2] fix: add permissionError case Co-authored-by: Gabriel Bernal --- .../dashboards/perses/project/ProjectDropdown.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/src/components/dashboards/perses/project/ProjectDropdown.tsx b/web/src/components/dashboards/perses/project/ProjectDropdown.tsx index f12a9f98d..e69852adc 100644 --- a/web/src/components/dashboards/perses/project/ProjectDropdown.tsx +++ b/web/src/components/dashboards/perses/project/ProjectDropdown.tsx @@ -234,6 +234,13 @@ const ProjectDropdown: React.FC = ({ {toggle} + ) : permissionsError ? ( + + {toggle} + ) : ( toggle )}