Repository: ignite
Updated Branches:
  refs/heads/master 536e82548 -> ae2bf3d6f


IGNITE-7459 Web Console: Hiding previous scan results on new scan.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ae2bf3d6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ae2bf3d6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ae2bf3d6

Branch: refs/heads/master
Commit: ae2bf3d6fc527e0f85d246abc65547d79226bf19
Parents: 536e825
Author: Alexander Kalinin <verba...@yandex.ru>
Authored: Wed Mar 14 11:33:52 2018 +0700
Committer: Alexey Kuznetsov <akuznet...@apache.org>
Committed: Wed Mar 14 11:33:52 2018 +0700

----------------------------------------------------------------------
 .../frontend/app/components/page-queries/controller.js            | 3 +--
 .../frontend/app/components/page-queries/template.tpl.pug         | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ae2bf3d6/modules/web-console/frontend/app/components/page-queries/controller.js
----------------------------------------------------------------------
diff --git 
a/modules/web-console/frontend/app/components/page-queries/controller.js 
b/modules/web-console/frontend/app/components/page-queries/controller.js
index 2814966..94d62b1 100644
--- a/modules/web-console/frontend/app/components/page-queries/controller.js
+++ b/modules/web-console/frontend/app/components/page-queries/controller.js
@@ -1570,10 +1570,9 @@ export default class {
             const filter = paragraph.filter;
             const pageSize = paragraph.pageSize;
 
-            paragraph.localQueryMode = local;
-
             $scope.scanAvailable(paragraph) && _chooseNode(cacheName, local)
                 .then((nid) => {
+                    paragraph.localQueryMode = local;
                     paragraph.scanningInProgress = true;
 
                     Notebook.save($scope.notebook)

http://git-wip-us.apache.org/repos/asf/ignite/blob/ae2bf3d6/modules/web-console/frontend/app/components/page-queries/template.tpl.pug
----------------------------------------------------------------------
diff --git 
a/modules/web-console/frontend/app/components/page-queries/template.tpl.pug 
b/modules/web-console/frontend/app/components/page-queries/template.tpl.pug
index 4419d5c..05bd09b 100644
--- a/modules/web-console/frontend/app/components/page-queries/template.tpl.pug
+++ b/modules/web-console/frontend/app/components/page-queries/template.tpl.pug
@@ -277,7 +277,7 @@ mixin paragraph-scan
                     
i.fa.fa-fw.fa-refresh.fa-spin(ng-show='paragraph.checkScanInProgress(true)')
                     span.tipLabelExecute Scan on selected node
 
-        .col-sm-12.sql-result(ng-if='paragraph.queryExecuted()' 
ng-switch='paragraph.resultType()')
+        .col-sm-12.sql-result(ng-if='paragraph.queryExecuted() && 
!paragraph.scanningInProgress' ng-switch='paragraph.resultType()')
             .error(ng-switch-when='error') Error: {{paragraph.error.message}}
             .empty(ng-switch-when='empty') Result set is empty. Duration: #[b 
{{paragraph.duration | duration}}]
             .table(ng-switch-when='table')

Reply via email to