Skip to content

Commit e7fe7f1

Browse files
committed
fix: payload in case of bulk trigger
1 parent e42cb9b commit e7fe7f1

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

src/components/ApplicationGroup/Details/TriggerView/EnvTriggerView.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,9 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
978978
ciPipelineMaterials,
979979
invalidateCache,
980980
pipelineType: node.isJobCI ? CIPipelineBuildType.CI_JOB : CIPipelineBuildType.CI_BUILD,
981-
...(!node.isJobCI ? { runtimeParams: runtimeParamsValidationResponse.validParams } : {}),
981+
...(getRuntimeParams && !node.isJobCI
982+
? { runtimeParams: runtimeParamsValidationResponse.validParams }
983+
: {}),
982984
}
983985

984986
triggerCINode(payload)
@@ -1551,7 +1553,7 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
15511553
}
15521554

15531555
const runtimeParamsValidationResponse = validateAndGetValidRuntimeParams(
1554-
runtimeParams?.[selectedCINode?.id] ?? [],
1556+
runtimeParams?.[node.id] ?? [],
15551557
)
15561558
if (!runtimeParamsValidationResponse.isValid) {
15571559
setCDLoading(false)
@@ -1565,7 +1567,9 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
15651567
ciPipelineMaterials,
15661568
invalidateCache: appIgnoreCache[+node.id],
15671569
pipelineType: node.isJobCI ? CIPipelineBuildType.CI_JOB : CIPipelineBuildType.CI_BUILD,
1568-
...(!node.isJobCI ? { runtimeParams: runtimeParamsValidationResponse?.validParams } : {}),
1570+
...(getRuntimeParams && !node.isJobCI
1571+
? { runtimeParams: runtimeParamsValidationResponse?.validParams }
1572+
: {}),
15691573
}
15701574
_CITriggerPromiseList.push(triggerCINode(payload))
15711575
})

src/components/app/details/triggerView/TriggerView.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,9 @@ class TriggerView extends Component<TriggerViewProps, TriggerViewState> {
858858
invalidateCache: this.state.invalidateCache,
859859
environmentId: envId,
860860
pipelineType: node.isJobCI ? CIPipelineBuildType.CI_JOB : CIPipelineBuildType.CI_BUILD,
861-
...(!node.isJobCI && !this.props.isJobView ? { runtimeParams: runtimeParamsValidationResponse.validParams } : {}),
861+
...(getRuntimeParams && !node.isJobCI && !this.props.isJobView
862+
? { runtimeParams: runtimeParamsValidationResponse.validParams }
863+
: {}),
862864
}
863865

864866
triggerCINode(payload)

src/components/common/GitInfoMaterial.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,12 @@ export default function GitInfoMaterial({
331331
)
332332
}
333333

334+
const getRuntimeParametersHeading = () => {
335+
const headingPrefix = 'Pass parameters'
336+
const headingSuffix = appName ? `for '${appName}'` : ''
337+
return `${headingPrefix} ${headingSuffix}`
338+
}
339+
334340
function renderMaterialHistory(selectedMaterial: CIMaterialType) {
335341
const anyCommit = selectedMaterial.history?.length > 0
336342
const isWebhook = selectedMaterial.type === SourceTypeMap.WEBHOOK
@@ -381,7 +387,7 @@ export default function GitInfoMaterial({
381387

382388
return (
383389
<RuntimeParameters
384-
heading={`Pass parameters ${appName ? `for '${appName}'` : ''}`}
390+
heading={getRuntimeParametersHeading()}
385391
parameters={runtimeParams}
386392
handleKeyValueChange={handleRuntimeParametersChange}
387393
isJobCI={isJobCI}

0 commit comments

Comments
 (0)