jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fixup error handling in apps view

Browse Source
This commit is contained in:
Girish Ramakrishnan
2019-09-03 15:18:05 -07:00
parent 7d44c87aff
commit bbd73d361a
1 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/views/apps.js
View File

@@ -221,31 +221,41 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
let tab = 'advanced'; // the tab to switch to
if (error) {
if (error.statusCode === 409 && (error.message.indexOf('Port') !== -1)) {
$scope.appConfigure.error.port = error.message;
tab = 'location';
} else if (error.statusCode === 400 && error.message.indexOf('mailbox') !== -1 ) {
$scope.appConfigure.error.mailboxName = error.message;
$scope.appConfigureForm.mailboxName.$setPristine();
$('#appConfigureMailboxNameInput').focus();
} else if (error.statusCode === 409 && error.message.indexOf('Domain') === 0) {
$scope.appConfigure.error.location = error.message;
$scope.appConfigureForm.location.$setPristine();
tab = 'location';
$('#appConfigureLocationInput').focus();
} else if (error.statusCode === 409 && error.message.indexOf('Alternate domain') === 0 ) {
$scope.appConfigure.error.alternateDomains = error.message;
tab = 'location';
} else if (error.statusCode === 400 && error.message.indexOf('cert') !== -1 ) {
$scope.appConfigure.error.cert = error.message;
$scope.appConfigure.certificateFileName = '';
$scope.appConfigure.certificateFile = null;
$scope.appConfigure.keyFileName = '';
$scope.appConfigure.keyFile = null;
} else if (error.message.indexOf('dataDir') !== -1 ) { // can be 400 or 409
$scope.appConfigure.error.dataDir = error.message;
$scope.appConfigureForm.dataDir.$setPristine();
$('#appConfigureDataDirInput').focus();
if (error.statusCode === 409) {
if (error.portName) {
$scope.appConfigure.error.port = error.message;
tab = 'location';
} else if (error.domain && error.domain === $scope.config.adminDomin) {
$scope.appConfigure.error.location = error.message;
$scope.appConfigureForm.location.$setPristine();
tab = 'location';
$('#appConfigureLocationInput').focus();
} else if (error.domain && error.domain !== $scope.config.adminDomin) {
$scope.appConfigure.error.alternateDomains = error.message;
tab = 'location';
} else {
$scope.appConfigure.error.other = error.message;
tab = 'location';
}
} else if (error.statusCode === 400) {
if (error.field === 'mailboxName') {
$scope.appConfigure.error.mailboxName = error.message;
$scope.appConfigureForm.mailboxName.$setPristine();
$('#appConfigureMailboxNameInput').focus();
} else if (error.field === 'cert') {
$scope.appConfigure.error.cert = error.message;
$scope.appConfigure.certificateFileName = '';
$scope.appConfigure.certificateFile = null;
$scope.appConfigure.keyFileName = '';
$scope.appConfigure.keyFile = null;
} else if (error.field === 'dataDir') {
$scope.appConfigure.error.dataDir = error.message;
$scope.appConfigureForm.dataDir.$setPristine();
$('#appConfigureDataDirInput').focus();
} else {
$scope.appConfigure.error.other = error.message;
tab = 'location';
}
} else {
$scope.appConfigure.error.other = error.message;
tab = 'location';
@@ -362,11 +372,15 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
$scope.appClone.busy = false;
if (error) {
if (error.statusCode === 409 && (error.message.indexOf('is reserved') !== -1 || error.message.indexOf('is already in use') !== -1)) {
$scope.appClone.error.port = error.message;
} else if (error.statusCode === 409) {
$scope.appClone.error.location = 'This location is already taken.';
$('#appCloneLocationInput').focus();
if (error.statusCode === 409) {
if (error.portName) {
$scope.appClone.error.port = error.message;
} else if (error.domain) {
$scope.appClone.error.location = 'This location is already taken.';
$('#appCloneLocationInput').focus();
} else {
Client.error(error);
}
} else {
Client.error(error);
}