Skip to content

Commit 2d6244c

Browse files
Fix: ClusterRoles not visible under the User Management -> Roles tab
1 parent 495c52a commit 2d6244c

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

frontend/public/components/RBAC/role.jsx

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,17 @@ export const RolesPage = ({ namespace, mock, showTitle }) => {
365365
namespace: createNS,
366366
};
367367
const { t } = useTranslation();
368+
const location = useLocation();
369+
370+
const isUserManagementContext =
371+
location.pathname.includes('/k8s/ns/') || location.pathname.includes('/k8s/all-namespaces/');
372+
373+
const resources = [{ kind: 'Role', namespaced: true, optional: mock }];
374+
375+
if (!isUserManagementContext) {
376+
resources.push({ kind: 'ClusterRole', namespaced: false, optional: true });
377+
}
378+
368379
return (
369380
<MultiListPage
370381
ListComponent={RolesList}
@@ -374,18 +385,14 @@ export const RolesPage = ({ namespace, mock, showTitle }) => {
374385
createAccessReview={accessReview}
375386
createButtonText={t('public~Create Role')}
376387
createProps={{ to: `/k8s/ns/${createNS}/roles/~new` }}
377-
flatten={(resources) => _.flatMap(resources, 'data').filter((r) => !!r)}
378-
resources={[
379-
{ kind: 'Role', namespaced: true, optional: mock },
380-
{ kind: 'ClusterRole', namespaced: false, optional: true },
381-
]}
388+
flatten={(resourceData) => _.flatMap(resourceData, 'data').filter((r) => !!r)}
389+
resources={resources}
382390
rowFilters={[
383391
{
384392
filterGroupName: t('public~Role'),
385393
type: 'role-kind',
386394
reducer: roleType,
387395
items: [
388-
{ id: 'cluster', title: t('public~Cluster-wide Roles') },
389396
{ id: 'namespace', title: t('public~Namespace Roles') },
390397
{ id: 'system', title: t('public~System Roles') },
391398
],

0 commit comments

Comments
 (0)