Skip to content

Commit 5b50d02

Browse files
committed
testing fixes
1 parent 501967f commit 5b50d02

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

src/components/cdPipeline/NewCDPipeline.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ export default function NewCDPipeline({
448448
form.enableCustomTag = pipelineConfigFromRes.enableCustomTag
449449
form.customTagStage = pipelineConfigFromRes.customTagStage
450450
form.isDigestEnforcedForEnv = pipelineConfigFromRes.isDigestEnforcedForEnv
451-
form.isDigestEnforcedForPipeline = pipelineConfigFromRes.isDigestEnforcedForEnv || pipelineConfigFromRes.isDigestEnforcedForPipeline
451+
form.isDigestEnforcedForPipeline = pipelineConfigFromRes.isDigestEnforcedForPipeline
452452

453453
if (pipelineConfigFromRes?.preDeployStage) {
454454
if(pipelineConfigFromRes.preDeployStage.steps?.length > 0){
@@ -571,6 +571,7 @@ export default function NewCDPipeline({
571571
enableCustomTag: formData.enableCustomTag,
572572
customTagStage: formData?.customTagStage ? formData.customTagStage : StageTypeEnums.PRE_CD,
573573
isDigestEnforcedForEnv: formData.isDigestEnforcedForEnv,
574+
isDigestEnforcedForPipeline: formData.isDigestEnforcedForPipeline,
574575
}
575576

576577
if (isVirtualEnvironment) {

src/components/cdPipeline/PullImageDigestToggle.tsx

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,31 @@ import { DIGEST_DISABLE_TOGGLE_MESSAGE } from '../../config'
88
function PullImageDigestToggle({ formData, setFormData }: PullImageDigestToggleType): JSX.Element {
99
const handleImageDigestToggle = (): void => {
1010
const _formData = { ...formData }
11-
_formData.isDigestEnforcedForEnv = !_formData.isDigestEnforcedForEnv
11+
_formData.isDigestEnforcedForPipeline = !_formData.isDigestEnforcedForPipeline
1212
setFormData(_formData)
1313
}
1414

15+
const getContentText = () => {
16+
let text = ''
17+
if (formData.isDigestEnforcedForEnv) {
18+
text = DIGEST_DISABLE_TOGGLE_MESSAGE
19+
} else if (formData.isDigestEnforcedForPipeline) {
20+
text = 'Image digest is enforced for this environment' // Later will be change
21+
}
22+
return text
23+
}
24+
1525
const renderDogestToggle = () => {
1626
return (
1727
<ConditionalWrap
18-
condition={formData.isDigestEnforcedForPipeline}
28+
condition={formData.isDigestEnforcedForEnv}
1929
wrap={(children) => (
20-
<Tippy className="default-tt w-200" content={DIGEST_DISABLE_TOGGLE_MESSAGE}>
30+
<Tippy className="default-tt w-200" content={getContentText()}>
2131
<div>{children}</div>
2232
</Tippy>
2333
)}
2434
>
25-
<div className={`w-32 h-20 ${formData.isDigestEnforcedForPipeline ? 'dc__opacity-0_4' : ''}`}>
35+
<div className={`w-32 h-20 ${formData.isDigestEnforcedForEnv ? 'dc__opacity-0_4' : ''}`}>
2636
<Toggle
2737
selected={formData.isDigestEnforcedForEnv}
2838
onSelect={handleImageDigestToggle}

0 commit comments

Comments
 (0)