Skip to content

Commit 894b9a7

Browse files
eshankvaisheshankvaish
committed
Merge branch 'develop' of github.com:devtron-labs/dashboard into feature/application-template
2 parents ec7bffa + aab9e4a commit 894b9a7

File tree

6 files changed

+16
-93
lines changed

6 files changed

+16
-93
lines changed

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ import { ENV_CONFIG_PATH_REG } from './AppConfig.constants'
5757

5858
const getApprovalPolicyConfigForApp: (appId: number) => Promise<ResourceIdToResourceApprovalPolicyConfigMapType> =
5959
importComponentFromFELibrary('getApprovalPolicyConfigForApp', null, 'function')
60-
const isFELibAvailable: boolean = importComponentFromFELibrary('isFELibAvailable', null, 'function')
6160

6261
export const AppConfig = ({ appName, resourceKind, filteredEnvIds, isTemplateView }: AppConfigProps) => {
6362
// HOOKS
@@ -492,15 +491,7 @@ export const AppConfig = ({ appName, resourceKind, filteredEnvIds, isTemplateVie
492491
if (location.pathname.match(ENV_CONFIG_PATH_REG)) {
493492
return 'app-compose-env-configurations__nav'
494493
}
495-
return `${
496-
isGitOpsConfigurationRequired
497-
? 'app-compose-with-gitops-config__nav'
498-
: 'app-compose-with-no-gitops-config__nav'
499-
} ${isJob ? 'job-compose__side-nav' : ''} ${
500-
!showCannotDeleteTooltip ? 'dc__position-rel' : ''
501-
} ${hideConfigHelp ? 'hide-app-config-help' : ''} ${!canShowExternalLinks ? 'hide-external-links' : ''} ${
502-
state.isUnlocked.workflowEditor && isFELibAvailable && !isJob ? 'config-protection__side-nav' : ''
503-
}`
494+
return !showCannotDeleteTooltip ? 'dc__position-rel' : ''
504495
}
505496

506497
const toggleRepoSelectionTippy = () => {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ export enum STAGE_NAME {
4545
SECRETS = 'SECRETS',
4646
ENV_OVERRIDE = 'ENV_OVERRIDE',
4747
EXTERNAL_LINKS = 'EXTERNAL_LINKS',
48-
PROTECT_CONFIGURATION = 'PROTECT_CONFIGURATION',
4948
REDIRECT_ITEM = 'REDIRECT_ITEM',
5049
}
5150

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -293,12 +293,6 @@ export const getNavItems = ({
293293
flowCompletionPercent: completedPercent,
294294
currentStep: completedSteps,
295295
},
296-
{
297-
title: 'Protect Configuration',
298-
href: URLS.GLOBAL_CONFIG_APPROVAL_POLICY,
299-
stage: STAGE_NAME.PROTECT_CONFIGURATION,
300-
isLocked: false,
301-
},
302296
]),
303297
{
304298
title: 'Environment Override',

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

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ import {
4242
TippyCustomized,
4343
TippyTheme,
4444
} from '@devtron-labs/devtron-fe-common-lib'
45-
import { importComponentFromFELibrary } from '@Components/common'
46-
import { ReactComponent as ICArrowSquareOut } from '@Icons/ic-arrow-square-out.svg'
4745
import { DEVTRON_APPS_STEPS, STAGE_NAME } from '../AppConfig.types'
4846
import { DEPLOYMENT_CONFIGURATION_RESOURCE_TYPE_ROUTE, URLS } from '../../../../../../config'
4947
import AppConfigurationCheckBox from './AppConfigurationCheckBox'
@@ -55,8 +53,6 @@ import { useAppConfigurationContext } from '../AppConfiguration.provider'
5553
import { renderNavItem } from './Navigation.helper'
5654
import { EnvConfigurationsNav } from './EnvConfigurationsNav'
5755

58-
const isFELibAvailable = importComponentFromFELibrary('isFELibAvailable', null, 'function')
59-
6056
export const AppNavigation = () => {
6157
// HOOKS
6258
const { path } = useRouteMatch()
@@ -68,7 +64,6 @@ export const AppNavigation = () => {
6864
deleteApp,
6965
canShowExternalLinks,
7066
showCannotDeleteTooltip,
71-
isWorkflowEditorUnlocked,
7267
toggleRepoSelectionTippy,
7368
getRepo,
7469
isJobView,
@@ -208,27 +203,6 @@ export const AppNavigation = () => {
208203
)
209204
}
210205

211-
if (item.stage === STAGE_NAME.PROTECT_CONFIGURATION) {
212-
return (
213-
isWorkflowEditorUnlocked &&
214-
isFELibAvailable && (
215-
<div key={item.stage}>
216-
{!canShowExternalLinks && (
217-
<div className="dc__border-bottom-n1 mt-8 mb-8" />
218-
)}
219-
{renderNavItem(item, null, {
220-
target: '_blank',
221-
icon: (
222-
<ICArrowSquareOut className="icon-dim-16 dc__no-shrink scn-8" />
223-
),
224-
tooltipContent:
225-
'Configuration change approval has been moved to Global Configuration',
226-
})}
227-
</div>
228-
)
229-
)
230-
}
231-
232206
if (
233207
item.stage !== STAGE_NAME.ENV_OVERRIDE ||
234208
(item.stage === STAGE_NAME.ENV_OVERRIDE && item.isLocked)

‎src/Pages/Applications/DevtronApps/Details/AppConfigurations/Navigation/Navigation.helper.tsx

Lines changed: 15 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,15 @@ import {
2020
ApprovalConfigDataKindType,
2121
ApprovalConfigDataType,
2222
CollapsibleListItem,
23-
ConditionalWrap,
2423
EnvResourceType,
2524
getIsApprovalPolicyConfigured,
2625
ResourceIdToResourceApprovalPolicyConfigMapType,
27-
Tooltip,
2826
} from '@devtron-labs/devtron-fe-common-lib'
2927

3028
import { ReactComponent as Lock } from '@Icons/ic-locked.svg'
3129
import { ReactComponent as ICStamp } from '@Icons/ic-stamp.svg'
3230
import { ResourceConfigStage, ResourceConfigState } from '@Pages/Applications/DevtronApps/service.types'
3331

34-
import { AnchorHTMLAttributes, ReactElement } from 'react'
3532
import {
3633
CustomNavItemsType,
3734
EnvConfigRouteParams,
@@ -51,51 +48,29 @@ const renderNavItemIcon = (isLocked: boolean, isApprovalPolicyConfigured: boolea
5148
return null
5249
}
5350

54-
const wrapWithTooltip = (content: string) => (children: ReactElement) => (
55-
<Tooltip content={content} alwaysShowTippyOnHover placement="right">
56-
{children}
57-
</Tooltip>
58-
)
59-
6051
/**
6152
*
6253
* @param item
6354
* @param hideApprovalPolicyIcon Used to hide the policy icon (applicable for jobs atm)
6455
*/
65-
export const renderNavItem = (
66-
item: CustomNavItemsType,
67-
hideApprovalPolicyIcon?: boolean,
68-
options?: {
69-
target?: AnchorHTMLAttributes<HTMLAnchorElement>['target']
70-
icon?: ReactElement
71-
tooltipContent?: string
72-
},
73-
) => {
56+
export const renderNavItem = (item: CustomNavItemsType, hideApprovalPolicyIcon?: boolean) => {
7457
const linkDataTestName = item.title.toLowerCase().split(' ').join('-')
7558

7659
return (
77-
<ConditionalWrap condition={!!options?.tooltipContent} wrap={wrapWithTooltip(options?.tooltipContent)}>
78-
<NavLink
79-
data-testid={`${linkDataTestName}-link`}
80-
key={item.title}
81-
onClick={(event) => {
82-
if (item.isLocked) {
83-
event.preventDefault()
84-
}
85-
}}
86-
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"
87-
to={item.href}
88-
target={options?.target}
89-
>
90-
<span className="dc__truncate nav-text">{item.title}</span>
91-
{options?.icon ??
92-
renderNavItemIcon(
93-
item.isLocked,
94-
!hideApprovalPolicyIcon && item.isProtectionAllowed,
95-
linkDataTestName,
96-
)}
97-
</NavLink>
98-
</ConditionalWrap>
60+
<NavLink
61+
data-testid={`${linkDataTestName}-link`}
62+
key={item.title}
63+
onClick={(event) => {
64+
if (item.isLocked) {
65+
event.preventDefault()
66+
}
67+
}}
68+
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"
69+
to={item.href}
70+
>
71+
<span className="dc__truncate nav-text">{item.title}</span>
72+
{renderNavItemIcon(item.isLocked, !hideApprovalPolicyIcon && item.isProtectionAllowed, linkDataTestName)}
73+
</NavLink>
9974
)
10075
}
10176

‎src/components/cdPipeline/BuildCD.tsx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ import {
3434
TriggerType,
3535
InfoBlock,
3636
ButtonVariantType,
37-
useMainContext,
38-
Tooltip,
3937
MODES,
40-
useGetUserRoles,
4138
} from '@devtron-labs/devtron-fe-common-lib'
4239
import { useParams, useHistory } from 'react-router-dom'
4340
import yamlJsParser from 'yaml'
@@ -71,7 +68,6 @@ import { MigrateToDevtronProps } from './MigrateToDevtron/types'
7168

7269
const VirtualEnvSelectionInfoText = importComponentFromFELibrary('VirtualEnvSelectionInfoText')
7370
const HelmManifestPush = importComponentFromFELibrary('HelmManifestPush')
74-
const ApprovalPolicyRedirectCard = importComponentFromFELibrary('ApprovalPolicyRedirectCard', null, 'function')
7571

7672
export default function BuildCD({
7773
isAdvanced,
@@ -110,11 +106,6 @@ export default function BuildCD({
110106
setReloadNoGitOpsRepoConfiguredModal,
111107
} = useContext(pipelineContext)
112108

113-
const {
114-
featureGitOpsFlags: { isFeatureArgoCdMigrationEnabled },
115-
} = useMainContext()
116-
const { isSuperAdmin } = useGetUserRoles()
117-
118109
const validationRules = new ValidationRules()
119110
const history = useHistory()
120111

@@ -824,7 +815,6 @@ export default function BuildCD({
824815
{isAdvanced ? renderAdvancedDeploymentStrategy() : renderBasicDeploymentStrategy()}
825816
{isAdvanced && (
826817
<>
827-
{ApprovalPolicyRedirectCard && <ApprovalPolicyRedirectCard />}
828818
<CustomImageTags
829819
formData={formData}
830820
setFormData={setFormData}

0 commit comments

Comments
 (0)