You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2015/02/10 22:52:24 UTC
[12/17] tez git commit: TEZ-2062. Tez UI: Showing 50 elements not
working properly. (Sreenath Somarajapuram via hitesh)
TEZ-2062. Tez UI: Showing 50 elements not working properly. (Sreenath Somarajapuram via hitesh)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/12c31ab5
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/12c31ab5
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/12c31ab5
Branch: refs/heads/TEZ-2003
Commit: 12c31ab5e5a7a19dafa635e69e67f829540a0457
Parents: 28941dc
Author: Hitesh Shah <hi...@apache.org>
Authored: Mon Feb 9 16:09:22 2015 -0800
Committer: Hitesh Shah <hi...@apache.org>
Committed: Mon Feb 9 16:09:22 2015 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../main/webapp/app/scripts/components/extended-table.js | 8 ++------
tez-ui/src/main/webapp/app/styles/main.less | 3 +++
tez-ui/src/main/webapp/app/templates/dags.hbs | 10 +++-------
4 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/12c31ab5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 40668e1..ab9250b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -57,6 +57,7 @@ Release 0.6.1: Unreleased
INCOMPATIBLE CHANGES
ALL CHANGES:
+ TEZ-2062. Tez UI: Showing 50 elements not working properly.
TEZ-2056. Tez UI: fix VertexID filter,show only tez configs by default,fix appattemptid.
TEZ-2052. Tez UI: log view fixes, show version from build, better handling of ats url config.
TEZ-2043. Tez UI: add progress info from am webservice to dag and vertex views.
http://git-wip-us.apache.org/repos/asf/tez/blob/12c31ab5/tez-ui/src/main/webapp/app/scripts/components/extended-table.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/components/extended-table.js b/tez-ui/src/main/webapp/app/scripts/components/extended-table.js
index e16e03c..0999176 100644
--- a/tez-ui/src/main/webapp/app/scripts/components/extended-table.js
+++ b/tez-ui/src/main/webapp/app/scripts/components/extended-table.js
@@ -207,7 +207,7 @@ App.ExTable.TableComponent = Ember.Table.EmberTableComponent.extend({
return Ember.run.next(this, function() {
return Ember.run.once(this, this.updateLayout);
});
- }, 'columns.length'),
+ }, 'columns.length', '_tableContentHeight'),
_filterHeight: function() {
var minHeight = this.get('minFilterHeight');
@@ -226,11 +226,7 @@ App.ExTable.TableComponent = Ember.Table.EmberTableComponent.extend({
height = this.get('_height');
contentHeight = this.get('_tableContentHeight') + this.get('_headerHeight') + this.get('_footerHeight')
+ this.get('_filterHeight');
- if (contentHeight < height) {
- return contentHeight;
- } else {
- return height;
- }
+ return height && contentHeight;
}.property('_height', '_tableContentHeight', '_headerHeight', '_footerHeight', '_filterHeight'),
_bodyHeight: function() {
http://git-wip-us.apache.org/repos/asf/tez/blob/12c31ab5/tez-ui/src/main/webapp/app/styles/main.less
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/styles/main.less b/tez-ui/src/main/webapp/app/styles/main.less
index 1681f3d..a5d1892 100644
--- a/tez-ui/src/main/webapp/app/styles/main.less
+++ b/tez-ui/src/main/webapp/app/styles/main.less
@@ -432,6 +432,9 @@ div.indent {
}
}
}
+.ember-table-cell:last-child {
+ border: none;
+}
.inline-display {
display: inline;
http://git-wip-us.apache.org/repos/asf/tez/blob/12c31ab5/tez-ui/src/main/webapp/app/templates/dags.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/dags.hbs b/tez-ui/src/main/webapp/app/templates/dags.hbs
index 69c5cf8..abe5ea5 100644
--- a/tez-ui/src/main/webapp/app/templates/dags.hbs
+++ b/tez-ui/src/main/webapp/app/templates/dags.hbs
@@ -20,10 +20,6 @@
<li class="active">All Dags</li>
</ul>
-{{#unless loading}}
- {{partial 'partials/table-controls'}}
- </div>
- {{partial 'partials/table'}}
-{{else}}
- {{partial 'partials/loading-spinner'}}
-{{/unless}}
+<div class='margin-small-vertical'>
+ {{partial 'common/table-with-spinner'}}
+</div>
\ No newline at end of file