Merge pull request #2906 from devtron-labs/fix/pipeline-config

fix: update secretsData handling for pipeline deployment configurations

Author: RohitRaj011

src/components/app/details/triggerView/PipelineConfigDiff/usePipelineDeploymentConfig.ts

@@ -160,46 +160,82 @@ export const usePipelineDeploymentConfig = ({
             // NOTE: for security reasons secretsData from getAppEnvDeploymentConfig
             // will be null if user is not app admin. therefore need to override it
             // with masked values from getCompareSecretsData api
-            if (
-                _pipelineDeploymentConfigRes[0].status === 'fulfilled' &&
-                _pipelineDeploymentConfigRes[0].value &&
-                !_pipelineDeploymentConfigRes[0].value.result.isAppAdmin &&
-                secretsData.status === 'fulfilled' &&
-                secretsData.value?.[0]
-            ) {
-                _pipelineDeploymentConfigRes[0].value.result.secretsData = secretsData.value[0].secretsData
-            }
-
-            if (
-                _pipelineDeploymentConfigRes[1].status === 'fulfilled' &&
-                _pipelineDeploymentConfigRes[1].value &&
-                !_pipelineDeploymentConfigRes[1].value.result.isAppAdmin &&
-                secretsData.status === 'fulfilled' &&
-                secretsData.value?.[1]
-            ) {
-                // we can use 0th secret data it will not impact strategy
-                _pipelineDeploymentConfigRes[1].value.result.secretsData = secretsData.value[0].secretsData
-                _pipelineDeploymentConfigRes[1].value.result.secretsData = secretsData.value[0].secretsData
-            }
-
+            // setting pipelineConfig - last saved config (current published)
             if (
                 _pipelineDeploymentConfigRes[2].status === 'fulfilled' &&
                 _pipelineDeploymentConfigRes[2].value &&
                 !_pipelineDeploymentConfigRes[2].value.result.isAppAdmin &&
                 secretsData.status === 'fulfilled' &&
-                secretsData.value?.[2]
+                secretsData.value?.[1]
             ) {
                 _pipelineDeploymentConfigRes[2].value.result.secretsData = secretsData.value[1].secretsData
             }
 
+            // Rollback case
+            if (isRollbackTriggerSelected && wfrId) {
+                // setting pipelineConfig - last deployed config (w/o deployment strategy)
+                if (
+                    _pipelineDeploymentConfigRes[0].status === 'fulfilled' &&
+                    _pipelineDeploymentConfigRes[0].value &&
+                    !_pipelineDeploymentConfigRes[0].value.result.isAppAdmin &&
+                    secretsDataCDRollback.status === 'fulfilled' &&
+                    secretsDataCDRollback.value?.[0]
+                ) {
+                    _pipelineDeploymentConfigRes[0].value.result.secretsData =
+                        secretsDataCDRollback.value[0].secretsData
+                }
+
+                // setting pipelineConfig - last deployed config (with deployment strategy)
+                if (
+                    _pipelineDeploymentConfigRes[1].status === 'fulfilled' &&
+                    _pipelineDeploymentConfigRes[1].value &&
+                    !_pipelineDeploymentConfigRes[1].value.result.isAppAdmin &&
+                    secretsDataCDRollback.status === 'fulfilled' &&
+                    secretsDataCDRollback.value?.[0]
+                ) {
+                    // we can use 0th secret data it will not impact strategy
+                    _pipelineDeploymentConfigRes[1].value.result.secretsData =
+                        secretsDataCDRollback.value[0].secretsData
+                    _pipelineDeploymentConfigRes[1].value.result.secretsData =
+                        secretsDataCDRollback.value[0].secretsData
+                }
+            }
+            // Deploy case
+            else {
+                // setting pipelineConfig - last deployed config (w/o deployment strategy)
+                if (
+                    _pipelineDeploymentConfigRes[0].status === 'fulfilled' &&
+                    _pipelineDeploymentConfigRes[0].value &&
+                    !_pipelineDeploymentConfigRes[0].value.result.isAppAdmin &&
+                    secretsData.status === 'fulfilled' &&
+                    secretsData.value?.[0]
+                ) {
+                    _pipelineDeploymentConfigRes[0].value.result.secretsData = secretsData.value[0].secretsData
+                }
+
+                // setting pipelineConfig - last deployed config (with deployment strategy)
+                if (
+                    _pipelineDeploymentConfigRes[1].status === 'fulfilled' &&
+                    _pipelineDeploymentConfigRes[1].value &&
+                    !_pipelineDeploymentConfigRes[1].value.result.isAppAdmin &&
+                    secretsData.status === 'fulfilled' &&
+                    secretsData.value?.[0]
+                ) {
+                    // we can use 0th secret data it will not impact strategy
+                    _pipelineDeploymentConfigRes[1].value.result.secretsData = secretsData.value[0].secretsData
+                    _pipelineDeploymentConfigRes[1].value.result.secretsData = secretsData.value[0].secretsData
+                }
+            }
+
+            // setting pipelineConfig - rollback config
             if (
                 _pipelineDeploymentConfigRes[3].status === 'fulfilled' &&
                 _pipelineDeploymentConfigRes[3].value &&
                 !_pipelineDeploymentConfigRes[3].value.result.isAppAdmin &&
                 secretsDataCDRollback.status === 'fulfilled' &&
-                secretsDataCDRollback.value?.[3]
+                secretsDataCDRollback.value?.[1]
             ) {
-                _pipelineDeploymentConfigRes[3].value.result.secretsData = secretsDataCDRollback.value[2].secretsData
+                _pipelineDeploymentConfigRes[3].value.result.secretsData = secretsDataCDRollback.value[1].secretsData
             }
 
             return _pipelineDeploymentConfigRes