From 95b1f5c3d03823f9bf1e86a33994c61e0ef70b83 Mon Sep 17 00:00:00 2001
From: Chris Thielen <github@sandgnat.com>
Date: Tue, 29 Jan 2019 13:09:21 -0800
Subject: [PATCH] fix(core/pipeline): Support expressions for pipeline name in
 the pipeline stage

---
 .../config/stages/pipeline/pipelineStage.html |  4 ++--
 .../config/stages/pipeline/pipelineStage.js   | 23 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.html b/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.html
index 0c029d96eda..4da1150ded4 100644
--- a/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.html
+++ b/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.html
@@ -13,8 +13,8 @@
     </ui-select>
   </stage-config-field>
   <stage-config-field label="Pipeline">
-    <input ng-model="stage.pipeline" class="form-control input-sm" ng-if="stage.application.includes('${')" />
-    <div ng-if="stage.application && viewState.pipelinesLoaded && !stage.application.includes('${')">
+    <input ng-model="stage.pipeline" class="form-control input-sm" ng-if="stage.pipeline.includes('${') || stage.application.includes('${')" />
+    <div ng-if="stage.application && viewState.pipelinesLoaded && stage !== null && !stage.pipeline.includes('${') && !stage.application.includes('${')">
       <ui-select class="form-control input-sm"
                  ng-model="stage.pipeline">
         <ui-select-match placeholder="Select a pipeline...">{{$select.selected.name}}</ui-select-match>
diff --git a/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.js b/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.js
index 2a5659d3aa4..3c0e6715c19 100644
--- a/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.js
+++ b/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.js
@@ -58,14 +58,10 @@ module.exports = angular
     function initializeMasters() {
       if ($scope.stage.application && !$scope.stage.application.includes('${')) {
         PipelineConfigService.getPipelinesForApplication($scope.stage.application).then(function(pipelines) {
-          $scope.pipelines = _.filter(pipelines, function(pipeline) {
-            return pipeline.id !== $scope.pipeline.id;
-          });
-          if (
-            !_.find(pipelines, function(pipeline) {
-              return pipeline.id === $scope.stage.pipeline;
-            })
-          ) {
+          $scope.pipelines = _.filter(pipelines, pipeline => pipeline.id !== $scope.pipeline.id);
+          const pipelineId = $scope.stage.pipeline;
+          const isFound = _.find(pipelines, pipeline => pipeline.id === pipelineId);
+          if (!isFound && pipelineId && !pipelineId.includes('${')) {
             $scope.stage.pipeline = null;
           }
           $scope.viewState.pipelinesLoaded = true;
@@ -75,10 +71,13 @@ module.exports = angular
     }
 
     function updatePipelineConfig() {
-      if ($scope.stage && $scope.stage.application && $scope.stage.pipeline) {
-        var config = _.find($scope.pipelines, function(pipeline) {
-          return pipeline.id === $scope.stage.pipeline;
-        });
+      const pipeline = $scope.stage && $scope.stage.pipeline;
+      if (pipeline && pipeline.includes('${')) {
+        return;
+      }
+
+      if ($scope.stage && $scope.stage.application && pipeline) {
+        const config = _.find($scope.pipelines, pipeline => pipeline.id === $scope.stage.pipeline);
         if (config && config.parameterConfig) {
           if (!$scope.stage.pipelineParameters) {
             $scope.stage.pipelineParameters = {};