Merge branch 'develop' of github.com:devtron-labs/dashboard into feat/combined-ci-cd-pipeline

Author: RohitRaj011

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.15.3-pre-3",
+        "@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",

src/components/cdPipeline/BuildCD.tsx

@@ -81,6 +81,7 @@ export default function BuildCD({
     isGitOpsRepoNotConfigured,
     noGitOpsModuleInstalledAndConfigured,
     releaseMode,
+    isCustomChart,
     getMandatoryPluginData,
     migrateToDevtronFormState,
     setMigrateToDevtronFormState,
@@ -655,7 +656,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/CDPipeline.tsx

@@ -176,6 +176,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: [],
@@ -598,6 +599,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
@@ -728,7 +730,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,
@@ -1332,6 +1334,7 @@ export default function CDPipeline({
                                     isGitOpsRepoNotConfigured={isGitOpsRepoNotConfigured}
                                     noGitOpsModuleInstalledAndConfigured={noGitOpsModuleInstalledAndConfigured}
                                     releaseMode={formData.releaseMode}
+                                    isCustomChart={formData.isCustomChart}
                                     getMandatoryPluginData={getMandatoryPluginData}
                                     migrateToDevtronFormState={migrateToDevtronFormState}
                                     setMigrateToDevtronFormState={setMigrateToDevtronFormState}

src/components/cdPipeline/types.ts

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

yarn.lock

@@ -1722,9 +1722,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@devtron-labs/devtron-fe-common-lib@npm:1.15.3-pre-3":
-  version: 1.15.3-pre-3
-  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.15.3-pre-3"
+"@devtron-labs/devtron-fe-common-lib@npm:1.15.3-pre-4":
+  version: 1.15.3-pre-4
+  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.15.3-pre-4"
   dependencies:
     "@codemirror/lang-json": "npm:6.0.1"
     "@codemirror/lang-yaml": "npm:6.1.2"
@@ -1772,7 +1772,7 @@ __metadata:
     react-select: 5.8.0
     rxjs: ^7.8.1
     yaml: ^2.4.1
-  checksum: 10c0/4c663d4f66d18791962eae42f7633b2570f67a067fbffd08e00f18c36b6530ec6c0cce67214e9448a3f813973de98ae11f952c4ea4268f8699bb6e9893ab4fb7
+  checksum: 10c0/dde132e8ff05a86678e255560d767149c6644213f0c938897095ec9b6491635b174beb9c4da266bd8ec85aef15805b18fb26486b274beadbff8be2ee88f358fb
   languageName: node
   linkType: hard
 
@@ -5684,7 +5684,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "dashboard@workspace:."
   dependencies:
-    "@devtron-labs/devtron-fe-common-lib": "npm:1.15.3-pre-3"
+    "@devtron-labs/devtron-fe-common-lib": "npm:1.15.3-pre-4"
     "@esbuild-plugins/node-globals-polyfill": "npm:0.2.3"
     "@playwright/test": "npm:^1.32.1"
     "@rjsf/core": "npm:^5.13.3"