From 92414d789699f826ba341135316db02acf196354 Mon Sep 17 00:00:00 2001
From: typescreep <typescreep@prorobotech.ru>
Date: Mon, 1 Sep 2025 17:51:52 +0300
Subject: [PATCH] cluster/tenant recognition fix + using base nav for cluster
 from env

---
 .../organisms/SelectorCluster/SelectorCluster.tsx             | 4 +++-
 src/templates/BaseTemplate/BaseTemplate.tsx                   | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/organisms/HeaderSecond/organisms/SelectorCluster/SelectorCluster.tsx b/src/components/organisms/HeaderSecond/organisms/SelectorCluster/SelectorCluster.tsx
index c48a769..e090ebf 100644
--- a/src/components/organisms/HeaderSecond/organisms/SelectorCluster/SelectorCluster.tsx
+++ b/src/components/organisms/HeaderSecond/organisms/SelectorCluster/SelectorCluster.tsx
@@ -6,6 +6,7 @@ import { RootState } from 'store/store'
 import { useNavSelectorClusters } from 'hooks/useNavSelectorClusters'
 import { useMountEffect } from 'hooks/useMountEffect'
 import { EntrySelect } from 'components/atoms'
+import { BASE_NAVIGATE_FROM_CLUSTERLIST } from 'constants/customizationApiGroupAndVersion'
 
 type TSelectorClusterProps = {
   clusterName?: string
@@ -22,7 +23,8 @@ export const SelectorCluster: FC<TSelectorClusterProps> = ({ clusterName }) => {
   const handleClusterChange = (value?: string) => {
     if (value) {
       setSelectedClusterName(value)
-      navigate(`${baseprefix}/clusters/${value}`)
+      // navigate(`${baseprefix}/clusters/${value}`)
+      navigate(BASE_NAVIGATE_FROM_CLUSTERLIST.replace('~recordValue~', value))
     } else {
       navigate(`${baseprefix}/clusters/`)
     }
diff --git a/src/templates/BaseTemplate/BaseTemplate.tsx b/src/templates/BaseTemplate/BaseTemplate.tsx
index b79fe7e..2a54484 100644
--- a/src/templates/BaseTemplate/BaseTemplate.tsx
+++ b/src/templates/BaseTemplate/BaseTemplate.tsx
@@ -85,6 +85,10 @@ export const BaseTemplate: FC<TBaseTemplateProps> = ({ children, withNoCluster,
     dispatch(setCluster(clusterName))
   }
 
+  if (clusterName === undefined) {
+    dispatch(setCluster(''))
+  }
+
   if (!clusterName && !withNoCluster) {
     navigate(`${baseprefix}/`)
   }