This is an automated email from the ASF dual-hosted git repository. xxyu pushed a commit to branch kylin-on-parquet-v2 in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/kylin-on-parquet-v2 by this push: new 63f8c84 KYLIN-4705 Monitor Spark's AppMaster for QueryServer - Part II 63f8c84 is described below commit 63f8c841918041be05508bf9fef5300e0d54a764 Author: Zhichao Zhang <441586...@qq.com> AuthorDate: Fri Sep 4 10:45:29 2020 +0800 KYLIN-4705 Monitor Spark's AppMaster for QueryServer - Part II --- webapp/app/js/controllers/admin.js | 13 +++++++++++-- webapp/app/js/services/admin.js | 3 ++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/webapp/app/js/controllers/admin.js b/webapp/app/js/controllers/admin.js index f1054e0..6265499 100644 --- a/webapp/app/js/controllers/admin.js +++ b/webapp/app/js/controllers/admin.js @@ -308,8 +308,17 @@ KylinApp.controller('AdminCtrl', function ($scope, AdminService, CacheService, T } $scope.openSparderUrl = function(){ - var sparder_url = Config.service.url + 'admin/sparder_url'; - $window.open(sparder_url); + AdminService.openSparderUrl({}, function (urlString) { + $window.open(urlString.url); + }, function (e) { + if (e.data && e.data.exception) { + var message = e.data.exception; + var msg = !!(message) ? message : 'Failed to take action.'; + SweetAlert.swal('Oops...', msg, 'error'); + } else { + SweetAlert.swal('Oops...', "Failed to take action.", 'error'); + } + }); } $scope.isCuratorScheduler = function() { diff --git a/webapp/app/js/services/admin.js b/webapp/app/js/services/admin.js index 6211910..80de227 100644 --- a/webapp/app/js/services/admin.js +++ b/webapp/app/js/services/admin.js @@ -24,5 +24,6 @@ KylinApp.factory('AdminService', ['$resource', function ($resource, config) { cleanStorage: {method: 'DELETE', params: {action: 'storage'}, isArray: false}, updateConfig: {method: 'PUT', params: {action: 'config'}, isArray: false}, getVersionInfo: {method: 'GET', params: {action: 'version'}, isArray: false}, + openSparderUrl: {method: 'GET', params: {action: 'sparder_url'}, isArray: false}, }); -}]); \ No newline at end of file +}]);