WIP
This commit is contained in:
parent
77278f0391
commit
1bf25f25c1
14 changed files with 942 additions and 336 deletions
|
@ -2818,6 +2818,7 @@ function SuperUserAdminCtrl($scope, $timeout, ApiService, Features, UserService,
|
|||
// Monitor any user changes and place the current user into the scope.
|
||||
UserService.updateUserIn($scope);
|
||||
|
||||
$scope.configStatus = null;
|
||||
$scope.logsCounter = 0;
|
||||
$scope.newUser = {};
|
||||
$scope.createdUser = null;
|
||||
|
@ -2993,6 +2994,154 @@ function SuperUserAdminCtrl($scope, $timeout, ApiService, Features, UserService,
|
|||
|
||||
}, ApiService.errorDisplay('Cannot send recovery email'))
|
||||
};
|
||||
|
||||
$scope.parseDbUri = function(value) {
|
||||
if (!value) { return null; }
|
||||
|
||||
// Format: mysql+pymysql://<username>:<url escaped password>@<hostname>/<database_name>
|
||||
var uri = URI(value);
|
||||
return {
|
||||
'kind': uri.protocol(),
|
||||
'username': uri.username(),
|
||||
'password': uri.password(),
|
||||
'server': uri.host(),
|
||||
'database': uri.path() ? uri.path().substr(1) : ''
|
||||
};
|
||||
};
|
||||
|
||||
$scope.serializeDbUri = function(fields) {
|
||||
if (!fields['server']) { return '' };
|
||||
|
||||
try {
|
||||
var uri = URI();
|
||||
uri = uri && uri.host(fields['server']);
|
||||
uri = uri && uri.protocol(fields['kind']);
|
||||
uri = uri && uri.username(fields['username']);
|
||||
uri = uri && uri.password(fields['password']);
|
||||
uri = uri && uri.path('/' + (fields['database'] || ''));
|
||||
uri = uri && uri.toString();
|
||||
} catch (ex) {
|
||||
return '';
|
||||
}
|
||||
|
||||
return uri;
|
||||
};
|
||||
|
||||
$scope.createSuperUser = function() {
|
||||
$scope.configStep = 'creating-superuser';
|
||||
ApiService.scCreateInitialSuperuser($scope.superUser, null).then(function(resp) {
|
||||
UserService.load();
|
||||
$('#createSuperuserModal').modal('hide');
|
||||
$scope.checkContainerStatus();
|
||||
}, ApiService.errorDisplay('Could not create superuser'));
|
||||
};
|
||||
|
||||
$scope.checkContainerStatus = function() {
|
||||
var errorHandler = function(resp) {
|
||||
if (resp.status == 404 && $scope.configStep == 'valid-database') {
|
||||
// Container has not yet come back up, so we schedule another check.
|
||||
$scope.waitForValidConfig();
|
||||
return;
|
||||
}
|
||||
|
||||
return ApiService.errorDisplay('Cannot load status. Please report this to support')(resp);
|
||||
};
|
||||
|
||||
ApiService.scRegistryStatus(null, null).then(function(resp) {
|
||||
$scope.configStatus = resp;
|
||||
|
||||
// !dir_exists -> No mounted directory.
|
||||
if (!$scope.configStatus.dir_exists) {
|
||||
bootbox.dialog({
|
||||
"message": "No volume was found mounted at path <code>/conf/stack</code>. " +
|
||||
"Please rerun the container with the volume mounted and refresh this page." +
|
||||
"<br><br>For more information: " +
|
||||
"<a href='https://coreos.com/docs/enterprise-registry/initial-setup/'>" +
|
||||
"Enterprise Registry Setup Guide</a>",
|
||||
"title": "Missing mounted configuration volume",
|
||||
"buttons": {},
|
||||
"closeButton": false
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// is_testing = False -> valid config
|
||||
// ready = False -> no valid superusers yet
|
||||
if (!$scope.configStatus.is_testing && !$scope.configStatus.ready) {
|
||||
$('#initializeConfigModal').modal('hide');
|
||||
|
||||
$scope.superUser = {};
|
||||
$scope.configStep = 'create-superuser';
|
||||
$('#createSuperuserModal').modal({
|
||||
keyboard: false,
|
||||
backdrop: 'static'
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// file_exists -> config file, but possibly invalid DB
|
||||
// valid_db = False -> invalid DB
|
||||
// is_testing = True -> still in testing mode
|
||||
if (!$scope.configStatus.file_exists || !$scope.configStatus.valid_db ||
|
||||
$scope.configStatus.is_testing) {
|
||||
$('#createSuperuserModal').modal('hide');
|
||||
|
||||
$scope.databaseUri = '';
|
||||
$scope.configStep = 'enter-database';
|
||||
|
||||
// Handle the case where they have entered a valid DB config, refreshed, but have not
|
||||
// yet restarted the DB container.
|
||||
if ($scope.configStatus.file_exists && $scope.configStatus.is_testing) {
|
||||
$scope.waitForValidConfig();
|
||||
}
|
||||
|
||||
$('#initializeConfigModal').modal({
|
||||
keyboard: false,
|
||||
backdrop: 'static'
|
||||
});
|
||||
return;
|
||||
}
|
||||
}, errorHandler, /* background */true);
|
||||
};
|
||||
|
||||
$scope.waitForValidConfig = function() {
|
||||
$scope.configStep = 'valid-database';
|
||||
$timeout(function() {
|
||||
$scope.checkContainerStatus();
|
||||
}, 3000);
|
||||
};
|
||||
|
||||
$scope.validateDatabase = function() {
|
||||
$scope.configStep = 'validating-database';
|
||||
$scope.databaseInvalid = null;
|
||||
|
||||
var data = {
|
||||
'config': {
|
||||
'DB_URI': $scope.databaseUri
|
||||
}
|
||||
};
|
||||
|
||||
var params = {
|
||||
'service': 'database'
|
||||
};
|
||||
|
||||
ApiService.scValidateConfig(data, params).then(function(resp) {
|
||||
var status = resp.status;
|
||||
|
||||
if (status) {
|
||||
$scope.configStep = 'updating-config';
|
||||
ApiService.scUpdateConfig(data, null).then(function(resp) {
|
||||
$scope.waitForValidConfig();
|
||||
}, ApiService.errorDisplay('Cannot update config. Please report this to support'));
|
||||
} else {
|
||||
$scope.configStep = 'invalid-database';
|
||||
$scope.databaseInvalid = resp.reason;
|
||||
}
|
||||
}, ApiService.errorDisplay('Cannot validate database. Please report this to support'));
|
||||
};
|
||||
|
||||
// Load the configuration status.
|
||||
$scope.checkContainerStatus();
|
||||
}
|
||||
|
||||
function TourCtrl($scope, $location) {
|
||||
|
|
|
@ -78,10 +78,11 @@ angular.module("core-config-setup", ['angularFileUpload'])
|
|||
|
||||
$transclude(function(clone, scope) {
|
||||
$scope.childScope = scope;
|
||||
$scope.childScope['fields'] = {};
|
||||
$element.append(clone);
|
||||
});
|
||||
|
||||
$scope.childScope.$watch(function(value) {
|
||||
$scope.childScope.$watch('fields', function(value) {
|
||||
// Note: We need the timeout here because Angular starts the digest of the
|
||||
// parent scope AFTER the child scope, which means it can end up one action
|
||||
// behind. The timeout ensures that the parent scope will be fully digest-ed
|
||||
|
@ -89,13 +90,13 @@ angular.module("core-config-setup", ['angularFileUpload'])
|
|||
$timeout(function() {
|
||||
$scope.binding = $scope.serializer({'fields': value});
|
||||
});
|
||||
});
|
||||
}, true);
|
||||
|
||||
$scope.$watch('binding', function(value) {
|
||||
var parsed = $scope.parser({'value': value});
|
||||
for (var key in parsed) {
|
||||
if (parsed.hasOwnProperty(key)) {
|
||||
$scope.childScope[key] = parsed[key];
|
||||
$scope.childScope['fields'][key] = parsed[key];
|
||||
}
|
||||
}
|
||||
});
|
||||
|
@ -240,7 +241,7 @@ angular.module("core-config-setup", ['angularFileUpload'])
|
|||
|
||||
$scope.uploadProgress = 0;
|
||||
$scope.upload = $upload.upload({
|
||||
url: '/api/v1/configfile',
|
||||
url: '/api/v1/superuser/config/file',
|
||||
method: 'POST',
|
||||
data: { filename: $scope.filename },
|
||||
file: files[0],
|
||||
|
@ -257,7 +258,7 @@ angular.module("core-config-setup", ['angularFileUpload'])
|
|||
};
|
||||
|
||||
var loadStatus = function(filename) {
|
||||
Restangular.one('configfile/' + filename).get().then(function(resp) {
|
||||
Restangular.one('superuser/config/file/' + filename).get().then(function(resp) {
|
||||
$scope.hasFile = resp['exists'];
|
||||
});
|
||||
};
|
||||
|
|
Reference in a new issue