vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move tar filter to file, add tests for it

Browse source
This commit is contained in:
Sam Chow 2018-06-28 16:56:33 -04:00
parent db757edcd2
commit d7ffb54333
9 changed files with 83 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

14
config_app/js/components/download-tarball-modal/download-tarball-modal.component.html
View file

@ -8,15 +8,17 @@
<h4 class="modal-title"><span>Download Configuration</span></h4>
</div>
<!-- Body -->
<div class="modal-body">
<div class="modal-body download-tarball-modal">
<div ng-if="$ctrl.loadedConfig">
Please download your updated configuration. To deploy these changes to your Quay Enterprise instances, please
<a target="_blank" href="https://coreos.com/quay-enterprise/docs/latest/initial-setup.html">
see the docs.
</a>
<div class="modal__warning-box">
<i class="fas fa-exclamation-triangle" style="margin-right: 10px;"></i><strong>Warning:</strong>
Your configuration and certificates are kept <i>unencrypted</i>. Please keep this file secure.
<div class="fas co-alert co-alert-warning">
<strong>Warning: </strong>
Your configuration and certificates are kept <i>unencrypted</i>. Please keep this file secure.
</div>
</div>
</div>
<div ng-if="!$ctrl.loadedConfig">
@ -25,8 +27,10 @@
see the docs.
</a>
<div class="modal__warning-box">
<i class="fas fa-exclamation-triangle" style="margin-right: 10px;"></i><strong>Warning: </strong>
Your configuration and certificates are kept <i>unencrypted</i>. Please keep this file secure.
<div class="fas co-alert co-alert-warning">
<strong>Warning: </strong>
Your configuration and certificates are kept <i>unencrypted</i>. Please keep this file secure.
</div>
</div>
</div>
</div>

11
config_app/js/components/download-tarball-modal/download-tarball-modal.css
View file

@ -1,6 +1,11 @@
.modal__warning-box {
background-color: #ddd;
.co-dialog .modal-body.download-tarball-modal {
padding: 15px;
border-radius: 5px;
}
.modal__warning-box {
margin-top: 15px;
}
.modal__warning-box .co-alert.co-alert-warning::before {
font-family:Font Awesome\ 5 Free;
}

12
config_app/js/core-config-setup/core-config-setup.js
View file

@ -39,13 +39,7 @@ angular.module("quay-config")
$scope.SERVICES = [
{'id': 'redis', 'title': 'Redis'},
{'id': 'registry-storage', 'title': 'Registry Storage', 'condition': (config) => {
// We can skip validation if all of the storage locations are local, as we can't
// guarantee that this will be the same machine Q.E. will run under. Therefore,
// we just have a warning to the user that Q.E. won't start if the locations don't match
return Object.values(config.DISTRIBUTED_STORAGE_CONFIG)
.some(storageTuple => storageTuple[0] !== 'LocalStorage')
}},
{'id': 'registry-storage', 'title': 'Registry Storage'},
{'id': 'time-machine', 'title': 'Time Machine'},
@ -417,6 +411,10 @@ angular.module("quay-config")
$scope.saveConfiguration = function() {
$scope.savingConfiguration = true;
// Make sure to note that fully verified setup is completed. We use this as a signal
// in the setup tool.
$scope.config['SETUP_COMPLETE'] = true;
var data = {
'config': $scope.config,
'hostname': window.location.host,