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

Tarball the config and give it to the front end

Browse source 
Download file as blob to avoid binary string encoding
This commit is contained in:
Sam Chow 2018-06-25 17:40:59 -04:00
parent 7619ab44e5
commit aa93d698b2
8 changed files with 66 additions and 1677 deletions
Download patch file Download diff file Expand all files Collapse all files

1656
config_app/js/config-field-templates/config-setup-tool.html
View file

File diff suppressed because it is too large Load diff

4
config_app/js/core-config-setup/config-setup-tool.html
View file

@ -1630,9 +1630,9 @@
</span>
<button class="btn btn-primary"
ng-click="saveConfiguration()"
ng-click="generateConfigTarball()"
ng-disabled="savingConfiguration">
<i class="fa fa-upload" style="margin-right: 10px;"></i>Save Configuration
<i class="fa fa-upload" style="margin-right: 10px;"></i>Generate Configuration
</button>
</div>

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

@ -413,12 +413,12 @@ angular.module("quay-config")
}
};
$scope.saveConfiguration = function() {
$scope.generateConfigTarball = 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;
// $scope.config['SETUP_COMPLETE'] = true;
var data = {
'config': $scope.config,
@ -432,9 +432,14 @@ angular.module("quay-config")
authPassword = null;
});
ApiService.scUpdateConfig(data).then(function(resp) {
// We need to set the response type to 'blob', to ensure it's never encoded as a string
// (string encoded binary data can be difficult to transform with js)
// and to make it easier to save (FileSaver expects a blob)
ApiService.scGetConfigTarball(null, null, null, null, true).then(function(resp) {
authPassword = null;
FileSaver.saveAs(resp, 'quay-config.tar.gz');
$scope.savingConfiguration = false;
$scope.mapped.$hasChanges = false;

18
config_app/js/services/api-service.js
View file

@ -212,12 +212,20 @@ angular.module('quay-config').factory('ApiService', ['Restangular', '$q', 'UtilS
var urlPath = path['x-path'];
// Add the operation itself.
apiService[operationName] = function(opt_options, opt_parameters, opt_background, opt_forceget) {
apiService[operationName] = function(opt_options, opt_parameters, opt_background, opt_forceget, opt_blobresp) {
var one = Restangular.one(buildUrl(urlPath, opt_parameters));
if (opt_background) {
one.withHttpConfig({
'ignoreLoadingBar': true
});
if (opt_background || opt_blobresp) {
let httpConfig = {};
if (opt_background) {
httpConfig['ignoreLoadingBar'] = true;
}
if (opt_blobresp) {
httpConfig['responseType'] = 'blob';
}
one.withHttpConfig(httpConfig);
}
var opObj = one[opt_forceget ? 'get' : 'custom' + method.toUpperCase()](opt_options);