Merge pull request #2167 from benjaminapetersen/bpetersen/trello/api-groups/build-configs-instantiate

Merged by openshift-bot

Author: OpenShift Bot

Diff for: app/scripts/controllers/buildConfig.js

@@ -46,6 +46,7 @@ angular.module('openshiftConsole')
 
     $scope.buildConfigsVersion = APIService.getPreferredVersion('buildconfigs');
     $scope.buildsVersion = APIService.getPreferredVersion('builds');
+    $scope.buildConfigsInstantiateVersion = APIService.getPreferredVersion('buildconfigs/instantiate');
 
     $scope.emptyMessage = "Loading...";
 
@@ -92,7 +93,7 @@ angular.module('openshiftConsole')
       $scope.envVars = _.filter($scope.envVars, 'name');
       buildStrategy($scope.updatedBuildConfig).env = keyValueEditorUtils.compactEntries(angular.copy($scope.envVars));
       DataService
-        .update("buildconfigs", $routeParams.buildconfig, $scope.updatedBuildConfig, $scope.projectContext)
+        .update($scope.buildConfigsVersion, $routeParams.buildconfig, $scope.updatedBuildConfig, $scope.projectContext)
         .then(function success() {
           NotificationsService.addNotification({
             type: "success",

Diff for: app/views/browse/build-config.html

@@ -8,7 +8,7 @@ <h1 class="contains-actions">
           <!-- Primary Actions -->
           <button
               class="btn btn-default hidden-xs"
-              ng-if="('buildconfigs/instantiate' | canI : 'create') && !(buildConfig | isBinaryBuild)"
+              ng-if="(buildConfigsInstantiateVersion | canI : 'create') && !(buildConfig | isBinaryBuild)"
               ng-click="startBuild()">
             <span ng-if="!(buildConfig | isJenkinsPipelineStrategy)">
               Start Build
@@ -27,7 +27,7 @@ <h1 class="contains-actions">
              class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
              data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
           <ul class="dropdown-menu dropdown-menu-right actions action-button">
-            <li class="visible-xs-inline" ng-if="('buildconfigs/instantiate' | canI : 'create') && !(buildConfig | isBinaryBuild)">
+            <li class="visible-xs-inline" ng-if="(buildConfigsInstantiateVersion | canI : 'create') && !(buildConfig | isBinaryBuild)">
               <a href="" role="button" ng-click="startBuild()">
                 <span ng-if="!(buildConfig | isJenkinsPipelineStrategy)">
                   Start Build
@@ -83,10 +83,10 @@ <h2>No builds.</h2>
 
                   <p>
                     <span ng-if="!buildConfig.spec.strategy.jenkinsPipelineStrategy">
-                      <span ng-if="!('buildconfigs/instantiate' | canI : 'create')">
+                      <span ng-if="!(buildConfigsInstantiateVersion | canI : 'create')">
                         Builds will create an image from
                       </span>
-                      <span ng-if="'buildconfigs/instantiate' | canI : 'create'">
+                      <span ng-if="buildConfigsInstantiateVersion | canI : 'create'">
                         Start a new build to create an image from
                       </span>
                       <span ng-if="buildConfig.spec.source.type === 'Git'">
@@ -118,7 +118,7 @@ <h2>No builds.</h2>
                   <button
                       class="btn btn-primary btn-lg"
                       ng-click="startBuild()"
-                      ng-if="('buildconfigs/instantiate' | canI : 'create') && !(buildConfig | isBinaryBuild)">
+                      ng-if="(buildConfigsInstantiateVersion | canI : 'create') && !(buildConfig | isBinaryBuild)">
                     <span ng-if="!(buildConfig | isJenkinsPipelineStrategy)">
                       Start Build
                     </span>

Diff for: dist/scripts/scripts.js

@@ -5295,7 +5295,7 @@ title: "Builds",
 link: "project/" + n.project + "/browse/builds"
 }), e.breadcrumbs.push({
 title: n.buildconfig
-}), e.buildConfigsVersion = a.getPreferredVersion("buildconfigs"), e.buildsVersion = a.getPreferredVersion("builds"), e.emptyMessage = "Loading...", e.aceLoaded = function(e) {
+}), e.buildConfigsVersion = a.getPreferredVersion("buildconfigs"), e.buildsVersion = a.getPreferredVersion("builds"), e.buildConfigsInstantiateVersion = a.getPreferredVersion("buildconfigs/instantiate"), e.emptyMessage = "Loading...", e.aceLoaded = function(e) {
 var t = e.getSession();
 t.setOption("tabSize", 2), t.setOption("useSoftTabs", !0), e.$blockScrolling = 1 / 0;
 };
@@ -5305,7 +5305,7 @@ e.updatedBuildConfig = angular.copy(t), e.envVars = m(e.updatedBuildConfig).env
 e.compareTriggers = function(e, t) {
 return _.isNumber(e.value) ? -1 : "ConfigChange" === e.value ? -1 : "ConfigChange" === t.value ? 1 : "ImageChange" === e.value ? -1 : "ImageChange" === t.value ? 1 : e.value.localeCompare(t.value);
 }, e.saveEnvVars = function() {
-l.hideNotification("save-bc-env-error"), e.envVars = _.filter(e.envVars, "name"), m(e.updatedBuildConfig).env = d.compactEntries(angular.copy(e.envVars)), i.update("buildconfigs", n.buildconfig, e.updatedBuildConfig, e.projectContext).then(function() {
+l.hideNotification("save-bc-env-error"), e.envVars = _.filter(e.envVars, "name"), m(e.updatedBuildConfig).env = d.compactEntries(angular.copy(e.envVars)), i.update(e.buildConfigsVersion, n.buildconfig, e.updatedBuildConfig, e.projectContext).then(function() {
 l.addNotification({
 type: "success",
 message: "Environment variables for build config " + e.buildConfigName + " were successfully updated."

Diff for: dist/scripts/templates.js

@@ -1617,7 +1617,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<h1 class=\"contains-actions\">\n" +
     "<div class=\"pull-right dropdown\" ng-if=\"buildConfig\" ng-hide=\"!('buildConfigs' | canIDoAny)\">\n" +
     "\n" +
-    "<button class=\"btn btn-default hidden-xs\" ng-if=\"('buildconfigs/instantiate' | canI : 'create') && !(buildConfig | isBinaryBuild)\" ng-click=\"startBuild()\">\n" +
+    "<button class=\"btn btn-default hidden-xs\" ng-if=\"(buildConfigsInstantiateVersion | canI : 'create') && !(buildConfig | isBinaryBuild)\" ng-click=\"startBuild()\">\n" +
     "<span ng-if=\"!(buildConfig | isJenkinsPipelineStrategy)\">\n" +
     "Start Build\n" +
     "</span>\n" +
@@ -1632,7 +1632,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</button>\n" +
     "<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
     "<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
-    "<li class=\"visible-xs-inline\" ng-if=\"('buildconfigs/instantiate' | canI : 'create') && !(buildConfig | isBinaryBuild)\">\n" +
+    "<li class=\"visible-xs-inline\" ng-if=\"(buildConfigsInstantiateVersion | canI : 'create') && !(buildConfig | isBinaryBuild)\">\n" +
     "<a href=\"\" role=\"button\" ng-click=\"startBuild()\">\n" +
     "<span ng-if=\"!(buildConfig | isJenkinsPipelineStrategy)\">\n" +
     "Start Build\n" +
@@ -1677,10 +1677,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<h2>No builds.</h2>\n" +
     "<p>\n" +
     "<span ng-if=\"!buildConfig.spec.strategy.jenkinsPipelineStrategy\">\n" +
-    "<span ng-if=\"!('buildconfigs/instantiate' | canI : 'create')\">\n" +
+    "<span ng-if=\"!(buildConfigsInstantiateVersion | canI : 'create')\">\n" +
     "Builds will create an image from\n" +
     "</span>\n" +
-    "<span ng-if=\"'buildconfigs/instantiate' | canI : 'create'\">\n" +
+    "<span ng-if=\"buildConfigsInstantiateVersion | canI : 'create'\">\n" +
     "Start a new build to create an image from\n" +
     "</span>\n" +
     "<span ng-if=\"buildConfig.spec.source.type === 'Git'\">\n" +
@@ -1705,7 +1705,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</span>\n" +
     "</span>\n" +
     "</p>\n" +
-    "<button class=\"btn btn-primary btn-lg\" ng-click=\"startBuild()\" ng-if=\"('buildconfigs/instantiate' | canI : 'create') && !(buildConfig | isBinaryBuild)\">\n" +
+    "<button class=\"btn btn-primary btn-lg\" ng-click=\"startBuild()\" ng-if=\"(buildConfigsInstantiateVersion | canI : 'create') && !(buildConfig | isBinaryBuild)\">\n" +
     "<span ng-if=\"!(buildConfig | isJenkinsPipelineStrategy)\">\n" +
     "Start Build\n" +
     "</span>\n" +