Skip to content

[release-coo-ocp-4.19] OU-1281: show disabled project bar while loading #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
openshift-cherrypick-robot wants to merge 2 commits into
base: release-coo-ocp-4.19
Choose a base branch
from
+38 −14
Open

[release-coo-ocp-4.19] OU-1281: show disabled project bar while loading #946

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0871d65
fix: show disabled project bar while loading
PeterYurkovich May 13, 2026
045e393
fix: add permissionError case
PeterYurkovich May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 38 additions & 14 deletions web/src/components/dashboards/perses/project/ProjectDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import {
TextInput,
EmptyStateActions,
EmptyStateFooter,
Tooltip,
TooltipPosition,
} from '@patternfly/react-core';
import fuzzysearch from 'fuzzysearch';
import { useTranslation } from 'react-i18next';
Expand Down Expand Up @@ -202,25 +204,47 @@ const ProjectDropdown: React.FC<ProjectDropdownProps> = ({
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 = (
<ProjectMenuToggle
disabled={disabled || permissionsLoading || !!permissionsError}
menu={<ProjectMenu {...menuProps} />}
menuRef={menuRef}
isOpen={isOpen}
title={`${t('Project')}: ${title}`}
onToggle={(menuState) => {
setOpen(menuState);
}}
shortCut={shortCut}
/>
);

return (
<div className="co-namespace-dropdown">
<ProjectMenuToggle
disabled={disabled}
menu={<ProjectMenu {...menuProps} />}
menuRef={menuRef}
isOpen={isOpen}
title={`${t('Project')}: ${title}`}
onToggle={(menuState) => {
setOpen(menuState);
}}
shortCut={shortCut}
/>
{permissionsLoading ? (
<Tooltip content={t('Checking permissions...')} position={TooltipPosition.bottom}>
{toggle}
</Tooltip>
) : permissionsError ? (
<Tooltip
content={t('Failed to load project permissions. Please refresh the page and try again.')}
position={TooltipPosition.bottom}
>
{toggle}
</Tooltip>
) : (
toggle
)}
</div>
);
};
Expand Down