feat: DeploymentConfigDiff - revamped logic to parse draft deployment template resolved values and template version

Author: RohitRaj011

src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiff.types.ts

@@ -5,6 +5,7 @@ import {
     ConfigMapSecretDataConfigDatumDTO,
     DeploymentTemplateDTO,
     EnvResourceType,
+    TemplateListDTO,
 } from '@Shared/Services'
 
 import { ManifestTemplateDTO } from '@Pages/Applications'
@@ -152,10 +153,14 @@ export type AppEnvDeploymentConfigListParams<IsManifestView> = (IsManifestView e
     ? {
           currentList: ManifestTemplateDTO
           compareList: ManifestTemplateDTO
+          compareToTemplateOptions?: never
+          compareWithTemplateOptions?: never
       }
     : {
           currentList: AppEnvDeploymentConfigDTO
           compareList: AppEnvDeploymentConfigDTO
+          compareToTemplateOptions?: TemplateListDTO[]
+          compareWithTemplateOptions?: TemplateListDTO[]
       }) & {
     getNavItemHref: (resourceType: EnvResourceType, resourceName: string) => string
     isManifestView?: IsManifestView

src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiff.utils.tsx

@@ -40,6 +40,22 @@ export const getDeploymentTemplateData = (data: DeploymentTemplateDTO) => {
     )
 }
 
+const getDeploymentTemplateAppMetricsAndTemplateVersion = (
+    data: DeploymentTemplateDTO,
+    templateOptions: TemplateListDTO[],
+) => {
+    const parsedDraftData = JSON.parse(data?.deploymentDraftData?.configData[0].draftMetadata.data || null)
+    const draftTemplateVersion = templateOptions?.find(
+        ({ chartRefId }) => parsedDraftData?.chartRefId === chartRefId,
+    )?.chartVersion
+
+    return {
+        isAppMetricsEnabled:
+            parsedDraftData || data ? parsedDraftData?.isAppMetricsEnabled || data?.isAppMetricsEnabled || false : null,
+        templateVersion: draftTemplateVersion || data?.templateVersion,
+    }
+}
+
 /**
  * Retrieves the draft data from the given configuration data object.
  *
@@ -338,7 +354,7 @@ const getDiffViewData = (
     }
 }
 
-const getDeploymentTemplateDiffViewData = (data: DeploymentTemplateDTO | null) => {
+const getDeploymentTemplateDiffViewData = (data: DeploymentTemplateDTO | null, templateOptions: TemplateListDTO[]) => {
     const _data = getDeploymentTemplateData(data)
     const codeEditorValue = {
         displayName: 'data',
@@ -347,8 +363,7 @@ const getDeploymentTemplateDiffViewData = (data: DeploymentTemplateDTO | null) =
 
     const diffViewData = prepareHistoryData(
         {
-            ...(data || {}),
-            isAppMetricsEnabled: data ? data.isAppMetricsEnabled || false : null,
+            ...getDeploymentTemplateAppMetricsAndTemplateVersion(data, templateOptions),
             codeEditorValue,
         },
         DEPLOYMENT_HISTORY_CONFIGURATION_LIST_MAP.DEPLOYMENT_TEMPLATE.VALUE,
@@ -516,12 +531,39 @@ const getConfigMapSecretData = (
     return deploymentConfig
 }
 
-const getDeploymentTemplateResolvedData = (deploymentTemplate: DeploymentTemplateDTO) => {
+const getDeploymentTemplateResolvedData = (deploymentTemplate: DeploymentTemplateDTO): DeploymentTemplateDTO => {
     try {
         if (deploymentTemplate.deploymentDraftData) {
-            return JSON.parse(deploymentTemplate.deploymentDraftData.configData[0].draftMetadata.draftResolvedValue)
+            const parsedDraftResolvedData = JSON.parse(
+                deploymentTemplate.deploymentDraftData.configData[0].draftMetadata.draftResolvedValue,
+            )
+
+            return {
+                ...deploymentTemplate,
+                deploymentDraftData: {
+                    ...deploymentTemplate.deploymentDraftData,
+                    configData: [
+                        {
+                            ...deploymentTemplate.deploymentDraftData.configData[0],
+                            draftMetadata: {
+                                ...deploymentTemplate.deploymentDraftData.configData[0].draftMetadata,
+                                data: JSON.stringify({
+                                    ...JSON.parse(
+                                        deploymentTemplate.deploymentDraftData.configData[0].draftMetadata.data,
+                                    ),
+                                    envOverrideValues: parsedDraftResolvedData,
+                                }),
+                            },
+                        },
+                    ],
+                },
+            }
+        }
+
+        return {
+            ...deploymentTemplate,
+            data: deploymentTemplate.resolvedValue,
         }
-        return deploymentTemplate.resolvedValue
     } catch {
         return null
     }
@@ -545,19 +587,9 @@ const getConfigDataWithResolvedDeploymentTemplate = (
         return data
     }
 
-    const deploymentTemplateResolvedData = getDeploymentTemplateResolvedData(data.deploymentTemplate)
-
     return {
         ...data,
-        deploymentTemplate: {
-            ...data.deploymentTemplate,
-            ...(deploymentTemplateResolvedData
-                ? {
-                      data: deploymentTemplateResolvedData,
-                      deploymentDraftData: null,
-                  }
-                : {}),
-        },
+        deploymentTemplate: getDeploymentTemplateResolvedData(data.deploymentTemplate),
     }
 }
 
@@ -579,6 +611,8 @@ export const getAppEnvDeploymentConfigList = <ManifestView extends boolean = fal
     getNavItemHref,
     isManifestView,
     convertVariables = false,
+    compareToTemplateOptions,
+    compareWithTemplateOptions,
 }: AppEnvDeploymentConfigListParams<ManifestView>): {
     configList: DeploymentConfigDiffProps['configList']
     navList: DeploymentConfigDiffProps['navList']
@@ -593,8 +627,14 @@ export const getAppEnvDeploymentConfigList = <ManifestView extends boolean = fal
             compareList as AppEnvDeploymentConfigListParams<false>['compareList'],
             convertVariables,
         )
-        const currentDeploymentData = getDeploymentTemplateDiffViewData(compareToObject.deploymentTemplate)
-        const compareDeploymentData = getDeploymentTemplateDiffViewData(compareWithObject.deploymentTemplate)
+        const currentDeploymentData = getDeploymentTemplateDiffViewData(
+            compareToObject.deploymentTemplate,
+            compareToTemplateOptions,
+        )
+        const compareDeploymentData = getDeploymentTemplateDiffViewData(
+            compareWithObject.deploymentTemplate,
+            compareWithTemplateOptions,
+        )
 
         const deploymentTemplateData = {
             id: EnvResourceType.DeploymentTemplate,