Skip to content

OCPBUGS-65690: Visiting Group Detail Page > RoleBindings will show error #15739

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

OCPBUGS-65690: Visiting Group Detail Page > RoleBindings will show error #15739

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion frontend/public/components/RBAC/bindings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,11 @@ export const BindingsList: React.FCC<BindingsListTableProps> = (props) => {

const filtersMap = tableFilters(false); // false for fuzzy search

// Convert staticFilters to array format if it's an object
const filtersArray = Array.isArray(staticFilters) ? staticFilters : [staticFilters];

return data.filter((binding) => {
return staticFilters.every((filter) => {
return filtersArray.every((filter) => {
const filterKey = Object.keys(filter)[0];
const filterValue = filter[filterKey];

Expand Down
5 changes: 4 additions & 1 deletion frontend/public/components/RBAC/role.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,11 @@ const BindingsListComponent = (props) => {

const filtersMap = tableFilters(false); // false for fuzzy search

// Convert staticFilters to array format if it's an object
const filtersArray = Array.isArray(staticFilters) ? staticFilters : [staticFilters];

return data.filter((binding) => {
return staticFilters.every((filter) => {
return filtersArray.every((filter) => {
const filterKey = Object.keys(filter)[0];
const filterValue = filter[filterKey];

Expand Down
10 changes: 6 additions & 4 deletions frontend/public/components/factory/table-filters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,23 +54,25 @@ export const tableFilters = (isExactSearch: boolean): FilterMap => {
},

alerts: (values, alert: Alert) => {
if (!values.all) {
if (!values.all || !Array.isArray(values.all)) {
return true;
}
const labels = getLabelsAsString(alert, 'labels');
return !!values.all.every((v) => labels.includes(v));
},

'observe-rules': (values, rule: Rule) => {
if (!values.all) {
if (!values.all || !Array.isArray(values.all)) {
return true;
}
const labels = getLabelsAsString(rule, 'labels');
return !!values.all.every((v) => labels.includes(v));
},

'observe-target-labels': (values, target: Target) =>
!values.all || values.all.every((v) => getLabelsAsString(target, 'labels').includes(v)),
!values.all ||
(Array.isArray(values.all) &&
values.all.every((v) => getLabelsAsString(target, 'labels').includes(v))),

// Filter role by role kind
'role-kind': (filter, role) =>
Expand All @@ -95,7 +97,7 @@ export const tableFilters = (isExactSearch: boolean): FilterMap => {
'role-binding-group': (groupName, { subject }) => subject.name === groupName,

labels: (values, obj) => {
if (!values.all) {
if (!values.all || !Array.isArray(values.all)) {
return true;
}
const labels = getLabelsAsString(obj);
Expand Down