Skip to content

Commit 72362c3

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 72362c3

File tree

10 files changed

+562
-441
lines changed

10 files changed

+562
-441
lines changed

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

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

107+
$scope.buildHookTypes = [
108+
"Shell Script",
109+
"Command",
110+
"Arguments to Default Image Entry Point",
111+
"Shell Script with Arguments",
112+
"Command with Arguments"
113+
];
114+
115+
$scope.buildHookSelection = {};
116+
117+
var getInitialBuildHookSelection = function() {
118+
if (($scope.buildConfig.spec.postCommit.args || []).length) {
119+
if (($scope.buildConfig.spec.postCommit.command || []).length) {
120+
$scope.buildHookSelection.type = "Command with Arguments";sdas
121+
} else if (($scope.buildConfig.spec.postCommit.script || "").length) {
122+
$scope.buildHookSelection.type = "Shell Script with Arguments";
123+
} else {
124+
$scope.buildHookSelection.type = "Arguments to Default Image Entry Point";
125+
}
126+
} else if (($scope.buildConfig.spec.postCommit.command || []).length) {
127+
$scope.buildHookSelection.type = "Command";
128+
} else {
129+
$scope.buildHookSelection.type = "Shell Script";
130+
}
131+
};
132+
133+
var clearIncompatibleBuildHookFields = function(selectedBuildHook) {
134+
switch (selectedBuildHook) {
135+
case "Shell Script":
136+
$scope.buildConfig.spec.postCommit.command = [];
137+
$scope.buildConfig.spec.postCommit.args = [];
138+
break;
139+
case "Command":
140+
$scope.buildConfig.spec.postCommit.script = "";
141+
$scope.buildConfig.spec.postCommit.args = [];
142+
break;
143+
case "Arguments to Default Image Entry Point":
144+
$scope.buildConfig.spec.postCommit.script = "";
145+
$scope.buildConfig.spec.postCommit.command = [];
146+
break;
147+
case "Shell Script with Arguments":
148+
$scope.buildConfig.spec.postCommit.command = [];
149+
break;
150+
case "Command with Arguments":
151+
$scope.buildConfig.spec.postCommit.script = "";
152+
break;
153+
}
154+
};
155+
107156
AlertMessageService.getAlerts().forEach(function(alert) {
108157
$scope.alerts[alert.name] = alert.data;
109158
});
@@ -124,6 +173,8 @@ angular.module('openshiftConsole')
124173
// success
125174
function(buildConfig) {
126175
$scope.buildConfig = buildConfig;
176+
getInitialBuildHookSelection();
177+
127178
$scope.updatedBuildConfig = angular.copy($scope.buildConfig);
128179
$scope.buildStrategy = buildStrategy($scope.updatedBuildConfig);
129180
$scope.strategyType = $scope.buildConfig.spec.strategy.type;
@@ -161,7 +212,7 @@ angular.module('openshiftConsole')
161212
}
162213

163214
if (imageOptions.type === "ImageStreamImage") {
164-
isimage = (imageData.namespace || buildConfig.metadata.namespace) + "/" + imageData.name;
215+
isimage = (imageData.namespace || buildConfig.metadata.namespace) + "/" + imageData.name;
165216
} else {
166217
isimage = "";
167218
}
@@ -407,6 +458,7 @@ angular.module('openshiftConsole')
407458

408459
$scope.save = function() {
409460
$scope.disableInputs = true;
461+
clearIncompatibleBuildHookFields($scope.buildHookSelection.type);
410462
// Update Configuration
411463
buildStrategy($scope.updatedBuildConfig).forcePull = $scope.options.forcePull;
412464

@@ -451,6 +503,8 @@ angular.module('openshiftConsole')
451503
// Update envVars
452504
buildStrategy($scope.updatedBuildConfig).env = keyValueEditorUtils.compactEntries($scope.envVars);
453505

506+
$scope.updatedBuildConfig.spec.postCommit = $scope.buildConfig.spec.postCommit;
507+
454508
// Update secrets
455509
updateSecrets($scope.updatedBuildConfig.spec.source, _.head($scope.secrets.picked.gitSecret), "sourceSecret");
456510
updateSecrets(buildStrategy($scope.updatedBuildConfig), _.head($scope.secrets.picked.pullSecret), "pullSecret");

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

+95-5
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"
@@ -420,8 +420,6 @@ <h3 class="with-divider">Image Configuration</h3>
420420
</dl>
421421
</div>
422422

423-
424-
425423
<div ng-if="!(updatedBuildConfig | isJenkinsPipelineStrategy)" class="section">
426424
<h3 class="with-divider">Environment Variables<span class="help action-inline">
427425
<a href="">
@@ -499,7 +497,7 @@ <h3 class="with-divider">
499497
<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>
500498
</h3>
501499
<div class="form-group">
502-
<osc-source-secrets model="secrets.picked.sourceSecrets"
500+
<osc-source-secrets model="secrets.picked.sourceSecrets"
503501
namespace="projectName"
504502
secrets-by-type="secrets.secretsByType"
505503
strategy-type="strategyType"
@@ -536,7 +534,99 @@ <h3 class="with-divider">Run Policy
536534
<div class="help-block" ng-switch-default>Builds triggered from this Build Configuration will run using the {{updatedBuildConfig.spec.runPolicy | sentenceCase}} policy.</div>
537535
</div>
538536
</div>
539-
537+
538+
<div class="section" ng-if="view.advancedOptions">
539+
<div ng-if="!(updatedBuildConfig | isJenkinsPipelineStrategy)" class="section">
540+
<h3 class="with-divider">Build Hooks
541+
<span class="help action-inline">
542+
<a href>
543+
<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>
544+
</a>
545+
</span>
546+
</h3>
547+
548+
<div>
549+
<div class="form-group">
550+
<h4>Hook Types</h4>
551+
<ui-select required
552+
ng-model="buildHookSelection.type"
553+
title="Choose a Build Hook type to edit">
554+
<ui-select-match>{{$select.selected | sentenceCase}}</ui-select-match>
555+
<ui-select-choices repeat="type in buildHookTypes">
556+
{{type | sentenceCase }}
557+
</ui-select-choices>
558+
</ui-select>
559+
</div>
560+
561+
<fieldset>
562+
<div ng-show="buildHookSelection.type === 'Shell Script'">
563+
<h4>Script</h4>
564+
<div
565+
ui-ace="{
566+
mode: 'yaml',
567+
theme: 'eclipse',
568+
onLoad: aceLoaded,
569+
rendererOptions: {
570+
fadeFoldWidgets: true,
571+
showPrintMargin: false
572+
}
573+
}"
574+
ng-model="buildConfig.spec.postCommit.script"
575+
class="ace-bordered ace-read-only ace-inline dockerfile-mode mar-top-md">
576+
</div>
577+
</div>
578+
<div ng-show="buildHookSelection.type === 'Command'">
579+
<h4>Command</h4>
580+
<edit-command
581+
args="buildConfig.spec.postCommit.command"
582+
isRequired="true">
583+
</edit-command>
584+
</div>
585+
<div ng-show="buildHookSelection.type === 'Arguments to Default Image Entry Point'">
586+
<h4>Arguments to Default Image Entry Point</h4>
587+
<edit-command
588+
args="buildConfig.spec.postCommit.args"
589+
isRequired="true">
590+
</edit-command>
591+
</div>
592+
<div ng-show="buildHookSelection.type === 'Shell Script with Arguments'">
593+
<h4>Shell Script with Arguments</h4>
594+
<div
595+
ui-ace="{
596+
mode: 'yaml',
597+
theme: 'eclipse',
598+
onLoad: aceLoaded,
599+
rendererOptions: {
600+
fadeFoldWidgets: true,
601+
showPrintMargin: false
602+
}
603+
}"
604+
ng-model="buildConfig.spec.postCommit.script"
605+
class="ace-bordered ace-read-only ace-inline dockerfile-mode mar-top-md">
606+
</div>
607+
<h4>Arguments</h4>
608+
<edit-command
609+
args="buildConfig.spec.postCommit.args"
610+
isRequired="false">
611+
</edit-command>
612+
</div>
613+
<div ng-show="buildHookSelection.type === 'Command with Arguments'">
614+
<h4>Command</h4>
615+
<edit-command
616+
args="buildConfig.spec.postCommit.command"
617+
isRequired="true">
618+
</edit-command>
619+
<h4 class="mar-top-xl">Arguments</h4>
620+
<edit-command
621+
args="buildConfig.spec.postCommit.args"
622+
isRequired="true">
623+
</edit-command>
624+
</div>
625+
</fieldset>
626+
</div>
627+
</div>
628+
</div>
629+
540630
<div class="gutter-top">
541631
<a href="" ng-click="view.advancedOptions = !view.advancedOptions" role="button">{{view.advancedOptions ? 'Hide' : 'Show'}} advanced options</a>
542632
</div>

‎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"

0 commit comments

Comments
 (0)