Bug 1388447 - On BC editor page, when 'Push To' is 'None', should disable 'Push Secret'

Author: jhadvig

app/scripts/directives/oscSecrets.js

@@ -12,6 +12,7 @@ angular.module("openshiftConsole")
         displayType: "@",
         type: "@",
         alerts: '=',
+        disableInput: "=",
         serviceAccountToLink: '@?',
         allowMultipleSecrets: "=?" // false by default
       },

app/views/directives/osc-secrets.html

@@ -5,7 +5,7 @@
         <div class="col-lg-12">
           <div ng-if="!allowMultipleSecrets">
             <label class="picker-label">{{displayType | startCase}} Secret</label>
-            <ui-select ng-model="pickedSecret.name">
+            <ui-select ng-disabled="disableInput" ng-model="pickedSecret.name">
               <ui-select-match placeholder="Secret name">{{$select.selected}}</ui-select-match>
               <ui-select-choices repeat="secret in (secretsByType[type] | filter : $select.search)">
                 <div ng-bind-html="secret | highlight : $select.search"></div>
@@ -16,7 +16,7 @@
             <div class="basic-secrets">
               <div class="secret-name">
                 <label ng-if="$first" class="picker-label">{{displayType | startCase}} Secrets</label>
-                <ui-select ng-model="pickedSecret.name">
+                <ui-select ng-disabled="disableInput" ng-model="pickedSecret.name">
                   <ui-select-match placeholder="Secret name">{{$select.selected}}</ui-select-match>
                   <ui-select-choices repeat="secret in (secretsByType[type] | filter : $select.search)">
                     <div ng-bind-html="secret | highlight : $select.search"></div>
@@ -48,7 +48,7 @@
     </div>
   </div>
 
-  <div class="osc-secret-actions">
+  <div class="osc-secret-actions" ng-if="!disableInput">
     <span ng-if="canAddSourceSecret()">
       <a href=""
         role="button" 

app/views/edit/build-config.html

@@ -410,6 +410,7 @@ <h3 class="with-divider">Image Configuration</h3>
                                         namespace="projectName"
                                         display-type="push"
                                         type="image"
+                                        disable-input="imageOptions.to.type==='None'"
                                         service-account-to-link="builder"
                                         secrets-by-type="secrets.secretsByType"
                                         alerts="alerts">

dist/scripts/scripts.js

@@ -9149,6 +9149,7 @@ namespace:"=",
 displayType:"@",
 type:"@",
 alerts:"=",
+disableInput:"=",
 serviceAccountToLink:"@?",
 allowMultipleSecrets:"=?"
 },

dist/scripts/templates.js

@@ -7012,7 +7012,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"col-lg-12\">\n" +
     "<div ng-if=\"!allowMultipleSecrets\">\n" +
     "<label class=\"picker-label\">{{displayType | startCase}} Secret</label>\n" +
-    "<ui-select ng-model=\"pickedSecret.name\">\n" +
+    "<ui-select ng-disabled=\"disableInput\" ng-model=\"pickedSecret.name\">\n" +
     "<ui-select-match placeholder=\"Secret name\">{{$select.selected}}</ui-select-match>\n" +
     "<ui-select-choices repeat=\"secret in (secretsByType[type] | filter : $select.search)\">\n" +
     "<div ng-bind-html=\"secret | highlight : $select.search\"></div>\n" +
@@ -7023,7 +7023,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"basic-secrets\">\n" +
     "<div class=\"secret-name\">\n" +
     "<label ng-if=\"$first\" class=\"picker-label\">{{displayType | startCase}} Secrets</label>\n" +
-    "<ui-select ng-model=\"pickedSecret.name\">\n" +
+    "<ui-select ng-disabled=\"disableInput\" ng-model=\"pickedSecret.name\">\n" +
     "<ui-select-match placeholder=\"Secret name\">{{$select.selected}}</ui-select-match>\n" +
     "<ui-select-choices repeat=\"secret in (secretsByType[type] | filter : $select.search)\">\n" +
     "<div ng-bind-html=\"secret | highlight : $select.search\"></div>\n" +
@@ -7054,7 +7054,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "</div>\n" +
     "</div>\n" +
-    "<div class=\"osc-secret-actions\">\n" +
+    "<div class=\"osc-secret-actions\" ng-if=\"!disableInput\">\n" +
     "<span ng-if=\"canAddSourceSecret()\">\n" +
     "<a href=\"\" role=\"button\" ng-click=\"addSourceSecret()\">Add another secret</a>\n" +
     "<span ng-if=\"'secrets' | canI : 'create'\" class=\"action-divider\">|</span>\n" +
@@ -7730,7 +7730,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "</div>\n" +
     "<div class=\"form-group\" ng-if=\"view.advancedOptions\">\n" +
-    "<osc-secrets model=\"secrets.picked.pushSecret\" namespace=\"projectName\" display-type=\"push\" type=\"image\" service-account-to-link=\"builder\" secrets-by-type=\"secrets.secretsByType\" alerts=\"alerts\">\n" +
+    "<osc-secrets model=\"secrets.picked.pushSecret\" namespace=\"projectName\" display-type=\"push\" type=\"image\" disable-input=\"imageOptions.to.type==='None'\" service-account-to-link=\"builder\" secrets-by-type=\"secrets.secretsByType\" alerts=\"alerts\">\n" +
     "</osc-secrets>\n" +
     "</div>\n" +
     "</div>\n" +