Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/restore/restore.controller.js =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/restore/restore.controller.js (revision 0) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/restore/restore.controller.js (working copy) @@ -0,0 +1,141 @@ +angular + .module('cm.system') + .controller('restoreCtrl', [ + '$scope', + '$rootScope', + '$state', + '$uibModal', + '$filter', + 'systemService', + '$interval', + 'FileUploader', + function ($scope, $rootScope, $state, $uibModal, $filter, systemService, $interval, FileUploader) { + $rootScope.title = "Restore"; + $rootScope.allow_config = true; + let restoreModel = this; + + restoreModel.status = 'N/A'; + restoreModel.description = ''; + restoreModel.filename = ''; + + function getRestoreStatus() { + systemService + .getRestoreStatus() + .then(function (res) { + if (res && res.status === 200) { + let restoreStatusResponse = res.data; + // restoreModel.status = restoreStatusResponse.status; + restoreModel.description = restoreStatusResponse.message; + } + }); + } + + getRestoreStatus(); + + if (!angular.isDefined($scope.DataTimer)) { + $scope.DataTimer = $interval(function () { + getRestoreStatus(); + }, 10000); + } + + $scope.$on('$destroy', function () { + if (angular.isDefined($scope.DataTimer)) { + $interval.cancel($scope.DataTimer); + $scope.DataTimer = undefined; + } + }); + + restoreModel.startRestore = function () { + restoreModel.showProgressBar(); + systemService + .startRestore({}) + .then(function (res) { + $rootScope.$broadcast('endLoading', true); + if (res && res.status === 200) { + $rootScope.TipService.setMessage($filter('T')(res.data.message)); + } else { + $rootScope.TipService.setMessage($filter('T')("The attempt to back up the system failed.")); + } + }) + } + + restoreModel.showProgressBar = function () { + let modalInstance = $uibModal.open({ + templateUrl: 'app/modules/common/templates/progress.html', + controller: 'showProgressCtrl', + controllerAs: 'progress', + backdrop: false + }); + }; + + restoreModel.cancel = function () { + restoreModel.showProgressBar(); + getRestoreStatus(function () { + $rootScope.$broadcast('endLoading', true); + }); + }; + + let showProgressBar = function () { + let modalInstance = $uibModal.open({ + templateUrl: 'app/modules/common/templates/progress_with_value.html', + controller: 'showProgressCtrlWithValue', + controllerAs: 'progress', + backdrop: false + }); + modalInstance.result.then(function () { + fileUploader.cancelAll(); + fileUploader.clearQueue(); + document.getElementById('textfield').value = ""; + document.getElementById('uploadfield').value = ""; + }); + }; + + let fileUploader = restoreModel.file_uploader = new FileUploader({ + queueLimit: 1, + url: '/upload', + autoUpload: true, + removeAfterUpload: true, + }); + + fileUploader.onBeforeUploadItem = function (item) { + showProgressBar(); + }; + + fileUploader.onSuccessItem = function (item, response, status, headers) { + if (!response.error) { + restoreModel.local = response.files[0].url; + $rootScope.$broadcast('endLoading', true); + } + }; + + fileUploader.onProgressItem = function (item, progress) { + $rootScope.$broadcast('upLoading', progress); + }; + + restoreModel.submit = function () { + let filename = document.getElementById('textfield').value; + if (!filename || filename.length === 0) { + $rootScope.TipService.setMessage("Please choose a valid file."); + return; + } + let confirm_msg = $filter('T')("Before initiating the system restore process, please be advised that your system may experience a temporary period of unavailability upon completion. Would you like to proceed with the restoration at this time?"); + if (confirm(confirm_msg)) { + restoreModel.showProgressBar(); + systemService + .startRestore({"filename": filename}) + .then(function (res) { + $rootScope.$broadcast('endLoading', true); + if (res && res.status === 200) { + if (res.data && res.data.error === 400) { + $rootScope.TipService.setMessage(res.data.message); + $rootScope.$broadcast('endLoading', true); + } + } else { + $rootScope.TipService.setMessage("Failed to restore the AMP, please try again."); + $rootScope.$broadcast('endLoading', true); + } + }) + } + } + } + ]); Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/restore/restore.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/restore/restore.html (revision 0) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/restore/restore.html (working copy) @@ -0,0 +1,74 @@ +
+
+
+
+ {{ 'Restore' | T }} +
+
+
+ +
+
+
+
+
+ System restoration is currently in progress. Please wait. +
+
+
+
+ The recent system restore operation has been completed successfully. +
+
+ An error occurred during the recent system restore operation. +
+
+
+
+
+ + +
+ +
+
+
+
+
+
+
+ Note: The restore process will substitute your current information with the backup data. +
+
+
+
+ + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/update/update.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/update/update.html (revision 2494) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/update/update.html (working copy) @@ -77,7 +77,7 @@
- +
@@ -104,11 +104,11 @@ \ No newline at end of file + Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/system.html =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/system.html (revision 2494) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/system.html (working copy) @@ -40,6 +40,9 @@
  • {{ 'Backup' | T }}
    • +
  • + {{ 'Restore' | T }} +
    • @@ -57,5 +60,5 @@
    +
    - Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/system.module.js =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/system.module.js (revision 2494) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/system.module.js (working copy) @@ -244,7 +244,17 @@ } } }); + $stateProvider + .state('index.system.restore', { + url: '^/system/restore', + views: { + 'restore@index.system': { + templateUrl: 'app/modules/system/submenu/restore/restore.html', + controller: 'restoreCtrl', + controllerAs: 'restore' + } + } + }); }]); angular.module("cmApp").requires.push('cm.system'); - Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/system.service.js =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/system.service.js (revision 2494) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/system/system.service.js (working copy) @@ -81,6 +81,9 @@ //Backup getBackupStatus: getBackupStatus, startBackup: startBackup, + //Restore from Backup + getRestoreStatus: getRestoreStatus, + startRestore: startRestore, }; function getUpdateVersion() { @@ -370,5 +373,10 @@ function startBackup(payload) { return apiService.post2('/backup/start', payload); } + function getRestoreStatus() { + return apiService.get('/restore/status'); + } + function startRestore(payload) { + return apiService.post2('/restore/start', JSON.stringify(payload)); + } }]); - Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/controller/restore_controller.py =================================================================== --- /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/controller/restore_controller.py (revision 2494) +++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/controller/restore_controller.py (working copy) @@ -15,21 +15,19 @@ def handle_restore_req(request, path=None): try: if path == 'start' and request.method == 'POST': - if 'backup_file' in request.FILES: - uploaded_file = request.FILES['backup_file'] - filename = os.path.join("/tmp" + uploaded_file.name) + obj = request.body + obj = json.loads(obj) + if 'filename' in obj: + uploaded_filename = obj['filename'] + filename = os.path.join("/tmp/webui_upload/" + uploaded_filename) if not filename.endswith("tar.gz"): return HttpResponse(json.dumps({ 'error': 400, - 'message': "Invalid file type. please upload file with extention tar.gz" + 'message': "Invalid file type. please upload file with extension tar.gz" }), content_type='application/json') - # Save the uploaded file - with open(filename, 'wb') as f: - for chunk in uploaded_file.chunks(): - f.write(chunk) - return restore_backup(filename, request) + return restore_backup(filename, request) else: return HttpResponse(json.dumps({ 'error': 400,