Skip to content

[release-4.21] OCPBUGS-90498: Projects cannot be filtered by display name in the console list view #16653

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
cajieh wants to merge 1 commit into
base: release-4.21
Choose a base branch
from
Open

[release-4.21] OCPBUGS-90498: Projects cannot be filtered by display name in the console list view #16653

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
13 changes: 9 additions & 4 deletions frontend/packages/console-app/src/components/data-view/useConsoleDataViewFilters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ const getK8sResourceMetadata = (obj: K8sResourceCommon): ResourceMetadata => ({
labels: obj.metadata?.labels,
});

const getOpenShiftDisplayName = (resource: K8sResourceCommon): string | undefined =>
resource.metadata?.annotations?.['openshift.io/display-name'];

export const useConsoleDataViewFilters = <
TData,
TFilters extends ResourceFilters = ResourceFilters
Expand Down Expand Up @@ -42,12 +45,14 @@ export const useConsoleDataViewFilters = <
() =>
data?.filter((resource) => {
const { name: resourceName, labels } = getObjectMetadata(resource);
const displayName = getOpenShiftDisplayName(resource as K8sResourceCommon);

// Filter by K8s resource name
// Filter by K8s resource name or display name
const matchFn = isExactSearch ? exactMatch : fuzzyCaseInsensitive;
const matchesName =
!filters.name || isExactSearch
? exactMatch(filters.name, resourceName)
: fuzzyCaseInsensitive(filters.name, resourceName);
!filters.name ||
matchFn(filters.name, resourceName) ||
matchFn(filters.name, displayName);

const resourceLabels = mapLabelsToStrings(labels);
const filterLabelsArray = filters.label?.split(',') ?? [];
Expand Down