Repository: ignite Updated Branches: refs/heads/ignite-843 f1f55d361 -> 9882bc57c
# 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/9882bc57 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9882bc57 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9882bc57 Branch: refs/heads/ignite-843 Commit: 9882bc57ceacd17ad464ca683db6c2aff5baacef Parents: f1f55d3 Author: Andrey <[email protected]> Authored: Mon Sep 7 18:21:16 2015 +0700 Committer: Andrey <[email protected]> Committed: Mon Sep 7 18:21:16 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/routes/sql.js | 4 +++ .../src/main/js/views/sql/cache-metadata.jade | 27 ++++++++++++++++++++ .../src/main/js/views/sql/sql.jade | 12 ++++----- 3 files changed, 37 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9882bc57/modules/control-center-web/src/main/js/routes/sql.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/sql.js b/modules/control-center-web/src/main/js/routes/sql.js index 88297ca..6925eed 100644 --- a/modules/control-center-web/src/main/js/routes/sql.js +++ b/modules/control-center-web/src/main/js/routes/sql.js @@ -26,6 +26,10 @@ router.get('/chart-settings', function (req, res) { res.render('sql/chart-settings', {}); }); +router.get('/cache-metadata', function (req, res) { + res.render('sql/cache-metadata', {}); +}); + router.get('/:noteId', function (req, res) { res.render('sql/sql', {noteId: req.params.noteId}); }); http://git-wip-us.apache.org/repos/asf/ignite/blob/9882bc57/modules/control-center-web/src/main/js/views/sql/cache-metadata.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/sql/cache-metadata.jade b/modules/control-center-web/src/main/js/views/sql/cache-metadata.jade new file mode 100644 index 0000000..8fb88e9 --- /dev/null +++ b/modules/control-center-web/src/main/js/views/sql/cache-metadata.jade @@ -0,0 +1,27 @@ +//- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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. +.popover(tabindex='-1' style='width: 200px') + .arrow + h3.popover-title(style='color: black') Refresh rate + button.close(id='paragraph-rate-close' type='button' ng-click='$hide()') × + .popover-content + form(name='popoverForm') + .form-group(style='margin: 0; padding: 5px') + .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') + .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/9882bc57/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 2497dc3..4eeece9 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,17 @@ block container ng-model='paragraph.query' ng-class='{"disable": paragraph.status == "RUNNING" || paragraph.status == "PENDING" }') .col-xs-4.col-sm-3 - div(ng-show='caches.length > 0' style='padding: 5px 10px' st-table='displayedCollection' st-safe-src='caches') + div(ng-show='caches.length > 0' style='padding: 5px 10px' st-table='displayedCaches' st-safe-src='caches') lable.labelField.labelFormField Caches: .input-tip - input.form-control(type='text' st-search placeholder='Filter caches...') + input.form-control(type='text' placeholder='Filter caches...') table.links tbody - tr(ng-repeat='cache in displayedCollection track by cache.name') + tr(ng-repeat='cache in displayedCaches 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(bs-popover data-template-url='cache-metadata' data-placement='left' data-auto-close='1' data-trigger='click') div(ng-show='caches.length == 0') label Placeholder empty caches .col-sm-12 @@ -117,12 +117,12 @@ block container button.btn.btn-primary(id='export-item-dropdown' data-toggle='dropdown' data-container='body' bs-dropdown='exportDropdown' data-placement='bottom-right') span.caret .sql-table-wrapper - table.table.table-condensed(st-table='displayedCollection' st-safe-src='paragraph.rows' float-thead='floatTheadOptions') + table.table.table-condensed(st-table='displayedResult' st-safe-src='paragraph.rows' float-thead='floatTheadOptions') thead tr th(ng-repeat='col in paragraph.meta track by $index' data-ng-bind='col.fieldName' bs-tooltip='columnToolTip(col)' data-placement='bottom') tbody - tr(ng-repeat='row in displayedCollection track by $index') + tr(ng-repeat='row in displayedResult track by $index') td(ng-repeat='val in row track by $index') {{ val }} .panel-body(ng-show='paragraph.rows && paragraph.result != "table" && paragraph.result != "none"') button.btn.btn-default.chart-btn.fa.fa-cog(bs-popover data-template-url='chart-settings' data-placement='top-right' data-auto-close='1' data-trigger='click')
