Repository: tez Updated Branches: refs/heads/master 0207281b3 -> d8767248e
TEZ-3850. Enable header as sort button on Tez UI (Jonathan Eagles) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/d8767248 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/d8767248 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/d8767248 Branch: refs/heads/master Commit: d8767248e426eeea628ddb2f3831c45880606e7d Parents: 0207281 Author: Sreenath Somarajapuram <[email protected]> Authored: Mon Oct 16 13:54:27 2017 +0530 Committer: Sreenath Somarajapuram <[email protected]> Committed: Mon Oct 16 13:54:27 2017 +0530 ---------------------------------------------------------------------- tez-ui/src/main/webapp/app/controllers/dag/tasks.js | 1 + tez-ui/src/main/webapp/app/controllers/table.js | 3 ++- tez-ui/src/main/webapp/app/controllers/vertex/tasks.js | 1 + tez-ui/src/main/webapp/package.json | 2 +- tez-ui/src/main/webapp/yarn.lock | 6 +++--- 5 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/d8767248/tez-ui/src/main/webapp/app/controllers/dag/tasks.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/controllers/dag/tasks.js b/tez-ui/src/main/webapp/app/controllers/dag/tasks.js index a742644..92f674a 100644 --- a/tez-ui/src/main/webapp/app/controllers/dag/tasks.js +++ b/tez-ui/src/main/webapp/app/controllers/dag/tasks.js @@ -83,6 +83,7 @@ export default MultiTableController.extend({ headerTitle: 'Successful/Last Attempt Log', cellComponentName: 'em-table-tasks-log-link-cell', enableSearch: false, + contentPath: 'logs', getCellContent: function (row) { var attemptID = row.get("successfulAttemptID"); if(!attemptID) { http://git-wip-us.apache.org/repos/asf/tez/blob/d8767248/tez-ui/src/main/webapp/app/controllers/table.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/controllers/table.js b/tez-ui/src/main/webapp/app/controllers/table.js index fd01a50..57adf00 100644 --- a/tez-ui/src/main/webapp/app/controllers/table.js +++ b/tez-ui/src/main/webapp/app/controllers/table.js @@ -51,7 +51,8 @@ export default AbstractController.extend({ searchText: this.get("searchText"), sortColumnId: this.get("sortColumnId"), sortOrder: this.get("sortOrder"), - pageNo: this.get("pageNo") + pageNo: this.get("pageNo"), + headerAsSortButton: true, }); }), http://git-wip-us.apache.org/repos/asf/tez/blob/d8767248/tez-ui/src/main/webapp/app/controllers/vertex/tasks.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/controllers/vertex/tasks.js b/tez-ui/src/main/webapp/app/controllers/vertex/tasks.js index 86261fd..560c8ba 100644 --- a/tez-ui/src/main/webapp/app/controllers/vertex/tasks.js +++ b/tez-ui/src/main/webapp/app/controllers/vertex/tasks.js @@ -73,6 +73,7 @@ export default MultiTableController.extend(AutoCounterColumn, { headerTitle: 'Successful/Last Attempt Log', cellComponentName: 'em-table-tasks-log-link-cell', enableSearch: false, + contentPath: 'logs', getCellContent: function (row) { var attemptID = row.get("successfulAttemptID"); if(!attemptID) { http://git-wip-us.apache.org/repos/asf/tez/blob/d8767248/tez-ui/src/main/webapp/package.json ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/package.json b/tez-ui/src/main/webapp/package.json index 513de52..ccb85ea 100644 --- a/tez-ui/src/main/webapp/package.json +++ b/tez-ui/src/main/webapp/package.json @@ -62,7 +62,7 @@ }, "dependencies": { "em-helpers": "0.8.0", - "em-table": "0.7.2", + "em-table": "0.11.2", "em-tgraph": "0.0.10" } } http://git-wip-us.apache.org/repos/asf/tez/blob/d8767248/tez-ui/src/main/webapp/yarn.lock ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/yarn.lock b/tez-ui/src/main/webapp/yarn.lock index bf694fb..abbb702 100644 --- a/tez-ui/src/main/webapp/yarn.lock +++ b/tez-ui/src/main/webapp/yarn.lock @@ -1401,9 +1401,9 @@ [email protected]: optionalDependencies: phantomjs-prebuilt "2.1.13" [email protected]: - version "0.7.2" - resolved "https://registry.yarnpkg.com/em-table/-/em-table-0.7.2.tgz#867ff734701df9765f2505e02acd74768edb0f71"; [email protected]: + version "0.11.2" + resolved "https://registry.yarnpkg.com/em-table/-/em-table-0.11.2.tgz#1248f5f7a59dfc5d6592164933eebb02f3a5d410"; dependencies: ember-cli-htmlbars "^1.0.1" ember-cli-less "^1.4.0"
