Skip to content

Commit 8638ca9

Browse files
author
OpenShift Bot
authored
Merge pull request #2098 from benjaminapetersen/bpetersen/trello-api-groups-build
Merged by openshift-bot
2 parents 444e25c + 5582adc commit 8638ca9

File tree

4 files changed

+46
-40
lines changed

4 files changed

+46
-40
lines changed

‎app/scripts/controllers/build.js

+10-4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ angular.module('openshiftConsole')
1010
.controller('BuildController', function ($scope,
1111
$filter,
1212
$routeParams,
13+
APIService,
1314
BuildsService,
1415
DataService,
1516
ModalsService,
@@ -58,6 +59,10 @@ angular.module('openshiftConsole')
5859
title: $routeParams.build
5960
});
6061

62+
$scope.buildsVersion = APIService.getPreferredVersion('builds');
63+
$scope.buildConfigsVersion = APIService.getPreferredVersion('buildconfigs');
64+
$scope.podsVersion = APIService.getPreferredVersion('pods');
65+
6166
var buildPod;
6267
var annotation = $filter('annotation');
6368
var watches = [];
@@ -116,7 +121,7 @@ angular.module('openshiftConsole')
116121
buildPodName = annotation(build, 'buildPod');
117122
if (buildPodName) {
118123
// Don't show an error if we can't get the build pod. Often it will have been deleted.
119-
DataService.get("pods", buildPodName, context, { errorNotification: false }).then(function(response) {
124+
DataService.get($scope.podsVersion, buildPodName, context, { errorNotification: false }).then(function(response) {
120125
buildPod = response;
121126
updateEventObjects();
122127
});
@@ -146,12 +151,13 @@ angular.module('openshiftConsole')
146151
updateCanBuild();
147152
};
148153

154+
149155
DataService
150-
.get("builds", $routeParams.build, context, { errorNotification: false })
156+
.get($scope.buildsVersion, $routeParams.build, context, { errorNotification: false })
151157
.then(function(build) {
152158
buildResolved(build);
153-
watches.push(DataService.watchObject("builds", $routeParams.build, context, buildResolved));
154-
watches.push(DataService.watchObject("buildconfigs", $routeParams.buildconfig, context, buildConfigResolved));
159+
watches.push(DataService.watchObject($scope.buildsVersion, $routeParams.build, context, buildResolved));
160+
watches.push(DataService.watchObject($scope.buildConfigsVersion, $routeParams.buildconfig, context, buildConfigResolved));
155161
}, buildRejected);
156162

157163
$scope.toggleSecret = function() {

‎app/views/browse/build.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ <h1 class="contains-actions">
1010
<!-- Primary Actions -->
1111
<button class="btn btn-default hidden-xs"
1212
ng-click="cancelBuild()"
13-
ng-if="!build.metadata.deletionTimestamp && (build | isIncompleteBuild) && ('builds' | canI : 'update')">Cancel Build</button>
13+
ng-if="!build.metadata.deletionTimestamp && (build | isIncompleteBuild) && (buildsVersion | canI : 'update')">Cancel Build</button>
1414
<button class="btn btn-default hidden-xs"
1515
ng-click="cloneBuild()"
1616
ng-hide="build.metadata.deletionTimestamp || (build | isIncompleteBuild) || !('builds/clone' | canI : 'create') || (build | isBinaryBuild)"
@@ -25,7 +25,7 @@ <h1 class="contains-actions">
2525
class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
2626
data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
2727
<ul class="dropdown-menu dropdown-menu-right actions action-button">
28-
<li ng-if="'buildconfigs' | canI : 'update'">
28+
<li ng-if="buildConfigsVersion | canI : 'update'">
2929
<a ng-href="{{buildConfig | editResourceURL}}" role="button">
3030
<span ng-if="!(buildConfig | isJenkinsPipelineStrategy)">
3131
Edit Configuration
@@ -35,8 +35,8 @@ <h1 class="contains-actions">
3535
</span>
3636
</a>
3737
</li>
38-
<li class="divider" ng-if="'buildconfigs' | canI : 'update'"></li>
39-
<li ng-if="!build.metadata.deletionTimestamp && (build | isIncompleteBuild) && ('builds' | canI : 'update')"
38+
<li class="divider" ng-if="buildConfigsVersion | canI : 'update'"></li>
39+
<li ng-if="!build.metadata.deletionTimestamp && (build | isIncompleteBuild) && (buildsVersion | canI : 'update')"
4040
class="visible-xs-inline">
4141
<a href=""
4242
role="button"
@@ -51,10 +51,10 @@ <h1 class="contains-actions">
5151
ng-attr-aria-disabled="{{canBuild ? undefined : 'true'}}"
5252
ng-class="{ 'disabled-link': !canBuild }">Rebuild</a>
5353
</li>
54-
<li ng-if="('builds' | canI : 'update')">
54+
<li ng-if="(buildsVersion | canI : 'update')">
5555
<a ng-href="{{build | editYamlURL}}" role="button">Edit YAML</a>
5656
</li>
57-
<li ng-if="('builds' | canI : 'delete')">
57+
<li ng-if="(buildsVersion | canI : 'delete')">
5858
<delete-link
5959
kind="Build"
6060
resource-name="{{build.metadata.name}}"
@@ -94,7 +94,7 @@ <h1 class="contains-actions">
9494
<uib-tab heading="Environment" active="selectedTab.environment" ng-if="!(build | isJenkinsPipelineStrategy)">
9595
<uib-tab-heading>Environment</uib-tab-heading>
9696
<h3>Environment Variables</h3>
97-
<p ng-if="'buildconfigs' | canI : 'update'">
97+
<p ng-if="buildConfigsVersion | canI : 'update'">
9898
<span class="pficon pficon-info" aria-hidden="true"></span>
9999
Environment variables can be edited on the <a ng-href="{{build | configURLForResource}}?tab=environment">build configuration</a>.
100100
</p>

‎dist/scripts/scripts.js

+22-22
Original file line numberDiff line numberDiff line change
@@ -5370,7 +5370,7 @@ c.showJenkinsfileExamples();
53705370
i.unwatchAll(g);
53715371
});
53725372
}));
5373-
} ]), angular.module("openshiftConsole").controller("BuildController", [ "$scope", "$filter", "$routeParams", "BuildsService", "DataService", "ModalsService", "Navigate", "ProjectsService", function(e, t, n, a, r, o, i, s) {
5373+
} ]), angular.module("openshiftConsole").controller("BuildController", [ "$scope", "$filter", "$routeParams", "APIService", "BuildsService", "DataService", "ModalsService", "Navigate", "ProjectsService", function(e, t, n, a, r, o, i, s, c) {
53745374
e.projectName = n.project, e.build = null, e.buildConfig = null, e.buildConfigName = n.buildconfig, e.builds = {}, e.alerts = {}, e.showSecret = !1, e.renderOptions = {
53755375
hideFilterWidget: !0
53765376
}, e.breadcrumbs = [], n.isPipeline ? (e.breadcrumbs.push({
@@ -5387,39 +5387,39 @@ title: n.buildconfig,
53875387
link: "project/" + n.project + "/browse/builds/" + n.buildconfig
53885388
})), e.breadcrumbs.push({
53895389
title: n.build
5390-
});
5391-
var c, l = t("annotation"), u = [], d = function(t) {
5390+
}), e.buildsVersion = a.getPreferredVersion("builds"), e.buildConfigsVersion = a.getPreferredVersion("buildconfigs"), e.podsVersion = a.getPreferredVersion("pods");
5391+
var l, u = t("annotation"), d = [], p = function(t) {
53925392
e.logCanRun = !_.includes([ "New", "Pending", "Error" ], t.status.phase);
5393-
}, p = function() {
5394-
e.buildConfig ? e.canBuild = a.canBuild(e.buildConfig) : e.canBuild = !1;
5393+
}, m = function() {
5394+
e.buildConfig ? e.canBuild = r.canBuild(e.buildConfig) : e.canBuild = !1;
53955395
};
5396-
s.get(n.project).then(_.spread(function(i, s) {
5397-
e.project = i, e.projectContext = s, e.logOptions = {};
5398-
var m = function() {
5399-
e.eventObjects = c ? [ e.build, c ] : [ e.build ];
5396+
c.get(n.project).then(_.spread(function(a, s) {
5397+
e.project = a, e.projectContext = s, e.logOptions = {};
5398+
var c = function() {
5399+
e.eventObjects = l ? [ e.build, l ] : [ e.build ];
54005400
}, f = function(t, n) {
5401-
e.loaded = !0, e.build = t, d(t), m();
5402-
var a = l(t, "buildNumber");
5401+
e.loaded = !0, e.build = t, p(t), c();
5402+
var a = u(t, "buildNumber");
54035403
a && (e.breadcrumbs[2].title = "#" + a), "DELETED" === n && (e.alerts.deleted = {
54045404
type: "warning",
54055405
message: "This build has been deleted."
54065406
});
5407-
var o;
5408-
c || (o = l(t, "buildPod")) && r.get("pods", o, s, {
5407+
var r;
5408+
l || (r = u(t, "buildPod")) && o.get(e.podsVersion, r, s, {
54095409
errorNotification: !1
54105410
}).then(function(e) {
5411-
c = e, m();
5411+
l = e, c();
54125412
});
54135413
}, g = function(t, n) {
54145414
"DELETED" === n && (e.alerts.deleted = {
54155415
type: "warning",
54165416
message: "Build configuration " + e.buildConfigName + " has been deleted."
5417-
}, e.buildConfigDeleted = !0), e.buildConfig = t, e.buildConfigPaused = a.isPaused(e.buildConfig), p();
5417+
}, e.buildConfigDeleted = !0), e.buildConfig = t, e.buildConfigPaused = r.isPaused(e.buildConfig), m();
54185418
};
5419-
r.get("builds", n.build, s, {
5419+
o.get(e.buildsVersion, n.build, s, {
54205420
errorNotification: !1
5421-
}).then(function(e) {
5422-
f(e), u.push(r.watchObject("builds", n.build, s, f)), u.push(r.watchObject("buildconfigs", n.buildconfig, s, g));
5421+
}).then(function(t) {
5422+
f(t), d.push(o.watchObject(e.buildsVersion, n.build, s, f)), d.push(o.watchObject(e.buildConfigsVersion, n.buildconfig, s, g));
54235423
}, function(n) {
54245424
e.loaded = !0, e.alerts.load = {
54255425
type: "error",
@@ -5429,13 +5429,13 @@ details: t("getErrorDetails")(n)
54295429
}), e.toggleSecret = function() {
54305430
e.showSecret = !0;
54315431
}, e.cancelBuild = function() {
5432-
a.cancelBuild(e.build, e.buildConfigName);
5432+
r.cancelBuild(e.build, e.buildConfigName);
54335433
}, e.cloneBuild = function() {
5434-
e.build && e.canBuild && a.cloneBuild(e.build, e.buildConfigName);
5434+
e.build && e.canBuild && r.cloneBuild(e.build, e.buildConfigName);
54355435
}, e.showJenkinsfileExamples = function() {
5436-
o.showJenkinsfileExamples();
5436+
i.showJenkinsfileExamples();
54375437
}, e.$on("$destroy", function() {
5438-
r.unwatchAll(u);
5438+
o.unwatchAll(d);
54395439
});
54405440
}));
54415441
} ]), angular.module("openshiftConsole").controller("ImageController", [ "$scope", "$routeParams", "DataService", "ProjectsService", "$filter", "ImageStreamsService", "imageLayers", function(e, t, n, a, r, o, i) {

‎dist/scripts/templates.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -2056,7 +2056,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
20562056
"<h1 class=\"contains-actions\">\n" +
20572057
"<div class=\"pull-right dropdown\" ng-hide=\"!('builds' | canIDoAny)\">\n" +
20582058
"\n" +
2059-
"<button class=\"btn btn-default hidden-xs\" ng-click=\"cancelBuild()\" ng-if=\"!build.metadata.deletionTimestamp && (build | isIncompleteBuild) && ('builds' | canI : 'update')\">Cancel Build</button>\n" +
2059+
"<button class=\"btn btn-default hidden-xs\" ng-click=\"cancelBuild()\" ng-if=\"!build.metadata.deletionTimestamp && (build | isIncompleteBuild) && (buildsVersion | canI : 'update')\">Cancel Build</button>\n" +
20602060
"<button class=\"btn btn-default hidden-xs\" ng-click=\"cloneBuild()\" ng-hide=\"build.metadata.deletionTimestamp || (build | isIncompleteBuild) || !('builds/clone' | canI : 'create') || (build | isBinaryBuild)\" ng-disabled=\"!canBuild\">Rebuild</button>\n" +
20612061
"\n" +
20622062
"<button type=\"button\" class=\"dropdown-toggle btn btn-default actions-dropdown-btn hidden-xs\" data-toggle=\"dropdown\">\n" +
@@ -2065,7 +2065,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
20652065
"</button>\n" +
20662066
"<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" +
20672067
"<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
2068-
"<li ng-if=\"'buildconfigs' | canI : 'update'\">\n" +
2068+
"<li ng-if=\"buildConfigsVersion | canI : 'update'\">\n" +
20692069
"<a ng-href=\"{{buildConfig | editResourceURL}}\" role=\"button\">\n" +
20702070
"<span ng-if=\"!(buildConfig | isJenkinsPipelineStrategy)\">\n" +
20712071
"Edit Configuration\n" +
@@ -2075,17 +2075,17 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
20752075
"</span>\n" +
20762076
"</a>\n" +
20772077
"</li>\n" +
2078-
"<li class=\"divider\" ng-if=\"'buildconfigs' | canI : 'update'\"></li>\n" +
2079-
"<li ng-if=\"!build.metadata.deletionTimestamp && (build | isIncompleteBuild) && ('builds' | canI : 'update')\" class=\"visible-xs-inline\">\n" +
2078+
"<li class=\"divider\" ng-if=\"buildConfigsVersion | canI : 'update'\"></li>\n" +
2079+
"<li ng-if=\"!build.metadata.deletionTimestamp && (build | isIncompleteBuild) && (buildsVersion | canI : 'update')\" class=\"visible-xs-inline\">\n" +
20802080
"<a href=\"\" role=\"button\" ng-click=\"cancelBuild()\">Cancel Build</a>\n" +
20812081
"</li>\n" +
20822082
"<li class=\"visible-xs-inline\" ng-class=\"{ disabled: !canBuild }\" ng-hide=\"build.metadata.deletionTimestamp || (build | isIncompleteBuild) || !('builds/clone' | canI : 'create') || (build | isBinaryBuild)\">\n" +
20832083
"<a href=\"\" role=\"button\" ng-click=\"cloneBuild()\" ng-attr-aria-disabled=\"{{canBuild ? undefined : 'true'}}\" ng-class=\"{ 'disabled-link': !canBuild }\">Rebuild</a>\n" +
20842084
"</li>\n" +
2085-
"<li ng-if=\"('builds' | canI : 'update')\">\n" +
2085+
"<li ng-if=\"(buildsVersion | canI : 'update')\">\n" +
20862086
"<a ng-href=\"{{build | editYamlURL}}\" role=\"button\">Edit YAML</a>\n" +
20872087
"</li>\n" +
2088-
"<li ng-if=\"('builds' | canI : 'delete')\">\n" +
2088+
"<li ng-if=\"(buildsVersion | canI : 'delete')\">\n" +
20892089
"<delete-link kind=\"Build\" resource-name=\"{{build.metadata.name}}\" project-name=\"{{build.metadata.namespace}}\" alerts=\"alerts\" redirect-url=\"{{build | configURLForResource}}\">\n" +
20902090
"</delete-link>\n" +
20912091
"</li>\n" +
@@ -2114,7 +2114,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
21142114
"<uib-tab heading=\"Environment\" active=\"selectedTab.environment\" ng-if=\"!(build | isJenkinsPipelineStrategy)\">\n" +
21152115
"<uib-tab-heading>Environment</uib-tab-heading>\n" +
21162116
"<h3>Environment Variables</h3>\n" +
2117-
"<p ng-if=\"'buildconfigs' | canI : 'update'\">\n" +
2117+
"<p ng-if=\"buildConfigsVersion | canI : 'update'\">\n" +
21182118
"<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
21192119
"Environment variables can be edited on the <a ng-href=\"{{build | configURLForResource}}?tab=environment\">build configuration</a>.\n" +
21202120
"</p>\n" +

0 commit comments

Comments
 (0)