Skip to content

Commit d9e3dd6

Browse files
MarkDeMariaMarkDeMaria
committed
Allow editing of build hooks on build configuration page
-Multi-select tag for Command, Script, and Args -Warning states: --On page load, if both Command and Script are both present, forms are disabled and user told to use YAML --If either Command or Script present, and user tries to add the type not present, Save button is disabled and has-error info-block informs user of error and told to use YAML
1 parent de8aca5 commit d9e3dd6

File tree

10 files changed

+447
-419
lines changed

10 files changed

+447
-419
lines changed

‎app/scripts/controllers/edit/buildConfig.js

+21-1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,21 @@ angular.module('openshiftConsole')
104104
"SerialLatestOnly"
105105
];
106106

107+
$scope.buildHookTypes = [
108+
"Command",
109+
"Script",
110+
"Args"
111+
];
112+
$scope.selectedBuildHook = {};
113+
$scope.selectedBuildHook.type = ['Command'];
114+
$scope.disableBuildHookEditor = false;
115+
$scope.newInvalidBuildHooks = false;
116+
117+
// Filter the catalog when the keyword or tag changes.
118+
$scope.$watchGroup(['buildConfig.spec.postCommit.command', 'buildConfig.spec.postCommit.script'], function(newBuildHooks) {
119+
$scope.newInvalidBuildHooks = ((newBuildHooks[0] || []).length && (newBuildHooks[1] || "").trim());
120+
});
121+
107122
AlertMessageService.getAlerts().forEach(function(alert) {
108123
$scope.alerts[alert.name] = alert.data;
109124
});
@@ -124,6 +139,9 @@ angular.module('openshiftConsole')
124139
// success
125140
function(buildConfig) {
126141
$scope.buildConfig = buildConfig;
142+
143+
$scope.disableBuildHookEditor = ($scope.buildConfig.spec.postCommit.command && ($scope.buildConfig.spec.postCommit.script || "").trim());
144+
127145
$scope.updatedBuildConfig = angular.copy($scope.buildConfig);
128146
$scope.buildStrategy = buildStrategy($scope.updatedBuildConfig);
129147
$scope.strategyType = $scope.buildConfig.spec.strategy.type;
@@ -161,7 +179,7 @@ angular.module('openshiftConsole')
161179
}
162180

163181
if (imageOptions.type === "ImageStreamImage") {
164-
isimage = (imageData.namespace || buildConfig.metadata.namespace) + "/" + imageData.name;
182+
isimage = (imageData.namespace || buildConfig.metadata.namespace) + "/" + imageData.name;
165183
} else {
166184
isimage = "";
167185
}
@@ -451,6 +469,8 @@ angular.module('openshiftConsole')
451469
// Update envVars
452470
buildStrategy($scope.updatedBuildConfig).env = keyValueEditorUtils.compactEntries($scope.envVars);
453471

472+
$scope.updatedBuildConfig.spec.postCommit = $scope.buildConfig.spec.postCommit;
473+
454474
// Update secrets
455475
updateSecrets($scope.updatedBuildConfig.spec.source, _.head($scope.secrets.picked.gitSecret), "sourceSecret");
456476
updateSecrets(buildStrategy($scope.updatedBuildConfig), _.head($scope.secrets.picked.pullSecret), "pullSecret");

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

+75-4
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ <h3>Source Configuration</h3>
9191
<div class="help-block" id="context-dir-help">Optional subdirectory for the application source code, used as the context directory for the build.</div>
9292
</div>
9393
<div class="form-group">
94-
<osc-secrets model="secrets.picked.gitSecret"
94+
<osc-secrets model="secrets.picked.gitSecret"
9595
namespace="projectName"
9696
display-type="source"
9797
type="source"
@@ -499,7 +499,7 @@ <h3 class="with-divider">
499499
<a href="{{'source_secrets' | helpLink}}" aria-hidden="true" target="_blank"><span class="learn-more-inline">Learn more&nbsp;<i class="fa fa-external-link"></i></span></a>
500500
</h3>
501501
<div class="form-group">
502-
<osc-source-secrets model="secrets.picked.sourceSecrets"
502+
<osc-source-secrets model="secrets.picked.sourceSecrets"
503503
namespace="projectName"
504504
secrets-by-type="secrets.secretsByType"
505505
strategy-type="strategyType"
@@ -536,15 +536,86 @@ <h3 class="with-divider">Run Policy
536536
<div class="help-block" ng-switch-default>Builds triggered from this Build Configuration will run using the {{updatedBuildConfig.spec.runPolicy | sentenceCase}} policy.</div>
537537
</div>
538538
</div>
539-
539+
540+
<div class="section" ng-if="view.advancedOptions">
541+
<div ng-if="!(updatedBuildConfig | isJenkinsPipelineStrategy)" class="section">
542+
<h3 class="with-divider">Build Hooks
543+
<span class="help action-inline">
544+
<a href>
545+
<i class="pficon pficon-help" data-toggle="tooltip" aria-hidden="true" data-original-title="Build hooks allow behavior to be injected into the build process."></i>
546+
</a>
547+
</span>
548+
</h3>
549+
550+
<div
551+
ng-if="disableBuildHookEditor"
552+
class="alert alert-info alert-dismissable">
553+
<span class="pficon pficon-info"></span>
554+
<strong>Both the Script and Command build hook types are defined in this build configuration.</strong>
555+
To edit them, use the build configuration YAML editor.
556+
</div>
557+
558+
<div>
559+
<div class="form-group" ng-class="{ 'has-error': newInvalidBuildHooks }">
560+
<h4>Hook Type</h4>
561+
<select
562+
multiple
563+
class="form-control"
564+
ng-model="selectedBuildHook.type">
565+
<option>Command</option>
566+
<option>Script</option>
567+
<option>Args</option>
568+
</select>
569+
570+
<span ng-if="newInvalidBuildHooks" class="help-block">
571+
Both the Script and Command build hook types are defined in this build configuration. To edit them, use the build configuration YAML editor.
572+
</span>
573+
</div>
574+
575+
<fieldset ng-disabled="disableBuildHookEditor">
576+
<div ng-show="selectedBuildHook.type.contains('Command')">
577+
<h4>Command</h4>
578+
<edit-command
579+
args="buildConfig.spec.postCommit.command"
580+
isRequired="false">
581+
</edit-command>
582+
</div>
583+
<div ng-show="selectedBuildHook.type.contains('Script')">
584+
<h4>Script</h4>
585+
<div
586+
ui-ace="{
587+
mode: 'yaml',
588+
theme: 'eclipse',
589+
onLoad: aceLoaded,
590+
rendererOptions: {
591+
fadeFoldWidgets: true,
592+
showPrintMargin: false
593+
}
594+
}"
595+
ng-model="buildConfig.spec.postCommit.script"
596+
class="ace-bordered ace-read-only ace-inline dockerfile-mode mar-top-md">
597+
</div>
598+
</div>
599+
<div ng-show="selectedBuildHook.type.contains('Args')">
600+
<h4>Arguments</h4>
601+
<edit-command
602+
args="buildConfig.spec.postCommit.args"
603+
isRequired="false">
604+
</edit-command>
605+
</div>
606+
</fieldset>
607+
</div>
608+
</div>
609+
</div>
610+
540611
<div class="gutter-top">
541612
<a href="" ng-click="view.advancedOptions = !view.advancedOptions" role="button">{{view.advancedOptions ? 'Hide' : 'Show'}} advanced options</a>
542613
</div>
543614
<div class="buttons gutter-top-bottom">
544615
<button
545616
type="submit"
546617
class="btn btn-primary btn-lg"
547-
ng-disabled="form.$invalid || form.$pristine || disableInputs">
618+
ng-disabled="form.$invalid || form.$pristine || disableInputs || (newInvalidBuildHooks && !disableBuildHookEditor)">
548619
Save
549620
</button>
550621
<a class="btn btn-default btn-lg"

‎dist.java/java/404.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h4>Connected to <span ng-bind="containerName"></span></h4>
3838
<div ng-include src="viewPartial"></div>
3939
</div>
4040

41-
<script src="libs-b80880b94c.js"></script>
41+
<script src="libs-3d3f8220c5.js"></script>
4242

4343
<!-- add any scripts under dist/ here -->
4444
<script src="app-ab9ba6f96c.js"></script>

‎dist.java/java/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h4>Connected to <span ng-bind="containerName"></span></h4>
3838
<div ng-include src="viewPartial"></div>
3939
</div>
4040

41-
<script src="libs-b80880b94c.js"></script>
41+
<script src="libs-3d3f8220c5.js"></script>
4242

4343
<!-- add any scripts under dist/ here -->
4444
<script src="app-ab9ba6f96c.js"></script>

‎dist.java/java/style.css

+1-2
Original file line numberDiff line numberDiff line change
@@ -4450,9 +4450,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22}
44504450
div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}
44514451
.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}
44524452
.CodeMirror-selected{background:#d9d9d9}
4453-
.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}
4453+
.CodeMirror-focused .CodeMirror-selected,.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}
44544454
.CodeMirror-crosshair{cursor:crosshair}
4455-
.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}
44564455
.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}
44574456
.cm-searching{background:#ffa;background:rgba(255,255,0,.4)}
44584457
.cm-force-border{padding-right:.1px}

‎dist.java/java/version.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "openshift-jvm",
3-
"version": "1.0.50",
4-
"commitId": "dcbee06e1d9043763259c661132673a7d69e8b95",
3+
"version": "1.0.47",
4+
"commitId": "fe68cabf7eb0f96c13dedbf56fae43b0248323d4",
55
"packages": {
66
"angular": {
77
"version": "1.5.8"
@@ -46,7 +46,7 @@
4646
"version": "2.0.40"
4747
},
4848
"hawtio-integration": {
49-
"version": "2.0.22"
49+
"version": "2.0.20"
5050
},
5151
"hawtio-jmx": {
5252
"version": "2.0.78"

‎dist/scripts/scripts.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -6304,13 +6304,15 @@ genericWebhooks:[],
63046304
imageChangeTriggers:[],
63056305
builderImageChangeTrigger:{},
63066306
configChangeTrigger:{}
6307-
}, a.runPolicyTypes = [ "Serial", "Parallel", "SerialLatestOnly" ], j.getAlerts().forEach(function(b) {
6307+
}, a.runPolicyTypes = [ "Serial", "Parallel", "SerialLatestOnly" ], a.buildHookTypes = [ "Command", "Script", "Args" ], a.selectedBuildHook = {}, a.selectedBuildHook.type = [ "Command" ], a.disableBuildHookEditor = !1, a.newInvalidBuildHooks = !1, a.$watchGroup([ "buildConfig.spec.postCommit.command", "buildConfig.spec.postCommit.script" ], function(b) {
6308+
a.newInvalidBuildHooks = (b[0] || []).length && (b[1] || "").trim();
6309+
}), j.getAlerts().forEach(function(b) {
63086310
a.alerts[b.name] = b.data;
63096311
}), j.clearAlerts(), a.secrets = {};
63106312
var m = [], n = f("buildStrategy");
63116313
e.get(b.project).then(_.spread(function(e, g) {
63126314
a.project = e, a.context = g, a.breadcrumbs[0].title = f("displayName")(e), c.get("buildconfigs", b.buildconfig, g).then(function(e) {
6313-
a.buildConfig = e, a.updatedBuildConfig = angular.copy(a.buildConfig), a.buildStrategy = n(a.updatedBuildConfig), a.strategyType = a.buildConfig.spec.strategy.type, a.envVars = a.buildStrategy.env || [], _.each(a.envVars, function(a) {
6315+
a.buildConfig = e, a.disableBuildHookEditor = a.buildConfig.spec.postCommit.command && (a.buildConfig.spec.postCommit.script || "").trim(), a.updatedBuildConfig = angular.copy(a.buildConfig), a.buildStrategy = n(a.updatedBuildConfig), a.strategyType = a.buildConfig.spec.strategy.type, a.envVars = a.buildStrategy.env || [], _.each(a.envVars, function(a) {
63146316
f("altTextForValueFrom")(a);
63156317
}), a.triggers = o(a.triggers, a.buildConfig.spec.triggers), a.sources = w(a.sources, a.buildConfig.spec.source), _.has(e, "spec.strategy.jenkinsPipelineStrategy.jenkinsfile") && (a.jenkinsfileOptions.type = "inline"), c.list("secrets", g, function(b) {
63166318
var c = d.groupSecretsByType(b), e = _.mapValues(c, function(a) {
@@ -6504,7 +6506,7 @@ break;
65046506
case "JenkinsPipeline":
65056507
"path" === a.jenkinsfileOptions.type ? delete a.updatedBuildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile :delete a.updatedBuildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath;
65066508
}
6507-
switch (q(), a.sources.images && !_.isEmpty(a.sourceImages) && (a.updatedBuildConfig.spec.source.images[0].paths = p(a.imageSourcePaths), a.updatedBuildConfig.spec.source.images[0].from = r(a.imageOptions.fromSource)), "None" === a.imageOptions.from.type ? delete n(a.updatedBuildConfig).from :n(a.updatedBuildConfig).from = r(a.imageOptions.from), "None" === a.imageOptions.to.type ? delete a.updatedBuildConfig.spec.output.to :a.updatedBuildConfig.spec.output.to = r(a.imageOptions.to), n(a.updatedBuildConfig).env = l.compactEntries(a.envVars), u(a.updatedBuildConfig.spec.source, _.head(a.secrets.picked.gitSecret), "sourceSecret"), u(n(a.updatedBuildConfig), _.head(a.secrets.picked.pullSecret), "pullSecret"), u(a.updatedBuildConfig.spec.output, _.head(a.secrets.picked.pushSecret), "pushSecret"), a.strategyType) {
6509+
switch (q(), a.sources.images && !_.isEmpty(a.sourceImages) && (a.updatedBuildConfig.spec.source.images[0].paths = p(a.imageSourcePaths), a.updatedBuildConfig.spec.source.images[0].from = r(a.imageOptions.fromSource)), "None" === a.imageOptions.from.type ? delete n(a.updatedBuildConfig).from :n(a.updatedBuildConfig).from = r(a.imageOptions.from), "None" === a.imageOptions.to.type ? delete a.updatedBuildConfig.spec.output.to :a.updatedBuildConfig.spec.output.to = r(a.imageOptions.to), n(a.updatedBuildConfig).env = l.compactEntries(a.envVars), a.updatedBuildConfig.spec.postCommit = a.buildConfig.spec.postCommit, u(a.updatedBuildConfig.spec.source, _.head(a.secrets.picked.gitSecret), "sourceSecret"), u(n(a.updatedBuildConfig), _.head(a.secrets.picked.pullSecret), "pullSecret"), u(a.updatedBuildConfig.spec.output, _.head(a.secrets.picked.pushSecret), "pushSecret"), a.strategyType) {
65086510
case "Source":
65096511
case "Docker":
65106512
v(a.updatedBuildConfig.spec.source, a.secrets.picked.sourceSecrets);

‎dist/scripts/templates.js

+55-1
Original file line numberDiff line numberDiff line change
@@ -7828,11 +7828,65 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
78287828
"<div class=\"help-block\" ng-switch-default>Builds triggered from this Build Configuration will run using the {{updatedBuildConfig.spec.runPolicy | sentenceCase}} policy.</div>\n" +
78297829
"</div>\n" +
78307830
"</div>\n" +
7831+
"<div class=\"section\" ng-if=\"view.advancedOptions\">\n" +
7832+
"<div ng-if=\"!(updatedBuildConfig | isJenkinsPipelineStrategy)\" class=\"section\">\n" +
7833+
"<h3 class=\"with-divider\">Build Hooks\n" +
7834+
"<span class=\"help action-inline\">\n" +
7835+
"<a href>\n" +
7836+
"<i class=\"pficon pficon-help\" data-toggle=\"tooltip\" aria-hidden=\"true\" data-original-title=\"Build hooks allow behavior to be injected into the build process.\"></i>\n" +
7837+
"</a>\n" +
7838+
"</span>\n" +
7839+
"</h3>\n" +
7840+
"<div ng-if=\"disableBuildHookEditor\" class=\"alert alert-info alert-dismissable\">\n" +
7841+
"<span class=\"pficon pficon-info\"></span>\n" +
7842+
"<strong>Both the Script and Command build hook types are defined in this build configuration.</strong>\n" +
7843+
"To edit them, use the build configuration YAML editor.\n" +
7844+
"</div>\n" +
7845+
"<div>\n" +
7846+
"<div class=\"form-group\" ng-class=\"{ 'has-error': newInvalidBuildHooks }\">\n" +
7847+
"<h4>Hook Type</h4>\n" +
7848+
"<select multiple class=\"form-control\" ng-model=\"selectedBuildHook.type\">\n" +
7849+
"<option>Command</option>\n" +
7850+
"<option>Script</option>\n" +
7851+
"<option>Args</option>\n" +
7852+
"</select>\n" +
7853+
"<span ng-if=\"newInvalidBuildHooks\" class=\"help-block\">\n" +
7854+
"Both the Script and Command build hook types are defined in this build configuration. To edit them, use the build configuration YAML editor.\n" +
7855+
"</span>\n" +
7856+
"</div>\n" +
7857+
"<fieldset ng-disabled=\"disableBuildHookEditor\">\n" +
7858+
"<div ng-show=\"selectedBuildHook.type.contains('Command')\">\n" +
7859+
"<h4>Command</h4>\n" +
7860+
"<edit-command args=\"buildConfig.spec.postCommit.command\" isrequired=\"false\">\n" +
7861+
"</edit-command>\n" +
7862+
"</div>\n" +
7863+
"<div ng-show=\"selectedBuildHook.type.contains('Script')\">\n" +
7864+
"<h4>Script</h4>\n" +
7865+
"<div ui-ace=\"{\n" +
7866+
" mode: 'yaml',\n" +
7867+
" theme: 'eclipse',\n" +
7868+
" onLoad: aceLoaded,\n" +
7869+
" rendererOptions: {\n" +
7870+
" fadeFoldWidgets: true,\n" +
7871+
" showPrintMargin: false\n" +
7872+
" }\n" +
7873+
" }\" ng-model=\"buildConfig.spec.postCommit.script\" class=\"ace-bordered ace-read-only ace-inline dockerfile-mode mar-top-md\">\n" +
7874+
"</div>\n" +
7875+
"</div>\n" +
7876+
"<div ng-show=\"selectedBuildHook.type.contains('Args')\">\n" +
7877+
"<h4>Arguments</h4>\n" +
7878+
"<edit-command args=\"buildConfig.spec.postCommit.args\" isrequired=\"false\">\n" +
7879+
"</edit-command>\n" +
7880+
"</div>\n" +
7881+
"</fieldset>\n" +
7882+
"</div>\n" +
7883+
"</div>\n" +
7884+
"</div>\n" +
78317885
"<div class=\"gutter-top\">\n" +
78327886
"<a href=\"\" ng-click=\"view.advancedOptions = !view.advancedOptions\" role=\"button\">{{view.advancedOptions ? 'Hide' : 'Show'}} advanced options</a>\n" +
78337887
"</div>\n" +
78347888
"<div class=\"buttons gutter-top-bottom\">\n" +
7835-
"<button type=\"submit\" class=\"btn btn-primary btn-lg\" ng-disabled=\"form.$invalid || form.$pristine || disableInputs\">\n" +
7889+
"<button type=\"submit\" class=\"btn btn-primary btn-lg\" ng-disabled=\"form.$invalid || form.$pristine || disableInputs || (newInvalidBuildHooks && !disableBuildHookEditor)\">\n" +
78367890
"Save\n" +
78377891
"</button>\n" +
78387892
"<a class=\"btn btn-default btn-lg\" href=\"{{updatedBuildConfig | navigateResourceURL}}\">\n" +

0 commit comments

Comments
 (0)