You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by pa...@apache.org on 2017/01/31 12:59:44 UTC
ambari git commit: AMBARI-19782. Hive2: Results are not cleared on
"execute" (pallavkul)
Repository: ambari
Updated Branches:
refs/heads/trunk f1ce60295 -> 207546fdb
AMBARI-19782. Hive2: Results are not cleared on "execute" (pallavkul)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/207546fd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/207546fd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/207546fd
Branch: refs/heads/trunk
Commit: 207546fdb21fc5e882efbfb9c2a2366bdb392415
Parents: f1ce602
Author: pallavkul <pa...@gmail.com>
Authored: Tue Jan 31 18:28:29 2017 +0530
Committer: pallavkul <pa...@gmail.com>
Committed: Tue Jan 31 18:28:29 2017 +0530
----------------------------------------------------------------------
.../templates/components/query-result-table.hbs | 60 ++++++++++----------
.../ui/app/templates/queries/query.hbs | 1 +
2 files changed, 32 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/207546fd/contrib/views/hive20/src/main/resources/ui/app/templates/components/query-result-table.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/hive20/src/main/resources/ui/app/templates/components/query-result-table.hbs b/contrib/views/hive20/src/main/resources/ui/app/templates/components/query-result-table.hbs
index 180c43d..9700038 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/templates/components/query-result-table.hbs
+++ b/contrib/views/hive20/src/main/resources/ui/app/templates/components/query-result-table.hbs
@@ -17,18 +17,17 @@
}}
-{{#unless columns.length}}
+
+{{#if isQueryRunning}}
<div style="position:relative">
<div style="margin: auto;position: absolute;top: 0;left: 0;bottom: 0;right: 0;text-align: center">
{{fa-icon "spinner fa-2" spin=true}}
</div>
</div>
-{{/unless}}
-
+{{/if}}
-{{#if columns.length}}
+{{#unless isQueryRunning}}
<div class="clearfix" style="text-align: right; padding-right:5px">
-
<span class="dropdown">
<button class="btn btn-default dropdown-toggle" title="Actions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">{{fa-icon "bars"}} </button>
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu">
@@ -41,32 +40,35 @@
<button class="btn btn-default" title="Next Page" {{action "goNextPage" }}>{{fa-icon "arrow-right"}} </button>
<button class="btn btn-default" title="Expand/Collspse" {{action "expandQueryResultPanel" }}>{{fa-icon "expand"}}</button>
</div>
-{{/if}}
-<div class="clearfix">
- {{#light-table table height='70vh' as |t|}}
- {{#if columns.length}}
- {{t.head
- onColumnClick=(action 'onColumnClick')
- iconAscending='fa fa-sort-asc'
- iconDescending='fa fa-sort-desc'
- fixed=true
- }}
+ <div class="clearfix">
+ {{#light-table table height='70vh' as |t|}}
+ {{#if columns.length}}
+ {{t.head
+ onColumnClick=(action 'onColumnClick')
+ iconAscending='fa fa-sort-asc'
+ iconDescending='fa fa-sort-desc'
+ fixed=true
+ }}
+
+ {{#t.body
+ canSelect=false
+ onScrolledToBottom=(action 'onScrolledToBottom')
+ as |body|
+ }}
+ {{#if isLoading}}
+ {{#body.loader}}
+ {{table-loader}}
+ {{/body.loader}}
+ {{/if}}
+ {{/t.body}}
+ {{/if}}
+ {{/light-table}}
+ </div>
+
+
+{{/unless}}
- {{#t.body
- canSelect=false
- onScrolledToBottom=(action 'onScrolledToBottom')
- as |body|
- }}
- {{#if isLoading}}
- {{#body.loader}}
- {{table-loader}}
- {{/body.loader}}
- {{/if}}
- {{/t.body}}
- {{/if}}
- {{/light-table}}
-</div>
{{#if showSaveHdfsModal}}
{{export-result
http://git-wip-us.apache.org/repos/asf/ambari/blob/207546fd/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs b/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
index 22838a4..62c97a2 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
+++ b/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
@@ -74,6 +74,7 @@
isExportResultSuccessMessege=isExportResultSuccessMessege
isExportResultFailureMessege=isExportResultFailureMessege
showSaveHdfsModal=showSaveHdfsModal
+ isQueryRunning=worksheet.isQueryRunning
}}
</div>
{{/if}}