Merge pull request #313 from devtron-labs/feat/secret-eso-dataFrom-template

feat: add SubPath values in prepareConfigMapAndSecretData service

Author: RohitRaj011

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.3.15",
+    "version": "0.3.19",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -202,6 +202,20 @@ export const prepareConfigMapAndSecretData = (
             }
             if (rawData.subPath) {
                 secretValues['subPath'] = { displayName: 'Set SubPath', value: 'Yes' }
+
+                if (rawData.esoSubPath) {
+                    secretValues['subPathValues'] = { displayName: 'SubPath', value: rawData.esoSubPath.join(', ') }
+                } else if (
+                    rawData.external &&
+                    rawData.externalType === 'KubernetesSecret' &&
+                    historyData.codeEditorValue?.resolvedValue
+                ) {
+                    const resolvedSecretData = JSON.parse(historyData.codeEditorValue.resolvedValue)
+                    secretValues['subPathValues'] = {
+                        displayName: 'SubPath',
+                        value: Object.keys(resolvedSecretData).join(', '),
+                    }
+                }
             }
             if (rawData.filePermission) {
                 secretValues['filePermission'] = {

src/Shared/Components/CICDHistory/service.tsx

@@ -6,8 +6,9 @@ import { DEPLOYMENT_HISTORY_CONFIGURATION_LIST_MAP } from '@Shared/constants'
 import { YAMLStringify } from '@Common/Helper'
 import { SortingOrder } from '@Common/Constants'
 import {
-    AppEnvDeploymentConfigListParams,
     DeploymentConfigDiffProps,
+    DeploymentHistorySingleValue,
+    AppEnvDeploymentConfigListParams,
     DiffHeadingDataType,
     prepareHistoryData,
 } from '@Shared/Components'
@@ -77,6 +78,20 @@ export const mergeConfigDataArraysByName = (
     return Array.from(dataMap.values())
 }
 
+/**
+ * Checks if the given secret is an external Kubernetes secret.
+ *
+ * @param secret - The secret data object to check.
+ * @returns `true` if the secret is an external Kubernetes secret else `false` \
+ * or `null` if the secret is invalid.
+ */
+const isExternalKubernetesSecret = (secret: ConfigMapSecretDataConfigDatumDTO) => {
+    if (!secret) {
+        return null
+    }
+    return secret.subPath && secret.external && secret.externalType === 'KubernetesSecret'
+}
+
 /**
  * Retrieves data for a given configuration, depending on the type.
  *
@@ -179,8 +194,8 @@ const getCodeEditorData = (
     const compareToConfigData = getConfigData(compareToValue, type)
     const compareWithConfigData = getConfigData(compareWithValue, type)
 
-    let compareToCodeEditorData
-    let compareWithCodeEditorData
+    let compareToCodeEditorData: DeploymentHistorySingleValue
+    let compareWithCodeEditorData: DeploymentHistorySingleValue
 
     if (type === ConfigResourceType.Secret) {
         const { compareToObfuscatedData, compareWithObfuscatedData } = getObfuscatedData(
@@ -192,12 +207,26 @@ const getCodeEditorData = (
 
         compareToCodeEditorData = {
             displayName: 'data',
-            value: JSON.stringify(compareToObfuscatedData) || '',
+            ...(isExternalKubernetesSecret(compareToValue)
+                ? {
+                      value: null,
+                      resolvedValue: JSON.stringify(compareToObfuscatedData) || '',
+                  }
+                : {
+                      value: JSON.stringify(compareToObfuscatedData) || '',
+                  }),
         }
 
         compareWithCodeEditorData = {
             displayName: 'data',
-            value: JSON.stringify(compareWithObfuscatedData) || '',
+            ...(isExternalKubernetesSecret(compareWithValue)
+                ? {
+                      value: null,
+                      resolvedValue: JSON.stringify(compareWithObfuscatedData) || '',
+                  }
+                : {
+                      value: JSON.stringify(compareWithObfuscatedData) || '',
+                  }),
         }
     } else {
         compareToCodeEditorData = {