Skip to content

Commit 5f3c03a

Browse files
committed
fix for diable env
1 parent 4d665e7 commit 5f3c03a

File tree

4 files changed

+34
-12
lines changed

4 files changed

+34
-12
lines changed

src/components/cdPipeline/NewCDPipeline.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ export default function NewCDPipeline({
447447
form.enableCustomTag = pipelineConfigFromRes.enableCustomTag
448448
form.customTagStage = pipelineConfigFromRes.customTagStage
449449
form.isDigestEnforcedForEnv = pipelineConfigFromRes.isDigestEnforcedForEnv
450-
form.isDigestEnforcedForPipeline = pipelineConfigFromRes.isDigestEnforcedForPipeline
450+
form.isDigestEnforcedForPipeline = pipelineConfigFromRes.isDigestEnforcedForEnv? pipelineConfigFromRes.isDigestEnforcedForEnv : pipelineConfigFromRes.isDigestEnforcedForPipeline
451451

452452
if (pipelineConfigFromRes?.preDeployStage) {
453453
if(pipelineConfigFromRes.preDeployStage.steps?.length > 0){
Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,39 @@
1-
import { Toggle } from '@devtron-labs/devtron-fe-common-lib'
1+
import { ConditionalWrap, Toggle } from '@devtron-labs/devtron-fe-common-lib'
22
import React from 'react'
3+
import Tippy from '@tippyjs/react'
34
import { ReactComponent as DockerWithImage } from '../../assets/icons/ic-docker-with-image.svg'
45
import { PullImageDigestToggleType } from './types'
6+
import { DIGEST_DISABLE_TOGGLE_MESSAGE } from '../../config'
57

68
function PullImageDigestToggle({ formData, setFormData }: PullImageDigestToggleType): JSX.Element {
7-
const handleCustomTagToggle = (): void => {
9+
const handleImageDigestToggle = (): void => {
810
const _formData = { ...formData }
911
_formData.isDigestEnforcedForPipeline = !_formData.isDigestEnforcedForPipeline
1012
setFormData(_formData)
1113
}
1214

15+
const renderDogestToggle = () => {
16+
return (
17+
<ConditionalWrap
18+
condition={formData.isDigestEnforcedForEnv}
19+
wrap={(children) => (
20+
<Tippy className="default-tt w-200" content={DIGEST_DISABLE_TOGGLE_MESSAGE}>
21+
<div>{children}</div>
22+
</Tippy>
23+
)}
24+
>
25+
<div className={`w-32 h-20 ${formData.isDigestEnforcedForEnv ? 'dc__opacity-0_4' : ''}`}>
26+
<Toggle
27+
selected={formData.isDigestEnforcedForPipeline}
28+
onSelect={handleImageDigestToggle}
29+
dataTestId="create-build-pipeline-image-pull-digest-toggle"
30+
disabled={formData.isDigestEnforcedForEnv}
31+
/>
32+
</div>
33+
</ConditionalWrap>
34+
)
35+
}
36+
1337
const renderImageDigestBody = (): JSX.Element => {
1438
return (
1539
<div className="fs-13">
@@ -25,13 +49,7 @@ function PullImageDigestToggle({ formData, setFormData }: PullImageDigestToggleT
2549
</div>
2650
</div>
2751
</div>
28-
<div className="w-32 h-20">
29-
<Toggle
30-
selected={formData.isDigestEnforcedForPipeline}
31-
onSelect={handleCustomTagToggle}
32-
dataTestId="create-build-pipeline-image-pull-digest-toggle"
33-
/>
34-
</div>
52+
{renderDogestToggle()}
3553
</div>
3654
<hr />
3755
</div>
@@ -40,5 +58,4 @@ function PullImageDigestToggle({ formData, setFormData }: PullImageDigestToggleT
4058

4159
return renderImageDigestBody()
4260
}
43-
4461
export default PullImageDigestToggle

src/config/constants.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -810,4 +810,5 @@ export const ENV_ALREADY_EXIST_ERROR = 'Deployment pipeline already exists for t
810810
export const CVE_ID_NOT_FOUND = "CVE ID not found"
811811
export const CONFIGURE_LINK_NO_NAME = "Please provide name for the tool you want to link"
812812
export const NO_HOST_URL = "Please enter host url"
813-
export const WEBHOOK_NO_API_TOKEN_ERROR = "API Token is required to execute webhook"
813+
export const WEBHOOK_NO_API_TOKEN_ERROR = "API Token is required to execute webhook"
814+
export const DIGEST_DISABLE_TOGGLE_MESSAGE= "Pull image digest policy is enforced in Global Configurations. Go to Global Configurations to change."

src/css/base.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3676,6 +3676,10 @@ textarea::placeholder {
36763676
}
36773677

36783678
// opacity
3679+
.dc__opacity-0_4 {
3680+
opacity: 0.4;
3681+
}
3682+
36793683
.dc__opacity-0_5 {
36803684
opacity: 0.5;
36813685
}

0 commit comments

Comments
 (0)