Merge branch 'develop' of github.com:devtron-labs/dashboard into feat/notifications

Author: eshankvaish

.eslintignore

@@ -296,7 +296,7 @@ src/components/common/helpers/Helpers.tsx
 src/components/common/helpers/compareVersion.ts
 src/components/common/helpers/isSubset.ts
 src/components/common/helpers/time.ts
-src/components/common/helpers/util.ts
+src/components/common/helpers/utils.tsx
 src/components/common/helpers/workflowURL.ts
 src/components/common/hooks/FileReader.ts
 src/components/common/hooks/__tests__/FileReader.test.tsx

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.3.4",
+        "@devtron-labs/devtron-fe-common-lib": "0.3.6",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/Pages/Applications/DevtronApps/Details/AppConfigurations/AppConfig.types.ts

@@ -241,6 +241,7 @@ export interface ExtendedCollapsibleListItem
     configState: ResourceConfigState
 }
 
+// DEPLOYMENT CONFIG COMPARE INTERFACES & TYPES ------- START
 export interface DeploymentConfigParams {
     appId: string
     envId: string
@@ -276,6 +277,8 @@ export enum AppEnvDeploymentConfigQueryParams {
     COMPARE_WITH_IDENTIFIER_ID = 'compareWithIdentifierId',
     COMPARE_WITH_PIPELINE_ID = 'compareWithPipelineId',
     CHART_REF_ID = 'chartRefId',
+    MANIFEST_CHART_REF_ID = 'manifestChartRefId',
+    COMPARE_WITH_MANIFEST_CHART_REF_ID = 'compareWithManifestChartRefId',
 }
 
 export interface AppEnvDeploymentConfigQueryParamsType {
@@ -287,4 +290,29 @@ export interface AppEnvDeploymentConfigQueryParamsType {
     compareWithIdentifierId?: number
     compareWithPipelineId?: number
     chartRefId?: number
+    manifestChartRefId?: number
+    compareWithManifestChartRefId?: number
 }
+
+export type GetConfigDiffDataProps = Required<
+    Pick<DeploymentConfigCompareProps, 'appName' | 'envName' | 'type'> & {
+        configType: AppEnvDeploymentConfigType
+        compareName: string
+        identifierId: number
+        pipelineId: number
+    }
+>
+
+export type GetDeploymentTemplateDataProps = Omit<GetConfigDiffDataProps, 'identifierId' | 'pipelineId'>
+
+export type GetManifestDataProps = Pick<DeploymentConfigCompareProps, 'type' | 'environments'> & {
+    appId: string
+    envId: string
+    configType: AppEnvDeploymentConfigType
+    compareName: string
+    values: string
+    identifierId: number
+    pipelineId: number
+    manifestChartRefId: number
+}
+// DEPLOYMENT CONFIG COMPARE INTERFACES & TYPES ------- END

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/AppComposeRouter.tsx

@@ -302,7 +302,10 @@ const AppComposeRouter = () => {
                                   const envOverridePath = match.params.envId
                                       ? `/${URLS.APP_ENV_OVERRIDE_CONFIG}/${match.params.envId}`
                                       : ''
-                                  const resourceTypePath = `/${match.params.resourceType}`
+                                  // Set the resourceTypePath based on the resourceType from the URL parameters.
+                                  // If the resourceType is 'Manifest', use 'deployment-template' as the back URL.
+                                  // Otherwise, use the actual resourceType from the URL, which could be 'deployment-template', 'configmap', or 'secrets'.
+                                  const resourceTypePath = `/${match.params.resourceType === EnvResourceType.Manifest ? EnvResourceType.DeploymentTemplate : match.params.resourceType}`
                                   const resourceNamePath = match.params.resourceName
                                       ? `/${match.params.resourceName}`
                                       : ''