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

Fix alembic migrations importing app

Browse source 
Ensure we connect to loaded config db
This commit is contained in:
Sam Chow 2018-06-19 13:46:34 -04:00
parent bb2b28cd11
commit b5f630ba29
18 changed files with 69 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

9
config_app/js/components/load-config/load-config.component.ts
View file

@ -1,4 +1,4 @@
import { Component, Inject } from 'ng-metadata/core';
import {Component, EventEmitter, Inject, Output} from 'ng-metadata/core';
const templateUrl = require('./load-config.html');
const styleUrl = require('./load-config.css');
@ -10,7 +10,7 @@ const styleUrl = require('./load-config.css');
export class LoadConfigComponent {
private readyToSubmit: boolean = false;
private uploadFunc: Function;
private state: 'load' | 'validate' = 'load';
@Output() public configLoaded: EventEmitter<any> = new EventEmitter();
private constructor(@Inject('ApiService') private apiService: any) {
}
@ -27,9 +27,8 @@ export class LoadConfigComponent {
private uploadTarball() {
this.uploadFunc(success => {
if (success) {
this.state = 'validate';
}
else {
this.configLoaded.emit({});
} else {
this.apiService.errorDisplay('Error loading configuration',
'Could not upload configuration. Please reload the page and try again.\n' +
'If this problem persists, please contact support')();

4
config_app/js/components/load-config/load-config.css
View file

@ -1,4 +0,0 @@
.load-config__body strong {
}

21
config_app/js/components/load-config/load-config.html
View file

@ -1,4 +1,4 @@
<div ng-if="$ctrl.state === 'load'">
<div>
<div class="co-dialog modal fade initial-setup-modal in" id="setupModal" style="display: block;">
<div class="modal-backdrop fade in" style="height: 1000px;"></div>
<div class="modal-dialog fade in">
@ -26,22 +26,3 @@
</div><!-- /.modal-dialog -->
</div>
</div>
<div ng-if="$ctrl.state === 'validate'">
<div class="co-dialog modal fade initial-setup-modal in" id="validateModal" style="display: block;">
<div class="modal-backdrop fade in" style="height: 1000px;"></div>
<div class="modal-dialog fade in">
<div class="modal-content">
<!-- Header -->
<div class="modal-header">
<h4 class="modal-title"><span>Validate Config</span></h4>
</div>
<!-- Body -->
<div class="modal-body">
<span>Validating Config...</span>
spinner here...
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div>
</div>