Skip to content

Commit 501967f

Browse files
committed
fix for deployment environment
1 parent 3cb534b commit 501967f

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

src/components/cdPipeline/BuildCD.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ export default function BuildCD({
150150
? GeneratedHelmPush.DO_NOT_PUSH
151151
: GeneratedHelmPush.PUSH
152152
_form.allowedDeploymentTypes = selection.allowedDeploymentTypes
153+
_form.isDigestEnforcedForEnv = _form.environments.find((env) => env.id == selection.id)?.isDigestEnforcedForEnv
153154
setFormDataErrorObj(_formDataErrorObj)
154155
setFormData(_form)
155156
} else {

src/components/cdPipeline/CDPipeline.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ export default class CDPipeline extends Component<CDPipelineProps, CDPipelineSta
271271
description: env.description,
272272
isVirtualEnvironment: env.isVirtualEnvironment, //Virtual environment is valid for virtual cluster on selection of environment
273273
allowedDeploymentTypes: env.allowedDeploymentTypes || [],
274+
isDigestEnforcedForEnv: env.isDigestEnforcedForEnv,
274275
}
275276
})
276277
environments = environments.sort((a, b) => {
@@ -709,6 +710,7 @@ export default class CDPipeline extends Component<CDPipelineProps, CDPipelineSta
709710
}
710711

711712
savePipeline() {
713+
console.log(this.state.environments)
712714
const { pipelineConfig, errorForm } = { ...this.state }
713715
errorForm.pipelineNameError = this.validationRules.name(pipelineConfig.name)
714716
if (!this.state.pipelineConfig.isVirtualEnvironment) {
@@ -777,6 +779,7 @@ export default class CDPipeline extends Component<CDPipelineProps, CDPipelineSta
777779
}
778780
pipeline.preStage.config = pipeline.preStage.config.replace(/^\s+|\s+$/g, '')
779781
pipeline.postStage.config = pipeline.postStage.config.replace(/^\s+|\s+$/g, '')
782+
pipeline.isDigestEnforcedForEnv = this.state.environments.find((env) => env.id === pipelineConfig.environmentId).isDigestEnforcedForEnv
780783

781784
if (this.state.pipelineConfig.isVirtualEnvironment) {
782785
pipeline.deploymentAppType =

src/components/cdPipeline/NewCDPipeline.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ export default function NewCDPipeline({
263263
description: env.description,
264264
isVirtualEnvironment: env.isVirtualEnvironment,
265265
allowedDeploymentTypes: env.allowedDeploymentTypes || [],
266+
isDigestEnforcedForEnv: env.isDigestEnforcedForEnv,
266267
}
267268
})
268269
sortObjectArrayAlphabetically(list, 'name')
@@ -569,7 +570,6 @@ export default function NewCDPipeline({
569570
},
570571
enableCustomTag: formData.enableCustomTag,
571572
customTagStage: formData?.customTagStage ? formData.customTagStage : StageTypeEnums.PRE_CD,
572-
isDigestEnforcedForPipeline: formData.isDigestEnforcedForPipeline,
573573
isDigestEnforcedForEnv: formData.isDigestEnforcedForEnv,
574574
}
575575

src/components/cdPipeline/PullImageDigestToggle.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ 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.isDigestEnforcedForPipeline = !_formData.isDigestEnforcedForPipeline
11+
_formData.isDigestEnforcedForEnv = !_formData.isDigestEnforcedForEnv
1212
setFormData(_formData)
1313
}
1414

1515
const renderDogestToggle = () => {
1616
return (
1717
<ConditionalWrap
18-
condition={formData.isDigestEnforcedForEnv}
18+
condition={formData.isDigestEnforcedForPipeline}
1919
wrap={(children) => (
2020
<Tippy className="default-tt w-200" content={DIGEST_DISABLE_TOGGLE_MESSAGE}>
2121
<div>{children}</div>
2222
</Tippy>
2323
)}
2424
>
25-
<div className={`w-32 h-20 ${formData.isDigestEnforcedForEnv ? 'dc__opacity-0_4' : ''}`}>
25+
<div className={`w-32 h-20 ${formData.isDigestEnforcedForPipeline ? 'dc__opacity-0_4' : ''}`}>
2626
<Toggle
27-
selected={formData.isDigestEnforcedForPipeline}
27+
selected={formData.isDigestEnforcedForEnv}
2828
onSelect={handleImageDigestToggle}
2929
dataTestId="create-build-pipeline-image-pull-digest-toggle"
3030
disabled={formData.isDigestEnforcedForEnv}

src/components/cdPipeline/cdPipeline.types.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export interface Environment {
5858
isClusterCdActive: boolean
5959
isVirtualEnvironment?: boolean
6060
allowedDeploymentTypes?: DeploymentAppTypes[]
61+
isDigestEnforcedForEnv?: boolean
6162
}
6263
export interface CommonError {
6364
isValid: boolean
@@ -135,6 +136,7 @@ export interface PipelineConfig {
135136
userApprovalConfig?: {
136137
requiredCount: number
137138
}
139+
isDigestEnforcedForEnv?: boolean
138140
}
139141

140142
export interface BasicCDPipelineModalProps {

0 commit comments

Comments
 (0)