Merge branch 'develop' of https://github.com/devtron-labs/dashboard into feat/resource-recommender-develop

Author: AbhishekA1509

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
         cache: 'yarn'
 
     - name: Install dependencies
-      run: yarn install --frozen-lockfile
+      run: yarn install --immutable
 
     - name: Check linting issues
       run: yarn lint

.yarn/releases/yarn-4.9.2.cjs

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.9.2.cjs

.yarnrc.yml

@@ -2,10 +2,16 @@ FROM node:22-alpine AS builder
 
 WORKDIR /app
 
-COPY package.json yarn.lock .
+RUN corepack enable yarn && \
+    yarn set version 4.9.2
+
+COPY package.json .
+COPY yarn.lock .
+COPY .yarn/ .yarn/
+COPY .yarnrc.yml ./
 
 RUN apk add --no-cache git
-RUN yarn install --frozen-lockfile --network-timeout 600000
+RUN yarn install --immutable --network-timeout 600000
 
 COPY . .
 

Dockerfile

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.15.3-pre-1",
+        "@devtron-labs/devtron-fe-common-lib": "1.15.3-pre-4",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
@@ -138,5 +138,6 @@
         "rollup": "^4.22.4",
         "path-to-regexp": "^1.9.0",
         "cross-spawn": "^7.0.5"
-    }
+    },
+    "packageManager": "[email protected]"
 }

package.json

@@ -21,6 +21,8 @@ import ReactSelect, { Props as SelectProps, SelectInstance } from 'react-select'
 import {
     APP_SELECTOR_STYLES,
     AppSelectorDropdownIndicator,
+    Badge,
+    ComponentSizeType,
     DocLink,
     DocLinkProps,
     Icon,
@@ -148,7 +150,7 @@ const ClusterSelector: React.FC<ClusterSelectorType> = ({
                 }}
             />
 
-            {defaultOption?.isProd && <span className="px-6 py-2 br-4 bcb-1 cb-7 fs-12 lh-16 fw-5">Production</span>}
+            {defaultOption?.isProd && <Badge label="Production" size={ComponentSizeType.xxs} />}
 
             {RBPageHeaderPopup && !isInstallationStatusView ? (
                 <RBPageHeaderPopup

src/components/ResourceBrowser/ResourceList/ClusterSelector.tsx

@@ -80,6 +80,7 @@ export default function BuildCD({
     isGitOpsRepoNotConfigured,
     noGitOpsModuleInstalledAndConfigured,
     releaseMode,
+    isCustomChart,
     getMandatoryPluginData,
     migrateToDevtronFormState,
     setMigrateToDevtronFormState,
@@ -671,7 +672,7 @@ export default function BuildCD({
     }
 
     const renderAdvancedDeploymentStrategy = () => {
-        if (noStrategyAvailable.current || releaseMode === ReleaseMode.MIGRATE_EXTERNAL_APPS) {
+        if (noStrategyAvailable.current || (releaseMode === ReleaseMode.MIGRATE_EXTERNAL_APPS && isCustomChart)) {
             return null
         }
 

src/components/cdPipeline/BuildCD.tsx

@@ -179,6 +179,7 @@ export default function CDPipeline({
         deploymentAppType: window._env_.HIDE_GITOPS_OR_HELM_OPTION ? '' : DeploymentAppTypes.HELM,
         deploymentAppName: '',
         releaseMode: ReleaseMode.NEW_DEPLOYMENT,
+        isCustomChart: false,
         triggerType: TriggerType.Auto,
         strategies: [],
         savedStrategies: [],
@@ -601,6 +602,7 @@ export default function CDPipeline({
         form.name = pipelineConfigFromRes.name
         form.deploymentAppName = pipelineConfigFromRes.deploymentAppName
         form.releaseMode = pipelineConfigFromRes.releaseMode
+        form.isCustomChart = pipelineConfigFromRes.isCustomChart
         form.environmentName = pipelineConfigFromRes.environmentName || ''
         form.namespace = env.namespace
         form.repoName = pipelineConfigFromRes.repoName
@@ -731,7 +733,7 @@ export default function CDPipeline({
             environmentId: formData.environmentId,
             namespace: formData.namespace,
             id: +cdPipelineId,
-            strategies: formData.releaseMode === ReleaseMode.MIGRATE_EXTERNAL_APPS ? [] : formData.savedStrategies,
+            strategies: formData.releaseMode === ReleaseMode.MIGRATE_EXTERNAL_APPS && formData.isCustomChart ? [] : formData.savedStrategies,
             parentPipelineType,
             parentPipelineId: +parentPipelineId,
             isClusterCdActive: formData.isClusterCdActive,
@@ -1369,6 +1371,7 @@ export default function CDPipeline({
                                     isGitOpsRepoNotConfigured={isGitOpsRepoNotConfigured}
                                     noGitOpsModuleInstalledAndConfigured={noGitOpsModuleInstalledAndConfigured}
                                     releaseMode={formData.releaseMode}
+                                    isCustomChart={formData.isCustomChart}
                                     getMandatoryPluginData={getMandatoryPluginData}
                                     migrateToDevtronFormState={migrateToDevtronFormState}
                                     setMigrateToDevtronFormState={setMigrateToDevtronFormState}

src/components/cdPipeline/CDPipeline.tsx

@@ -91,6 +91,7 @@ export interface BuildCDProps
     isWebhookCD: boolean
     dockerRegistries: any[]
     releaseMode: ReleaseMode
+    isCustomChart: boolean
     getMandatoryPluginData: (
         form: PipelineFormType,
         requiredPluginIds?: PluginDetailPayloadType['pluginIds'],

src/components/cdPipeline/types.ts

@@ -30,6 +30,8 @@ import {
     useMainContext,
     SelectPickerOptionType,
     InfoBlock,
+    Badge,
+    SeveritiesDTO,
 } from '@devtron-labs/devtron-fe-common-lib'
 import YAML from 'yaml'
 import { Link } from 'react-router-dom'
@@ -1098,33 +1100,31 @@ export const getPluginIdsFromBuildStage = (
     return pluginIds
 }
 
+const SEVERITY_ORDER = [
+    { key: SeveritiesDTO.CRITICAL, label: 'Critical', variant: 'negative' },
+    { key: SeveritiesDTO.HIGH, label: 'High', variant: 'custom', fontColor: 'R500', bgColor: 'R100' },
+    { key: SeveritiesDTO.MEDIUM, label: 'Medium', variant: 'custom', fontColor: 'O600', bgColor: 'O100' },
+    { key: SeveritiesDTO.LOW, label: 'Low', variant: 'warning' },
+    { key: SeveritiesDTO.UNKNOWN, label: 'Unknown', variant: 'neutral' },
+] as const
+
 export const getSeverityWithCount = (severityCount: SeverityCount) => {
-    if (severityCount.critical) {
-        return (
-            <span className="severity-chip severity-chip--critical dc__w-fit-content">
-                {severityCount.critical} Critical
-            </span>
-        )
-    }
-    if (severityCount.high) {
-        return <span className="severity-chip severity-chip--high dc__w-fit-content">{severityCount.high} High</span>
-    }
-    if (severityCount.medium) {
-        return (
-            <span className="severity-chip severity-chip--medium dc__w-fit-content">{severityCount.medium} Medium</span>
-        )
-    }
-    if (severityCount.low) {
-        return <span className="severity-chip severity-chip--low dc__w-fit-content">{severityCount.low} Low</span>
-    }
-    if (severityCount.unknown) {
-        return (
-            <span className="severity-chip severity-chip--unknown dc__w-fit-content">
-                {severityCount.unknown} Unknown
-            </span>
-        )
+    for (const item of SEVERITY_ORDER) {
+        if (severityCount[item.key]) {
+            if (item.variant === 'custom') {
+                return (
+                    <Badge
+                        label={`${severityCount[item.key]} ${item.label}`}
+                        variant="custom"
+                        fontColor={item.fontColor}
+                        bgColor={item.bgColor}
+                    />
+                )
+            }
+            return <Badge label={`${severityCount[item.key]} ${item.label}`} variant={item.variant} />
+        }
     }
-    return <span className="severity-chip severity-chip--passed dc__w-fit-content">Passed</span>
+    return <Badge label="Passed" variant="positive" />
 }
 
 // FIXME: Ideally whole branch calculations should be in fe-lib