fix: update goBackURL logic to handle Manifest resource type correctly

devtron-labs · Feb 14, 2025 · ba9d4e2 · ba9d4e2
1 parent 7c1596c
commit ba9d4e2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/...Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/AppComposeRouter.tsx b/...Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/AppComposeRouter.tsx
@@ -326,7 +326,10 @@ const AppComposeRouter = () => {
                         const resourceTypePath = `/${match.params.resourceType === EnvResourceType.Manifest || match.params.resourceType === EnvResourceType.PipelineStrategy ? EnvResourceType.DeploymentTemplate : match.params.resourceType}`
                         const resourceNamePath = match.params.resourceName ? `/${match.params.resourceName}` : ''
 
-                        const goBackURL = `${basePath}${envOverridePath}${resourceTypePath}${resourceNamePath}`
+                        const goBackURL =
+                            match.params.resourceType === EnvResourceType.Manifest
+                                ? `${basePath}${envOverridePath}`
+                                : `${basePath}${envOverridePath}${resourceTypePath}${resourceNamePath}`
 
                         return (
                             <DeploymentConfigCompare

diff --git a/src/Pages/Releases/Detail/Configurations/Configurations.tsx b/src/Pages/Releases/Detail/Configurations/Configurations.tsx
@@ -191,7 +191,10 @@ export const Configurations = () => {
                     const resourceTypePath = `/${match.params.resourceType === EnvResourceType.Manifest || match.params.resourceType === EnvResourceType.PipelineStrategy ? EnvResourceType.DeploymentTemplate : match.params.resourceType}`
                     const resourceNamePath = match.params.resourceName ? `/${match.params.resourceName}` : ''
 
-                    const goBackURL = `${basePath}${resourceTypePath}${resourceNamePath}`
+                    const goBackURL =
+                        match.params.resourceType === EnvResourceType.Manifest
+                            ? basePath
+                            : `${basePath}${resourceTypePath}${resourceNamePath}`
 
                     return showConfig ? (
                         <DeploymentConfigCompare

diff --git a/src/components/ApplicationGroup/Details/EnvironmentConfig/EnvConfig.tsx b/src/components/ApplicationGroup/Details/EnvironmentConfig/EnvConfig.tsx
@@ -156,7 +156,10 @@ const EnvConfig = ({ filteredAppIds, envName }: AppGroupDetailDefaultType) => {
                     const resourceTypePath = `/${match.params.resourceType === EnvResourceType.Manifest || match.params.resourceType === EnvResourceType.PipelineStrategy ? EnvResourceType.DeploymentTemplate : match.params.resourceType}`
                     const resourceNamePath = match.params.resourceName ? `/${match.params.resourceName}` : ''
 
-                    const goBackURL = `${basePath}${resourceTypePath}${resourceNamePath}`
+                    const goBackURL =
+                        match.params.resourceType === EnvResourceType.Manifest
+                            ? basePath
+                            : `${basePath}${resourceTypePath}${resourceNamePath}`
 
                     return (
                         <DeploymentConfigCompare