From ef32ccd167c922630a7b39b779ddb2c620dd3343 Mon Sep 17 00:00:00 2001 From: jiazhong Date: Fri, 12 Dec 2014 17:39:24 +0800 Subject: [PATCH 1/4] update admin page style & alert style --- webapp/app/js/controllers/access.js | 4 ++-- webapp/app/js/controllers/admin.js | 3 +-- webapp/app/js/controllers/cubeEdit.js | 28 +++++++++++++++++----------- webapp/app/js/controllers/cubes.js | 25 ++++++------------------- webapp/app/js/controllers/job.js | 6 +++--- webapp/app/js/controllers/projects.js | 4 ++-- webapp/app/less/app.less | 4 ++++ webapp/app/partials/admin/admin.html | 22 +++++++++++----------- 8 files changed, 46 insertions(+), 50 deletions(-) diff --git a/webapp/app/js/controllers/access.js b/webapp/app/js/controllers/access.js index a8e7a68..faee735 100644 --- a/webapp/app/js/controllers/access.js +++ b/webapp/app/js/controllers/access.js @@ -77,9 +77,9 @@ KylinApp.controller('AccessCtrl', function ($scope,AccessService, MessageService $scope.revoke = function (type, access, entity) { SweetAlert.swal({ - title: 'Confirm', + title: '', text: 'Are you sure to revoke the access?', - type: 'warning', + type: 'info', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", diff --git a/webapp/app/js/controllers/admin.js b/webapp/app/js/controllers/admin.js index 5476a1f..af3624d 100644 --- a/webapp/app/js/controllers/admin.js +++ b/webapp/app/js/controllers/admin.js @@ -149,11 +149,10 @@ KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, Ta }; $scope.calculate = function () { $modalInstance.dismiss(); - SweetAlert.swal('Success!', 'A cardinality task has been submitted', 'success'); TableService.genCardinality({tableName: $scope.tableName}, {delimiter: $scope.delimiter, format: $scope.format}, function (result) { -// MessageService.sendMsg('Cardinality job was calculated successfully. Click Refresh button ...', 'success', {}); SweetAlert.swal('Success!', 'Cardinality job was calculated successfully. . Click Refresh button ...', 'success'); },function(e){ + console.log(e); if(e.data&& e.data.exception){ var message =e.data.exception; var msg = !!(message) ? message : 'Failed to take action.'; diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js index 02c1acc..ca67a9d 100644 --- a/webapp/app/js/controllers/cubeEdit.js +++ b/webapp/app/js/controllers/cubeEdit.js @@ -191,7 +191,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio } SweetAlert.swal({ - title: 'Confirm', + title: '', text: 'Are you sure to save the cube ?', type: 'info', showCancelButton: true, @@ -211,17 +211,23 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio design_form.$invalid = true; } } else { - MessageService.sendMsg("

Failed to deal the request:

"+$scope.state.cubeSchema+"
","error",{},true); + $scope.cubeMetaFrame.project = $scope.state.project; + if(request.message){ + var message =request.message; + var msg = !!(message) ? message : 'Failed to take action.'; + MessageService.sendMsg("

Failed to deal the request:

"+msg+"

"+$scope.state.cubeSchema+"
","error",{},true); + }else{ + SweetAlert.swal('Oops...', "Failed to take action.", 'error'); + } } //end loading loadingRequest.hide(); recoveryCubeStatus(); }, function (e) { - if(e.data&& e.data.exception){ var message =e.data.exception; var msg = !!(message) ? message : 'Failed to take action.'; - MessageService.sendMsg("

Failed to deal the request:"+msg+"

"+$scope.state.cubeSchema+"
","error",{},true); + MessageService.sendMsg("

Failed to deal the request:

"+msg+"

"+$scope.state.cubeSchema+"
","error",{},true); }else{ SweetAlert.swal('Oops...', "Failed to take action.", 'error'); } @@ -231,19 +237,19 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio } else { CubeService.save({}, {cubeDescData: $scope.state.cubeSchema, project: $scope.state.project}, function (request) { - if (request.successful) { + if(request.successful) { $scope.state.cubeSchema = request.cubeDescData; MessageService.sendMsg("Created cube successful.","success",{},true); } else { $scope.cubeMetaFrame.project = $scope.state.project; - var e = request; - if(e.data&& e.data.exception){ - var message =e.data.exception; + if(request.message){ + var message =request.message; var msg = !!(message) ? message : 'Failed to take action.'; - MessageService.sendMsg("

Failed to deal the request:

"+msg+"

"+$scope.state.cubeSchema+"
","error",{},true); + MessageService.sendMsg("

Failed to deal the request:

"+msg+"

"+$scope.state.cubeSchema+"
","error",{},true); }else{ SweetAlert.swal('Oops...', "Failed to take action.", 'error'); - } } + } + } //end loading loadingRequest.hide(); @@ -252,7 +258,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio if(e.data&& e.data.exception){ var message =e.data.exception; var msg = !!(message) ? message : 'Failed to take action.'; - MessageService.sendMsg("

Failed to deal the request:

"+msg+"

"+$scope.state.cubeSchema+"
","error",{},true); + MessageService.sendMsg("

Failed to deal the request:

"+msg+"

"+$scope.state.cubeSchema+"
","error",{},true); }else{ SweetAlert.swal('Oops...', "Failed to take action.", 'error'); } diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js index 80aa7d8..47e0c21 100644 --- a/webapp/app/js/controllers/cubes.js +++ b/webapp/app/js/controllers/cubes.js @@ -122,7 +122,7 @@ KylinApp SweetAlert.swal({ title: '', text: 'Are you sure to enable the cube? Please note: if cube schema is changed in the disabled period, all segments of the cube will be discarded due to data and schema mismatch.', - type: 'warning', + type: 'info', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", @@ -156,7 +156,7 @@ KylinApp SweetAlert.swal({ title: '', text: 'Are you sure to purge the cube? ', - type: 'warning', + type: 'info', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", @@ -185,7 +185,7 @@ KylinApp SweetAlert.swal({ title: '', text: 'Are you sure to disable the cube? ', - type: 'warning', + type: 'info', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", @@ -213,8 +213,8 @@ KylinApp SweetAlert.swal({ title: '', - text: "Are you sure to drop the cube? Once it's dropped, your cube’s metadata and data will be cleaned up and can’t be restored back. ", - type: 'warning', + text: " Once it's dropped, your cube’s metadata and data will be cleaned up and can’t be restored back. ", + type: 'info', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", @@ -265,7 +265,7 @@ KylinApp SweetAlert.swal({ title: '', text: "Are you sure to start the build? ", - type: 'warning', + type: 'info', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", @@ -354,16 +354,6 @@ var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageServic $scope.rebuild = function () { - SweetAlert.swal({ - title: '', - text: "Are you sure to rebuild the cube? ", - type: 'warning', - showCancelButton: true, - confirmButtonColor: '#DD6B55', - confirmButtonText: "Yes", - closeOnConfirm: true - }, function(isConfirm) { - if(isConfirm){ $scope.message = null; $scope.jobBuildRequest.startTime = new Date($scope.jobBuildRequest.startTime).getTime(); $scope.jobBuildRequest.endTime = new Date($scope.jobBuildRequest.endTime).getTime(); @@ -393,9 +383,6 @@ var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageServic SweetAlert.swal('Oops...', "Failed to take action.", 'error'); } }); - } - - }); }; // used by cube segment refresh diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js index 9324eb2..c98864b 100644 --- a/webapp/app/js/controllers/job.js +++ b/webapp/app/js/controllers/job.js @@ -103,9 +103,9 @@ KylinApp }); $scope.resume = function (job) { SweetAlert.swal({ - title: 'Confirm', + title: '', text: 'Are you sure to resume the job?', - type: 'warning', + type: 'info', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", @@ -134,7 +134,7 @@ KylinApp SweetAlert.swal({ title: 'Confirm', text: 'Are you sure to discard the job?', - type: 'warning', + type: 'info', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", diff --git a/webapp/app/js/controllers/projects.js b/webapp/app/js/controllers/projects.js index 4f5a375..ab584a5 100644 --- a/webapp/app/js/controllers/projects.js +++ b/webapp/app/js/controllers/projects.js @@ -49,9 +49,9 @@ KylinApp $scope.delete = function(project){ SweetAlert.swal({ - title: 'Confirm', + title: '', text: 'Are you sure to delete ?', - type: 'warning', + type: 'info', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", diff --git a/webapp/app/less/app.less b/webapp/app/less/app.less index 9ece77c..a807ad1 100644 --- a/webapp/app/less/app.less +++ b/webapp/app/less/app.less @@ -526,3 +526,7 @@ ul.messenger .messenger-message-inner { -o-user-select: text; user-select: text; } + +.load-hive-metawrapper input[type="radio"]{ + margin-left:0px !important; +} \ No newline at end of file diff --git a/webapp/app/partials/admin/admin.html b/webapp/app/partials/admin/admin.html index c3c3e5b..ef5b402 100644 --- a/webapp/app/partials/admin/admin.html +++ b/webapp/app/partials/admin/admin.html @@ -21,29 +21,29 @@

Actions

-
+
-
+
-
+
-
+
-
+
@@ -61,7 +61,7 @@

Load Hive Table Metadata

-
+
From 1ef79c0236de4da88b4c33c255891a9950308723 Mon Sep 17 00:00:00 2001 From: jiazhong Date: Fri, 12 Dec 2014 18:29:45 +0800 Subject: [PATCH 2/4] rm big icon & use default btn on confirm box --- .../bootstrap-sweetalert/lib/sweet-alert.js | 4 +-- webapp/app/js/controllers/access.js | 2 +- webapp/app/js/controllers/admin.js | 8 ++--- webapp/app/js/controllers/cubeEdit.js | 2 +- webapp/app/js/controllers/cubes.js | 12 +++---- webapp/app/js/controllers/job.js | 4 +-- webapp/app/js/controllers/projects.js | 2 +- webapp/app/js/controllers/query.js | 41 ++++++++-------------- 8 files changed, 31 insertions(+), 44 deletions(-) diff --git a/webapp/app/components/bootstrap-sweetalert/lib/sweet-alert.js b/webapp/app/components/bootstrap-sweetalert/lib/sweet-alert.js index 6de8933..d90eec6 100644 --- a/webapp/app/components/bootstrap-sweetalert/lib/sweet-alert.js +++ b/webapp/app/components/bootstrap-sweetalert/lib/sweet-alert.js @@ -176,7 +176,7 @@ */ window.sweetAlertInitialize = function() { - var sweetHTML = '

Title

Text

', + var sweetHTML = '

Title

Text

', sweetWrap = document.createElement('div'); sweetWrap.innerHTML = sweetHTML; @@ -544,7 +544,7 @@ } // Reset confirm buttons to default class (Ugly fix) - $confirmBtn.className = 'confirm btn btn-lg' + $confirmBtn.className = 'confirm btn' // Set confirm button to selected class addClass($confirmBtn, params.confirmButtonClass); diff --git a/webapp/app/js/controllers/access.js b/webapp/app/js/controllers/access.js index faee735..2a0306b 100644 --- a/webapp/app/js/controllers/access.js +++ b/webapp/app/js/controllers/access.js @@ -79,7 +79,7 @@ KylinApp.controller('AccessCtrl', function ($scope,AccessService, MessageService SweetAlert.swal({ title: '', text: 'Are you sure to revoke the access?', - type: 'info', + type: '', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", diff --git a/webapp/app/js/controllers/admin.js b/webapp/app/js/controllers/admin.js index af3624d..dae1190 100644 --- a/webapp/app/js/controllers/admin.js +++ b/webapp/app/js/controllers/admin.js @@ -39,7 +39,7 @@ KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, Ta SweetAlert.swal({ title: '', text: 'Are you sure to reload metadata and clean cache?', - type: 'info', + type: '', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", @@ -81,7 +81,7 @@ KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, Ta SweetAlert.swal({ title: '', text: 'Are you sure to clean up unused HDFS and HBase space?', - type: 'info', + type: '', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", @@ -107,7 +107,7 @@ KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, Ta SweetAlert.swal({ title: '', text: 'Are you sure to disable query cache?', - type: 'info', + type: '', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", @@ -177,7 +177,7 @@ KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, Ta SweetAlert.swal({ title: '', text: 'Are you sure to update config?', - type: 'info', + type: '', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js index e057611..e29acfc 100644 --- a/webapp/app/js/controllers/cubeEdit.js +++ b/webapp/app/js/controllers/cubeEdit.js @@ -199,7 +199,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio SweetAlert.swal({ title: '', text: 'Are you sure to save the cube ?', - type: 'info', + type: '', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js index 47e0c21..fa9c180 100644 --- a/webapp/app/js/controllers/cubes.js +++ b/webapp/app/js/controllers/cubes.js @@ -122,10 +122,10 @@ KylinApp SweetAlert.swal({ title: '', text: 'Are you sure to enable the cube? Please note: if cube schema is changed in the disabled period, all segments of the cube will be discarded due to data and schema mismatch.', - type: 'info', + type: '', showCancelButton: true, confirmButtonColor: '#DD6B55', - confirmButtonText: "Yes", +// confirmButtonText: "Yes", closeOnConfirm: true }, function(isConfirm) { if(isConfirm){ @@ -156,7 +156,7 @@ KylinApp SweetAlert.swal({ title: '', text: 'Are you sure to purge the cube? ', - type: 'info', + type: '', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", @@ -185,7 +185,7 @@ KylinApp SweetAlert.swal({ title: '', text: 'Are you sure to disable the cube? ', - type: 'info', + type: '', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", @@ -214,7 +214,7 @@ KylinApp SweetAlert.swal({ title: '', text: " Once it's dropped, your cube’s metadata and data will be cleaned up and can’t be restored back. ", - type: 'info', + type: '', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", @@ -265,7 +265,7 @@ KylinApp SweetAlert.swal({ title: '', text: "Are you sure to start the build? ", - type: 'info', + type: '', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js index c98864b..5fb60db 100644 --- a/webapp/app/js/controllers/job.js +++ b/webapp/app/js/controllers/job.js @@ -105,7 +105,7 @@ KylinApp SweetAlert.swal({ title: '', text: 'Are you sure to resume the job?', - type: 'info', + type: '', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", @@ -134,7 +134,7 @@ KylinApp SweetAlert.swal({ title: 'Confirm', text: 'Are you sure to discard the job?', - type: 'info', + type: '', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", diff --git a/webapp/app/js/controllers/projects.js b/webapp/app/js/controllers/projects.js index ab584a5..ff4418b 100644 --- a/webapp/app/js/controllers/projects.js +++ b/webapp/app/js/controllers/projects.js @@ -51,7 +51,7 @@ KylinApp SweetAlert.swal({ title: '', text: 'Are you sure to delete ?', - type: 'info', + type: '', showCancelButton: true, confirmButtonColor: '#DD6B55', confirmButtonText: "Yes", diff --git a/webapp/app/js/controllers/query.js b/webapp/app/js/controllers/query.js index 1d5643c..397b6db 100644 --- a/webapp/app/js/controllers/query.js +++ b/webapp/app/js/controllers/query.js @@ -222,14 +222,6 @@ KylinApp $scope.parseQueryResult(query, result, (!result || result.isException) ? 'failed' : 'success'); $scope.curQuery.result.hasMore = (query.result.results && query.result.results.length == $scope.rowsPerPage); }, function (result) { - var e = result; - 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'); - } scrollToButton(); $scope.parseQueryResult(query, result, 'failed'); }); @@ -287,14 +279,6 @@ KylinApp query.result.loading = false; }, function (result) { query.status = 'failed'; - var e = result; - 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'); - } }); } @@ -377,14 +361,6 @@ KylinApp QueryService.save({}, {name: query.name, project: query.project, sql: query.sql, description: query.description}, function () { SweetAlert.swal('Success!', 'New query saved..', 'success'); $modalInstance.dismiss('cancel'); - },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'); - } }); } } @@ -398,9 +374,20 @@ KylinApp }); if (isExecuting && (next.replace(current, "").indexOf("#") != 0)) { - if (!confirm("You've executing query in current page, are you sure to leave this page?")) { - event.preventDefault(); - } + SweetAlert.swal({ + title: '', + text: "You've executing query in current page, are you sure to leave this page?", + type: '', + showCancelButton: true, + confirmButtonColor: '#DD6B55', + confirmButtonText: "Yes", + closeOnConfirm: true + }, function(isConfirm) { + if(!isConfirm){ + event.preventDefault(); + } + + }); } }); From 23270b1f2098b9ffe4accadab969fac3bae87e6b Mon Sep 17 00:00:00 2001 From: jiazhong Date: Fri, 12 Dec 2014 19:08:22 +0800 Subject: [PATCH 3/4] webapp/app/partials/cubes/cube_json_edit.html --- webapp/app/js/controllers/admin.js | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/webapp/app/js/controllers/admin.js b/webapp/app/js/controllers/admin.js index dae1190..a613152 100644 --- a/webapp/app/js/controllers/admin.js +++ b/webapp/app/js/controllers/admin.js @@ -174,16 +174,7 @@ KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, Ta }; $scope.update = function () { - SweetAlert.swal({ - title: '', - text: 'Are you sure to update config?', - type: '', - showCancelButton: true, - confirmButtonColor: '#DD6B55', - confirmButtonText: "Yes", - closeOnConfirm: true - }, function(isConfirm) { - if(isConfirm){ + AdminService.updateConfig({}, {key: $scope.state.key, value: $scope.state.value}, function (result) { SweetAlert.swal('Success!', 'Config updated successfully!', 'success'); $modalInstance.dismiss(); @@ -197,10 +188,6 @@ KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, Ta } }); } - - }); - - } }; $scope.getEnv(); From c8bf31feb674c2bb3964b114b5477c6e297a9bdd Mon Sep 17 00:00:00 2001 From: jiazhong Date: Fri, 12 Dec 2014 19:09:10 +0800 Subject: [PATCH 4/4] add cube_json_edit.html --- webapp/app/partials/cubes/cube_json_edit.html | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/webapp/app/partials/cubes/cube_json_edit.html b/webapp/app/partials/cubes/cube_json_edit.html index 2833f0a..4293a55 100644 --- a/webapp/app/partials/cubes/cube_json_edit.html +++ b/webapp/app/partials/cubes/cube_json_edit.html @@ -39,3 +39,22 @@
+ + + + + +