Skip to content

Commit 828948e

Browse files
spadgettspadgett
committed
Show post commit hooks for builds and build configs
1 parent f6709f6 commit 828948e

File tree

9 files changed

+134
-3
lines changed

9 files changed

+134
-3
lines changed

‎app/index.html

+1
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ <h1>JavaScript Required</h1>
354354
<script src="scripts/directives/deployImage.js"></script>
355355
<script src="scripts/directives/selector.js"></script>
356356
<script src="scripts/directives/selectContainers.js"></script>
357+
<script src="scripts/directives/buildHooks.js"></script>
357358
<script src="scripts/filters/date.js"></script>
358359
<script src="scripts/filters/resources.js"></script>
359360
<script src="scripts/filters/canI.js"></script>

‎app/scripts/directives/buildHooks.js

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
angular.module('openshiftConsole')
4+
.directive('buildHooks',
5+
function() {
6+
return {
7+
restrict: 'E',
8+
templateUrl: 'views/directives/build-hooks.html',
9+
scope: {
10+
build: '=' // build or build config
11+
}
12+
};
13+
}
14+
);

‎app/scripts/filters/resources.js

+8
Original file line numberDiff line numberDiff line change
@@ -1412,4 +1412,12 @@ angular.module('openshiftConsole')
14121412
var revision = annotationFilter(deployment, 'deployment.kubernetes.io/revision');
14131413
return revision ? "#" + revision : 'Unknown';
14141414
};
1415+
})
1416+
.filter('hasPostCommitHook', function() {
1417+
// Check if a build or build config has a post commit hook.
1418+
return function(build) {
1419+
return _.has(build, 'spec.postCommit.command') ||
1420+
_.has(build, 'spec.postCommit.script') ||
1421+
_.has(build, 'spec.postCommit.args');
1422+
};
14151423
});

‎app/views/browse/_build-details.html

+4
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,10 @@ <h3>Configuration <span class="small" ng-if="buildConfigName">created from <a hr
120120
}
121121
}" readonly ng-model="build.spec.strategy.jenkinsPipelineStrategy.jenkinsfile" class="ace-bordered ace-inline ace-read-only"></div>
122122
</dl>
123+
<div ng-if="build | hasPostCommitHook">
124+
<h3>Post-Commit Hooks</h3>
125+
<build-hooks build="build"></build-hooks>
126+
</div>
123127
</div>
124128
</div>
125129
<annotations annotations="build.metadata.annotations"></annotations>

‎app/views/browse/build-config.html

+4
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,10 @@ <h4>{{imageSource.from | imageObjectRef : buildConfig.metadata.namespace}}</h4>
368368
}" readonly ng-model="buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile" class="ace-bordered ace-inline ace-read-only"></div>
369369
</div>
370370
</dl>
371+
<div ng-if="buildConfig | hasPostCommitHook">
372+
<h3>Post-Commit Hooks</h3>
373+
<build-hooks build="buildConfig"></build-hooks>
374+
</div>
371375
</div>
372376
<div class="col-lg-6">
373377
<h3>Triggers</h3>

‎app/views/directives/build-hooks.html

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<!--
2+
Use `dl-horizontal left` style unless there's a script.
3+
Otherwise use the default `dl` style because it looks strange with the block editor.
4+
-->
5+
<dl ng-class="{ 'dl-horizontal left': !build.spec.postCommit.script }">
6+
<dt ng-if-start="build.spec.postCommit.command">Command:</dt>
7+
<dd ng-if-end>
8+
<code class="command">
9+
<truncate-long-text
10+
content="build.spec.postCommit.command.join(' ')"
11+
limit="80"
12+
newline-limit="1"
13+
expandable="true"
14+
use-word-boundary="false">
15+
</truncate-long-text>
16+
</code>
17+
</dd>
18+
<dt ng-if-start="build.spec.postCommit.script">Script:</dt>
19+
<dd ng-if-end>
20+
<div
21+
ui-ace="{
22+
mode: 'sh',
23+
theme: 'eclipse',
24+
rendererOptions: {
25+
fadeFoldWidgets: true,
26+
showPrintMargin: false
27+
}
28+
}"
29+
ng-model="build.spec.postCommit.script"
30+
readonly
31+
class="ace-bordered ace-read-only ace-inline mar-top-md mar-bottom-md">
32+
</div>
33+
</dd>
34+
<dt ng-if-start="build.spec.postCommit.args">Args:</dt>
35+
<dd ng-if-end>
36+
<code class="command">
37+
<truncate-long-text
38+
content="build.spec.postCommit.args.join(' ')"
39+
limit="80"
40+
newline-limit="1"
41+
expandable="true"
42+
use-word-boundary="false">
43+
</truncate-long-text>
44+
</code>
45+
</dd>
46+
</dl>

‎app/views/edit/build-config.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,8 @@ <h3 class="with-divider">Run Policy
530530
</div>
531531

532532
<div ng-if="view.advancedOptions && !(updatedBuildConfig | isJenkinsPipelineStrategy)" class="section">
533-
<h3 class="with-divider">Build Hooks
533+
<h3 class="with-divider">
534+
Post-Commit Hooks
534535
<span class="help action-inline">
535536
<a href="{{'build-hooks' | helpLink}}" aria-hidden="true" target="_blank"><span class="learn-more-inline">Learn More&nbsp;<i class="fa fa-external-link"></i></span></a>
536537
</span>

‎dist/scripts/scripts.js

+13-1
Original file line numberDiff line numberDiff line change
@@ -13516,6 +13516,14 @@ return a;
1351613516
}, !0);
1351713517
} ]
1351813518
};
13519+
}), angular.module("openshiftConsole").directive("buildHooks", function() {
13520+
return {
13521+
restrict:"E",
13522+
templateUrl:"views/directives/build-hooks.html",
13523+
scope:{
13524+
build:"="
13525+
}
13526+
};
1351913527
}), angular.module("openshiftConsole").filter("duration", function() {
1352013528
return function(a, b, c, d) {
1352113529
function e(a, b, d) {
@@ -14344,7 +14352,11 @@ if (!b) return "";
1434414352
var c = a(b, "deployment.kubernetes.io/revision");
1434514353
return c ? "#" + c :"Unknown";
1434614354
};
14347-
} ]), angular.module("openshiftConsole").filter("canI", [ "AuthorizationService", function(a) {
14355+
} ]).filter("hasPostCommitHook", function() {
14356+
return function(a) {
14357+
return _.has(a, "spec.postCommit.command") || _.has(a, "spec.postCommit.script") || _.has(a, "spec.postCommit.args");
14358+
};
14359+
}), angular.module("openshiftConsole").filter("canI", [ "AuthorizationService", function(a) {
1434814360
return function(b, c, d) {
1434914361
return a.canI(b, c, d);
1435014362
};

‎dist/scripts/templates.js

+42-1
Original file line numberDiff line numberDiff line change
@@ -1436,6 +1436,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
14361436
" }\n" +
14371437
" }\" readonly=\"readonly\" ng-model=\"build.spec.strategy.jenkinsPipelineStrategy.jenkinsfile\" class=\"ace-bordered ace-inline ace-read-only\"></div>\n" +
14381438
"</dl>\n" +
1439+
"<div ng-if=\"build | hasPostCommitHook\">\n" +
1440+
"<h3>Post-Commit Hooks</h3>\n" +
1441+
"<build-hooks build=\"build\"></build-hooks>\n" +
1442+
"</div>\n" +
14391443
"</div>\n" +
14401444
"</div>\n" +
14411445
"<annotations annotations=\"build.metadata.annotations\"></annotations>\n" +
@@ -2128,6 +2132,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
21282132
" }\" readonly=\"readonly\" ng-model=\"buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile\" class=\"ace-bordered ace-inline ace-read-only\"></div>\n" +
21292133
"</div>\n" +
21302134
"</dl>\n" +
2135+
"<div ng-if=\"buildConfig | hasPostCommitHook\">\n" +
2136+
"<h3>Post-Commit Hooks</h3>\n" +
2137+
"<build-hooks build=\"buildConfig\"></build-hooks>\n" +
2138+
"</div>\n" +
21312139
"</div>\n" +
21322140
"<div class=\"col-lg-6\">\n" +
21332141
"<h3>Triggers</h3>\n" +
@@ -6052,6 +6060,38 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
60526060
);
60536061

60546062

6063+
$templateCache.put('views/directives/build-hooks.html',
6064+
" <dl ng-class=\"{ 'dl-horizontal left': !build.spec.postCommit.script }\">\n" +
6065+
"<dt ng-if-start=\"build.spec.postCommit.command\">Command:</dt>\n" +
6066+
"<dd ng-if-end>\n" +
6067+
"<code class=\"command\">\n" +
6068+
"<truncate-long-text content=\"build.spec.postCommit.command.join(' ')\" limit=\"80\" newline-limit=\"1\" expandable=\"true\" use-word-boundary=\"false\">\n" +
6069+
"</truncate-long-text>\n" +
6070+
"</code>\n" +
6071+
"</dd>\n" +
6072+
"<dt ng-if-start=\"build.spec.postCommit.script\">Script:</dt>\n" +
6073+
"<dd ng-if-end>\n" +
6074+
"<div ui-ace=\"{\n" +
6075+
" mode: 'sh',\n" +
6076+
" theme: 'eclipse',\n" +
6077+
" rendererOptions: {\n" +
6078+
" fadeFoldWidgets: true,\n" +
6079+
" showPrintMargin: false\n" +
6080+
" }\n" +
6081+
" }\" ng-model=\"build.spec.postCommit.script\" readonly=\"readonly\" class=\"ace-bordered ace-read-only ace-inline mar-top-md mar-bottom-md\">\n" +
6082+
"</div>\n" +
6083+
"</dd>\n" +
6084+
"<dt ng-if-start=\"build.spec.postCommit.args\">Args:</dt>\n" +
6085+
"<dd ng-if-end>\n" +
6086+
"<code class=\"command\">\n" +
6087+
"<truncate-long-text content=\"build.spec.postCommit.args.join(' ')\" limit=\"80\" newline-limit=\"1\" expandable=\"true\" use-word-boundary=\"false\">\n" +
6088+
"</truncate-long-text>\n" +
6089+
"</code>\n" +
6090+
"</dd>\n" +
6091+
"</dl>"
6092+
);
6093+
6094+
60556095
$templateCache.put('views/directives/build-pipeline.html',
60566096
"<div>\n" +
60576097
"<div ng-if=\"expandOnlyRunning\">\n" +
@@ -9117,7 +9157,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
91179157
"</div>\n" +
91189158
"</div>\n" +
91199159
"<div ng-if=\"view.advancedOptions && !(updatedBuildConfig | isJenkinsPipelineStrategy)\" class=\"section\">\n" +
9120-
"<h3 class=\"with-divider\">Build Hooks\n" +
9160+
"<h3 class=\"with-divider\">\n" +
9161+
"Post-Commit Hooks\n" +
91219162
"<span class=\"help action-inline\">\n" +
91229163
"<a href=\"{{'build-hooks' | helpLink}}\" aria-hidden=\"true\" target=\"_blank\"><span class=\"learn-more-inline\">Learn More&nbsp;<i class=\"fa fa-external-link\"></i></span></a>\n" +
91239164
"</span>\n" +

0 commit comments

Comments
 (0)