Skip to content

OCPBUGS-69380: Fixed loaded page no roles error upon render #15878

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
krishagarwal278 wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −21
Open

OCPBUGS-69380: Fixed loaded page no roles error upon render #15878

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 13 additions & 21 deletions frontend/public/components/RBAC/role.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import {
import { DataViewCheckboxFilter } from '@patternfly/react-data-view';
import { tableFilters } from '../factory/table-filters';
import { SectionHeading } from '../utils/headings';
import { ConsoleEmptyState } from '@console/shared/src/components/empty-state';
import { navFactory } from '../utils/horizontal-nav';
import { ResourceLink, resourceListPathFromModel } from '../utils/resource-link';
import { LoadingBox } from '../utils/status-box';
Expand Down Expand Up @@ -444,7 +443,7 @@ const useRoleFilterOptions = () => {

const RolesList = (props) => {
const { t } = useTranslation();
const { data } = props;
const { data, loaded } = props;
const columns = useRolesColumns();
const roleFilterOptions = useRoleFilterOptions();

Expand All @@ -471,25 +470,18 @@ const RolesList = (props) => {

return (
<React.Suspense fallback={<LoadingBox />}>
{data.length === 0 ? (
<ConsoleEmptyState title={t('public~No Roles found')}>
{t(
'public~Roles grant access to types of objects in the cluster. Roles are applied to a team or user via a RoleBinding.',
)}
</ConsoleEmptyState>
) : (
<ConsoleDataView
{...props}
data={data}
label={t('public~Roles')}
columns={columns}
getDataViewRows={getDataViewRows}
initialFilters={initialFilters}
additionalFilterNodes={additionalFilterNodes}
matchesAdditionalFilters={matchesAdditionalFilters}
hideColumnManagement={true}
/>
)}
<ConsoleDataView
{...props}
data={data}
loaded={loaded}
label={t('public~Roles')}
columns={columns}
getDataViewRows={getDataViewRows}
initialFilters={initialFilters}
additionalFilterNodes={additionalFilterNodes}
matchesAdditionalFilters={matchesAdditionalFilters}
hideColumnManagement={true}
/>
</React.Suspense>
);
};
Expand Down