fix(core/pipeline): ExecutionAndtagePicker Fix auto selection of stage (

#7640)
spinnaker · Nov 20, 2019 · dd0e3bb · dd0e3bb
1 parent 1a7e326
commit dd0e3bb
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/...pts/modules/core/src/pipeline/config/stages/evaluateVariables/ExecutionAndStagePicker.tsx b/...pts/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) };
+    }, {});
 }