Repository: tez Updated Branches: refs/heads/branch-0.6 df78a5186 -> d1f331e30
TEZ-2013. TEZ UI - App Details Page UI Nits (Sreenath Somarajapuram via jeagles) (cherry picked from commit 38b21094c40638c4ee4c2753686fafff1c3032ca) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/d1f331e3 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/d1f331e3 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/d1f331e3 Branch: refs/heads/branch-0.6 Commit: d1f331e30c87f3b4b6e6c827d8a8965f4f3ee35d Parents: df78a51 Author: Jonathan Eagles <[email protected]> Authored: Fri Jan 30 13:28:08 2015 -0600 Committer: Jonathan Eagles <[email protected]> Committed: Fri Jan 30 13:29:02 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../controllers/tez-app-dags-controller.js | 37 ++++++++++++-------- tez-ui/src/main/webapp/app/scripts/router.js | 3 +- .../src/main/webapp/app/templates/tez-app.hbs | 2 +- 4 files changed, 26 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/d1f331e3/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 2afb77e..ea751ee 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,7 @@ Release 0.6.1: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-2013. TEZ UI - App Details Page UI Nits 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 http://git-wip-us.apache.org/repos/asf/tez/blob/d1f331e3/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-dags-controller.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-dags-controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-dags-controller.js index 15963d4..b9054b1 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-dags-controller.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-dags-controller.js @@ -25,9 +25,11 @@ App.TezAppDagsController = Em.ObjectController.extend(App.PaginatedContentMixin, childEntityType: 'dag', queryParams: { + dagName_filter: 'dagName', status_filter: 'status', user_filter: 'user' }, + dagName_filter: null, status_filter: null, user_filter: null, @@ -35,10 +37,11 @@ App.TezAppDagsController = Em.ObjectController.extend(App.PaginatedContentMixin, var filters = { primary: { applicationId: this.get('appId'), - user: this.user_filter }, secondary: { - status: this.status_filter + user: this.user_filter, + status: this.status_filter, + dagName: this.dagName_filter } }; this.setFiltersAndLoadEntities(filters); @@ -61,6 +64,7 @@ App.TezAppDagsController = Em.ObjectController.extend(App.PaginatedContentMixin, { id: 'dagName', headerCellName: 'Dag Name', + filterID: 'dagName_filter', tableCellViewClass: Em.Table.TableCell.extend({ template: Em.Handlebars.compile( "{{#link-to 'dag' view.cellContent.id class='ember-table-content'}}{{view.cellContent.name}}{{/link-to}}") @@ -73,18 +77,12 @@ App.TezAppDagsController = Em.ObjectController.extend(App.PaginatedContentMixin, } }, { - id: 'dagId', - headerCellName: 'Dag ID', - tableCellViewClass: Em.Table.TableCell.extend({ - template: Em.Handlebars.compile( - "{{#link-to 'dag' view.cellContent class='ember-table-content'}}{{view.cellContent}}{{/link-to}}") - }), - getCellContent: function(row) { - return row.get('id') - } + id: 'id', + headerCellName: 'Id', + contentPath: 'id' }, { - id: 'submitter', + id: 'user', headerCellName: 'Submitter', filterID: 'user_filter', contentPath: 'user' @@ -93,6 +91,8 @@ App.TezAppDagsController = Em.ObjectController.extend(App.PaginatedContentMixin, id: 'status', headerCellName: 'Status', filterID: 'status_filter', + filterType: 'dropdown', + dropdownValues: App.Helpers.misc.dagStatusUIOptions, tableCellViewClass: Em.Table.TableCell.extend({ template: Em.Handlebars.compile( '<span class="ember-table-content"> \ @@ -107,10 +107,17 @@ App.TezAppDagsController = Em.ObjectController.extend(App.PaginatedContentMixin, } }, { - id: 'submittedTime', - headerCellName: 'Submitted Time', + id: 'startTime', + headerCellName: 'Start Time', + getCellContent: function(row) { + return App.Helpers.date.dateFormat(row.get('startTime')); + } + }, + { + id: 'endTime', + headerCellName: 'End Time', getCellContent: function(row) { - return App.Helpers.date.dateFormat(row.get('submittedTime')); + return App.Helpers.date.dateFormat(row.get('endTime')); } }, { http://git-wip-us.apache.org/repos/asf/tez/blob/d1f331e3/tez-ui/src/main/webapp/app/scripts/router.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/router.js b/tez-ui/src/main/webapp/app/scripts/router.js index 34eb26e..b1f750b 100644 --- a/tez-ui/src/main/webapp/app/scripts/router.js +++ b/tez-ui/src/main/webapp/app/scripts/router.js @@ -251,7 +251,8 @@ App.TezAppRoute = Em.Route.extend({ App.TezAppDagsRoute = Em.Route.extend({ renderTemplate: renderTableWithSpinner, queryParams: { - count: App.Helpers.misc.defaultQueryParamsConfig, + dagName: App.Helpers.misc.defaultQueryParamsConfig, + count: App.Helpers.misc.defaultQueryParamsConfig, fromID: App.Helpers.misc.defaultQueryParamsConfig, user: App.Helpers.misc.defaultQueryParamsConfig, status: App.Helpers.misc.defaultQueryParamsConfig http://git-wip-us.apache.org/repos/asf/tez/blob/d1f331e3/tez-ui/src/main/webapp/app/templates/tez-app.hbs ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/templates/tez-app.hbs b/tez-ui/src/main/webapp/app/templates/tez-app.hbs index f9c5b29..5ab983c 100644 --- a/tez-ui/src/main/webapp/app/templates/tez-app.hbs +++ b/tez-ui/src/main/webapp/app/templates/tez-app.hbs @@ -28,7 +28,7 @@ <tbody> <tr> <td>YARN RM Tracking URL</td> - <td><a {{bind-attr href=rmTrackingURL}}>{{unbound id}}</a></td> + <td><a {{bind-attr href=rmTrackingURL}}>{{unbound appId}}</a></td> </tr> <tr> <td>Attempt Id</td>
