fix: variable name and pr comments

Author: ritvikmahajan17

.env

@@ -37,4 +37,4 @@ DEFAULT_CI_TRIGGER_TYPE_MANUAL=false
 ANNOUNCEMENT_BANNER_MSG=
 LOGIN_PAGE_IMAGE=
 LOGIN_PAGE_IMAGE_BG=
-SHOW_DEFAULT_CLUSTER=false
+HIDE_DEFAULT_CLUSTER=false

src/components/ClusterNodes/ClusterSelectionList.tsx

@@ -14,6 +14,7 @@ import { ClusterSelectionType } from '../ResourceBrowser/Types'
 import { AppDetailsTabs } from '../v2/appDetails/appDetails.store'
 import { K8S_EMPTY_GROUP } from '../ResourceBrowser/Constants'
 import './clusterNodes.scss'
+import { DEFAULT_CLUSTER_ID } from '../cluster/cluster.type'
 
 export default function ClusterSelectionList({
     clusterOptions,
@@ -35,6 +36,9 @@ export default function ClusterSelectionList({
     const [searchApplied, setSearchApplied] = useState(false)
 
     useEffect(() => {
+        if (window._env_.HIDE_DEFAULT_CLUSTER) {
+            clusterOptions = clusterOptions.filter((item) => item.id !== DEFAULT_CLUSTER_ID)
+        }
         setClusterList([])
         setFilteredClusterList([])
         setLastDataSync(!lastDataSync)
@@ -121,7 +125,6 @@ export default function ClusterSelectionList({
 
     const renderClusterRow = (clusterData: ClusterDetail): JSX.Element => {
         const errorCount = clusterData.nodeErrors ? Object.keys(clusterData.nodeErrors).length : 0
-        if (!window._env_.SHOW_DEFAULT_CLUSTER && clusterData.name === 'default_cluster') return <></>
         return (
             <div
                 key={`cluster-${clusterData.id}`}

src/components/ResourceBrowser/ResourceList/ClusterSelector.tsx

@@ -10,6 +10,7 @@ import {
     SIDEBAR_KEYS,
 } from '../Constants'
 import { ClusterOptionType } from '../Types'
+import { DEFAULT_CLUSTER_ID } from '../../cluster/cluster.type'
 
 interface ClusterSelectorType {
     onChange: ({ label, value }) => void
@@ -18,8 +19,8 @@ interface ClusterSelectorType {
 }
 
 export default function ClusterSelector({ onChange, clusterList, clusterId }: ClusterSelectorType) {
-    if (!window._env_.SHOW_DEFAULT_CLUSTER) {
-        clusterList = clusterList.filter((item) => item.label !== 'default_cluster')
+    if (window._env_.HIDE_DEFAULT_CLUSTER) {
+        clusterList = clusterList.filter((item) => Number(item.value) !== DEFAULT_CLUSTER_ID)
     }
     const defaultOption = clusterList.find((item) => item.value == clusterId)
 

src/components/ResourceBrowser/ResourceList/ResourceList.tsx

@@ -73,6 +73,7 @@ import ClusterTerminal from '../../ClusterNodes/ClusterTerminal'
 import { createTaintsList } from '../../cluster/cluster.util'
 import NodeDetailsList from '../../ClusterNodes/NodeDetailsList'
 import NodeDetails from '../../ClusterNodes/NodeDetails'
+import { DEFAULT_CLUSTER_ID } from '../../cluster/cluster.type'
 
 export default function ResourceList() {
     const { clusterId, namespace, nodeType, node, group } = useParams<{
@@ -687,7 +688,7 @@ export default function ResourceList() {
         setSelectedCluster(selected)
         getNamespaceList(selected.value)
 
-        if (selected.value === 1 && !window._env_.SHOW_DEFAULT_CLUSTER) {
+        if (selected.value === DEFAULT_CLUSTER_ID && window._env_.HIDE_DEFAULT_CLUSTER) {
             replace({
                 pathname: URLS.RESOURCE_BROWSER,
             })

src/index.tsx

@@ -47,7 +47,7 @@ interface customEnv {
     ANNOUNCEMENT_BANNER_MSG?: string
     LOGIN_PAGE_IMAGE?: string
     LOGIN_PAGE_IMAGE_BG?: string
-    SHOW_DEFAULT_CLUSTER?: boolean
+    HIDE_DEFAULT_CLUSTER?: boolean
 }
 declare global {
     interface Window {
@@ -149,7 +149,7 @@ if (!window || !window._env_) {
         ANNOUNCEMENT_BANNER_MSG: '',
         LOGIN_PAGE_IMAGE: '',
         LOGIN_PAGE_IMAGE_BG: '',
-        SHOW_DEFAULT_CLUSTER: false,
+        HIDE_DEFAULT_CLUSTER: false,
     }
 }