Merge pull request #1497 from devtron-labs/feat/cm-based-default-cluster-show

feat: cm based show/hide default_cluster

Author: ritvikmahajan17

.env

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

src/components/ClusterNodes/ClusterSelectionList.tsx

@@ -14,14 +14,15 @@ 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,
     onChangeCluster,
     isSuperAdmin,
     clusterListLoader,
     refreshData,
-    initTabsBasedOnRole
+    initTabsBasedOnRole,
 }: ClusterSelectionType) {
     const location = useLocation()
     const history = useHistory()
@@ -35,11 +36,15 @@ export default function ClusterSelectionList({
     const [searchApplied, setSearchApplied] = useState(false)
 
     useEffect(() => {
+        let filteredClusterOptions = clusterOptions
+        if (window._env_.HIDE_DEFAULT_CLUSTER) {
+            filteredClusterOptions = clusterOptions.filter((item) => item.id !== DEFAULT_CLUSTER_ID)
+        }
         setClusterList([])
         setFilteredClusterList([])
         setLastDataSync(!lastDataSync)
-        setClusterList(clusterOptions)
-        setFilteredClusterList(clusterOptions)
+        setClusterList(filteredClusterOptions)
+        setFilteredClusterList(filteredClusterOptions)
         setMinLoader(false)
     }, [clusterOptions])
 

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,12 +19,16 @@ interface ClusterSelectorType {
 }
 
 export default function ClusterSelector({ onChange, clusterList, clusterId }: ClusterSelectorType) {
-    const defaultOption = clusterList.find((item) => item.value == clusterId)
+    let filteredClusterList = clusterList
+    if (window._env_.HIDE_DEFAULT_CLUSTER) {
+        filteredClusterList = clusterList.filter((item) => Number(item.value) !== DEFAULT_CLUSTER_ID)
+    }
+    const defaultOption = filteredClusterList.find((item) => item.value == clusterId)
 
     return (
         <ReactSelect
             classNamePrefix="cluster-select-header"
-            options={clusterList}
+            options={filteredClusterList}
             onChange={onChange}
             components={{
                 IndicatorSeparator: null,

src/components/ResourceBrowser/ResourceList/ResourceList.tsx

@@ -63,20 +63,9 @@ import {
     sortEventListData,
 } from '../Utils'
 import '../ResourceBrowser.scss'
-import {
-    ClusterCapacityType,
-    ClusterDetail,
-    ClusterErrorType,
-    ClusterImageList,
-    ERROR_TYPE,
-} from '../../ClusterNodes/types'
+import { ClusterCapacityType, ClusterDetail, ClusterImageList } from '../../ClusterNodes/types'
 import { getHostURLConfiguration } from '../../../services/service'
-import {
-    clusterNamespaceList,
-    getClusterCapacity,
-    getClusterList,
-    getClusterListMin,
-} from '../../ClusterNodes/clusterNodes.service'
+import { clusterNamespaceList, getClusterList, getClusterListMin } from '../../ClusterNodes/clusterNodes.service'
 import ClusterSelectionList from '../../ClusterNodes/ClusterSelectionList'
 import ClusterSelector from './ClusterSelector'
 import ClusterOverview from '../../ClusterNodes/ClusterOverview'
@@ -85,6 +74,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<{
@@ -699,6 +689,12 @@ export default function ResourceList() {
         setSelectedCluster(selected)
         getNamespaceList(selected.value)
 
+        if (selected.value === DEFAULT_CLUSTER_ID && window._env_.HIDE_DEFAULT_CLUSTER) {
+            replace({
+                pathname: URLS.RESOURCE_BROWSER,
+            })
+            return
+        }
         if (!skipRedirection) {
             const path = `${URLS.RESOURCE_BROWSER}/${selected.value}/${
                 ALL_NAMESPACE_OPTION.value

src/index.tsx

@@ -47,6 +47,7 @@ interface customEnv {
     ANNOUNCEMENT_BANNER_MSG?: string
     LOGIN_PAGE_IMAGE?: string
     LOGIN_PAGE_IMAGE_BG?: string
+    HIDE_DEFAULT_CLUSTER?: boolean
 }
 declare global {
     interface Window {
@@ -58,11 +59,7 @@ declare global {
 }
 
 const root = document.getElementById('root')
-if (
-    process.env.NODE_ENV === 'production' &&
-    window._env_ &&
-    (window._env_.SENTRY_ERROR_ENABLED)
-) {
+if (process.env.NODE_ENV === 'production' && window._env_ && window._env_.SENTRY_ERROR_ENABLED) {
     const integrationArr = []
     integrationArr.push(new CaptureConsole({ levels: ['error'] }))
     if (window._env_.SENTRY_PERFORMANCE_ENABLED) {
@@ -145,13 +142,14 @@ if (!window || !window._env_) {
         ENABLE_CHART_SEARCH_IN_HELM_DEPLOY: false,
         HIDE_EXCLUDE_INCLUDE_GIT_COMMITS: true,
         ENABLE_BUILD_CONTEXT: false,
-        CLAIR_TOOL_VERSION:'V4',
+        CLAIR_TOOL_VERSION: 'V4',
         ENABLE_RESTART_WORKLOAD: false,
         ENABLE_SCOPED_VARIABLES: false,
         DEFAULT_CI_TRIGGER_TYPE_MANUAL: false,
         ANNOUNCEMENT_BANNER_MSG: '',
         LOGIN_PAGE_IMAGE: '',
-        LOGIN_PAGE_IMAGE_BG: ''
+        LOGIN_PAGE_IMAGE_BG: '',
+        HIDE_DEFAULT_CLUSTER: false,
     }
 }