From 7995897087eb053118e7d66f5623c16a6a239236 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Thu, 6 Nov 2025 04:04:46 +0300
Subject: [PATCH 01/32] tables with list-then-watch

---
 src/App.tsx                                   |  5 ++
 .../TableApiBuiltin/TableApiBuiltin.tsx       | 82 ++++++++++++-------
 .../molecules/TableApiBuiltin/utils.ts        |  8 +-
 .../molecules/SearchEntry/SearchEntry.tsx     |  4 +-
 .../ListThenWatchPage/ListThenWatchPage.tsx   | 81 ++++++++++++++++++
 src/pages/ListThenWatchPage/index.ts          |  1 +
 src/pages/TableApiPage/TableApiPage.tsx       |  4 +-
 .../TableBuiltinPage/TableBuiltinPage.tsx     |  4 +-
 src/pages/index.ts                            |  2 +
 9 files changed, 155 insertions(+), 36 deletions(-)
 create mode 100644 src/pages/ListThenWatchPage/ListThenWatchPage.tsx
 create mode 100644 src/pages/ListThenWatchPage/index.ts

diff --git a/src/App.tsx b/src/App.tsx
index 6711b2b..ecae2df 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -27,6 +27,7 @@ import {
   FactoryPage,
   FactoryAdminPage,
   SearchPage,
+  ListThenWatchPage,
 } from 'pages'
 import { getBasePrefix } from 'utils/getBaseprefix'
 import { colorsLight, colorsDark, sizes } from 'constants/colors'
@@ -125,6 +126,10 @@ export const App: FC<TAppProps> = ({ isFederation, forcedTheme }) => {
         />
         <Route path={`${prefix}/:clusterName/:namespace?/:syntheticProject?/search/*`} element={<SearchPage />} />
         <Route path={`${prefix}/factory-admin/*`} element={<FactoryAdminPage />} />
+        <Route
+          path={`${prefix}/:clusterName/:namespace?/:syntheticProject?/list-then-watch/*`}
+          element={<ListThenWatchPage />}
+        />
       </Route>
     </Routes>
   )
diff --git a/src/components/molecules/TableApiBuiltin/TableApiBuiltin.tsx b/src/components/molecules/TableApiBuiltin/TableApiBuiltin.tsx
index 4a27a36..201d4f9 100644
--- a/src/components/molecules/TableApiBuiltin/TableApiBuiltin.tsx
+++ b/src/components/molecules/TableApiBuiltin/TableApiBuiltin.tsx
@@ -12,8 +12,7 @@ import {
   DeleteModalMany,
   // checkIfBuiltInInstanceNamespaceScoped,
   // checkIfApiInstanceNamespaceScoped,
-  useBuiltinResources,
-  useApiResources,
+  useListWatch,
   Spacer,
   getLinkToForm,
 } from '@prorobotech/openapi-k8s-toolkit'
@@ -38,7 +37,7 @@ type TTableApiBuiltinProps = {
   typeName: string
   labels?: string[]
   fields?: string[]
-  limit: string | null
+  limit?: number
   inside?: boolean
   customizationIdPrefix: string
   searchMount?: boolean
@@ -143,35 +142,62 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
   })
 
   const {
-    isPending: isPendingBuiltin,
-    error: errorBuiltin,
-    data: dataBuiltin,
-  } = useBuiltinResources({
-    clusterName: cluster,
-    namespace,
-    typeName,
-    labels,
-    fields,
-    limit,
+    state: stateCore,
+    status: statusCore,
+    lastError: lastErrorCore,
+  } = useListWatch({
+    wsUrl: `/api/clusters/${cluster}/openapi-bff-ws/listThenWatch/listWatchWs`,
+    paused: false,
+    ignoreRemove: false,
+    autoDrain: true,
+    preserveStateOnUrlChange: true,
+    pageSize: limit,
+    query: {
+      namespace,
+      apiVersion: apiVersion || '',
+      plural: typeName,
+      labelSelector: labels ? encodeURIComponent(labels.join(',')) : undefined,
+      fieldSelector: fields ? encodeURIComponent(fields.join(',')) : undefined,
+    },
     isEnabled: resourceType === 'builtin',
   })
 
+  const isPendingBuiltin = statusCore === 'connecting'
+  const errorBuiltin = statusCore === 'closed' && lastErrorCore ? lastErrorCore : undefined
+  const dataBuiltin = stateCore.order.map(key => {
+    const res = stateCore.byKey[key]
+    return res
+  })
+
   const {
-    isPending: isPendingApi,
-    error: errorApi,
-    data: dataApi,
-  } = useApiResources({
-    clusterName: cluster,
-    namespace,
-    apiGroup: apiGroup || '',
-    apiVersion: apiVersion || '',
-    typeName,
-    labels,
-    fields,
-    limit,
+    state: stateApi,
+    status: statusApi,
+    lastError: lastErrorApi,
+  } = useListWatch({
+    wsUrl: `/api/clusters/${cluster}/openapi-bff-ws/listThenWatch/listWatchWs`,
+    paused: false,
+    ignoreRemove: false,
+    autoDrain: true,
+    preserveStateOnUrlChange: true,
+    pageSize: limit,
+    query: {
+      namespace,
+      apiGroup: apiGroup || '',
+      apiVersion: apiVersion || '',
+      plural: typeName,
+      labelSelector: labels ? labels.join(',') : undefined,
+      fieldSelector: fields ? fields.join(',') : undefined,
+    },
     isEnabled: resourceType === 'api' && !!apiGroup && !!apiVersion,
   })
 
+  const isPendingApi = statusApi === 'connecting'
+  const errorApi = statusApi === 'closed' && lastErrorApi ? lastErrorApi : undefined
+  const dataApi = stateApi.order.map(key => {
+    const res = stateApi.byKey[key]
+    return res
+  })
+
   const onDeleteHandle = (name: string, endpoint: string) => {
     setIsDeleteModalOpen({ name, endpoint })
   }
@@ -194,11 +220,9 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
     <>
       {((resourceType === 'builtin' && isPendingBuiltin) || (resourceType === 'api' && isPendingApi)) && <Spin />}
       {resourceType === 'builtin' && errorBuiltin && (
-        <Alert message={`An error has occurred: ${errorBuiltin?.message} `} type="error" />
-      )}
-      {resourceType === 'api' && errorApi && (
-        <Alert message={`An error has occurred: ${errorApi?.message} `} type="error" />
+        <Alert message={`An error has occurred: ${errorBuiltin} `} type="error" />
       )}
+      {resourceType === 'api' && errorApi && <Alert message={`An error has occurred: ${errorApi} `} type="error" />}
       <OverflowContainer height={height} searchMount={searchMount}>
         {!errorBuiltin &&
           !errorApi &&
diff --git a/src/components/molecules/TableApiBuiltin/utils.ts b/src/components/molecules/TableApiBuiltin/utils.ts
index dde900f..1e4cd77 100644
--- a/src/components/molecules/TableApiBuiltin/utils.ts
+++ b/src/components/molecules/TableApiBuiltin/utils.ts
@@ -1,4 +1,4 @@
-import { TBuiltinResources, TApiResources, TJSON } from '@prorobotech/openapi-k8s-toolkit'
+import { TSingleResource, TJSON } from '@prorobotech/openapi-k8s-toolkit'
 
 export const getDataItems = ({
   resourceType,
@@ -6,8 +6,8 @@ export const getDataItems = ({
   dataApi,
 }: {
   resourceType: 'builtin' | 'api'
-  dataBuiltin?: TBuiltinResources
-  dataApi?: TApiResources
+  dataBuiltin?: TSingleResource[]
+  dataApi?: TSingleResource[]
 }): TJSON[] => {
-  return resourceType === 'builtin' ? dataBuiltin?.items || [] : dataApi?.items || []
+  return resourceType === 'builtin' ? dataBuiltin || [] : dataApi || []
 }
diff --git a/src/components/organisms/Search/molecules/SearchEntry/SearchEntry.tsx b/src/components/organisms/Search/molecules/SearchEntry/SearchEntry.tsx
index 169bd9f..28e6ab0 100644
--- a/src/components/organisms/Search/molecules/SearchEntry/SearchEntry.tsx
+++ b/src/components/organisms/Search/molecules/SearchEntry/SearchEntry.tsx
@@ -60,6 +60,8 @@ export const SearchEntry: FC<TSearchEntryProps> = ({ resource, labels, fields, f
     form.setFieldsValue({ [FIELD_NAME]: cur.filter(v => v !== value) })
   }
 
+  const limitSp = searchParams.get('limit')
+
   return (
     <Styled.Container $colorBorder={token.colorBorder} $colorText={token.colorText}>
       <Flex justify="space-between" align="center">
@@ -98,7 +100,7 @@ export const SearchEntry: FC<TSearchEntryProps> = ({ resource, labels, fields, f
               typeName={typeName}
               labels={labels?.length ? labels : undefined}
               fields={fields?.length ? fields : undefined}
-              limit={searchParams.get('limit')}
+              limit={limitSp && limitSp.length > 0 ? Number(limitSp) : undefined}
               customizationIdPrefix={tableCustomizationIdPrefix}
               searchMount
               kindName={kindName}
diff --git a/src/pages/ListThenWatchPage/ListThenWatchPage.tsx b/src/pages/ListThenWatchPage/ListThenWatchPage.tsx
new file mode 100644
index 0000000..4d4775d
--- /dev/null
+++ b/src/pages/ListThenWatchPage/ListThenWatchPage.tsx
@@ -0,0 +1,81 @@
+/* eslint-disable no-void */
+/* eslint-disable no-console */
+/* eslint-disable react/button-has-type */
+import { useState, FC } from 'react'
+import { useListWatch, TUseListWatchQuery } from '@prorobotech/openapi-k8s-toolkit'
+
+export const ListThenWatchPage: FC = () => {
+  const [queryState, setQueryState] = useState<TUseListWatchQuery>({
+    apiGroup: '',
+    apiVersion: 'v1',
+    plural: 'pods',
+    namespace: 'incloud-web',
+  })
+
+  const { state, total, status, lastError, reconnect } = useListWatch({
+    wsUrl: '/api/clusters/default/openapi-bff-ws/listThenWatch/listWatchWs',
+    paused: false,
+    ignoreRemove: false,
+    autoDrain: true,
+    preserveStateOnUrlChange: true,
+    isEnabled: true,
+    query: queryState,
+  })
+
+  const switchNamespace = (ns: string) => {
+    setQueryState(prev => ({
+      ...prev,
+      namespace: ns,
+      initialContinue: undefined,
+    }))
+  }
+
+  if (status === 'connecting') {
+    return <div>🔄 Connecting to API server…</div>
+  }
+
+  if (status === 'closed' && lastError) {
+    return <div className="text-red-600">⚠️ Error: {lastError}</div>
+  }
+
+  if (status === 'closed') {
+    return (
+      <div>
+        ❌ Connection closed. <button onClick={reconnect}>Retry</button>
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-4">
+      <header className="mb-3 flex gap-2 items-center">
+        <span>
+          Status: <b>{status}</b>
+        </span>
+        {lastError && <span className="text-red-600">• {lastError}</span>}
+        <button onClick={() => reconnect()} className="px-2 py-1 border rounded">
+          Reconnect
+        </button>
+        <button onClick={() => switchNamespace('kube-system')} className="px-2 py-1 border rounded">
+          kube-system
+        </button>
+        <span className="ml-auto">Total: {total}</span>
+      </header>
+
+      <ul className="space-y-1">
+        {state.order.map(key => {
+          const res = state.byKey[key]
+          const name = res.metadata?.name ?? key
+          const ns = res.metadata?.namespace ?? ''
+          return (
+            <li key={key} className="border rounded p-2">
+              <div className="text-sm">
+                {ns}/{name}
+              </div>
+            </li>
+          )
+        })}
+      </ul>
+    </div>
+  )
+}
diff --git a/src/pages/ListThenWatchPage/index.ts b/src/pages/ListThenWatchPage/index.ts
new file mode 100644
index 0000000..0a6ad10
--- /dev/null
+++ b/src/pages/ListThenWatchPage/index.ts
@@ -0,0 +1 @@
+export { ListThenWatchPage } from './ListThenWatchPage'
diff --git a/src/pages/TableApiPage/TableApiPage.tsx b/src/pages/TableApiPage/TableApiPage.tsx
index 87d2724..02a1fad 100644
--- a/src/pages/TableApiPage/TableApiPage.tsx
+++ b/src/pages/TableApiPage/TableApiPage.tsx
@@ -59,6 +59,8 @@ export const TableApiPage: FC<TTableApiPageProps> = ({ inside }) => {
   const sidebarIdProjectList = `${getSidebarIdPrefix({})}projects-list`
   const breadcrumbsIdProjectList = `${getBreadcrumbsIdPrefix({})}projects-list`
 
+  const limitSp = searchParams.get('limit')
+
   return (
     <BaseTemplate
       inside={inside}
@@ -84,7 +86,7 @@ export const TableApiPage: FC<TTableApiPageProps> = ({ inside }) => {
             apiVersion={apiVersion}
             typeName={typeName}
             key={`${apiGroup}-${apiVersion}-${namespace}-${typeName}`}
-            limit={searchParams.get('limit')}
+            limit={limitSp && limitSp.length > 0 ? Number(limitSp) : undefined}
             inside={inside}
             customizationIdPrefix={tableCustomizationIdPrefix}
           />
diff --git a/src/pages/TableBuiltinPage/TableBuiltinPage.tsx b/src/pages/TableBuiltinPage/TableBuiltinPage.tsx
index d36f48b..e1b6f96 100644
--- a/src/pages/TableBuiltinPage/TableBuiltinPage.tsx
+++ b/src/pages/TableBuiltinPage/TableBuiltinPage.tsx
@@ -46,6 +46,8 @@ export const TableBuiltinPage: FC<TTableBuiltinPageProps> = ({ inside }) => {
     inside,
   })
 
+  const limitSp = searchParams.get('limit')
+
   return (
     <BaseTemplate
       inside={inside}
@@ -70,7 +72,7 @@ export const TableBuiltinPage: FC<TTableBuiltinPageProps> = ({ inside }) => {
             key={`${namespace}-${typeName}`}
             namespace={namespace}
             typeName={typeName}
-            limit={searchParams.get('limit')}
+            limit={limitSp && limitSp.length > 0 ? Number(limitSp) : undefined}
             inside={inside}
             customizationIdPrefix={tableCustomizationIdPrefix}
           />
diff --git a/src/pages/index.ts b/src/pages/index.ts
index 82d8723..b032f86 100644
--- a/src/pages/index.ts
+++ b/src/pages/index.ts
@@ -19,3 +19,5 @@ export { FactoryPage } from './FactoryPage'
 export { FactoryAdminPage } from './FactoryAdminPage'
 /* search */
 export { SearchPage } from './SearchPage'
+/* list-then-watch */
+export { ListThenWatchPage } from './ListThenWatchPage'

From 9af91a7ec5c72854d3b7309bc56ff500cc78088f Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Thu, 6 Nov 2025 04:50:15 +0300
Subject: [PATCH 02/32] list-then-watch

---
 package-lock.json                                         | 8 ++++----
 package.json                                              | 2 +-
 .../ManageableBreadcrumbs/ManageableBreadcrumbs.tsx       | 8 ++++----
 .../molecules/ManageableSidebar/ManageableSidebar.tsx     | 6 ++++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1d1c035..a275bd3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^0.0.1-alpha.160",
+        "@prorobotech/openapi-k8s-toolkit": "^0.0.1-alpha.161",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2804,9 +2804,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "0.0.1-alpha.160",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-0.0.1-alpha.160.tgz",
-      "integrity": "sha512-brg6dJ0Tw1YY88xbPBWp6E/+8LEmTIKvPqDvS5MKOKWK375jYu585hV+B5qxmseB3OMl/IJg1Dipn8D6QefCeA==",
+      "version": "0.0.1-alpha.161",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-0.0.1-alpha.161.tgz",
+      "integrity": "sha512-sjgfoyW46i+XLrMk8gzGx4t/DXcXiqyc4EQahyQmxSIBk6ipuKVJ7zblGOOB4uOQNLf64yNC0mDG2cRDIPk5ng==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index 79a5bf0..e32eca8 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "0.0.1-alpha.160",
+    "@prorobotech/openapi-k8s-toolkit": "0.0.1-alpha.161",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",
diff --git a/src/components/molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx b/src/components/molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx
index c154621..65a6304 100644
--- a/src/components/molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx
+++ b/src/components/molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx
@@ -32,10 +32,10 @@ export const ManageableBreadcrumbs: FC<TManageableBreadCrumbsProps> = ({ idToCom
   return (
     <ManageableBreadcrumbsWithDataProvider
       idToCompare={idToCompare}
-      uri={`/api/clusters/${clusterName}/k8s/apis/${BASE_API_GROUP}/${BASE_API_VERSION}/${
-        inside ? 'breadcrumbsinsides' : 'breadcrumbs'
-      }/`}
-      refetchInterval={5000}
+      wsUrl={`/api/clusters/${clusterName}/openapi-bff-ws/listThenWatch/listWatchWs`}
+      apiGroup={BASE_API_GROUP}
+      apiVersion={BASE_API_VERSION}
+      plural={inside ? 'breadcrumbsinsides' : 'breadcrumbs'}
       isEnabled={clusterName !== undefined}
       replaceValues={{
         clusterName,
diff --git a/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx b/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
index c883e28..f63db1a 100644
--- a/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
+++ b/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
@@ -67,8 +67,10 @@ export const ManageableSidebar: FC<TManageableSidebarProps> = ({
       $maxHeight={height}
     >
       <ManageableSidebarWithDataProvider
-        uri={`/api/clusters/${clusterName}/k8s/apis/${BASE_API_GROUP}/${BASE_API_VERSION}/sidebars/`}
-        refetchInterval={5000}
+        wsUrl={`/api/clusters/${clusterName}/openapi-bff-ws/listThenWatch/listWatchWs`}
+        apiGroup={BASE_API_GROUP}
+        apiVersion={BASE_API_VERSION}
+        plural="sidebars"
         isEnabled={clusterName !== undefined}
         replaceValues={{
           clusterName,

From 4bff5d057a41a0b824a7bf2799d1a5ee84911a1a Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Thu, 6 Nov 2025 22:05:11 +0300
Subject: [PATCH 03/32] multiline height

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a275bd3..2b4eef4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^0.0.1-alpha.161",
+        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.1",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2804,9 +2804,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "0.0.1-alpha.161",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-0.0.1-alpha.161.tgz",
-      "integrity": "sha512-sjgfoyW46i+XLrMk8gzGx4t/DXcXiqyc4EQahyQmxSIBk6ipuKVJ7zblGOOB4uOQNLf64yNC0mDG2cRDIPk5ng==",
+      "version": "1.1.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.1.tgz",
+      "integrity": "sha512-vuE+cysEhQj0SAUNO/ByJw1OLih5KQUkTEzoJZ4I135/ciQXpMOY9QnXlcTnFxwafb1rnk4APBsAuYPTR4SpyQ==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index e32eca8..5baf5f4 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "0.0.1-alpha.161",
+    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.1",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",

From dd356a200cc900e7da31d4ef22490edc1eb842e2 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Fri, 7 Nov 2025 17:12:19 +0300
Subject: [PATCH 04/32] gated hook for resource fetching

---
 package-lock.json                             |   8 +-
 package.json                                  |   2 +-
 .../ManageableBreadcrumbs.tsx                 |   2 +-
 .../ManageableSidebar/ManageableSidebar.tsx   |   2 +-
 .../TableApiBuiltin/TableApiBuiltin.tsx       | 192 +++++++-----------
 5 files changed, 80 insertions(+), 126 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2b4eef4..702da31 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.1",
+        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.2",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2804,9 +2804,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "1.1.0-alpha.1",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.1.tgz",
-      "integrity": "sha512-vuE+cysEhQj0SAUNO/ByJw1OLih5KQUkTEzoJZ4I135/ciQXpMOY9QnXlcTnFxwafb1rnk4APBsAuYPTR4SpyQ==",
+      "version": "1.1.0-alpha.2",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.2.tgz",
+      "integrity": "sha512-aNOTBpOevJ1VqZ6e2w1yDpv//+4TGdk0j0fsJa465bOQJbFZLQIAxepZ+T2SY81mnVen24IMZhPBwn9VNEYJWA==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index 5baf5f4..97662e1 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.1",
+    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.2",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",
diff --git a/src/components/molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx b/src/components/molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx
index 65a6304..6743c05 100644
--- a/src/components/molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx
+++ b/src/components/molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx
@@ -32,7 +32,7 @@ export const ManageableBreadcrumbs: FC<TManageableBreadCrumbsProps> = ({ idToCom
   return (
     <ManageableBreadcrumbsWithDataProvider
       idToCompare={idToCompare}
-      wsUrl={`/api/clusters/${clusterName}/openapi-bff-ws/listThenWatch/listWatchWs`}
+      cluster={clusterName}
       apiGroup={BASE_API_GROUP}
       apiVersion={BASE_API_VERSION}
       plural={inside ? 'breadcrumbsinsides' : 'breadcrumbs'}
diff --git a/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx b/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
index f63db1a..e105d42 100644
--- a/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
+++ b/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
@@ -67,7 +67,7 @@ export const ManageableSidebar: FC<TManageableSidebarProps> = ({
       $maxHeight={height}
     >
       <ManageableSidebarWithDataProvider
-        wsUrl={`/api/clusters/${clusterName}/openapi-bff-ws/listThenWatch/listWatchWs`}
+        cluster={clusterName}
         apiGroup={BASE_API_GROUP}
         apiVersion={BASE_API_VERSION}
         plural="sidebars"
diff --git a/src/components/molecules/TableApiBuiltin/TableApiBuiltin.tsx b/src/components/molecules/TableApiBuiltin/TableApiBuiltin.tsx
index 201d4f9..2e6ed03 100644
--- a/src/components/molecules/TableApiBuiltin/TableApiBuiltin.tsx
+++ b/src/components/molecules/TableApiBuiltin/TableApiBuiltin.tsx
@@ -12,9 +12,10 @@ import {
   DeleteModalMany,
   // checkIfBuiltInInstanceNamespaceScoped,
   // checkIfApiInstanceNamespaceScoped,
-  useListWatch,
+  useK8sSmartResource,
   Spacer,
   getLinkToForm,
+  TSingleResource,
 } from '@prorobotech/openapi-k8s-toolkit'
 import { FlexGrow, PaddingContainer } from 'components'
 import { TABLE_PROPS } from 'constants/tableProps'
@@ -27,7 +28,7 @@ import {
   TABLE_ADD_BUTTON_HEIGHT,
 } from 'constants/blocksSizes'
 import { OverflowContainer } from './atoms'
-import { getDataItems } from './utils'
+// import { getDataItems } from './utils'
 
 type TTableApiBuiltinProps = {
   namespace?: string
@@ -142,60 +143,18 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
   })
 
   const {
-    state: stateCore,
-    status: statusCore,
-    lastError: lastErrorCore,
-  } = useListWatch({
-    wsUrl: `/api/clusters/${cluster}/openapi-bff-ws/listThenWatch/listWatchWs`,
-    paused: false,
-    ignoreRemove: false,
-    autoDrain: true,
-    preserveStateOnUrlChange: true,
-    pageSize: limit,
-    query: {
-      namespace,
-      apiVersion: apiVersion || '',
-      plural: typeName,
-      labelSelector: labels ? encodeURIComponent(labels.join(',')) : undefined,
-      fieldSelector: fields ? encodeURIComponent(fields.join(',')) : undefined,
-    },
-    isEnabled: resourceType === 'builtin',
-  })
-
-  const isPendingBuiltin = statusCore === 'connecting'
-  const errorBuiltin = statusCore === 'closed' && lastErrorCore ? lastErrorCore : undefined
-  const dataBuiltin = stateCore.order.map(key => {
-    const res = stateCore.byKey[key]
-    return res
-  })
-
-  const {
-    state: stateApi,
-    status: statusApi,
-    lastError: lastErrorApi,
-  } = useListWatch({
-    wsUrl: `/api/clusters/${cluster}/openapi-bff-ws/listThenWatch/listWatchWs`,
-    paused: false,
-    ignoreRemove: false,
-    autoDrain: true,
-    preserveStateOnUrlChange: true,
-    pageSize: limit,
-    query: {
-      namespace,
-      apiGroup: apiGroup || '',
-      apiVersion: apiVersion || '',
-      plural: typeName,
-      labelSelector: labels ? labels.join(',') : undefined,
-      fieldSelector: fields ? fields.join(',') : undefined,
-    },
-    isEnabled: resourceType === 'api' && !!apiGroup && !!apiVersion,
-  })
-
-  const isPendingApi = statusApi === 'connecting'
-  const errorApi = statusApi === 'closed' && lastErrorApi ? lastErrorApi : undefined
-  const dataApi = stateApi.order.map(key => {
-    const res = stateApi.byKey[key]
-    return res
+    data: dataItems,
+    isLoading,
+    error,
+  } = useK8sSmartResource<{ items: TSingleResource[] }>({
+    cluster,
+    namespace,
+    group: apiGroup || undefined,
+    version: apiVersion || '',
+    plural: typeName,
+    labelSelector: labels ? encodeURIComponent(labels.join(',')) : undefined,
+    fieldSelector: fields ? encodeURIComponent(fields.join(',')) : undefined,
+    limit,
   })
 
   const onDeleteHandle = (name: string, endpoint: string) => {
@@ -218,70 +177,65 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
 
   return (
     <>
-      {((resourceType === 'builtin' && isPendingBuiltin) || (resourceType === 'api' && isPendingApi)) && <Spin />}
-      {resourceType === 'builtin' && errorBuiltin && (
-        <Alert message={`An error has occurred: ${errorBuiltin} `} type="error" />
-      )}
-      {resourceType === 'api' && errorApi && <Alert message={`An error has occurred: ${errorApi} `} type="error" />}
+      {isLoading && <Spin />}
+      {error && <Alert message={`An error has occurred: ${error} `} type="error" />}
       <OverflowContainer height={height} searchMount={searchMount}>
-        {!errorBuiltin &&
-          !errorApi &&
-          ((resourceType === 'builtin' && dataBuiltin) || (resourceType === 'api' && dataApi)) && (
-            <EnrichedTableProvider
-              key={resourceType === 'builtin' ? `/v1/${typeName}` : `/${apiGroup}/${apiVersion}/${typeName}`}
-              customizationId={
-                resourceType === 'builtin'
-                  ? `${customizationIdPrefix}/v1/${typeName}`
-                  : `${customizationIdPrefix}/${apiGroup}/${apiVersion}/${typeName}`
-              }
-              tableMappingsReplaceValues={{
-                clusterName: params.clusterName,
-                projectName: params.projectName,
-                instanceName: params.instanceName,
-                namespace: params.namespace,
-                syntheticProject: params.syntheticProject,
-                entryType: params.entryType,
-                apiGroup: params.apiGroup,
-                apiVersion: params.apiVersion,
-                typeName: params.typeName,
-                entryName: params.entryName,
-                apiExtensionVersion: params.apiExtensionVersion,
-                crdName: params.crdName,
-                ...replaceValuesPartsOfUrls,
-              }}
-              cluster={cluster}
-              namespace={namespace}
-              theme={theme}
-              baseprefix={inside ? `${baseprefix}/inside` : baseprefix}
-              dataItems={getDataItems({ resourceType, dataBuiltin, dataApi })}
-              k8sResource={{
-                resource: typeName,
-                apiGroup,
-                apiVersion,
-              }}
-              // isNamespaced={isNamespaced}
-              // isNamespacedLoading={isNamespacedLoading}
-              dataForControls={{
-                cluster,
-                syntheticProject: params.syntheticProject,
-                resource: typeName,
-                apiGroup,
-                apiVersion,
-              }}
-              dataForControlsInternal={{
-                onDeleteHandle,
-              }}
-              selectData={{
-                selectedRowKeys,
-                onChange: (selectedRowKeys: React.Key[], selectedRowsData: { name: string; endpoint: string }[]) => {
-                  setSelectedRowKeys(selectedRowKeys)
-                  setSelectedRowsData(selectedRowsData)
-                },
-              }}
-              tableProps={{ ...TABLE_PROPS, disablePagination: !searchMount }}
-              // maxHeight={height - 65}
-            />
-          )}
+        {!error && dataItems && (
+          <EnrichedTableProvider
+            key={resourceType === 'builtin' ? `/v1/${typeName}` : `/${apiGroup}/${apiVersion}/${typeName}`}
+            customizationId={
+              resourceType === 'builtin'
+                ? `${customizationIdPrefix}/v1/${typeName}`
+                : `${customizationIdPrefix}/${apiGroup}/${apiVersion}/${typeName}`
+            }
+            tableMappingsReplaceValues={{
+              clusterName: params.clusterName,
+              projectName: params.projectName,
+              instanceName: params.instanceName,
+              namespace: params.namespace,
+              syntheticProject: params.syntheticProject,
+              entryType: params.entryType,
+              apiGroup: params.apiGroup,
+              apiVersion: params.apiVersion,
+              typeName: params.typeName,
+              entryName: params.entryName,
+              apiExtensionVersion: params.apiExtensionVersion,
+              crdName: params.crdName,
+              ...replaceValuesPartsOfUrls,
+            }}
+            cluster={cluster}
+            namespace={namespace}
+            theme={theme}
+            baseprefix={inside ? `${baseprefix}/inside` : baseprefix}
+            dataItems={dataItems.items}
+            k8sResource={{
+              resource: typeName,
+              apiGroup,
+              apiVersion,
+            }}
+            // isNamespaced={isNamespaced}
+            // isNamespacedLoading={isNamespacedLoading}
+            dataForControls={{
+              cluster,
+              syntheticProject: params.syntheticProject,
+              resource: typeName,
+              apiGroup,
+              apiVersion,
+            }}
+            dataForControlsInternal={{
+              onDeleteHandle,
+            }}
+            selectData={{
+              selectedRowKeys,
+              onChange: (selectedRowKeys: React.Key[], selectedRowsData: { name: string; endpoint: string }[]) => {
+                setSelectedRowKeys(selectedRowKeys)
+                setSelectedRowsData(selectedRowsData)
+              },
+            }}
+            tableProps={{ ...TABLE_PROPS, disablePagination: !searchMount }}
+            // maxHeight={height - 65}
+          />
+        )}
         {/* {selectedRowKeys.length > 0 && (
           <MarginTopContainer $top={-40}>
             <Flex gap={16}>

From ac0b1099d506d92df11c3cefa9a49f932fa5b28e Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Mon, 10 Nov 2025 04:50:14 +0300
Subject: [PATCH 05/32] multi query hybrid hook

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 702da31..36fdc3e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.2",
+        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.4",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2804,9 +2804,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "1.1.0-alpha.2",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.2.tgz",
-      "integrity": "sha512-aNOTBpOevJ1VqZ6e2w1yDpv//+4TGdk0j0fsJa465bOQJbFZLQIAxepZ+T2SY81mnVen24IMZhPBwn9VNEYJWA==",
+      "version": "1.1.0-alpha.4",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.4.tgz",
+      "integrity": "sha512-sZ5y4CKwk7Rf9ShqGJDbba5yGbA4hz2FEXFm6fXkVm+qx6X6gp5IXVS26IgZD7H7ulAUIxcLR7FwxzU6Q9PSDA==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index 97662e1..7c904fa 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.2",
+    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.4",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",

From 1f463004caec66e53eb4052d5b5835571c5c30bd Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Tue, 11 Nov 2025 02:05:24 +0300
Subject: [PATCH 06/32] uid to watchkey | factories websockets

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 36fdc3e..2c877fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.4",
+        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.5",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2804,9 +2804,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "1.1.0-alpha.4",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.4.tgz",
-      "integrity": "sha512-sZ5y4CKwk7Rf9ShqGJDbba5yGbA4hz2FEXFm6fXkVm+qx6X6gp5IXVS26IgZD7H7ulAUIxcLR7FwxzU6Q9PSDA==",
+      "version": "1.1.0-alpha.5",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.5.tgz",
+      "integrity": "sha512-JgRwGwNhhY7Rh7/c0QYzhWBMqQYwdVaef4ogwPNURJdXRext7gie5pSsxJVey2p1qc9O6K4AI4DQMEHccr8fcw==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index 7c904fa..446cc63 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.4",
+    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.5",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",

From aec50c47db5ebcea917910d43d409f1edcc7efa1 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Tue, 11 Nov 2025 02:21:18 +0300
Subject: [PATCH 07/32] factories, navigation resource via hooks

---
 src/components/organisms/Factory/Factory.tsx  | 19 ++++++++----
 .../organisms/Selector/Selector.tsx           | 29 +++++++++++++----
 .../SelectorNamespace/SelectorNamespace.tsx   | 31 +++++++++++++++----
 src/hooks/useNavSelector/useNavSelector.ts    | 29 +++++++++++++----
 4 files changed, 84 insertions(+), 24 deletions(-)

diff --git a/src/components/organisms/Factory/Factory.tsx b/src/components/organisms/Factory/Factory.tsx
index 2da5374..6ed21ae 100644
--- a/src/components/organisms/Factory/Factory.tsx
+++ b/src/components/organisms/Factory/Factory.tsx
@@ -4,7 +4,8 @@ import {
   DynamicComponents,
   DynamicRendererWithProviders,
   TDynamicComponentsAppTypeMap,
-  useDirectUnknownResource,
+  // useDirectUnknownResource,
+  useK8sSmartResource,
   TFactoryResponse,
   ContentCard,
 } from '@prorobotech/openapi-k8s-toolkit'
@@ -44,11 +45,17 @@ export const Factory: FC<TFactoryProps> = ({ setSidebarTags }) => {
     }
   }, [])
 
-  const { data: factoryData } = useDirectUnknownResource<TFactoryResponse<TDynamicComponentsAppTypeMap>>({
-    uri: `/api/clusters/${cluster}/k8s/apis/${BASE_API_GROUP}/${BASE_API_VERSION}/factories/`,
-    refetchInterval: false,
-    queryKey: ['factories', cluster || 'no-cluster'],
-    isEnabled: cluster !== undefined,
+  // const { data: factoryData } = useDirectUnknownResource<TFactoryResponse<TDynamicComponentsAppTypeMap>>({
+  //   uri: `/api/clusters/${cluster}/k8s/apis/${BASE_API_GROUP}/${BASE_API_VERSION}/factories/`,
+  //   refetchInterval: false,
+  //   queryKey: ['factories', cluster || 'no-cluster'],
+  //   isEnabled: cluster !== undefined,
+  // })
+  const { data: factoryData } = useK8sSmartResource<TFactoryResponse<TDynamicComponentsAppTypeMap>>({
+    cluster,
+    group: BASE_API_GROUP,
+    version: BASE_API_VERSION,
+    plural: 'factories',
   })
 
   const { spec } = factoryData?.items.find(({ spec }) => spec.key === key) ?? { spec: undefined }
diff --git a/src/components/organisms/HeaderSecond/organisms/Selector/Selector.tsx b/src/components/organisms/HeaderSecond/organisms/Selector/Selector.tsx
index a7c0cdb..9fdfeda 100644
--- a/src/components/organisms/HeaderSecond/organisms/Selector/Selector.tsx
+++ b/src/components/organisms/HeaderSecond/organisms/Selector/Selector.tsx
@@ -1,7 +1,10 @@
 import React, { FC, useState } from 'react'
 import { Flex, Typography } from 'antd'
 import { useNavigate } from 'react-router-dom'
-import { useDirectUnknownResource } from '@prorobotech/openapi-k8s-toolkit'
+import {
+  // useDirectUnknownResource,
+  useK8sSmartResource,
+} from '@prorobotech/openapi-k8s-toolkit'
 import { useNavSelector } from 'hooks/useNavSelector'
 import { useMountEffect } from 'hooks/useMountEffect'
 import { EntrySelect } from 'components/atoms'
@@ -31,15 +34,29 @@ export const Selector: FC<TSelectorProps> = ({ clusterName, projectName, instanc
     projectName,
   )
 
-  const { data: navigationData } = useDirectUnknownResource<{
-    spec: { projects: { clear: string; change: string }; instances: { clear: string; change: string } }
+  // const { data: navigationData } = useDirectUnknownResource<{
+  //   spec: { projects: { clear: string; change: string }; instances: { clear: string; change: string } }
+  // }>({
+  //   uri: `/api/clusters/${clusterName}/k8s/apis/${BASE_API_GROUP}/${BASE_API_VERSION}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE}`,
+  //   refetchInterval: false,
+  //   queryKey: ['navigation', clusterName || 'no-cluster'],
+  //   isEnabled: clusterName !== undefined,
+  // })
+
+  const { data: navigationDataArr } = useK8sSmartResource<{
+    items: { spec: { projects: { clear: string; change: string }; instances: { clear: string; change: string } } }[]
   }>({
-    uri: `/api/clusters/${clusterName}/k8s/apis/${BASE_API_GROUP}/${BASE_API_VERSION}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE}`,
-    refetchInterval: false,
-    queryKey: ['navigation', clusterName || 'no-cluster'],
+    cluster: clusterName || '',
+    group: BASE_API_GROUP,
+    version: BASE_API_VERSION,
+    plural: BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME,
+    fieldSelector: `metadata.name=${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE}`,
     isEnabled: clusterName !== undefined,
   })
 
+  const navigationData =
+    navigationDataArr?.items && navigationDataArr.items.length > 0 ? navigationDataArr.items[0] : undefined
+
   // const handleClusterChange = (value: string) => {
   //   setSelectedClusterName(value)
   //   navigate(`${baseprefix}/clusters/${value}`)
diff --git a/src/components/organisms/HeaderSecond/organisms/SelectorNamespace/SelectorNamespace.tsx b/src/components/organisms/HeaderSecond/organisms/SelectorNamespace/SelectorNamespace.tsx
index c3bf2a1..46c9ce5 100644
--- a/src/components/organisms/HeaderSecond/organisms/SelectorNamespace/SelectorNamespace.tsx
+++ b/src/components/organisms/HeaderSecond/organisms/SelectorNamespace/SelectorNamespace.tsx
@@ -1,7 +1,10 @@
 import React, { FC, useState } from 'react'
 import { Flex, Typography } from 'antd'
 import { useLocation, useNavigate } from 'react-router-dom'
-import { useDirectUnknownResource } from '@prorobotech/openapi-k8s-toolkit'
+import {
+  // useDirectUnknownResource,
+  useK8sSmartResource,
+} from '@prorobotech/openapi-k8s-toolkit'
 import { useSelector } from 'react-redux'
 import type { RootState } from 'store/store'
 import { useNavSelectorInside } from 'hooks/useNavSelectorInside'
@@ -31,15 +34,31 @@ export const SelectorNamespace: FC<TSelectorNamespaceProps> = ({ clusterName, na
 
   const { namespacesInSidebar } = useNavSelectorInside(selectedClusterName)
 
-  const { data: navigationData } = useDirectUnknownResource<{
-    spec: { namespaces: { clear: string; change: string } }
+  // const { data: navigationData } = useDirectUnknownResource<{
+  //   spec: { namespaces: { clear: string; change: string } }
+  // }>({
+  //   uri: `/api/clusters/${clusterName}/k8s/apis/${BASE_API_GROUP}/${BASE_API_VERSION}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE}`,
+  //   refetchInterval: false,
+  //   queryKey: ['navigation', clusterName || 'no-cluster'],
+  //   isEnabled: clusterName !== undefined,
+  // })
+
+  const { data: navigationDataArr } = useK8sSmartResource<{
+    items: {
+      spec: { namespaces: { clear: string; change: string } }
+    }[]
   }>({
-    uri: `/api/clusters/${clusterName}/k8s/apis/${BASE_API_GROUP}/${BASE_API_VERSION}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE}`,
-    refetchInterval: false,
-    queryKey: ['navigation', clusterName || 'no-cluster'],
+    cluster: clusterName || '',
+    group: BASE_API_GROUP,
+    version: BASE_API_VERSION,
+    plural: BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME,
+    fieldSelector: `metadata.name=${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE}`,
     isEnabled: clusterName !== undefined,
   })
 
+  const navigationData =
+    navigationDataArr?.items && navigationDataArr.items.length > 0 ? navigationDataArr.items[0] : undefined
+
   const isSearchPage = useIsSearchPage(baseprefix || '')
 
   const handleNamepsaceChange = (value?: string) => {
diff --git a/src/hooks/useNavSelector/useNavSelector.ts b/src/hooks/useNavSelector/useNavSelector.ts
index 4bc12ef..e338a32 100644
--- a/src/hooks/useNavSelector/useNavSelector.ts
+++ b/src/hooks/useNavSelector/useNavSelector.ts
@@ -2,7 +2,8 @@ import {
   useApiResources,
   TClusterList,
   TSingleResource,
-  useDirectUnknownResource,
+  // useDirectUnknownResource,
+  useK8sSmartResource,
 } from '@prorobotech/openapi-k8s-toolkit'
 import { useSelector } from 'react-redux'
 import { RootState } from 'store/store'
@@ -50,15 +51,31 @@ const mappedInstanceToOptionInSidebar = ({
 export const useNavSelector = (clusterName?: string, projectName?: string) => {
   const clusterList = useSelector((state: RootState) => state.clusterList.clusterList)
 
-  const { data: navigationData } = useDirectUnknownResource<{
-    spec: { instances: { mapOptionsPattern: string } }
+  // const { data: navigationData } = useDirectUnknownResource<{
+  //   spec: { instances: { mapOptionsPattern: string } }
+  // }>({
+  //   uri: `/api/clusters/${clusterName}/k8s/apis/${BASE_API_GROUP}/${BASE_API_VERSION}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE}`,
+  //   refetchInterval: false,
+  //   queryKey: ['navigation', clusterName || 'no-cluster'],
+  //   isEnabled: clusterName !== undefined,
+  // })
+
+  const { data: navigationDataArr } = useK8sSmartResource<{
+    items: {
+      spec: { instances: { mapOptionsPattern: string } }
+    }[]
   }>({
-    uri: `/api/clusters/${clusterName}/k8s/apis/${BASE_API_GROUP}/${BASE_API_VERSION}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE}`,
-    refetchInterval: false,
-    queryKey: ['navigation', clusterName || 'no-cluster'],
+    cluster: clusterName || '',
+    group: BASE_API_GROUP,
+    version: BASE_API_VERSION,
+    plural: BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME,
+    fieldSelector: `metadata.name=${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE}`,
     isEnabled: clusterName !== undefined,
   })
 
+  const navigationData =
+    navigationDataArr?.items && navigationDataArr.items.length > 0 ? navigationDataArr.items[0] : undefined
+
   const { data: projects } = useApiResources({
     clusterName: clusterName || '',
     namespace: '',

From a7d98362dd135548599354583ab402fdfc3aacd5 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Tue, 11 Nov 2025 02:32:11 +0300
Subject: [PATCH 08/32] crds sockets

---
 .../molecules/TableCrdInfo/TableCrdInfo.tsx   | 36 ++++++++++++---
 .../molecules/ResourceInfo/ResourceInfo.tsx   | 29 +++++++++---
 .../Forms/CrdsForms/UpdateCrdsForm.tsx        | 46 +++++++++++++++----
 3 files changed, 89 insertions(+), 22 deletions(-)

diff --git a/src/components/molecules/TableCrdInfo/TableCrdInfo.tsx b/src/components/molecules/TableCrdInfo/TableCrdInfo.tsx
index fbd8519..72cc1bc 100644
--- a/src/components/molecules/TableCrdInfo/TableCrdInfo.tsx
+++ b/src/components/molecules/TableCrdInfo/TableCrdInfo.tsx
@@ -1,6 +1,12 @@
 import React, { FC, useState, useEffect } from 'react'
 import { Spin, Alert } from 'antd'
-import { usePermissions, checkIfApiInstanceNamespaceScoped, useCrdData } from '@prorobotech/openapi-k8s-toolkit'
+import {
+  usePermissions,
+  checkIfApiInstanceNamespaceScoped,
+  // useCrdData,
+  useK8sSmartResource,
+  TCRD,
+} from '@prorobotech/openapi-k8s-toolkit'
 import { useSelector } from 'react-redux'
 import { RootState } from 'store/store'
 import { ResourceInfo } from './molecules'
@@ -28,12 +34,28 @@ export const TableCrdInfo: FC<TTableCrdInfoProps> = ({
 
   const [isNamespaced, setIsNamespaced] = useState<boolean>()
 
-  const { isPending, error, data } = useCrdData({
-    clusterName: cluster,
-    crdName,
-    apiExtensionVersion,
+  // const { isPending, error, data } = useCrdData({
+  //   clusterName: cluster,
+  //   crdName,
+  //   apiExtensionVersion,
+  // })
+
+  const {
+    data: dataArr,
+    isLoading: isPending,
+    error,
+  } = useK8sSmartResource<{
+    items: TCRD[]
+  }>({
+    cluster,
+    group: 'apiextensions.k8s.io',
+    version: apiExtensionVersion,
+    plural: 'customresourcedefinitions',
+    fieldSelector: `metadata.name=${crdName}`,
   })
 
+  const data = dataArr?.items && dataArr.items.length > 0 ? dataArr.items[0] : undefined
+
   useEffect(() => {
     if (data && !isPending && !error) {
       checkIfApiInstanceNamespaceScoped({
@@ -79,7 +101,9 @@ export const TableCrdInfo: FC<TTableCrdInfoProps> = ({
   return (
     <>
       {isPending && <Spin />}
-      {error && <Alert message={`An error has occurred: ${error?.message} `} type="error" />}
+      {error && (
+        <Alert message={`An error has occurred: ${typeof error === 'string' ? error : error?.message} `} type="error" />
+      )}
       {!error && data && data.spec && (
         <ResourceInfo
           clusterName={cluster}
diff --git a/src/components/molecules/TableCrdInfo/molecules/ResourceInfo/ResourceInfo.tsx b/src/components/molecules/TableCrdInfo/molecules/ResourceInfo/ResourceInfo.tsx
index 9f0d04b..40dcb99 100644
--- a/src/components/molecules/TableCrdInfo/molecules/ResourceInfo/ResourceInfo.tsx
+++ b/src/components/molecules/TableCrdInfo/molecules/ResourceInfo/ResourceInfo.tsx
@@ -10,7 +10,9 @@ import {
   DeleteModal,
   DeleteModalMany,
   TAdditionalPrinterColumns,
-  useCrdResources,
+  // useCrdResources,
+  useK8sSmartResource,
+  TJSON,
 } from '@prorobotech/openapi-k8s-toolkit'
 import { FlexGrow, OverflowMaxHeightContainer, PaddingContainer } from 'components'
 import { TABLE_PROPS } from 'constants/tableProps'
@@ -92,12 +94,25 @@ export const ResourceInfo: FC<TResourceInfoProps> = ({
     }
   }, [])
 
-  const { isPending, error, data } = useCrdResources({
-    clusterName,
-    namespace,
-    apiGroup,
-    apiVersion,
-    crdName: crdPluralName,
+  // const { isPending, error, data } = useCrdResources({
+  //   clusterName,
+  //   namespace,
+  //   apiGroup,
+  //   apiVersion,
+  //   crdName: crdPluralName,
+  // })
+
+  const {
+    data,
+    isLoading: isPending,
+    error,
+  } = useK8sSmartResource<{
+    items: TJSON[]
+  }>({
+    cluster: clusterName,
+    group: apiGroup,
+    version: apiVersion,
+    plural: crdPluralName,
   })
 
   let resourceSchema = {}
diff --git a/src/components/organisms/Forms/CrdsForms/UpdateCrdsForm.tsx b/src/components/organisms/Forms/CrdsForms/UpdateCrdsForm.tsx
index 35714cb..7f4cb5d 100644
--- a/src/components/organisms/Forms/CrdsForms/UpdateCrdsForm.tsx
+++ b/src/components/organisms/Forms/CrdsForms/UpdateCrdsForm.tsx
@@ -1,6 +1,11 @@
 import React, { FC, useState } from 'react'
 import { Spin, Alert, Segmented } from 'antd'
-import { useCrdResourceSingle, Spacer } from '@prorobotech/openapi-k8s-toolkit'
+import {
+  //  useCrdResourceSingle,
+  useK8sSmartResource,
+  TSingleResource,
+  Spacer,
+} from '@prorobotech/openapi-k8s-toolkit'
 import { useSelector } from 'react-redux'
 import { RootState } from 'store/store'
 import { BlackholeForm } from 'components'
@@ -41,22 +46,45 @@ export const UpdateCrdsForm: FC<TUpdateCrdsFormProps> = ({
     onDisabled: onCurrentModeDisabled,
   }
 
-  const { data, isPending, error } = useCrdResourceSingle({
-    clusterName: cluster,
+  // const { data, isPending, error } = useCrdResourceSingle({
+  //   clusterName: cluster,
+  //   namespace,
+  //   apiGroup,
+  //   apiVersion,
+  //   crdName: typeName,
+  //   entryName,
+  //   refetchInterval: false,
+  // })
+
+  const {
+    data: dataArr,
+    isLoading: isPending,
+    error,
+  } = useK8sSmartResource<{
+    items: TSingleResource[]
+  }>({
+    cluster,
     namespace,
-    apiGroup,
-    apiVersion,
-    crdName: typeName,
-    entryName,
-    refetchInterval: false,
+    group: apiGroup,
+    version: apiVersion,
+    plural: typeName,
+    fieldSelector: `metadata.name=${entryName}`,
   })
 
+  const data = dataArr?.items && dataArr.items.length > 0 ? dataArr.items[0] : undefined
+
   if (isPending) {
     return <Spin />
   }
 
   if (error) {
-    return <Alert message={`An error has occurred: ${error?.message} `} type="error" />
+    return (
+      <Alert message={`An error has occurred: ${typeof error === 'string' ? error : error?.message} `} type="error" />
+    )
+  }
+
+  if (!data) {
+    return <Alert message={`An error has occurred: No data `} type="error" />
   }
 
   /* eslint-disable-next-line @typescript-eslint/no-unused-vars */

From 10cfafaf471a451822001455e25c130ca8381617 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Tue, 11 Nov 2025 02:52:02 +0300
Subject: [PATCH 09/32] navs hooks

---
 .../ListInsideClusterAndNs.tsx                | 61 ++++++++++++++-----
 src/hooks/useNavSelector/useNavSelector.ts    | 58 +++++++++++++-----
 src/hooks/useNavSelectorInside.ts             | 49 +++++++++++----
 3 files changed, 127 insertions(+), 41 deletions(-)

diff --git a/src/components/organisms/ListInsideClusterAndNs/ListInsideClusterAndNs.tsx b/src/components/organisms/ListInsideClusterAndNs/ListInsideClusterAndNs.tsx
index 4f52a36..8576d24 100644
--- a/src/components/organisms/ListInsideClusterAndNs/ListInsideClusterAndNs.tsx
+++ b/src/components/organisms/ListInsideClusterAndNs/ListInsideClusterAndNs.tsx
@@ -1,6 +1,14 @@
+/* eslint-disable no-nested-ternary */
 import React, { FC, useState } from 'react'
 import { Button, Alert, Spin, Typography } from 'antd'
-import { filterSelectOptions, Spacer, useBuiltinResources, useApiResources } from '@prorobotech/openapi-k8s-toolkit'
+import {
+  filterSelectOptions,
+  Spacer,
+  TSingleResource,
+  //  useBuiltinResources,
+  // useApiResources,
+  useK8sSmartResource,
+} from '@prorobotech/openapi-k8s-toolkit'
 import { useNavigate } from 'react-router-dom'
 import { useSelector, useDispatch } from 'react-redux'
 import { RootState } from 'store/store'
@@ -33,20 +41,39 @@ export const ListInsideClusterAndNs: FC = () => {
     typeof CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME === 'string' &&
     CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME.length > 0
 
-  const namespacesData = useBuiltinResources({
-    clusterName: selectedCluster || '',
-    typeName: 'namespaces',
-    limit: null,
+  // const namespacesData = useBuiltinResources({
+  //   clusterName: selectedCluster || '',
+  //   typeName: 'namespaces',
+  //   limit: null,
+  //   isEnabled: Boolean(selectedCluster !== undefined && !isCustomNamespaceResource),
+  // })
+
+  const namespacesData = useK8sSmartResource<{
+    items: TSingleResource[]
+  }>({
+    cluster: selectedCluster || '',
+    version: 'v1',
+    plural: 'namespaces',
     isEnabled: Boolean(selectedCluster !== undefined && !isCustomNamespaceResource),
   })
 
-  const namespacesDataCustom = useApiResources({
-    clusterName: selectedCluster || '',
-    apiGroup: CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
-    apiVersion: CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
-    typeName: CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME,
-    limit: null,
-    isEnabled: Boolean(selectedCluster !== undefined && isCustomNamespaceResource),
+  // const namespacesDataCustom = useApiResources({
+  //   clusterName: selectedCluster || '',
+  //   apiGroup: CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
+  //   apiVersion: CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
+  //   typeName: CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME,
+  //   limit: null,
+  //   isEnabled: Boolean(selectedCluster !== undefined && isCustomNamespaceResource),
+  // })
+
+  const namespacesDataCustom = useK8sSmartResource<{
+    items: TSingleResource[]
+  }>({
+    cluster: selectedCluster || '',
+    group: CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
+    version: CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
+    plural: CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME,
+    isEnabled: Boolean(selectedCluster !== undefined && !isCustomNamespaceResource),
   })
 
   return (
@@ -80,13 +107,19 @@ export const ListInsideClusterAndNs: FC = () => {
         />
       )}
       <Spacer $space={8} $samespace />
-      {selectedCluster && (isCustomNamespaceResource ? namespacesDataCustom.isPending : namespacesData.isPending) && (
+      {selectedCluster && (isCustomNamespaceResource ? namespacesDataCustom.isLoading : namespacesData.isLoading) && (
         <Spin />
       )}
       {selectedCluster && (isCustomNamespaceResource ? namespacesDataCustom.error : namespacesData.error) && (
         <Alert
           message={`An error has occurred: ${
-            isCustomNamespaceResource ? namespacesDataCustom.error?.message : namespacesData.error?.message
+            isCustomNamespaceResource
+              ? typeof namespacesDataCustom.error === 'string'
+                ? namespacesDataCustom.error
+                : namespacesDataCustom.error?.message
+              : typeof namespacesData.error === 'string'
+              ? namespacesData.error
+              : namespacesData.error?.message
           } `}
           type="error"
         />
diff --git a/src/hooks/useNavSelector/useNavSelector.ts b/src/hooks/useNavSelector/useNavSelector.ts
index e338a32..1ae504e 100644
--- a/src/hooks/useNavSelector/useNavSelector.ts
+++ b/src/hooks/useNavSelector/useNavSelector.ts
@@ -1,5 +1,5 @@
 import {
-  useApiResources,
+  // useApiResources,
   TClusterList,
   TSingleResource,
   // useDirectUnknownResource,
@@ -76,26 +76,54 @@ export const useNavSelector = (clusterName?: string, projectName?: string) => {
   const navigationData =
     navigationDataArr?.items && navigationDataArr.items.length > 0 ? navigationDataArr.items[0] : undefined
 
-  const { data: projects } = useApiResources({
-    clusterName: clusterName || '',
-    namespace: '',
-    apiGroup: BASE_PROJECTS_API_GROUP,
-    apiVersion: BASE_PROJECTS_VERSION,
-    typeName: BASE_PROJECTS_RESOURCE_NAME,
-    limit: null,
+  // const { data: projects } = useApiResources({
+  //   clusterName: clusterName || '',
+  //   namespace: '',
+  //   apiGroup: BASE_PROJECTS_API_GROUP,
+  //   apiVersion: BASE_PROJECTS_VERSION,
+  //   typeName: BASE_PROJECTS_RESOURCE_NAME,
+  //   limit: null,
+  //   isEnabled: clusterName !== undefined,
+  // })
+
+  const { data: projects } = useK8sSmartResource<{
+    items: TSingleResource[]
+  }>({
+    cluster: clusterName || '',
+    group: BASE_PROJECTS_API_GROUP,
+    version: BASE_PROJECTS_VERSION,
+    plural: BASE_PROJECTS_RESOURCE_NAME,
     isEnabled: clusterName !== undefined,
   })
 
-  const { data: instances, isSuccess: allInstancesLoadingSuccess } = useApiResources({
-    clusterName: clusterName || '',
-    namespace: '',
-    apiGroup: BASE_INSTANCES_API_GROUP,
-    apiVersion: BASE_INSTANCES_VERSION,
-    typeName: BASE_INSTANCES_RESOURCE_NAME,
-    limit: null,
+  // const { data: instances, isSuccess: allInstancesLoadingSuccess } = useApiResources({
+  //   clusterName: clusterName || '',
+  //   namespace: '',
+  //   apiGroup: BASE_INSTANCES_API_GROUP,
+  //   apiVersion: BASE_INSTANCES_VERSION,
+  //   typeName: BASE_INSTANCES_RESOURCE_NAME,
+  //   limit: null,
+  //   isEnabled: clusterName !== undefined,
+  // })
+
+  const {
+    data: instances,
+    isLoading: isInstancesLoading,
+    isError: isInstancesError,
+  } = useK8sSmartResource<{
+    items: TSingleResource[]
+  }>({
+    cluster: clusterName || '',
+    group: BASE_INSTANCES_API_GROUP,
+    version: BASE_INSTANCES_VERSION,
+    plural: BASE_INSTANCES_RESOURCE_NAME,
     isEnabled: clusterName !== undefined,
   })
 
+  const allInstancesLoadingSuccess: boolean = Boolean(
+    instances && instances.items && !isInstancesError && !isInstancesLoading,
+  )
+
   const clustersInSidebar = clusterList ? clusterList.map(mappedClusterToOptionInSidebar) : []
   const projectsInSidebar = clusterName && projects ? projects.items.map(mappedProjectToOptionInSidebar) : []
   const instancesInSidebar =
diff --git a/src/hooks/useNavSelectorInside.ts b/src/hooks/useNavSelectorInside.ts
index 7358170..58c4b06 100644
--- a/src/hooks/useNavSelectorInside.ts
+++ b/src/hooks/useNavSelectorInside.ts
@@ -1,4 +1,10 @@
-import { TClusterList, TSingleResource, useBuiltinResources, useApiResources } from '@prorobotech/openapi-k8s-toolkit'
+import {
+  TClusterList,
+  TSingleResource,
+  //  useBuiltinResources,
+  // useApiResources,
+  useK8sSmartResource,
+} from '@prorobotech/openapi-k8s-toolkit'
 import { useSelector } from 'react-redux'
 import { RootState } from 'store/store'
 import {
@@ -31,20 +37,39 @@ export const useNavSelectorInside = (clusterName?: string) => {
     typeof CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME === 'string' &&
     CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME.length > 0
 
-  const { data: namespaces } = useBuiltinResources({
-    clusterName: clusterName || '',
-    typeName: 'namespaces',
-    limit: null,
+  // const { data: namespaces } = useBuiltinResources({
+  //   clusterName: clusterName || '',
+  //   typeName: 'namespaces',
+  //   limit: null,
+  //   isEnabled: Boolean(clusterName !== undefined && !isCustomNamespaceResource),
+  // })
+
+  const { data: namespaces } = useK8sSmartResource<{
+    items: TSingleResource[]
+  }>({
+    cluster: clusterName || '',
+    version: 'v1',
+    plural: 'namespaces',
     isEnabled: Boolean(clusterName !== undefined && !isCustomNamespaceResource),
   })
 
-  const { data: namespacesCustom } = useApiResources({
-    clusterName: clusterName || '',
-    apiGroup: CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
-    apiVersion: CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
-    typeName: CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME,
-    limit: null,
-    isEnabled: Boolean(clusterName !== undefined && isCustomNamespaceResource),
+  // const { data: namespacesCustom } = useApiResources({
+  //   clusterName: clusterName || '',
+  //   apiGroup: CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
+  //   apiVersion: CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
+  //   typeName: CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME,
+  //   limit: null,
+  //   isEnabled: Boolean(clusterName !== undefined && isCustomNamespaceResource),
+  // })
+
+  const { data: namespacesCustom } = useK8sSmartResource<{
+    items: TSingleResource[]
+  }>({
+    cluster: clusterName || '',
+    group: CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
+    version: CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
+    plural: CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME,
+    isEnabled: Boolean(clusterName !== undefined && !isCustomNamespaceResource),
   })
 
   const clustersInSidebar = clusterList ? clusterList.map(mappedClusterToOptionInSidebar) : []

From dfd83addb6bfeb68c96e7238fb7006825183ed43 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Tue, 11 Nov 2025 04:01:35 +0300
Subject: [PATCH 10/32] handle wsurl change before connect

---
 .../ListInsideClusterAndNs/ListInsideClusterAndNs.tsx         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/organisms/ListInsideClusterAndNs/ListInsideClusterAndNs.tsx b/src/components/organisms/ListInsideClusterAndNs/ListInsideClusterAndNs.tsx
index 8576d24..b3e752c 100644
--- a/src/components/organisms/ListInsideClusterAndNs/ListInsideClusterAndNs.tsx
+++ b/src/components/organisms/ListInsideClusterAndNs/ListInsideClusterAndNs.tsx
@@ -30,7 +30,7 @@ export const ListInsideClusterAndNs: FC = () => {
   const [selectedCluster, setSelectedCluster] = useState<string>()
   const [selectedNamespace, setSelectedNamespace] = useState<string>()
 
-  const isCustomNamespaceResource =
+  const isCustomNamespaceResource: boolean =
     CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP &&
     typeof CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP === 'string' &&
     CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP.length > 0 &&
@@ -73,7 +73,7 @@ export const ListInsideClusterAndNs: FC = () => {
     group: CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
     version: CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
     plural: CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME,
-    isEnabled: Boolean(selectedCluster !== undefined && !isCustomNamespaceResource),
+    isEnabled: Boolean(selectedCluster !== undefined && isCustomNamespaceResource),
   })
 
   return (

From 67d5b09bab691b07ac07c8ffc66efa75391cc10e Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Tue, 11 Nov 2025 05:29:33 +0300
Subject: [PATCH 11/32] outlets

---
 src/App.tsx                                   |  86 ++++--------
 .../FactoryAdminPage/AddComponentModal.tsx    |  52 -------
 src/pages/FactoryAdminPage/AntdCardForm.tsx   |  73 ----------
 src/pages/FactoryAdminPage/AntdTextForm.tsx   |  55 --------
 .../FactoryAdminPage/AppComponentAdmin.tsx    | 128 ------------------
 src/pages/FactoryAdminPage/ComponentForm.tsx  |  15 --
 src/pages/FactoryAdminPage/ComponentForm2.tsx |  27 ----
 src/pages/FactoryAdminPage/ComponentNode.tsx  |  64 ---------
 .../FactoryAdminPage/DynamicComponentForm.tsx | 111 ---------------
 .../FactoryAdminPage/EditComponentModal.tsx   |  34 -----
 src/pages/FactoryAdminPage/TextWithIdForm.tsx |  39 ------
 src/pages/FactoryAdminPage/index.ts           |   1 -
 src/pages/FactoryAdminPage/types.ts           |  26 ----
 src/pages/FactoryAdminPage/utils.ts           | 111 ---------------
 src/pages/FactoryPage/FactoryPage.tsx         |  53 +++-----
 src/pages/FormApiPage/FormApiPage.tsx         |  97 -------------
 src/pages/FormBuiltinPage/FormBuiltinPage.tsx |  82 -----------
 src/pages/FormCrdPage/FormCrdPage.tsx         |  97 -------------
 src/pages/Forms/FormApiPage/FormApiPage.tsx   |  87 ++++++++++++
 src/pages/{ => Forms}/FormApiPage/index.ts    |   0
 .../Forms/FormBuiltinPage/FormBuiltinPage.tsx |  71 ++++++++++
 .../{ => Forms}/FormBuiltinPage/index.ts      |   0
 src/pages/Forms/FormCrdPage/FormCrdPage.tsx   |  87 ++++++++++++
 src/pages/{ => Forms}/FormCrdPage/index.ts    |   0
 src/pages/Forms/index.ts                      |   3 +
 .../ListInsideApiByApiGroupPage.tsx           |   0
 .../ListInsideApiByApiGroupPage/index.ts      |   0
 .../ListInsideApiPage/ListInsideApiPage.tsx   |   0
 .../{ => Insides}/ListInsideApiPage/index.ts  |   0
 .../ListInsideClustersAndNsPage.tsx           |   0
 .../ListInsideClustersAndNsPage/index.ts      |   0
 .../ListInsideCrdByApiGroupPage.tsx           |   0
 .../ListInsideCrdByApiGroupPage/index.ts      |   0
 src/pages/Insides/index.ts                    |   4 +
 .../ListThenWatchPage/ListThenWatchPage.tsx   |  81 -----------
 src/pages/ListThenWatchPage/index.ts          |   1 -
 src/pages/TableApiPage/TableApiPage.tsx       |  97 -------------
 .../TableBuiltinPage/TableBuiltinPage.tsx     |  83 ------------
 src/pages/TableCrdPage/TableCrdPage.tsx       |  79 -----------
 .../Tables/TableApiPage/TableApiPage.tsx      | 103 ++++++++++++++
 src/pages/{ => Tables}/TableApiPage/index.ts  |   0
 .../TableBuiltinPage/TableBuiltinPage.tsx     |  86 ++++++++++++
 .../{ => Tables}/TableBuiltinPage/index.ts    |   0
 .../Tables/TableCrdPage/TableCrdPage.tsx      |  84 ++++++++++++
 src/pages/{ => Tables}/TableCrdPage/index.ts  |   0
 src/pages/Tables/index.ts                     |   3 +
 src/pages/index.ts                            |  33 +++--
 src/templates/AppShell/AppShell.tsx           |  88 ++++++++++++
 src/templates/AppShell/index.ts               |   2 +
 src/templates/index.ts                        |   3 +
 50 files changed, 680 insertions(+), 1466 deletions(-)
 delete mode 100644 src/pages/FactoryAdminPage/AddComponentModal.tsx
 delete mode 100644 src/pages/FactoryAdminPage/AntdCardForm.tsx
 delete mode 100644 src/pages/FactoryAdminPage/AntdTextForm.tsx
 delete mode 100644 src/pages/FactoryAdminPage/AppComponentAdmin.tsx
 delete mode 100644 src/pages/FactoryAdminPage/ComponentForm.tsx
 delete mode 100644 src/pages/FactoryAdminPage/ComponentForm2.tsx
 delete mode 100644 src/pages/FactoryAdminPage/ComponentNode.tsx
 delete mode 100644 src/pages/FactoryAdminPage/DynamicComponentForm.tsx
 delete mode 100644 src/pages/FactoryAdminPage/EditComponentModal.tsx
 delete mode 100644 src/pages/FactoryAdminPage/TextWithIdForm.tsx
 delete mode 100644 src/pages/FactoryAdminPage/index.ts
 delete mode 100644 src/pages/FactoryAdminPage/types.ts
 delete mode 100644 src/pages/FactoryAdminPage/utils.ts
 delete mode 100644 src/pages/FormApiPage/FormApiPage.tsx
 delete mode 100644 src/pages/FormBuiltinPage/FormBuiltinPage.tsx
 delete mode 100644 src/pages/FormCrdPage/FormCrdPage.tsx
 create mode 100644 src/pages/Forms/FormApiPage/FormApiPage.tsx
 rename src/pages/{ => Forms}/FormApiPage/index.ts (100%)
 create mode 100644 src/pages/Forms/FormBuiltinPage/FormBuiltinPage.tsx
 rename src/pages/{ => Forms}/FormBuiltinPage/index.ts (100%)
 create mode 100644 src/pages/Forms/FormCrdPage/FormCrdPage.tsx
 rename src/pages/{ => Forms}/FormCrdPage/index.ts (100%)
 create mode 100644 src/pages/Forms/index.ts
 rename src/pages/{ => Insides}/ListInsideApiByApiGroupPage/ListInsideApiByApiGroupPage.tsx (100%)
 rename src/pages/{ => Insides}/ListInsideApiByApiGroupPage/index.ts (100%)
 rename src/pages/{ => Insides}/ListInsideApiPage/ListInsideApiPage.tsx (100%)
 rename src/pages/{ => Insides}/ListInsideApiPage/index.ts (100%)
 rename src/pages/{ => Insides}/ListInsideClustersAndNsPage/ListInsideClustersAndNsPage.tsx (100%)
 rename src/pages/{ => Insides}/ListInsideClustersAndNsPage/index.ts (100%)
 rename src/pages/{ => Insides}/ListInsideCrdByApiGroupPage/ListInsideCrdByApiGroupPage.tsx (100%)
 rename src/pages/{ => Insides}/ListInsideCrdByApiGroupPage/index.ts (100%)
 create mode 100644 src/pages/Insides/index.ts
 delete mode 100644 src/pages/ListThenWatchPage/ListThenWatchPage.tsx
 delete mode 100644 src/pages/ListThenWatchPage/index.ts
 delete mode 100644 src/pages/TableApiPage/TableApiPage.tsx
 delete mode 100644 src/pages/TableBuiltinPage/TableBuiltinPage.tsx
 delete mode 100644 src/pages/TableCrdPage/TableCrdPage.tsx
 create mode 100644 src/pages/Tables/TableApiPage/TableApiPage.tsx
 rename src/pages/{ => Tables}/TableApiPage/index.ts (100%)
 create mode 100644 src/pages/Tables/TableBuiltinPage/TableBuiltinPage.tsx
 rename src/pages/{ => Tables}/TableBuiltinPage/index.ts (100%)
 create mode 100644 src/pages/Tables/TableCrdPage/TableCrdPage.tsx
 rename src/pages/{ => Tables}/TableCrdPage/index.ts (100%)
 create mode 100644 src/pages/Tables/index.ts
 create mode 100644 src/templates/AppShell/AppShell.tsx
 create mode 100644 src/templates/AppShell/index.ts

diff --git a/src/App.tsx b/src/App.tsx
index ecae2df..e97f190 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -18,20 +18,19 @@ import {
   ListInsideApiPage,
   ListInsideCrdByApiGroupPage,
   ListInsideApiByApiGroupPage,
-  TableCrdPage,
+  // TableCrdPage,
   TableApiPage,
   TableBuiltinPage,
   FormBuiltinPage,
   FormApiPage,
-  FormCrdPage,
+  // FormCrdPage,
   FactoryPage,
-  FactoryAdminPage,
+  // FactoryAdminPage,
   SearchPage,
-  ListThenWatchPage,
 } from 'pages'
 import { getBasePrefix } from 'utils/getBaseprefix'
 import { colorsLight, colorsDark, sizes } from 'constants/colors'
-import { MainLayout } from 'templates/MainLayout'
+import { MainLayout, AppShell } from 'templates'
 
 type TAppProps = {
   isFederation?: boolean
@@ -62,6 +61,25 @@ export const App: FC<TAppProps> = ({ isFederation, forcedTheme }) => {
         <Route path={`${prefix}/clusters/:clusterName`} element={<ListProjectsPage />} />
         <Route path={`${prefix}/inside/`} element={<MainPage />} />
         <Route path={`${prefix}/clusters/:clusterName/projects/:namespace`} element={<ProjectInfoPage />} />
+
+        <Route path={`${prefix}/:clusterName/:namespace?/:syntheticProject?/*`} element={<AppShell />}>
+          {/* <Route path="crd-table/:apiGroup/:apiVersion/:apiExtensionVersion/:crdName" element={<TableCrdPage />} /> */}
+          <Route path="api-table/:apiGroup/:apiVersion/:typeName" element={<TableApiPage />} />
+          <Route path="builtin-table/:typeName" element={<TableBuiltinPage />} />
+          {/* <Route path="forms/crds/:apiGroup/:apiVersion/:typeName/:entryName?/"" element={<FormCrdPage />} /> */}
+          <Route path="forms/builtin/:apiVersion/:typeName/:entryName?/" element={<FormBuiltinPage />} />
+          <Route path="forms/apis/:apiGroup/:apiVersion/:typeName/:entryName?/" element={<FormApiPage />} />
+          <Route path="factory/:key/*" element={<FactoryPage />} />
+        </Route>
+        <Route path={`${prefix}/inside/:clusterName/:namespace?/:syntheticProject?/*`} element={<AppShell inside />}>
+          {/* <Route path="crd-table/:apiGroup/:apiVersion/:apiExtensionVersion/:crdName" element={<TableCrdPage inside />} /> */}
+          <Route path="api-table/:apiGroup/:apiVersion/:typeName" element={<TableApiPage inside />} />
+          <Route path="builtin-table/:typeName" element={<TableBuiltinPage inside />} />
+          {/* <Route path="forms/crds/:apiGroup/:apiVersion/:typeName/:entryName?/"" element={<FormCrdPage />} /> */}
+          <Route path="forms/builtin/:apiVersion/:typeName/:entryName?/" element={<FormBuiltinPage />} />
+          <Route path="forms/apis/:apiGroup/:apiVersion/:typeName/:entryName?/" element={<FormApiPage />} />
+        </Route>
+
         <Route path={`${prefix}/inside/clusters`} element={<ListInsideClustersAndNsPage inside />} />
         <Route path={`${prefix}/inside/:clusterName/:namespace?/apis`} element={<ListInsideApiPage inside />} />
         <Route
@@ -72,64 +90,8 @@ export const App: FC<TAppProps> = ({ isFederation, forcedTheme }) => {
           path={`${prefix}/inside/:clusterName/:namespace?/apis-by-api/:apiGroup/:apiVersion/`}
           element={<ListInsideApiByApiGroupPage inside />}
         />
-        <Route
-          path={`${prefix}/:clusterName/:namespace?/:syntheticProject?/crd-table/:apiGroup/:apiVersion/:apiExtensionVersion/:crdName`}
-          element={<TableCrdPage />}
-        />
-        <Route
-          path={`${prefix}/:clusterName/:namespace?/:syntheticProject?/api-table/:apiGroup/:apiVersion/:typeName`}
-          element={<TableApiPage />}
-        />
-        <Route
-          path={`${prefix}/:clusterName/:namespace?/:syntheticProject?/builtin-table/:typeName`}
-          element={<TableBuiltinPage />}
-        />
-        <Route
-          path={`${prefix}/:clusterName/:namespace?/:syntheticProject?/forms/builtin/:apiVersion/:typeName/:entryName?/`}
-          element={<FormBuiltinPage />}
-        />
-        <Route
-          path={`${prefix}/:clusterName/:namespace?/:syntheticProject?/forms/apis/:apiGroup/:apiVersion/:typeName/:entryName?/`}
-          element={<FormApiPage />}
-        />
-        <Route
-          path={`${prefix}/:clusterName/:namespace?/:syntheticProject?/forms/crds/:apiGroup/:apiVersion/:typeName/:entryName?/`}
-          element={<FormCrdPage />}
-        />
-        <Route
-          path={`${prefix}/inside/:clusterName/:namespace?/:syntheticProject?/crd-table/:apiGroup/:apiVersion/:apiExtensionVersion/:crdName`}
-          element={<TableCrdPage inside />}
-        />
-        <Route
-          path={`${prefix}/inside/:clusterName/:namespace?/:syntheticProject?/api-table/:apiGroup/:apiVersion/:typeName`}
-          element={<TableApiPage inside />}
-        />
-        <Route
-          path={`${prefix}/inside/:clusterName/:namespace?/:syntheticProject?/builtin-table/:typeName`}
-          element={<TableBuiltinPage inside />}
-        />
-        <Route
-          path={`${prefix}/inside/:clusterName/:namespace?/:syntheticProject?/forms/builtin/:apiVersion/:typeName/:entryName?/`}
-          element={<FormBuiltinPage inside />}
-        />
-        <Route
-          path={`${prefix}/inside/:clusterName/:namespace?/:syntheticProject?/forms/apis/:apiGroup/:apiVersion/:typeName/:entryName?/`}
-          element={<FormApiPage inside />}
-        />
-        <Route
-          path={`${prefix}/inside/:clusterName/:namespace?/:syntheticProject?/forms/crds/:apiGroup/:apiVersion/:typeName/:entryName?/`}
-          element={<FormCrdPage inside />}
-        />
-        <Route
-          path={`${prefix}/:clusterName/:namespace?/:syntheticProject?/factory/:key/*`}
-          element={<FactoryPage />}
-        />
+
         <Route path={`${prefix}/:clusterName/:namespace?/:syntheticProject?/search/*`} element={<SearchPage />} />
-        <Route path={`${prefix}/factory-admin/*`} element={<FactoryAdminPage />} />
-        <Route
-          path={`${prefix}/:clusterName/:namespace?/:syntheticProject?/list-then-watch/*`}
-          element={<ListThenWatchPage />}
-        />
       </Route>
     </Routes>
   )
diff --git a/src/pages/FactoryAdminPage/AddComponentModal.tsx b/src/pages/FactoryAdminPage/AddComponentModal.tsx
deleted file mode 100644
index f2d7616..0000000
--- a/src/pages/FactoryAdminPage/AddComponentModal.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React, { useState } from 'react'
-import { Modal, Button, Form, Select } from 'antd'
-import { ComponentType } from './types'
-
-export const componentTypes: ComponentType[] = [
-  'antdText',
-  'antdCard',
-  'antdFlex',
-  'antdRow',
-  'antdCol',
-  'partsOfUrl',
-  'multiQuery',
-  'parsedText',
-]
-
-interface AddComponentModalProps {
-  onAdd: (type: ComponentType) => void
-  title?: string
-}
-
-export const AddComponentModal: React.FC<AddComponentModalProps> = ({ onAdd, title = 'Add Component' }) => {
-  const [visible, setVisible] = useState(false)
-  const [form] = Form.useForm()
-
-  const handleSubmit = (values: { type: ComponentType }) => {
-    onAdd(values.type)
-    setVisible(false)
-    form.resetFields()
-  }
-
-  return (
-    <>
-      <Button onClick={() => setVisible(true)}>Add</Button>
-      <Modal title={title} visible={visible} onCancel={() => setVisible(false)} footer={null}>
-        <Form form={form} onFinish={handleSubmit}>
-          <Form.Item label="Component Type" name="type" rules={[{ required: true }]}>
-            <Select>
-              {componentTypes.map(type => (
-                <Select.Option key={type} value={type}>
-                  {type}
-                </Select.Option>
-              ))}
-            </Select>
-          </Form.Item>
-          <Button type="primary" htmlType="submit">
-            Add
-          </Button>
-        </Form>
-      </Modal>
-    </>
-  )
-}
diff --git a/src/pages/FactoryAdminPage/AntdCardForm.tsx b/src/pages/FactoryAdminPage/AntdCardForm.tsx
deleted file mode 100644
index 7e97207..0000000
--- a/src/pages/FactoryAdminPage/AntdCardForm.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-/* eslint-disable no-console */
-/* eslint-disable no-param-reassign */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import React, { useEffect } from 'react'
-import { Form, Input, Select, Button, Switch } from 'antd'
-
-const { TextArea } = Input
-const { Option } = Select
-
-interface AntdCardFormProps {
-  initialValues: any // This would be `TDynamicComponentsAppTypeMap['antdCard']`
-  onSave: (data: any) => void
-}
-
-export const AntdCardForm: React.FC<AntdCardFormProps> = ({ initialValues, onSave }) => {
-  const [form] = Form.useForm()
-
-  useEffect(() => {
-    form.setFieldsValue(initialValues)
-  }, [initialValues, form])
-
-  const handleSubmit = (values: any) => {
-    try {
-      if (values.style) {
-        values.style = JSON.parse(values.style)
-      }
-    } catch (e) {
-      console.log('Invalid JSON for style', e)
-      return
-    }
-
-    onSave(values)
-  }
-
-  return (
-    <Form form={form} onFinish={handleSubmit} layout="vertical" initialValues={initialValues}>
-      <Form.Item label="ID" name="id" rules={[{ required: true }]}>
-        <Input disabled />
-      </Form.Item>
-
-      <Form.Item label="Title" name="title">
-        <Input placeholder="Card title" />
-      </Form.Item>
-
-      <Form.Item label="Bordered" name="bordered" valuePropName="checked">
-        <Switch defaultChecked />
-      </Form.Item>
-
-      <Form.Item label="Cover Image URL" name="cover">
-        <Input placeholder="https://example.com/image.jpg" />
-      </Form.Item>
-
-      <Form.Item label="Style (JSON)" name="style">
-        <TextArea rows={4} placeholder='e.g. {"width": "300px", "margin": "10px"}' />
-      </Form.Item>
-
-      <Form.Item label="Size" name="size">
-        <Select defaultValue="default">
-          <Option value="default">Default</Option>
-          <Option value="small">Small</Option>
-        </Select>
-      </Form.Item>
-
-      <Form.Item label="Extra Content (Right Side)" name="extra">
-        <Input placeholder="Extra content like links or buttons" />
-      </Form.Item>
-
-      <Button type="primary" htmlType="submit">
-        Save
-      </Button>
-    </Form>
-  )
-}
diff --git a/src/pages/FactoryAdminPage/AntdTextForm.tsx b/src/pages/FactoryAdminPage/AntdTextForm.tsx
deleted file mode 100644
index 6e089d4..0000000
--- a/src/pages/FactoryAdminPage/AntdTextForm.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-/* eslint-disable no-console */
-/* eslint-disable no-param-reassign */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import React, { useEffect } from 'react'
-import { Form, Input, Select, Button } from 'antd'
-
-interface AntdTextFormProps {
-  initialValues: any
-  onSave: (data: any) => void
-}
-
-export const AntdTextForm: React.FC<AntdTextFormProps> = ({ initialValues, onSave }) => {
-  const [form] = Form.useForm()
-
-  useEffect(() => {
-    form.setFieldsValue(initialValues)
-  }, [initialValues, form])
-
-  const handleSubmit = (values: any) => {
-    try {
-      if (values.style) {
-        values.style = JSON.parse(values.style)
-      }
-    } catch (e) {
-      console.log('Invalid JSON for style', e)
-    }
-    onSave(values)
-  }
-
-  return (
-    <Form form={form} onFinish={handleSubmit} layout="vertical" initialValues={initialValues}>
-      <Form.Item label="ID" name="id" rules={[{ required: true }]}>
-        <Input disabled />
-      </Form.Item>
-      <Form.Item label="Text" name="text" rules={[{ required: true }]}>
-        <Input />
-      </Form.Item>
-      <Form.Item label="Type" name="type">
-        <Select allowClear>
-          <Select.Option value="">Default</Select.Option>
-          <Select.Option value="secondary">Secondary</Select.Option>
-          <Select.Option value="success">Success</Select.Option>
-          <Select.Option value="warning">Warning</Select.Option>
-          <Select.Option value="danger">Danger</Select.Option>
-        </Select>
-      </Form.Item>
-      <Form.Item label="Style (JSON)" name="style">
-        <Input.TextArea rows={4} placeholder='e.g. {"color": "red"}' />
-      </Form.Item>
-      <Button type="primary" htmlType="submit">
-        Save
-      </Button>
-    </Form>
-  )
-}
diff --git a/src/pages/FactoryAdminPage/AppComponentAdmin.tsx b/src/pages/FactoryAdminPage/AppComponentAdmin.tsx
deleted file mode 100644
index a7c2435..0000000
--- a/src/pages/FactoryAdminPage/AppComponentAdmin.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-/* eslint-disable no-console */
-/* TODO: REFACTOR */
-import React, { useState } from 'react'
-import { Button, Typography, Modal, Input } from 'antd'
-
-import { ComponentNode } from './ComponentNode'
-import { AddComponentModal } from './AddComponentModal'
-import { Component, ComponentType, TDynamicComponentsAppTypeMap } from './types'
-
-const { Title } = Typography
-const { TextArea } = Input
-
-export const AppComponentAdmin: React.FC = () => {
-  const [components, setComponents] = useState<Component[]>([])
-  const [maxId, setMaxId] = useState(1)
-  const [jsonOutput, setJsonOutput] = useState<string>('')
-  const [isModalVisible, setIsModalVisible] = useState(false)
-
-  const getNewId = () => {
-    const newId = maxId + 1
-    setMaxId(newId)
-    return newId
-  }
-
-  const generateDefaultData = (type: ComponentType): TDynamicComponentsAppTypeMap[ComponentType] => {
-    const base = { id: getNewId() }
-    switch (type) {
-      case 'antdText':
-        return { ...base, text: '' }
-      case 'antdCard':
-        return { ...base, title: '' }
-      case 'antdFlex':
-        return { ...base, justify: 'start', align: 'start' }
-      case 'antdRow':
-        return { ...base }
-      case 'antdCol':
-        return { ...base, span: 12 }
-      case 'partsOfUrl':
-      case 'multiQuery':
-      case 'parsedText':
-        return { ...base, text: '' }
-      default:
-        return base
-    }
-  }
-
-  const addComponent = (type: ComponentType) => {
-    const newComponent: Component = {
-      type,
-      data: generateDefaultData(type),
-      children: [],
-    }
-    setComponents(prev => [...prev, newComponent])
-  }
-
-  const updateComponent = (index: number, updated: Component) => {
-    setComponents(prev => {
-      const newComponents = [...prev]
-      newComponents[index] = updated
-      return newComponents
-    })
-  }
-
-  const deleteComponent = (index: number) => {
-    setComponents(prev => {
-      const newComponents = [...prev]
-      newComponents.splice(index, 1)
-      return newComponents
-    })
-  }
-
-  const handleSaveAll = () => {
-    const output = JSON.stringify(
-      {
-        data: components,
-      },
-      null,
-      2,
-    )
-    setJsonOutput(output)
-    setIsModalVisible(true)
-  }
-
-  const handleCopyToClipboard = () => {
-    navigator.clipboard.writeText(jsonOutput)
-    console.log('Copied to clipboard!')
-  }
-
-  return (
-    <div style={{ padding: 20 }}>
-      <Title level={3}>Component Admin Panel</Title>
-      <AddComponentModal onAdd={addComponent} title="Add Root Component" />
-
-      <div style={{ marginTop: 20 }}>
-        {components.map((component, index) => (
-          <ComponentNode
-            key={component.data.id}
-            component={component}
-            onUpdate={updated => updateComponent(index, updated)}
-            onDelete={() => deleteComponent(index)}
-          />
-        ))}
-      </div>
-
-      {/* Save Button */}
-      <Button type="primary" onClick={handleSaveAll} style={{ marginTop: 20 }}>
-        Save All as JSON
-      </Button>
-
-      {/* JSON Output Modal */}
-      <Modal
-        title="Final JSON Output"
-        open={isModalVisible}
-        onCancel={() => setIsModalVisible(false)}
-        footer={[
-          <Button key="copy" onClick={handleCopyToClipboard}>
-            Copy to Clipboard
-          </Button>,
-          <Button key="close" onClick={() => setIsModalVisible(false)}>
-            Close
-          </Button>,
-        ]}
-      >
-        <TextArea value={jsonOutput} readOnly rows={20} style={{ fontFamily: 'monospace' }} />
-      </Modal>
-    </div>
-  )
-}
diff --git a/src/pages/FactoryAdminPage/ComponentForm.tsx b/src/pages/FactoryAdminPage/ComponentForm.tsx
deleted file mode 100644
index a703fca..0000000
--- a/src/pages/FactoryAdminPage/ComponentForm.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-// src/ComponentForm.tsx
-import React from 'react'
-import { DynamicComponentForm } from './DynamicComponentForm'
-import type { ComponentType } from './types'
-
-interface ComponentFormProps {
-  type: ComponentType
-  data: any
-  onSave: (data: any) => void
-}
-
-export const ComponentForm: React.FC<ComponentFormProps> = ({ type, data, onSave }) => {
-  return <DynamicComponentForm type={type} initialValues={data} onSave={onSave} />
-}
diff --git a/src/pages/FactoryAdminPage/ComponentForm2.tsx b/src/pages/FactoryAdminPage/ComponentForm2.tsx
deleted file mode 100644
index f19f175..0000000
--- a/src/pages/FactoryAdminPage/ComponentForm2.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import React from 'react'
-import { ComponentType } from './types'
-import { AntdTextForm } from './AntdTextForm'
-import { AntdCardForm } from './AntdCardForm'
-import { TextWithIdForm } from './TextWithIdForm'
-
-interface ComponentFormProps {
-  type: ComponentType
-  data: any
-  onSave: (data: any) => void
-}
-
-export const ComponentForm: React.FC<ComponentFormProps> = ({ type, data, onSave }) => {
-  switch (type) {
-    case 'antdText':
-      return <AntdTextForm initialValues={data} onSave={onSave} />
-    case 'antdCard':
-      return <AntdCardForm initialValues={data} onSave={onSave} />
-    case 'partsOfUrl':
-    case 'multiQuery':
-    case 'parsedText':
-      return <TextWithIdForm initialValues={data} onSave={onSave} />
-    default:
-      return <div>Unsupported component type</div>
-  }
-}
diff --git a/src/pages/FactoryAdminPage/ComponentNode.tsx b/src/pages/FactoryAdminPage/ComponentNode.tsx
deleted file mode 100644
index 077ef82..0000000
--- a/src/pages/FactoryAdminPage/ComponentNode.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import React from 'react'
-import { Button } from 'antd'
-import { Component, ComponentType } from './types'
-import { EditComponentModal } from './EditComponentModal'
-import { AddComponentModal } from './AddComponentModal'
-import { generateDefaultData } from './utils'
-
-interface ComponentNodeProps {
-  component: Component
-  onUpdate: (component: Component) => void
-  onDelete: () => void
-}
-
-export const ComponentNode: React.FC<ComponentNodeProps> = ({ component, onUpdate, onDelete }) => {
-  const handleAddChild = (type: ComponentType) => {
-    const newChild: Component = {
-      type,
-      data: generateDefaultData(type),
-      children: [],
-    }
-    const updated = { ...component }
-    updated.children = updated.children ? [...updated.children, newChild] : [newChild]
-    onUpdate(updated)
-  }
-
-  const handleUpdateChild = (index: number, updatedChild: Component) => {
-    const updated = { ...component }
-    updated.children![index] = updatedChild
-    onUpdate(updated)
-  }
-
-  const handleDeleteChild = (index: number) => {
-    const updated = { ...component }
-    updated.children!.splice(index, 1)
-    onUpdate(updated)
-  }
-
-  return (
-    <div style={{ border: '1px solid #ccc', padding: 10, margin: '10px 0' }}>
-      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-        <span>
-          <strong>{component.type}</strong> (ID: {component.data.id})
-        </span>
-        <div>
-          <EditComponentModal component={component} onSave={onUpdate} />
-          <AddComponentModal onAdd={handleAddChild} title="Add Child" />
-          <Button danger size="small" onClick={onDelete} style={{ marginLeft: 8 }}>
-            Delete
-          </Button>
-        </div>
-      </div>
-      <div style={{ marginLeft: 20, marginTop: 10 }}>
-        {component.children?.map((child, idx) => (
-          <ComponentNode
-            key={child.data.id}
-            component={child}
-            onUpdate={updated => handleUpdateChild(idx, updated)}
-            onDelete={() => handleDeleteChild(idx)}
-          />
-        ))}
-      </div>
-    </div>
-  )
-}
diff --git a/src/pages/FactoryAdminPage/DynamicComponentForm.tsx b/src/pages/FactoryAdminPage/DynamicComponentForm.tsx
deleted file mode 100644
index 73f042d..0000000
--- a/src/pages/FactoryAdminPage/DynamicComponentForm.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-/* eslint-disable no-console */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/no-unused-vars */
-// src/DynamicComponentForm.tsx
-import React, { useEffect } from 'react'
-import { Form, Input, Select, Switch, Button, Typography } from 'antd'
-
-import { componentMetaMap } from './utils'
-import type { ComponentType } from './types'
-
-const { TextArea } = Input
-const { Option } = Select
-
-interface DynamicComponentFormProps {
-  type: ComponentType
-  initialValues: any
-  onSave: (data: any) => void
-}
-
-export const DynamicComponentForm: React.FC<DynamicComponentFormProps> = ({ type, initialValues, onSave }) => {
-  const [form] = Form.useForm()
-
-  useEffect(() => {
-    form.setFieldsValue(initialValues)
-  }, [initialValues, form])
-
-  const handleSubmit = (values: any) => {
-    try {
-      const parsedValues = Object.entries(values).reduce((acc, [key, value]) => {
-        const meta = componentMetaMap[type]?.[key]
-
-        if (meta?.inputType === 'json') {
-          if (typeof value === 'string') {
-            try {
-              acc[key] = JSON.parse(value)
-            } catch (e) {
-              console.warn(`Invalid JSON for ${key}:`, value)
-              acc[key] = value // Keep original string
-            }
-          } else {
-            acc[key] = value // Already parsed or non-string
-          }
-        } else {
-          acc[key] = value
-        }
-
-        return acc
-      }, {} as any)
-
-      onSave(parsedValues)
-    } catch (e) {
-      console.log('Invalid JSON input', e)
-    }
-  }
-
-  const renderFormItem = (prop: string, meta: any) => {
-    const value = initialValues[prop]
-
-    switch (meta.inputType) {
-      case 'text':
-        return <Input placeholder={meta.label} />
-      case 'textarea':
-        return <TextArea rows={4} placeholder={meta.label} />
-      case 'json':
-        return (
-          <TextArea
-            rows={4}
-            placeholder={`e.g. {"color": "red"}`}
-            defaultValue={value ? JSON.stringify(value, null, 2) : ''}
-          />
-        )
-      case 'boolean':
-        return <Switch defaultChecked={value} />
-      case 'select':
-        return (
-          <Select defaultValue={value}>
-            {meta.options?.map((opt: { label: string; value: string }) => (
-              <Option key={opt.value} value={opt.value}>
-                {opt.label}
-              </Option>
-            ))}
-          </Select>
-        )
-      case 'number':
-        return <Input type="number" placeholder={meta.label} />
-      default:
-        return <Input />
-    }
-  }
-
-  return (
-    <Form form={form} onFinish={handleSubmit} layout="vertical">
-      {/* ID (always present and read-only) */}
-      <Form.Item label="ID" name="id" rules={[{ required: true }]}>
-        <Input disabled />
-      </Form.Item>
-
-      {/* Render dynamic props */}
-      {Object.entries(componentMetaMap[type] || {}).map(([prop, meta]) => (
-        <Form.Item key={prop} label={meta.label} name={prop}>
-          {renderFormItem(prop, meta)}
-        </Form.Item>
-      ))}
-
-      {/* Submit Button */}
-      <Button type="primary" htmlType="submit" style={{ marginTop: 16 }}>
-        Save
-      </Button>
-    </Form>
-  )
-}
diff --git a/src/pages/FactoryAdminPage/EditComponentModal.tsx b/src/pages/FactoryAdminPage/EditComponentModal.tsx
deleted file mode 100644
index 77ccfe7..0000000
--- a/src/pages/FactoryAdminPage/EditComponentModal.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* eslint-disable react/button-has-type */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import React, { useState } from 'react'
-import { Modal } from 'antd'
-import { ComponentForm } from './ComponentForm'
-import { Component } from './types'
-
-interface EditComponentModalProps {
-  component: Component
-  onSave: (component: Component) => void
-}
-
-export const EditComponentModal: React.FC<EditComponentModalProps> = ({ component, onSave }) => {
-  const [open, setOpen] = useState(false)
-
-  const handleSave = (data: any) => {
-    onSave({ ...component, data })
-    setOpen(false)
-  }
-
-  return (
-    <>
-      <button onClick={() => setOpen(true)}>Edit</button>
-      <Modal
-        title={`Edit ${component.type}`}
-        open={open} // ✅ Use open instead of visible
-        onCancel={() => setOpen(false)}
-        footer={null}
-      >
-        <ComponentForm type={component.type} data={component.data} onSave={handleSave} />
-      </Modal>
-    </>
-  )
-}
diff --git a/src/pages/FactoryAdminPage/TextWithIdForm.tsx b/src/pages/FactoryAdminPage/TextWithIdForm.tsx
deleted file mode 100644
index c39004d..0000000
--- a/src/pages/FactoryAdminPage/TextWithIdForm.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, { useEffect } from 'react'
-import { Form, Input, Button } from 'antd'
-
-interface TextWithIdFormProps {
-  initialValues: {
-    id: number
-    text: string
-  }
-  onSave: (data: { id: number; text: string }) => void
-}
-
-export const TextWithIdForm: React.FC<TextWithIdFormProps> = ({ initialValues, onSave }) => {
-  const [form] = Form.useForm()
-
-  useEffect(() => {
-    form.setFieldsValue(initialValues)
-  }, [initialValues, form])
-
-  const handleSubmit = (values: { id: number; text: string }) => {
-    onSave(values)
-  }
-
-  return (
-    <Form form={form} onFinish={handleSubmit} layout="vertical" initialValues={initialValues}>
-      <Form.Item label="ID" name="id" rules={[{ required: true }]}>
-        <Input disabled />
-      </Form.Item>
-      <Form.Item label="Text" name="text" rules={[{ required: true }]}>
-        <Input.TextArea
-          rows={4}
-          placeholder="Enter text (you can use variables like {5}, {reqs[0]['metadata']} etc.)"
-        />
-      </Form.Item>
-      <Button type="primary" htmlType="submit">
-        Save
-      </Button>
-    </Form>
-  )
-}
diff --git a/src/pages/FactoryAdminPage/index.ts b/src/pages/FactoryAdminPage/index.ts
deleted file mode 100644
index 3727974..0000000
--- a/src/pages/FactoryAdminPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { AppComponentAdmin as FactoryAdminPage } from './AppComponentAdmin'
diff --git a/src/pages/FactoryAdminPage/types.ts b/src/pages/FactoryAdminPage/types.ts
deleted file mode 100644
index bd8e5bb..0000000
--- a/src/pages/FactoryAdminPage/types.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import type {
-  CardProps as AntdCardProps,
-  FlexProps as AntdFlexProps,
-  RowProps as AntdRowProps,
-  ColProps as AntdColProps,
-} from 'antd'
-import { TextProps as AntdTextProps } from 'antd/es/typography/Text'
-
-export type TDynamicComponentsAppTypeMap = {
-  antdText: { id: number; text: string } & Omit<AntdTextProps, 'id'>
-  antdCard: { id: number } & Omit<AntdCardProps, 'id'>
-  antdFlex: { id: number } & Omit<AntdFlexProps, 'id' | 'children'>
-  antdRow: { id: number } & Omit<AntdRowProps, 'id' | 'children'>
-  antdCol: { id: number } & Omit<AntdColProps, 'id' | 'children'>
-  partsOfUrl: { id: number; text: string }
-  multiQuery: { id: number; text: string }
-  parsedText: { id: number; text: string }
-}
-
-export type ComponentType = keyof TDynamicComponentsAppTypeMap
-
-export type Component = {
-  type: ComponentType
-  data: TDynamicComponentsAppTypeMap[ComponentType]
-  children?: Component[]
-}
diff --git a/src/pages/FactoryAdminPage/utils.ts b/src/pages/FactoryAdminPage/utils.ts
deleted file mode 100644
index 33d4df8..0000000
--- a/src/pages/FactoryAdminPage/utils.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-// src/utils.ts
-import type { ComponentType, TDynamicComponentsAppTypeMap } from './types'
-
-export const generateDefaultData = (type: ComponentType): TDynamicComponentsAppTypeMap[ComponentType] => {
-  const base = { id: Math.floor(Math.random() * 100000) } // Simplified ID generation
-  switch (type) {
-    case 'antdText':
-      return { ...base, text: '' }
-    case 'antdCard':
-      return { ...base, title: '' }
-    case 'antdFlex':
-      return { ...base, justify: 'start', align: 'start' }
-    case 'antdRow':
-      return { ...base }
-    case 'antdCol':
-      return { ...base, span: 12 }
-    case 'partsOfUrl':
-    case 'multiQuery':
-    case 'parsedText':
-      return { ...base, text: '' }
-    default:
-      return base
-  }
-}
-
-// Define property metadata for each component
-type PropertyMeta = {
-  label: string
-  inputType: 'text' | 'textarea' | 'json' | 'boolean' | 'select' | 'number'
-  options?: { label: string; value: any }[]
-}
-
-type ComponentMetaMap = {
-  [key in ComponentType]: Record<string, PropertyMeta>
-}
-
-export const componentMetaMap: ComponentMetaMap = {
-  antdText: {
-    text: { label: 'Text', inputType: 'textarea' },
-    type: {
-      label: 'Type',
-      inputType: 'select',
-      options: [
-        { label: 'Default', value: '' },
-        { label: 'Secondary', value: 'secondary' },
-        { label: 'Success', value: 'success' },
-        { label: 'Warning', value: 'warning' },
-        { label: 'Danger', value: 'danger' },
-      ],
-    },
-    style: { label: 'Style (JSON)', inputType: 'json' },
-  },
-  antdCard: {
-    title: { label: 'Title', inputType: 'text' },
-    bordered: { label: 'Bordered', inputType: 'boolean' },
-    cover: { label: 'Cover Image URL', inputType: 'text' },
-    size: {
-      label: 'Size',
-      inputType: 'select',
-      options: [
-        { label: 'Default', value: 'default' },
-        { label: 'Small', value: 'small' },
-      ],
-    },
-    extra: { label: 'Extra Content', inputType: 'text' },
-    style: { label: 'Style (JSON)', inputType: 'json' },
-  },
-  antdFlex: {
-    justify: {
-      label: 'Justify',
-      inputType: 'select',
-      options: [
-        { label: 'Start', value: 'start' },
-        { label: 'End', value: 'end' },
-        { label: 'Center', value: 'center' },
-        { label: 'Space Around', value: 'space-around' },
-        { label: 'Space Between', value: 'space-between' },
-      ],
-    },
-    align: {
-      label: 'Align',
-      inputType: 'select',
-      options: [
-        { label: 'Start', value: 'start' },
-        { label: 'End', value: 'end' },
-        { label: 'Center', value: 'center' },
-        { label: 'Baseline', value: 'baseline' },
-        { label: 'Stretch', value: 'stretch' },
-      ],
-    },
-    gap: { label: 'Gap (number)', inputType: 'number' },
-  },
-  antdRow: {
-    gutter: { label: 'Gutter', inputType: 'number' },
-    style: { label: 'Style (JSON)', inputType: 'json' },
-  },
-  antdCol: {
-    span: { label: 'Span (1-24)', inputType: 'number' },
-    offset: { label: 'Offset', inputType: 'number' },
-  },
-  partsOfUrl: {
-    text: { label: 'Text', inputType: 'textarea' },
-  },
-  multiQuery: {
-    text: { label: 'Text', inputType: 'textarea' },
-  },
-  parsedText: {
-    text: { label: 'Text', inputType: 'textarea' },
-  },
-}
diff --git a/src/pages/FactoryPage/FactoryPage.tsx b/src/pages/FactoryPage/FactoryPage.tsx
index ad6c8e6..71b9845 100644
--- a/src/pages/FactoryPage/FactoryPage.tsx
+++ b/src/pages/FactoryPage/FactoryPage.tsx
@@ -1,44 +1,23 @@
-import React, { FC, useState } from 'react'
-import { useParams } from 'react-router-dom'
-import { ManageableBreadcrumbs, ManageableSidebar, Factory, NavigationContainer } from 'components'
-import { getBreadcrumbsIdPrefix } from 'utils/getBreadcrumbsIdPrefix'
-import { getSidebarIdPrefix } from 'utils/getSidebarIdPrefix'
-import { BaseTemplate } from 'templates'
+import React, { FC, useEffect } from 'react'
+import { useParams, useOutletContext } from 'react-router-dom'
+import { Factory } from 'components'
+import { TChromeCtx } from 'templates'
 
 export const FactoryPage: FC = () => {
-  const { namespace, syntheticProject, key } = useParams()
+  const { key } = useParams()
 
-  const [currentTags, setCurrentTags] = useState<string[]>()
+  const { setCurrentTags, setSidebarSuffix, setBreadcrumbsSuffix } = useOutletContext<TChromeCtx>()
 
-  const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
-  const possibleInstance = syntheticProject && namespace ? namespace : undefined
+  useEffect(() => {
+    setSidebarSuffix(`factory-${key}`)
+    setBreadcrumbsSuffix(`factory-${key}`)
 
-  const breadcrumbsId = `${getBreadcrumbsIdPrefix({
-    instance: !!syntheticProject,
-    project: !!namespace,
-  })}factory-${key}`
+    return () => {
+      setCurrentTags(undefined)
+      setSidebarSuffix(undefined)
+      setBreadcrumbsSuffix(undefined)
+    }
+  }, [key, setSidebarSuffix, setBreadcrumbsSuffix, setCurrentTags])
 
-  const sidebarId = `${getSidebarIdPrefix({
-    instance: !!syntheticProject,
-    project: !!namespace,
-  })}factory-${key}`
-
-  return (
-    <BaseTemplate
-      sidebar={
-        <ManageableSidebar
-          instanceName={possibleInstance}
-          projectName={possibleProject}
-          idToCompare={sidebarId}
-          currentTags={currentTags}
-        />
-      }
-      // withNoCluster
-    >
-      <NavigationContainer>
-        <ManageableBreadcrumbs idToCompare={breadcrumbsId} />
-      </NavigationContainer>
-      <Factory setSidebarTags={setCurrentTags} key={key} />
-    </BaseTemplate>
-  )
+  return <Factory setSidebarTags={setCurrentTags} key={key} />
 }
diff --git a/src/pages/FormApiPage/FormApiPage.tsx b/src/pages/FormApiPage/FormApiPage.tsx
deleted file mode 100644
index aa623dc..0000000
--- a/src/pages/FormApiPage/FormApiPage.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import React, { FC } from 'react'
-import { ContentCard } from '@prorobotech/openapi-k8s-toolkit'
-import { useParams, useSearchParams } from 'react-router-dom'
-import { useSelector } from 'react-redux'
-import type { RootState } from 'store/store'
-import {
-  CreateApisForm,
-  UpdateApisForm,
-  BackLink,
-  ManageableBreadcrumbs,
-  ManageableSidebar,
-  NavigationContainer,
-} from 'components'
-import { getSidebarIdPrefix } from 'utils/getSidebarIdPrefix'
-import { getBreadcrumbsIdPrefix } from 'utils/getBreadcrumbsIdPrefix'
-import { getFormsBackLink } from 'utils/getBacklink'
-import { BASE_USE_NAMESPACE_NAV } from 'constants/customizationApiGroupAndVersion'
-import { BaseTemplate } from 'templates'
-
-type TFormApiPageProps = {
-  inside?: boolean
-}
-
-export const FormApiPage: FC<TFormApiPageProps> = ({ inside }) => {
-  const { clusterName, syntheticProject, namespace, apiGroup, apiVersion, typeName, entryName } = useParams()
-  const [searchParams] = useSearchParams()
-  const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
-
-  const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
-  const possibleInstance = syntheticProject && namespace ? namespace : undefined
-
-  if (!typeName || !apiGroup || !apiVersion) {
-    return null
-  }
-
-  const backLink = searchParams.get('backlink')?.startsWith('/') ? searchParams.get('backlink') : undefined
-
-  const preparedBacklink = getFormsBackLink({
-    backLink,
-    clusterName,
-    possibleProject,
-    possibleInstance,
-    baseprefix,
-    namespacesMode: BASE_USE_NAMESPACE_NAV === 'true',
-  })
-
-  const sidebarId = `${getSidebarIdPrefix({ instance: !!syntheticProject, project: !!namespace, inside })}api-form`
-  const breadcrumbsId = `${getBreadcrumbsIdPrefix({
-    instance: !!syntheticProject,
-    project: !!namespace,
-    inside,
-  })}api-form${entryName ? '-edit' : ''}`
-
-  return (
-    <BaseTemplate
-      inside={inside}
-      sidebar={
-        <ManageableSidebar
-          instanceName={possibleInstance}
-          projectName={possibleProject}
-          idToCompare={sidebarId}
-          currentTags={[`${apiGroup}/${apiVersion}/${typeName}`]}
-        />
-      }
-    >
-      <NavigationContainer>
-        <ManageableBreadcrumbs idToCompare={breadcrumbsId} inside={inside} />
-        <BackLink
-          to={preparedBacklink}
-          title={`${entryName ? 'Update' : 'Create'} ${apiGroup}/${apiVersion}/${typeName}${
-            entryName ? `/${entryName}` : ''
-          }`}
-        />
-      </NavigationContainer>
-      <ContentCard flexGrow={1} displayFlex flexFlow="column">
-        {entryName ? (
-          <UpdateApisForm
-            namespace={namespace}
-            apiGroup={apiGroup}
-            apiVersion={apiVersion}
-            typeName={typeName}
-            entryName={entryName}
-            backLink={backLink}
-          />
-        ) : (
-          <CreateApisForm
-            namespace={namespace}
-            apiGroup={apiGroup}
-            apiVersion={apiVersion}
-            typeName={typeName}
-            backLink={backLink}
-          />
-        )}
-      </ContentCard>
-    </BaseTemplate>
-  )
-}
diff --git a/src/pages/FormBuiltinPage/FormBuiltinPage.tsx b/src/pages/FormBuiltinPage/FormBuiltinPage.tsx
deleted file mode 100644
index 2a61a46..0000000
--- a/src/pages/FormBuiltinPage/FormBuiltinPage.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import React, { FC } from 'react'
-import { ContentCard } from '@prorobotech/openapi-k8s-toolkit'
-import { useParams, useSearchParams } from 'react-router-dom'
-import { useSelector } from 'react-redux'
-import type { RootState } from 'store/store'
-import {
-  CreateBuiltinForm,
-  UpdateBuiltinForm,
-  BackLink,
-  ManageableBreadcrumbs,
-  ManageableSidebar,
-  NavigationContainer,
-} from 'components'
-import { getSidebarIdPrefix } from 'utils/getSidebarIdPrefix'
-import { getBreadcrumbsIdPrefix } from 'utils/getBreadcrumbsIdPrefix'
-import { getFormsBackLink } from 'utils/getBacklink'
-import { BASE_USE_NAMESPACE_NAV } from 'constants/customizationApiGroupAndVersion'
-import { BaseTemplate } from 'templates'
-
-type TFormBuiltinPageProps = {
-  inside?: boolean
-}
-
-export const FormBuiltinPage: FC<TFormBuiltinPageProps> = ({ inside }) => {
-  const { clusterName, syntheticProject, namespace, typeName, entryName } = useParams()
-  const [searchParams] = useSearchParams()
-  const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
-
-  const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
-  const possibleInstance = syntheticProject && namespace ? namespace : undefined
-
-  if (!typeName) {
-    return null
-  }
-
-  const backLink = searchParams.get('backlink')?.startsWith('/') ? searchParams.get('backlink') : undefined
-
-  const preparedBacklink = getFormsBackLink({
-    backLink,
-    clusterName,
-    possibleProject,
-    possibleInstance,
-    baseprefix,
-    namespacesMode: BASE_USE_NAMESPACE_NAV === 'true',
-  })
-
-  const sidebarId = `${getSidebarIdPrefix({ instance: !!syntheticProject, project: !!namespace, inside })}builtin-form`
-  const breadcrumbsId = `${getBreadcrumbsIdPrefix({
-    instance: !!syntheticProject,
-    project: !!namespace,
-    inside,
-  })}builtin-form${entryName ? '-edit' : ''}`
-
-  return (
-    <BaseTemplate
-      inside={inside}
-      sidebar={
-        <ManageableSidebar
-          instanceName={possibleInstance}
-          projectName={possibleProject}
-          idToCompare={sidebarId}
-          currentTags={[typeName]}
-        />
-      }
-    >
-      <NavigationContainer>
-        <ManageableBreadcrumbs idToCompare={breadcrumbsId} inside={inside} />
-        <BackLink
-          to={preparedBacklink}
-          title={`${entryName ? 'Update' : 'Create'} ${typeName}${entryName ? `/${entryName}` : ''}`}
-        />
-      </NavigationContainer>
-      <ContentCard flexGrow={1} displayFlex flexFlow="column">
-        {entryName ? (
-          <UpdateBuiltinForm namespace={namespace} typeName={typeName} entryName={entryName} backLink={backLink} />
-        ) : (
-          <CreateBuiltinForm namespace={namespace} typeName={typeName} backLink={backLink} />
-        )}
-      </ContentCard>
-    </BaseTemplate>
-  )
-}
diff --git a/src/pages/FormCrdPage/FormCrdPage.tsx b/src/pages/FormCrdPage/FormCrdPage.tsx
deleted file mode 100644
index 75f6a49..0000000
--- a/src/pages/FormCrdPage/FormCrdPage.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import React, { FC } from 'react'
-import { ContentCard } from '@prorobotech/openapi-k8s-toolkit'
-import { useParams, useSearchParams } from 'react-router-dom'
-import { useSelector } from 'react-redux'
-import type { RootState } from 'store/store'
-import {
-  CreateCrdsForm,
-  UpdateCrdsForm,
-  BackLink,
-  ManageableBreadcrumbs,
-  ManageableSidebar,
-  NavigationContainer,
-} from 'components'
-import { getSidebarIdPrefix } from 'utils/getSidebarIdPrefix'
-import { getBreadcrumbsIdPrefix } from 'utils/getBreadcrumbsIdPrefix'
-import { getFormsBackLink } from 'utils/getBacklink'
-import { BASE_USE_NAMESPACE_NAV } from 'constants/customizationApiGroupAndVersion'
-import { BaseTemplate } from 'templates'
-
-type TFormCrdPageProps = {
-  inside?: boolean
-}
-
-export const FormCrdPage: FC<TFormCrdPageProps> = ({ inside }) => {
-  const { clusterName, syntheticProject, apiGroup, apiVersion, namespace, typeName, entryName } = useParams()
-  const [searchParams] = useSearchParams()
-  const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
-
-  const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
-  const possibleInstance = syntheticProject && namespace ? namespace : undefined
-
-  if (!typeName || !apiGroup || !apiVersion) {
-    return null
-  }
-
-  const backLink = searchParams.get('backlink')?.startsWith('/') ? searchParams.get('backlink') : undefined
-
-  const preparedBacklink = getFormsBackLink({
-    backLink,
-    clusterName,
-    possibleProject,
-    possibleInstance,
-    baseprefix,
-    namespacesMode: BASE_USE_NAMESPACE_NAV === 'true',
-  })
-
-  const sidebarId = `${getSidebarIdPrefix({ instance: !!syntheticProject, project: !!namespace, inside })}crd-form`
-  const breadcrumbsId = `${getBreadcrumbsIdPrefix({
-    instance: !!syntheticProject,
-    project: !!namespace,
-    inside,
-  })}crd-form${entryName ? '-edit' : ''}`
-
-  return (
-    <BaseTemplate
-      inside={inside}
-      sidebar={
-        <ManageableSidebar
-          instanceName={possibleInstance}
-          projectName={possibleProject}
-          idToCompare={sidebarId}
-          currentTags={[`${apiGroup}/${apiVersion}/${typeName}`]}
-        />
-      }
-    >
-      <NavigationContainer>
-        <ManageableBreadcrumbs idToCompare={breadcrumbsId} inside={inside} />
-        <BackLink
-          to={preparedBacklink}
-          title={`${entryName ? 'Update' : 'Create'} ${apiGroup}/${apiVersion}/${typeName}${
-            entryName ? `/${entryName}` : ''
-          }`}
-        />
-      </NavigationContainer>
-      <ContentCard flexGrow={1} displayFlex flexFlow="column">
-        {entryName ? (
-          <UpdateCrdsForm
-            namespace={namespace}
-            apiGroup={apiGroup}
-            apiVersion={apiVersion}
-            typeName={typeName}
-            entryName={entryName}
-            backLink={backLink}
-          />
-        ) : (
-          <CreateCrdsForm
-            namespace={namespace}
-            apiGroup={apiGroup}
-            apiVersion={apiVersion}
-            typeName={typeName}
-            backLink={backLink}
-          />
-        )}
-      </ContentCard>
-    </BaseTemplate>
-  )
-}
diff --git a/src/pages/Forms/FormApiPage/FormApiPage.tsx b/src/pages/Forms/FormApiPage/FormApiPage.tsx
new file mode 100644
index 0000000..858a392
--- /dev/null
+++ b/src/pages/Forms/FormApiPage/FormApiPage.tsx
@@ -0,0 +1,87 @@
+import React, { FC, useEffect } from 'react'
+import { ContentCard } from '@prorobotech/openapi-k8s-toolkit'
+import { useParams, useSearchParams, useOutletContext } from 'react-router-dom'
+import { useSelector } from 'react-redux'
+import type { RootState } from 'store/store'
+import { CreateApisForm, UpdateApisForm } from 'components'
+import { getFormsBackLink } from 'utils/getBacklink'
+import { BASE_USE_NAMESPACE_NAV } from 'constants/customizationApiGroupAndVersion'
+import { TChromeCtx } from 'templates'
+
+export const FormApiPage: FC = () => {
+  const { clusterName, syntheticProject, namespace, apiGroup, apiVersion, typeName, entryName } = useParams()
+  const [searchParams] = useSearchParams()
+  const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
+
+  const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
+  const possibleInstance = syntheticProject && namespace ? namespace : undefined
+
+  const backLink = searchParams.get('backlink')?.startsWith('/') ? searchParams.get('backlink') : undefined
+
+  const preparedBacklink = getFormsBackLink({
+    backLink,
+    clusterName,
+    possibleProject,
+    possibleInstance,
+    baseprefix,
+    namespacesMode: BASE_USE_NAMESPACE_NAV === 'true',
+  })
+
+  const { setCurrentTags, setSidebarSuffix, setBreadcrumbsSuffix, setBacklinkTo, setBacklinkTitle } =
+    useOutletContext<TChromeCtx>()
+
+  useEffect(() => {
+    setSidebarSuffix('api-form')
+    setBreadcrumbsSuffix(`api-form${entryName ? '-edit' : ''}`)
+    setCurrentTags([`${apiGroup}/${apiVersion}/${typeName}`])
+    setBacklinkTo(preparedBacklink)
+    setBacklinkTitle(
+      `${entryName ? 'Update' : 'Create'} ${apiGroup}/${apiVersion}/${typeName}${entryName ? `/${entryName}` : ''}`,
+    )
+
+    return () => {
+      setCurrentTags(undefined)
+      setSidebarSuffix(undefined)
+      setBreadcrumbsSuffix(undefined)
+      setBacklinkTo(undefined)
+      setBacklinkTitle(undefined)
+    }
+  }, [
+    apiGroup,
+    apiVersion,
+    typeName,
+    entryName,
+    preparedBacklink,
+    setSidebarSuffix,
+    setBreadcrumbsSuffix,
+    setCurrentTags,
+    setBacklinkTo,
+    setBacklinkTitle,
+  ])
+  if (!typeName || !apiGroup || !apiVersion) {
+    return null
+  }
+
+  return (
+    <ContentCard flexGrow={1} displayFlex flexFlow="column">
+      {entryName ? (
+        <UpdateApisForm
+          namespace={namespace}
+          apiGroup={apiGroup}
+          apiVersion={apiVersion}
+          typeName={typeName}
+          entryName={entryName}
+          backLink={backLink}
+        />
+      ) : (
+        <CreateApisForm
+          namespace={namespace}
+          apiGroup={apiGroup}
+          apiVersion={apiVersion}
+          typeName={typeName}
+          backLink={backLink}
+        />
+      )}
+    </ContentCard>
+  )
+}
diff --git a/src/pages/FormApiPage/index.ts b/src/pages/Forms/FormApiPage/index.ts
similarity index 100%
rename from src/pages/FormApiPage/index.ts
rename to src/pages/Forms/FormApiPage/index.ts
diff --git a/src/pages/Forms/FormBuiltinPage/FormBuiltinPage.tsx b/src/pages/Forms/FormBuiltinPage/FormBuiltinPage.tsx
new file mode 100644
index 0000000..c9472f8
--- /dev/null
+++ b/src/pages/Forms/FormBuiltinPage/FormBuiltinPage.tsx
@@ -0,0 +1,71 @@
+import React, { FC, useEffect } from 'react'
+import { ContentCard } from '@prorobotech/openapi-k8s-toolkit'
+import { useParams, useSearchParams, useOutletContext } from 'react-router-dom'
+import { useSelector } from 'react-redux'
+import type { RootState } from 'store/store'
+import { CreateBuiltinForm, UpdateBuiltinForm } from 'components'
+import { getFormsBackLink } from 'utils/getBacklink'
+import { BASE_USE_NAMESPACE_NAV } from 'constants/customizationApiGroupAndVersion'
+import { TChromeCtx } from 'templates'
+
+export const FormBuiltinPage: FC = () => {
+  const { clusterName, syntheticProject, namespace, typeName, entryName } = useParams()
+  const [searchParams] = useSearchParams()
+  const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
+
+  const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
+  const possibleInstance = syntheticProject && namespace ? namespace : undefined
+
+  const backLink = searchParams.get('backlink')?.startsWith('/') ? searchParams.get('backlink') : undefined
+
+  const preparedBacklink = getFormsBackLink({
+    backLink,
+    clusterName,
+    possibleProject,
+    possibleInstance,
+    baseprefix,
+    namespacesMode: BASE_USE_NAMESPACE_NAV === 'true',
+  })
+
+  const { setCurrentTags, setSidebarSuffix, setBreadcrumbsSuffix, setBacklinkTo, setBacklinkTitle } =
+    useOutletContext<TChromeCtx>()
+
+  useEffect(() => {
+    setSidebarSuffix('builtin-form')
+    setBreadcrumbsSuffix(`builtin-form${entryName ? '-edit' : ''}`)
+    setCurrentTags([`${typeName}`])
+    setBacklinkTo(preparedBacklink)
+    setBacklinkTitle(`${entryName ? 'Update' : 'Create'} ${typeName}${entryName ? `/${entryName}` : ''}`)
+
+    return () => {
+      setCurrentTags(undefined)
+      setSidebarSuffix(undefined)
+      setBreadcrumbsSuffix(undefined)
+      setBacklinkTo(undefined)
+      setBacklinkTitle(undefined)
+    }
+  }, [
+    typeName,
+    entryName,
+    preparedBacklink,
+    setSidebarSuffix,
+    setBreadcrumbsSuffix,
+    setCurrentTags,
+    setBacklinkTo,
+    setBacklinkTitle,
+  ])
+
+  if (!typeName) {
+    return null
+  }
+
+  return (
+    <ContentCard flexGrow={1} displayFlex flexFlow="column">
+      {entryName ? (
+        <UpdateBuiltinForm namespace={namespace} typeName={typeName} entryName={entryName} backLink={backLink} />
+      ) : (
+        <CreateBuiltinForm namespace={namespace} typeName={typeName} backLink={backLink} />
+      )}
+    </ContentCard>
+  )
+}
diff --git a/src/pages/FormBuiltinPage/index.ts b/src/pages/Forms/FormBuiltinPage/index.ts
similarity index 100%
rename from src/pages/FormBuiltinPage/index.ts
rename to src/pages/Forms/FormBuiltinPage/index.ts
diff --git a/src/pages/Forms/FormCrdPage/FormCrdPage.tsx b/src/pages/Forms/FormCrdPage/FormCrdPage.tsx
new file mode 100644
index 0000000..a3202a9
--- /dev/null
+++ b/src/pages/Forms/FormCrdPage/FormCrdPage.tsx
@@ -0,0 +1,87 @@
+import React, { FC, useEffect } from 'react'
+import { ContentCard } from '@prorobotech/openapi-k8s-toolkit'
+import { useParams, useSearchParams, useOutletContext } from 'react-router-dom'
+import { useSelector } from 'react-redux'
+import type { RootState } from 'store/store'
+import { CreateCrdsForm, UpdateCrdsForm } from 'components'
+import { getFormsBackLink } from 'utils/getBacklink'
+import { BASE_USE_NAMESPACE_NAV } from 'constants/customizationApiGroupAndVersion'
+import { TChromeCtx } from 'templates'
+
+export const FormCrdPage: FC = () => {
+  const { clusterName, syntheticProject, apiGroup, apiVersion, namespace, typeName, entryName } = useParams()
+  const [searchParams] = useSearchParams()
+  const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
+
+  const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
+  const possibleInstance = syntheticProject && namespace ? namespace : undefined
+
+  const backLink = searchParams.get('backlink')?.startsWith('/') ? searchParams.get('backlink') : undefined
+
+  const preparedBacklink = getFormsBackLink({
+    backLink,
+    clusterName,
+    possibleProject,
+    possibleInstance,
+    baseprefix,
+    namespacesMode: BASE_USE_NAMESPACE_NAV === 'true',
+  })
+
+  const { setCurrentTags, setSidebarSuffix, setBreadcrumbsSuffix, setBacklinkTo, setBacklinkTitle } =
+    useOutletContext<TChromeCtx>()
+
+  useEffect(() => {
+    setSidebarSuffix('crd-form')
+    setBreadcrumbsSuffix(`crd-form${entryName ? '-edit' : ''}`)
+    setCurrentTags([`${apiGroup}/${apiVersion}/${typeName}`])
+    setBacklinkTo(preparedBacklink)
+    setBacklinkTitle(
+      `${entryName ? 'Update' : 'Create'} ${apiGroup}/${apiVersion}/${typeName}${entryName ? `/${entryName}` : ''}`,
+    )
+
+    return () => {
+      setCurrentTags(undefined)
+      setSidebarSuffix(undefined)
+      setBreadcrumbsSuffix(undefined)
+      setBacklinkTo(undefined)
+      setBacklinkTitle(undefined)
+    }
+  }, [
+    apiGroup,
+    apiVersion,
+    typeName,
+    entryName,
+    preparedBacklink,
+    setSidebarSuffix,
+    setBreadcrumbsSuffix,
+    setCurrentTags,
+    setBacklinkTo,
+    setBacklinkTitle,
+  ])
+
+  if (!typeName || !apiGroup || !apiVersion) {
+    return null
+  }
+  return (
+    <ContentCard flexGrow={1} displayFlex flexFlow="column">
+      {entryName ? (
+        <UpdateCrdsForm
+          namespace={namespace}
+          apiGroup={apiGroup}
+          apiVersion={apiVersion}
+          typeName={typeName}
+          entryName={entryName}
+          backLink={backLink}
+        />
+      ) : (
+        <CreateCrdsForm
+          namespace={namespace}
+          apiGroup={apiGroup}
+          apiVersion={apiVersion}
+          typeName={typeName}
+          backLink={backLink}
+        />
+      )}
+    </ContentCard>
+  )
+}
diff --git a/src/pages/FormCrdPage/index.ts b/src/pages/Forms/FormCrdPage/index.ts
similarity index 100%
rename from src/pages/FormCrdPage/index.ts
rename to src/pages/Forms/FormCrdPage/index.ts
diff --git a/src/pages/Forms/index.ts b/src/pages/Forms/index.ts
new file mode 100644
index 0000000..2a27924
--- /dev/null
+++ b/src/pages/Forms/index.ts
@@ -0,0 +1,3 @@
+// export { FormCrdPage } from './FormCrdPage'
+export { FormApiPage } from './FormApiPage'
+export { FormBuiltinPage } from './FormBuiltinPage'
diff --git a/src/pages/ListInsideApiByApiGroupPage/ListInsideApiByApiGroupPage.tsx b/src/pages/Insides/ListInsideApiByApiGroupPage/ListInsideApiByApiGroupPage.tsx
similarity index 100%
rename from src/pages/ListInsideApiByApiGroupPage/ListInsideApiByApiGroupPage.tsx
rename to src/pages/Insides/ListInsideApiByApiGroupPage/ListInsideApiByApiGroupPage.tsx
diff --git a/src/pages/ListInsideApiByApiGroupPage/index.ts b/src/pages/Insides/ListInsideApiByApiGroupPage/index.ts
similarity index 100%
rename from src/pages/ListInsideApiByApiGroupPage/index.ts
rename to src/pages/Insides/ListInsideApiByApiGroupPage/index.ts
diff --git a/src/pages/ListInsideApiPage/ListInsideApiPage.tsx b/src/pages/Insides/ListInsideApiPage/ListInsideApiPage.tsx
similarity index 100%
rename from src/pages/ListInsideApiPage/ListInsideApiPage.tsx
rename to src/pages/Insides/ListInsideApiPage/ListInsideApiPage.tsx
diff --git a/src/pages/ListInsideApiPage/index.ts b/src/pages/Insides/ListInsideApiPage/index.ts
similarity index 100%
rename from src/pages/ListInsideApiPage/index.ts
rename to src/pages/Insides/ListInsideApiPage/index.ts
diff --git a/src/pages/ListInsideClustersAndNsPage/ListInsideClustersAndNsPage.tsx b/src/pages/Insides/ListInsideClustersAndNsPage/ListInsideClustersAndNsPage.tsx
similarity index 100%
rename from src/pages/ListInsideClustersAndNsPage/ListInsideClustersAndNsPage.tsx
rename to src/pages/Insides/ListInsideClustersAndNsPage/ListInsideClustersAndNsPage.tsx
diff --git a/src/pages/ListInsideClustersAndNsPage/index.ts b/src/pages/Insides/ListInsideClustersAndNsPage/index.ts
similarity index 100%
rename from src/pages/ListInsideClustersAndNsPage/index.ts
rename to src/pages/Insides/ListInsideClustersAndNsPage/index.ts
diff --git a/src/pages/ListInsideCrdByApiGroupPage/ListInsideCrdByApiGroupPage.tsx b/src/pages/Insides/ListInsideCrdByApiGroupPage/ListInsideCrdByApiGroupPage.tsx
similarity index 100%
rename from src/pages/ListInsideCrdByApiGroupPage/ListInsideCrdByApiGroupPage.tsx
rename to src/pages/Insides/ListInsideCrdByApiGroupPage/ListInsideCrdByApiGroupPage.tsx
diff --git a/src/pages/ListInsideCrdByApiGroupPage/index.ts b/src/pages/Insides/ListInsideCrdByApiGroupPage/index.ts
similarity index 100%
rename from src/pages/ListInsideCrdByApiGroupPage/index.ts
rename to src/pages/Insides/ListInsideCrdByApiGroupPage/index.ts
diff --git a/src/pages/Insides/index.ts b/src/pages/Insides/index.ts
new file mode 100644
index 0000000..cb54512
--- /dev/null
+++ b/src/pages/Insides/index.ts
@@ -0,0 +1,4 @@
+export { ListInsideClustersAndNsPage } from './ListInsideClustersAndNsPage'
+export { ListInsideApiPage } from './ListInsideApiPage'
+export { ListInsideCrdByApiGroupPage } from './ListInsideCrdByApiGroupPage'
+export { ListInsideApiByApiGroupPage } from './ListInsideApiByApiGroupPage'
diff --git a/src/pages/ListThenWatchPage/ListThenWatchPage.tsx b/src/pages/ListThenWatchPage/ListThenWatchPage.tsx
deleted file mode 100644
index 4d4775d..0000000
--- a/src/pages/ListThenWatchPage/ListThenWatchPage.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-/* eslint-disable no-void */
-/* eslint-disable no-console */
-/* eslint-disable react/button-has-type */
-import { useState, FC } from 'react'
-import { useListWatch, TUseListWatchQuery } from '@prorobotech/openapi-k8s-toolkit'
-
-export const ListThenWatchPage: FC = () => {
-  const [queryState, setQueryState] = useState<TUseListWatchQuery>({
-    apiGroup: '',
-    apiVersion: 'v1',
-    plural: 'pods',
-    namespace: 'incloud-web',
-  })
-
-  const { state, total, status, lastError, reconnect } = useListWatch({
-    wsUrl: '/api/clusters/default/openapi-bff-ws/listThenWatch/listWatchWs',
-    paused: false,
-    ignoreRemove: false,
-    autoDrain: true,
-    preserveStateOnUrlChange: true,
-    isEnabled: true,
-    query: queryState,
-  })
-
-  const switchNamespace = (ns: string) => {
-    setQueryState(prev => ({
-      ...prev,
-      namespace: ns,
-      initialContinue: undefined,
-    }))
-  }
-
-  if (status === 'connecting') {
-    return <div>🔄 Connecting to API server…</div>
-  }
-
-  if (status === 'closed' && lastError) {
-    return <div className="text-red-600">⚠️ Error: {lastError}</div>
-  }
-
-  if (status === 'closed') {
-    return (
-      <div>
-        ❌ Connection closed. <button onClick={reconnect}>Retry</button>
-      </div>
-    )
-  }
-
-  return (
-    <div className="p-4">
-      <header className="mb-3 flex gap-2 items-center">
-        <span>
-          Status: <b>{status}</b>
-        </span>
-        {lastError && <span className="text-red-600">• {lastError}</span>}
-        <button onClick={() => reconnect()} className="px-2 py-1 border rounded">
-          Reconnect
-        </button>
-        <button onClick={() => switchNamespace('kube-system')} className="px-2 py-1 border rounded">
-          kube-system
-        </button>
-        <span className="ml-auto">Total: {total}</span>
-      </header>
-
-      <ul className="space-y-1">
-        {state.order.map(key => {
-          const res = state.byKey[key]
-          const name = res.metadata?.name ?? key
-          const ns = res.metadata?.namespace ?? ''
-          return (
-            <li key={key} className="border rounded p-2">
-              <div className="text-sm">
-                {ns}/{name}
-              </div>
-            </li>
-          )
-        })}
-      </ul>
-    </div>
-  )
-}
diff --git a/src/pages/ListThenWatchPage/index.ts b/src/pages/ListThenWatchPage/index.ts
deleted file mode 100644
index 0a6ad10..0000000
--- a/src/pages/ListThenWatchPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ListThenWatchPage } from './ListThenWatchPage'
diff --git a/src/pages/TableApiPage/TableApiPage.tsx b/src/pages/TableApiPage/TableApiPage.tsx
deleted file mode 100644
index 02a1fad..0000000
--- a/src/pages/TableApiPage/TableApiPage.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import React, { FC } from 'react'
-import { ContentCard } from '@prorobotech/openapi-k8s-toolkit'
-import { useParams, useSearchParams } from 'react-router-dom'
-import { useSelector } from 'react-redux'
-import type { RootState } from 'store/store'
-import { TableApiBuiltin, BackLink, ManageableBreadcrumbs, ManageableSidebar, NavigationContainer } from 'components'
-import { getSidebarIdPrefix } from 'utils/getSidebarIdPrefix'
-import { getBreadcrumbsIdPrefix } from 'utils/getBreadcrumbsIdPrefix'
-import { getTableCustomizationIdPrefix } from 'utils/getTableCustomizationIdPrefix'
-import { getTablesBackLink } from 'utils/getBacklink'
-import { BaseTemplate } from 'templates'
-import {
-  BASE_USE_NAMESPACE_NAV,
-  BASE_PROJECTS_API_GROUP,
-  BASE_PROJECTS_VERSION,
-  BASE_PROJECTS_RESOURCE_NAME,
-} from 'constants/customizationApiGroupAndVersion'
-
-type TTableApiPageProps = {
-  inside?: boolean
-}
-
-export const TableApiPage: FC<TTableApiPageProps> = ({ inside }) => {
-  const { clusterName, namespace, syntheticProject, apiGroup, apiVersion, typeName } = useParams()
-  const [searchParams] = useSearchParams()
-  const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
-
-  const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
-  const possibleInstance = syntheticProject && namespace ? namespace : undefined
-
-  const backlink = getTablesBackLink({
-    clusterName,
-    possibleProject,
-    possibleInstance,
-    namespace,
-    baseprefix,
-    inside,
-    namespacesMode: BASE_USE_NAMESPACE_NAV === 'true',
-  })
-
-  const sidebarId = `${getSidebarIdPrefix({ instance: !!syntheticProject, project: !!namespace, inside })}api-table`
-  const breadcrumbsId = `${getBreadcrumbsIdPrefix({
-    instance: !!syntheticProject,
-    project: !!namespace,
-    inside,
-  })}api-table`
-  const tableCustomizationIdPrefix = getTableCustomizationIdPrefix({
-    instance: !!syntheticProject,
-    project: BASE_USE_NAMESPACE_NAV !== 'true' && !!namespace,
-    namespace: !!namespace,
-    inside,
-  })
-
-  const isProjectList =
-    !namespace &&
-    apiGroup === BASE_PROJECTS_API_GROUP &&
-    apiVersion === BASE_PROJECTS_VERSION &&
-    typeName === BASE_PROJECTS_RESOURCE_NAME
-  const sidebarIdProjectList = `${getSidebarIdPrefix({})}projects-list`
-  const breadcrumbsIdProjectList = `${getBreadcrumbsIdPrefix({})}projects-list`
-
-  const limitSp = searchParams.get('limit')
-
-  return (
-    <BaseTemplate
-      inside={inside}
-      sidebar={
-        <ManageableSidebar
-          instanceName={possibleInstance}
-          projectName={possibleProject}
-          idToCompare={isProjectList ? sidebarIdProjectList : sidebarId}
-          currentTags={[`${apiGroup}/${apiVersion}/${typeName}`]}
-        />
-      }
-    >
-      <NavigationContainer>
-        <ManageableBreadcrumbs idToCompare={isProjectList ? breadcrumbsIdProjectList : breadcrumbsId} inside={inside} />
-        <BackLink to={backlink} title={`${apiGroup}/${apiVersion}/${typeName}`} />
-      </NavigationContainer>
-      <ContentCard flexGrow={1} displayFlex flexFlow="column">
-        {typeName && apiGroup && apiVersion && (
-          <TableApiBuiltin
-            resourceType="api"
-            namespace={namespace}
-            apiGroup={apiGroup}
-            apiVersion={apiVersion}
-            typeName={typeName}
-            key={`${apiGroup}-${apiVersion}-${namespace}-${typeName}`}
-            limit={limitSp && limitSp.length > 0 ? Number(limitSp) : undefined}
-            inside={inside}
-            customizationIdPrefix={tableCustomizationIdPrefix}
-          />
-        )}
-      </ContentCard>
-    </BaseTemplate>
-  )
-}
diff --git a/src/pages/TableBuiltinPage/TableBuiltinPage.tsx b/src/pages/TableBuiltinPage/TableBuiltinPage.tsx
deleted file mode 100644
index e1b6f96..0000000
--- a/src/pages/TableBuiltinPage/TableBuiltinPage.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import React, { FC } from 'react'
-import { ContentCard } from '@prorobotech/openapi-k8s-toolkit'
-import { useParams, useSearchParams } from 'react-router-dom'
-import { useSelector } from 'react-redux'
-import type { RootState } from 'store/store'
-import { TableApiBuiltin, BackLink, ManageableBreadcrumbs, ManageableSidebar, NavigationContainer } from 'components'
-import { getSidebarIdPrefix } from 'utils/getSidebarIdPrefix'
-import { getBreadcrumbsIdPrefix } from 'utils/getBreadcrumbsIdPrefix'
-import { getTableCustomizationIdPrefix } from 'utils/getTableCustomizationIdPrefix'
-import { getTablesBackLink } from 'utils/getBacklink'
-import { BaseTemplate } from 'templates'
-import { BASE_USE_NAMESPACE_NAV } from 'constants/customizationApiGroupAndVersion'
-
-type TTableBuiltinPageProps = {
-  inside?: boolean
-}
-
-export const TableBuiltinPage: FC<TTableBuiltinPageProps> = ({ inside }) => {
-  const { clusterName, namespace, syntheticProject, typeName } = useParams()
-  const [searchParams] = useSearchParams()
-  const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
-
-  const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
-  const possibleInstance = syntheticProject && namespace ? namespace : undefined
-
-  const backlink = getTablesBackLink({
-    clusterName,
-    possibleProject,
-    possibleInstance,
-    namespace,
-    baseprefix,
-    inside,
-    namespacesMode: BASE_USE_NAMESPACE_NAV === 'true',
-  })
-
-  const sidebarId = `${getSidebarIdPrefix({ instance: !!syntheticProject, project: !!namespace, inside })}builtin-table`
-  const breadcrumbsId = `${getBreadcrumbsIdPrefix({
-    instance: !!syntheticProject,
-    project: !!namespace,
-    inside,
-  })}builtin-table`
-  const tableCustomizationIdPrefix = getTableCustomizationIdPrefix({
-    instance: !!syntheticProject,
-    project: BASE_USE_NAMESPACE_NAV !== 'true' && !!namespace,
-    namespace: !!namespace,
-    inside,
-  })
-
-  const limitSp = searchParams.get('limit')
-
-  return (
-    <BaseTemplate
-      inside={inside}
-      sidebar={
-        <ManageableSidebar
-          instanceName={possibleInstance}
-          projectName={possibleProject}
-          idToCompare={sidebarId}
-          currentTags={[`${typeName}`]}
-        />
-      }
-    >
-      <NavigationContainer>
-        <ManageableBreadcrumbs idToCompare={breadcrumbsId} inside={inside} />
-        <BackLink to={backlink} title={typeName} />
-      </NavigationContainer>
-      <ContentCard flexGrow={1} displayFlex flexFlow="column">
-        {typeName && (
-          <TableApiBuiltin
-            resourceType="builtin"
-            apiVersion="v1"
-            key={`${namespace}-${typeName}`}
-            namespace={namespace}
-            typeName={typeName}
-            limit={limitSp && limitSp.length > 0 ? Number(limitSp) : undefined}
-            inside={inside}
-            customizationIdPrefix={tableCustomizationIdPrefix}
-          />
-        )}
-      </ContentCard>
-    </BaseTemplate>
-  )
-}
diff --git a/src/pages/TableCrdPage/TableCrdPage.tsx b/src/pages/TableCrdPage/TableCrdPage.tsx
deleted file mode 100644
index 5f509ff..0000000
--- a/src/pages/TableCrdPage/TableCrdPage.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import React, { FC } from 'react'
-import { ContentCard } from '@prorobotech/openapi-k8s-toolkit'
-import { useParams } from 'react-router-dom'
-import { useSelector } from 'react-redux'
-import type { RootState } from 'store/store'
-import { TableCrdInfo, BackLink, ManageableBreadcrumbs, ManageableSidebar, NavigationContainer } from 'components'
-import { getSidebarIdPrefix } from 'utils/getSidebarIdPrefix'
-import { getBreadcrumbsIdPrefix } from 'utils/getBreadcrumbsIdPrefix'
-import { getTableCustomizationIdPrefix } from 'utils/getTableCustomizationIdPrefix'
-import { getTablesBackLink } from 'utils/getBacklink'
-import { BaseTemplate } from 'templates'
-import { BASE_USE_NAMESPACE_NAV } from 'constants/customizationApiGroupAndVersion'
-
-type TTableCrdPageProps = {
-  inside?: boolean
-}
-
-export const TableCrdPage: FC<TTableCrdPageProps> = ({ inside }) => {
-  const { clusterName, namespace, syntheticProject, apiGroup, apiVersion, apiExtensionVersion, crdName } = useParams()
-  const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
-
-  const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
-  const possibleInstance = syntheticProject && namespace ? namespace : undefined
-
-  const backlink = getTablesBackLink({
-    clusterName,
-    possibleProject,
-    possibleInstance,
-    namespace,
-    baseprefix,
-    inside,
-    namespacesMode: BASE_USE_NAMESPACE_NAV === 'true',
-  })
-
-  const sidebarId = `${getSidebarIdPrefix({ instance: !!syntheticProject, project: !!namespace, inside })}crd-table`
-  const breadcrumbsId = `${getBreadcrumbsIdPrefix({
-    instance: !!syntheticProject,
-    project: !!namespace,
-    inside,
-  })}crd-table`
-  const tableCustomizationIdPrefix = getTableCustomizationIdPrefix({
-    instance: !!syntheticProject,
-    project: BASE_USE_NAMESPACE_NAV !== 'true' && !!namespace,
-    namespace: !!namespace,
-    inside,
-  })
-
-  return (
-    <BaseTemplate
-      inside={inside}
-      sidebar={
-        <ManageableSidebar
-          instanceName={possibleInstance}
-          projectName={possibleProject}
-          idToCompare={sidebarId}
-          currentTags={[`${apiGroup}/${apiVersion}/${crdName}`]}
-        />
-      }
-    >
-      <NavigationContainer>
-        <ManageableBreadcrumbs idToCompare={breadcrumbsId} inside={inside} />
-        <BackLink to={backlink} title={`${apiGroup}/${apiVersion}/${crdName}`} />
-      </NavigationContainer>
-      <ContentCard flexGrow={1} displayFlex flexFlow="column">
-        {crdName && apiGroup && apiVersion && apiExtensionVersion && (
-          <TableCrdInfo
-            namespace={namespace}
-            apiGroup={apiGroup}
-            apiVersion={apiVersion}
-            crdName={crdName}
-            apiExtensionVersion={apiExtensionVersion}
-            inside={inside}
-            customizationIdPrefix={tableCustomizationIdPrefix}
-          />
-        )}
-      </ContentCard>
-    </BaseTemplate>
-  )
-}
diff --git a/src/pages/Tables/TableApiPage/TableApiPage.tsx b/src/pages/Tables/TableApiPage/TableApiPage.tsx
new file mode 100644
index 0000000..98fcda1
--- /dev/null
+++ b/src/pages/Tables/TableApiPage/TableApiPage.tsx
@@ -0,0 +1,103 @@
+import React, { FC, useEffect } from 'react'
+import { ContentCard } from '@prorobotech/openapi-k8s-toolkit'
+import { useParams, useSearchParams, useOutletContext } from 'react-router-dom'
+import { useSelector } from 'react-redux'
+import type { RootState } from 'store/store'
+import { TableApiBuiltin } from 'components'
+import { getTableCustomizationIdPrefix } from 'utils/getTableCustomizationIdPrefix'
+import { getTablesBackLink } from 'utils/getBacklink'
+import { TChromeCtx } from 'templates'
+import {
+  BASE_USE_NAMESPACE_NAV,
+  BASE_PROJECTS_API_GROUP,
+  BASE_PROJECTS_VERSION,
+  BASE_PROJECTS_RESOURCE_NAME,
+} from 'constants/customizationApiGroupAndVersion'
+
+type TTableApiPageProps = {
+  inside?: boolean
+}
+
+export const TableApiPage: FC<TTableApiPageProps> = ({ inside }) => {
+  const { clusterName, namespace, syntheticProject, apiGroup, apiVersion, typeName } = useParams()
+  const [searchParams] = useSearchParams()
+  const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
+
+  const isProjectList =
+    !namespace &&
+    apiGroup === BASE_PROJECTS_API_GROUP &&
+    apiVersion === BASE_PROJECTS_VERSION &&
+    typeName === BASE_PROJECTS_RESOURCE_NAME
+  const breadcrumbsIdProjectList = 'projects-list'
+
+  const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
+  const possibleInstance = syntheticProject && namespace ? namespace : undefined
+
+  const preparedBacklink = getTablesBackLink({
+    clusterName,
+    possibleProject,
+    possibleInstance,
+    namespace,
+    baseprefix,
+    inside,
+    namespacesMode: BASE_USE_NAMESPACE_NAV === 'true',
+  })
+
+  const { setCurrentTags, setSidebarSuffix, setBreadcrumbsSuffix, setBacklinkTo, setBacklinkTitle } =
+    useOutletContext<TChromeCtx>()
+
+  useEffect(() => {
+    setSidebarSuffix('builtin-table')
+    setBreadcrumbsSuffix(isProjectList ? breadcrumbsIdProjectList : 'api-table')
+    setCurrentTags([`${typeName}`])
+    setBacklinkTo(preparedBacklink)
+    setBacklinkTitle(undefined)
+
+    return () => {
+      setCurrentTags(undefined)
+      setSidebarSuffix(undefined)
+      setBreadcrumbsSuffix(undefined)
+      setBacklinkTo(undefined)
+      setBacklinkTitle(`${apiGroup}/${apiVersion}/${typeName}`)
+    }
+  }, [
+    typeName,
+    isProjectList,
+    breadcrumbsIdProjectList,
+    preparedBacklink,
+    apiGroup,
+    apiVersion,
+    setSidebarSuffix,
+    setBreadcrumbsSuffix,
+    setCurrentTags,
+    setBacklinkTo,
+    setBacklinkTitle,
+  ])
+
+  const tableCustomizationIdPrefix = getTableCustomizationIdPrefix({
+    instance: !!syntheticProject,
+    project: BASE_USE_NAMESPACE_NAV !== 'true' && !!namespace,
+    namespace: !!namespace,
+    inside,
+  })
+
+  const limitSp = searchParams.get('limit')
+
+  return (
+    <ContentCard flexGrow={1} displayFlex flexFlow="column">
+      {typeName && apiGroup && apiVersion && (
+        <TableApiBuiltin
+          resourceType="api"
+          namespace={namespace}
+          apiGroup={apiGroup}
+          apiVersion={apiVersion}
+          typeName={typeName}
+          key={`${apiGroup}-${apiVersion}-${namespace}-${typeName}`}
+          limit={limitSp && limitSp.length > 0 ? Number(limitSp) : undefined}
+          inside={inside}
+          customizationIdPrefix={tableCustomizationIdPrefix}
+        />
+      )}
+    </ContentCard>
+  )
+}
diff --git a/src/pages/TableApiPage/index.ts b/src/pages/Tables/TableApiPage/index.ts
similarity index 100%
rename from src/pages/TableApiPage/index.ts
rename to src/pages/Tables/TableApiPage/index.ts
diff --git a/src/pages/Tables/TableBuiltinPage/TableBuiltinPage.tsx b/src/pages/Tables/TableBuiltinPage/TableBuiltinPage.tsx
new file mode 100644
index 0000000..c3e402c
--- /dev/null
+++ b/src/pages/Tables/TableBuiltinPage/TableBuiltinPage.tsx
@@ -0,0 +1,86 @@
+import React, { FC, useEffect } from 'react'
+import { ContentCard } from '@prorobotech/openapi-k8s-toolkit'
+import { useParams, useSearchParams, useOutletContext } from 'react-router-dom'
+import { useSelector } from 'react-redux'
+import type { RootState } from 'store/store'
+import { TableApiBuiltin } from 'components'
+import { getTableCustomizationIdPrefix } from 'utils/getTableCustomizationIdPrefix'
+import { getTablesBackLink } from 'utils/getBacklink'
+import { TChromeCtx } from 'templates'
+import { BASE_USE_NAMESPACE_NAV } from 'constants/customizationApiGroupAndVersion'
+
+type TTableBuiltinPageProps = {
+  inside?: boolean
+}
+
+export const TableBuiltinPage: FC<TTableBuiltinPageProps> = ({ inside }) => {
+  const { clusterName, namespace, syntheticProject, typeName } = useParams()
+  const [searchParams] = useSearchParams()
+  const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
+
+  const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
+  const possibleInstance = syntheticProject && namespace ? namespace : undefined
+
+  const preparedBacklink = getTablesBackLink({
+    clusterName,
+    possibleProject,
+    possibleInstance,
+    namespace,
+    baseprefix,
+    inside,
+    namespacesMode: BASE_USE_NAMESPACE_NAV === 'true',
+  })
+
+  const { setCurrentTags, setSidebarSuffix, setBreadcrumbsSuffix, setBacklinkTo, setBacklinkTitle } =
+    useOutletContext<TChromeCtx>()
+
+  useEffect(() => {
+    setSidebarSuffix('builtin-table')
+    setBreadcrumbsSuffix('builtin-table')
+    setCurrentTags([`${typeName}`])
+    setBacklinkTo(preparedBacklink)
+    setBacklinkTitle(typeName)
+
+    return () => {
+      setCurrentTags(undefined)
+      setSidebarSuffix(undefined)
+      setBreadcrumbsSuffix(undefined)
+      setBacklinkTo(undefined)
+      setBacklinkTitle(undefined)
+    }
+  }, [
+    typeName,
+    preparedBacklink,
+    setSidebarSuffix,
+    setBreadcrumbsSuffix,
+    setCurrentTags,
+    setBacklinkTo,
+    setBacklinkTitle,
+  ])
+
+  const tableCustomizationIdPrefix = getTableCustomizationIdPrefix({
+    instance: !!syntheticProject,
+    project: BASE_USE_NAMESPACE_NAV !== 'true' && !!namespace,
+    namespace: !!namespace,
+    inside,
+  })
+
+  const limitSp = searchParams.get('limit')
+
+  return (
+    <ContentCard flexGrow={1} displayFlex flexFlow="column">
+      {typeName && (
+        <TableApiBuiltin
+          resourceType="builtin"
+          apiVersion="v1"
+          key={`${namespace}-${typeName}`}
+          namespace={namespace}
+          typeName={typeName}
+          limit={limitSp && limitSp.length > 0 ? Number(limitSp) : undefined}
+          inside={inside}
+          customizationIdPrefix={tableCustomizationIdPrefix}
+        />
+      )}
+    </ContentCard>
+  )
+}
diff --git a/src/pages/TableBuiltinPage/index.ts b/src/pages/Tables/TableBuiltinPage/index.ts
similarity index 100%
rename from src/pages/TableBuiltinPage/index.ts
rename to src/pages/Tables/TableBuiltinPage/index.ts
diff --git a/src/pages/Tables/TableCrdPage/TableCrdPage.tsx b/src/pages/Tables/TableCrdPage/TableCrdPage.tsx
new file mode 100644
index 0000000..1eddc08
--- /dev/null
+++ b/src/pages/Tables/TableCrdPage/TableCrdPage.tsx
@@ -0,0 +1,84 @@
+import React, { FC, useEffect } from 'react'
+import { ContentCard } from '@prorobotech/openapi-k8s-toolkit'
+import { useParams, useOutletContext } from 'react-router-dom'
+import { useSelector } from 'react-redux'
+import type { RootState } from 'store/store'
+import { TableCrdInfo } from 'components'
+import { getTableCustomizationIdPrefix } from 'utils/getTableCustomizationIdPrefix'
+import { getTablesBackLink } from 'utils/getBacklink'
+import { TChromeCtx } from 'templates'
+import { BASE_USE_NAMESPACE_NAV } from 'constants/customizationApiGroupAndVersion'
+
+type TTableCrdPageProps = {
+  inside?: boolean
+}
+
+export const TableCrdPage: FC<TTableCrdPageProps> = ({ inside }) => {
+  const { clusterName, namespace, syntheticProject, apiGroup, apiVersion, apiExtensionVersion, crdName } = useParams()
+  const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
+
+  const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
+  const possibleInstance = syntheticProject && namespace ? namespace : undefined
+
+  const preparedBacklink = getTablesBackLink({
+    clusterName,
+    possibleProject,
+    possibleInstance,
+    namespace,
+    baseprefix,
+    inside,
+    namespacesMode: BASE_USE_NAMESPACE_NAV === 'true',
+  })
+
+  const { setCurrentTags, setSidebarSuffix, setBreadcrumbsSuffix, setBacklinkTo, setBacklinkTitle } =
+    useOutletContext<TChromeCtx>()
+
+  useEffect(() => {
+    setSidebarSuffix('crd-table')
+    setBreadcrumbsSuffix('crd-table')
+    setCurrentTags([`${apiGroup}/${apiVersion}/${crdName}`])
+    setBacklinkTo(preparedBacklink)
+    setBacklinkTitle(`${apiGroup}/${apiVersion}/${crdName}`)
+
+    return () => {
+      setCurrentTags(undefined)
+      setSidebarSuffix(undefined)
+      setBreadcrumbsSuffix(undefined)
+      setBacklinkTo(undefined)
+      setBacklinkTitle(undefined)
+    }
+  }, [
+    apiGroup,
+    apiVersion,
+    crdName,
+    preparedBacklink,
+    setSidebarSuffix,
+    setBreadcrumbsSuffix,
+    setCurrentTags,
+    setBacklinkTo,
+    setBacklinkTitle,
+  ])
+
+  const tableCustomizationIdPrefix = getTableCustomizationIdPrefix({
+    instance: !!syntheticProject,
+    project: BASE_USE_NAMESPACE_NAV !== 'true' && !!namespace,
+    namespace: !!namespace,
+    inside,
+  })
+
+  return (
+    <ContentCard flexGrow={1} displayFlex flexFlow="column">
+      {crdName && apiGroup && apiVersion && apiExtensionVersion && (
+        <TableCrdInfo
+          namespace={namespace}
+          apiGroup={apiGroup}
+          apiVersion={apiVersion}
+          crdName={crdName}
+          apiExtensionVersion={apiExtensionVersion}
+          inside={inside}
+          customizationIdPrefix={tableCustomizationIdPrefix}
+        />
+      )}
+    </ContentCard>
+  )
+}
diff --git a/src/pages/TableCrdPage/index.ts b/src/pages/Tables/TableCrdPage/index.ts
similarity index 100%
rename from src/pages/TableCrdPage/index.ts
rename to src/pages/Tables/TableCrdPage/index.ts
diff --git a/src/pages/Tables/index.ts b/src/pages/Tables/index.ts
new file mode 100644
index 0000000..842bb38
--- /dev/null
+++ b/src/pages/Tables/index.ts
@@ -0,0 +1,3 @@
+// export { TableCrdPage } from './TableCrdPage'
+export { TableApiPage } from './TableApiPage'
+export { TableBuiltinPage } from './TableBuiltinPage'
diff --git a/src/pages/index.ts b/src/pages/index.ts
index b032f86..c41444f 100644
--- a/src/pages/index.ts
+++ b/src/pages/index.ts
@@ -4,20 +4,25 @@ export { ListClustersPage } from './ListClustersPage'
 export { ListProjectsPage } from './ListProjectsPage'
 export { ProjectInfoPage } from './ProjectInfoPage'
 /* inside routing */
-export { ListInsideClustersAndNsPage } from './ListInsideClustersAndNsPage'
-export { ListInsideApiPage } from './ListInsideApiPage'
-export { ListInsideCrdByApiGroupPage } from './ListInsideCrdByApiGroupPage'
-export { ListInsideApiByApiGroupPage } from './ListInsideApiByApiGroupPage'
-/* common routing */
-export { TableCrdPage } from './TableCrdPage'
-export { TableApiPage } from './TableApiPage'
-export { TableBuiltinPage } from './TableBuiltinPage'
-export { FormCrdPage } from './FormCrdPage'
-export { FormApiPage } from './FormApiPage'
-export { FormBuiltinPage } from './FormBuiltinPage'
+export {
+  ListInsideClustersAndNsPage,
+  ListInsideApiPage,
+  ListInsideCrdByApiGroupPage,
+  ListInsideApiByApiGroupPage,
+} from './Insides'
+/* tables */
+export {
+  // TableCrdPage,
+  TableApiPage,
+  TableBuiltinPage,
+} from './Tables'
+/* forms */
+export {
+  // FormCrdPage,
+  FormApiPage,
+  FormBuiltinPage,
+} from './Forms'
+/* factory */
 export { FactoryPage } from './FactoryPage'
-export { FactoryAdminPage } from './FactoryAdminPage'
 /* search */
 export { SearchPage } from './SearchPage'
-/* list-then-watch */
-export { ListThenWatchPage } from './ListThenWatchPage'
diff --git a/src/templates/AppShell/AppShell.tsx b/src/templates/AppShell/AppShell.tsx
new file mode 100644
index 0000000..534de74
--- /dev/null
+++ b/src/templates/AppShell/AppShell.tsx
@@ -0,0 +1,88 @@
+// AppShell.tsx
+import React, { FC, useState, useMemo } from 'react'
+import { Outlet, useParams } from 'react-router-dom'
+import { BaseTemplate } from 'templates'
+import { ManageableSidebar, NavigationContainer, ManageableBreadcrumbs, BackLink } from 'components'
+import { getSidebarIdPrefix } from 'utils/getSidebarIdPrefix'
+import { getBreadcrumbsIdPrefix } from 'utils/getBreadcrumbsIdPrefix'
+
+export type TChromeCtx = {
+  setCurrentTags: (tags?: string[]) => void
+  setSidebarSuffix: (suffix?: string) => void
+  setBreadcrumbsSuffix: (suffix?: string) => void
+  setBacklinkTo: (backlinkTo?: string) => void
+  setBacklinkTitle: (backlinkTitle?: string) => void
+}
+
+export const AppShell: FC<{ inside?: boolean }> = ({ inside }) => {
+  const { namespace, syntheticProject } = useParams()
+
+  const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
+  const possibleInstance = syntheticProject && namespace ? namespace : undefined
+
+  const [currentTags, setCurrentTagsState] = useState<string[] | undefined>()
+  const [sidebarSuffix, setSidebarSuffix] = useState<string | undefined>()
+  const [breadcrumbsSuffix, setBreadcrumbsSuffix] = useState<string | undefined>()
+  const [backlinkTo, setBacklinkTo] = useState<string | undefined>()
+  const [backlinkTitle, setBacklinkTitle] = useState<string | undefined>()
+
+  // Commit tags only on actual content change to avoid sidebar refetch
+  const setCurrentTags = React.useCallback((next?: string[]) => {
+    setCurrentTagsState(prev => {
+      // eslint-disable-next-line one-var
+      const a = prev ?? [],
+        b = next ?? []
+      if (a.length === b.length && a.every((v, i) => v === b[i])) return prev
+      return next
+    })
+  }, [])
+
+  const sidebarId = useMemo(
+    () =>
+      `${getSidebarIdPrefix({ instance: !!syntheticProject, project: !!namespace, inside })}${
+        sidebarSuffix ?? 'app-shell'
+      }`,
+    [syntheticProject, namespace, inside, sidebarSuffix],
+  )
+
+  const breadcrumbsId = useMemo(
+    () =>
+      `${getBreadcrumbsIdPrefix({ instance: !!syntheticProject, project: !!namespace, inside })}${
+        breadcrumbsSuffix ?? 'app-shell'
+      }`,
+    [syntheticProject, namespace, inside, breadcrumbsSuffix],
+  )
+
+  const sidebarEl = React.useMemo(
+    () => (
+      <ManageableSidebar
+        instanceName={possibleInstance}
+        projectName={possibleProject}
+        idToCompare={sidebarId}
+        currentTags={currentTags}
+      />
+    ),
+    [possibleInstance, possibleProject, sidebarId, currentTags],
+  )
+
+  const ctx = useMemo<TChromeCtx>(
+    () => ({
+      setCurrentTags,
+      setSidebarSuffix,
+      setBreadcrumbsSuffix,
+      setBacklinkTo,
+      setBacklinkTitle,
+    }),
+    [setCurrentTags],
+  )
+
+  return (
+    <BaseTemplate inside={inside} sidebar={sidebarEl}>
+      <NavigationContainer>
+        <ManageableBreadcrumbs idToCompare={breadcrumbsId} inside={inside} />
+        {backlinkTo && backlinkTitle && <BackLink to={backlinkTo} title={backlinkTitle} />}
+      </NavigationContainer>
+      <Outlet context={ctx} />
+    </BaseTemplate>
+  )
+}
diff --git a/src/templates/AppShell/index.ts b/src/templates/AppShell/index.ts
new file mode 100644
index 0000000..fec3523
--- /dev/null
+++ b/src/templates/AppShell/index.ts
@@ -0,0 +1,2 @@
+export { AppShell } from './AppShell'
+export type { TChromeCtx } from './AppShell'
diff --git a/src/templates/index.ts b/src/templates/index.ts
index 284a62d..17aaff6 100644
--- a/src/templates/index.ts
+++ b/src/templates/index.ts
@@ -1 +1,4 @@
 export { BaseTemplate } from './BaseTemplate'
+export { MainLayout } from './MainLayout'
+export { AppShell } from './AppShell'
+export type { TChromeCtx } from './AppShell'

From 72a979d2957ecade8f5a351c82a379f696e8b384 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Tue, 11 Nov 2025 06:00:00 +0300
Subject: [PATCH 12/32] outlets

---
 src/App.tsx                                   | 32 +++++-----
 .../ListInsideApiByApiGroupPage.tsx           | 46 +++++++-------
 .../ListInsideApiPage/ListInsideApiPage.tsx   | 42 ++++++-------
 .../ListInsideCrdByApiGroupPage.tsx           | 56 ++++++++---------
 src/pages/ListProjectsPage/index.ts           |  1 -
 src/pages/ProjectInfoPage/index.ts            |  1 -
 .../RedirectProjectInfoPage.tsx}              |  2 +-
 src/pages/RedirectProjectInfoPage/index.ts    |  1 +
 .../RedirectProjectsPage.tsx}                 |  2 +-
 src/pages/RedirectProjectsPage/index.ts       |  1 +
 src/pages/SearchPage/SearchPage.tsx           | 61 +++++++------------
 src/pages/index.ts                            | 21 ++++---
 src/templates/AppShell/AppShell.tsx           | 24 +++++---
 src/utils/getBreadcrumbsIdPrefix.ts           |  6 +-
 src/utils/getSidebarIdPrefix.ts               |  6 +-
 15 files changed, 151 insertions(+), 151 deletions(-)
 delete mode 100644 src/pages/ListProjectsPage/index.ts
 delete mode 100644 src/pages/ProjectInfoPage/index.ts
 rename src/pages/{ProjectInfoPage/ProjectInfoPage.tsx => RedirectProjectInfoPage/RedirectProjectInfoPage.tsx} (80%)
 create mode 100644 src/pages/RedirectProjectInfoPage/index.ts
 rename src/pages/{ListProjectsPage/ListProjectsPage.tsx => RedirectProjectsPage/RedirectProjectsPage.tsx} (81%)
 create mode 100644 src/pages/RedirectProjectsPage/index.ts

diff --git a/src/App.tsx b/src/App.tsx
index e97f190..3911dcd 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -12,8 +12,8 @@ import { setBaseprefix } from 'store/federation/federation/baseprefix'
 import {
   MainPage,
   ListClustersPage,
-  ListProjectsPage,
-  ProjectInfoPage,
+  RedirectProjectsPage,
+  RedirectProjectInfoPage,
   ListInsideClustersAndNsPage,
   ListInsideApiPage,
   ListInsideCrdByApiGroupPage,
@@ -58,19 +58,18 @@ export const App: FC<TAppProps> = ({ isFederation, forcedTheme }) => {
       <Route element={<MainLayout forcedTheme={forcedTheme} />}>
         <Route path={`${prefix}/`} element={<MainPage />} />
         <Route path={`${prefix}/clusters`} element={<ListClustersPage />} />
-        <Route path={`${prefix}/clusters/:clusterName`} element={<ListProjectsPage />} />
-        <Route path={`${prefix}/inside/`} element={<MainPage />} />
-        <Route path={`${prefix}/clusters/:clusterName/projects/:namespace`} element={<ProjectInfoPage />} />
 
         <Route path={`${prefix}/:clusterName/:namespace?/:syntheticProject?/*`} element={<AppShell />}>
           {/* <Route path="crd-table/:apiGroup/:apiVersion/:apiExtensionVersion/:crdName" element={<TableCrdPage />} /> */}
           <Route path="api-table/:apiGroup/:apiVersion/:typeName" element={<TableApiPage />} />
           <Route path="builtin-table/:typeName" element={<TableBuiltinPage />} />
           {/* <Route path="forms/crds/:apiGroup/:apiVersion/:typeName/:entryName?/"" element={<FormCrdPage />} /> */}
-          <Route path="forms/builtin/:apiVersion/:typeName/:entryName?/" element={<FormBuiltinPage />} />
           <Route path="forms/apis/:apiGroup/:apiVersion/:typeName/:entryName?/" element={<FormApiPage />} />
+          <Route path="forms/builtin/:apiVersion/:typeName/:entryName?/" element={<FormBuiltinPage />} />
           <Route path="factory/:key/*" element={<FactoryPage />} />
+          <Route path="search/*" element={<SearchPage />} />
         </Route>
+
         <Route path={`${prefix}/inside/:clusterName/:namespace?/:syntheticProject?/*`} element={<AppShell inside />}>
           {/* <Route path="crd-table/:apiGroup/:apiVersion/:apiExtensionVersion/:crdName" element={<TableCrdPage inside />} /> */}
           <Route path="api-table/:apiGroup/:apiVersion/:typeName" element={<TableApiPage inside />} />
@@ -80,18 +79,19 @@ export const App: FC<TAppProps> = ({ isFederation, forcedTheme }) => {
           <Route path="forms/apis/:apiGroup/:apiVersion/:typeName/:entryName?/" element={<FormApiPage />} />
         </Route>
 
+        <Route path={`${prefix}/inside/`} element={<MainPage />} />
         <Route path={`${prefix}/inside/clusters`} element={<ListInsideClustersAndNsPage inside />} />
-        <Route path={`${prefix}/inside/:clusterName/:namespace?/apis`} element={<ListInsideApiPage inside />} />
-        <Route
-          path={`${prefix}/inside/:clusterName/:namespace?/crds-by-api/:apiGroup/:apiVersion/:apiExtensionVersion`}
-          element={<ListInsideCrdByApiGroupPage inside />}
-        />
-        <Route
-          path={`${prefix}/inside/:clusterName/:namespace?/apis-by-api/:apiGroup/:apiVersion/`}
-          element={<ListInsideApiByApiGroupPage inside />}
-        />
+        <Route path={`${prefix}/inside/:clusterName/:namespace?/*`} element={<AppShell inside />}>
+          <Route path="apis" element={<ListInsideApiPage />} />
+          <Route
+            path="crds-by-api/:apiGroup/:apiVersion/:apiExtensionVersion"
+            element={<ListInsideCrdByApiGroupPage />}
+          />
+          <Route path="apis-by-api/:apiGroup/:apiVersion/" element={<ListInsideApiByApiGroupPage />} />
+        </Route>
 
-        <Route path={`${prefix}/:clusterName/:namespace?/:syntheticProject?/search/*`} element={<SearchPage />} />
+        <Route path={`${prefix}/clusters/:clusterName`} element={<RedirectProjectsPage />} />
+        <Route path={`${prefix}/clusters/:clusterName/projects/:namespace`} element={<RedirectProjectInfoPage />} />
       </Route>
     </Routes>
   )
diff --git a/src/pages/Insides/ListInsideApiByApiGroupPage/ListInsideApiByApiGroupPage.tsx b/src/pages/Insides/ListInsideApiByApiGroupPage/ListInsideApiByApiGroupPage.tsx
index bb5f561..c25064f 100644
--- a/src/pages/Insides/ListInsideApiByApiGroupPage/ListInsideApiByApiGroupPage.tsx
+++ b/src/pages/Insides/ListInsideApiByApiGroupPage/ListInsideApiByApiGroupPage.tsx
@@ -1,31 +1,31 @@
-import React, { FC } from 'react'
+import React, { FC, useEffect } from 'react'
 import { ContentCard } from '@prorobotech/openapi-k8s-toolkit'
-import { useParams } from 'react-router-dom'
-import { ListInsideApisByApiGroup, ManageableBreadcrumbs, ManageableSidebar, NavigationContainer } from 'components'
-import { getSidebarIdPrefix } from 'utils/getSidebarIdPrefix'
-import { getBreadcrumbsIdPrefix } from 'utils/getBreadcrumbsIdPrefix'
-import { BaseTemplate } from 'templates'
+import { useParams, useOutletContext } from 'react-router-dom'
+import { ListInsideApisByApiGroup } from 'components'
+import { TChromeCtx } from 'templates'
 
-type TListInsideApiByApiGroupPageProps = {
-  inside?: boolean
-}
-
-export const ListInsideApiByApiGroupPage: FC<TListInsideApiByApiGroupPageProps> = ({ inside }) => {
+export const ListInsideApiByApiGroupPage: FC = () => {
   const { namespace, apiGroup, apiVersion } = useParams()
 
-  const sidebarId = `${getSidebarIdPrefix({ namespace: !!namespace, inside })}api-by-api`
-  const breadcrumbsId = `${getBreadcrumbsIdPrefix({ namespace: !!namespace, inside })}api-by-api`
+  const { setSidebarSuffix, setBreadcrumbsSuffix, setUseOnlyNamespace } = useOutletContext<TChromeCtx>()
+
+  useEffect(() => {
+    setSidebarSuffix('api-by-api')
+    setBreadcrumbsSuffix('api-by-api')
+    setUseOnlyNamespace(true)
+
+    return () => {
+      setSidebarSuffix(undefined)
+      setBreadcrumbsSuffix(undefined)
+      setUseOnlyNamespace(false)
+    }
+  }, [setSidebarSuffix, setBreadcrumbsSuffix, setUseOnlyNamespace])
 
   return (
-    <BaseTemplate inside={inside} sidebar={<ManageableSidebar idToCompare={sidebarId} />}>
-      <NavigationContainer>
-        <ManageableBreadcrumbs idToCompare={breadcrumbsId} inside />
-      </NavigationContainer>
-      <ContentCard flexGrow={1} displayFlex flexFlow="column">
-        {apiGroup && apiVersion && (
-          <ListInsideApisByApiGroup namespace={namespace} apiGroup={apiGroup} apiVersion={apiVersion} />
-        )}
-      </ContentCard>
-    </BaseTemplate>
+    <ContentCard flexGrow={1} displayFlex flexFlow="column">
+      {apiGroup && apiVersion && (
+        <ListInsideApisByApiGroup namespace={namespace} apiGroup={apiGroup} apiVersion={apiVersion} />
+      )}
+    </ContentCard>
   )
 }
diff --git a/src/pages/Insides/ListInsideApiPage/ListInsideApiPage.tsx b/src/pages/Insides/ListInsideApiPage/ListInsideApiPage.tsx
index 9e5ae09..05057a1 100644
--- a/src/pages/Insides/ListInsideApiPage/ListInsideApiPage.tsx
+++ b/src/pages/Insides/ListInsideApiPage/ListInsideApiPage.tsx
@@ -1,29 +1,29 @@
-import React, { FC } from 'react'
+import React, { FC, useEffect } from 'react'
 import { ContentCard } from '@prorobotech/openapi-k8s-toolkit'
-import { useParams } from 'react-router-dom'
-import { ListInsideAllResources, ManageableBreadcrumbs, ManageableSidebar, NavigationContainer } from 'components'
-import { getSidebarIdPrefix } from 'utils/getSidebarIdPrefix'
-import { getBreadcrumbsIdPrefix } from 'utils/getBreadcrumbsIdPrefix'
-import { BaseTemplate } from 'templates'
+import { useParams, useOutletContext } from 'react-router-dom'
+import { ListInsideAllResources } from 'components'
+import { TChromeCtx } from 'templates'
 
-type TListInsideApiPageProps = {
-  inside?: boolean
-}
-
-export const ListInsideApiPage: FC<TListInsideApiPageProps> = ({ inside }) => {
+export const ListInsideApiPage: FC = () => {
   const { namespace } = useParams()
 
-  const sidebarId = `${getSidebarIdPrefix({ namespace: !!namespace, inside })}apis`
-  const breadcrumbsId = `${getBreadcrumbsIdPrefix({ namespace: !!namespace, inside })}apis`
+  const { setSidebarSuffix, setBreadcrumbsSuffix, setUseOnlyNamespace } = useOutletContext<TChromeCtx>()
+
+  useEffect(() => {
+    setSidebarSuffix('apis')
+    setBreadcrumbsSuffix('apis')
+    setUseOnlyNamespace(true)
+
+    return () => {
+      setSidebarSuffix(undefined)
+      setBreadcrumbsSuffix(undefined)
+      setUseOnlyNamespace(false)
+    }
+  }, [setSidebarSuffix, setBreadcrumbsSuffix, setUseOnlyNamespace])
 
   return (
-    <BaseTemplate inside={inside} sidebar={<ManageableSidebar idToCompare={sidebarId} />}>
-      <NavigationContainer>
-        <ManageableBreadcrumbs idToCompare={breadcrumbsId} inside />
-      </NavigationContainer>
-      <ContentCard flexGrow={1} displayFlex flexFlow="column">
-        <ListInsideAllResources namespace={namespace} />
-      </ContentCard>
-    </BaseTemplate>
+    <ContentCard flexGrow={1} displayFlex flexFlow="column">
+      <ListInsideAllResources namespace={namespace} />
+    </ContentCard>
   )
 }
diff --git a/src/pages/Insides/ListInsideCrdByApiGroupPage/ListInsideCrdByApiGroupPage.tsx b/src/pages/Insides/ListInsideCrdByApiGroupPage/ListInsideCrdByApiGroupPage.tsx
index 19cd151..68d7b5c 100644
--- a/src/pages/Insides/ListInsideCrdByApiGroupPage/ListInsideCrdByApiGroupPage.tsx
+++ b/src/pages/Insides/ListInsideCrdByApiGroupPage/ListInsideCrdByApiGroupPage.tsx
@@ -1,36 +1,36 @@
-import React, { FC } from 'react'
+import React, { FC, useEffect } from 'react'
 import { ContentCard } from '@prorobotech/openapi-k8s-toolkit'
-import { useParams } from 'react-router-dom'
-import { ListInsideCrdsByApiGroup, ManageableBreadcrumbs, ManageableSidebar, NavigationContainer } from 'components'
-import { getSidebarIdPrefix } from 'utils/getSidebarIdPrefix'
-import { getBreadcrumbsIdPrefix } from 'utils/getBreadcrumbsIdPrefix'
-import { BaseTemplate } from 'templates'
+import { useParams, useOutletContext } from 'react-router-dom'
+import { ListInsideCrdsByApiGroup } from 'components'
+import { TChromeCtx } from 'templates'
 
-type TListInsideCrdByApiGroupPageProps = {
-  inside?: boolean
-}
-
-export const ListInsideCrdByApiGroupPage: FC<TListInsideCrdByApiGroupPageProps> = ({ inside }) => {
+export const ListInsideCrdByApiGroupPage: FC = () => {
   const { namespace, apiGroup, apiVersion, apiExtensionVersion } = useParams()
 
-  const sidebarId = `${getSidebarIdPrefix({ namespace: !!namespace, inside })}crd-by-api`
-  const breadcrumbsId = `${getBreadcrumbsIdPrefix({ namespace: !!namespace, inside })}crd-by-api`
+  const { setSidebarSuffix, setBreadcrumbsSuffix, setUseOnlyNamespace } = useOutletContext<TChromeCtx>()
+
+  useEffect(() => {
+    setSidebarSuffix('crd-by-api')
+    setBreadcrumbsSuffix('crd-by-api')
+    setUseOnlyNamespace(true)
+
+    return () => {
+      setSidebarSuffix(undefined)
+      setBreadcrumbsSuffix(undefined)
+      setUseOnlyNamespace(false)
+    }
+  }, [setSidebarSuffix, setBreadcrumbsSuffix, setUseOnlyNamespace])
 
   return (
-    <BaseTemplate inside={inside} sidebar={<ManageableSidebar idToCompare={sidebarId} />}>
-      <NavigationContainer>
-        <ManageableBreadcrumbs idToCompare={breadcrumbsId} inside />
-      </NavigationContainer>
-      <ContentCard flexGrow={1} displayFlex flexFlow="column">
-        {apiGroup && apiVersion && apiExtensionVersion && (
-          <ListInsideCrdsByApiGroup
-            namespace={namespace}
-            apiGroup={apiGroup}
-            apiVersion={apiVersion}
-            apiExtensionVersion={apiExtensionVersion}
-          />
-        )}
-      </ContentCard>
-    </BaseTemplate>
+    <ContentCard flexGrow={1} displayFlex flexFlow="column">
+      {apiGroup && apiVersion && apiExtensionVersion && (
+        <ListInsideCrdsByApiGroup
+          namespace={namespace}
+          apiGroup={apiGroup}
+          apiVersion={apiVersion}
+          apiExtensionVersion={apiExtensionVersion}
+        />
+      )}
+    </ContentCard>
   )
 }
diff --git a/src/pages/ListProjectsPage/index.ts b/src/pages/ListProjectsPage/index.ts
deleted file mode 100644
index b3c30e4..0000000
--- a/src/pages/ListProjectsPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ListProjectsPage } from './ListProjectsPage'
diff --git a/src/pages/ProjectInfoPage/index.ts b/src/pages/ProjectInfoPage/index.ts
deleted file mode 100644
index 14f22bf..0000000
--- a/src/pages/ProjectInfoPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ProjectInfoPage } from './ProjectInfoPage'
diff --git a/src/pages/ProjectInfoPage/ProjectInfoPage.tsx b/src/pages/RedirectProjectInfoPage/RedirectProjectInfoPage.tsx
similarity index 80%
rename from src/pages/ProjectInfoPage/ProjectInfoPage.tsx
rename to src/pages/RedirectProjectInfoPage/RedirectProjectInfoPage.tsx
index f205d63..f8ff0f8 100644
--- a/src/pages/ProjectInfoPage/ProjectInfoPage.tsx
+++ b/src/pages/RedirectProjectInfoPage/RedirectProjectInfoPage.tsx
@@ -2,7 +2,7 @@ import React, { FC } from 'react'
 import { RedirectProjectInfo } from 'components'
 import { BaseTemplate } from 'templates'
 
-export const ProjectInfoPage: FC = () => {
+export const RedirectProjectInfoPage: FC = () => {
   return (
     <BaseTemplate>
       <RedirectProjectInfo />
diff --git a/src/pages/RedirectProjectInfoPage/index.ts b/src/pages/RedirectProjectInfoPage/index.ts
new file mode 100644
index 0000000..7a1c41e
--- /dev/null
+++ b/src/pages/RedirectProjectInfoPage/index.ts
@@ -0,0 +1 @@
+export { RedirectProjectInfoPage } from './RedirectProjectInfoPage'
diff --git a/src/pages/ListProjectsPage/ListProjectsPage.tsx b/src/pages/RedirectProjectsPage/RedirectProjectsPage.tsx
similarity index 81%
rename from src/pages/ListProjectsPage/ListProjectsPage.tsx
rename to src/pages/RedirectProjectsPage/RedirectProjectsPage.tsx
index 1d02c38..d37455a 100644
--- a/src/pages/ListProjectsPage/ListProjectsPage.tsx
+++ b/src/pages/RedirectProjectsPage/RedirectProjectsPage.tsx
@@ -2,7 +2,7 @@ import React, { FC } from 'react'
 import { RedirectProjectList } from 'components'
 import { BaseTemplate } from 'templates'
 
-export const ListProjectsPage: FC = () => {
+export const RedirectProjectsPage: FC = () => {
   return (
     <BaseTemplate>
       <RedirectProjectList />
diff --git a/src/pages/RedirectProjectsPage/index.ts b/src/pages/RedirectProjectsPage/index.ts
new file mode 100644
index 0000000..2ea6faf
--- /dev/null
+++ b/src/pages/RedirectProjectsPage/index.ts
@@ -0,0 +1 @@
+export { RedirectProjectsPage } from './RedirectProjectsPage'
diff --git a/src/pages/SearchPage/SearchPage.tsx b/src/pages/SearchPage/SearchPage.tsx
index 33e3e24..26bdd2b 100644
--- a/src/pages/SearchPage/SearchPage.tsx
+++ b/src/pages/SearchPage/SearchPage.tsx
@@ -1,47 +1,32 @@
-import React, { FC } from 'react'
+import React, { FC, useEffect } from 'react'
 import { ContentCard } from '@prorobotech/openapi-k8s-toolkit'
-import { useParams } from 'react-router-dom'
-import { BackLink, ManageableBreadcrumbs, ManageableSidebar, NavigationContainer, Search } from 'components'
-import { getSidebarIdPrefix } from 'utils/getSidebarIdPrefix'
-import { getBreadcrumbsIdPrefix } from 'utils/getBreadcrumbsIdPrefix'
-import { BaseTemplate } from 'templates'
+import { useOutletContext } from 'react-router-dom'
+import { Search } from 'components'
+import { TChromeCtx } from 'templates'
 
 export const SearchPage: FC = () => {
-  const { namespace, syntheticProject } = useParams()
+  const { setCurrentTags, setSidebarSuffix, setBreadcrumbsSuffix, setUseOnlyNamespace, setBaseTemplateSearchBoolean } =
+    useOutletContext<TChromeCtx>()
 
-  const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
-  const possibleInstance = syntheticProject && namespace ? namespace : undefined
+  useEffect(() => {
+    setCurrentTags(['search'])
+    setSidebarSuffix('search-page')
+    setBreadcrumbsSuffix('search-page')
+    setUseOnlyNamespace(true)
+    setBaseTemplateSearchBoolean(true)
 
-  // const sidebarId = `${getSidebarIdPrefix({ instance: !!syntheticProject, project: !!namespace })}search-page`
-  // const breadcrumbsId = `${getBreadcrumbsIdPrefix({
-  //   instance: !!syntheticProject,
-  //   project: !!namespace,
-  // })}search-page`
-  const sidebarId = `${getSidebarIdPrefix({ namespace: !!namespace })}search-page`
-  const breadcrumbsId = `${getBreadcrumbsIdPrefix({
-    namespace: !!namespace,
-  })}search-page`
+    return () => {
+      setCurrentTags(undefined)
+      setSidebarSuffix(undefined)
+      setBreadcrumbsSuffix(undefined)
+      setUseOnlyNamespace(false)
+      setBaseTemplateSearchBoolean(false)
+    }
+  }, [setSidebarSuffix, setBreadcrumbsSuffix, setCurrentTags, setUseOnlyNamespace, setBaseTemplateSearchBoolean])
 
   return (
-    <BaseTemplate
-      inside={false}
-      isSearch
-      sidebar={
-        <ManageableSidebar
-          instanceName={possibleInstance}
-          projectName={possibleProject}
-          idToCompare={sidebarId}
-          currentTags={['search']}
-        />
-      }
-    >
-      <NavigationContainer>
-        <ManageableBreadcrumbs idToCompare={breadcrumbsId} inside={false} />
-        <BackLink title="Search" />
-      </NavigationContainer>
-      <ContentCard flexGrow={1} displayFlex flexFlow="column">
-        <Search />
-      </ContentCard>
-    </BaseTemplate>
+    <ContentCard flexGrow={1} displayFlex flexFlow="column">
+      <Search />
+    </ContentCard>
   )
 }
diff --git a/src/pages/index.ts b/src/pages/index.ts
index c41444f..046b069 100644
--- a/src/pages/index.ts
+++ b/src/pages/index.ts
@@ -1,15 +1,6 @@
-export { MainPage } from './MainPage'
 /* main routing */
+export { MainPage } from './MainPage'
 export { ListClustersPage } from './ListClustersPage'
-export { ListProjectsPage } from './ListProjectsPage'
-export { ProjectInfoPage } from './ProjectInfoPage'
-/* inside routing */
-export {
-  ListInsideClustersAndNsPage,
-  ListInsideApiPage,
-  ListInsideCrdByApiGroupPage,
-  ListInsideApiByApiGroupPage,
-} from './Insides'
 /* tables */
 export {
   // TableCrdPage,
@@ -26,3 +17,13 @@ export {
 export { FactoryPage } from './FactoryPage'
 /* search */
 export { SearchPage } from './SearchPage'
+/* inside routing */
+export {
+  ListInsideClustersAndNsPage,
+  ListInsideApiPage,
+  ListInsideCrdByApiGroupPage,
+  ListInsideApiByApiGroupPage,
+} from './Insides'
+/* redirects */
+export { RedirectProjectsPage } from './RedirectProjectsPage'
+export { RedirectProjectInfoPage } from './RedirectProjectInfoPage'
diff --git a/src/templates/AppShell/AppShell.tsx b/src/templates/AppShell/AppShell.tsx
index 534de74..c42f1a7 100644
--- a/src/templates/AppShell/AppShell.tsx
+++ b/src/templates/AppShell/AppShell.tsx
@@ -12,6 +12,8 @@ export type TChromeCtx = {
   setBreadcrumbsSuffix: (suffix?: string) => void
   setBacklinkTo: (backlinkTo?: string) => void
   setBacklinkTitle: (backlinkTitle?: string) => void
+  setUseOnlyNamespace: (flag: boolean) => void
+  setBaseTemplateSearchBoolean: (flag: boolean) => void
 }
 
 export const AppShell: FC<{ inside?: boolean }> = ({ inside }) => {
@@ -25,6 +27,8 @@ export const AppShell: FC<{ inside?: boolean }> = ({ inside }) => {
   const [breadcrumbsSuffix, setBreadcrumbsSuffix] = useState<string | undefined>()
   const [backlinkTo, setBacklinkTo] = useState<string | undefined>()
   const [backlinkTitle, setBacklinkTitle] = useState<string | undefined>()
+  const [useOnlyNamespace, setUseOnlyNamespace] = useState<boolean>(false)
+  const [baseTemplateSearchBoolean, setBaseTemplateSearchBoolean] = useState<boolean>(false)
 
   // Commit tags only on actual content change to avoid sidebar refetch
   const setCurrentTags = React.useCallback((next?: string[]) => {
@@ -39,18 +43,22 @@ export const AppShell: FC<{ inside?: boolean }> = ({ inside }) => {
 
   const sidebarId = useMemo(
     () =>
-      `${getSidebarIdPrefix({ instance: !!syntheticProject, project: !!namespace, inside })}${
+      `${getSidebarIdPrefix({ instance: !!syntheticProject, project: !!namespace, useOnlyNamespace, inside })}${
         sidebarSuffix ?? 'app-shell'
       }`,
-    [syntheticProject, namespace, inside, sidebarSuffix],
+    [syntheticProject, namespace, sidebarSuffix, useOnlyNamespace, inside],
   )
 
   const breadcrumbsId = useMemo(
     () =>
-      `${getBreadcrumbsIdPrefix({ instance: !!syntheticProject, project: !!namespace, inside })}${
-        breadcrumbsSuffix ?? 'app-shell'
-      }`,
-    [syntheticProject, namespace, inside, breadcrumbsSuffix],
+      `${getBreadcrumbsIdPrefix({
+        namespace: !!namespace,
+        instance: !!syntheticProject,
+        project: !!namespace,
+        useOnlyNamespace,
+        inside,
+      })}${breadcrumbsSuffix ?? 'app-shell'}`,
+    [syntheticProject, namespace, breadcrumbsSuffix, useOnlyNamespace, inside],
   )
 
   const sidebarEl = React.useMemo(
@@ -72,12 +80,14 @@ export const AppShell: FC<{ inside?: boolean }> = ({ inside }) => {
       setBreadcrumbsSuffix,
       setBacklinkTo,
       setBacklinkTitle,
+      setUseOnlyNamespace,
+      setBaseTemplateSearchBoolean,
     }),
     [setCurrentTags],
   )
 
   return (
-    <BaseTemplate inside={inside} sidebar={sidebarEl}>
+    <BaseTemplate inside={inside} sidebar={sidebarEl} isSearch={baseTemplateSearchBoolean}>
       <NavigationContainer>
         <ManageableBreadcrumbs idToCompare={breadcrumbsId} inside={inside} />
         {backlinkTo && backlinkTitle && <BackLink to={backlinkTo} title={backlinkTitle} />}
diff --git a/src/utils/getBreadcrumbsIdPrefix.ts b/src/utils/getBreadcrumbsIdPrefix.ts
index 42b0a50..0d7a49a 100644
--- a/src/utils/getBreadcrumbsIdPrefix.ts
+++ b/src/utils/getBreadcrumbsIdPrefix.ts
@@ -3,17 +3,19 @@ export const getBreadcrumbsIdPrefix = ({
   instance,
   namespace,
   inside,
+  useOnlyNamespace,
 }: {
   project?: boolean
   instance?: boolean
   namespace?: boolean
   inside?: boolean
+  useOnlyNamespace?: boolean
 }): string => {
   let result = inside ? 'inside-' : 'stock-'
 
-  if (instance) {
+  if (instance && !useOnlyNamespace) {
     result += 'instance-'
-  } else if (project) {
+  } else if (project && !useOnlyNamespace) {
     result += 'project-'
   } else if (namespace) {
     result += 'namespace-'
diff --git a/src/utils/getSidebarIdPrefix.ts b/src/utils/getSidebarIdPrefix.ts
index 27b9347..33c8199 100644
--- a/src/utils/getSidebarIdPrefix.ts
+++ b/src/utils/getSidebarIdPrefix.ts
@@ -3,17 +3,19 @@ export const getSidebarIdPrefix = ({
   instance,
   namespace,
   inside,
+  useOnlyNamespace,
 }: {
   project?: boolean
   instance?: boolean
   namespace?: boolean
   inside?: boolean
+  useOnlyNamespace?: boolean
 }): string => {
   let result = inside ? 'inside-' : 'stock-'
 
-  if (instance) {
+  if (instance && !useOnlyNamespace) {
     result += 'instance-'
-  } else if (project) {
+  } else if (project && !useOnlyNamespace) {
     result += 'project-'
   } else if (namespace) {
     result += 'namespace-'

From d1eedb0287a71fd1524ac262dacdf8068ba55897 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Tue, 11 Nov 2025 06:10:44 +0300
Subject: [PATCH 13/32] fix logos

---
 src/templates/MainLayout/MainLayout.tsx | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/templates/MainLayout/MainLayout.tsx b/src/templates/MainLayout/MainLayout.tsx
index ec96087..e89ff53 100644
--- a/src/templates/MainLayout/MainLayout.tsx
+++ b/src/templates/MainLayout/MainLayout.tsx
@@ -66,13 +66,17 @@ export const MainLayout: FC<TMainLayoutProps> = ({ children, forcedTheme }) => {
     }
   }, [clusterListQuery, dispatch])
 
-  if (clusterName) {
-    dispatch(setCluster(clusterName))
-  }
+  // if (clusterName) {
+  //   dispatch(setCluster(clusterName))
+  // }
 
-  if (clusterName === undefined) {
-    dispatch(setCluster(''))
-  }
+  // if (clusterName === undefined) {
+  //   dispatch(setCluster(''))
+  // }
+
+  useEffect(() => {
+    dispatch(setCluster(clusterName ?? ''))
+  }, [dispatch, clusterName])
 
   return (
     <DefaultColorProvider $color={token.colorText}>

From 0122cde6936bc561711a50fdb21095329ad7f46d Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Wed, 12 Nov 2025 02:30:31 +0300
Subject: [PATCH 14/32] tookit sync

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2c877fd..afbe65f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.5",
+        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.6",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2804,9 +2804,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "1.1.0-alpha.5",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.5.tgz",
-      "integrity": "sha512-JgRwGwNhhY7Rh7/c0QYzhWBMqQYwdVaef4ogwPNURJdXRext7gie5pSsxJVey2p1qc9O6K4AI4DQMEHccr8fcw==",
+      "version": "1.1.0-alpha.6",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.6.tgz",
+      "integrity": "sha512-4pZ1Ac/S1+Kb+iWY3d53ORnGOQyRV0PHzC9A6qzGRarJjUnAZATk0ZlAC9PIFQaosVaiHw8LaLGz4x/9Rjzt+w==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index 446cc63..1c8d8ae 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.5",
+    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.6",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",

From 6903b3f0d1def1d10186a01be805cbac7a596790 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Thu, 13 Nov 2025 13:38:05 +0300
Subject: [PATCH 15/32] sync toolkit

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index afbe65f..629c308 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.6",
+        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.7",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2804,9 +2804,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "1.1.0-alpha.6",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.6.tgz",
-      "integrity": "sha512-4pZ1Ac/S1+Kb+iWY3d53ORnGOQyRV0PHzC9A6qzGRarJjUnAZATk0ZlAC9PIFQaosVaiHw8LaLGz4x/9Rjzt+w==",
+      "version": "1.1.0-alpha.7",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.7.tgz",
+      "integrity": "sha512-WM+G7ppYp/rVmyK++eLRku2trpvNEQzAhGkYlHbwbEqWzTnJF1ki4CM66UZPTvUH+Q4FYVJW9pTBIorn0yEYEA==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index 1c8d8ae..7dc0f87 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.6",
+    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.7",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",

From e9bb392c08910ada0f4eaa56548bee9ce54014e5 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Fri, 14 Nov 2025 13:57:18 +0300
Subject: [PATCH 16/32] new prepare table req body

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 629c308..032cc04 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.7",
+        "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.8",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2804,9 +2804,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "1.1.0-alpha.7",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.7.tgz",
-      "integrity": "sha512-WM+G7ppYp/rVmyK++eLRku2trpvNEQzAhGkYlHbwbEqWzTnJF1ki4CM66UZPTvUH+Q4FYVJW9pTBIorn0yEYEA==",
+      "version": "1.1.0-alpha.8",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.8.tgz",
+      "integrity": "sha512-bv7paXWtah6Wj1UnTPhx9akfWjKw/CXtddmm2f18ehvDqYgKqmDE4ZLEdBC6pFugxIwiyuXTnQ73pePnT8u+Jw==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index 7dc0f87..b59c99d 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.7",
+    "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.8",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",

From 7a95d58e3622c667ab232cf3cce086522fc3d3a4 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Mon, 17 Nov 2025 09:32:18 +0300
Subject: [PATCH 17/32] codestyles

---
 src/components/molecules/BlackholeForm/BlackholeForm.tsx      | 4 ++--
 .../molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx | 4 ++--
 .../molecules/ManageableSidebar/ManageableSidebar.tsx         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/molecules/BlackholeForm/BlackholeForm.tsx b/src/components/molecules/BlackholeForm/BlackholeForm.tsx
index ceb2139..28ff258 100644
--- a/src/components/molecules/BlackholeForm/BlackholeForm.tsx
+++ b/src/components/molecules/BlackholeForm/BlackholeForm.tsx
@@ -1,6 +1,6 @@
 import React, { FC, useState, useEffect } from 'react'
 import { useParams } from 'react-router-dom'
-import { BlackholeFormDataProvider, TJSON } from '@prorobotech/openapi-k8s-toolkit'
+import { BlackholeFormProvider, TJSON } from '@prorobotech/openapi-k8s-toolkit'
 import { useSelector } from 'react-redux'
 import type { RootState } from 'store/store'
 import {
@@ -83,7 +83,7 @@ export const BlackholeForm: FC<TBlackholeFormProps> = ({ data, customizationId,
   }
 
   return (
-    <BlackholeFormDataProvider
+    <BlackholeFormProvider
       theme={theme}
       cluster={cluster}
       urlParams={urlParams}
diff --git a/src/components/molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx b/src/components/molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx
index 6743c05..b9c4102 100644
--- a/src/components/molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx
+++ b/src/components/molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx
@@ -1,6 +1,6 @@
 import React, { FC } from 'react'
 import { useLocation, useParams } from 'react-router-dom'
-import { ManageableBreadcrumbsWithDataProvider } from '@prorobotech/openapi-k8s-toolkit'
+import { ManageableBreadcrumbsProvider } from '@prorobotech/openapi-k8s-toolkit'
 import { BASE_API_GROUP, BASE_API_VERSION } from 'constants/customizationApiGroupAndVersion'
 
 type TManageableBreadCrumbsProps = {
@@ -30,7 +30,7 @@ export const ManageableBreadcrumbs: FC<TManageableBreadCrumbsProps> = ({ idToCom
     }, {})
 
   return (
-    <ManageableBreadcrumbsWithDataProvider
+    <ManageableBreadcrumbsProvider
       idToCompare={idToCompare}
       cluster={clusterName}
       apiGroup={BASE_API_GROUP}
diff --git a/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx b/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
index e105d42..65d8d8a 100644
--- a/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
+++ b/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
@@ -1,7 +1,7 @@
 import React, { FC, useState, useEffect } from 'react'
 import { theme as antdtheme } from 'antd'
 import { useLocation, useParams } from 'react-router-dom'
-import { ManageableSidebarWithDataProvider } from '@prorobotech/openapi-k8s-toolkit'
+import { ManageableSidebarProvider } from '@prorobotech/openapi-k8s-toolkit'
 import { useSelector } from 'react-redux'
 import type { RootState } from 'store/store'
 // import { HEAD_FIRST_ROW, SIDEBAR_CLUSTER_HEIGHT } from 'constants/blocksSizes'
@@ -66,7 +66,7 @@ export const ManageableSidebar: FC<TManageableSidebarProps> = ({
       $colorBorder={token.colorBorder}
       $maxHeight={height}
     >
-      <ManageableSidebarWithDataProvider
+      <ManageableSidebarProvider
         cluster={clusterName}
         apiGroup={BASE_API_GROUP}
         apiVersion={BASE_API_VERSION}

From fe7380ba119080d06cf5bad520c2ba06e3eff112 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Mon, 17 Nov 2025 09:44:38 +0300
Subject: [PATCH 18/32] navigations ts

---
 .../HeaderSecond/organisms/Selector/Selector.tsx      | 11 ++++++-----
 .../organisms/SelectorNamespace/SelectorNamespace.tsx |  9 ++++-----
 src/hooks/useNavSelector/useNavSelector.ts            |  7 +++----
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/components/organisms/HeaderSecond/organisms/Selector/Selector.tsx b/src/components/organisms/HeaderSecond/organisms/Selector/Selector.tsx
index 9fdfeda..782f2d2 100644
--- a/src/components/organisms/HeaderSecond/organisms/Selector/Selector.tsx
+++ b/src/components/organisms/HeaderSecond/organisms/Selector/Selector.tsx
@@ -4,6 +4,7 @@ import { useNavigate } from 'react-router-dom'
 import {
   // useDirectUnknownResource,
   useK8sSmartResource,
+  TNavigationResource,
 } from '@prorobotech/openapi-k8s-toolkit'
 import { useNavSelector } from 'hooks/useNavSelector'
 import { useMountEffect } from 'hooks/useMountEffect'
@@ -44,7 +45,7 @@ export const Selector: FC<TSelectorProps> = ({ clusterName, projectName, instanc
   // })
 
   const { data: navigationDataArr } = useK8sSmartResource<{
-    items: { spec: { projects: { clear: string; change: string }; instances: { clear: string; change: string } } }[]
+    items: TNavigationResource[]
   }>({
     cluster: clusterName || '',
     group: BASE_API_GROUP,
@@ -66,13 +67,13 @@ export const Selector: FC<TSelectorProps> = ({ clusterName, projectName, instanc
     if (value && value !== 'all') {
       setSelectedProjectName(value)
       const changeUrl =
-        navigationData?.spec.projects.change
+        navigationData?.spec?.projects?.change
           .replace('{selectedCluster}', selectedClusterName || 'no-cluster')
           .replace('{value}', value) || 'no navigation data'
       navigate(changeUrl)
     } else {
       const clearUrl =
-        navigationData?.spec.projects.clear.replace('{selectedCluster}', selectedClusterName || 'no-cluster') ||
+        navigationData?.spec?.projects?.clear.replace('{selectedCluster}', selectedClusterName || 'no-cluster') ||
         'no navigation data'
       navigate(clearUrl)
     }
@@ -82,14 +83,14 @@ export const Selector: FC<TSelectorProps> = ({ clusterName, projectName, instanc
     if (value && value !== 'all') {
       setSelectedInstanceName(value)
       const changeUrl =
-        navigationData?.spec.instances.change
+        navigationData?.spec?.instances?.change
           .replace('{selectedCluster}', selectedClusterName || 'no-cluster')
           .replace('{selectedProject}', selectedProjectName || 'no-project')
           .replace('{value}', value) || 'no navigation data'
       navigate(changeUrl)
     } else {
       const clearUrl =
-        navigationData?.spec.instances.clear
+        navigationData?.spec?.instances?.clear
           .replace('{selectedCluster}', selectedClusterName || 'no-cluster')
           .replace('{selectedProject}', selectedProjectName || 'no-project') || 'no navigation data'
       navigate(clearUrl)
diff --git a/src/components/organisms/HeaderSecond/organisms/SelectorNamespace/SelectorNamespace.tsx b/src/components/organisms/HeaderSecond/organisms/SelectorNamespace/SelectorNamespace.tsx
index 46c9ce5..a3c2db5 100644
--- a/src/components/organisms/HeaderSecond/organisms/SelectorNamespace/SelectorNamespace.tsx
+++ b/src/components/organisms/HeaderSecond/organisms/SelectorNamespace/SelectorNamespace.tsx
@@ -4,6 +4,7 @@ import { useLocation, useNavigate } from 'react-router-dom'
 import {
   // useDirectUnknownResource,
   useK8sSmartResource,
+  TNavigationResource,
 } from '@prorobotech/openapi-k8s-toolkit'
 import { useSelector } from 'react-redux'
 import type { RootState } from 'store/store'
@@ -44,9 +45,7 @@ export const SelectorNamespace: FC<TSelectorNamespaceProps> = ({ clusterName, na
   // })
 
   const { data: navigationDataArr } = useK8sSmartResource<{
-    items: {
-      spec: { namespaces: { clear: string; change: string } }
-    }[]
+    items: TNavigationResource[]
   }>({
     cluster: clusterName || '',
     group: BASE_API_GROUP,
@@ -101,13 +100,13 @@ export const SelectorNamespace: FC<TSelectorNamespaceProps> = ({ clusterName, na
     if (value && value !== 'all') {
       setSelectedNamespace(value)
       const changeUrl =
-        navigationData?.spec.namespaces.change
+        navigationData?.spec?.namespaces?.change
           .replace('{selectedCluster}', selectedClusterName || 'no-cluster')
           .replace('{value}', value) || 'no navigation data'
       navigate(changeUrl)
     } else {
       const clearUrl =
-        navigationData?.spec.namespaces.clear.replace('{selectedCluster}', selectedClusterName || 'no-cluster') ||
+        navigationData?.spec?.namespaces?.clear.replace('{selectedCluster}', selectedClusterName || 'no-cluster') ||
         'no navigation data'
       navigate(clearUrl)
     }
diff --git a/src/hooks/useNavSelector/useNavSelector.ts b/src/hooks/useNavSelector/useNavSelector.ts
index 1ae504e..a54da43 100644
--- a/src/hooks/useNavSelector/useNavSelector.ts
+++ b/src/hooks/useNavSelector/useNavSelector.ts
@@ -4,6 +4,7 @@ import {
   TSingleResource,
   // useDirectUnknownResource,
   useK8sSmartResource,
+  TNavigationResource,
 } from '@prorobotech/openapi-k8s-toolkit'
 import { useSelector } from 'react-redux'
 import { RootState } from 'store/store'
@@ -61,9 +62,7 @@ export const useNavSelector = (clusterName?: string, projectName?: string) => {
   // })
 
   const { data: navigationDataArr } = useK8sSmartResource<{
-    items: {
-      spec: { instances: { mapOptionsPattern: string } }
-    }[]
+    items: TNavigationResource[]
   }>({
     cluster: clusterName || '',
     group: BASE_API_GROUP,
@@ -133,7 +132,7 @@ export const useNavSelector = (clusterName?: string, projectName?: string) => {
           .map(item =>
             mappedInstanceToOptionInSidebar({
               instance: item,
-              templateString: navigationData?.spec.instances.mapOptionsPattern,
+              templateString: navigationData?.spec?.instances?.mapOptionsPattern,
             }),
           )
       : []

From 10071ae36a74026fc2a6fbc4c6df58f9b27e3dd9 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Mon, 17 Nov 2025 12:23:10 +0300
Subject: [PATCH 19/32] owner refs with relative paths

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 032cc04..c2dcd19 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.8",
+        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.9",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2804,9 +2804,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "1.1.0-alpha.8",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.8.tgz",
-      "integrity": "sha512-bv7paXWtah6Wj1UnTPhx9akfWjKw/CXtddmm2f18ehvDqYgKqmDE4ZLEdBC6pFugxIwiyuXTnQ73pePnT8u+Jw==",
+      "version": "1.1.0-alpha.9",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.9.tgz",
+      "integrity": "sha512-Lb97O5RsOQLwhUTetnXeVXqCHRhZRXOxLqVHp24xnyInwWvMbCsgVn3tXKSQz2MFIuyCw1HWVdN5/Dh19GiPdA==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index b59c99d..95bab45 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.8",
+    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.9",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",

From eec1ee25f29ff0f6adc67e2161f15315c25c7f97 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Tue, 18 Nov 2025 04:54:29 +0300
Subject: [PATCH 20/32] more ns handlers to ownerrefs component | yaml editor
 notifications

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c2dcd19..cee2e4a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.9",
+        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.10",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2804,9 +2804,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "1.1.0-alpha.9",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.9.tgz",
-      "integrity": "sha512-Lb97O5RsOQLwhUTetnXeVXqCHRhZRXOxLqVHp24xnyInwWvMbCsgVn3tXKSQz2MFIuyCw1HWVdN5/Dh19GiPdA==",
+      "version": "1.1.0-alpha.10",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.10.tgz",
+      "integrity": "sha512-pxkgo86obgoX1lZDQmq8c3iUB1rk3+OfvvFPGCsiY/9rlFdXt7/4sg0O6y+L/H3++86YpuL0aT4sIVMxNVldcA==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index 95bab45..63ad3bf 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.9",
+    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.10",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",

From 9d5845ca7a85c9c19f575db5f7b4d919d45baf0f Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Tue, 18 Nov 2025 16:57:42 +0300
Subject: [PATCH 21/32] sidebars fallback

---
 .../molecules/ManageableSidebar/ManageableSidebar.tsx | 11 ++++++++++-
 src/constants/customizationApiGroupAndVersion.ts      |  4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx b/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
index 65d8d8a..568c2c9 100644
--- a/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
+++ b/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
@@ -6,7 +6,11 @@ import { useSelector } from 'react-redux'
 import type { RootState } from 'store/store'
 // import { HEAD_FIRST_ROW, SIDEBAR_CLUSTER_HEIGHT } from 'constants/blocksSizes'
 import { HEAD_FIRST_ROW } from 'constants/blocksSizes'
-import { BASE_API_GROUP, BASE_API_VERSION } from 'constants/customizationApiGroupAndVersion'
+import {
+  BASE_API_GROUP,
+  BASE_API_VERSION,
+  CUSTOMIZATION_SIDEBAR_FALLBACK_ID,
+} from 'constants/customizationApiGroupAndVersion'
 import { Styled } from './styled'
 
 type TManageableSidebarProps = {
@@ -56,6 +60,8 @@ export const ManageableSidebar: FC<TManageableSidebarProps> = ({
       return acc
     }, {})
 
+  console.log(namespace ? `${CUSTOMIZATION_SIDEBAR_FALLBACK_ID}-namespaced` : CUSTOMIZATION_SIDEBAR_FALLBACK_ID)
+
   return (
     <Styled.Container
       $isDark={theme === 'dark'}
@@ -82,6 +88,9 @@ export const ManageableSidebar: FC<TManageableSidebarProps> = ({
         }}
         pathname={pathname}
         idToCompare={idToCompare}
+        fallbackIdToCompare={
+          namespace ? `${CUSTOMIZATION_SIDEBAR_FALLBACK_ID}-namespaced` : CUSTOMIZATION_SIDEBAR_FALLBACK_ID
+        }
         currentTags={currentTags}
         noMarginTop
       />
diff --git a/src/constants/customizationApiGroupAndVersion.ts b/src/constants/customizationApiGroupAndVersion.ts
index 5700560..dc40f62 100644
--- a/src/constants/customizationApiGroupAndVersion.ts
+++ b/src/constants/customizationApiGroupAndVersion.ts
@@ -34,6 +34,10 @@ export const BASE_CUSTOMIZATION_NAVIGATION_RESOURCE = import.meta.env.DEV
   ? window._env_.CUSTOMIZATION_NAVIGATION_RESOURCE || import.meta.env.VITE_CUSTOMIZATION_NAVIGATION_RESOURCE
   : window._env_.CUSTOMIZATION_NAVIGATION_RESOURCE
 
+export const CUSTOMIZATION_SIDEBAR_FALLBACK_ID = import.meta.env.DEV
+  ? window._env_.CUSTOMIZATION_SIDEBAR_FALLBACK_ID || import.meta.env.VITE_CUSTOMIZATION_SIDEBAR_FALLBACK_ID
+  : window._env_.CUSTOMIZATION_SIDEBAR_FALLBACK_ID
+
 export const BASE_USE_NAMESPACE_NAV = import.meta.env.DEV
   ? window._env_.USE_NAMESPACE_NAV || import.meta.env.VITE_USE_NAMESPACE_NAV
   : window._env_.USE_NAMESPACE_NAV

From ad3f089420851b3c6e3bfe515746aa8dec843c92 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Tue, 18 Nov 2025 17:24:39 +0300
Subject: [PATCH 22/32] sidebars fallback

---
 .env                                                        | 2 ++
 .env.options.dist                                           | 2 ++
 README.md                                                   | 1 +
 server/index.ts                                             | 6 ++++++
 .../molecules/ManageableSidebar/ManageableSidebar.tsx       | 2 --
 src/constants/customizationApiGroupAndVersion.ts            | 4 ++++
 6 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index d117d9b..c527b4f 100644
--- a/.env
+++ b/.env
@@ -10,6 +10,8 @@ VITE_CUSTOMIZATION_API_VERSION=v1alpha
 VITE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME=navigations
 VITE_CUSTOMIZATION_NAVIGATION_RESOURCE=navigation
 
+VITE_CUSTOMIZATION_SIDEBAR_FALLBACK_ID = fallback
+
 VITE_USE_NAMESPACE_NAV=true
 
 VITE_HIDE_INSIDE=false
diff --git a/.env.options.dist b/.env.options.dist
index d36b462..9039ae3 100644
--- a/.env.options.dist
+++ b/.env.options.dist
@@ -12,6 +12,8 @@ CUSTOMIZATION_API_VERSION=
 CUSTOMIZATION_NAVIGATION_RESOURCE_NAME=
 CUSTOMIZATION_NAVIGATION_RESOURCE=
 
+CUSTOMIZATION_SIDEBAR_FALLBACK_ID=
+
 USE_NAMESPACE_NAV=
 
 HIDE_INSIDE=
diff --git a/README.md b/README.md
index 5614994..22342c1 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@ This app can be configured through environment variables.
 | `CUSTOMIZATION_API_VERSION`                   | `string`  | API version for customization resources. `v1alpha1`                                     |
 | `CUSTOMIZATION_NAVIGATION_RESOURCE_NAME`      | `string`  | Resource plural name for navigation settings. `navigations`                             |
 | `CUSTOMIZATION_NAVIGATION_RESOURCE`           | `string`  | Resource name for navigation settings. `navigation`                                     |
+| `CUSTOMIZATION_SIDEBAR_FALLBACK_ID`           | `string`  | `spec.id` to find in `sidebars` to fallback. Use `-namespaced` for NS-pages             |
 | `USE_NAMESPACE_NAV`                           | `boolean` | Use namespaces instead of project/instances. `true`                                     |
 | `HIDE_INSIDE`                                 | `boolean` | Use namespaces instead of project/instances. `true`                                     |
 | `NAVIGATE_FROM_CLUSTERLIST`                   | `string`  | Location to be navigated after selecting cluster. `/openapi-ui/clusters/~recordValue~`  |
diff --git a/server/index.ts b/server/index.ts
index f14aca6..354369d 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -38,6 +38,11 @@ const CUSTOMIZATION_NAVIGATION_RESOURCE =
     ? options?.CUSTOMIZATION_NAVIGATION_RESOURCE
     : process.env.CUSTOMIZATION_NAVIGATION_RESOURCE
 
+const CUSTOMIZATION_SIDEBAR_FALLBACK_ID =
+  process.env.LOCAL === 'true'
+    ? options?.CUSTOMIZATION_SIDEBAR_FALLBACK_ID
+    : process.env.CUSTOMIZATION_SIDEBAR_FALLBACK_ID
+
 const USE_NAMESPACE_NAV = process.env.LOCAL === 'true' ? options?.USE_NAMESPACE_NAV : process.env.USE_NAMESPACE_NAV
 const HIDE_INSIDE = process.env.LOCAL === 'true' ? options?.HIDE_INSIDE : process.env.HIDE_INSIDE
 
@@ -239,6 +244,7 @@ app.get(`${basePrefix ? basePrefix : ''}/env.js`, (_, res) => {
           : ''
       }
       CUSTOMIZATION_NAVIGATION_RESOURCE: ${JSON.stringify(CUSTOMIZATION_NAVIGATION_RESOURCE) || '"check envs"'},
+      CUSTOMIZATION_SIDEBAR_FALLBACK_ID: ${JSON.stringify(CUSTOMIZATION_SIDEBAR_FALLBACK_ID) || '"check envs"'},
       USE_NAMESPACE_NAV: ${USE_NAMESPACE_NAV ? JSON.stringify(USE_NAMESPACE_NAV).toLowerCase() : '"false"'},
       HIDE_INSIDE: ${HIDE_INSIDE ? JSON.stringify(HIDE_INSIDE).toLowerCase() : '"false"'},
       NAVIGATE_FROM_CLUSTERLIST: ${JSON.stringify(NAVIGATE_FROM_CLUSTERLIST) || '"check envs"'},
diff --git a/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx b/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
index 568c2c9..e3d478c 100644
--- a/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
+++ b/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
@@ -60,8 +60,6 @@ export const ManageableSidebar: FC<TManageableSidebarProps> = ({
       return acc
     }, {})
 
-  console.log(namespace ? `${CUSTOMIZATION_SIDEBAR_FALLBACK_ID}-namespaced` : CUSTOMIZATION_SIDEBAR_FALLBACK_ID)
-
   return (
     <Styled.Container
       $isDark={theme === 'dark'}
diff --git a/src/constants/customizationApiGroupAndVersion.ts b/src/constants/customizationApiGroupAndVersion.ts
index dc40f62..61abdf4 100644
--- a/src/constants/customizationApiGroupAndVersion.ts
+++ b/src/constants/customizationApiGroupAndVersion.ts
@@ -38,6 +38,10 @@ export const CUSTOMIZATION_SIDEBAR_FALLBACK_ID = import.meta.env.DEV
   ? window._env_.CUSTOMIZATION_SIDEBAR_FALLBACK_ID || import.meta.env.VITE_CUSTOMIZATION_SIDEBAR_FALLBACK_ID
   : window._env_.CUSTOMIZATION_SIDEBAR_FALLBACK_ID
 
+export const CUSTOMIZATION_BREADCRUMBS_FALLBACK_ID = import.meta.env.DEV
+  ? window._env_.CUSTOMIZATION_BREADCRUMBS_FALLBACK_ID || import.meta.env.VITE_CUSTOMIZATION_BREADCRUMBS_FALLBACK_ID
+  : window._env_.CUSTOMIZATION_BREADCRUMBS_FALLBACK_ID
+
 export const BASE_USE_NAMESPACE_NAV = import.meta.env.DEV
   ? window._env_.USE_NAMESPACE_NAV || import.meta.env.VITE_USE_NAMESPACE_NAV
   : window._env_.USE_NAMESPACE_NAV

From f1d15116f134412b40359d1542f6142ffd58613c Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Tue, 18 Nov 2025 17:35:39 +0300
Subject: [PATCH 23/32] sidebars fallback

---
 src/constants/customizationApiGroupAndVersion.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/constants/customizationApiGroupAndVersion.ts b/src/constants/customizationApiGroupAndVersion.ts
index 61abdf4..dc40f62 100644
--- a/src/constants/customizationApiGroupAndVersion.ts
+++ b/src/constants/customizationApiGroupAndVersion.ts
@@ -38,10 +38,6 @@ export const CUSTOMIZATION_SIDEBAR_FALLBACK_ID = import.meta.env.DEV
   ? window._env_.CUSTOMIZATION_SIDEBAR_FALLBACK_ID || import.meta.env.VITE_CUSTOMIZATION_SIDEBAR_FALLBACK_ID
   : window._env_.CUSTOMIZATION_SIDEBAR_FALLBACK_ID
 
-export const CUSTOMIZATION_BREADCRUMBS_FALLBACK_ID = import.meta.env.DEV
-  ? window._env_.CUSTOMIZATION_BREADCRUMBS_FALLBACK_ID || import.meta.env.VITE_CUSTOMIZATION_BREADCRUMBS_FALLBACK_ID
-  : window._env_.CUSTOMIZATION_BREADCRUMBS_FALLBACK_ID
-
 export const BASE_USE_NAMESPACE_NAV = import.meta.env.DEV
   ? window._env_.USE_NAMESPACE_NAV || import.meta.env.VITE_USE_NAMESPACE_NAV
   : window._env_.USE_NAMESPACE_NAV

From e2b6ac5fe626b8ebb8e24080e3ff4405a4f4e6a6 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Tue, 18 Nov 2025 18:22:37 +0300
Subject: [PATCH 24/32] package sync

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cee2e4a..0eef9a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.10",
+        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.11",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2804,9 +2804,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "1.1.0-alpha.10",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.10.tgz",
-      "integrity": "sha512-pxkgo86obgoX1lZDQmq8c3iUB1rk3+OfvvFPGCsiY/9rlFdXt7/4sg0O6y+L/H3++86YpuL0aT4sIVMxNVldcA==",
+      "version": "1.1.0-alpha.11",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.11.tgz",
+      "integrity": "sha512-fox3HIJUazy96qm2hYNR4sWsKNJLRqEQNh921SCu2sC5fwPfIghyasYgGg5s08HOwGleoHaG9BZSJzBTUQc4oA==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index 63ad3bf..41a3d53 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.10",
+    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.11",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",

From 01159ac45c149954cc91a12a356acdd76cc8591e Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Wed, 19 Nov 2025 16:02:51 +0300
Subject: [PATCH 25/32] togglers | fix for patching req

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0eef9a8..1dc7fa6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.11",
+        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.12",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2804,9 +2804,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "1.1.0-alpha.11",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.11.tgz",
-      "integrity": "sha512-fox3HIJUazy96qm2hYNR4sWsKNJLRqEQNh921SCu2sC5fwPfIghyasYgGg5s08HOwGleoHaG9BZSJzBTUQc4oA==",
+      "version": "1.1.0-alpha.12",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.12.tgz",
+      "integrity": "sha512-O9KDM7zrApdUoLBo2YW5jIcWZr1hLeoBzWLPHE1ZXjS/Tbo08XgXW7A+JxU80KlLisU/mlUgt6s5gZXQFdufdg==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index 41a3d53..e8dc084 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.11",
+    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.12",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",

From 11a1adc7288d29bb117a0e3e8367bc604e65de0f Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Thu, 20 Nov 2025 08:56:43 +0300
Subject: [PATCH 26/32] owner refs and tables improvements

---
 package-lock.json | 97 ++++++++++++++++++++++++-----------------------
 package.json      |  2 +-
 2 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1dc7fa6..b3ede1f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.12",
+        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.13",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -146,7 +146,6 @@
       "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-5.6.0.tgz",
       "integrity": "sha512-Mb6QkQmPLZsmIHJ6oBsoyKrrT8/kAUdQ6+8q38e2bQSclROi69SiDlI4zZroaIPseae1w110RJH0zGrphAvlSQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@ant-design/colors": "^7.0.0",
         "@ant-design/icons-svg": "^4.4.0",
@@ -258,7 +257,6 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.27.1.tgz",
       "integrity": "sha512-IaaGWsQqfsQWVLqMn9OB92MNN7zukfVA4s7KKAI0KfrrDsZ0yhi5uV4baBuLuN7n3vsZpwP8asPPcVwApxvjBQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.27.1",
@@ -1859,6 +1857,7 @@
       "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
       "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.1.90"
       }
@@ -1879,7 +1878,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -1903,7 +1901,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -1960,6 +1957,7 @@
       "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz",
       "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "colorspace": "1.1.x",
         "enabled": "2.0.x",
@@ -2804,9 +2802,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "1.1.0-alpha.12",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.12.tgz",
-      "integrity": "sha512-O9KDM7zrApdUoLBo2YW5jIcWZr1hLeoBzWLPHE1ZXjS/Tbo08XgXW7A+JxU80KlLisU/mlUgt6s5gZXQFdufdg==",
+      "version": "1.1.0-alpha.13",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.13.tgz",
+      "integrity": "sha512-qAa394TvcAziVbFEXQ7/xJcpvHIFu5p8ZIo7kdlLKBeR2Ln2CikyJYqVgPNOVhTfiJrkf/nmkd4Qs1fGKJpX6g==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
@@ -3711,7 +3709,6 @@
       "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.62.2.tgz",
       "integrity": "sha512-fkTpKKfwTJtVPKVR+ag7YqFgG/7TRVVPzduPAUF9zRCiiA8Wu305u+KJl8rCrh98Qce77vzIakvtUyzWLtaPGA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@tanstack/query-core": "5.62.2"
       },
@@ -3728,7 +3725,6 @@
       "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.62.2.tgz",
       "integrity": "sha512-s4+88OZ6ygD4ziNfUgh9y1XxsGqpscI77c8EaLP7KwEfa5WqnlB9MT/uslFkFq3vwb8JhMjB7Osv2MYrSMry6w==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@tanstack/query-devtools": "5.61.4"
       },
@@ -3863,7 +3859,6 @@
       "integrity": "sha512-24xqse6+VByVLIr+xWaQ9muX1B4bXJKXBbjszbld/UEDslGLY53+ZucF44HCmLbMPejTzGG9XgR+3m2/Wqu1kw==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -3953,7 +3948,8 @@
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz",
       "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@types/use-sync-external-store": {
       "version": "0.0.3",
@@ -4001,6 +3997,7 @@
       "integrity": "sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.32.1",
         "@typescript-eslint/types": "8.32.1",
@@ -4026,6 +4023,7 @@
       "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/types": "8.32.1",
         "@typescript-eslint/visitor-keys": "8.32.1"
@@ -4044,6 +4042,7 @@
       "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/types": "8.32.1",
         "eslint-visitor-keys": "^4.2.0"
@@ -4062,6 +4061,7 @@
       "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -4188,6 +4188,7 @@
       "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -4202,6 +4203,7 @@
       "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/types": "8.32.1",
         "@typescript-eslint/visitor-keys": "8.32.1",
@@ -4229,6 +4231,7 @@
       "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/types": "8.32.1",
         "eslint-visitor-keys": "^4.2.0"
@@ -4247,6 +4250,7 @@
       "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -4260,6 +4264,7 @@
       "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -4273,6 +4278,7 @@
       "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18.12"
       },
@@ -4433,8 +4439,7 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz",
       "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/accepts": {
       "version": "1.3.8",
@@ -4455,7 +4460,6 @@
       "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4478,7 +4482,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -4535,7 +4538,6 @@
       "resolved": "https://registry.npmjs.org/antd/-/antd-5.26.4.tgz",
       "integrity": "sha512-e1EnOvEkvvqcQ18dxfzChBJyJACyih13WpNf2OtnP9z2POh/SF0fXL+ynUemT1zfr+p+P1po/tmHXaMc5PMghg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@ant-design/colors": "^7.2.1",
         "@ant-design/cssinjs": "^1.23.0",
@@ -4853,7 +4855,8 @@
       "version": "3.2.6",
       "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
       "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/async-function": {
       "version": "1.0.0",
@@ -5256,7 +5259,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001716",
         "electron-to-chromium": "^1.5.149",
@@ -5506,6 +5508,7 @@
       "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
       "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "color-convert": "^1.9.3",
         "color-string": "^1.6.0"
@@ -5535,6 +5538,7 @@
       "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
       "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "color-name": "^1.0.0",
         "simple-swizzle": "^0.2.2"
@@ -5545,6 +5549,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "color-name": "1.1.3"
       }
@@ -5553,7 +5558,8 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/colord": {
       "version": "2.9.3",
@@ -5566,6 +5572,7 @@
       "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz",
       "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "color": "^3.1.3",
         "text-hex": "1.0.x"
@@ -5963,8 +5970,7 @@
       "version": "1.11.13",
       "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
       "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/debug": {
       "version": "4.4.1",
@@ -6194,7 +6200,8 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
       "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/encodeurl": {
       "version": "1.0.2",
@@ -6563,7 +6570,6 @@
       "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -6725,7 +6731,6 @@
       "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "array-includes": "^3.1.6",
         "array.prototype.findlastindex": "^1.2.2",
@@ -6805,7 +6810,6 @@
       "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.20.7",
         "aria-query": "^5.1.3",
@@ -6891,7 +6895,6 @@
       "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "array-includes": "^3.1.6",
         "array.prototype.flatmap": "^1.3.1",
@@ -6923,7 +6926,6 @@
       "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -7501,7 +7503,8 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz",
       "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
@@ -7604,7 +7607,8 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
       "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/follow-redirects": {
       "version": "1.15.9",
@@ -8741,6 +8745,7 @@
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=8"
       },
@@ -9031,7 +9036,8 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
       "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/language-subtag-registry": {
       "version": "0.3.23",
@@ -9127,6 +9133,7 @@
       "resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz",
       "integrity": "sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@colors/colors": "1.6.0",
         "@types/triple-beam": "^1.3.2",
@@ -9672,6 +9679,7 @@
       "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz",
       "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fn.name": "1.x.x"
       }
@@ -9680,8 +9688,7 @@
       "version": "12.1.3",
       "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-12.1.3.tgz",
       "integrity": "sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/optionator": {
       "version": "0.9.4",
@@ -9967,7 +9974,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.8",
         "picocolors": "^1.1.1",
@@ -10017,7 +10023,6 @@
       "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -10089,7 +10094,6 @@
       "integrity": "sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -10135,7 +10139,6 @@
       "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-15.1.3.tgz",
       "integrity": "sha512-6ZiOBfCywsD4k1BN9IX0uZhF+tJkV8q8llP64G5Hajs4JOeVLPCwpPVcpXy3BwYiUGgyJzsJJQeOIv7+hDSq8g==",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@opentelemetry/api": "^1.4.0",
         "tdigest": "^0.1.1"
@@ -10912,7 +10915,6 @@
       "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
       "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -10925,7 +10927,6 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
       "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "scheduler": "^0.23.2"
@@ -10984,7 +10985,6 @@
       "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.25.1.tgz",
       "integrity": "sha512-0tUDpbFvk35iv+N89dWNrJp+afLgd+y4VtorJZuOCXK0kkCWjEvb3vTJM++SYvMEpbVwXKf3FjeVveVEb6JpDQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@remix-run/router": "1.18.0",
         "react-router": "6.25.1"
@@ -11028,8 +11028,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
       "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/redux-thunk": {
       "version": "3.1.0",
@@ -11261,7 +11260,6 @@
       "integrity": "sha512-HqMFpUbWlf/tvcxBFNKnJyzc7Lk+XO3FGc3pbNBLqEbOz0gPLRgcrlS3UF4MfUrVlstOaP/q0kM6GVvi+LrLRg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.7"
       },
@@ -11400,6 +11398,7 @@
       "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz",
       "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10"
       }
@@ -11684,6 +11683,7 @@
       "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
       "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "is-arrayish": "^0.3.1"
       }
@@ -11692,7 +11692,8 @@
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
       "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/slash": {
       "version": "2.0.0",
@@ -11758,6 +11759,7 @@
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
       "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": "*"
       }
@@ -12282,7 +12284,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
       "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/text-table": {
       "version": "0.2.0",
@@ -12345,6 +12348,7 @@
       "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz",
       "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 14.0.0"
       }
@@ -12974,7 +12978,6 @@
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
       "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -13211,7 +13214,6 @@
       "integrity": "sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.21.3",
         "postcss": "^8.4.43",
@@ -13463,6 +13465,7 @@
       "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.9.0.tgz",
       "integrity": "sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "logform": "^2.7.0",
         "readable-stream": "^3.6.2",
diff --git a/package.json b/package.json
index e8dc084..3b1f6af 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.12",
+    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.13",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",

From 744a4e966185c7f4041cec5daa087554015a63a3 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Fri, 21 Nov 2025 10:49:59 +0300
Subject: [PATCH 27/32] sync naming

---
 src/App.tsx                                   | 30 +++---
 .../RedirectProjectInfo.tsx                   |  8 +-
 .../RedirectProjectList.tsx                   | 12 +--
 .../molecules/BlackholeForm/BlackholeForm.tsx | 10 +-
 .../ManageableBreadcrumbs.tsx                 | 16 ++--
 .../ManageableSidebar/ManageableSidebar.tsx   | 10 +-
 .../TableApiBuiltin/TableApiBuiltin.tsx       | 92 ++++---------------
 .../molecules/TableCrdInfo/TableCrdInfo.tsx   | 34 +++----
 .../molecules/ResourceInfo/ResourceInfo.tsx   | 29 ++----
 src/components/organisms/Factory/Factory.tsx  | 11 +--
 .../Forms/ApisForms/CreateApisForm.tsx        |  8 +-
 .../Forms/ApisForms/UpdateApisForm.tsx        | 21 ++---
 .../Forms/BuiltinForms/CreateBuiltinForm.tsx  |  8 +-
 .../Forms/BuiltinForms/UpdateBuiltinForm.tsx  | 19 ++--
 .../Forms/CrdsForms/CreateCrdsForm.tsx        |  8 +-
 .../Forms/CrdsForms/UpdateCrdsForm.tsx        | 40 +++-----
 .../organisms/Header/organisms/User/User.tsx  |  4 -
 .../organisms/HeaderSecond/HeaderSecond.tsx   | 11 +--
 .../organisms/Selector/Selector.tsx           | 61 +++++-------
 .../SelectorCluster/SelectorCluster.tsx       | 16 ++--
 .../SelectorClusterInside.tsx                 | 17 ++--
 .../SelectorInside/SelectorInside.tsx         | 26 ++----
 .../SelectorNamespace/SelectorNamespace.tsx   | 51 ++++------
 .../ListInsideAllResources.tsx                |  6 +-
 .../ListInsideApisByApiGroup.tsx              |  4 +-
 .../ListInsideClusterAndNs.tsx                | 42 ++-------
 .../ListInsideCrdsByApiGroup.tsx              |  4 +-
 src/components/organisms/Search/Search.tsx    |  2 +-
 .../molecules/SearchEntry/SearchEntry.tsx     |  6 +-
 src/components/organisms/Sidebar/styled.ts    | 10 --
 src/constants/blocksSizes.ts                  |  2 -
 .../customizationApiGroupAndVersion.ts        | 48 +++++-----
 src/hooks/useIsSearchPage/useIsSearchPage.ts  |  2 +-
 src/hooks/useNavSelector/useNavSelector.ts    | 79 +++++-----------
 src/hooks/useNavSelectorInside.ts             | 54 ++++-------
 src/pages/Forms/FormApiPage/FormApiPage.tsx   | 26 +++---
 .../Forms/FormBuiltinPage/FormBuiltinPage.tsx | 22 ++---
 src/pages/Forms/FormCrdPage/FormCrdPage.tsx   | 26 +++---
 src/pages/Forms/index.ts                      |  1 -
 .../Tables/TableApiPage/TableApiPage.tsx      | 24 ++---
 .../TableBuiltinPage/TableBuiltinPage.tsx     | 16 ++--
 .../Tables/TableCrdPage/TableCrdPage.tsx      |  4 +-
 src/pages/Tables/index.ts                     |  1 -
 src/store/theme/theme/theme.ts                |  2 -
 src/templates/AppShell/AppShell.tsx           |  1 -
 src/templates/BaseTemplate/BaseTemplate.tsx   |  1 -
 src/templates/MainLayout/MainLayout.tsx       | 14 +--
 src/utils/getBacklink.ts                      | 26 +++---
 48 files changed, 350 insertions(+), 615 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 3911dcd..aff33c1 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -59,29 +59,29 @@ export const App: FC<TAppProps> = ({ isFederation, forcedTheme }) => {
         <Route path={`${prefix}/`} element={<MainPage />} />
         <Route path={`${prefix}/clusters`} element={<ListClustersPage />} />
 
-        <Route path={`${prefix}/:clusterName/:namespace?/:syntheticProject?/*`} element={<AppShell />}>
+        <Route path={`${prefix}/:cluster/:namespace?/:syntheticProject?/*`} element={<AppShell />}>
           {/* <Route path="crd-table/:apiGroup/:apiVersion/:apiExtensionVersion/:crdName" element={<TableCrdPage />} /> */}
-          <Route path="api-table/:apiGroup/:apiVersion/:typeName" element={<TableApiPage />} />
-          <Route path="builtin-table/:typeName" element={<TableBuiltinPage />} />
-          {/* <Route path="forms/crds/:apiGroup/:apiVersion/:typeName/:entryName?/"" element={<FormCrdPage />} /> */}
-          <Route path="forms/apis/:apiGroup/:apiVersion/:typeName/:entryName?/" element={<FormApiPage />} />
-          <Route path="forms/builtin/:apiVersion/:typeName/:entryName?/" element={<FormBuiltinPage />} />
+          <Route path="api-table/:apiGroup/:apiVersion/:plural" element={<TableApiPage />} />
+          <Route path="builtin-table/:plural" element={<TableBuiltinPage />} />
+          {/* <Route path="forms/crds/:apiGroup/:apiVersion/:plural/:name?/"" element={<FormCrdPage />} /> */}
+          <Route path="forms/apis/:apiGroup/:apiVersion/:plural/:name?/" element={<FormApiPage />} />
+          <Route path="forms/builtin/:apiVersion/:plural/:name?/" element={<FormBuiltinPage />} />
           <Route path="factory/:key/*" element={<FactoryPage />} />
           <Route path="search/*" element={<SearchPage />} />
         </Route>
 
-        <Route path={`${prefix}/inside/:clusterName/:namespace?/:syntheticProject?/*`} element={<AppShell inside />}>
+        <Route path={`${prefix}/inside/:cluster/:namespace?/:syntheticProject?/*`} element={<AppShell inside />}>
           {/* <Route path="crd-table/:apiGroup/:apiVersion/:apiExtensionVersion/:crdName" element={<TableCrdPage inside />} /> */}
-          <Route path="api-table/:apiGroup/:apiVersion/:typeName" element={<TableApiPage inside />} />
-          <Route path="builtin-table/:typeName" element={<TableBuiltinPage inside />} />
-          {/* <Route path="forms/crds/:apiGroup/:apiVersion/:typeName/:entryName?/"" element={<FormCrdPage />} /> */}
-          <Route path="forms/builtin/:apiVersion/:typeName/:entryName?/" element={<FormBuiltinPage />} />
-          <Route path="forms/apis/:apiGroup/:apiVersion/:typeName/:entryName?/" element={<FormApiPage />} />
+          <Route path="api-table/:apiGroup/:apiVersion/:plural" element={<TableApiPage inside />} />
+          <Route path="builtin-table/:plural" element={<TableBuiltinPage inside />} />
+          {/* <Route path="forms/crds/:apiGroup/:apiVersion/:plural/:name?/"" element={<FormCrdPage />} /> */}
+          <Route path="forms/builtin/:apiVersion/:plural/:name?/" element={<FormBuiltinPage />} />
+          <Route path="forms/apis/:apiGroup/:apiVersion/:plural/:name?/" element={<FormApiPage />} />
         </Route>
 
         <Route path={`${prefix}/inside/`} element={<MainPage />} />
         <Route path={`${prefix}/inside/clusters`} element={<ListInsideClustersAndNsPage inside />} />
-        <Route path={`${prefix}/inside/:clusterName/:namespace?/*`} element={<AppShell inside />}>
+        <Route path={`${prefix}/inside/:cluster/:namespace?/*`} element={<AppShell inside />}>
           <Route path="apis" element={<ListInsideApiPage />} />
           <Route
             path="crds-by-api/:apiGroup/:apiVersion/:apiExtensionVersion"
@@ -90,8 +90,8 @@ export const App: FC<TAppProps> = ({ isFederation, forcedTheme }) => {
           <Route path="apis-by-api/:apiGroup/:apiVersion/" element={<ListInsideApiByApiGroupPage />} />
         </Route>
 
-        <Route path={`${prefix}/clusters/:clusterName`} element={<RedirectProjectsPage />} />
-        <Route path={`${prefix}/clusters/:clusterName/projects/:namespace`} element={<RedirectProjectInfoPage />} />
+        <Route path={`${prefix}/clusters/:cluster`} element={<RedirectProjectsPage />} />
+        <Route path={`${prefix}/clusters/:cluster/projects/:namespace`} element={<RedirectProjectInfoPage />} />
       </Route>
     </Routes>
   )
diff --git a/src/components/atoms/RedirectProjectInfo/RedirectProjectInfo.tsx b/src/components/atoms/RedirectProjectInfo/RedirectProjectInfo.tsx
index 584263b..cde4448 100644
--- a/src/components/atoms/RedirectProjectInfo/RedirectProjectInfo.tsx
+++ b/src/components/atoms/RedirectProjectInfo/RedirectProjectInfo.tsx
@@ -4,15 +4,15 @@ import { useSelector } from 'react-redux'
 import { RootState } from 'store/store'
 
 export const RedirectProjectInfo: FC = () => {
-  const { clusterName, namespace } = useParams()
+  const { cluster, namespace } = useParams()
   const navigate = useNavigate()
   const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
 
-  navigate(`${baseprefix}/${clusterName}/${namespace}/factory/project/${namespace}`)
+  navigate(`${baseprefix}/${cluster}/${namespace}/factory/project/${namespace}`)
 
   useEffect(() => {
-    navigate(`${baseprefix}/${clusterName}/${namespace}/factory/project/${namespace}`)
-  }, [clusterName, namespace, baseprefix, navigate])
+    navigate(`${baseprefix}/${cluster}/${namespace}/factory/project/${namespace}`)
+  }, [cluster, namespace, baseprefix, navigate])
 
   return null
 }
diff --git a/src/components/atoms/RedirectProjectList/RedirectProjectList.tsx b/src/components/atoms/RedirectProjectList/RedirectProjectList.tsx
index 40e8c38..cf08411 100644
--- a/src/components/atoms/RedirectProjectList/RedirectProjectList.tsx
+++ b/src/components/atoms/RedirectProjectList/RedirectProjectList.tsx
@@ -4,24 +4,24 @@ import { useSelector } from 'react-redux'
 import { RootState } from 'store/store'
 import {
   BASE_PROJECTS_API_GROUP,
-  BASE_PROJECTS_VERSION,
-  BASE_PROJECTS_RESOURCE_NAME,
+  BASE_PROJECTS_API_VERSION,
+  BASE_PROJECTS_PLURAL,
 } from 'constants/customizationApiGroupAndVersion'
 
 export const RedirectProjectList: FC = () => {
-  const { clusterName } = useParams()
+  const { cluster } = useParams()
   const navigate = useNavigate()
   const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
 
   navigate(
-    `${baseprefix}/${clusterName}/api-table/${BASE_PROJECTS_API_GROUP}/${BASE_PROJECTS_VERSION}/${BASE_PROJECTS_RESOURCE_NAME}`,
+    `${baseprefix}/${cluster}/api-table/${BASE_PROJECTS_API_GROUP}/${BASE_PROJECTS_API_VERSION}/${BASE_PROJECTS_PLURAL}`,
   )
 
   useEffect(() => {
     navigate(
-      `${baseprefix}/${clusterName}/api-table/${BASE_PROJECTS_API_GROUP}/${BASE_PROJECTS_VERSION}/${BASE_PROJECTS_RESOURCE_NAME}`,
+      `${baseprefix}/${cluster}/api-table/${BASE_PROJECTS_API_GROUP}/${BASE_PROJECTS_API_VERSION}/${BASE_PROJECTS_PLURAL}`,
     )
-  }, [clusterName, baseprefix, navigate])
+  }, [cluster, baseprefix, navigate])
 
   return null
 }
diff --git a/src/components/molecules/BlackholeForm/BlackholeForm.tsx b/src/components/molecules/BlackholeForm/BlackholeForm.tsx
index 28ff258..1f58752 100644
--- a/src/components/molecules/BlackholeForm/BlackholeForm.tsx
+++ b/src/components/molecules/BlackholeForm/BlackholeForm.tsx
@@ -17,7 +17,7 @@ type TBlackholeFormProps = {
   data:
     | {
         type: 'builtin'
-        typeName: string
+        plural: string
         prefillValuesSchema?: TJSON
         prefillValueNamespaceOnly?: string
       }
@@ -25,7 +25,7 @@ type TBlackholeFormProps = {
         type: 'apis'
         apiGroup: string
         apiVersion: string
-        typeName: string
+        plural: string
         prefillValuesSchema?: TJSON
         prefillValueNamespaceOnly?: string
       }
@@ -71,15 +71,15 @@ export const BlackholeForm: FC<TBlackholeFormProps> = ({ data, customizationId,
   }, [])
 
   const urlParams = {
-    clusterName: params.clusterName,
+    cluster: params.cluster,
     namespace: params.namespace,
     syntheticProject: params.syntheticProject,
-    entryName: params.entryName,
+    name: params.name,
   }
 
   const urlParamsForPermissions = {
     apiGroup: params.apiGroup,
-    typeName: params.typeName,
+    plural: params.plural,
   }
 
   return (
diff --git a/src/components/molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx b/src/components/molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx
index b9c4102..02efdc1 100644
--- a/src/components/molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx
+++ b/src/components/molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx
@@ -12,13 +12,13 @@ export const ManageableBreadcrumbs: FC<TManageableBreadCrumbsProps> = ({ idToCom
   const location = useLocation()
   const { pathname } = useLocation()
   const params = useParams()
-  const clusterName = params?.clusterName || ''
+  const cluster = params?.cluster || ''
   const namespace = params?.namespace || ''
   const syntheticProject = params?.syntheticProject || ''
   const apiGroup = params?.apiGroup || ''
   const apiVersion = params?.apiVersion || ''
-  const typeName = params?.typeName || ''
-  const entryName = params?.entryName || ''
+  const plural = params?.plural || ''
+  const name = params?.name || ''
   const apiExtensionVersion = params?.apiExtensionVersion || ''
   const crdName = params?.crdName || ''
 
@@ -32,13 +32,13 @@ export const ManageableBreadcrumbs: FC<TManageableBreadCrumbsProps> = ({ idToCom
   return (
     <ManageableBreadcrumbsProvider
       idToCompare={idToCompare}
-      cluster={clusterName}
+      cluster={cluster}
       apiGroup={BASE_API_GROUP}
       apiVersion={BASE_API_VERSION}
       plural={inside ? 'breadcrumbsinsides' : 'breadcrumbs'}
-      isEnabled={clusterName !== undefined}
+      isEnabled={cluster !== undefined}
       replaceValues={{
-        clusterName,
+        cluster,
         projectName: '',
         instanceName: '',
         namespace,
@@ -46,8 +46,8 @@ export const ManageableBreadcrumbs: FC<TManageableBreadCrumbsProps> = ({ idToCom
         entryType: '',
         apiGroup,
         apiVersion,
-        typeName,
-        entryName,
+        plural,
+        name,
         apiExtensionVersion,
         crdName,
         ...replaceValuesPartsOfUrls,
diff --git a/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx b/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
index e3d478c..f5e3246 100644
--- a/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
+++ b/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx
@@ -4,7 +4,6 @@ import { useLocation, useParams } from 'react-router-dom'
 import { ManageableSidebarProvider } from '@prorobotech/openapi-k8s-toolkit'
 import { useSelector } from 'react-redux'
 import type { RootState } from 'store/store'
-// import { HEAD_FIRST_ROW, SIDEBAR_CLUSTER_HEIGHT } from 'constants/blocksSizes'
 import { HEAD_FIRST_ROW } from 'constants/blocksSizes'
 import {
   BASE_API_GROUP,
@@ -29,7 +28,7 @@ export const ManageableSidebar: FC<TManageableSidebarProps> = ({
   const location = useLocation()
   const { pathname } = useLocation()
   const params = useParams()
-  const clusterName = params?.clusterName || ''
+  const cluster = params?.cluster || ''
   const namespace = params?.namespace || ''
   const syntheticProject = params?.syntheticProject || ''
   const theme = useSelector((state: RootState) => state.openapiTheme.theme)
@@ -38,7 +37,6 @@ export const ManageableSidebar: FC<TManageableSidebarProps> = ({
   const [height, setHeight] = useState(0)
 
   useEffect(() => {
-    // const height = window.innerHeight - HEAD_FIRST_ROW - SIDEBAR_CLUSTER_HEIGHT - 2
     const height = window.innerHeight - HEAD_FIRST_ROW - 2
     setHeight(height)
 
@@ -71,13 +69,13 @@ export const ManageableSidebar: FC<TManageableSidebarProps> = ({
       $maxHeight={height}
     >
       <ManageableSidebarProvider
-        cluster={clusterName}
+        cluster={cluster}
         apiGroup={BASE_API_GROUP}
         apiVersion={BASE_API_VERSION}
         plural="sidebars"
-        isEnabled={clusterName !== undefined}
+        isEnabled={cluster !== undefined}
         replaceValues={{
-          clusterName,
+          cluster,
           projectName,
           instanceName,
           namespace,
diff --git a/src/components/molecules/TableApiBuiltin/TableApiBuiltin.tsx b/src/components/molecules/TableApiBuiltin/TableApiBuiltin.tsx
index 2e6ed03..af9fdf5 100644
--- a/src/components/molecules/TableApiBuiltin/TableApiBuiltin.tsx
+++ b/src/components/molecules/TableApiBuiltin/TableApiBuiltin.tsx
@@ -10,8 +10,6 @@ import {
   usePermissions,
   DeleteModal,
   DeleteModalMany,
-  // checkIfBuiltInInstanceNamespaceScoped,
-  // checkIfApiInstanceNamespaceScoped,
   useK8sSmartResource,
   Spacer,
   getLinkToForm,
@@ -28,14 +26,13 @@ import {
   TABLE_ADD_BUTTON_HEIGHT,
 } from 'constants/blocksSizes'
 import { OverflowContainer } from './atoms'
-// import { getDataItems } from './utils'
 
 type TTableApiBuiltinProps = {
   namespace?: string
   resourceType: 'builtin' | 'api'
   apiGroup?: string // api
   apiVersion: string // api
-  typeName: string
+  plural: string
   labels?: string[]
   fields?: string[]
   limit?: number
@@ -50,7 +47,7 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
   resourceType,
   apiGroup,
   apiVersion,
-  typeName,
+  plural,
   labels,
   fields,
   limit,
@@ -72,8 +69,6 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
   )
   const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([])
   const [selectedRowsData, setSelectedRowsData] = useState<{ name: string; endpoint: string }[]>([])
-  // const [isNamespaced, setIsNamespaced] = useState<boolean>()
-  // const [isNamespacedLoading, setIsNamespacedLoading] = useState<boolean>()
 
   const [height, setHeight] = useState(0)
 
@@ -99,45 +94,11 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
     }
   }, [])
 
-  // useEffect(() => {
-  //   setIsNamespacedLoading(true)
-  //   if (resourceType === 'builtin') {
-  //     checkIfBuiltInInstanceNamespaceScoped({
-  //       typeName,
-  //       clusterName: cluster,
-  //     })
-  //       .then(({ isNamespaceScoped }) => {
-  //         if (isNamespaceScoped) {
-  //           setIsNamespaced(isNamespaceScoped)
-  //         } else {
-  //           setIsNamespaced(false)
-  //         }
-  //       })
-  //       .finally(() => setIsNamespacedLoading(false))
-  //   }
-  //   if (resourceType === 'api' && apiGroup && apiVersion) {
-  //     checkIfApiInstanceNamespaceScoped({
-  //       apiGroup,
-  //       apiVersion,
-  //       typeName,
-  //       clusterName: cluster,
-  //     })
-  //       .then(({ isNamespaceScoped }) => {
-  //         if (isNamespaceScoped) {
-  //           setIsNamespaced(true)
-  //         } else {
-  //           setIsNamespaced(false)
-  //         }
-  //       })
-  //       .finally(() => setIsNamespacedLoading(false))
-  //   }
-  // }, [resourceType, cluster, typeName, apiGroup, apiVersion])
-
   const createPermission = usePermissions({
-    group: apiGroup || undefined,
-    resource: typeName,
+    apiGroup: apiGroup || undefined,
+    plural,
     namespace: params.namespace,
-    clusterName: cluster,
+    cluster,
     verb: 'create',
     refetchInterval: false,
   })
@@ -149,9 +110,9 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
   } = useK8sSmartResource<{ items: TSingleResource[] }>({
     cluster,
     namespace,
-    group: apiGroup || undefined,
-    version: apiVersion || '',
-    plural: typeName,
+    apiGroup,
+    apiVersion: apiVersion || '',
+    plural,
     labelSelector: labels ? encodeURIComponent(labels.join(',')) : undefined,
     fieldSelector: fields ? encodeURIComponent(fields.join(',')) : undefined,
     limit,
@@ -182,14 +143,14 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
       <OverflowContainer height={height} searchMount={searchMount}>
         {!error && dataItems && (
           <EnrichedTableProvider
-            key={resourceType === 'builtin' ? `/v1/${typeName}` : `/${apiGroup}/${apiVersion}/${typeName}`}
+            key={resourceType === 'builtin' ? `/v1/${plural}` : `/${apiGroup}/${apiVersion}/${plural}`}
             customizationId={
               resourceType === 'builtin'
-                ? `${customizationIdPrefix}/v1/${typeName}`
-                : `${customizationIdPrefix}/${apiGroup}/${apiVersion}/${typeName}`
+                ? `${customizationIdPrefix}/v1/${plural}`
+                : `${customizationIdPrefix}/${apiGroup}/${apiVersion}/${plural}`
             }
             tableMappingsReplaceValues={{
-              clusterName: params.clusterName,
+              cluster: params.cluster,
               projectName: params.projectName,
               instanceName: params.instanceName,
               namespace: params.namespace,
@@ -197,8 +158,8 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
               entryType: params.entryType,
               apiGroup: params.apiGroup,
               apiVersion: params.apiVersion,
-              typeName: params.typeName,
-              entryName: params.entryName,
+              plural: params.plural,
+              name: params.name,
               apiExtensionVersion: params.apiExtensionVersion,
               crdName: params.crdName,
               ...replaceValuesPartsOfUrls,
@@ -209,16 +170,14 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
             baseprefix={inside ? `${baseprefix}/inside` : baseprefix}
             dataItems={dataItems.items}
             k8sResource={{
-              resource: typeName,
+              plural,
               apiGroup,
               apiVersion,
             }}
-            // isNamespaced={isNamespaced}
-            // isNamespacedLoading={isNamespacedLoading}
             dataForControls={{
               cluster,
               syntheticProject: params.syntheticProject,
-              resource: typeName,
+              plural,
               apiGroup,
               apiVersion,
             }}
@@ -233,23 +192,8 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
               },
             }}
             tableProps={{ ...TABLE_PROPS, disablePagination: !searchMount }}
-            // maxHeight={height - 65}
           />
         )}
-        {/* {selectedRowKeys.length > 0 && (
-          <MarginTopContainer $top={-40}>
-            <Flex gap={16}>
-              <Button type="primary" onClick={clearSelected}>
-                <ClearOutlined />
-                Clear
-              </Button>
-              <Button type="primary" onClick={() => setIsDeleteModalManyOpen(selectedRowsData)}>
-                <MinusOutlined />
-                Delete
-              </Button>
-            </Flex>
-          </MarginTopContainer>
-        )} */}
       </OverflowContainer>
       {searchMount ? <Spacer $space={12} $samespace /> : <FlexGrow />}
       <PaddingContainer $padding="4px">
@@ -264,15 +208,13 @@ export const TableApiBuiltin: FC<TTableApiBuiltinProps> = ({
                 syntheticProject: params.syntheticProject,
                 apiGroup,
                 apiVersion,
-                typeName,
+                plural,
                 inside,
                 fullPath,
                 searchMount,
               })
               navigate(url)
             }}
-            // loading={isNamespaced ? false : createPermission.isPending}
-            // disabled={isNamespaced ? false : !createPermission.data?.status.allowed}
             loading={createPermission.isPending}
             disabled={!createPermission.data?.status.allowed}
           >
diff --git a/src/components/molecules/TableCrdInfo/TableCrdInfo.tsx b/src/components/molecules/TableCrdInfo/TableCrdInfo.tsx
index 72cc1bc..2bb728d 100644
--- a/src/components/molecules/TableCrdInfo/TableCrdInfo.tsx
+++ b/src/components/molecules/TableCrdInfo/TableCrdInfo.tsx
@@ -34,12 +34,6 @@ export const TableCrdInfo: FC<TTableCrdInfoProps> = ({
 
   const [isNamespaced, setIsNamespaced] = useState<boolean>()
 
-  // const { isPending, error, data } = useCrdData({
-  //   clusterName: cluster,
-  //   crdName,
-  //   apiExtensionVersion,
-  // })
-
   const {
     data: dataArr,
     isLoading: isPending,
@@ -48,8 +42,8 @@ export const TableCrdInfo: FC<TTableCrdInfoProps> = ({
     items: TCRD[]
   }>({
     cluster,
-    group: 'apiextensions.k8s.io',
-    version: apiExtensionVersion,
+    apiGroup: 'apiextensions.k8s.io',
+    apiVersion: apiExtensionVersion,
     plural: 'customresourcedefinitions',
     fieldSelector: `metadata.name=${crdName}`,
   })
@@ -61,8 +55,8 @@ export const TableCrdInfo: FC<TTableCrdInfoProps> = ({
       checkIfApiInstanceNamespaceScoped({
         apiGroup,
         apiVersion,
-        typeName: data.spec.names.plural,
-        clusterName: cluster,
+        plural: data.spec.names.plural,
+        cluster,
       }).then(({ isNamespaceScoped }) => {
         if (isNamespaceScoped) {
           setIsNamespaced(true)
@@ -72,28 +66,28 @@ export const TableCrdInfo: FC<TTableCrdInfoProps> = ({
   }, [cluster, data, isPending, error, apiGroup, apiVersion])
 
   const createPermission = usePermissions({
-    group: apiGroup,
-    resource: data ? data.spec.names.singular : '',
+    apiGroup,
+    plural: data ? data.spec.names.singular : '',
     namespace: '',
-    clusterName: cluster,
+    cluster,
     verb: 'create',
     refetchInterval: false,
   })
 
   const updatePermission = usePermissions({
-    group: apiGroup,
-    resource: data ? data.spec.names.singular : '',
+    apiGroup,
+    plural: data ? data.spec.names.singular : '',
     namespace: '',
-    clusterName: cluster,
+    cluster,
     verb: 'update',
     refetchInterval: false,
   })
 
   const deletePermission = usePermissions({
-    group: apiGroup,
-    resource: data ? data.spec.names.singular : '',
+    apiGroup,
+    plural: data ? data.spec.names.singular : '',
     namespace: '',
-    clusterName: cluster,
+    cluster,
     verb: 'delete',
     refetchInterval: false,
   })
@@ -106,7 +100,7 @@ export const TableCrdInfo: FC<TTableCrdInfoProps> = ({
       )}
       {!error && data && data.spec && (
         <ResourceInfo
-          clusterName={cluster}
+          cluster={cluster}
           namespace={namespace}
           crdName={crdName}
           crdPluralName={data.spec.names.plural}
diff --git a/src/components/molecules/TableCrdInfo/molecules/ResourceInfo/ResourceInfo.tsx b/src/components/molecules/TableCrdInfo/molecules/ResourceInfo/ResourceInfo.tsx
index 40dcb99..573bdd1 100644
--- a/src/components/molecules/TableCrdInfo/molecules/ResourceInfo/ResourceInfo.tsx
+++ b/src/components/molecules/TableCrdInfo/molecules/ResourceInfo/ResourceInfo.tsx
@@ -26,7 +26,7 @@ import {
 } from 'constants/blocksSizes'
 
 type TResourceInfoProps = {
-  clusterName: string
+  cluster: string
   namespace?: string
   crdName: string
   crdPluralName: string
@@ -44,7 +44,7 @@ type TResourceInfoProps = {
 }
 
 export const ResourceInfo: FC<TResourceInfoProps> = ({
-  clusterName,
+  cluster,
   namespace,
   crdName,
   crdPluralName,
@@ -59,7 +59,6 @@ export const ResourceInfo: FC<TResourceInfoProps> = ({
   const location = useLocation()
   const navigate = useNavigate()
   const params = useParams()
-  const cluster = useSelector((state: RootState) => state.cluster.cluster)
   const theme = useSelector((state: RootState) => state.openapiTheme.theme)
   const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
 
@@ -94,14 +93,6 @@ export const ResourceInfo: FC<TResourceInfoProps> = ({
     }
   }, [])
 
-  // const { isPending, error, data } = useCrdResources({
-  //   clusterName,
-  //   namespace,
-  //   apiGroup,
-  //   apiVersion,
-  //   crdName: crdPluralName,
-  // })
-
   const {
     data,
     isLoading: isPending,
@@ -109,9 +100,9 @@ export const ResourceInfo: FC<TResourceInfoProps> = ({
   } = useK8sSmartResource<{
     items: TJSON[]
   }>({
-    cluster: clusterName,
-    group: apiGroup,
-    version: apiVersion,
+    cluster,
+    apiGroup,
+    apiVersion,
     plural: crdPluralName,
   })
 
@@ -158,7 +149,7 @@ export const ResourceInfo: FC<TResourceInfoProps> = ({
   //           key={`/${apiGroup}/${apiVersion}/${crdPluralName}`}
   //           customizationId={`${customizationIdPrefix}/${apiGroup}/${apiVersion}/${crdPluralName}`}
   //           tableMappingsReplaceValues={{
-  //             clusterName: params.clusterName,
+  //             cluster: params.cluster,
   //             projectName: params.projectName,
   //             instanceName: params.instanceName,
   //             namespace: params.namespace,
@@ -166,8 +157,8 @@ export const ResourceInfo: FC<TResourceInfoProps> = ({
   //             entryType: params.entryType,
   //             apiGroup: params.apiGroup,
   //             apiVersion: params.apiVersion,
-  //             typeName: params.typeName,
-  //             entryName: params.entryName,
+  //             plural: params.plural,
+  //             name: params.name,
   //             apiExtensionVersion: params.apiExtensionVersion,
   //             crdName: params.crdName,
   //             ...replaceValuesPartsOfUrls,
@@ -182,12 +173,12 @@ export const ResourceInfo: FC<TResourceInfoProps> = ({
   //             cluster,
   //             syntheticProject: params.syntheticProject,
   //             pathPrefix: 'forms/crds',
-  //             typeName: crdPluralName,
+  //             plural: crdPluralName,
   //             apiVersion: `${apiGroup}/${apiVersion}`,
   //             backlink: `${baseprefix}${inside ? '/inside' : ''}/${cluster}${namespace ? `/${namespace}` : ''}${
   //               params.syntheticProject ? `/${params.syntheticProject}` : ''
   //             }/crd-table/${apiGroup}/${apiVersion}/${apiExtensionVersion}/${crdName}`,
-  //             deletePathPrefix: `/api/clusters/${clusterName}/k8s/apis`,
+  //             deletePathPrefix: `/api/clusters/${cluster}/k8s/apis`,
   //             onDeleteHandle,
   //             permissions: {
   //               canUpdate: permissions.canUpdate,
diff --git a/src/components/organisms/Factory/Factory.tsx b/src/components/organisms/Factory/Factory.tsx
index 6ed21ae..972c0d0 100644
--- a/src/components/organisms/Factory/Factory.tsx
+++ b/src/components/organisms/Factory/Factory.tsx
@@ -4,7 +4,6 @@ import {
   DynamicComponents,
   DynamicRendererWithProviders,
   TDynamicComponentsAppTypeMap,
-  // useDirectUnknownResource,
   useK8sSmartResource,
   TFactoryResponse,
   ContentCard,
@@ -45,16 +44,10 @@ export const Factory: FC<TFactoryProps> = ({ setSidebarTags }) => {
     }
   }, [])
 
-  // const { data: factoryData } = useDirectUnknownResource<TFactoryResponse<TDynamicComponentsAppTypeMap>>({
-  //   uri: `/api/clusters/${cluster}/k8s/apis/${BASE_API_GROUP}/${BASE_API_VERSION}/factories/`,
-  //   refetchInterval: false,
-  //   queryKey: ['factories', cluster || 'no-cluster'],
-  //   isEnabled: cluster !== undefined,
-  // })
   const { data: factoryData } = useK8sSmartResource<TFactoryResponse<TDynamicComponentsAppTypeMap>>({
     cluster,
-    group: BASE_API_GROUP,
-    version: BASE_API_VERSION,
+    apiGroup: BASE_API_GROUP,
+    apiVersion: BASE_API_VERSION,
     plural: 'factories',
   })
 
diff --git a/src/components/organisms/Forms/ApisForms/CreateApisForm.tsx b/src/components/organisms/Forms/ApisForms/CreateApisForm.tsx
index 1d9408f..c337e57 100644
--- a/src/components/organisms/Forms/ApisForms/CreateApisForm.tsx
+++ b/src/components/organisms/Forms/ApisForms/CreateApisForm.tsx
@@ -7,11 +7,11 @@ type TCreateApisFormProps = {
   namespace?: string
   apiGroup: string
   apiVersion: string
-  typeName: string
+  plural: string
   backLink?: string | null
 }
 
-export const CreateApisForm: FC<TCreateApisFormProps> = ({ namespace, apiGroup, apiVersion, typeName, backLink }) => {
+export const CreateApisForm: FC<TCreateApisFormProps> = ({ namespace, apiGroup, apiVersion, plural, backLink }) => {
   const [currentMode, setCurrentMode] = useState<string>('OpenAPI')
   const [currentModeDisabled, setCurrentModeDisabled] = useState<boolean>(false)
 
@@ -45,10 +45,10 @@ export const CreateApisForm: FC<TCreateApisFormProps> = ({ namespace, apiGroup,
           type: 'apis',
           apiGroup,
           apiVersion,
-          typeName,
+          plural,
           prefillValueNamespaceOnly: namespace,
         }}
-        customizationId={`default-/${apiGroup}/${apiVersion}/${typeName}`}
+        customizationId={`default-/${apiGroup}/${apiVersion}/${plural}`}
         isCreate
         backlink={backLink}
         modeData={modeData}
diff --git a/src/components/organisms/Forms/ApisForms/UpdateApisForm.tsx b/src/components/organisms/Forms/ApisForms/UpdateApisForm.tsx
index f831b7c..05e0b1f 100644
--- a/src/components/organisms/Forms/ApisForms/UpdateApisForm.tsx
+++ b/src/components/organisms/Forms/ApisForms/UpdateApisForm.tsx
@@ -8,8 +8,8 @@ import { BlackholeForm } from 'components'
 type TUpdateApisFormProps = {
   apiGroup: string
   apiVersion: string
-  typeName: string
-  entryName: string
+  plural: string
+  name: string
   namespace?: string
   backLink?: string | null
 }
@@ -17,8 +17,8 @@ type TUpdateApisFormProps = {
 export const UpdateApisForm: FC<TUpdateApisFormProps> = ({
   apiGroup,
   apiVersion,
-  typeName,
-  entryName,
+  plural,
+  name,
   namespace,
   backLink,
 }) => {
@@ -42,12 +42,12 @@ export const UpdateApisForm: FC<TUpdateApisFormProps> = ({
   }
 
   const { data, isPending, error } = useApiResourceSingle({
-    clusterName: cluster,
+    cluster,
     namespace,
     apiGroup,
     apiVersion,
-    typeName,
-    entryName,
+    plural,
+    name,
     refetchInterval: false,
   })
 
@@ -59,8 +59,6 @@ export const UpdateApisForm: FC<TUpdateApisFormProps> = ({
     return <Alert message={`An error has occurred: ${error?.message} `} type="error" />
   }
 
-  /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
-  // const { status: _, ...noStatusData } = data
   /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
   const { managedFields: __, ...metadata } = data.metadata
 
@@ -80,11 +78,10 @@ export const UpdateApisForm: FC<TUpdateApisFormProps> = ({
           type: 'apis',
           apiGroup,
           apiVersion,
-          typeName,
-          // prefillValuesSchema: { ...noStatusData, metadata },
+          plural,
           prefillValuesSchema: { ...data, metadata },
         }}
-        customizationId={`default-/${apiGroup}/${apiVersion}/${typeName}`}
+        customizationId={`default-/${apiGroup}/${apiVersion}/${plural}`}
         backlink={backLink}
         modeData={modeData}
       />
diff --git a/src/components/organisms/Forms/BuiltinForms/CreateBuiltinForm.tsx b/src/components/organisms/Forms/BuiltinForms/CreateBuiltinForm.tsx
index 1faadd8..74ba5b6 100644
--- a/src/components/organisms/Forms/BuiltinForms/CreateBuiltinForm.tsx
+++ b/src/components/organisms/Forms/BuiltinForms/CreateBuiltinForm.tsx
@@ -5,11 +5,11 @@ import { BlackholeForm } from 'components'
 
 type TCreateBuiltinFormProps = {
   namespace?: string
-  typeName: string
+  plural: string
   backLink?: string | null
 }
 
-export const CreateBuiltinForm: FC<TCreateBuiltinFormProps> = ({ namespace, typeName, backLink }) => {
+export const CreateBuiltinForm: FC<TCreateBuiltinFormProps> = ({ namespace, plural, backLink }) => {
   const [currentMode, setCurrentMode] = useState<string>('OpenAPI')
   const [currentModeDisabled, setCurrentModeDisabled] = useState<boolean>(false)
 
@@ -41,10 +41,10 @@ export const CreateBuiltinForm: FC<TCreateBuiltinFormProps> = ({ namespace, type
       <BlackholeForm
         data={{
           type: 'builtin',
-          typeName,
+          plural,
           prefillValueNamespaceOnly: namespace,
         }}
-        customizationId={`default-/v1/${typeName}`}
+        customizationId={`default-/v1/${plural}`}
         isCreate
         backlink={backLink}
         modeData={modeData}
diff --git a/src/components/organisms/Forms/BuiltinForms/UpdateBuiltinForm.tsx b/src/components/organisms/Forms/BuiltinForms/UpdateBuiltinForm.tsx
index 635a8f9..01e5344 100644
--- a/src/components/organisms/Forms/BuiltinForms/UpdateBuiltinForm.tsx
+++ b/src/components/organisms/Forms/BuiltinForms/UpdateBuiltinForm.tsx
@@ -6,13 +6,13 @@ import { RootState } from 'store/store'
 import { BlackholeForm } from 'components'
 
 type TUpdateBuiltinFormProps = {
-  typeName: string
-  entryName: string
+  plural: string
+  name: string
   namespace?: string
   backLink?: string | null
 }
 
-export const UpdateBuiltinForm: FC<TUpdateBuiltinFormProps> = ({ typeName, entryName, namespace, backLink }) => {
+export const UpdateBuiltinForm: FC<TUpdateBuiltinFormProps> = ({ plural, name, namespace, backLink }) => {
   const cluster = useSelector((state: RootState) => state.cluster.cluster)
 
   const [currentMode, setCurrentMode] = useState<string>('OpenAPI')
@@ -33,10 +33,10 @@ export const UpdateBuiltinForm: FC<TUpdateBuiltinFormProps> = ({ typeName, entry
   }
 
   const { data, isPending, error } = useBuiltinResourceSingle({
-    clusterName: cluster,
+    cluster,
     namespace,
-    typeName,
-    entryName,
+    plural,
+    name,
     refetchInterval: false,
   })
 
@@ -48,8 +48,6 @@ export const UpdateBuiltinForm: FC<TUpdateBuiltinFormProps> = ({ typeName, entry
     return <Alert message={`An error has occurred: ${error?.message} `} type="error" />
   }
 
-  /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
-  // const { status: _, ...noStatusData } = data
   /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
   const { managedFields: __, ...metadata } = data.metadata
 
@@ -67,11 +65,10 @@ export const UpdateBuiltinForm: FC<TUpdateBuiltinFormProps> = ({ typeName, entry
       <BlackholeForm
         data={{
           type: 'builtin',
-          typeName,
-          // prefillValuesSchema: { ...noStatusData, metadata },
+          plural,
           prefillValuesSchema: { ...data, metadata },
         }}
-        customizationId={`default-/v1/${typeName}`}
+        customizationId={`default-/v1/${plural}`}
         backlink={backLink}
         modeData={modeData}
       />
diff --git a/src/components/organisms/Forms/CrdsForms/CreateCrdsForm.tsx b/src/components/organisms/Forms/CrdsForms/CreateCrdsForm.tsx
index 237b0f6..79dd95a 100644
--- a/src/components/organisms/Forms/CrdsForms/CreateCrdsForm.tsx
+++ b/src/components/organisms/Forms/CrdsForms/CreateCrdsForm.tsx
@@ -7,11 +7,11 @@ type TCreateCrdsFormProps = {
   namespace?: string
   apiGroup: string
   apiVersion: string
-  typeName: string
+  plural: string
   backLink?: string | null
 }
 
-export const CreateCrdsForm: FC<TCreateCrdsFormProps> = ({ namespace, apiGroup, apiVersion, typeName, backLink }) => {
+export const CreateCrdsForm: FC<TCreateCrdsFormProps> = ({ namespace, apiGroup, apiVersion, plural, backLink }) => {
   const [currentMode, setCurrentMode] = useState<string>('OpenAPI')
   const [currentModeDisabled, setCurrentModeDisabled] = useState<boolean>(false)
 
@@ -45,10 +45,10 @@ export const CreateCrdsForm: FC<TCreateCrdsFormProps> = ({ namespace, apiGroup,
           type: 'apis',
           apiGroup,
           apiVersion,
-          typeName,
+          plural,
           prefillValueNamespaceOnly: namespace,
         }}
-        customizationId={`default-/${apiGroup}/${apiVersion}/${typeName}`}
+        customizationId={`default-/${apiGroup}/${apiVersion}/${plural}`}
         isCreate
         backlink={backLink}
         modeData={modeData}
diff --git a/src/components/organisms/Forms/CrdsForms/UpdateCrdsForm.tsx b/src/components/organisms/Forms/CrdsForms/UpdateCrdsForm.tsx
index 7f4cb5d..ce37e22 100644
--- a/src/components/organisms/Forms/CrdsForms/UpdateCrdsForm.tsx
+++ b/src/components/organisms/Forms/CrdsForms/UpdateCrdsForm.tsx
@@ -1,11 +1,6 @@
 import React, { FC, useState } from 'react'
 import { Spin, Alert, Segmented } from 'antd'
-import {
-  //  useCrdResourceSingle,
-  useK8sSmartResource,
-  TSingleResource,
-  Spacer,
-} from '@prorobotech/openapi-k8s-toolkit'
+import { useK8sSmartResource, TSingleResource, Spacer } from '@prorobotech/openapi-k8s-toolkit'
 import { useSelector } from 'react-redux'
 import { RootState } from 'store/store'
 import { BlackholeForm } from 'components'
@@ -13,8 +8,8 @@ import { BlackholeForm } from 'components'
 type TUpdateCrdsFormProps = {
   apiGroup: string
   apiVersion: string
-  typeName: string
-  entryName: string
+  plural: string
+  name: string
   namespace?: string
   backLink?: string | null
 }
@@ -22,8 +17,8 @@ type TUpdateCrdsFormProps = {
 export const UpdateCrdsForm: FC<TUpdateCrdsFormProps> = ({
   apiGroup,
   apiVersion,
-  typeName,
-  entryName,
+  plural,
+  name,
   namespace,
   backLink,
 }) => {
@@ -46,16 +41,6 @@ export const UpdateCrdsForm: FC<TUpdateCrdsFormProps> = ({
     onDisabled: onCurrentModeDisabled,
   }
 
-  // const { data, isPending, error } = useCrdResourceSingle({
-  //   clusterName: cluster,
-  //   namespace,
-  //   apiGroup,
-  //   apiVersion,
-  //   crdName: typeName,
-  //   entryName,
-  //   refetchInterval: false,
-  // })
-
   const {
     data: dataArr,
     isLoading: isPending,
@@ -65,10 +50,10 @@ export const UpdateCrdsForm: FC<TUpdateCrdsFormProps> = ({
   }>({
     cluster,
     namespace,
-    group: apiGroup,
-    version: apiVersion,
-    plural: typeName,
-    fieldSelector: `metadata.name=${entryName}`,
+    apiGroup,
+    apiVersion,
+    plural,
+    fieldSelector: `metadata.name=${name}`,
   })
 
   const data = dataArr?.items && dataArr.items.length > 0 ? dataArr.items[0] : undefined
@@ -87,8 +72,6 @@ export const UpdateCrdsForm: FC<TUpdateCrdsFormProps> = ({
     return <Alert message={`An error has occurred: No data `} type="error" />
   }
 
-  /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
-  // const { status: _, ...noStatusData } = data
   /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
   const { managedFields: __, ...metadata } = data.metadata
 
@@ -108,11 +91,10 @@ export const UpdateCrdsForm: FC<TUpdateCrdsFormProps> = ({
           type: 'apis',
           apiGroup,
           apiVersion,
-          typeName,
-          // prefillValuesSchema: { ...noStatusData, metadata },
+          plural,
           prefillValuesSchema: { ...data, metadata },
         }}
-        customizationId={`default-/${apiGroup}/${apiVersion}/${typeName}`}
+        customizationId={`default-/${apiGroup}/${apiVersion}/${plural}`}
         backlink={backLink}
         modeData={modeData}
       />
diff --git a/src/components/organisms/Header/organisms/User/User.tsx b/src/components/organisms/Header/organisms/User/User.tsx
index 69f89ce..71fff86 100644
--- a/src/components/organisms/Header/organisms/User/User.tsx
+++ b/src/components/organisms/Header/organisms/User/User.tsx
@@ -20,10 +20,6 @@ export const User: FC = () => {
       placement="top"
       menu={{
         items: [
-          // {
-          //   key: '1',
-          //   label: <ThemeSelector />,
-          // },
           ...(BASE_HIDE_INSIDE === 'true'
             ? []
             : [
diff --git a/src/components/organisms/HeaderSecond/HeaderSecond.tsx b/src/components/organisms/HeaderSecond/HeaderSecond.tsx
index 10b588f..1faa445 100644
--- a/src/components/organisms/HeaderSecond/HeaderSecond.tsx
+++ b/src/components/organisms/HeaderSecond/HeaderSecond.tsx
@@ -12,8 +12,7 @@ type THeaderProps = {
 }
 
 export const HeaderSecond: FC<THeaderProps> = ({ inside, isSearch }) => {
-  // const { projectName, instanceName, clusterName, entryType, namespace, syntheticProject } = useParams()
-  const { projectName, instanceName, clusterName, namespace, syntheticProject } = useParams()
+  const { projectName, instanceName, cluster, namespace, syntheticProject } = useParams()
   const { token } = theme.useToken()
 
   const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
@@ -23,17 +22,17 @@ export const HeaderSecond: FC<THeaderProps> = ({ inside, isSearch }) => {
     <Styled.BackgroundContainer $bgColor={token.colorFillSecondary} $borderRadius={token.borderRadius}>
       <Styled.PaddingContainer $height={HEAD_SECOND_ROW}>
         <Flex gap={18}>
-          {inside ? <SelectorClusterInside clusterName={clusterName} /> : <SelectorCluster clusterName={clusterName} />}
-          {inside && <SelectorInside clusterName={clusterName} namespace={namespace} />}
+          {inside ? <SelectorClusterInside cluster={cluster} /> : <SelectorCluster cluster={cluster} />}
+          {inside && <SelectorInside cluster={cluster} namespace={namespace} />}
           {!inside && !isSearch && BASE_USE_NAMESPACE_NAV !== 'true' && (
             <Selector
-              clusterName={clusterName}
+              cluster={cluster}
               projectName={projectName || possibleProject}
               instanceName={instanceName || possibleInstance}
             />
           )}
           {!inside && (isSearch || BASE_USE_NAMESPACE_NAV === 'true') && (
-            <SelectorNamespace clusterName={clusterName} namespace={namespace} />
+            <SelectorNamespace cluster={cluster} namespace={namespace} />
           )}
         </Flex>
       </Styled.PaddingContainer>
diff --git a/src/components/organisms/HeaderSecond/organisms/Selector/Selector.tsx b/src/components/organisms/HeaderSecond/organisms/Selector/Selector.tsx
index 782f2d2..f1913e8 100644
--- a/src/components/organisms/HeaderSecond/organisms/Selector/Selector.tsx
+++ b/src/components/organisms/HeaderSecond/organisms/Selector/Selector.tsx
@@ -1,79 +1,60 @@
 import React, { FC, useState } from 'react'
 import { Flex, Typography } from 'antd'
 import { useNavigate } from 'react-router-dom'
-import {
-  // useDirectUnknownResource,
-  useK8sSmartResource,
-  TNavigationResource,
-} from '@prorobotech/openapi-k8s-toolkit'
+import { useK8sSmartResource, TNavigationResource } from '@prorobotech/openapi-k8s-toolkit'
 import { useNavSelector } from 'hooks/useNavSelector'
 import { useMountEffect } from 'hooks/useMountEffect'
 import { EntrySelect } from 'components/atoms'
 import {
   BASE_API_GROUP,
   BASE_API_VERSION,
+  BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL,
   BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME,
-  BASE_CUSTOMIZATION_NAVIGATION_RESOURCE,
 } from 'constants/customizationApiGroupAndVersion'
 
 type TSelectorProps = {
-  clusterName?: string
+  cluster?: string
   projectName?: string
   instanceName?: string
 }
 
-export const Selector: FC<TSelectorProps> = ({ clusterName, projectName, instanceName }) => {
+export const Selector: FC<TSelectorProps> = ({ cluster, projectName, instanceName }) => {
   const navigate = useNavigate()
 
-  const [selectedClusterName, setSelectedClusterName] = useState(clusterName)
+  const [selectedCluster, setSelectedCluster] = useState(cluster)
   const [selectedProjectName, setSelectedProjectName] = useState(projectName)
   const [selectedInstanceName, setSelectedInstanceName] = useState(instanceName)
 
-  // const { projectsInSidebar, instancesInSidebar, allInstancesLoadingSuccess, clustersInSidebar } = useNavSelector(
   const { projectsInSidebar, instancesInSidebar, allInstancesLoadingSuccess } = useNavSelector(
-    selectedClusterName,
+    selectedCluster,
     projectName,
   )
 
-  // const { data: navigationData } = useDirectUnknownResource<{
-  //   spec: { projects: { clear: string; change: string }; instances: { clear: string; change: string } }
-  // }>({
-  //   uri: `/api/clusters/${clusterName}/k8s/apis/${BASE_API_GROUP}/${BASE_API_VERSION}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE}`,
-  //   refetchInterval: false,
-  //   queryKey: ['navigation', clusterName || 'no-cluster'],
-  //   isEnabled: clusterName !== undefined,
-  // })
-
   const { data: navigationDataArr } = useK8sSmartResource<{
     items: TNavigationResource[]
   }>({
-    cluster: clusterName || '',
-    group: BASE_API_GROUP,
-    version: BASE_API_VERSION,
-    plural: BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME,
-    fieldSelector: `metadata.name=${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE}`,
-    isEnabled: clusterName !== undefined,
+    cluster: cluster || '',
+    apiGroup: BASE_API_GROUP,
+    apiVersion: BASE_API_VERSION,
+    plural: BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL,
+    fieldSelector: `metadata.name=${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME}`,
+    isEnabled: cluster !== undefined,
   })
 
   const navigationData =
     navigationDataArr?.items && navigationDataArr.items.length > 0 ? navigationDataArr.items[0] : undefined
 
-  // const handleClusterChange = (value: string) => {
-  //   setSelectedClusterName(value)
-  //   navigate(`${baseprefix}/clusters/${value}`)
-  // }
-
   const handleProjectChange = (value?: string) => {
     if (value && value !== 'all') {
       setSelectedProjectName(value)
       const changeUrl =
         navigationData?.spec?.projects?.change
-          .replace('{selectedCluster}', selectedClusterName || 'no-cluster')
+          .replace('{selectedCluster}', selectedCluster || 'no-cluster')
           .replace('{value}', value) || 'no navigation data'
       navigate(changeUrl)
     } else {
       const clearUrl =
-        navigationData?.spec?.projects?.clear.replace('{selectedCluster}', selectedClusterName || 'no-cluster') ||
+        navigationData?.spec?.projects?.clear.replace('{selectedCluster}', selectedCluster || 'no-cluster') ||
         'no navigation data'
       navigate(clearUrl)
     }
@@ -84,31 +65,31 @@ export const Selector: FC<TSelectorProps> = ({ clusterName, projectName, instanc
       setSelectedInstanceName(value)
       const changeUrl =
         navigationData?.spec?.instances?.change
-          .replace('{selectedCluster}', selectedClusterName || 'no-cluster')
+          .replace('{selectedCluster}', selectedCluster || 'no-cluster')
           .replace('{selectedProject}', selectedProjectName || 'no-project')
           .replace('{value}', value) || 'no navigation data'
       navigate(changeUrl)
     } else {
       const clearUrl =
         navigationData?.spec?.instances?.clear
-          .replace('{selectedCluster}', selectedClusterName || 'no-cluster')
+          .replace('{selectedCluster}', selectedCluster || 'no-cluster')
           .replace('{selectedProject}', selectedProjectName || 'no-project') || 'no navigation data'
       navigate(clearUrl)
     }
   }
 
   useMountEffect(() => {
-    setSelectedClusterName(clusterName)
+    setSelectedCluster(cluster)
     setSelectedProjectName(projectName)
     setSelectedInstanceName(instanceName)
-  }, [projectName, instanceName, clusterName])
+  }, [projectName, instanceName, cluster])
 
   return (
     <Flex gap={18} justify="start" align="center">
       {/* <EntrySelect
         placeholder="Cluster"
         options={clustersInSidebar}
-        value={selectedClusterName}
+        value={selectedCluster}
         onChange={handleClusterChange}
       /> */}
       <Typography.Text>Project: </Typography.Text>
@@ -117,7 +98,7 @@ export const Selector: FC<TSelectorProps> = ({ clusterName, projectName, instanc
         options={[{ value: 'all', label: 'All Namespaces' }, ...projectsInSidebar]}
         value={selectedProjectName || 'all'}
         onChange={handleProjectChange}
-        disabled={selectedClusterName === undefined || projectsInSidebar.length === 0}
+        disabled={selectedCluster === undefined || projectsInSidebar.length === 0}
       />
       <Typography.Text>Instance: </Typography.Text>
       <EntrySelect
@@ -126,7 +107,7 @@ export const Selector: FC<TSelectorProps> = ({ clusterName, projectName, instanc
         value={selectedInstanceName || 'all'}
         onChange={handleInstanceChange}
         disabled={
-          selectedClusterName === undefined ||
+          selectedCluster === undefined ||
           selectedProjectName === undefined ||
           (allInstancesLoadingSuccess && instancesInSidebar.length === 0)
         }
diff --git a/src/components/organisms/HeaderSecond/organisms/SelectorCluster/SelectorCluster.tsx b/src/components/organisms/HeaderSecond/organisms/SelectorCluster/SelectorCluster.tsx
index 00c75d7..f647f32 100644
--- a/src/components/organisms/HeaderSecond/organisms/SelectorCluster/SelectorCluster.tsx
+++ b/src/components/organisms/HeaderSecond/organisms/SelectorCluster/SelectorCluster.tsx
@@ -9,21 +9,20 @@ import { EntrySelect } from 'components/atoms'
 import { BASE_NAVIGATE_FROM_CLUSTERLIST } from 'constants/customizationApiGroupAndVersion'
 
 type TSelectorClusterProps = {
-  clusterName?: string
+  cluster?: string
 }
 
-export const SelectorCluster: FC<TSelectorClusterProps> = ({ clusterName }) => {
+export const SelectorCluster: FC<TSelectorClusterProps> = ({ cluster }) => {
   const navigate = useNavigate()
   const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
 
-  const [selectedClusterName, setSelectedClusterName] = useState(clusterName)
+  const [selectedCluster, setSelectedCluster] = useState(cluster)
 
   const { clustersInSidebar } = useNavSelectorClusters()
 
   const handleClusterChange = (value?: string) => {
     if (value) {
-      setSelectedClusterName(value)
-      // navigate(`${baseprefix}/clusters/${value}`)
+      setSelectedCluster(value)
       navigate(BASE_NAVIGATE_FROM_CLUSTERLIST.replace('~recordValue~', value))
     } else {
       navigate(`${baseprefix}/clusters/`)
@@ -31,8 +30,8 @@ export const SelectorCluster: FC<TSelectorClusterProps> = ({ clusterName }) => {
   }
 
   useMountEffect(() => {
-    setSelectedClusterName(clusterName)
-  }, [clusterName])
+    setSelectedCluster(cluster)
+  }, [cluster])
 
   return (
     <Flex gap={18} justify="start" align="center">
@@ -40,9 +39,8 @@ export const SelectorCluster: FC<TSelectorClusterProps> = ({ clusterName }) => {
       <EntrySelect
         placeholder="Select Cluster"
         options={clustersInSidebar}
-        value={selectedClusterName}
+        value={selectedCluster}
         onChange={handleClusterChange}
-        // fullwidth
       />
     </Flex>
   )
diff --git a/src/components/organisms/HeaderSecond/organisms/SelectorClusterInside/SelectorClusterInside.tsx b/src/components/organisms/HeaderSecond/organisms/SelectorClusterInside/SelectorClusterInside.tsx
index d71663f..697891a 100644
--- a/src/components/organisms/HeaderSecond/organisms/SelectorClusterInside/SelectorClusterInside.tsx
+++ b/src/components/organisms/HeaderSecond/organisms/SelectorClusterInside/SelectorClusterInside.tsx
@@ -8,20 +8,20 @@ import { useMountEffect } from 'hooks/useMountEffect'
 import { EntrySelect } from 'components/atoms'
 
 type TSelectorClusterInsideProps = {
-  clusterName?: string
+  cluster?: string
 }
 
-export const SelectorClusterInside: FC<TSelectorClusterInsideProps> = ({ clusterName }) => {
+export const SelectorClusterInside: FC<TSelectorClusterInsideProps> = ({ cluster }) => {
   const navigate = useNavigate()
   const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
 
-  const [selectedClusterName, setSelectedClusterName] = useState(clusterName)
+  const [selectedCluster, setSelectedCluster] = useState(cluster)
 
-  const { clustersInSidebar } = useNavSelectorInside(selectedClusterName)
+  const { clustersInSidebar } = useNavSelectorInside(selectedCluster)
 
   const handleClusterChange = (value?: string) => {
     if (value) {
-      setSelectedClusterName(value)
+      setSelectedCluster(value)
       navigate(`${baseprefix}/inside/${value}/apis`)
     } else {
       navigate(`${baseprefix}/inside/`)
@@ -29,8 +29,8 @@ export const SelectorClusterInside: FC<TSelectorClusterInsideProps> = ({ cluster
   }
 
   useMountEffect(() => {
-    setSelectedClusterName(clusterName)
-  }, [clusterName])
+    setSelectedCluster(cluster)
+  }, [cluster])
 
   return (
     <Flex gap={18} justify="start" align="center">
@@ -38,9 +38,8 @@ export const SelectorClusterInside: FC<TSelectorClusterInsideProps> = ({ cluster
       <EntrySelect
         placeholder="Select Cluster"
         options={clustersInSidebar}
-        value={selectedClusterName}
+        value={selectedCluster}
         onChange={handleClusterChange}
-        // fullwidth
       />
     </Flex>
   )
diff --git a/src/components/organisms/HeaderSecond/organisms/SelectorInside/SelectorInside.tsx b/src/components/organisms/HeaderSecond/organisms/SelectorInside/SelectorInside.tsx
index bd62b44..31a0ee2 100644
--- a/src/components/organisms/HeaderSecond/organisms/SelectorInside/SelectorInside.tsx
+++ b/src/components/organisms/HeaderSecond/organisms/SelectorInside/SelectorInside.tsx
@@ -6,24 +6,18 @@ import { useMountEffect } from 'hooks/useMountEffect'
 import { EntrySelect } from 'components/atoms'
 
 type TSelectorInsideProps = {
-  clusterName?: string
+  cluster?: string
   namespace?: string
 }
 
-export const SelectorInside: FC<TSelectorInsideProps> = ({ clusterName, namespace }) => {
+export const SelectorInside: FC<TSelectorInsideProps> = ({ cluster, namespace }) => {
   const navigate = useNavigate()
   const params = useParams()
 
-  const [selectedClusterName, setSelectedClusterName] = useState<string | undefined>(clusterName)
+  const [selectedCluster, setSelectedCluster] = useState<string | undefined>(cluster)
   const [selectedNamespace, setSelectedNamespace] = useState<string | undefined>(namespace)
 
-  // const { namespacesInSidebar, clustersInSidebar } = useNavSelectorInside(selectedClusterName)
-  const { namespacesInSidebar } = useNavSelectorInside(selectedClusterName)
-
-  // const handleClusterChange = (value: string) => {
-  //   setSelectedClusterName(value)
-  //   navigate(`${baseprefix}/inside/${value}/apis`)
-  // }
+  const { namespacesInSidebar } = useNavSelectorInside(selectedCluster)
 
   const handleNamepsaceChange = (value?: string) => {
     if (value && value !== 'all' && params.namespace) {
@@ -44,25 +38,19 @@ export const SelectorInside: FC<TSelectorInsideProps> = ({ clusterName, namespac
   }
 
   useMountEffect(() => {
-    setSelectedClusterName(clusterName)
+    setSelectedCluster(cluster)
     setSelectedNamespace(namespace)
-  }, [namespace, clusterName])
+  }, [namespace, cluster])
 
   return (
     <Flex gap={18} justify="start" align="center">
-      {/* <EntrySelect
-        placeholder="Cluster"
-        options={clustersInSidebar}
-        value={selectedClusterName}
-        onChange={handleClusterChange}
-      /> */}
       <Typography.Text>Namespace: </Typography.Text>
       <EntrySelect
         placeholder="Namespace"
         options={[{ value: 'all', label: 'All Namespaces' }, ...namespacesInSidebar]}
         value={selectedNamespace || 'all'}
         onChange={handleNamepsaceChange}
-        disabled={selectedClusterName === undefined || namespacesInSidebar.length === 0}
+        disabled={selectedCluster === undefined || namespacesInSidebar.length === 0}
       />
     </Flex>
   )
diff --git a/src/components/organisms/HeaderSecond/organisms/SelectorNamespace/SelectorNamespace.tsx b/src/components/organisms/HeaderSecond/organisms/SelectorNamespace/SelectorNamespace.tsx
index a3c2db5..004a87a 100644
--- a/src/components/organisms/HeaderSecond/organisms/SelectorNamespace/SelectorNamespace.tsx
+++ b/src/components/organisms/HeaderSecond/organisms/SelectorNamespace/SelectorNamespace.tsx
@@ -1,11 +1,7 @@
 import React, { FC, useState } from 'react'
 import { Flex, Typography } from 'antd'
 import { useLocation, useNavigate } from 'react-router-dom'
-import {
-  // useDirectUnknownResource,
-  useK8sSmartResource,
-  TNavigationResource,
-} from '@prorobotech/openapi-k8s-toolkit'
+import { useK8sSmartResource, TNavigationResource } from '@prorobotech/openapi-k8s-toolkit'
 import { useSelector } from 'react-redux'
 import type { RootState } from 'store/store'
 import { useNavSelectorInside } from 'hooks/useNavSelectorInside'
@@ -15,44 +11,35 @@ import { EntrySelect } from 'components/atoms'
 import {
   BASE_API_GROUP,
   BASE_API_VERSION,
+  BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL,
   BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME,
-  BASE_CUSTOMIZATION_NAVIGATION_RESOURCE,
 } from 'constants/customizationApiGroupAndVersion'
 
 type TSelectorNamespaceProps = {
-  clusterName?: string
+  cluster?: string
   namespace?: string
 }
 
-export const SelectorNamespace: FC<TSelectorNamespaceProps> = ({ clusterName, namespace }) => {
+export const SelectorNamespace: FC<TSelectorNamespaceProps> = ({ cluster, namespace }) => {
   const navigate = useNavigate()
   const location = useLocation()
 
   const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
 
-  const [selectedClusterName, setSelectedClusterName] = useState(clusterName)
+  const [selectedCluster, setSelectedCluster] = useState(cluster)
   const [selectedNamespace, setSelectedNamespace] = useState(namespace)
 
-  const { namespacesInSidebar } = useNavSelectorInside(selectedClusterName)
-
-  // const { data: navigationData } = useDirectUnknownResource<{
-  //   spec: { namespaces: { clear: string; change: string } }
-  // }>({
-  //   uri: `/api/clusters/${clusterName}/k8s/apis/${BASE_API_GROUP}/${BASE_API_VERSION}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE}`,
-  //   refetchInterval: false,
-  //   queryKey: ['navigation', clusterName || 'no-cluster'],
-  //   isEnabled: clusterName !== undefined,
-  // })
+  const { namespacesInSidebar } = useNavSelectorInside(selectedCluster)
 
   const { data: navigationDataArr } = useK8sSmartResource<{
     items: TNavigationResource[]
   }>({
-    cluster: clusterName || '',
-    group: BASE_API_GROUP,
-    version: BASE_API_VERSION,
-    plural: BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME,
-    fieldSelector: `metadata.name=${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE}`,
-    isEnabled: clusterName !== undefined,
+    cluster: cluster || '',
+    apiGroup: BASE_API_GROUP,
+    apiVersion: BASE_API_VERSION,
+    plural: BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL,
+    fieldSelector: `metadata.name=${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME}`,
+    isEnabled: cluster !== undefined,
   })
 
   const navigationData =
@@ -65,10 +52,10 @@ export const SelectorNamespace: FC<TSelectorNamespaceProps> = ({ clusterName, na
       const { pathname, search, hash } = location
       const segs = pathname.split('/')
 
-      // Assume pattern: /prefix/:clusterName/:namespace?/:syntheticProject?/search/*
+      // Assume pattern: /prefix/:cluster/:namespace?/:syntheticProject?/search/*
       // Find the "search" segment index
       const searchIdx = segs.indexOf('search')
-      const clusterIdx = segs.indexOf(selectedClusterName || '')
+      const clusterIdx = segs.indexOf(selectedCluster || '')
       if (clusterIdx === -1) {
         return
       } // bail if we can't find the cluster
@@ -101,21 +88,21 @@ export const SelectorNamespace: FC<TSelectorNamespaceProps> = ({ clusterName, na
       setSelectedNamespace(value)
       const changeUrl =
         navigationData?.spec?.namespaces?.change
-          .replace('{selectedCluster}', selectedClusterName || 'no-cluster')
+          .replace('{selectedCluster}', selectedCluster || 'no-cluster')
           .replace('{value}', value) || 'no navigation data'
       navigate(changeUrl)
     } else {
       const clearUrl =
-        navigationData?.spec?.namespaces?.clear.replace('{selectedCluster}', selectedClusterName || 'no-cluster') ||
+        navigationData?.spec?.namespaces?.clear.replace('{selectedCluster}', selectedCluster || 'no-cluster') ||
         'no navigation data'
       navigate(clearUrl)
     }
   }
 
   useMountEffect(() => {
-    setSelectedClusterName(clusterName)
+    setSelectedCluster(cluster)
     setSelectedNamespace(namespace)
-  }, [namespace, clusterName])
+  }, [namespace, cluster])
 
   return (
     <Flex gap={18} justify="start" align="center">
@@ -125,7 +112,7 @@ export const SelectorNamespace: FC<TSelectorNamespaceProps> = ({ clusterName, na
         options={[{ value: 'all', label: 'All Namespaces' }, ...namespacesInSidebar]}
         value={selectedNamespace || 'all'}
         onChange={handleNamepsaceChange}
-        disabled={selectedClusterName === undefined || namespacesInSidebar.length === 0}
+        disabled={selectedCluster === undefined || namespacesInSidebar.length === 0}
       />
     </Flex>
   )
diff --git a/src/components/organisms/ListInsideAllResources/ListInsideAllResources.tsx b/src/components/organisms/ListInsideAllResources/ListInsideAllResources.tsx
index fc0bf15..9c7a467 100644
--- a/src/components/organisms/ListInsideAllResources/ListInsideAllResources.tsx
+++ b/src/components/organisms/ListInsideAllResources/ListInsideAllResources.tsx
@@ -33,16 +33,16 @@ export const ListInsideAllResources: FC<TListInsideAllResourcesProps> = ({ names
   }>()
 
   const apiGroupList = useApisResourceTypes({
-    clusterName: cluster,
+    cluster,
   })
 
   const builtInData = useBuiltinResourceTypes({
-    clusterName: cluster,
+    cluster,
   })
 
   useEffect(() => {
     getGroupsByCategory({
-      clusterName: cluster,
+      cluster,
       namespace,
       apiGroupListData: apiGroupList.data,
       builtinResourceTypesData: builtInData.data,
diff --git a/src/components/organisms/ListInsideApisByApiGroup/ListInsideApisByApiGroup.tsx b/src/components/organisms/ListInsideApisByApiGroup/ListInsideApisByApiGroup.tsx
index 86588bf..f1f0045 100644
--- a/src/components/organisms/ListInsideApisByApiGroup/ListInsideApisByApiGroup.tsx
+++ b/src/components/organisms/ListInsideApisByApiGroup/ListInsideApisByApiGroup.tsx
@@ -27,13 +27,13 @@ export const ListInsideApisByApiGroup: FC<TListInsideApisByApiGroupProps> = ({ n
   const navigate = useNavigate()
 
   const { isPending, error, data } = useApiResourceTypesByGroup({
-    clusterName: cluster,
+    cluster,
     apiGroup,
     apiVersion,
   })
 
   useEffect(() => {
-    filterIfApiInstanceNamespaceScoped({ namespace, data, apiGroup, apiVersion, clusterName: cluster }).then(data =>
+    filterIfApiInstanceNamespaceScoped({ namespace, data, apiGroup, apiVersion, cluster }).then(data =>
       setFilteredResources(data),
     )
   }, [namespace, data, apiGroup, apiVersion, cluster])
diff --git a/src/components/organisms/ListInsideClusterAndNs/ListInsideClusterAndNs.tsx b/src/components/organisms/ListInsideClusterAndNs/ListInsideClusterAndNs.tsx
index b3e752c..6508a08 100644
--- a/src/components/organisms/ListInsideClusterAndNs/ListInsideClusterAndNs.tsx
+++ b/src/components/organisms/ListInsideClusterAndNs/ListInsideClusterAndNs.tsx
@@ -1,14 +1,7 @@
 /* eslint-disable no-nested-ternary */
 import React, { FC, useState } from 'react'
 import { Button, Alert, Spin, Typography } from 'antd'
-import {
-  filterSelectOptions,
-  Spacer,
-  TSingleResource,
-  //  useBuiltinResources,
-  // useApiResources,
-  useK8sSmartResource,
-} from '@prorobotech/openapi-k8s-toolkit'
+import { filterSelectOptions, Spacer, TSingleResource, useK8sSmartResource } from '@prorobotech/openapi-k8s-toolkit'
 import { useNavigate } from 'react-router-dom'
 import { useSelector, useDispatch } from 'react-redux'
 import { RootState } from 'store/store'
@@ -16,7 +9,7 @@ import { setCluster } from 'store/cluster/cluster/cluster'
 import {
   CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
   CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
-  CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME,
+  CUSTOM_NAMESPACE_API_RESOURCE_PLURAL,
 } from 'constants/customizationApiGroupAndVersion'
 import { Styled } from './styled'
 
@@ -37,42 +30,26 @@ export const ListInsideClusterAndNs: FC = () => {
     CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION &&
     typeof CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION === 'string' &&
     CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION.length > 0 &&
-    CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME &&
-    typeof CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME === 'string' &&
-    CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME.length > 0
-
-  // const namespacesData = useBuiltinResources({
-  //   clusterName: selectedCluster || '',
-  //   typeName: 'namespaces',
-  //   limit: null,
-  //   isEnabled: Boolean(selectedCluster !== undefined && !isCustomNamespaceResource),
-  // })
+    CUSTOM_NAMESPACE_API_RESOURCE_PLURAL &&
+    typeof CUSTOM_NAMESPACE_API_RESOURCE_PLURAL === 'string' &&
+    CUSTOM_NAMESPACE_API_RESOURCE_PLURAL.length > 0
 
   const namespacesData = useK8sSmartResource<{
     items: TSingleResource[]
   }>({
     cluster: selectedCluster || '',
-    version: 'v1',
+    apiVersion: 'v1',
     plural: 'namespaces',
     isEnabled: Boolean(selectedCluster !== undefined && !isCustomNamespaceResource),
   })
 
-  // const namespacesDataCustom = useApiResources({
-  //   clusterName: selectedCluster || '',
-  //   apiGroup: CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
-  //   apiVersion: CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
-  //   typeName: CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME,
-  //   limit: null,
-  //   isEnabled: Boolean(selectedCluster !== undefined && isCustomNamespaceResource),
-  // })
-
   const namespacesDataCustom = useK8sSmartResource<{
     items: TSingleResource[]
   }>({
     cluster: selectedCluster || '',
-    group: CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
-    version: CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
-    plural: CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME,
+    apiGroup: CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
+    apiVersion: CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
+    plural: CUSTOM_NAMESPACE_API_RESOURCE_PLURAL,
     isEnabled: Boolean(selectedCluster !== undefined && isCustomNamespaceResource),
   })
 
@@ -97,7 +74,6 @@ export const ListInsideClusterAndNs: FC = () => {
             if (typeof value === 'string') {
               dispatch(setCluster(value))
               setSelectedCluster(value)
-              // navigate(`/${value}/apis`)
             }
           }}
           onClear={() => {
diff --git a/src/components/organisms/ListInsideCrdsByApiGroup/ListInsideCrdsByApiGroup.tsx b/src/components/organisms/ListInsideCrdsByApiGroup/ListInsideCrdsByApiGroup.tsx
index ed850b2..f55210c 100644
--- a/src/components/organisms/ListInsideCrdsByApiGroup/ListInsideCrdsByApiGroup.tsx
+++ b/src/components/organisms/ListInsideCrdsByApiGroup/ListInsideCrdsByApiGroup.tsx
@@ -30,13 +30,13 @@ export const ListInsideCrdsByApiGroup: FC<TListInsideCrdsByApiGroupProps> = ({
   const [filteredResources, setFilteredResources] = useState<TApiGroupResourceTypeList['resources']>()
 
   const { isPending, error, data } = useApiResourceTypesByGroup({
-    clusterName: cluster,
+    cluster,
     apiGroup,
     apiVersion,
   })
 
   useEffect(() => {
-    filterIfApiInstanceNamespaceScoped({ namespace, data, apiGroup, apiVersion, clusterName: cluster }).then(data =>
+    filterIfApiInstanceNamespaceScoped({ namespace, data, apiGroup, apiVersion, cluster }).then(data =>
       setFilteredResources(data),
     )
   }, [namespace, data, apiGroup, apiVersion, cluster])
diff --git a/src/components/organisms/Search/Search.tsx b/src/components/organisms/Search/Search.tsx
index 3d531b5..b296aff 100644
--- a/src/components/organisms/Search/Search.tsx
+++ b/src/components/organisms/Search/Search.tsx
@@ -100,7 +100,7 @@ export const Search: FC = () => {
   useEffect(() => {
     setIsLoading(true)
     setError(undefined)
-    getKinds({ clusterName: cluster })
+    getKinds({ cluster })
       .then(data => {
         setKindIndex(data)
         setKindWithVersion(getSortedKindsAll(data))
diff --git a/src/components/organisms/Search/molecules/SearchEntry/SearchEntry.tsx b/src/components/organisms/Search/molecules/SearchEntry/SearchEntry.tsx
index 28e6ab0..a6be1ee 100644
--- a/src/components/organisms/Search/molecules/SearchEntry/SearchEntry.tsx
+++ b/src/components/organisms/Search/molecules/SearchEntry/SearchEntry.tsx
@@ -40,7 +40,7 @@ export const SearchEntry: FC<TSearchEntryProps> = ({ resource, labels, fields, f
 
   const { FIELD_NAME } = constants
 
-  const [apiGroup, apiVersion, typeName] = resource.split('~')
+  const [apiGroup, apiVersion, plural] = resource.split('~')
 
   const kindName = kindByGvr(kindsWithVersion)(resource)
   const abbr = getUppercase(kindName && kindName.length ? kindName : 'Loading')
@@ -91,13 +91,13 @@ export const SearchEntry: FC<TSearchEntryProps> = ({ resource, labels, fields, f
       {isOpen && (
         <>
           <Spacer $space={12} $samespace />
-          {typeName && (
+          {plural && (
             <TableApiBuiltin
               resourceType={apiGroup.length > 0 ? 'api' : 'builtin'}
               namespace={isNamespaceResource ? namespace : undefined}
               apiGroup={apiGroup.length > 0 ? apiGroup : undefined}
               apiVersion={apiVersion}
-              typeName={typeName}
+              plural={plural}
               labels={labels?.length ? labels : undefined}
               fields={fields?.length ? fields : undefined}
               limit={limitSp && limitSp.length > 0 ? Number(limitSp) : undefined}
diff --git a/src/components/organisms/Sidebar/styled.ts b/src/components/organisms/Sidebar/styled.ts
index ff1f047..216bc6f 100644
--- a/src/components/organisms/Sidebar/styled.ts
+++ b/src/components/organisms/Sidebar/styled.ts
@@ -1,5 +1,4 @@
 import styled from 'styled-components'
-// import { HEAD_FIRST_ROW, SIDEBAR_CLUSTER_HEIGHT } from 'constants/blocksSizes'
 import { HEAD_FIRST_ROW } from 'constants/blocksSizes'
 
 type TBackgroundContainerProps = {
@@ -16,15 +15,6 @@ const BackgroundContainer = styled.div<TBackgroundContainerProps>`
   height: calc(100vh - ${HEAD_FIRST_ROW}px);
 `
 
-// const ClusterSelectorContainer = styled.div`
-//   height: ${SIDEBAR_CLUSTER_HEIGHT}px;
-//   display: flex;
-//   justify-content: center;
-//   align-items: center;
-//   padding: 12px;
-// `
-
 export const Styled = {
   BackgroundContainer,
-  // ClusterSelectorContainer,
 }
diff --git a/src/constants/blocksSizes.ts b/src/constants/blocksSizes.ts
index 545c3d3..a89fc15 100644
--- a/src/constants/blocksSizes.ts
+++ b/src/constants/blocksSizes.ts
@@ -4,8 +4,6 @@ export const NAV_HEIGHT = 50
 export const FOOTER_HEIGHT = 38
 export const MAIN_CONTENT_HORIZONTAL_PADDING = 24
 export const BACKLINK_HEIGHT = 26
-/* sidebar */
-// export const SIDEBAR_CLUSTER_HEIGHT = 56
 /* computed only */
 export const BREADCRUMBS_HEIGHT = 26
 export const CONTENT_CARD_PADDING = 25
diff --git a/src/constants/customizationApiGroupAndVersion.ts b/src/constants/customizationApiGroupAndVersion.ts
index dc40f62..c35578a 100644
--- a/src/constants/customizationApiGroupAndVersion.ts
+++ b/src/constants/customizationApiGroupAndVersion.ts
@@ -27,12 +27,13 @@ export const BASE_API_VERSION = import.meta.env.DEV
   ? window._env_.CUSTOMIZATION_API_VERSION || import.meta.env.VITE_CUSTOMIZATION_API_VERSION
   : window._env_.CUSTOMIZATION_API_VERSION
 
+export const BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL = import.meta.env.DEV
+  ? window._env_.CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL ||
+    import.meta.env.VITE_CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL
+  : window._env_.CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL
 export const BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME = import.meta.env.DEV
   ? window._env_.CUSTOMIZATION_NAVIGATION_RESOURCE_NAME || import.meta.env.VITE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME
   : window._env_.CUSTOMIZATION_NAVIGATION_RESOURCE_NAME
-export const BASE_CUSTOMIZATION_NAVIGATION_RESOURCE = import.meta.env.DEV
-  ? window._env_.CUSTOMIZATION_NAVIGATION_RESOURCE || import.meta.env.VITE_CUSTOMIZATION_NAVIGATION_RESOURCE
-  : window._env_.CUSTOMIZATION_NAVIGATION_RESOURCE
 
 export const CUSTOMIZATION_SIDEBAR_FALLBACK_ID = import.meta.env.DEV
   ? window._env_.CUSTOMIZATION_SIDEBAR_FALLBACK_ID || import.meta.env.VITE_CUSTOMIZATION_SIDEBAR_FALLBACK_ID
@@ -53,29 +54,29 @@ export const BASE_NAVIGATE_FROM_CLUSTERLIST = import.meta.env.DEV
 export const BASE_PROJECTS_API_GROUP = import.meta.env.DEV
   ? window._env_.PROJECTS_API_GROUP || import.meta.env.VITE_PROJECTS_API_GROUP
   : window._env_.PROJECTS_API_GROUP
-export const BASE_PROJECTS_VERSION = import.meta.env.DEV
-  ? window._env_.PROJECTS_VERSION || import.meta.env.VITE_PROJECTS_VERSION
-  : window._env_.PROJECTS_VERSION
-export const BASE_PROJECTS_RESOURCE_NAME = import.meta.env.DEV
-  ? window._env_.PROJECTS_RESOURCE_NAME || import.meta.env.VITE_PROJECTS_RESOURCE_NAME
-  : window._env_.PROJECTS_RESOURCE_NAME
+export const BASE_PROJECTS_API_VERSION = import.meta.env.DEV
+  ? window._env_.PROJECTS_API_VERSION || import.meta.env.VITE_PROJECTS_API_VERSION
+  : window._env_.PROJECTS_API_VERSION
+export const BASE_PROJECTS_PLURAL = import.meta.env.DEV
+  ? window._env_.PROJECTS_PLURAL || import.meta.env.VITE_PROJECTS_PLURAL
+  : window._env_.PROJECTS_PLURAL
 
-export const BASE_MARKETPLACE_RESOURCE_NAME = import.meta.env.DEV
-  ? window._env_.MARKETPLACE_RESOURCE_NAME || import.meta.env.VITE_MARKETPLACE_RESOURCE_NAME
-  : window._env_.MARKETPLACE_RESOURCE_NAME
+export const BASE_MARKETPLACE_PLURAL = import.meta.env.DEV
+  ? window._env_.MARKETPLACE_PLURAL || import.meta.env.VITE_MARKETPLACE_PLURAL
+  : window._env_.MARKETPLACE_PLURAL
 export const BASE_MARKETPLACE_KIND = import.meta.env.DEV
   ? import.meta.env.VITE_MARKETPLACE_KIND
   : window._env_.MARKETPLACE_KIND
 
-export const BASE_INSTANCES_API_GROUP = import.meta.env.DEV
+export const BASE_INSTANCES_API_GROUP: string | undefined = import.meta.env.DEV
   ? window._env_.INSTANCES_API_GROUP || import.meta.env.VITE_INSTANCES_API_GROUP
   : window._env_.INSTANCES_API_GROUP
-export const BASE_INSTANCES_VERSION = import.meta.env.DEV
-  ? window._env_.INSTANCES_VERSION || import.meta.env.VITE_INSTANCES_VERSION
-  : window._env_.INSTANCES_VERSION
-export const BASE_INSTANCES_RESOURCE_NAME = import.meta.env.DEV
-  ? window._env_.INSTANCES_RESOURCE_NAME || import.meta.env.VITE_INSTANCES_RESOURCE_NAME
-  : window._env_.INSTANCES_RESOURCE_NAME
+export const BASE_INSTANCES_API_VERSION = import.meta.env.DEV
+  ? window._env_.INSTANCES_API_VERSION || import.meta.env.VITE_INSTANCES_API_VERSION
+  : window._env_.INSTANCES_API_VERSION
+export const BASE_INSTANCES_PLURAL = import.meta.env.DEV
+  ? window._env_.INSTANCES_PLURAL || import.meta.env.VITE_INSTANCES_PLURAL
+  : window._env_.INSTANCES_PLURAL
 
 export const NODE_TERMINAL_DEFAULT_PROFILE = import.meta.env.DEV
   ? window._env_.NODE_TERMINAL_DEFAULT_PROFILE || import.meta.env.VITE_NODE_TERMINAL_DEFAULT_PROFILE
@@ -123,14 +124,13 @@ export const BASE_NAMESPACE_FACTORY_KEY = import.meta.env.DEV
   ? window._env_.BASE_NAMESPACE_FACTORY_KEY || import.meta.env.VITE_BASE_NAMESPACE_FACTORY_KEY
   : window._env_.BASE_NAMESPACE_FACTORY_KEY
 
-export const CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP = import.meta.env.DEV
+export const CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP: string | undefined = import.meta.env.DEV
   ? window._env_.CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP || import.meta.env.VITE_CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP
   : window._env_.CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP
 export const CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION = import.meta.env.DEV
   ? window._env_.CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION ||
     import.meta.env.VITE_CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION
   : window._env_.CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION
-export const CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME = import.meta.env.DEV
-  ? window._env_.CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME ||
-    import.meta.env.VITE_CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME
-  : window._env_.CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME
+export const CUSTOM_NAMESPACE_API_RESOURCE_PLURAL = import.meta.env.DEV
+  ? window._env_.CUSTOM_NAMESPACE_API_RESOURCE_PLURAL || import.meta.env.VITE_CUSTOM_NAMESPACE_API_RESOURCE_PLURAL
+  : window._env_.CUSTOM_NAMESPACE_API_RESOURCE_PLURAL
diff --git a/src/hooks/useIsSearchPage/useIsSearchPage.ts b/src/hooks/useIsSearchPage/useIsSearchPage.ts
index a7c3ad9..5eadd49 100644
--- a/src/hooks/useIsSearchPage/useIsSearchPage.ts
+++ b/src/hooks/useIsSearchPage/useIsSearchPage.ts
@@ -3,7 +3,7 @@ import { useLocation, matchPath } from 'react-router-dom'
 export const useIsSearchPage = (prefix: string) => {
   const { pathname } = useLocation()
   const base = `/${prefix}`.replace(/\/{2,}/g, '/').replace(/\/$/, '')
-  const pattern = `${base}/:clusterName/:namespace?/:syntheticProject?/search/*`
+  const pattern = `${base}/:cluster/:namespace?/:syntheticProject?/search/*`
 
   return Boolean(matchPath({ path: pattern }, pathname))
 }
diff --git a/src/hooks/useNavSelector/useNavSelector.ts b/src/hooks/useNavSelector/useNavSelector.ts
index a54da43..155b23e 100644
--- a/src/hooks/useNavSelector/useNavSelector.ts
+++ b/src/hooks/useNavSelector/useNavSelector.ts
@@ -1,8 +1,6 @@
 import {
-  // useApiResources,
   TClusterList,
   TSingleResource,
-  // useDirectUnknownResource,
   useK8sSmartResource,
   TNavigationResource,
 } from '@prorobotech/openapi-k8s-toolkit'
@@ -11,14 +9,14 @@ import { RootState } from 'store/store'
 import {
   BASE_API_GROUP,
   BASE_API_VERSION,
+  BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL,
   BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME,
-  BASE_CUSTOMIZATION_NAVIGATION_RESOURCE,
   BASE_PROJECTS_API_GROUP,
-  BASE_PROJECTS_VERSION,
-  BASE_PROJECTS_RESOURCE_NAME,
+  BASE_PROJECTS_API_VERSION,
+  BASE_PROJECTS_PLURAL,
   BASE_INSTANCES_API_GROUP,
-  BASE_INSTANCES_VERSION,
-  BASE_INSTANCES_RESOURCE_NAME,
+  BASE_INSTANCES_API_VERSION,
+  BASE_INSTANCES_PLURAL,
 } from 'constants/customizationApiGroupAndVersion'
 import { parseAll } from './utils'
 
@@ -49,62 +47,33 @@ const mappedInstanceToOptionInSidebar = ({
   label: instance.metadata.name,
 })
 
-export const useNavSelector = (clusterName?: string, projectName?: string) => {
+export const useNavSelector = (cluster?: string, projectName?: string) => {
   const clusterList = useSelector((state: RootState) => state.clusterList.clusterList)
 
-  // const { data: navigationData } = useDirectUnknownResource<{
-  //   spec: { instances: { mapOptionsPattern: string } }
-  // }>({
-  //   uri: `/api/clusters/${clusterName}/k8s/apis/${BASE_API_GROUP}/${BASE_API_VERSION}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME}/${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE}`,
-  //   refetchInterval: false,
-  //   queryKey: ['navigation', clusterName || 'no-cluster'],
-  //   isEnabled: clusterName !== undefined,
-  // })
-
   const { data: navigationDataArr } = useK8sSmartResource<{
     items: TNavigationResource[]
   }>({
-    cluster: clusterName || '',
-    group: BASE_API_GROUP,
-    version: BASE_API_VERSION,
-    plural: BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME,
-    fieldSelector: `metadata.name=${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE}`,
-    isEnabled: clusterName !== undefined,
+    cluster: cluster || '',
+    apiGroup: BASE_API_GROUP,
+    apiVersion: BASE_API_VERSION,
+    plural: BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL,
+    fieldSelector: `metadata.name=${BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME}`,
+    isEnabled: cluster !== undefined,
   })
 
   const navigationData =
     navigationDataArr?.items && navigationDataArr.items.length > 0 ? navigationDataArr.items[0] : undefined
 
-  // const { data: projects } = useApiResources({
-  //   clusterName: clusterName || '',
-  //   namespace: '',
-  //   apiGroup: BASE_PROJECTS_API_GROUP,
-  //   apiVersion: BASE_PROJECTS_VERSION,
-  //   typeName: BASE_PROJECTS_RESOURCE_NAME,
-  //   limit: null,
-  //   isEnabled: clusterName !== undefined,
-  // })
-
   const { data: projects } = useK8sSmartResource<{
     items: TSingleResource[]
   }>({
-    cluster: clusterName || '',
-    group: BASE_PROJECTS_API_GROUP,
-    version: BASE_PROJECTS_VERSION,
-    plural: BASE_PROJECTS_RESOURCE_NAME,
-    isEnabled: clusterName !== undefined,
+    cluster: cluster || '',
+    apiGroup: BASE_PROJECTS_API_GROUP,
+    apiVersion: BASE_PROJECTS_API_VERSION,
+    plural: BASE_PROJECTS_PLURAL,
+    isEnabled: cluster !== undefined,
   })
 
-  // const { data: instances, isSuccess: allInstancesLoadingSuccess } = useApiResources({
-  //   clusterName: clusterName || '',
-  //   namespace: '',
-  //   apiGroup: BASE_INSTANCES_API_GROUP,
-  //   apiVersion: BASE_INSTANCES_VERSION,
-  //   typeName: BASE_INSTANCES_RESOURCE_NAME,
-  //   limit: null,
-  //   isEnabled: clusterName !== undefined,
-  // })
-
   const {
     data: instances,
     isLoading: isInstancesLoading,
@@ -112,11 +81,11 @@ export const useNavSelector = (clusterName?: string, projectName?: string) => {
   } = useK8sSmartResource<{
     items: TSingleResource[]
   }>({
-    cluster: clusterName || '',
-    group: BASE_INSTANCES_API_GROUP,
-    version: BASE_INSTANCES_VERSION,
-    plural: BASE_INSTANCES_RESOURCE_NAME,
-    isEnabled: clusterName !== undefined,
+    cluster: cluster || '',
+    apiGroup: BASE_INSTANCES_API_GROUP,
+    apiVersion: BASE_INSTANCES_API_VERSION,
+    plural: BASE_INSTANCES_PLURAL,
+    isEnabled: cluster !== undefined,
   })
 
   const allInstancesLoadingSuccess: boolean = Boolean(
@@ -124,9 +93,9 @@ export const useNavSelector = (clusterName?: string, projectName?: string) => {
   )
 
   const clustersInSidebar = clusterList ? clusterList.map(mappedClusterToOptionInSidebar) : []
-  const projectsInSidebar = clusterName && projects ? projects.items.map(mappedProjectToOptionInSidebar) : []
+  const projectsInSidebar = cluster && projects ? projects.items.map(mappedProjectToOptionInSidebar) : []
   const instancesInSidebar =
-    clusterName && instances
+    cluster && instances
       ? instances.items
           .filter(item => item.metadata.namespace === projectName)
           .map(item =>
diff --git a/src/hooks/useNavSelectorInside.ts b/src/hooks/useNavSelectorInside.ts
index 58c4b06..c7e5ec5 100644
--- a/src/hooks/useNavSelectorInside.ts
+++ b/src/hooks/useNavSelectorInside.ts
@@ -1,16 +1,10 @@
-import {
-  TClusterList,
-  TSingleResource,
-  //  useBuiltinResources,
-  // useApiResources,
-  useK8sSmartResource,
-} from '@prorobotech/openapi-k8s-toolkit'
+import { TClusterList, TSingleResource, useK8sSmartResource } from '@prorobotech/openapi-k8s-toolkit'
 import { useSelector } from 'react-redux'
 import { RootState } from 'store/store'
 import {
   CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
   CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
-  CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME,
+  CUSTOM_NAMESPACE_API_RESOURCE_PLURAL,
 } from 'constants/customizationApiGroupAndVersion'
 
 const mappedClusterToOptionInSidebar = ({ name }: TClusterList[number]): { value: string; label: string } => ({
@@ -23,7 +17,7 @@ const mappedNamespaceToOptionInSidebar = ({ metadata }: TSingleResource): { valu
   label: metadata.name,
 })
 
-export const useNavSelectorInside = (clusterName?: string) => {
+export const useNavSelectorInside = (cluster?: string) => {
   const clusterList = useSelector((state: RootState) => state.clusterList.clusterList)
 
   const isCustomNamespaceResource =
@@ -33,49 +27,33 @@ export const useNavSelectorInside = (clusterName?: string) => {
     CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION &&
     typeof CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION === 'string' &&
     CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION.length > 0 &&
-    CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME &&
-    typeof CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME === 'string' &&
-    CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME.length > 0
-
-  // const { data: namespaces } = useBuiltinResources({
-  //   clusterName: clusterName || '',
-  //   typeName: 'namespaces',
-  //   limit: null,
-  //   isEnabled: Boolean(clusterName !== undefined && !isCustomNamespaceResource),
-  // })
+    CUSTOM_NAMESPACE_API_RESOURCE_PLURAL &&
+    typeof CUSTOM_NAMESPACE_API_RESOURCE_PLURAL === 'string' &&
+    CUSTOM_NAMESPACE_API_RESOURCE_PLURAL.length > 0
 
   const { data: namespaces } = useK8sSmartResource<{
     items: TSingleResource[]
   }>({
-    cluster: clusterName || '',
-    version: 'v1',
+    cluster: cluster || '',
+    apiVersion: 'v1',
     plural: 'namespaces',
-    isEnabled: Boolean(clusterName !== undefined && !isCustomNamespaceResource),
+    isEnabled: Boolean(cluster !== undefined && !isCustomNamespaceResource),
   })
 
-  // const { data: namespacesCustom } = useApiResources({
-  //   clusterName: clusterName || '',
-  //   apiGroup: CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
-  //   apiVersion: CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
-  //   typeName: CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME,
-  //   limit: null,
-  //   isEnabled: Boolean(clusterName !== undefined && isCustomNamespaceResource),
-  // })
-
   const { data: namespacesCustom } = useK8sSmartResource<{
     items: TSingleResource[]
   }>({
-    cluster: clusterName || '',
-    group: CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
-    version: CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
-    plural: CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME,
-    isEnabled: Boolean(clusterName !== undefined && !isCustomNamespaceResource),
+    cluster: cluster || '',
+    apiGroup: CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP,
+    apiVersion: CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION,
+    plural: CUSTOM_NAMESPACE_API_RESOURCE_PLURAL,
+    isEnabled: Boolean(cluster !== undefined && !isCustomNamespaceResource),
   })
 
   const clustersInSidebar = clusterList ? clusterList.map(mappedClusterToOptionInSidebar) : []
-  const namespacesInSidebar = clusterName && namespaces ? namespaces.items.map(mappedNamespaceToOptionInSidebar) : []
+  const namespacesInSidebar = cluster && namespaces ? namespaces.items.map(mappedNamespaceToOptionInSidebar) : []
   const namespacesInSidebarCustom =
-    clusterName && namespacesCustom ? namespacesCustom.items.map(mappedNamespaceToOptionInSidebar) : []
+    cluster && namespacesCustom ? namespacesCustom.items.map(mappedNamespaceToOptionInSidebar) : []
 
   return {
     clustersInSidebar,
diff --git a/src/pages/Forms/FormApiPage/FormApiPage.tsx b/src/pages/Forms/FormApiPage/FormApiPage.tsx
index 858a392..5287fbd 100644
--- a/src/pages/Forms/FormApiPage/FormApiPage.tsx
+++ b/src/pages/Forms/FormApiPage/FormApiPage.tsx
@@ -9,7 +9,7 @@ import { BASE_USE_NAMESPACE_NAV } from 'constants/customizationApiGroupAndVersio
 import { TChromeCtx } from 'templates'
 
 export const FormApiPage: FC = () => {
-  const { clusterName, syntheticProject, namespace, apiGroup, apiVersion, typeName, entryName } = useParams()
+  const { cluster, syntheticProject, namespace, apiGroup, apiVersion, plural, name } = useParams()
   const [searchParams] = useSearchParams()
   const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
 
@@ -20,7 +20,7 @@ export const FormApiPage: FC = () => {
 
   const preparedBacklink = getFormsBackLink({
     backLink,
-    clusterName,
+    cluster,
     possibleProject,
     possibleInstance,
     baseprefix,
@@ -32,12 +32,10 @@ export const FormApiPage: FC = () => {
 
   useEffect(() => {
     setSidebarSuffix('api-form')
-    setBreadcrumbsSuffix(`api-form${entryName ? '-edit' : ''}`)
-    setCurrentTags([`${apiGroup}/${apiVersion}/${typeName}`])
+    setBreadcrumbsSuffix(`api-form${name ? '-edit' : ''}`)
+    setCurrentTags([`${apiGroup}/${apiVersion}/${plural}`])
     setBacklinkTo(preparedBacklink)
-    setBacklinkTitle(
-      `${entryName ? 'Update' : 'Create'} ${apiGroup}/${apiVersion}/${typeName}${entryName ? `/${entryName}` : ''}`,
-    )
+    setBacklinkTitle(`${name ? 'Update' : 'Create'} ${apiGroup}/${apiVersion}/${plural}${name ? `/${name}` : ''}`)
 
     return () => {
       setCurrentTags(undefined)
@@ -49,8 +47,8 @@ export const FormApiPage: FC = () => {
   }, [
     apiGroup,
     apiVersion,
-    typeName,
-    entryName,
+    plural,
+    name,
     preparedBacklink,
     setSidebarSuffix,
     setBreadcrumbsSuffix,
@@ -58,19 +56,19 @@ export const FormApiPage: FC = () => {
     setBacklinkTo,
     setBacklinkTitle,
   ])
-  if (!typeName || !apiGroup || !apiVersion) {
+  if (!plural || !apiGroup || !apiVersion) {
     return null
   }
 
   return (
     <ContentCard flexGrow={1} displayFlex flexFlow="column">
-      {entryName ? (
+      {name ? (
         <UpdateApisForm
           namespace={namespace}
           apiGroup={apiGroup}
           apiVersion={apiVersion}
-          typeName={typeName}
-          entryName={entryName}
+          plural={plural}
+          name={name}
           backLink={backLink}
         />
       ) : (
@@ -78,7 +76,7 @@ export const FormApiPage: FC = () => {
           namespace={namespace}
           apiGroup={apiGroup}
           apiVersion={apiVersion}
-          typeName={typeName}
+          plural={plural}
           backLink={backLink}
         />
       )}
diff --git a/src/pages/Forms/FormBuiltinPage/FormBuiltinPage.tsx b/src/pages/Forms/FormBuiltinPage/FormBuiltinPage.tsx
index c9472f8..7aeb5a6 100644
--- a/src/pages/Forms/FormBuiltinPage/FormBuiltinPage.tsx
+++ b/src/pages/Forms/FormBuiltinPage/FormBuiltinPage.tsx
@@ -9,7 +9,7 @@ import { BASE_USE_NAMESPACE_NAV } from 'constants/customizationApiGroupAndVersio
 import { TChromeCtx } from 'templates'
 
 export const FormBuiltinPage: FC = () => {
-  const { clusterName, syntheticProject, namespace, typeName, entryName } = useParams()
+  const { cluster, syntheticProject, namespace, plural, name } = useParams()
   const [searchParams] = useSearchParams()
   const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
 
@@ -20,7 +20,7 @@ export const FormBuiltinPage: FC = () => {
 
   const preparedBacklink = getFormsBackLink({
     backLink,
-    clusterName,
+    cluster,
     possibleProject,
     possibleInstance,
     baseprefix,
@@ -32,10 +32,10 @@ export const FormBuiltinPage: FC = () => {
 
   useEffect(() => {
     setSidebarSuffix('builtin-form')
-    setBreadcrumbsSuffix(`builtin-form${entryName ? '-edit' : ''}`)
-    setCurrentTags([`${typeName}`])
+    setBreadcrumbsSuffix(`builtin-form${name ? '-edit' : ''}`)
+    setCurrentTags([`${plural}`])
     setBacklinkTo(preparedBacklink)
-    setBacklinkTitle(`${entryName ? 'Update' : 'Create'} ${typeName}${entryName ? `/${entryName}` : ''}`)
+    setBacklinkTitle(`${name ? 'Update' : 'Create'} ${plural}${name ? `/${name}` : ''}`)
 
     return () => {
       setCurrentTags(undefined)
@@ -45,8 +45,8 @@ export const FormBuiltinPage: FC = () => {
       setBacklinkTitle(undefined)
     }
   }, [
-    typeName,
-    entryName,
+    plural,
+    name,
     preparedBacklink,
     setSidebarSuffix,
     setBreadcrumbsSuffix,
@@ -55,16 +55,16 @@ export const FormBuiltinPage: FC = () => {
     setBacklinkTitle,
   ])
 
-  if (!typeName) {
+  if (!plural) {
     return null
   }
 
   return (
     <ContentCard flexGrow={1} displayFlex flexFlow="column">
-      {entryName ? (
-        <UpdateBuiltinForm namespace={namespace} typeName={typeName} entryName={entryName} backLink={backLink} />
+      {name ? (
+        <UpdateBuiltinForm namespace={namespace} plural={plural} name={name} backLink={backLink} />
       ) : (
-        <CreateBuiltinForm namespace={namespace} typeName={typeName} backLink={backLink} />
+        <CreateBuiltinForm namespace={namespace} plural={plural} backLink={backLink} />
       )}
     </ContentCard>
   )
diff --git a/src/pages/Forms/FormCrdPage/FormCrdPage.tsx b/src/pages/Forms/FormCrdPage/FormCrdPage.tsx
index a3202a9..2a18980 100644
--- a/src/pages/Forms/FormCrdPage/FormCrdPage.tsx
+++ b/src/pages/Forms/FormCrdPage/FormCrdPage.tsx
@@ -9,7 +9,7 @@ import { BASE_USE_NAMESPACE_NAV } from 'constants/customizationApiGroupAndVersio
 import { TChromeCtx } from 'templates'
 
 export const FormCrdPage: FC = () => {
-  const { clusterName, syntheticProject, apiGroup, apiVersion, namespace, typeName, entryName } = useParams()
+  const { cluster, syntheticProject, apiGroup, apiVersion, namespace, plural, name } = useParams()
   const [searchParams] = useSearchParams()
   const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
 
@@ -20,7 +20,7 @@ export const FormCrdPage: FC = () => {
 
   const preparedBacklink = getFormsBackLink({
     backLink,
-    clusterName,
+    cluster,
     possibleProject,
     possibleInstance,
     baseprefix,
@@ -32,12 +32,10 @@ export const FormCrdPage: FC = () => {
 
   useEffect(() => {
     setSidebarSuffix('crd-form')
-    setBreadcrumbsSuffix(`crd-form${entryName ? '-edit' : ''}`)
-    setCurrentTags([`${apiGroup}/${apiVersion}/${typeName}`])
+    setBreadcrumbsSuffix(`crd-form${name ? '-edit' : ''}`)
+    setCurrentTags([`${apiGroup}/${apiVersion}/${plural}`])
     setBacklinkTo(preparedBacklink)
-    setBacklinkTitle(
-      `${entryName ? 'Update' : 'Create'} ${apiGroup}/${apiVersion}/${typeName}${entryName ? `/${entryName}` : ''}`,
-    )
+    setBacklinkTitle(`${plural ? 'Update' : 'Create'} ${apiGroup}/${apiVersion}/${plural}${name ? `/${name}` : ''}`)
 
     return () => {
       setCurrentTags(undefined)
@@ -49,8 +47,8 @@ export const FormCrdPage: FC = () => {
   }, [
     apiGroup,
     apiVersion,
-    typeName,
-    entryName,
+    plural,
+    name,
     preparedBacklink,
     setSidebarSuffix,
     setBreadcrumbsSuffix,
@@ -59,18 +57,18 @@ export const FormCrdPage: FC = () => {
     setBacklinkTitle,
   ])
 
-  if (!typeName || !apiGroup || !apiVersion) {
+  if (!plural || !apiGroup || !apiVersion) {
     return null
   }
   return (
     <ContentCard flexGrow={1} displayFlex flexFlow="column">
-      {entryName ? (
+      {name ? (
         <UpdateCrdsForm
           namespace={namespace}
           apiGroup={apiGroup}
           apiVersion={apiVersion}
-          typeName={typeName}
-          entryName={entryName}
+          plural={plural}
+          name={name}
           backLink={backLink}
         />
       ) : (
@@ -78,7 +76,7 @@ export const FormCrdPage: FC = () => {
           namespace={namespace}
           apiGroup={apiGroup}
           apiVersion={apiVersion}
-          typeName={typeName}
+          plural={plural}
           backLink={backLink}
         />
       )}
diff --git a/src/pages/Forms/index.ts b/src/pages/Forms/index.ts
index 2a27924..7476473 100644
--- a/src/pages/Forms/index.ts
+++ b/src/pages/Forms/index.ts
@@ -1,3 +1,2 @@
-// export { FormCrdPage } from './FormCrdPage'
 export { FormApiPage } from './FormApiPage'
 export { FormBuiltinPage } from './FormBuiltinPage'
diff --git a/src/pages/Tables/TableApiPage/TableApiPage.tsx b/src/pages/Tables/TableApiPage/TableApiPage.tsx
index 98fcda1..ec7b16f 100644
--- a/src/pages/Tables/TableApiPage/TableApiPage.tsx
+++ b/src/pages/Tables/TableApiPage/TableApiPage.tsx
@@ -10,8 +10,8 @@ import { TChromeCtx } from 'templates'
 import {
   BASE_USE_NAMESPACE_NAV,
   BASE_PROJECTS_API_GROUP,
-  BASE_PROJECTS_VERSION,
-  BASE_PROJECTS_RESOURCE_NAME,
+  BASE_PROJECTS_API_VERSION,
+  BASE_PROJECTS_PLURAL,
 } from 'constants/customizationApiGroupAndVersion'
 
 type TTableApiPageProps = {
@@ -19,22 +19,22 @@ type TTableApiPageProps = {
 }
 
 export const TableApiPage: FC<TTableApiPageProps> = ({ inside }) => {
-  const { clusterName, namespace, syntheticProject, apiGroup, apiVersion, typeName } = useParams()
+  const { cluster, namespace, syntheticProject, apiGroup, apiVersion, plural } = useParams()
   const [searchParams] = useSearchParams()
   const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
 
   const isProjectList =
     !namespace &&
     apiGroup === BASE_PROJECTS_API_GROUP &&
-    apiVersion === BASE_PROJECTS_VERSION &&
-    typeName === BASE_PROJECTS_RESOURCE_NAME
+    apiVersion === BASE_PROJECTS_API_VERSION &&
+    plural === BASE_PROJECTS_PLURAL
   const breadcrumbsIdProjectList = 'projects-list'
 
   const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
   const possibleInstance = syntheticProject && namespace ? namespace : undefined
 
   const preparedBacklink = getTablesBackLink({
-    clusterName,
+    cluster,
     possibleProject,
     possibleInstance,
     namespace,
@@ -49,7 +49,7 @@ export const TableApiPage: FC<TTableApiPageProps> = ({ inside }) => {
   useEffect(() => {
     setSidebarSuffix('builtin-table')
     setBreadcrumbsSuffix(isProjectList ? breadcrumbsIdProjectList : 'api-table')
-    setCurrentTags([`${typeName}`])
+    setCurrentTags([`${plural}`])
     setBacklinkTo(preparedBacklink)
     setBacklinkTitle(undefined)
 
@@ -58,10 +58,10 @@ export const TableApiPage: FC<TTableApiPageProps> = ({ inside }) => {
       setSidebarSuffix(undefined)
       setBreadcrumbsSuffix(undefined)
       setBacklinkTo(undefined)
-      setBacklinkTitle(`${apiGroup}/${apiVersion}/${typeName}`)
+      setBacklinkTitle(`${apiGroup}/${apiVersion}/${plural}`)
     }
   }, [
-    typeName,
+    plural,
     isProjectList,
     breadcrumbsIdProjectList,
     preparedBacklink,
@@ -85,14 +85,14 @@ export const TableApiPage: FC<TTableApiPageProps> = ({ inside }) => {
 
   return (
     <ContentCard flexGrow={1} displayFlex flexFlow="column">
-      {typeName && apiGroup && apiVersion && (
+      {plural && apiGroup && apiVersion && (
         <TableApiBuiltin
           resourceType="api"
           namespace={namespace}
           apiGroup={apiGroup}
           apiVersion={apiVersion}
-          typeName={typeName}
-          key={`${apiGroup}-${apiVersion}-${namespace}-${typeName}`}
+          plural={plural}
+          key={`${apiGroup}-${apiVersion}-${namespace}-${plural}`}
           limit={limitSp && limitSp.length > 0 ? Number(limitSp) : undefined}
           inside={inside}
           customizationIdPrefix={tableCustomizationIdPrefix}
diff --git a/src/pages/Tables/TableBuiltinPage/TableBuiltinPage.tsx b/src/pages/Tables/TableBuiltinPage/TableBuiltinPage.tsx
index c3e402c..b70d9cc 100644
--- a/src/pages/Tables/TableBuiltinPage/TableBuiltinPage.tsx
+++ b/src/pages/Tables/TableBuiltinPage/TableBuiltinPage.tsx
@@ -14,7 +14,7 @@ type TTableBuiltinPageProps = {
 }
 
 export const TableBuiltinPage: FC<TTableBuiltinPageProps> = ({ inside }) => {
-  const { clusterName, namespace, syntheticProject, typeName } = useParams()
+  const { cluster, namespace, syntheticProject, plural } = useParams()
   const [searchParams] = useSearchParams()
   const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
 
@@ -22,7 +22,7 @@ export const TableBuiltinPage: FC<TTableBuiltinPageProps> = ({ inside }) => {
   const possibleInstance = syntheticProject && namespace ? namespace : undefined
 
   const preparedBacklink = getTablesBackLink({
-    clusterName,
+    cluster,
     possibleProject,
     possibleInstance,
     namespace,
@@ -37,9 +37,9 @@ export const TableBuiltinPage: FC<TTableBuiltinPageProps> = ({ inside }) => {
   useEffect(() => {
     setSidebarSuffix('builtin-table')
     setBreadcrumbsSuffix('builtin-table')
-    setCurrentTags([`${typeName}`])
+    setCurrentTags([`${plural}`])
     setBacklinkTo(preparedBacklink)
-    setBacklinkTitle(typeName)
+    setBacklinkTitle(plural)
 
     return () => {
       setCurrentTags(undefined)
@@ -49,7 +49,7 @@ export const TableBuiltinPage: FC<TTableBuiltinPageProps> = ({ inside }) => {
       setBacklinkTitle(undefined)
     }
   }, [
-    typeName,
+    plural,
     preparedBacklink,
     setSidebarSuffix,
     setBreadcrumbsSuffix,
@@ -69,13 +69,13 @@ export const TableBuiltinPage: FC<TTableBuiltinPageProps> = ({ inside }) => {
 
   return (
     <ContentCard flexGrow={1} displayFlex flexFlow="column">
-      {typeName && (
+      {plural && (
         <TableApiBuiltin
           resourceType="builtin"
           apiVersion="v1"
-          key={`${namespace}-${typeName}`}
+          key={`${namespace}-${plural}`}
           namespace={namespace}
-          typeName={typeName}
+          plural={plural}
           limit={limitSp && limitSp.length > 0 ? Number(limitSp) : undefined}
           inside={inside}
           customizationIdPrefix={tableCustomizationIdPrefix}
diff --git a/src/pages/Tables/TableCrdPage/TableCrdPage.tsx b/src/pages/Tables/TableCrdPage/TableCrdPage.tsx
index 1eddc08..5bab36a 100644
--- a/src/pages/Tables/TableCrdPage/TableCrdPage.tsx
+++ b/src/pages/Tables/TableCrdPage/TableCrdPage.tsx
@@ -14,14 +14,14 @@ type TTableCrdPageProps = {
 }
 
 export const TableCrdPage: FC<TTableCrdPageProps> = ({ inside }) => {
-  const { clusterName, namespace, syntheticProject, apiGroup, apiVersion, apiExtensionVersion, crdName } = useParams()
+  const { cluster, namespace, syntheticProject, apiGroup, apiVersion, apiExtensionVersion, crdName } = useParams()
   const baseprefix = useSelector((state: RootState) => state.baseprefix.baseprefix)
 
   const possibleProject = syntheticProject && namespace ? syntheticProject : namespace
   const possibleInstance = syntheticProject && namespace ? namespace : undefined
 
   const preparedBacklink = getTablesBackLink({
-    clusterName,
+    cluster,
     possibleProject,
     possibleInstance,
     namespace,
diff --git a/src/pages/Tables/index.ts b/src/pages/Tables/index.ts
index 842bb38..fa949a1 100644
--- a/src/pages/Tables/index.ts
+++ b/src/pages/Tables/index.ts
@@ -1,3 +1,2 @@
-// export { TableCrdPage } from './TableCrdPage'
 export { TableApiPage } from './TableApiPage'
 export { TableBuiltinPage } from './TableBuiltinPage'
diff --git a/src/store/theme/theme/theme.ts b/src/store/theme/theme/theme.ts
index f567799..2c4ee9c 100644
--- a/src/store/theme/theme/theme.ts
+++ b/src/store/theme/theme/theme.ts
@@ -21,5 +21,3 @@ export const themeSlice = createSlice({
 })
 
 export const { setTheme } = themeSlice.actions
-
-// export default themeSlice
diff --git a/src/templates/AppShell/AppShell.tsx b/src/templates/AppShell/AppShell.tsx
index c42f1a7..21d3cd0 100644
--- a/src/templates/AppShell/AppShell.tsx
+++ b/src/templates/AppShell/AppShell.tsx
@@ -1,4 +1,3 @@
-// AppShell.tsx
 import React, { FC, useState, useMemo } from 'react'
 import { Outlet, useParams } from 'react-router-dom'
 import { BaseTemplate } from 'templates'
diff --git a/src/templates/BaseTemplate/BaseTemplate.tsx b/src/templates/BaseTemplate/BaseTemplate.tsx
index aecf1cf..28ada8d 100644
--- a/src/templates/BaseTemplate/BaseTemplate.tsx
+++ b/src/templates/BaseTemplate/BaseTemplate.tsx
@@ -5,7 +5,6 @@ import type { RootState } from 'store/store'
 import { DefaultLayout, HeaderSecond, Footer, Sidebar, RowFlexGrow, FlexCol } from 'components'
 
 type TBaseTemplateProps = {
-  // withNoCluster?: boolean
   children?: ReactNode | undefined
   inside?: boolean
   isSearch?: boolean
diff --git a/src/templates/MainLayout/MainLayout.tsx b/src/templates/MainLayout/MainLayout.tsx
index e89ff53..12e3365 100644
--- a/src/templates/MainLayout/MainLayout.tsx
+++ b/src/templates/MainLayout/MainLayout.tsx
@@ -16,7 +16,7 @@ type TMainLayoutProps = {
 }
 
 export const MainLayout: FC<TMainLayoutProps> = ({ children, forcedTheme }) => {
-  const { clusterName } = useParams()
+  const { cluster } = useParams()
   const { useToken } = antdtheme
   const { token } = useToken()
   const dispatch = useDispatch()
@@ -66,17 +66,9 @@ export const MainLayout: FC<TMainLayoutProps> = ({ children, forcedTheme }) => {
     }
   }, [clusterListQuery, dispatch])
 
-  // if (clusterName) {
-  //   dispatch(setCluster(clusterName))
-  // }
-
-  // if (clusterName === undefined) {
-  //   dispatch(setCluster(''))
-  // }
-
   useEffect(() => {
-    dispatch(setCluster(clusterName ?? ''))
-  }, [dispatch, clusterName])
+    dispatch(setCluster(cluster ?? ''))
+  }, [dispatch, cluster])
 
   return (
     <DefaultColorProvider $color={token.colorText}>
diff --git a/src/utils/getBacklink.ts b/src/utils/getBacklink.ts
index a862354..7df34da 100644
--- a/src/utils/getBacklink.ts
+++ b/src/utils/getBacklink.ts
@@ -1,19 +1,19 @@
 import {
   BASE_INSTANCES_API_GROUP,
-  BASE_INSTANCES_VERSION,
-  BASE_INSTANCES_RESOURCE_NAME,
+  BASE_INSTANCES_API_VERSION,
+  BASE_INSTANCES_PLURAL,
 } from 'constants/customizationApiGroupAndVersion'
 
 export const getFormsBackLink = ({
   backLink,
-  clusterName,
+  cluster,
   possibleProject,
   possibleInstance,
   baseprefix,
   namespacesMode,
 }: {
   backLink?: string | null
-  clusterName?: string
+  cluster?: string
   possibleProject?: string
   possibleInstance?: string
   baseprefix?: string
@@ -24,22 +24,22 @@ export const getFormsBackLink = ({
   }
 
   if (possibleInstance) {
-    return `${baseprefix}/${clusterName}/${possibleInstance}/${possibleProject}/api-table/apps/v1/deployments`
+    return `${baseprefix}/${cluster}/${possibleInstance}/${possibleProject}/api-table/apps/v1/deployments`
   }
 
   if (namespacesMode) {
-    return `${baseprefix}/${clusterName}/builtin-table/namespaces`
+    return `${baseprefix}/${cluster}/builtin-table/namespaces`
   }
 
   if (possibleProject) {
-    return `${baseprefix}/clusters/${clusterName}/projects/${possibleProject}`
+    return `${baseprefix}/clusters/${cluster}/projects/${possibleProject}`
   }
 
   return `${baseprefix}/clusters`
 }
 
 export const getTablesBackLink = ({
-  clusterName,
+  cluster,
   possibleProject,
   possibleInstance,
   namespace,
@@ -47,7 +47,7 @@ export const getTablesBackLink = ({
   inside,
   namespacesMode,
 }: {
-  clusterName?: string
+  cluster?: string
   possibleProject?: string
   possibleInstance?: string
   namespace?: string
@@ -56,19 +56,19 @@ export const getTablesBackLink = ({
   namespacesMode?: boolean
 }): string => {
   if (inside) {
-    return `${baseprefix}/inside/${clusterName}${namespace ? `/${namespace}` : ''}/apis`
+    return `${baseprefix}/inside/${cluster}${namespace ? `/${namespace}` : ''}/apis`
   }
 
   if (possibleInstance) {
-    return `${baseprefix}/${clusterName}/${possibleProject}/api-table/${BASE_INSTANCES_API_GROUP}/${BASE_INSTANCES_VERSION}/${BASE_INSTANCES_RESOURCE_NAME}`
+    return `${baseprefix}/${cluster}/${possibleProject}/api-table/${BASE_INSTANCES_API_GROUP}/${BASE_INSTANCES_API_VERSION}/${BASE_INSTANCES_PLURAL}`
   }
 
   if (namespacesMode) {
-    return `${baseprefix}/${clusterName}/builtin-table/namespaces`
+    return `${baseprefix}/${cluster}/builtin-table/namespaces`
   }
 
   if (possibleProject) {
-    return `${baseprefix}/clusters/${clusterName}/projects/${possibleProject}`
+    return `${baseprefix}/clusters/${cluster}/projects/${possibleProject}`
   }
 
   return `${baseprefix}/clusters`

From efa03290425e00be935e7b828aa30bb42c0a2e5e Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Fri, 21 Nov 2025 11:00:42 +0300
Subject: [PATCH 28/32] sync naming

---
 .env              | 16 ++++-----
 .env.options.dist | 14 ++++----
 README.md         | 86 +++++++++++++++++++++++------------------------
 package-lock.json |  8 ++---
 package.json      |  2 +-
 server/index.ts   | 47 +++++++++++++-------------
 6 files changed, 87 insertions(+), 86 deletions(-)

diff --git a/.env b/.env
index c527b4f..96fb1a2 100644
--- a/.env
+++ b/.env
@@ -7,8 +7,8 @@ VITE_CUSTOM_TENANT_TEXT=
 VITE_CUSTOMIZATION_API_GROUP=incloud.io
 VITE_CUSTOMIZATION_API_VERSION=v1alpha
 
-VITE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME=navigations
-VITE_CUSTOMIZATION_NAVIGATION_RESOURCE=navigation
+VITE_CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL=navigations
+VITE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME=navigation
 
 VITE_CUSTOMIZATION_SIDEBAR_FALLBACK_ID = fallback
 
@@ -19,15 +19,15 @@ VITE_HIDE_INSIDE=false
 VITE_NAVIGATE_FROM_CLUSTERLIST=/openapi-ui/~recordValue~/builtin-table/namespaces
 
 VITE_PROJECTS_API_GROUP=incloud.io
-VITE_PROJECTS_VERSION=v1alpha
-VITE_PROJECTS_RESOURCE_NAME=projects
+VITE_PROJECTS_API_VERSION=v1alpha
+VITE_PROJECTS_PLURAL=projects
 
-VITE_MARKETPLACE_RESOURCE_NAME=marketplacepanels
+VITE_MARKETPLACE_PLURAL=marketplacepanels
 VITE_MARKETPLACE_KIND=MarketplacePanel
 
 VITE_INSTANCES_API_GROUP=incloud.io
-VITE_INSTANCES_VERSION=v1alpha1
-VITE_INSTANCES_RESOURCE_NAME=v1alpha1
+VITE_INSTANCES_API_VERSION=v1alpha1
+VITE_INSTANCES_PLURAL=v1alpha1
 
 VITE_BFF_URL=
 
@@ -52,4 +52,4 @@ VITE_BASE_NAMESPACE_FACTORY_KEY=base-factory-clusterscoped-builtin
 
 VITE_CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP=
 VITE_CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION=
-VITE_CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME=
+VITE_CUSTOM_NAMESPACE_API_RESOURCE_PLURAL=
diff --git a/.env.options.dist b/.env.options.dist
index 9039ae3..e1c871c 100644
--- a/.env.options.dist
+++ b/.env.options.dist
@@ -9,8 +9,8 @@ KUBE_API_URL=
 CUSTOMIZATION_API_GROUP=
 CUSTOMIZATION_API_VERSION=
 
+CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL=
 CUSTOMIZATION_NAVIGATION_RESOURCE_NAME=
-CUSTOMIZATION_NAVIGATION_RESOURCE=
 
 CUSTOMIZATION_SIDEBAR_FALLBACK_ID=
 
@@ -21,15 +21,15 @@ HIDE_INSIDE=
 NAVIGATE_FROM_CLUSTERLIST=
 
 PROJECTS_API_GROUP=
-PROJECTS_VERSION=
-PROJECTS_RESOURCE_NAME=
+PROJECTS_API_VERSION=
+PROJECTS_PLURAL=
 
-MARKETPLACE_RESOURCE_NAME=
+MARKETPLACE_PLURAL
 MARKETPLACE_KIND=
 
 INSTANCES_API_GROUP=
-INSTANCES_VERSION=
-INSTANCES_RESOURCE_NAME=
+INSTANCES_API_VERSION=
+INSTANCES_PLURAL=
 
 BFF_URL=
 
@@ -54,4 +54,4 @@ BASE_NAMESPACE_FACTORY_KEY=
 
 CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP=
 CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION=
-CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME=
+CUSTOM_NAMESPACE_API_RESOURCE_PLURAL=
diff --git a/README.md b/README.md
index 22342c1..7bde29c 100644
--- a/README.md
+++ b/README.md
@@ -9,46 +9,46 @@ Define interfaces in YAML; the app discovers CRDs, watches their objects, and bu
 
 This app can be configured through environment variables.
 
-| Variable                                      | Type      | Description                                                                             |
-| --------------------------------------------- | --------- | --------------------------------------------------------------------------------------- |
-| `BASEPREFIX`                                  | `string`  | Base URL for the app. `/openapi-ui`                                                     |
-| `KUBE_API_URL`                                | `string`  | URL for the Kubernetes API. `http://api.incloud-web.svc.default.in-cloud.internal:8081` |
-| `BFF_URL`                                     | `string`  | URL for the BFF                                                                         |
-| `TITLE_TEXT`                                  | `string`  | Page title                                                                              |
-| `LOGO_TEXT`                                   | `string`  | Logo text near icon                                                                     |
-| `ICON_SVG`                                    | `string`  | Favicon base64 encoded                                                                  |
-| `FOOTER_TEXT`                                 | `string`  | Footer text                                                                             |
-| `CUSTOM_LOGO_SVG`                             | `string`  | Base64 encoded svg                                                                      |
-| `CUSTOM_TENANT_TEXT`                          | `string`  | Custom tenant text override                                                             |
-| `LOGIN_URL`                                   | `string`  | Login endpoint. `/oauth/token`                                                          |
-| `LOGOUT_URL`                                  | `string`  | Logout endpoint. `/oauth/logout`                                                        |
-| `LOGIN_USERNAME_FIELD`                        | `string`  | Field from login endpoint response. `name`                                              |
-| `CUSTOMIZATION_API_GROUP`                     | `string`  | API group for customization resources. `front.in-cloud.io`                              |
-| `CUSTOMIZATION_API_VERSION`                   | `string`  | API version for customization resources. `v1alpha1`                                     |
-| `CUSTOMIZATION_NAVIGATION_RESOURCE_NAME`      | `string`  | Resource plural name for navigation settings. `navigations`                             |
-| `CUSTOMIZATION_NAVIGATION_RESOURCE`           | `string`  | Resource name for navigation settings. `navigation`                                     |
-| `CUSTOMIZATION_SIDEBAR_FALLBACK_ID`           | `string`  | `spec.id` to find in `sidebars` to fallback. Use `-namespaced` for NS-pages             |
-| `USE_NAMESPACE_NAV`                           | `boolean` | Use namespaces instead of project/instances. `true`                                     |
-| `HIDE_INSIDE`                                 | `boolean` | Use namespaces instead of project/instances. `true`                                     |
-| `NAVIGATE_FROM_CLUSTERLIST`                   | `string`  | Location to be navigated after selecting cluster. `/openapi-ui/clusters/~recordValue~`  |
-| `PROJECTS_API_GROUP`                          | `string`  | API group for projects resources. If not using namespace nav.                           |
-| `PROJECTS_VERSION`                            | `string`  | API version for projects resources. If not using namespace nav.                         |
-| `PROJECTS_RESOURCE_NAME`                      | `string`  | Plural name for projects resources. If not using namespace nav.                         |
-| `INSTANCES_API_GROUP`                         | `string`  | API group for instances resources. If not using namespace nav.                          |
-| `INSTANCES_VERSION`                           | `string`  | API version for instances resources. If not using namespace nav.                        |
-| `INSTANCES_RESOURCE_NAME`                     | `string`  | Plural name for instances resources. If not using namespace nav.                        |
-| `MARKETPLACE_RESOURCE_NAME`                   | `string`  | Plural name for marketplace resources for related factory component.                    |
-| `MARKETPLACE_KIND`                            | `string`  | Kind name for marketplace resources for related factory component.                      |
-| `NODE_TERMINAL_DEFAULT_PROFILE`               | `string`  | Default profile for node terminal component. `baseline`                                 |
-| `REMOVE_BACKLINK`                             | `boolean` | Remove backlink arrow from right-side navigation                                        |
-| `REMOVE_BACKLINK_TEXT`                        | `boolean` | Remove backlink text from right-side navigation                                         |
-| `DOCS_URL`                                    | `string`  | URL to navigate from question mark                                                      |
-| `SEARCH_TABLE_CUSTOMIZATION_PREFIX`           | `string`  | Search tables Customization id prefix                                                   |
-| `BASE_FACTORY_NAMESPACED_API_KEY`             | `string`  | Base factory key for namespaced API resources                                           |
-| `BASE_FACTORY_CLUSTERSCOPED_API_KEY`          | `string`  | Base factory key for clusterscoped API resources                                        |
-| `BASE_FACTORY_NAMESPACED_BUILTIN_KEY`         | `string`  | Base factory key for namespaced builtin (v1) resources                                  |
-| `BASE_FACTORY_CLUSTERSCOPED_BUILTIN_KEY`      | `string`  | Base factory key for clusterscoped builtin (v1) resources                               |
-| `BASE_NAMESPACE_FACTORY_KEY`                  | `string`  | Base factory key for namespaces                                                         |
-| `CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP`     | `string`  | Custom namespace resource: api group                                                    |
-| `CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION`   | `string`  | Custom namespace resource: api version                                                  |
-| `CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME` | `string`  | Custom namespace resource: resource name                                                |
+| Variable                                    | Type      | Description                                                                             |
+| ------------------------------------------- | --------- | --------------------------------------------------------------------------------------- |
+| `BASEPREFIX`                                | `string`  | Base URL for the app. `/openapi-ui`                                                     |
+| `KUBE_API_URL`                              | `string`  | URL for the Kubernetes API. `http://api.incloud-web.svc.default.in-cloud.internal:8081` |
+| `BFF_URL`                                   | `string`  | URL for the BFF                                                                         |
+| `TITLE_TEXT`                                | `string`  | Page title                                                                              |
+| `LOGO_TEXT`                                 | `string`  | Logo text near icon                                                                     |
+| `ICON_SVG`                                  | `string`  | Favicon base64 encoded                                                                  |
+| `FOOTER_TEXT`                               | `string`  | Footer text                                                                             |
+| `CUSTOM_LOGO_SVG`                           | `string`  | Base64 encoded svg                                                                      |
+| `CUSTOM_TENANT_TEXT`                        | `string`  | Custom tenant text override                                                             |
+| `LOGIN_URL`                                 | `string`  | Login endpoint. `/oauth/token`                                                          |
+| `LOGOUT_URL`                                | `string`  | Logout endpoint. `/oauth/logout`                                                        |
+| `LOGIN_USERNAME_FIELD`                      | `string`  | Field from login endpoint response. `name`                                              |
+| `CUSTOMIZATION_API_GROUP`                   | `string`  | API group for customization resources. `front.in-cloud.io`                              |
+| `CUSTOMIZATION_API_VERSION`                 | `string`  | API version for customization resources. `v1alpha1`                                     |
+| `CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL`  | `string`  | Resource plural name for navigation settings. `navigations`                             |
+| `CUSTOMIZATION_NAVIGATION_RESOURCE_NAME`    | `string`  | Resource name for navigation settings. `navigation`                                     |
+| `CUSTOMIZATION_SIDEBAR_FALLBACK_ID`         | `string`  | `spec.id` to find in `sidebars` to fallback. Use `-namespaced` for NS-pages             |
+| `USE_NAMESPACE_NAV`                         | `boolean` | Use namespaces instead of project/instances. `true`                                     |
+| `HIDE_INSIDE`                               | `boolean` | Use namespaces instead of project/instances. `true`                                     |
+| `NAVIGATE_FROM_CLUSTERLIST`                 | `string`  | Location to be navigated after selecting cluster. `/openapi-ui/clusters/~recordValue~`  |
+| `PROJECTS_API_GROUP`                        | `string`  | API group for projects resources. If not using namespace nav.                           |
+| `PROJECTS_API_VERSION`                      | `string`  | API version for projects resources. If not using namespace nav.                         |
+| `PROJECTS_PLURAL`                           | `string`  | Plural name for projects resources. If not using namespace nav.                         |
+| `INSTANCES_API_GROUP`                       | `string`  | API group for instances resources. If not using namespace nav.                          |
+| `INSTANCES_API_VERSION`                     | `string`  | API version for instances resources. If not using namespace nav.                        |
+| `INSTANCES_PLURAL`                          | `string`  | Plural name for instances resources. If not using namespace nav.                        |
+| `MARKETPLACE_PLURAL`                        | `string`  | Plural name for marketplace resources for related factory component.                    |
+| `MARKETPLACE_KIND`                          | `string`  | Kind name for marketplace resources for related factory component.                      |
+| `NODE_TERMINAL_DEFAULT_PROFILE`             | `string`  | Default profile for node terminal component. `baseline`                                 |
+| `REMOVE_BACKLINK`                           | `boolean` | Remove backlink arrow from right-side navigation                                        |
+| `REMOVE_BACKLINK_TEXT`                      | `boolean` | Remove backlink text from right-side navigation                                         |
+| `DOCS_URL`                                  | `string`  | URL to navigate from question mark                                                      |
+| `SEARCH_TABLE_CUSTOMIZATION_PREFIX`         | `string`  | Search tables Customization id prefix                                                   |
+| `BASE_FACTORY_NAMESPACED_API_KEY`           | `string`  | Base factory key for namespaced API resources                                           |
+| `BASE_FACTORY_CLUSTERSCOPED_API_KEY`        | `string`  | Base factory key for clusterscoped API resources                                        |
+| `BASE_FACTORY_NAMESPACED_BUILTIN_KEY`       | `string`  | Base factory key for namespaced builtin (v1) resources                                  |
+| `BASE_FACTORY_CLUSTERSCOPED_BUILTIN_KEY`    | `string`  | Base factory key for clusterscoped builtin (v1) resources                               |
+| `BASE_NAMESPACE_FACTORY_KEY`                | `string`  | Base factory key for namespaces                                                         |
+| `CUSTOM_NAMESPACE_API_RESOURCE_API_GROUP`   | `string`  | Custom namespace resource: api group                                                    |
+| `CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION` | `string`  | Custom namespace resource: api version                                                  |
+| `CUSTOM_NAMESPACE_API_RESOURCE_PLURAL`      | `string`  | Custom namespace resource: plural name                                                  |
diff --git a/package-lock.json b/package-lock.json
index b3ede1f..c7d4b8d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.13",
+        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.14",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2802,9 +2802,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "1.1.0-alpha.13",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.13.tgz",
-      "integrity": "sha512-qAa394TvcAziVbFEXQ7/xJcpvHIFu5p8ZIo7kdlLKBeR2Ln2CikyJYqVgPNOVhTfiJrkf/nmkd4Qs1fGKJpX6g==",
+      "version": "1.1.0-alpha.14",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.14.tgz",
+      "integrity": "sha512-9sIflaPQ3wNzwVGguRSZNgBe1ww4RUcvz848LnkhUi0Lhvb3rqx4azo4TgEEwVh+k780D+iifv0i1Ep35JJjJw==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index 3b1f6af..07ba880 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.13",
+    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.14",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",
diff --git a/server/index.ts b/server/index.ts
index 354369d..dc7abc9 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -29,14 +29,14 @@ const CUSTOMIZATION_API_GROUP =
 const CUSTOMIZATION_API_VERSION =
   process.env.LOCAL === 'true' ? options?.CUSTOMIZATION_API_VERSION : process.env.CUSTOMIZATION_API_VERSION
 
+const CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL =
+  process.env.LOCAL === 'true'
+    ? options?.CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL
+    : process.env.CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL
 const CUSTOMIZATION_NAVIGATION_RESOURCE_NAME =
   process.env.LOCAL === 'true'
     ? options?.CUSTOMIZATION_NAVIGATION_RESOURCE_NAME
     : process.env.CUSTOMIZATION_NAVIGATION_RESOURCE_NAME
-const CUSTOMIZATION_NAVIGATION_RESOURCE =
-  process.env.LOCAL === 'true'
-    ? options?.CUSTOMIZATION_NAVIGATION_RESOURCE
-    : process.env.CUSTOMIZATION_NAVIGATION_RESOURCE
 
 const CUSTOMIZATION_SIDEBAR_FALLBACK_ID =
   process.env.LOCAL === 'true'
@@ -50,19 +50,18 @@ const NAVIGATE_FROM_CLUSTERLIST =
   process.env.LOCAL === 'true' ? options?.NAVIGATE_FROM_CLUSTERLIST : process.env.NAVIGATE_FROM_CLUSTERLIST
 
 const PROJECTS_API_GROUP = process.env.LOCAL === 'true' ? options?.PROJECTS_API_GROUP : process.env.PROJECTS_API_GROUP
-const PROJECTS_VERSION = process.env.LOCAL === 'true' ? options?.PROJECTS_VERSION : process.env.PROJECTS_VERSION
-const PROJECTS_RESOURCE_NAME =
-  process.env.LOCAL === 'true' ? options?.PROJECTS_RESOURCE_NAME : process.env.PROJECTS_RESOURCE_NAME
+const PROJECTS_API_VERSION =
+  process.env.LOCAL === 'true' ? options?.PROJECTS_API_VERSION : process.env.PROJECTS_API_VERSION
+const PROJECTS_PLURAL = process.env.LOCAL === 'true' ? options?.PROJECTS_PLURAL : process.env.PROJECTS_PLURAL
 
-const MARKETPLACE_RESOURCE_NAME =
-  process.env.LOCAL === 'true' ? options?.MARKETPLACE_RESOURCE_NAME : process.env.MARKETPLACE_RESOURCE_NAME
+const MARKETPLACE_PLURAL = process.env.LOCAL === 'true' ? options?.MARKETPLACE_PLURAL : process.env.MARKETPLACE_PLURAL
 const MARKETPLACE_KIND = process.env.LOCAL === 'true' ? options?.MARKETPLACE_KIND : process.env.MARKETPLACE_KIND
 
 const INSTANCES_API_GROUP =
   process.env.LOCAL === 'true' ? options?.INSTANCES_API_GROUP : process.env.INSTANCES_API_GROUP
-const INSTANCES_VERSION = process.env.LOCAL === 'true' ? options?.INSTANCES_VERSION : process.env.INSTANCES_VERSION
-const INSTANCES_RESOURCE_NAME =
-  process.env.LOCAL === 'true' ? options?.INSTANCES_RESOURCE_NAME : process.env.INSTANCES_RESOURCE_NAME
+const INSTANCES_API_VERSION =
+  process.env.LOCAL === 'true' ? options?.INSTANCES_API_VERSION : process.env.INSTANCES_API_VERSION
+const INSTANCES_PLURAL = process.env.LOCAL === 'true' ? options?.INSTANCES_PLURAL : process.env.INSTANCES_PLURAL
 
 const BFF_URL = process.env.LOCAL === 'true' ? options?.BFF_URL : process.env.BFF_URL
 
@@ -110,10 +109,10 @@ const CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION =
   process.env.LOCAL === 'true'
     ? options?.CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION
     : process.env.CUSTOM_NAMESPACE_API_RESOURCE_API_VERSION
-const CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME =
+const CUSTOM_NAMESPACE_API_RESOURCE_PLURAL =
   process.env.LOCAL === 'true'
-    ? options?.CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME
-    : process.env.CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME
+    ? options?.CUSTOM_NAMESPACE_API_RESOURCE_PLURAL
+    : process.env.CUSTOM_NAMESPACE_API_RESOURCE_PLURAL
 
 const healthcheck = require('express-healthcheck')
 const promBundle = require('express-prom-bundle')
@@ -225,6 +224,9 @@ app.get(`${basePrefix ? basePrefix : ''}/env.js`, (_, res) => {
       ${CUSTOM_TENANT_TEXT ? `  CUSTOM_TENANT_TEXT: "${CUSTOM_TENANT_TEXT}",` : ''}
       CUSTOMIZATION_API_GROUP: ${JSON.stringify(CUSTOMIZATION_API_GROUP) || '"check envs"'},
       CUSTOMIZATION_API_VERSION: ${JSON.stringify(CUSTOMIZATION_API_VERSION) || '"check envs"'},
+      CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL: ${
+        JSON.stringify(CUSTOMIZATION_NAVIGATION_RESOURCE_PLURAL) || '"check envs"'
+      },
       CUSTOMIZATION_NAVIGATION_RESOURCE_NAME: ${
         JSON.stringify(CUSTOMIZATION_NAVIGATION_RESOURCE_NAME) || '"check envs"'
       },
@@ -239,23 +241,22 @@ app.get(`${basePrefix ? basePrefix : ''}/env.js`, (_, res) => {
           : ''
       }
       ${
-        CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME
-          ? `  CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME: "${CUSTOM_NAMESPACE_API_RESOURCE_RESOURCE_NAME}",`
+        CUSTOM_NAMESPACE_API_RESOURCE_PLURAL
+          ? `  CUSTOM_NAMESPACE_API_RESOURCE_PLURAL: "${CUSTOM_NAMESPACE_API_RESOURCE_PLURAL}",`
           : ''
       }
-      CUSTOMIZATION_NAVIGATION_RESOURCE: ${JSON.stringify(CUSTOMIZATION_NAVIGATION_RESOURCE) || '"check envs"'},
       CUSTOMIZATION_SIDEBAR_FALLBACK_ID: ${JSON.stringify(CUSTOMIZATION_SIDEBAR_FALLBACK_ID) || '"check envs"'},
       USE_NAMESPACE_NAV: ${USE_NAMESPACE_NAV ? JSON.stringify(USE_NAMESPACE_NAV).toLowerCase() : '"false"'},
       HIDE_INSIDE: ${HIDE_INSIDE ? JSON.stringify(HIDE_INSIDE).toLowerCase() : '"false"'},
       NAVIGATE_FROM_CLUSTERLIST: ${JSON.stringify(NAVIGATE_FROM_CLUSTERLIST) || '"check envs"'},
       PROJECTS_API_GROUP: ${JSON.stringify(PROJECTS_API_GROUP) || '"check envs"'},
-      PROJECTS_VERSION: ${JSON.stringify(PROJECTS_VERSION) || '"check envs"'},
-      PROJECTS_RESOURCE_NAME: ${JSON.stringify(PROJECTS_RESOURCE_NAME) || '"check envs"'},
-      MARKETPLACE_RESOURCE_NAME: ${JSON.stringify(MARKETPLACE_RESOURCE_NAME) || '"check envs"'},
+      PROJECTS_API_VERSION: ${JSON.stringify(PROJECTS_API_VERSION) || '"check envs"'},
+      PROJECTS_PLURAL: ${JSON.stringify(PROJECTS_PLURAL) || '"check envs"'},
+      MARKETPLACE_PLURAL: ${JSON.stringify(MARKETPLACE_PLURAL) || '"check envs"'},
       MARKETPLACE_KIND: ${JSON.stringify(MARKETPLACE_KIND) || '"check envs"'},
       INSTANCES_API_GROUP: ${JSON.stringify(INSTANCES_API_GROUP) || '"check envs"'},
-      INSTANCES_VERSION: ${JSON.stringify(INSTANCES_VERSION) || '"check envs"'},
-      INSTANCES_RESOURCE_NAME: ${JSON.stringify(INSTANCES_RESOURCE_NAME) || '"check envs"'},
+      INSTANCES_API_VERSION: ${JSON.stringify(INSTANCES_API_VERSION) || '"check envs"'},
+      INSTANCES_PLURAL: ${JSON.stringify(INSTANCES_PLURAL) || '"check envs"'},
       NODE_TERMINAL_DEFAULT_PROFILE: ${JSON.stringify(NODE_TERMINAL_DEFAULT_PROFILE) || '"general"'},
       LOGIN_URL: ${JSON.stringify(LOGIN_URL) || '"check envs"'},
       LOGOUT_URL: ${JSON.stringify(LOGOUT_URL) || '"check envs"'},

From d65dab4fabebea94dcf55aa580c6f81f79912098 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Fri, 21 Nov 2025 15:39:17 +0300
Subject: [PATCH 29/32] possible fix for polling fallback data update

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c7d4b8d..0cb631d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.14",
+        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.17",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2802,9 +2802,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "1.1.0-alpha.14",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.14.tgz",
-      "integrity": "sha512-9sIflaPQ3wNzwVGguRSZNgBe1ww4RUcvz848LnkhUi0Lhvb3rqx4azo4TgEEwVh+k780D+iifv0i1Ep35JJjJw==",
+      "version": "1.1.0-alpha.17",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.17.tgz",
+      "integrity": "sha512-K4OYwbfxWnB1BNzj5OntnOdaZncJes1o+dm+xequfm1lgtmwJfvcGcEVsgCKh5iS8Gd0KMqtJmZeXOwhPpEpiw==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index 07ba880..dd3730a 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.14",
+    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.17",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",

From 6577e3f9d564bafa62770f61006442eeffb3e204 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Sat, 22 Nov 2025 08:14:40 +0300
Subject: [PATCH 30/32] sync toolkit

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0cb631d..d296fa6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.17",
+        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.18",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2802,9 +2802,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "1.1.0-alpha.17",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.17.tgz",
-      "integrity": "sha512-K4OYwbfxWnB1BNzj5OntnOdaZncJes1o+dm+xequfm1lgtmwJfvcGcEVsgCKh5iS8Gd0KMqtJmZeXOwhPpEpiw==",
+      "version": "1.1.0-alpha.18",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.18.tgz",
+      "integrity": "sha512-dG22TUhCNqQ4qFBkhDw3rHoAWofSZni11Sdu0IVR4O4xs13y/ptfr7+zBiTZVlUJHwr3gwWZwJ1zQf2SG5qUyQ==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index dd3730a..ae39840 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.17",
+    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.18",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",

From 82ea21a917e8c7ddbec28e6b9ec279bc6934f133 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Sat, 22 Nov 2025 08:39:22 +0300
Subject: [PATCH 31/32] safer hook

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d296fa6..0c09f5d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.18",
+        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.19",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2802,9 +2802,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "1.1.0-alpha.18",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.18.tgz",
-      "integrity": "sha512-dG22TUhCNqQ4qFBkhDw3rHoAWofSZni11Sdu0IVR4O4xs13y/ptfr7+zBiTZVlUJHwr3gwWZwJ1zQf2SG5qUyQ==",
+      "version": "1.1.0-alpha.19",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.19.tgz",
+      "integrity": "sha512-wHvKr7zei7s2mde3tHl/nBzKrdP76JjP9sFmdNeAFkhZ6ukUHVpwS8enZIu9w1rSDy5EKJPm0c3J1XBboU23xQ==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index ae39840..ef59eab 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.18",
+    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.19",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",

From cccd2b4772e1f4e978f06b757cc4cf4b367ac0af Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Sat, 22 Nov 2025 08:46:41 +0300
Subject: [PATCH 32/32] safer hook

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0c09f5d..b1a44eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@ant-design/icons": "5.6.0",
         "@monaco-editor/react": "4.6.0",
         "@originjs/vite-plugin-federation": "1.3.6",
-        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.19",
+        "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.20",
         "@readme/openapi-parser": "4.0.0",
         "@reduxjs/toolkit": "2.2.5",
         "@tanstack/react-query": "5.62.2",
@@ -2802,9 +2802,9 @@
       }
     },
     "node_modules/@prorobotech/openapi-k8s-toolkit": {
-      "version": "1.1.0-alpha.19",
-      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.19.tgz",
-      "integrity": "sha512-wHvKr7zei7s2mde3tHl/nBzKrdP76JjP9sFmdNeAFkhZ6ukUHVpwS8enZIu9w1rSDy5EKJPm0c3J1XBboU23xQ==",
+      "version": "1.1.0-alpha.20",
+      "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.20.tgz",
+      "integrity": "sha512-jptUG4OV2SLTgt3Z3rBUf2GNOGgS4QCTxOcrrkoreC0wyCkubTcI7+rflc29B2OOGcEi/2F6GCVf/H4qimgDnA==",
       "license": "MIT",
       "dependencies": {
         "@monaco-editor/react": "4.6.0",
diff --git a/package.json b/package.json
index ef59eab..89c514d 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@ant-design/icons": "5.6.0",
     "@monaco-editor/react": "4.6.0",
     "@originjs/vite-plugin-federation": "1.3.6",
-    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.19",
+    "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.20",
     "@readme/openapi-parser": "4.0.0",
     "@reduxjs/toolkit": "2.2.5",
     "@tanstack/react-query": "5.62.2",