fix: update goBackURL logic to correctly handle resource types for Ma…

…nifest and PipelineStrategy
devtron-labs · Feb 14, 2025 · 1d90e58 · 1d90e58
1 parent ba9d4e2
commit 1d90e58
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/...Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/AppComposeRouter.tsx b/...Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/AppComposeRouter.tsx
@@ -320,16 +320,15 @@ const AppComposeRouter = () => {
                         const envOverridePath = match.params.envId
                             ? `/${URLS.APP_ENV_OVERRIDE_CONFIG}/${match.params.envId}`
                             : `/${URLS.BASE_CONFIG}`
-                        // Set the resourceTypePath based on the resourceType from the URL parameters.
-                        // If the resourceType is 'Manifest' or 'PipelineStrategy', 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 || match.params.resourceType === EnvResourceType.PipelineStrategy ? EnvResourceType.DeploymentTemplate : match.params.resourceType}`
+
+                        // Used in CM/CS
                         const resourceNamePath = match.params.resourceName ? `/${match.params.resourceName}` : ''
 
                         const goBackURL =
-                            match.params.resourceType === EnvResourceType.Manifest
+                            match.params.resourceType === EnvResourceType.Manifest ||
+                            match.params.resourceType === EnvResourceType.PipelineStrategy
                                 ? `${basePath}${envOverridePath}`
-                                : `${basePath}${envOverridePath}${resourceTypePath}${resourceNamePath}`
+                                : `${basePath}${envOverridePath}/${match.params.resourceType}${resourceNamePath}`
 
                         return (
                             <DeploymentConfigCompare

diff --git a/src/Pages/Releases/Detail/Configurations/Configurations.tsx b/src/Pages/Releases/Detail/Configurations/Configurations.tsx
@@ -185,16 +185,14 @@ export const Configurations = () => {
             >
                 {({ match, location }) => {
                     const basePath = generatePath(path, match.params)
-                    // Set the resourceTypePath based on the resourceType from the URL parameters.
-                    // If the resourceType is 'Manifest' or 'PipelineStrategy', 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 || match.params.resourceType === EnvResourceType.PipelineStrategy ? EnvResourceType.DeploymentTemplate : match.params.resourceType}`
+                    // Used in cm/cs
                     const resourceNamePath = match.params.resourceName ? `/${match.params.resourceName}` : ''
 
                     const goBackURL =
-                        match.params.resourceType === EnvResourceType.Manifest
+                        match.params.resourceType === EnvResourceType.Manifest ||
+                        match.params.resourceType === EnvResourceType.PipelineStrategy
                             ? basePath
-                            : `${basePath}${resourceTypePath}${resourceNamePath}`
+                            : `${basePath}/${match.params.resourceType}${resourceNamePath}`
 
                     return showConfig ? (
                         <DeploymentConfigCompare

diff --git a/src/components/ApplicationGroup/Details/EnvironmentConfig/EnvConfig.tsx b/src/components/ApplicationGroup/Details/EnvironmentConfig/EnvConfig.tsx
@@ -150,16 +150,13 @@ const EnvConfig = ({ filteredAppIds, envName }: AppGroupDetailDefaultType) => {
             >
                 {({ match, location }) => {
                     const basePath = generatePath(path, match.params)
-                    // Set the resourceTypePath based on the resourceType from the URL parameters.
-                    // If the resourceType is 'Manifest' or 'PipelineStrategy', 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 || match.params.resourceType === EnvResourceType.PipelineStrategy ? EnvResourceType.DeploymentTemplate : match.params.resourceType}`
+                    // Used in cm/cs
                     const resourceNamePath = match.params.resourceName ? `/${match.params.resourceName}` : ''
-
                     const goBackURL =
-                        match.params.resourceType === EnvResourceType.Manifest
+                        match.params.resourceType === EnvResourceType.Manifest ||
+                        match.params.resourceType === EnvResourceType.PipelineStrategy
                             ? basePath
-                            : `${basePath}${resourceTypePath}${resourceNamePath}`
+                            : `${basePath}/${match.params.resourceType}${resourceNamePath}`
 
                     return (
                         <DeploymentConfigCompare