From 522d0b4de56a7adce13052381242c3a14147c6d2 Mon Sep 17 00:00:00 2001 From: KubeSphere CI Bot <47586280+ks-ci-bot@users.noreply.github.com> Date: Thu, 16 Jan 2025 16:49:30 +0800 Subject: [PATCH] fix: alias query not functioning (#2203) Signed-off-by: hongming Co-authored-by: hongming --- pkg/apiserver/query/field.go | 1 + pkg/models/resources/v1alpha3/interface.go | 2 +- pkg/models/resources/v1beta1/interface.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/apiserver/query/field.go b/pkg/apiserver/query/field.go index 453d7d492..c439c1967 100644 --- a/pkg/apiserver/query/field.go +++ b/pkg/apiserver/query/field.go @@ -10,6 +10,7 @@ type Value string const ( FieldName = "name" + FieldNameAndAlias = "nameAndAlias" FieldNames = "names" FieldUID = "uid" FieldCreationTimeStamp = "creationTimestamp" diff --git a/pkg/models/resources/v1alpha3/interface.go b/pkg/models/resources/v1alpha3/interface.go index 365372f5c..4402b77b2 100644 --- a/pkg/models/resources/v1alpha3/interface.go +++ b/pkg/models/resources/v1alpha3/interface.go @@ -109,7 +109,7 @@ func DefaultObjectMetaFilter(item metav1.ObjectMeta, filter query.Filter) bool { } return false // /namespaces?page=1&limit=10&name=default - case query.FieldName: + case query.FieldName, query.FieldNameAndAlias: displayName := item.GetAnnotations()[constants.DisplayNameAnnotationKey] if displayName != "" && strings.Contains(displayName, string(filter.Value)) { return true diff --git a/pkg/models/resources/v1beta1/interface.go b/pkg/models/resources/v1beta1/interface.go index c5b4973f1..685b498bd 100644 --- a/pkg/models/resources/v1beta1/interface.go +++ b/pkg/models/resources/v1beta1/interface.go @@ -137,7 +137,7 @@ func DefaultObjectMetaFilter(item metav1.Object, filter query.Filter) bool { } return false // /namespaces?page=1&limit=10&name=default - case query.FieldName: + case query.FieldName, query.FieldNameAndAlias: displayName := item.GetAnnotations()[constants.DisplayNameAnnotationKey] if displayName != "" && strings.Contains(strings.ToLower(displayName), strings.ToLower(string(filter.Value))) { return true