From fe041d9ba0ca356260db29224aea5994280ebc06 Mon Sep 17 00:00:00 2001 From: zhiqiangx Date: Wed, 27 Dec 2017 12:41:33 +0800 Subject: [PATCH 1/4] Change rule name to rule text. --- .../src/app/dashboard/views/rules/rules.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/rules.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/rules.js index af50d608613..533b163a6ee 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/rules.js +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/rules.js @@ -41,7 +41,7 @@ angular.module('zeppelinWebApp') cols: [ $stb.indicator().key('state').canSort('state.condition+"_"+submitTime').styleClass('td-no-padding').done(), $stb.text('ID').key('id').canSort().sortDefaultDescent().done(), - $stb.text('Name').key(['ruleName']).canSort().done(), + $stb.text('Rule Text').key(['ruleText']).styleClass('col-md-1 hidden-sm hidden-xs').done(), $stb.datetime('Submission Time').key('submitTime').canSort().done(), $stb.datetime('Last Check Time').key('lastCheckTime').canSort().done(), $stb.text('Checked Number').key('numChecked').canSort().styleClass('hidden-sm hidden-xs').done(), @@ -60,14 +60,9 @@ angular.module('zeppelinWebApp') // name: {href: pageUrl, text: rule.appName}, state: {tooltip: rule.state, condition: rule.isRunning ? 'good' : '', shape: 'stripe'}, //user: rule.user, - ruleName: { - value: rule.ruleName, - title: "ID:" + rule.id + " Name:" + rule.ruleName - + " Submission Time:" + new Date(rule.submitTime).toUTCString() - + " Last Check Time:" + new Date(rule.lastCheckTime).toUTCString() - + " Checked Number:" + rule.numChecked - + " Cmdlets Generated:" + rule.numCmdsGen - + " Status:" + rule.state + ruleText: { + value: rule.ruleText.length > 70 ? rule.ruleText.substring(0, 70) + ' ...' : rule.ruleText, + title: rule.ruleText }, submitTime: rule.submitTime, lastCheckTime: rule.lastCheckTime === 0 ? '-' : rule.lastCheckTime, From 1a75dc2f31764c07bf66600694ba50f657c1ba41 Mon Sep 17 00:00:00 2001 From: zhiqiangx Date: Tue, 2 Jan 2018 09:55:00 +0800 Subject: [PATCH 2/4] Solve #1512,Fix action progress bar has too many decimal digits issue --- .../zeppelin-web/src/app/dashboard/views/actions/actions.html | 4 ++-- .../zeppelin-web/src/app/dashboard/views/actions/actions.js | 1 + .../src/app/dashboard/views/copy/detail/copyActions.html | 4 ++-- .../src/app/dashboard/views/copy/detail/copyActions.js | 1 + .../src/app/dashboard/views/mover/detail/moverActions.html | 4 ++-- .../src/app/dashboard/views/mover/detail/moverActions.js | 1 + .../zeppelin-web/src/app/dashboard/views/rules/rules.js | 2 ++ 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.html b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.html index 1905c1fb626..303f42a3297 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.html +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.html @@ -53,11 +53,11 @@

No action is running

{{action.finished ? action.successful ? "Successful" : "Faild" : "-"}}
- +
-
diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.js index 37ddc49de68..497bb2a1864 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.js +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.js @@ -42,6 +42,7 @@ angular.module('zeppelinWebApp') $filter('date')(data.createTime,'yyyy-MM-dd HH:mm:ss'); data.finishTime = data.finished ? data.finishTime === 0 ? "-" : $filter('date')(data.finishTime,'yyyy-MM-dd HH:mm:ss') : '-'; + data.progress = Math.round(data.progress * 100); data.progressColor = data.finished ? data.successful ? 'success' : 'danger' : 'warning'; }); $scope.totalPage = Math.ceil($scope.totalNumber / $scope.pageNumber); diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.html b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.html index bbb76372828..179c1b11a82 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.html +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.html @@ -53,11 +53,11 @@

No action is running

{{action.finished ? action.runTime + "ms" : "-"}}
- +
-
diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.js index 820ae463d36..892b5490aac 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.js +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.js @@ -42,6 +42,7 @@ angular.module('zeppelinWebApp') $filter('date')(data.createTime,'yyyy-MM-dd HH:mm:ss'); data.finishTime = data.finished ? data.finishTime === 0 ? "-" : $filter('date')(data.finishTime,'yyyy-MM-dd HH:mm:ss') : '-'; + data.progress = Math.round(data.progress * 100); data.progressColor = data.finished ? data.successful ? 'success' : 'danger' : 'warning'; }); $scope.totalPage = Math.ceil($scope.totalNumber / $scope.pageNumber); diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.html b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.html index ccb27f8195d..b04b6ef9294 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.html +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.html @@ -53,11 +53,11 @@

No action is running

{{action.finished ? action.runTime + "ms" : "-"}}
- +
-
diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.js index 4c3dea003a8..e6b5354ca98 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.js +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.js @@ -42,6 +42,7 @@ function MoverActionsCtrl($scope, baseUrlSrv, $filter, $http, conf, $route) { $filter('date')(data.createTime,'yyyy-MM-dd HH:mm:ss'); data.finishTime = data.finished ? data.finishTime === 0 ? "-" : $filter('date')(data.finishTime,'yyyy-MM-dd HH:mm:ss') : '-'; + data.progress = Math.round(data.progress * 100); data.progressColor = data.finished ? data.successful ? 'success' : 'danger' : 'warning'; }); $scope.totalPage = Math.ceil($scope.totalNumber / $scope.pageNumber); diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/rules.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/rules.js index 533b163a6ee..0c62c766393 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/rules.js +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/rules.js @@ -84,8 +84,10 @@ angular.module('zeppelinWebApp') click: function () { if(!rule.isRunning) { rule.start(); + rule.isRunning = true; }else{ rule.terminate(); + rule.isRunning = false; } } }, From 2ac539a03aa17fb01e5bc5179301a7dacd5fd1fb Mon Sep 17 00:00:00 2001 From: zhiqiangx Date: Tue, 9 Jan 2018 10:07:43 +0800 Subject: [PATCH 3/4] Refine storage page. --- smart-zeppelin/zeppelin-web/src/app/app.js | 18 +--- .../app/dashboard/views/actions/actions.js | 14 ++- .../views/cluster/storage/storage.html | 15 --- .../views/cluster/storage/storage.js | 92 ++++++++++++------- .../views/cluster/storage/storages.html | 29 ++++++ .../views/cluster/storage/storages.js | 19 ++++ .../views/copy/detail/copyActions.js | 16 ++-- .../views/mover/detail/moverActions.js | 14 ++- .../app/dashboard/views/rules/rule/rule.js | 16 ++-- smart-zeppelin/zeppelin-web/src/index.js | 1 + 10 files changed, 149 insertions(+), 85 deletions(-) delete mode 100644 smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storage.html create mode 100644 smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storages.html create mode 100644 smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storages.js diff --git a/smart-zeppelin/zeppelin-web/src/app/app.js b/smart-zeppelin/zeppelin-web/src/app/app.js index 8f98aa4d644..b53a71e083c 100644 --- a/smart-zeppelin/zeppelin-web/src/app/app.js +++ b/smart-zeppelin/zeppelin-web/src/app/app.js @@ -202,22 +202,8 @@ var zeppelinWebApp = angular.module('zeppelinWebApp', [ controller: 'SearchResultCtrl' }) .when('/storage', { - templateUrl: 'app/dashboard/views/cluster/storage/storage.html', - controller: 'StorageCtrl', - resolve: { - cache: ['models', function (models) { - return models.$get.storageUsage('cache'); - }], - ssd: ['models', function (models) { - return models.$get.storageUsage('ssd'); - }], - disk: ['models', function (models) { - return models.$get.storageUsage('disk'); - }], - archive: ['models', function (models) { - return models.$get.storageUsage('archive'); - }] - } + templateUrl: 'app/dashboard/views/cluster/storage/storages.html', + controller: 'StoragesCtrl' }) .otherwise({ redirectTo: '/notebook' diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.js index 497bb2a1864..9f317037867 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.js +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/actions/actions.js @@ -19,8 +19,8 @@ angular.module('zeppelinWebApp') .controller('ActionsCtrl', ActionsCtrl); - ActionsCtrl.$inject = ['$scope', 'baseUrlSrv', '$filter', '$http', 'conf']; - function ActionsCtrl($scope, baseUrlSrv, $filter, $http, conf) { + ActionsCtrl.$inject = ['$scope', 'baseUrlSrv', '$filter', '$http', 'conf', '$interval']; + function ActionsCtrl($scope, baseUrlSrv, $filter, $http, conf, $interval) { $scope.pageNumber = 10; $scope.totalNumber = 0; $scope.actions; @@ -68,7 +68,11 @@ angular.module('zeppelinWebApp') getActions(); - setInterval(function(){ - $scope.$apply(getActions()); - },10000); + var timer=$interval(function(){ + getActions(); + },5000); + + $scope.$on('$destroy',function(){ + $interval.cancel(timer); + }); } diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storage.html b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storage.html deleted file mode 100644 index 6fc90f9d29e..00000000000 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storage.html +++ /dev/null @@ -1,15 +0,0 @@ -
-
-

Cache Storage Usage

-
-
-

SSD Storage Usage

-
-
-

Disk Storage Usage

-
-
-

Archive Storage Usage

-
-
- diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storage.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storage.js index 31a31c0b71e..9be51688b94 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storage.js +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storage.js @@ -12,53 +12,81 @@ * limitations under the License. */ -import PiechartVisualization from '../../../../visualization/builtins/visualization-piechart'; +import AreachartVisualization from '../../../../visualization/builtins/visualization-areachart'; angular.module('zeppelinWebApp').controller('StorageCtrl', StorageCtrl); -StorageCtrl.$inject = ['$scope', 'cache', 'ssd', 'disk', 'archive']; -function StorageCtrl($scope, cache, ssd, disk, archive) { - var targetEls = new Array(); +StorageCtrl.$inject = ['$scope', 'baseUrlSrv', '$filter', '$http', 'conf', '$interval']; +function StorageCtrl($scope, baseUrlSrv, $filter, $http, conf, $interval) { var tableData = { columns: [ - {name: "usage", index: 0, aggr: "sum"}, - {name: "value", index: 1, aggr: "sum"} + {name: "time", index: 0, aggr: "sum"}, + {name: "value(%)", index: 1, aggr: "sum"} ], + rows:[], comment: "" }; - var config = {}; + var config = {} - var getGB = function (value) { - var result = (value / (1024 * 1024 * 1024)).toFixed(2); - return result; - } + var timeGranularity = 60; + var timeRegular = 'HH:mm'; - var initPieChart = function(targetEl, data) { - if (data.total === 0) { - targetEl.remove(); - return; + var builtInViz; + + var getStorageData = function () { + $http.get(baseUrlSrv.getSmartApiRoot() + conf.restapiProtocol + '/cluster/primary/hist_utilization/' + + $scope.storageType + '/' + timeGranularity + '000/-' + timeGranularity * 60 + '000/0') + .then(function(response) { + var storageData = angular.fromJson(response.data).body; + var rows = new Array(); + angular.forEach(storageData, function (data, index) { + rows.push([$filter('date')(new Date(data.timeStamp), timeRegular), + (data.used / data.total * 100).toFixed(2)]); + }); + tableData.rows = rows; + initAreaChart(); + }); + }; + + $scope.initStorage = function (storage) { + $scope.storageType = storage; + getStorageData(); + }; + + $scope.selectTimeGranularity = function (time) { + if (time === 0) { + timeGranularity = 60; + timeRegular = 'HH:mm' + } else if (time === 1) { + timeGranularity = 3600; + timeRegular = 'dd HH:mm' + } else if (time === 2) { + timeGranularity = 3600 * 24; + timeRegular = 'MM-dd' + } + getStorageData(); + }; + + var initAreaChart = function() { + var targetEl = angular.element('#' + $scope.storageType); + //generate area chart. + targetEl.height(300); + if (!builtInViz) { + builtInViz = new AreachartVisualization(targetEl, config); + angular.element(window).resize(function () { + builtInViz.resize(); + }); } - //get pie chart data. - var rows = []; - rows[0] = ['Used(G)', getGB(data.used)]; - rows[1] = ['Free(G)', getGB(data.total - data.used)]; - tableData.rows = rows; - //generate pie chart. - targetEl.height(536); - targetEls.push(targetEl); - var builtInViz = new PiechartVisualization(targetEl, config); var transformation = builtInViz.getTransformation(); var transformed = transformation.transform(tableData); builtInViz.render(transformed); - builtInViz.donut(); builtInViz.activate(); - angular.element(window).resize(function () { - builtInViz.resize(); - }); }; - initPieChart(angular.element('#cache'), cache.body); - initPieChart(angular.element('#ssd'), ssd.body); - initPieChart(angular.element('#disk'), disk.body); - initPieChart(angular.element('#archive'), archive.body); + var timer=$interval(function(){ + getStorageData(); + },30000); + $scope.$on('$destroy',function(){ + $interval.cancel(timer); + }); } diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storages.html b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storages.html new file mode 100644 index 00000000000..4065ff26266 --- /dev/null +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storages.html @@ -0,0 +1,29 @@ + +
+
+

{{storage}} storage usage

+
+
+ + + +
+
+
+
+
diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storages.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storages.js new file mode 100644 index 00000000000..825aca17a31 --- /dev/null +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storages.js @@ -0,0 +1,19 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +angular.module('zeppelinWebApp').controller('StoragesCtrl', StoragesCtrl); +StoragesCtrl.$inject = ['$scope']; +function StoragesCtrl($scope) { + $scope.storages = ['cache', 'ssd', 'disk', 'archive']; +} diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.js index 892b5490aac..855c63eec9c 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.js +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.js @@ -15,12 +15,12 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - */ + */$interval angular.module('zeppelinWebApp') .controller('CopyActionsCtrl', CopyActionsCtrl); - CopyActionsCtrl.$inject = ['$scope', 'baseUrlSrv', '$filter', '$http', 'conf', '$route']; - function CopyActionsCtrl($scope, baseUrlSrv, $filter, $http, conf, $route) { + CopyActionsCtrl.$inject = ['$scope', 'baseUrlSrv', '$filter', '$http', 'conf', '$route', '$interval']; + function CopyActionsCtrl($scope, baseUrlSrv, $filter, $http, conf, $route, $interval) { $scope.pageNumber = 10; $scope.totalNumber = 0; $scope.copyActions; @@ -66,8 +66,12 @@ angular.module('zeppelinWebApp') getCopyActions(); - setInterval(function(){ - $scope.$apply(getCopyActions()); - },10000); + var timer=$interval(function(){ + getCopyActions(); + },5000); + + $scope.$on('$destroy',function(){ + $interval.cancel(timer); + }); } diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.js index e6b5354ca98..7c9c92fd2f9 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.js +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/detail/moverActions.js @@ -19,8 +19,8 @@ angular.module('zeppelinWebApp') .controller('MoverActionsCtrl', MoverActionsCtrl); -MoverActionsCtrl.$inject = ['$scope', 'baseUrlSrv', '$filter', '$http', 'conf', '$route']; -function MoverActionsCtrl($scope, baseUrlSrv, $filter, $http, conf, $route) { +MoverActionsCtrl.$inject = ['$scope', 'baseUrlSrv', '$filter', '$http', 'conf', '$route', '$interval']; +function MoverActionsCtrl($scope, baseUrlSrv, $filter, $http, conf, $route, $interval) { $scope.pageNumber = 10; $scope.totalNumber = 0; $scope.copyActions; @@ -66,8 +66,12 @@ function MoverActionsCtrl($scope, baseUrlSrv, $filter, $http, conf, $route) { getCopyActions(); - setInterval(function(){ - $scope.$apply(getCopyActions()); - },10000); + var timer=$interval(function(){ + getCopyActions(); + },5000); + + $scope.$on('$destroy',function(){ + $interval.cancel(timer); + }); } diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/rule/rule.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/rule/rule.js index 1da0ab37c04..cb573024f73 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/rule/rule.js +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/rule/rule.js @@ -22,9 +22,9 @@ angular.module('zeppelinWebApp') * This controller is used to obtain rule. All nested views will read status from here. */ .controller('RuleCtrl', RuleCtrl); - RuleCtrl.$inject = ['$scope', 'rule0', '$propertyTableBuilder', 'models', - 'baseUrlSrv', '$filter', '$http', 'conf', '$route']; - function RuleCtrl($scope, rule0, $ptb, models, + RuleCtrl.$inject = ['$scope', 'rule0', '$propertyTableBuilder', 'models', '$interval', + 'baseUrlSrv', '$filter', '$http', 'conf', '$route' ]; + function RuleCtrl($scope, rule0, $ptb, models, $interval, baseUrlSrv, $filter, $http, conf, $route) { 'use strict'; @@ -96,7 +96,11 @@ angular.module('zeppelinWebApp') }; getCmdlets(); - setInterval(function(){ - $scope.$apply(getCmdlets()); - },10000); + var timer=$interval(function(){ + getCmdlets(); + },5000); + + $scope.$on('$destroy',function(){ + $interval.cancel(timer); + }); } diff --git a/smart-zeppelin/zeppelin-web/src/index.js b/smart-zeppelin/zeppelin-web/src/index.js index d114edb6cff..af67e3ced50 100644 --- a/smart-zeppelin/zeppelin-web/src/index.js +++ b/smart-zeppelin/zeppelin-web/src/index.js @@ -71,6 +71,7 @@ import './app/dashboard/services/models/models.js'; import './app/dashboard/views/cluster/cluster_hottestFiles.js'; import './app/dashboard/views/cluster/cluster_fileInCache.js'; import './app/dashboard/views/cluster/storage/storage.js'; +import './app/dashboard/views/cluster/storage/storages.js'; import './app/dashboard/views/actions/actions.js'; import './app/dashboard/views/actions/action/action.js'; import './app/dashboard/views/actions/submit/submit.js'; From d5fa5d58f3b4ee808d1c796e9e53b0cb7569a91b Mon Sep 17 00:00:00 2001 From: zhiqiangx Date: Sat, 13 Jan 2018 00:01:52 +0800 Subject: [PATCH 4/4] Solve #1531, Adjust storage utilization UI page. --- .../src/app/dashboard/views/cluster/storage/storage.js | 2 +- .../src/app/dashboard/views/copy/detail/copyActions.js | 2 +- .../src/app/visualization/builtins/visualization-areachart.js | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storage.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storage.js index 9be51688b94..3af467895ae 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storage.js +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/storage/storage.js @@ -24,7 +24,7 @@ function StorageCtrl($scope, baseUrlSrv, $filter, $http, conf, $interval) { rows:[], comment: "" }; - var config = {} + var config = {}; var timeGranularity = 60; var timeRegular = 'HH:mm'; diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.js index 855c63eec9c..a422371268f 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.js +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/detail/copyActions.js @@ -15,7 +15,7 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - */$interval + */ angular.module('zeppelinWebApp') .controller('CopyActionsCtrl', CopyActionsCtrl); diff --git a/smart-zeppelin/zeppelin-web/src/app/visualization/builtins/visualization-areachart.js b/smart-zeppelin/zeppelin-web/src/app/visualization/builtins/visualization-areachart.js index 4e0d318dc0f..bc8bd741807 100644 --- a/smart-zeppelin/zeppelin-web/src/app/visualization/builtins/visualization-areachart.js +++ b/smart-zeppelin/zeppelin-web/src/app/visualization/builtins/visualization-areachart.js @@ -62,6 +62,8 @@ export default class AreachartVisualization extends Nvd3ChartVisualization { chart.yAxis.tickFormat(function(d) {return self.yAxisTickFormat(d);}); chart.yAxis.axisLabelDistance(50); chart.useInteractiveGuideline(true); // for better UX and performance issue. (https://github.com/novus/nvd3/issues/691) + chart.showControls(false); + chart.yDomain([0, 100]); this.chart.style(this.config.style || 'stack');