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

Author: AbhishekA1509

.env

@@ -69,4 +69,4 @@ FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false
 GATEKEEPER_URL=https://license.devtron.ai/dashboard
 FEATURE_AI_INTEGRATION_ENABLE=false
 LOGIN_PAGE_IMAGE=
-FEATURE_REDFISH_NODE_ENABLE=false
+FEATURE_REDFISH_NODE_ENABLE=false

src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/Sidebar.tsx

@@ -16,7 +16,7 @@
 
 import { generatePath, NavLink, useParams, useRouteMatch } from 'react-router-dom'
 
-import { Icon, IconName, ModalSidebarPanel } from '@devtron-labs/devtron-fe-common-lib'
+import { Icon, IconName, ModalSidebarPanel, SERVER_MODE, useMainContext } from '@devtron-labs/devtron-fe-common-lib'
 
 import { importComponentFromFELibrary } from '@Components/common'
 
@@ -27,47 +27,53 @@ const isFELibAvailable = importComponentFromFELibrary('isFELibAvailable', null,
 
 const Sidebar = () => {
     const { path } = useRouteMatch()
+    const { serverMode } = useMainContext()
     const { type } = useParams<CreateClusterParams>()
 
     const selectedSidebarElement = SIDEBAR_CONFIG[type]
 
     return (
         <div className="w-250 p-20 flexbox-col dc__gap-24 dc__no-shrink dc__overflow-auto">
             <div className="flexbox-col">
-                {Object.entries(SIDEBAR_CONFIG).map(([key, { title, iconName, isEnterprise, dataTestId }]) => {
-                    const isSelected = type.toLowerCase() === key.toLowerCase()
+                {Object.entries(SIDEBAR_CONFIG).map(
+                    ([key, { title, iconName, isEnterprise, dataTestId, hideInEAMode }]) => {
+                        if (hideInEAMode && serverMode === SERVER_MODE.EA_ONLY) {
+                            return null
+                        }
+                        const isSelected = type.toLowerCase() === key.toLowerCase()
 
-                    return (
-                        <NavLink
-                            data-testid={dataTestId}
-                            key={key}
-                            className={`dc__transparent flex left dc__gap-8 py-6 px-8 br-4 ${isSelected ? 'bcb-1' : 'dc__hover-n50'}`}
-                            to={generatePath(path, { type: key })}
-                        >
-                            <span className="dc__fill-available-space dc__no-shrink icon-dim-16">
-                                <Icon name={iconName as IconName} color={isSelected ? 'B500' : 'N600'} />
-                            </span>
-
-                            <span
-                                className={`fs-13 lh-20 dc__truncate flex-grow-1 ${isSelected ? 'cb-5 fw-6' : 'cn-9'}`}
+                        return (
+                            <NavLink
+                                data-testid={dataTestId}
+                                key={key}
+                                className={`dc__transparent flex left dc__gap-8 py-6 px-8 br-4 ${isSelected ? 'bcb-1' : 'dc__hover-n50'}`}
+                                to={generatePath(path, { type: key })}
                             >
-                                {title}
-                            </span>
+                                <span className="dc__fill-available-space dc__no-shrink icon-dim-16">
+                                    <Icon name={iconName as IconName} color={isSelected ? 'B500' : 'N600'} />
+                                </span>
+
+                                <span
+                                    className={`fs-13 lh-20 dc__truncate flex-grow-1 ${isSelected ? 'cb-5 fw-6' : 'cn-9'}`}
+                                >
+                                    {title}
+                                </span>
 
-                            {isEnterprise && !isFELibAvailable && (
-                                <Icon
-                                    name="ic-enterprise-feat"
-                                    color="Y700"
-                                    tooltipProps={{
-                                        content: 'This is an enterprise only feature',
-                                        placement: 'right',
-                                        alwaysShowTippyOnHover: true,
-                                    }}
-                                />
-                            )}
-                        </NavLink>
-                    )
-                })}
+                                {isEnterprise && !isFELibAvailable && (
+                                    <Icon
+                                        name="ic-enterprise-feat"
+                                        color="Y700"
+                                        tooltipProps={{
+                                            content: 'This is an enterprise only feature',
+                                            placement: 'right',
+                                            alwaysShowTippyOnHover: true,
+                                        }}
+                                    />
+                                )}
+                            </NavLink>
+                        )
+                    },
+                )}
             </div>
 
             <div className="divider__secondary--horizontal" />

src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/constants.tsx

@@ -44,5 +44,6 @@ export const SIDEBAR_CONFIG: SidebarConfigType = {
             </>
         ),
         isEnterprise: true,
+        hideInEAMode: true,
     },
 } as const

src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/types.ts

@@ -15,6 +15,7 @@ export type SidebarConfigType = Record<
         dataTestId: string
         documentationHeader?: string
         isEnterprise?: true
+        hideInEAMode?: true
     }
 >
 

src/components/v2/values/chartValuesDiff/ChartValuesView.tsx

@@ -160,7 +160,7 @@ const ChartValuesView = ({
         presetValueId: string
         envId: string
     }>()
-    const { serverMode, isManifestScanningEnabled } = useMainContext()
+    const { serverMode } = useMainContext()
     const { handleDownload } = useDownload()
     const chartValuesAbortRef = useRef<AbortController>(new AbortController())
     const [chartValuesList, setChartValuesList] = useState<ChartValuesType[]>(chartValuesListFromParent || [])
@@ -1810,7 +1810,7 @@ const ChartValuesView = ({
                             )}
                         </div>
                         {!isExternalApp &&
-                            isManifestScanningEnabled &&
+                            serverMode === SERVER_MODE.FULL &&
                             (isDeployChartView || isUpdateAppView) &&
                             ToggleSecurityScan && (
                                 <ToggleSecurityScan