Merge branch 'develop' of github.com:devtron-labs/dashboard into feat/revamp-edit-taints-modal

RohitRaj011 · RohitRaj011 · commit b336f7453c92 · 2025-05-26T18:35:41.000+05:30
diff --git a/.env b/.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
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.14.0-pre-0",
+        "@devtron-labs/devtron-fe-common-lib": "1.14.1-pre-2",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
diff --git a/src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/Sidebar.tsx b/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" />
diff --git a/src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/constants.tsx b/src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/constants.tsx
@@ -44,5 +44,6 @@ export const SIDEBAR_CONFIG: SidebarConfigType = {
             </>
         ),
         isEnterprise: true,
+        hideInEAMode: true,
     },
 } as const
diff --git a/src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/types.ts b/src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/types.ts
@@ -15,6 +15,7 @@ export type SidebarConfigType = Record<
         dataTestId: string
         documentationHeader?: string
         isEnterprise?: true
+        hideInEAMode?: true
     }
 >
 
diff --git a/src/assets/icons/ic-dot.svg b/src/assets/icons/ic-dot.svg
@@ -14,8 +14,6 @@
   - limitations under the License.
   -->
 
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <g fill="none" fill-rule="evenodd">
-        <path fill="#999" fill-rule="nonzero" d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/>
-    </g>
-</svg>
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="7.5" cy="7.5" r="6" fill="#3385D6" stroke="white" stroke-width="3"/>
+</svg>
diff --git a/src/assets/icons/ic-more-vertical.svg b/src/assets/icons/ic-more-vertical.svg
@@ -0,0 +1,21 @@
+<!--
+  - Copyright (c) 2024. Devtron Inc.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+  -->
+
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <g fill="none" fill-rule="evenodd">
+        <path fill="#999" fill-rule="nonzero" d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/>
+    </g>
+</svg>
diff --git a/src/components/CIPipelineN/TaskList.tsx b/src/components/CIPipelineN/TaskList.tsx
@@ -32,7 +32,7 @@ import { importComponentFromFELibrary } from '@Components/common'
 import TaskTitle from './TaskTitle'
 import { ReactComponent as Add } from '../../assets/icons/ic-add.svg'
 import { ReactComponent as Drag } from '../../assets/icons/drag.svg'
-import { ReactComponent as Dots } from '@Icons/ic-dot.svg'
+import { ReactComponent as Dots } from '@Icons/ic-more-vertical.svg'
 import { ReactComponent as Trash } from '../../assets/icons/ic-delete-interactive.svg'
 import { ReactComponent as AlertTriangle } from '../../assets/icons/ic-alert-triangle.svg'
 import { ReactComponent as MoveToPre } from '../../assets/icons/ic-arrow-backward.svg'
diff --git a/src/components/ResourceBrowser/ResourceList/ClusterSelector.tsx b/src/components/ResourceBrowser/ResourceList/ClusterSelector.tsx
@@ -27,7 +27,7 @@ import {
     ValueContainerWithLoadingShimmer,
 } from '@devtron-labs/devtron-fe-common-lib'
 
-import { ReactComponent as MenuDots } from '@Icons/ic-dot.svg'
+import { ReactComponent as MenuDots } from '@Icons/ic-more-vertical.svg'
 import DeleteClusterConfirmationModal from '@Components/cluster/DeleteClusterConfirmationModal'
 
 import { URLS } from '../../../config'
diff --git a/src/components/ResourceBrowser/ResourceList/NodeActionsMenu.tsx b/src/components/ResourceBrowser/ResourceList/NodeActionsMenu.tsx
@@ -19,7 +19,7 @@ import { useHistory, useLocation, useRouteMatch } from 'react-router-dom'
 
 import { noop, PopupMenu } from '@devtron-labs/devtron-fe-common-lib'
 
-import { ReactComponent as MenuDots } from '@Icons/ic-dot.svg'
+import { ReactComponent as MenuDots } from '@Icons/ic-more-vertical.svg'
 import { ReactComponent as UncordonIcon } from '@Icons/ic-play-outline.svg'
 import { TaintType } from '@Components/ClusterNodes/types'
 import { AppDetailsTabs } from '@Components/v2/appDetails/appDetails.store'
diff --git a/src/components/ResourceBrowser/ResourceList/ResourceBrowserActionMenu.tsx b/src/components/ResourceBrowser/ResourceList/ResourceBrowserActionMenu.tsx
@@ -28,7 +28,7 @@ import {
     useMainContext,
 } from '@devtron-labs/devtron-fe-common-lib'
 
-import { ReactComponent as MenuDots } from '@Icons/ic-dot.svg'
+import { ReactComponent as MenuDots } from '@Icons/ic-more-vertical.svg'
 
 import { ReactComponent as CalendarIcon } from '../../../assets/icons/ic-calendar.svg'
 import { ReactComponent as DeleteIcon } from '../../../assets/icons/ic-delete-interactive.svg'
diff --git a/src/components/charts/discoverChartDetail/ChartDeploymentList.tsx b/src/components/charts/discoverChartDetail/ChartDeploymentList.tsx
@@ -36,7 +36,7 @@ import { Td } from '../../common'
 import { Routes, URLS, ViewType, SERVER_MODE, DELETE_ACTION } from '../../../config'
 import { deleteInstalledChart } from '../charts.service'
 import AppNotDeployedIcon from '../../../assets/img/app-not-configured.png'
-import { ReactComponent as Dots } from '@Icons/ic-dot.svg'
+import { ReactComponent as Dots } from '@Icons/ic-more-vertical.svg'
 import trash from '../../../assets/icons/ic-delete.svg'
 import { getAppId } from '../../v2/appDetails/k8Resource/nodeDetail/nodeDetail.api'
 import ClusterNotReachableDialog from '../../common/ClusterNotReachableDialog/ClusterNotReachableDialog'
diff --git a/src/components/login/Login.tsx b/src/components/login/Login.tsx
@@ -43,7 +43,6 @@ import { TOKEN_COOKIE_NAME, URLS } from '../../config'
 import { getSSOConfigList } from '../../Pages/GlobalConfigurations/Authorization/SSOLoginServices/service'
 import { dashboardAccessed } from '../../services/service'
 import { LOGIN_CARD_ANIMATION_VARIANTS, SSOProvider } from './constants'
-import { SSOConfigLoginList } from './login.types'
 import { LoginForm } from './LoginForm'
 
 import './login.scss'
@@ -54,13 +53,14 @@ const getTermsAndConditions = importComponentFromFELibrary('getTermsAndCondition
 
 const Login = () => {
     const [continueUrl, setContinueUrl] = useState('')
-    const [loginList, setLoginList] = useState<SSOConfigLoginList[]>([])
 
     const { searchParams } = useSearchString()
     const location = useLocation()
     const history = useHistory()
 
-    const [initLoading, initResult] = useAsync(() => Promise.allSettled([getSSOConfigList(), dashboardAccessed()]), [])
+    const [ssoListLoading, ssoListResponse] = useAsync(getSSOConfigList, [])
+
+    const loginList = ssoListResponse?.result ?? []
 
     const setLoginNavigationURL = () => {
         let queryParam = searchParams.continue
@@ -96,26 +96,10 @@ const Login = () => {
 
     useEffect(() => {
         setLoginNavigationURL()
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        dashboardAccessed()
     }, [])
 
-    useEffect(() => {
-        if (initResult && !initLoading) {
-            const [ssoLoginListResponse, dashboardAccessesResponse] = initResult
-            if (ssoLoginListResponse.status === 'fulfilled' && ssoLoginListResponse.value.result) {
-                setLoginList(ssoLoginListResponse.value.result as SSOConfigLoginList[])
-            }
-
-            if (
-                typeof Storage !== 'undefined' &&
-                !localStorage.getItem('isDashboardAccessed') &&
-                dashboardAccessesResponse.status === 'fulfilled' &&
-                dashboardAccessesResponse.value.result
-            ) {
-                localStorage.setItem('isDashboardAccessed', 'true')
-            }
-        }
-    }, [initLoading, initResult])
-
     const onClickSSO = () => {
         if (typeof Storage !== 'undefined') {
             localStorage.setItem('isSSOLogin', 'true')
@@ -127,7 +111,7 @@ const Login = () => {
 
     const renderSSOLoginPage = () => (
         <div className="flexbox-col dc__gap-12 p-36">
-            {initLoading && !loginList.length && (
+            {ssoListLoading && !loginList.length && (
                 <Button
                     variant={ButtonVariantType.secondary}
                     text="Checking SSO"
diff --git a/src/components/login/login.types.ts b/src/components/login/login.types.ts
@@ -21,5 +21,5 @@ export interface SSOConfigLoginList extends Pick<SSOConfigDTO, 'id' | 'active' |
 }
 
 export interface LoginFormType {
-    loginList: SSOConfigLoginList[]
+    loginList: SSOConfigDTO[]
 }
diff --git a/src/components/v2/appDetails/sourceInfo/EnvironmentSelector.component.tsx b/src/components/v2/appDetails/sourceInfo/EnvironmentSelector.component.tsx
@@ -40,7 +40,7 @@ import { ReactComponent as LinkIcon } from '../../../../assets/icons/ic-link.svg
 import { ReactComponent as Trash } from '../../../../assets/icons/ic-delete-interactive.svg'
 import { deleteApplicationRelease } from '../../../external-apps/ExternalAppService'
 import { deleteInstalledChart } from '../../../charts/charts.service'
-import { ReactComponent as Dots } from '@Icons/ic-dot.svg'
+import { ReactComponent as Dots } from '@Icons/ic-more-vertical.svg'
 import { DELETE_ACTION, URLS, checkIfDevtronOperatorHelmRelease } from '../../../../config'
 import { ReactComponent as BinWithDots } from '../../../../assets/icons/ic-delete-dots.svg'
 import { DELETE_DEPLOYMENT_PIPELINE, DeploymentAppTypeNameMapping } from '../../../../config/constantMessaging'
diff --git a/src/components/v2/values/chartValuesDiff/ChartValuesView.tsx b/src/components/v2/values/chartValuesDiff/ChartValuesView.tsx
@@ -1809,12 +1809,15 @@ const ChartValuesView = ({
                                 />
                             )}
                         </div>
-                        {!isExternalApp && (isDeployChartView || isUpdateAppView) && ToggleSecurityScan && (
-                            <ToggleSecurityScan
-                                isManifestScanEnabled={commonState.isManifestScanEnabled}
-                                handleToggleSecurityScan={handleToggleSecurityScan}
-                            />
-                        )}
+                        {!isExternalApp &&
+                            serverMode === SERVER_MODE.FULL &&
+                            (isDeployChartView || isUpdateAppView) &&
+                            ToggleSecurityScan && (
+                                <ToggleSecurityScan
+                                    isManifestScanEnabled={commonState.isManifestScanEnabled}
+                                    handleToggleSecurityScan={handleToggleSecurityScan}
+                                />
+                            )}
                         {!isDeployChartView &&
                             chartValueId !== '0' &&
                             !(
diff --git a/src/css/base.scss b/src/css/base.scss
@@ -2863,6 +2863,10 @@ button.anchor {
     width: 10px;
 }
 
+.w-12 {
+    width: 12px;
+}
+
 .w-14 {
     width: 14px;
 }
@@ -5197,4 +5201,15 @@ details[open] {
             border-color: var(--N50);
         }
     }
-}
+}
+
+.sr-only {
+    clip: rect(1px, 1px, 1px, 1px);
+    clip-path: inset(50%);
+    height: 1px;
+    width: 1px;
+    margin: -1px;
+    overflow: hidden;
+    padding: 0;
+    position: absolute;
+}
diff --git a/src/services/service.ts b/src/services/service.ts
@@ -525,8 +525,17 @@ export function getClusterListMinWithoutAuth(): Promise<ClusterListResponse> {
     return get(URL)
 }
 
-export function dashboardAccessed() {
-    return get(Routes.DASHBOARD_ACCESSED)
+export const dashboardAccessed = async () => {
+    try {
+        const isDashboardAccessed = localStorage.getItem('isDashboardAccessed')
+        if (isDashboardAccessed) {
+            return
+        }
+        await get(Routes.DASHBOARD_ACCESSED)
+        localStorage.setItem('isDashboardAccessed', 'true')
+    } catch {
+        // do noting
+    }
 }
 
 export function dashboardLoggedIn() {
diff --git a/src/stories/Switch.stories.tsx b/src/stories/Switch.stories.tsx
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ export type SidebarConfigType = Record<`
`15`	`15`	`dataTestId: string`
`16`	`16`	`documentationHeader?: string`
`17`	`17`	`isEnterprise?: true`
	`18`	`+ hideInEAMode?: true`
`18`	`19`	`}`
`19`	`20`	`>`
`20`	`21`