File tree Expand file tree Collapse file tree 2 files changed +16
-5
lines changed
src/components/cdPipeline Expand file tree Collapse file tree 2 files changed +16
-5
lines changed Original file line number Diff line number Diff line change @@ -448,7 +448,7 @@ export default function NewCDPipeline({
448
448
form . enableCustomTag = pipelineConfigFromRes . enableCustomTag
449
449
form . customTagStage = pipelineConfigFromRes . customTagStage
450
450
form . isDigestEnforcedForEnv = pipelineConfigFromRes . isDigestEnforcedForEnv
451
- form . isDigestEnforcedForPipeline = pipelineConfigFromRes . isDigestEnforcedForEnv || pipelineConfigFromRes . isDigestEnforcedForPipeline
451
+ form . isDigestEnforcedForPipeline = pipelineConfigFromRes . isDigestEnforcedForPipeline
452
452
453
453
if ( pipelineConfigFromRes ?. preDeployStage ) {
454
454
if ( pipelineConfigFromRes . preDeployStage . steps ?. length > 0 ) {
@@ -571,6 +571,7 @@ export default function NewCDPipeline({
571
571
enableCustomTag : formData . enableCustomTag ,
572
572
customTagStage : formData ?. customTagStage ? formData . customTagStage : StageTypeEnums . PRE_CD ,
573
573
isDigestEnforcedForEnv : formData . isDigestEnforcedForEnv ,
574
+ isDigestEnforcedForPipeline : formData . isDigestEnforcedForPipeline ,
574
575
}
575
576
576
577
if ( isVirtualEnvironment ) {
Original file line number Diff line number Diff line change @@ -8,21 +8,31 @@ import { DIGEST_DISABLE_TOGGLE_MESSAGE } from '../../config'
8
8
function PullImageDigestToggle ( { formData, setFormData } : PullImageDigestToggleType ) : JSX . Element {
9
9
const handleImageDigestToggle = ( ) : void => {
10
10
const _formData = { ...formData }
11
- _formData . isDigestEnforcedForEnv = ! _formData . isDigestEnforcedForEnv
11
+ _formData . isDigestEnforcedForPipeline = ! _formData . isDigestEnforcedForPipeline
12
12
setFormData ( _formData )
13
13
}
14
14
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
+
15
25
const renderDogestToggle = ( ) => {
16
26
return (
17
27
< ConditionalWrap
18
- condition = { formData . isDigestEnforcedForPipeline }
28
+ condition = { formData . isDigestEnforcedForEnv }
19
29
wrap = { ( children ) => (
20
- < Tippy className = "default-tt w-200" content = { DIGEST_DISABLE_TOGGLE_MESSAGE } >
30
+ < Tippy className = "default-tt w-200" content = { getContentText ( ) } >
21
31
< div > { children } </ div >
22
32
</ Tippy >
23
33
) }
24
34
>
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' : '' } ` } >
26
36
< Toggle
27
37
selected = { formData . isDigestEnforcedForEnv }
28
38
onSelect = { handleImageDigestToggle }
You can’t perform that action at this time.
0 commit comments