Merge pull request #2577 from devtron-labs/revert-2402-feat/approval-policy-discovery

eshankvaish · web-flow · commit aab9e4a2566c · 2025-03-24T17:11:33.000+05:30
chore: revert: "feat: add support for redirection from protect config"
diff --git a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/AppConfig.tsx b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/AppConfig.tsx
@@ -56,7 +56,6 @@ import { ENV_CONFIG_PATH_REG } from './AppConfig.constants'
 
 const getApprovalPolicyConfigForApp: (appId: number) => Promise<ResourceIdToResourceApprovalPolicyConfigMapType> =
     importComponentFromFELibrary('getApprovalPolicyConfigForApp', null, 'function')
-const isFELibAvailable: boolean = importComponentFromFELibrary('isFELibAvailable', null, 'function')
 
 export const AppConfig = ({ appName, resourceKind, filteredEnvIds }: AppConfigProps) => {
     // HOOKS
@@ -469,15 +468,7 @@ export const AppConfig = ({ appName, resourceKind, filteredEnvIds }: AppConfigPr
         if (location.pathname.match(ENV_CONFIG_PATH_REG)) {
             return 'app-compose-env-configurations__nav'
         }
-        return `${
-            isGitOpsConfigurationRequired
-                ? 'app-compose-with-gitops-config__nav'
-                : 'app-compose-with-no-gitops-config__nav'
-        } ${isJob ? 'job-compose__side-nav' : ''} ${
-            !showCannotDeleteTooltip ? 'dc__position-rel' : ''
-        }  ${hideConfigHelp ? 'hide-app-config-help' : ''} ${!canShowExternalLinks ? 'hide-external-links' : ''}  ${
-            state.isUnlocked.workflowEditor && isFELibAvailable && !isJob ? 'config-protection__side-nav' : ''
-        }`
+        return !showCannotDeleteTooltip ? 'dc__position-rel' : ''
     }
 
     const toggleRepoSelectionTippy = () => {
diff --git a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/AppConfig.types.ts b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/AppConfig.types.ts
@@ -44,7 +44,6 @@ export enum STAGE_NAME {
     SECRETS = 'SECRETS',
     ENV_OVERRIDE = 'ENV_OVERRIDE',
     EXTERNAL_LINKS = 'EXTERNAL_LINKS',
-    PROTECT_CONFIGURATION = 'PROTECT_CONFIGURATION',
     REDIRECT_ITEM = 'REDIRECT_ITEM',
 }
 
diff --git a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/AppConfig.utils.ts b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/AppConfig.utils.ts
@@ -281,12 +281,6 @@ export const getNavItems = ({
                         flowCompletionPercent: completedPercent,
                         currentStep: completedSteps,
                     },
-                    {
-                        title: 'Protect Configuration',
-                        href: URLS.GLOBAL_CONFIG_APPROVAL_POLICY,
-                        stage: STAGE_NAME.PROTECT_CONFIGURATION,
-                        isLocked: false,
-                    },
                     {
                         title: 'Environment Override',
                         href: `/app/${appId}/edit/env-override`,
diff --git a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/Navigation/AppNavigation.tsx b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/Navigation/AppNavigation.tsx
@@ -42,8 +42,6 @@ import {
     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 { DEPLOYMENT_CONFIGURATION_RESOURCE_TYPE_ROUTE, URLS } from '../../../../../../config'
 import AppConfigurationCheckBox from './AppConfigurationCheckBox'
@@ -55,8 +53,6 @@ import { useAppConfigurationContext } from '../AppConfiguration.provider'
 import { renderNavItem } from './Navigation.helper'
 import { EnvConfigurationsNav } from './EnvConfigurationsNav'
 
-const isFELibAvailable = importComponentFromFELibrary('isFELibAvailable', null, 'function')
-
 export const AppNavigation = () => {
     // HOOKS
     const { path } = useRouteMatch()
@@ -68,7 +64,6 @@ export const AppNavigation = () => {
         deleteApp,
         canShowExternalLinks,
         showCannotDeleteTooltip,
-        isWorkflowEditorUnlocked,
         toggleRepoSelectionTippy,
         getRepo,
         isJobView,
@@ -196,25 +191,6 @@ export const AppNavigation = () => {
                                 )
                             }
 
-                            if (item.stage === STAGE_NAME.PROTECT_CONFIGURATION) {
-                                return (
-                                    isWorkflowEditorUnlocked &&
-                                    isFELibAvailable && (
-                                        <div key={item.stage}>
-                                            {!canShowExternalLinks && (
-                                                <div className="dc__border-bottom-n1 mt-8 mb-8" />
-                                            )}
-                                            {renderNavItem(item, null, {
-                                                target: '_blank',
-                                                icon: <ICArrowSquareOut className="icon-dim-16 dc__no-shrink scn-8" />,
-                                                tooltipContent:
-                                                    'Configuration change approval has been moved to Global Configuration',
-                                            })}
-                                        </div>
-                                    )
-                                )
-                            }
-
                             if (
                                 item.stage !== STAGE_NAME.ENV_OVERRIDE ||
                                 (item.stage === STAGE_NAME.ENV_OVERRIDE && item.isLocked)
diff --git a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/Navigation/Navigation.helper.tsx b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/Navigation/Navigation.helper.tsx
@@ -20,18 +20,15 @@ import {
     ApprovalConfigDataKindType,
     ApprovalConfigDataType,
     CollapsibleListItem,
-    ConditionalWrap,
     EnvResourceType,
     getIsApprovalPolicyConfigured,
     ResourceIdToResourceApprovalPolicyConfigMapType,
-    Tooltip,
 } from '@devtron-labs/devtron-fe-common-lib'
 
 import { ReactComponent as Lock } from '@Icons/ic-locked.svg'
 import { ReactComponent as ICStamp } from '@Icons/ic-stamp.svg'
 import { ResourceConfigStage, ResourceConfigState } from '@Pages/Applications/DevtronApps/service.types'
 
-import { AnchorHTMLAttributes, ReactElement } from 'react'
 import {
     CustomNavItemsType,
     EnvConfigRouteParams,
@@ -51,51 +48,29 @@ const renderNavItemIcon = (isLocked: boolean, isApprovalPolicyConfigured: boolea
     return null
 }
 
-const wrapWithTooltip = (content: string) => (children: ReactElement) => (
-    <Tooltip content={content} alwaysShowTippyOnHover placement="right">
-        {children}
-    </Tooltip>
-)
-
 /**
  *
  * @param item
  * @param hideApprovalPolicyIcon Used to hide the policy icon (applicable for jobs atm)
  */
-export const renderNavItem = (
-    item: CustomNavItemsType,
-    hideApprovalPolicyIcon?: boolean,
-    options?: {
-        target?: AnchorHTMLAttributes<HTMLAnchorElement>['target']
-        icon?: ReactElement
-        tooltipContent?: string
-    },
-) => {
+export const renderNavItem = (item: CustomNavItemsType, hideApprovalPolicyIcon?: boolean) => {
     const linkDataTestName = item.title.toLowerCase().split(' ').join('-')
 
     return (
-        <ConditionalWrap condition={!!options?.tooltipContent} wrap={wrapWithTooltip(options?.tooltipContent)}>
-            <NavLink
-                data-testid={`${linkDataTestName}-link`}
-                key={item.title}
-                onClick={(event) => {
-                    if (item.isLocked) {
-                        event.preventDefault()
-                    }
-                }}
-                className="dc__nav-item cursor fs-13 lh-32 cn-9 w-100 br-4 px-8 flexbox dc__align-items-center dc__content-space dc__no-decor"
-                to={item.href}
-                target={options?.target}
-            >
-                <span className="dc__truncate nav-text">{item.title}</span>
-                {options?.icon ??
-                    renderNavItemIcon(
-                        item.isLocked,
-                        !hideApprovalPolicyIcon && item.isProtectionAllowed,
-                        linkDataTestName,
-                    )}
-            </NavLink>
-        </ConditionalWrap>
+        <NavLink
+            data-testid={`${linkDataTestName}-link`}
+            key={item.title}
+            onClick={(event) => {
+                if (item.isLocked) {
+                    event.preventDefault()
+                }
+            }}
+            className="dc__nav-item cursor fs-13 lh-32 cn-7 w-100 br-4 px-8 flexbox dc__align-items-center dc__content-space dc__no-decor"
+            to={item.href}
+        >
+            <span className="dc__truncate nav-text">{item.title}</span>
+            {renderNavItemIcon(item.isLocked, !hideApprovalPolicyIcon && item.isProtectionAllowed, linkDataTestName)}
+        </NavLink>
     )
 }
 
diff --git a/src/components/cdPipeline/BuildCD.tsx b/src/components/cdPipeline/BuildCD.tsx
@@ -35,7 +35,6 @@ import {
     InfoBlock,
     ButtonVariantType,
     useMainContext,
-    Tooltip,
     MODES,
     useGetUserRoles,
 } from '@devtron-labs/devtron-fe-common-lib'
@@ -71,7 +70,6 @@ import { MigrateToDevtronProps } from './MigrateToDevtron/types'
 
 const VirtualEnvSelectionInfoText = importComponentFromFELibrary('VirtualEnvSelectionInfoText')
 const HelmManifestPush = importComponentFromFELibrary('HelmManifestPush')
-const ApprovalPolicyRedirectCard = importComponentFromFELibrary('ApprovalPolicyRedirectCard', null, 'function')
 
 export default function BuildCD({
     isAdvanced,
@@ -823,7 +821,6 @@ export default function BuildCD({
                 {isAdvanced ? renderAdvancedDeploymentStrategy() : renderBasicDeploymentStrategy()}
                 {isAdvanced && (
                     <>
-                        {ApprovalPolicyRedirectCard && <ApprovalPolicyRedirectCard />}
                         <CustomImageTags
                             formData={formData}
                             setFormData={setFormData}

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ export enum STAGE_NAME {`
`44`	`44`	`SECRETS = 'SECRETS',`
`45`	`45`	`ENV_OVERRIDE = 'ENV_OVERRIDE',`
`46`	`46`	`EXTERNAL_LINKS = 'EXTERNAL_LINKS',`
`47`		`- PROTECT_CONFIGURATION = 'PROTECT_CONFIGURATION',`
`48`	`47`	`REDIRECT_ITEM = 'REDIRECT_ITEM',`
`49`	`48`	`}`
`50`	`49`