You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by hi...@apache.org on 2015/01/30 19:32:04 UTC

[2/2] tez git commit: TEZ-2014. Tez UI: Nits : All tables, Vertices Page UI. (Sreenath Somarajapuram via hitesh)

TEZ-2014. Tez UI: Nits : All tables, Vertices Page UI. (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/ae99390c
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/ae99390c
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/ae99390c

Branch: refs/heads/master
Commit: ae99390cc8886b116739f8fcbe41bef2014324b4
Parents: 7b8b8ee
Author: Hitesh Shah <hi...@apache.org>
Authored: Fri Jan 30 10:29:37 2015 -0800
Committer: Hitesh Shah <hi...@apache.org>
Committed: Fri Jan 30 10:29:37 2015 -0800

----------------------------------------------------------------------
 CHANGES.txt                                            |  3 ++-
 .../webapp/app/scripts/controllers/dag_vertices.js     | 13 +++++++++++++
 .../webapp/app/scripts/mixins/paginated_content.js     |  2 +-
 tez-ui/src/main/webapp/app/styles/main.less            | 12 ++++++++++++
 4 files changed, 28 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/ae99390c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3d62b67..b1cdcaa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -55,7 +55,8 @@ Release 0.6.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
-  TEZ-2012. TEZ UI - Show page number in all tables, and display more readable task/attempt ids.
+  TEZ-2014. Tez UI: Nits : All tables, Vertices Page UI.
+  TEZ-2012. TEZ UI: Show page number in all tables, and display more readable task/attempt ids.
   TEZ-1973. Dag View
   TEZ-2010. History payload generated from conf has ${var} placeholders.
   TEZ-1946. Tez UI: add source & sink views, add counters to vertices/all task views.

http://git-wip-us.apache.org/repos/asf/tez/blob/ae99390c/tez-ui/src/main/webapp/app/scripts/controllers/dag_vertices.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dag_vertices.js b/tez-ui/src/main/webapp/app/scripts/controllers/dag_vertices.js
index c50280e..7cc5fbf 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/dag_vertices.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/dag_vertices.js
@@ -24,6 +24,8 @@ App.DagVerticesController = Em.ObjectController.extend(App.PaginatedContentMixin
   // required by the PaginatedContentMixin
   childEntityType: 'vertex',
 
+  count: 50,
+
   queryParams: {
     status_filter: 'status'
   },
@@ -90,6 +92,17 @@ App.DagVerticesController = Em.ObjectController.extend(App.PaginatedContentMixin
         }
       },
       {
+        id: 'duration',
+        headerCellName: 'Duration',
+        getCellContent: function(row) {
+          var st = row.get('startTime');
+          var et = row.get('endTime');
+          if (st && et) {
+            return App.Helpers.date.durationSummary(st, et);
+          }
+        }
+      },
+      {
         id: 'firstTaskStartTime',
         headerCellName: 'First Task Start Time',
         getCellContent: function(row) {

http://git-wip-us.apache.org/repos/asf/tez/blob/ae99390c/tez-ui/src/main/webapp/app/scripts/mixins/paginated_content.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/mixins/paginated_content.js b/tez-ui/src/main/webapp/app/scripts/mixins/paginated_content.js
index cce7937..568d526 100644
--- a/tez-ui/src/main/webapp/app/scripts/mixins/paginated_content.js
+++ b/tez-ui/src/main/webapp/app/scripts/mixins/paginated_content.js
@@ -25,7 +25,7 @@ App.PaginatedContentMixin = Em.Mixin.create({
   fromID: null,
 
   // The dropdown contents for number of items to show.
-  countOptions: [5, 10, 25, 50],
+  countOptions: [5, 10, 25, 50, 100],
 
   /* There is currently no efficient way in ATS to get pagination data, so we fake one.
    * store the first dag id on a page so that we can navigate back and store the last one 

http://git-wip-us.apache.org/repos/asf/tez/blob/ae99390c/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 1cbe3bb..92536f8 100644
--- a/tez-ui/src/main/webapp/app/styles/main.less
+++ b/tez-ui/src/main/webapp/app/styles/main.less
@@ -415,6 +415,18 @@ div.indent {
   }
 }
 
+.ember-table-header-row {
+  .ember-table-content {
+    padding: 2px;
+    input, select {
+      width: 100%;
+    }
+    input {
+      margin-bottom: -3px;
+    }
+  }
+}
+
 .inline-display {
   display: inline;
 }