github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(backup): reload if restore fails (#5404)

pull/5416/head
Chaim Lev-Ari 2021-08-12 02:10:40 +03:00 committed by GitHub
parent 8d01b45445
commit 456995353b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/portainer/views/init/admin/initAdminController.js
View File

@ -10,6 +10,8 @@ angular.module('portainer.app').controller('InitAdminController', [
'BackupService', 'BackupService',
'StatusService', 'StatusService',
function ($scope, $state, Notifications, Authentication, StateManager, SettingsService, UserService, EndpointService, BackupService, StatusService) { function ($scope, $state, Notifications, Authentication, StateManager, SettingsService, UserService, EndpointService, BackupService, StatusService) {
$scope.uploadBackup = uploadBackup;
$scope.logo = StateManager.getState().application.logo; $scope.logo = StateManager.getState().application.logo;
$scope.formValues = { $scope.formValues = {
@ -25,6 +27,8 @@ angular.module('portainer.app').controller('InitAdminController', [
showRestorePortainer: false, showRestorePortainer: false,
}; };
createAdministratorFlow();
$scope.togglePanel = function () { $scope.togglePanel = function () {
$scope.state.showInitPassword = !$scope.state.showInitPassword; $scope.state.showInitPassword = !$scope.state.showInitPassword;
$scope.state.showRestorePortainer = !$scope.state.showRestorePortainer; $scope.state.showRestorePortainer = !$scope.state.showRestorePortainer;
@ -74,11 +78,44 @@ angular.module('portainer.app').controller('InitAdminController', [
Notifications.error('Failure', err, 'Unable to verify administrator account existence'); Notifications.error('Failure', err, 'Unable to verify administrator account existence');
}); });
} }
createAdministratorFlow();
async function uploadBackup() {
$scope.state.backupInProgress = true;
const file = $scope.formValues.BackupFile;
const password = $scope.formValues.Password;
restoreAndRefresh(() => BackupService.uploadBackup(file, password));
}
async function restoreAndRefresh(restoreAsyncFn) {
$scope.state.backupInProgress = true;
try {
await restoreAsyncFn();
} catch (err) {
Notifications.error('Failure', err, 'Unable to restore the backup');
$scope.state.backupInProgress = false;
return;
}
try {
await waitPortainerRestart();
Notifications.success('The backup has successfully been restored');
$state.go('portainer.auth');
} catch (err) {
Notifications.error('Failure', err, 'Unable to check for status');
await wait(2);
location.reload();
}
$scope.state.backupInProgress = false;
}
async function waitPortainerRestart() { async function waitPortainerRestart() {
for (let i = 0; i < 10; i++) { for (let i = 0; i < 10; i++) {
await new Promise((resolve) => setTimeout(resolve, 5 * 1000)); await wait(5);
try { try {
const status = await StatusService.status(); const status = await StatusService.status();
if (status && status.Version) { if (status && status.Version) {
@ -88,25 +125,11 @@ angular.module('portainer.app').controller('InitAdminController', [
// pass // pass
} }
} }
throw 'Timeout to wait for Portainer restarting'; throw new Error('Timeout to wait for Portainer restarting');
} }
$scope.uploadBackup = async function () {
$scope.state.backupInProgress = true;
const file = $scope.formValues.BackupFile;
const password = $scope.formValues.Password;
try {
await BackupService.uploadBackup(file, password);
await waitPortainerRestart();
Notifications.success('The backup has successfully been restored');
$state.go('portainer.auth');
} catch (err) {
Notifications.error('Failure', err, 'Unable to restore the backup');
} finally {
$scope.state.backupInProgress = false;
}
};
}, },
]); ]);
function wait(seconds = 0) {
return new Promise((resolve) => setTimeout(resolve, seconds * 1000));
}