refactor: applied changes made in dashboard side

Author: RohitRaj011

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

@@ -83,6 +83,11 @@ const getConfigData = (
     cmSecretData: ConfigMapSecretDataConfigDatumDTO,
     type: ConfigResourceType,
 ): Record<string, string> => {
+    if (!cmSecretData) {
+        // Return undefined intentionally, as JSON.stringify converts null to "null" but keeps undefined as undefined.
+        return undefined
+    }
+
     const secretKeys = ['secretData', 'esoSecretData', 'defaultSecretData', 'defaultESOSecretData']
 
     if (type === ConfigResourceType.Secret) {
@@ -94,12 +99,7 @@ const getConfigData = (
 
     const configmapKeys = ['data', 'defaultData']
     const data = configmapKeys.find((key) => Object.keys(cmSecretData?.[key] ?? {}).length > 0)
-    if (data) {
-        return cmSecretData[data]
-    }
-
-    // Return undefined intentionally, as JSON.stringify converts null to "null" but keeps undefined as undefined.
-    return undefined
+    return cmSecretData[data]
 }
 
 /**
@@ -302,32 +302,20 @@ const getDiffHeading = <DeploymentTemplate extends boolean>(
 
     if (deploymentTemplate) {
         const _data = data as DeploymentTemplateDTO
-        if (!_data?.deploymentDraftData && !_data?.data) {
+        if (!_data) {
             doesNotExist = true
-        } else if (
-            _data?.deploymentDraftData?.configData[0].draftMetadata.draftState === DraftState.Init ||
-            _data?.data?.configData?.[0].draftMetadata.draftState === DraftState.Init
-        ) {
+        } else if (_data?.deploymentDraftData?.configData[0].draftMetadata.draftState === DraftState.Init) {
             isDraft = true
-        } else if (
-            _data?.deploymentDraftData?.configData[0].draftMetadata.draftState === DraftState.AwaitApproval ||
-            _data?.data?.configData?.[0].draftMetadata.draftState === DraftState.AwaitApproval
-        ) {
+        } else if (_data?.deploymentDraftData?.configData[0].draftMetadata.draftState === DraftState.AwaitApproval) {
             isApprovalPending = true
         }
     } else {
         const _data = data as ConfigMapSecretDataConfigDatumDTO
-        if (!_data?.draftMetadata && !_data?.data && !_data?.defaultData) {
+        if (!_data) {
             doesNotExist = true
-        } else if (
-            _data?.draftMetadata?.draftState === DraftState.Init ||
-            _data?.draftMetadata?.draftState === DraftState.Init
-        ) {
+        } else if (_data?.draftMetadata?.draftState === DraftState.Init) {
             isDraft = true
-        } else if (
-            _data?.draftMetadata?.draftState === DraftState.AwaitApproval ||
-            _data?.draftMetadata?.draftState === DraftState.AwaitApproval
-        ) {
+        } else if (_data?.draftMetadata?.draftState === DraftState.AwaitApproval) {
             isApprovalPending = true
         }
     }
@@ -385,7 +373,8 @@ const getConfigMapSecretData = (
 
         return {
             id: `${resourceType === ConfigResourceType.ConfigMap ? EnvResourceType.ConfigMap : EnvResourceType.Secret}-${currentItem?.name || compareItem?.name}`,
-            title: currentItem?.name || compareItem?.name,
+            title: `${resourceType === ConfigResourceType.ConfigMap ? 'ConfigMap' : 'Secret'} / ${currentItem?.name || compareItem?.name}`,
+            name: currentItem?.name || compareItem?.name,
             primaryConfig: {
                 heading: getDiffHeading(compareItem),
                 list: compareWithDiff,
@@ -406,14 +395,21 @@ const getConfigMapSecretData = (
  *
  * @param currentList - The current deployment configuration list.
  * @param compareList - The deployment configuration list to compare against.
- * @returns The combined deployment configuration list and an object indicating which configurations have changed.
+ * @param getNavItemHref - A function to generate navigation item URLs based on the resource type and resource name.
+ * @param sortOrder - (Optional) The order in which to sort the deployment templates.
+ *
+ * @returns An object containing the combined deployment configuration list, a collapsible navigation list, and a navigation list.
  */
 export const getAppEnvDeploymentConfigList = (
     currentList: AppEnvDeploymentConfigDTO,
     compareList: AppEnvDeploymentConfigDTO,
     getNavItemHref: (resourceType: EnvResourceType, resourceName: string) => string,
     sortOrder?: SortingOrder,
-): Pick<DeploymentConfigDiffProps, 'configList' | 'collapsibleNavList' | 'navList'> => {
+): {
+    configList: DeploymentConfigDiffProps['configList']
+    navList: DeploymentConfigDiffProps['navList']
+    collapsibleNavList: DeploymentConfigDiffProps['collapsibleNavList']
+} => {
     const currentDeploymentData = getDeploymentTemplateDiffViewData(currentList.deploymentTemplate, sortOrder)
     const compareDeploymentData = getDeploymentTemplateDiffViewData(compareList.deploymentTemplate, sortOrder)
 
@@ -466,10 +462,10 @@ export const getAppEnvDeploymentConfigList = (
         {
             header: 'ConfigMaps',
             id: EnvResourceType.ConfigMap,
-            items: cmData.map(({ title, hasDiff, id }) => ({
-                title,
+            items: cmData.map(({ name, hasDiff, id }) => ({
+                title: name,
                 hasDiff,
-                href: getNavItemHref(EnvResourceType.ConfigMap, title),
+                href: getNavItemHref(EnvResourceType.ConfigMap, name),
                 onClick: () => {
                     const element = document.querySelector(`#${id}`)
                     element?.scrollIntoView({ block: 'start' })
@@ -480,10 +476,10 @@ export const getAppEnvDeploymentConfigList = (
         {
             header: 'Secrets',
             id: EnvResourceType.Secret,
-            items: secretData.map(({ title, hasDiff, id }) => ({
-                title,
+            items: secretData.map(({ name, hasDiff, id }) => ({
+                title: name,
                 hasDiff,
-                href: getNavItemHref(EnvResourceType.Secret, title),
+                href: getNavItemHref(EnvResourceType.Secret, name),
                 onClick: () => {
                     const element = document.querySelector(`#${id}`)
                     element?.scrollIntoView({ block: 'start' })