feat: redirect non super admin to config maps in configuration view instead of Deployment template

src/Pages/Applications/DevtronApps/Details/AppConfigurations/AppConfig.tsx

@@ -27,6 +27,7 @@ import {
     ResourceIdToResourceApprovalPolicyConfigMapType,
     ConfirmationModal,
     ConfirmationModalVariantType,
+    noop,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { DeleteComponentsName } from '@Config/constantMessaging'
 import { ApplicationDeletionInfo } from '@Pages/Shared/ApplicationDeletionInfo/ApplicationDeletionInfo'
@@ -40,6 +41,7 @@ import {
     AppStageUnlockedType,
     STAGE_NAME,
     DEFAULT_LANDING_STAGE,
+    EnvConfigType,
 } from './AppConfig.types'
 import { getUserRole } from '../../../../GlobalConfigurations/Authorization/authorization.service'
 import { isCIPipelineCreated, isCDPipelineCreated, getNavItems, isUnlocked } from './AppConfig.utils'
@@ -140,12 +142,12 @@ export const AppConfig = ({ appName, resourceKind, filteredEnvIds }: AppConfigPr
      *
      * @param envId - The ID of the environment for which the configuration is to be fetched.
      */
-    const fetchEnvConfig = (envId: number) => {
+    const fetchEnvConfig = (envId: number, callback: (res: EnvConfigType) => void = noop) => {
         // Set loading state to true
         setState((prevState) => ({ ...prevState, envConfig: { ...prevState.envConfig, isLoading: true } }))
 
         // Fetch environment configuration
-        getEnvConfig(+appId, envId)
+        getEnvConfig(+appId, envId, callback)
             .then((res) => {
                 setState((prevState) => ({
                     ...prevState,

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

@@ -153,7 +153,7 @@ interface CommonAppConfigurationProps {
     deleteApp: () => void
     showCannotDeleteTooltip: boolean
     hideConfigHelp: boolean
-    fetchEnvConfig: (envId: number) => void
+    fetchEnvConfig: (envId: number, callback?: (res: EnvConfigType) => void) => void
 }
 
 export interface AppConfigurationContextType
@@ -206,7 +206,7 @@ export interface EnvironmentOptionType {
 
 export interface EnvConfigurationsNavProps {
     envConfig: EnvConfigurationState
-    fetchEnvConfig: (envId: number) => void
+    fetchEnvConfig: AppConfigurationContextType['fetchEnvConfig']
     environments: EnvironmentOptionType[]
     paramToCheck?: 'appId' | 'envId'
     goBackURL: string
@@ -223,12 +223,16 @@ export interface EnvConfigurationsNavProps {
     isCMSecretLocked?: boolean
     hideEnvSelector?: boolean
     appOrEnvIdToResourceApprovalConfigurationMap: AppConfigState['envIdToEnvApprovalConfigurationMap']
+    /**
+     * @default false
+     */
+    removeBaseConfigPath?: boolean
 }
 
 export interface EnvConfigRouteParams {
     appId: string
     envId: string
-    resourceType: string
+    resourceType?: EnvResourceType
 }
 
 export interface ExtendedCollapsibleListItem

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

@@ -19,10 +19,10 @@ import {
     stringComparatorBySortOrder,
     ConfigResourceType,
     BASE_CONFIGURATION_ENV_ID,
+    EnvResourceType,
 } from '@devtron-labs/devtron-fe-common-lib'
 
 import { URLS, DOCUMENTATION } from '@Config/index'
-
 import { AppConfigStatusItemType, EnvConfigDTO } from '../../service.types'
 import { AppConfigState, AppStageUnlockedType, CustomNavItemsType, EnvConfigType, STAGE_NAME } from './AppConfig.types'
 
@@ -145,7 +145,7 @@ export const getNavItems = ({
                     },
                     {
                         title: 'ConfigMaps & Secrets',
-                        href: `/job/${appId}/edit/configmap`,
+                        href: `/job/${appId}/edit/${EnvResourceType.ConfigMap}`,
                         stage: STAGE_NAME.REDIRECT_ITEM,
                         isLocked: !_isUnlocked.configmap,
                         isProtectionAllowed: true,
@@ -211,7 +211,7 @@ export const getNavItems = ({
                     },
                     {
                         title: 'Base Configurations',
-                        href: `/app/${appId}/edit/deployment-template`,
+                        href: `${URLS.APP}/${appId}/${URLS.APP_CONFIG}/${URLS.BASE_CONFIG}`,
                         stage: STAGE_NAME.REDIRECT_ITEM,
                         isLocked: !_isUnlocked.deploymentTemplate,
                         isProtectionAllowed:

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

@@ -26,7 +26,7 @@ import {
 } from '@devtron-labs/devtron-fe-common-lib'
 
 import { ReactComponent as Next } from '@Icons/ic-arrow-forward.svg'
-import { URLS } from '@Config/index'
+import { DEPLOYMENT_CONFIGURATION_RESOURCE_TYPE_ROUTE, URLS } from '@Config/index'
 import { ErrorBoundary, useAppContext } from '@Components/common'
 import ExternalLinks from '@Components/externalLinks/ExternalLinks'
 import { ConfigMapSecretWrapper } from '@Pages/Shared/ConfigMapSecret/ConfigMapSecret.wrapper'
@@ -196,6 +196,7 @@ const AppComposeRouter = () => {
                     />
                 </>
             </Route>
+
             {isUnlocked.dockerBuildConfig && (
                 <Route path={`${path}/${URLS.APP_DOCKER_CONFIG}`}>
                     <CIConfig
@@ -205,6 +206,13 @@ const AppComposeRouter = () => {
                     />
                 </Route>
             )}
+
+            {(isUnlocked.deploymentTemplate || isUnlocked.workflowEditor) && (
+                <Route path={`${path}/${URLS.BASE_CONFIG}`}>
+                    <Progressing pageLoader />
+                </Route>
+            )}
+
             {isUnlocked.deploymentTemplate && (
                 <Route path={`${path}/${URLS.APP_DEPLOYMENT_CONFIG}`}>
                     <DeploymentTemplate
@@ -293,7 +301,8 @@ const AppComposeRouter = () => {
                 </Route>,
                 <Route
                     key={`${path}/${URLS.APP_ENV_CONFIG_COMPARE}`}
-                    path={`${path}/:envId(\\d+)?/${URLS.APP_ENV_CONFIG_COMPARE}/:compareTo?/:resourceType(${Object.values(EnvResourceType).join('|')})/:resourceName?`}
+                    // TODO: Check this resourceType should not be optional in compare view
+                    path={`${path}/:envId(\\d+)?/${URLS.APP_ENV_CONFIG_COMPARE}/:compareTo?/${DEPLOYMENT_CONFIGURATION_RESOURCE_TYPE_ROUTE}/:resourceName?`}
                 >
                     {({ match }) => {
                         const basePath = generatePath(path, match.params)

src/Pages/Applications/DevtronApps/Details/AppConfigurations/Navigation/AppNavigation.tsx

@@ -32,21 +32,20 @@
  */
 
 import { ReactNode } from 'react'
-import { Route, Switch, useLocation, useRouteMatch } from 'react-router-dom'
+import { match as matchType, Route, Switch, useLocation, useRouteMatch } from 'react-router-dom'
 import {
     Button,
     ButtonStyleType,
     ButtonVariantType,
     ComponentSizeType,
     ConditionalWrap,
-    EnvResourceType,
     TippyCustomized,
     TippyTheme,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { importComponentFromFELibrary } from '@Components/common'
 import { ReactComponent as ICArrowSquareOut } from '@Icons/ic-arrow-square-out.svg'
 import { DEVTRON_APPS_STEPS, STAGE_NAME } from '../AppConfig.types'
-import { URLS } from '../../../../../../config'
+import { DEPLOYMENT_CONFIGURATION_RESOURCE_TYPE_ROUTE, URLS } from '../../../../../../config'
 import AppConfigurationCheckBox from './AppConfigurationCheckBox'
 import { GIT_MATERIAL_IN_USE_MESSAGE } from '../../../../../../config/constantMessaging'
 import DockerFileInUse from '../../../../../../assets/img/ic-dockerfile-in-use.png'
@@ -141,33 +140,41 @@ export const AppNavigation = () => {
         return secondLastUnlockedStage || lastUnlockedStage
     }
 
+    const renderEnvConfigurationsNav = (match: matchType, isBaseConfig?: boolean) => (
+        <EnvConfigurationsNav
+            key={`env-configurations-nav-${'envId' in match.params ? match.params.envId : ''}`}
+            envConfig={envConfig}
+            fetchEnvConfig={fetchEnvConfig}
+            environments={environments.map(({ environmentName, environmentId }) => ({
+                id: environmentId,
+                name: environmentName,
+            }))}
+            showBaseConfigurations
+            showDeploymentTemplate={!isJobView}
+            goBackURL={getValidBackURL()}
+            compareWithURL={`${path}/:envId(\\d+)?`}
+            showComparison={!isJobView && isUnlocked.workflowEditor}
+            isCMSecretLocked={!isUnlocked.workflowEditor}
+            appOrEnvIdToResourceApprovalConfigurationMap={envIdToEnvApprovalConfigurationMap}
+            removeBaseConfigPath={isBaseConfig}
+        />
+    )
+
     return (
         <Switch>
             <Route
                 path={[
-                    `${path}/:resourceType(${Object.values(EnvResourceType).join('|')})`,
-                    `${path}/${URLS.APP_ENV_OVERRIDE_CONFIG}/:envId(\\d+)/:resourceType(${Object.values(EnvResourceType).join('|')})`,
+                    `${path}/${DEPLOYMENT_CONFIGURATION_RESOURCE_TYPE_ROUTE}`,
+                    `${path}/${URLS.APP_ENV_OVERRIDE_CONFIG}/:envId(\\d+)/${DEPLOYMENT_CONFIGURATION_RESOURCE_TYPE_ROUTE}?`,
                 ]}
             >
-                {({ match }) => (
-                    <EnvConfigurationsNav
-                        key={`env-configurations-nav-${'envId' in match.params ? match.params.envId : ''}`}
-                        envConfig={envConfig}
-                        fetchEnvConfig={fetchEnvConfig}
-                        environments={environments.map(({ environmentName, environmentId }) => ({
-                            id: environmentId,
-                            name: environmentName,
-                        }))}
-                        showBaseConfigurations
-                        showDeploymentTemplate={!isJobView}
-                        goBackURL={getValidBackURL()}
-                        compareWithURL={`${path}/:envId(\\d+)?`}
-                        showComparison={!isJobView && isUnlocked.workflowEditor}
-                        isCMSecretLocked={!isUnlocked.workflowEditor}
-                        appOrEnvIdToResourceApprovalConfigurationMap={envIdToEnvApprovalConfigurationMap}
-                    />
-                )}
+                {({ match }) => renderEnvConfigurationsNav(match)}
             </Route>
+
+            <Route path={`${path}/${URLS.BASE_CONFIG}`} key={URLS.BASE_CONFIG}>
+                {({ match }) => renderEnvConfigurationsNav(match, true)}
+            </Route>
+
             <Route key="default-navigation">
                 <>
                     <div className="flexbox-col flex-grow-1 dc__overflow-auto w-100 pt-16 px-12">