Skip to content

Commit c302204

Browse files
Merge pull request #1648 from devtron-labs/fix/ci-trigger-two-toast
fix: return from bulk ci trigger function on validation error
2 parents 0592f71 + 183f6cd commit c302204

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

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

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1520,6 +1520,26 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
15201520
}
15211521
}
15221522
const _CITriggerPromiseList = []
1523+
// Traversing each nodeListItem to verify if runtimeParams are valid, if not returning error message
1524+
const runtimeParamsNodesValidation = nodeList.reduce((acc, node) => {
1525+
const runtimeParamsValidationResponse = validateAndGetValidRuntimeParams(
1526+
runtimeParams?.[node.id] ?? [],
1527+
)
1528+
1529+
if (!runtimeParamsValidationResponse.isValid) {
1530+
acc.isValid = false
1531+
acc.message = runtimeParamsValidationResponse.message
1532+
}
1533+
return acc
1534+
}, { isValid: true, message: '' })
1535+
1536+
if (!runtimeParamsNodesValidation.isValid) {
1537+
setCDLoading(false)
1538+
setCILoading(false)
1539+
toast.error(runtimeParamsNodesValidation.message)
1540+
return
1541+
}
1542+
15231543
nodeList.forEach((node) => {
15241544
const gitMaterials = new Map<number, string[]>()
15251545
const ciPipelineMaterials = []
@@ -1555,12 +1575,6 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
15551575
const runtimeParamsValidationResponse = validateAndGetValidRuntimeParams(
15561576
runtimeParams?.[node.id] ?? [],
15571577
)
1558-
if (!runtimeParamsValidationResponse.isValid) {
1559-
setCDLoading(false)
1560-
setCILoading(false)
1561-
toast.error(runtimeParamsValidationResponse.message)
1562-
return
1563-
}
15641578

15651579
const payload = {
15661580
pipelineId: +node.id,

0 commit comments

Comments
 (0)