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 2016/05/26 07:55:30 UTC
ambari git commit: AMBARI-16825. [Hive View] Non-visual explain gives
a bunch of strangely clickable links (pallavkul)
Repository: ambari
Updated Branches:
refs/heads/trunk 055288a3b -> 3a671d884
AMBARI-16825. [Hive View] Non-visual explain gives a bunch of strangely clickable links (pallavkul)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3a671d88
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3a671d88
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3a671d88
Branch: refs/heads/trunk
Commit: 3a671d884041135b774a803963c4f9b5dd2595b1
Parents: 055288a
Author: Pallav Kulshreshtha <pa...@gmail.com>
Authored: Thu May 26 13:25:05 2016 +0530
Committer: Pallav Kulshreshtha <pa...@gmail.com>
Committed: Thu May 26 13:25:05 2016 +0530
----------------------------------------------------------------------
.../app/controllers/index/history-query/explain.js | 14 +++++++++++---
.../main/resources/ui/hive-web/app/styles/app.scss | 14 +++++++++++++-
.../hive-web/app/templates/components/tree-view.hbs | 2 +-
.../app/templates/index/history-query/explain.hbs | 14 +++++++++-----
4 files changed, 34 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a671d88/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index/history-query/explain.js
----------------------------------------------------------------------
diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index/history-query/explain.js b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index/history-query/explain.js
index 20092e2..bc74e0b 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index/history-query/explain.js
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index/history-query/explain.js
@@ -119,7 +119,6 @@ export default Ember.ObjectController.extend({
} else {
formatted.pushObject(currentNode);
}
-
break;
}
}
@@ -128,7 +127,16 @@ export default Ember.ObjectController.extend({
formatted.pushObject(currentNode);
}
}
-
+ formatted = this.filterExplain(formatted);
this.set('formattedExplain', formatted);
+ },
+ filterExplain: function (explain){
+ var formattedExplain = explain.filter(function(item){
+ if(item.text !== '""'){
+ return item;
+ }
+ })
+ return formattedExplain;
}
-});
\ No newline at end of file
+});
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a671d88/contrib/views/hive/src/main/resources/ui/hive-web/app/styles/app.scss
----------------------------------------------------------------------
diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/app/styles/app.scss b/contrib/views/hive/src/main/resources/ui/hive-web/app/styles/app.scss
index c974dea..aeddaf6 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/app/styles/app.scss
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/styles/app.scss
@@ -691,4 +691,16 @@ table.no-border, table.no-border tr, table.no-border tr td {
.red-border {
border-color :red;
-}
\ No newline at end of file
+}
+
+ul.explainlist li{
+ background: none;
+ word-break: break-all;
+ padding: 0;
+}
+
+pre.explainprint{
+ line-height: 0.5;
+ padding: 12px 15px;
+}
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a671d88/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/tree-view.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/tree-view.hbs b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/tree-view.hbs
index cb83ec3..ef9a566 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/tree-view.hbs
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/tree-view.hbs
@@ -16,7 +16,7 @@
* limitations under the License.
}}
-<ul class="list-unstyled">
+<ul class="list-unstyled explainlist">
{{#each item in content}}
<li>
{{item.text}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a671d88/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/index/history-query/explain.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/index/history-query/explain.hbs b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/index/history-query/explain.hbs
index 3f8810f..f7948e2 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/index/history-query/explain.hbs
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/index/history-query/explain.hbs
@@ -15,9 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
}}
-
+<pre class="explainprint">
{{#each header in formattedExplain}}
- {{#expander-widget heading=header.text}}
- {{tree-view content=header.contents}}
- {{/expander-widget}}
-{{/each}}
\ No newline at end of file
+ {{#if header.text}}
+ <div>{{header.text}}</div>
+ {{#if header.contents.length }}
+ {{tree-view content=header.contents}}
+ {{/if}}
+ {{/if}}
+{{/each}}
+</pre>
\ No newline at end of file