Merge branch 'main' of github.com:devtron-labs/dashboard into feat/catalog-framework

Author: eshankvaish

.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/components/charts/list/ChartListPopUp.tsx

@@ -1,4 +1,4 @@
-import React, { useContext, useState } from 'react'
+import React, { useState } from 'react'
 import { ChartListPopUpType } from '../charts.types'
 import {
     showError,
@@ -16,15 +16,14 @@ import { toast } from 'react-toastify'
 import { EMPTY_STATE_STATUS, TOAST_INFO } from '../../../config/constantMessaging'
 import { reSyncChartRepo } from '../../chartRepo/chartRepo.service'
 import { ReactComponent as Help } from '../../../assets/icons/ic-help.svg'
-import { NavLink, useHistory } from 'react-router-dom'
-import { SERVER_MODE, URLS } from '../../../config'
+import { NavLink } from 'react-router-dom'
+import { URLS } from '../../../config'
 import { ReactComponent as Add } from '../../../assets/icons/ic-add.svg'
 import EmptyFolder from '../../../assets/img/Empty-folder.png'
 import NoResults from '../../../assets/img/[email protected]'
 import AddChartSource from './AddChartSource'
 import ChartListPopUpRow from './ChartListPopUpRow'
 import { ReactComponent as SyncIcon } from '../../../assets/icons/ic-arrows_clockwise.svg'
-import { mainContext } from '../../common/navigation/NavigationRoutes'
 
 function ChartListPopUp({
     onClose,
@@ -34,13 +33,11 @@ function ChartListPopUp({
     setFilteredChartList,
     setShowSourcePopoUp,
 }: ChartListPopUpType) {
-    const { serverMode } = useContext(mainContext)
     const [searchApplied, setSearchApplied] = useState<boolean>(false)
     const [searchText, setSearchText] = useState<string>('')
     const [fetching, setFetching] = useState<boolean>(false)
     const [showAddPopUp, setShowAddPopUp] = useState<boolean>(false)
     const isEmpty = chartList.length && !filteredChartList.length
-    const history = useHistory()
 
     const setStore = (event): void => {
         setSearchText(event.target.value)
@@ -60,20 +57,12 @@ function ChartListPopUp({
         setShowAddPopUp(!showAddPopUp)
     }
 
-    const onClickAddSource = (e) => {
-        if (serverMode === SERVER_MODE.EA_ONLY) {
-            history.push(URLS.GLOBAL_CONFIG_CHART)
-        } else {
-            toggleAddPopUp(e)
-        }
-    }
-
     const renderChartListHeaders = () => {
         return (
             <div className="pt-12 pb-12 pl-16 flex dc__content-space dc__border-bottom fw-6">
                 <span>Helm chart sources</span>
                 <div className="flex">
-                    <div className="flex cb-5 fw-6 cursor mr-12" onClick={onClickAddSource}>
+                    <div className="flex cb-5 fw-6 cursor mr-12" onClick={toggleAddPopUp}>
                         <Add className="icon-dim-20 fcb-5 mr-8" />
                         Add
                     </div>

src/components/common/Accordian/Accordian.tsx

@@ -1,33 +1,20 @@
-import React, { useContext, useState } from 'react'
+import React, { useState } from 'react'
 import { ReactComponent as Dropdown } from '../../../assets/icons/ic-chevron-down.svg'
 import { CHECKBOX_VALUE, Checkbox } from '@devtron-labs/devtron-fe-common-lib'
 import { ReactComponent as AddIcon } from '../../../assets/icons/ic-add.svg'
 import AddChartSource from '../../charts/list/AddChartSource'
-import { mainContext } from '../../common/navigation/NavigationRoutes'
-import { SERVER_MODE, URLS } from '../../../config'
-import { useHistory } from 'react-router-dom'
 
 export function Accordian({ header, options, value, onChange, onClickViewChartButton,dataTestId }) {
-    const { serverMode } = useContext(mainContext)
     const [collapsed, setCollapse] = useState<boolean>(true)
     const [showAddSource, toggleAddSource] = useState<boolean>(false)
     const toggleDropdown = (): void => {
         setCollapse(!collapsed)
     }
-    const history = useHistory()
 
     const handleTogleAddSource = () => {
         toggleAddSource(!showAddSource)
     }
 
-    const onClickAddSource = (e) => {
-        if (serverMode === SERVER_MODE.EA_ONLY) {
-            history.push(URLS.GLOBAL_CONFIG_CHART)
-        } else {
-            handleTogleAddSource()
-        }
-    }
-
     return (
         <div>
             <div
@@ -47,7 +34,7 @@ export function Accordian({ header, options, value, onChange, onClickViewChartBu
                     <button
                         type="button"
                         className="dc__position-rel dc__transparent dc__hover-n50 cursor flex left cb-5 fs-13 fw-6 lh-20 h-32 pl-10 w-100"
-                        onClick={onClickAddSource}
+                        onClick={handleTogleAddSource}
                     >
                         <AddIcon className="icon-dim-16 fcb-5 mr-8" />
                         Add chart source

src/components/deploymentConfig/DeploymentTemplateView/DeploymentTemplateEditorView.tsx

@@ -339,7 +339,7 @@ export default function DeploymentTemplateEditorView({
                 <div className="code-editor__header flex left w-100 p-0-imp">
                     <div className="flex left fs-12 fw-6 cn-9 dc__border-right h-32 pl-12 pr-12">
                         <span className="fw-n" style={{ width: '85px' }}>
-                            Compare with:{' '}
+                            Compare with:
                         </span>
                         <CompareWithDropdown
                             envId={envId}