From dd0e3bbd273745955ef2724a8fbc6dea634212cc Mon Sep 17 00:00:00 2001 From: Chris Thielen Date: Wed, 20 Nov 2019 11:00:03 -0700 Subject: [PATCH] fix(core/pipeline): ExecutionAndtagePicker Fix auto selection of stage (#7640) --- .../ExecutionAndStagePicker.tsx | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/scripts/modules/core/src/pipeline/config/stages/evaluateVariables/ExecutionAndStagePicker.tsx b/app/scripts/modules/core/src/pipeline/config/stages/evaluateVariables/ExecutionAndStagePicker.tsx index 26911d74c73..6a4ed51163d 100644 --- a/app/scripts/modules/core/src/pipeline/config/stages/evaluateVariables/ExecutionAndStagePicker.tsx +++ b/app/scripts/modules/core/src/pipeline/config/stages/evaluateVariables/ExecutionAndStagePicker.tsx @@ -143,11 +143,13 @@ function findCloseStageFromExecution(pipeline: IPipeline, execution: IExecution, } function stageRequisiteStageGraph(stage: IStage, allStages: { [key: string]: IStage }): { [key: string]: any } { - return stage.requisiteStageRefIds.reduce((acc, requisiteStageId) => { - const requisiteStage = allStages[requisiteStageId]; - if (!requisiteStage) { - return acc; - } - return { ...acc, [requisiteStageId]: stageRequisiteStageGraph(requisiteStage, allStages) }; - }, {}); + return stage.requisiteStageRefIds + .filter(ref => /^[0-9]+$/.exec(ref.toString())) + .reduce((acc, requisiteStageId) => { + const requisiteStage = allStages[requisiteStageId]; + if (!requisiteStage) { + return acc; + } + return { ...acc, [requisiteStageId]: stageRequisiteStageGraph(requisiteStage, allStages) }; + }, {}); }