Repository: ignite Updated Branches: refs/heads/ignite-843 901e6081e -> f1f55d361
# GG-843 Fixed sql UI. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f1f55d36 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f1f55d36 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f1f55d36 Branch: refs/heads/ignite-843 Commit: f1f55d36107eaf10a726c578ac1e6907d91598d2 Parents: 901e608 Author: Andrey <[email protected]> Authored: Mon Sep 7 18:08:06 2015 +0700 Committer: Andrey <[email protected]> Committed: Mon Sep 7 18:08:06 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/sql-controller.js | 20 ++++++++---------- .../src/main/js/public/stylesheets/style.scss | 4 ++-- .../src/main/js/views/sql/chart-settings.jade | 4 ++-- .../src/main/js/views/sql/paragraph-rate.jade | 2 +- .../src/main/js/views/sql/sql.jade | 22 +++++++++++--------- 5 files changed, 26 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f1f55d36/modules/control-center-web/src/main/js/controllers/sql-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js index 1318f6a..5bed7da 100644 --- a/modules/control-center-web/src/main/js/controllers/sql-controller.js +++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js @@ -25,6 +25,8 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle $scope.joinTip = $common.joinTip; + $scope.caches = []; + $scope.pageSizes = [10, 25, 50]; $scope.modes = [ @@ -239,16 +241,12 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle $common.showError(errMsg); }); - $scope.caches = undefined; - $http.post('/agent/topology') .success(function (clusters) { - var node = clusters[0]; - - $scope.caches = node.caches; + $scope.caches = clusters[0].caches; }) .error(function (err, status) { - $scope.caches = undefined; + $scope.caches = []; if (status == 503) $scope.showDownloadAgent(); @@ -423,22 +421,22 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle }; $scope.rateAsString = function (paragraph) { - if (paragraph.rate && paragraph.rate.ruined) + if (paragraph.rate && paragraph.rate.executed) return " " + paragraph.rate.value + paragraph.rate.unit; return ""; }; $scope.startRefresh = function (paragraph, value, unit) { - paragraph.rate = { value: value, unit: unit, ruined: true }; + paragraph.rate = { value: value, unit: unit, executed: true }; - //TODO Start timer. + //TODO IGNITE-843 Start timer. }; $scope.stopRefresh = function (paragraph) { - paragraph.rate.ruined = false; + paragraph.rate.executed = false; - //TODO Stop timer. + //TODO IGNITE-843 Stop timer. }; $scope.getter = function (value) { http://git-wip-us.apache.org/repos/asf/ignite/blob/f1f55d36/modules/control-center-web/src/main/js/public/stylesheets/style.scss ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss index 90c077e..1175027 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss @@ -512,7 +512,6 @@ h3 { tbody { border-left: 10px solid transparent; - border-right: 10px solid transparent; } tbody td:first-child { @@ -1300,7 +1299,8 @@ a { .chart-btn { position: absolute; - right: 30px; + right: 25px; + margin: 0; } .chart-settings { http://git-wip-us.apache.org/repos/asf/ignite/blob/f1f55d36/modules/control-center-web/src/main/js/views/sql/chart-settings.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/sql/chart-settings.jade b/modules/control-center-web/src/main/js/views/sql/chart-settings.jade index 0538acd..0396182 100644 --- a/modules/control-center-web/src/main/js/views/sql/chart-settings.jade +++ b/modules/control-center-web/src/main/js/views/sql/chart-settings.jade @@ -25,12 +25,12 @@ .col-sm-2 label X: .col-sm-10 - button.form-control(id='chart-settings-X' ng-model='paragraph.chartColX' data-placeholder='Col X' bs-select bs-options='item.value as item.label for item in paragraph.chartColumns' tabindex='0') + button.form-control(id='chart-settings-X' ng-model='paragraph.chartColX' data-placeholder='Col X' bs-select bs-options='item.value as item.label for item in paragraph.chartColumns' data-container='false' tabindex='0') .settings-row .col-sm-2 label Y: .col-sm-10 - button.form-control(id='chart-settings-Y' ng-model='paragraph.chartColY' data-placeholder='Col Y' bs-select bs-options='item.value as item.label for item in paragraph.chartColumns' tabindex='1') + button.form-control(id='chart-settings-Y' ng-model='paragraph.chartColY' data-placeholder='Col Y' bs-select bs-options='item.value as item.label for item in paragraph.chartColumns' data-container='false' tabindex='1') .form-actions button.btn.btn-primary(id='chart-settings-apply' ng-disabled='chartSettingsForm.$invalid' type='button' ng-click='applyChartSettings(paragraph); $hide()') Apply button.btn.btn-primary(id='chart-settings-cancel' type='button' ng-click='$hide()') Cancel http://git-wip-us.apache.org/repos/asf/ignite/blob/f1f55d36/modules/control-center-web/src/main/js/views/sql/paragraph-rate.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/sql/paragraph-rate.jade b/modules/control-center-web/src/main/js/views/sql/paragraph-rate.jade index d9d8cdf..13337cf 100644 --- a/modules/control-center-web/src/main/js/views/sql/paragraph-rate.jade +++ b/modules/control-center-web/src/main/js/views/sql/paragraph-rate.jade @@ -24,7 +24,7 @@ .col-sm-4(style='padding: 0') input.form-control(id='paragraph-rate' ng-init='value = paragraph.rate.value' ng-model='value' type='number' required auto-focus) .col-sm-8(style='padding-left: 5px; padding-right: 0') - button.form-control(id='paragraph-unit' ng-init='unit = paragraph.rate.unit' ng-model='unit' required placeholder='Time unit' bs-select bs-options='item.value as item.label for item in timeUnit' tabindex='0') + button.form-control(id='paragraph-unit' ng-init='unit = paragraph.rate.unit' ng-model='unit' required placeholder='Time unit' bs-select bs-options='item.value as item.label for item in timeUnit' data-container='false' tabindex='0') .form-actions(style='margin-top: 30px; padding: 5px') button.btn.btn-primary(id='paragraph-rate-start' ng-disabled='popoverForm.$invalid' type='button' ng-click='startRefresh(paragraph, value, unit); $hide()') Start button.btn.btn-primary.btn-default(id='paragraph-rate-stop' type='button' ng-click='stopRefresh(paragraph); $hide()') Stop http://git-wip-us.apache.org/repos/asf/ignite/blob/f1f55d36/modules/control-center-web/src/main/js/views/sql/sql.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade index ec56351..2497dc3 100644 --- a/modules/control-center-web/src/main/js/views/sql/sql.jade +++ b/modules/control-center-web/src/main/js/views/sql/sql.jade @@ -76,17 +76,19 @@ block container ng-model='paragraph.query' ng-class='{"disable": paragraph.status == "RUNNING" || paragraph.status == "PENDING" }') .col-xs-4.col-sm-3 - div(ng-hide='caches.length == 0' style='padding: 5px 0 5px 10px') - lable.labelHeader Caches: - table.links(st-table='caches') - thead - + div(ng-show='caches.length > 0' style='padding: 5px 10px' st-table='displayedCollection' st-safe-src='caches') + lable.labelField.labelFormField Caches: + .input-tip + input.form-control(type='text' st-search placeholder='Filter caches...') + table.links tbody - tr(ng-repeat='cache in caches track by cache.name') - td + tr(ng-repeat='cache in displayedCollection track by cache.name') + td(style='width: 100%') a(ng-class='{active: cache.name == paragraph.cache.name}' ng-click='paragraph.cache = cache') {{$index + 1}}) {{::cache.name}} td(style='width: 15px') - i.fa.fa-info-circle + i.fa.fa-info-circle() + div(ng-show='caches.length == 0') + label Placeholder empty caches .col-sm-12 hr(style='margin: 0') .col-sm-12 @@ -96,9 +98,9 @@ block container button.btn.btn-primary(ng-click='scan(paragraph)' ng-disabled='!paragraph.cache') Scan .pull-right label Refresh rate: - button.btn.btn-default.fa.fa-clock-o.tipLabel(ng-class='{"btn-info": paragraph.rate && paragraph.rate.ruined}' bs-popover data-template-url='rate' data-placement='top-right' data-auto-close='1' data-trigger='click') {{rateAsString(paragraph)}} + button.btn.btn-default.fa.fa-clock-o.tipLabel(ng-class='{"btn-info": paragraph.rate && paragraph.rate.executed}' bs-popover data-template-url='rate' data-placement='top-right' data-auto-close='1' data-trigger='click') {{rateAsString(paragraph)}} label.tipLabel Page size: - button.btn.btn-default.base-control.tipLabel(ng-model='paragraph.pageSize' bs-options='item for item in pageSizes' bs-select) + button.btn.btn-default.base-control.tipLabel(ng-model='paragraph.pageSize' bs-options='item for item in pageSizes' bs-select style='margin-right: 0') .col-sm-12(ng-show='paragraph.result != "none"') hr(style='margin-top: 0; margin-bottom: 10px') div(ng-show='paragraph.rows && paragraph.result === "table"')
