From c66ff4a398dbe7960305798d063e631baf75bf64 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Sun, 28 Sep 2025 19:29:43 +0300
Subject: [PATCH] search by name fix | new colors from hsl | only kinds with
 list verb in search

---
 .../TableApiBuiltin/TableApiBuiltin.tsx       |  6 +---
 .../molecules/TableApiBuiltin/utils.ts        | 11 ------
 src/components/organisms/Search/Search.tsx    | 34 ++++++++++---------
 .../molecules/SearchEntry/SearchEntry.tsx     | 12 +------
 src/pages/SearchPage/SearchPage.tsx           |  4 +--
 5 files changed, 22 insertions(+), 45 deletions(-)

diff --git a/src/components/molecules/TableApiBuiltin/TableApiBuiltin.tsx b/src/components/molecules/TableApiBuiltin/TableApiBuiltin.tsx
index 987fb40..00e3bb6 100644
--- a/src/components/molecules/TableApiBuiltin/TableApiBuiltin.tsx
+++ b/src/components/molecules/TableApiBuiltin/TableApiBuiltin.tsx
@@ -35,7 +35,6 @@ type TTableApiBuiltinProps = {
   apiGroup?: string // api
   apiVersion?: string // api
   typeName: string
-  specificName?: string
   labels?: string[]
   fields?: string[]
   limit: string | null
@@ -51,7 +50,6 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
   apiGroup,
   apiVersion,
   typeName,
-  specificName,
   labels,
   fields,
   limit,
@@ -159,7 +157,6 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
     clusterName: cluster,
     namespace,
     typeName,
-    specificName,
     labels,
     fields,
     limit,
@@ -176,7 +173,6 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
     apiGroup: apiGroup || '',
     apiVersion: apiVersion || '',
     typeName,
-    specificName,
     labels,
     fields,
     limit,
@@ -239,7 +235,7 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
               cluster={cluster}
               theme={theme}
               baseprefix={inside ? `${baseprefix}/inside` : baseprefix}
-              dataItems={getDataItems({ resourceType, dataBuiltin, dataApi, isSingle: !!specificName })}
+              dataItems={getDataItems({ resourceType, dataBuiltin, dataApi })}
               dataForControls={{
                 cluster,
                 syntheticProject: params.syntheticProject,
diff --git a/src/components/molecules/TableApiBuiltin/utils.ts b/src/components/molecules/TableApiBuiltin/utils.ts
index a523a9c..77a18f3 100644
--- a/src/components/molecules/TableApiBuiltin/utils.ts
+++ b/src/components/molecules/TableApiBuiltin/utils.ts
@@ -4,22 +4,11 @@ export const getDataItems = ({
   resourceType,
   dataBuiltin,
   dataApi,
-  isSingle,
 }: {
   resourceType: 'builtin' | 'api'
   dataBuiltin?: TBuiltinResources
   dataApi?: TApiResources
-  isSingle?: boolean
 }): TJSON[] => {
-  if (isSingle) {
-    if (resourceType === 'builtin') {
-      return dataBuiltin ? [dataBuiltin] : []
-    }
-
-    if (resourceType === 'api') {
-      return dataApi ? [dataApi] : []
-    }
-  }
   return resourceType === 'builtin' ? dataBuiltin?.items || [] : dataApi?.items || []
 }
 
diff --git a/src/components/organisms/Search/Search.tsx b/src/components/organisms/Search/Search.tsx
index 1527e5e..23fd9f7 100644
--- a/src/components/organisms/Search/Search.tsx
+++ b/src/components/organisms/Search/Search.tsx
@@ -240,22 +240,24 @@ export const Search: FC = () => {
             },
           }}
         >
-          {watchedKinds?.map(item => (
-            <Fragment key={item}>
-              <Spacer $space={20} $samespace />
-              <SearchEntry
-                kindsWithVersion={kindsWithVersion}
-                form={form}
-                constants={{
-                  FIELD_NAME,
-                }}
-                resource={item}
-                name={watchedName}
-                labels={watchedLabels}
-                fields={watchedFields}
-              />
-            </Fragment>
-          ))}
+          {watchedKinds?.map(item => {
+            const fields = [...(watchedFields || []), ...(watchedName ? [`metadata.name=${watchedName}`] : [])]
+            return (
+              <Fragment key={item}>
+                <Spacer $space={20} $samespace />
+                <SearchEntry
+                  kindsWithVersion={kindsWithVersion}
+                  form={form}
+                  constants={{
+                    FIELD_NAME,
+                  }}
+                  resource={item}
+                  labels={watchedLabels}
+                  fields={fields.length ? fields : undefined}
+                />
+              </Fragment>
+            )
+          })}
         </ConfigProvider>
         <Spacer $space={20} $samespace />
       </Styled.OverflowContainer>
diff --git a/src/components/organisms/Search/molecules/SearchEntry/SearchEntry.tsx b/src/components/organisms/Search/molecules/SearchEntry/SearchEntry.tsx
index 3312adc..6a90d20 100644
--- a/src/components/organisms/Search/molecules/SearchEntry/SearchEntry.tsx
+++ b/src/components/organisms/Search/molecules/SearchEntry/SearchEntry.tsx
@@ -19,7 +19,6 @@ import { Styled } from './styled'
 
 type TSearchEntryProps = {
   resource: string
-  name?: string
   labels?: string[]
   fields?: string[]
   form: FormInstance
@@ -29,15 +28,7 @@ type TSearchEntryProps = {
   kindsWithVersion: TKindWithVersion[]
 }
 
-export const SearchEntry: FC<TSearchEntryProps> = ({
-  resource,
-  name,
-  labels,
-  fields,
-  form,
-  constants,
-  kindsWithVersion,
-}) => {
+export const SearchEntry: FC<TSearchEntryProps> = ({ resource, labels, fields, form, constants, kindsWithVersion }) => {
   const { namespace, syntheticProject } = useParams()
   const [searchParams] = useSearchParams()
   const { token } = antdtheme.useToken()
@@ -96,7 +87,6 @@ export const SearchEntry: FC<TSearchEntryProps> = ({
               apiGroup={apiGroup.length > 0 ? apiGroup : undefined}
               apiVersion={apiGroup.length > 0 ? apiVersion : undefined}
               typeName={typeName}
-              specificName={name?.length ? name : undefined}
               labels={labels?.length ? labels : undefined}
               fields={fields?.length ? fields : undefined}
               limit={searchParams.get('limit')}
diff --git a/src/pages/SearchPage/SearchPage.tsx b/src/pages/SearchPage/SearchPage.tsx
index 922f312..b2ed41e 100644
--- a/src/pages/SearchPage/SearchPage.tsx
+++ b/src/pages/SearchPage/SearchPage.tsx
@@ -16,11 +16,11 @@ export const SearchPage: FC<TSearchPageProps> = ({ forcedTheme }) => {
   const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
   const possibleInstance = syntheticProject && namespace ? namespace : undefined
 
-  const sidebarId = `${getSidebarIdPrefix({ instance: !!syntheticProject, project: !!namespace })}seach-page`
+  const sidebarId = `${getSidebarIdPrefix({ instance: !!syntheticProject, project: !!namespace })}search-page`
   const breadcrumbsId = `${getBreadcrumbsIdPrefix({
     instance: !!syntheticProject,
     project: !!namespace,
-  })}seach-page`
+  })}search-page`
 
   return (
     <BaseTemplate