TEZ-3610. TEZ UI 0.7 0.9 compatibility for url query params and tez-app sub-routes (jeagles)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/10ded7cb Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/10ded7cb Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/10ded7cb Branch: refs/heads/TEZ-1190 Commit: 10ded7cbbf8d774f209de35461f14c9e526da888 Parents: dcae5e4 Author: Jonathan Eagles <[email protected]> Authored: Thu Feb 16 10:52:58 2017 -0600 Committer: Jonathan Eagles <[email protected]> Committed: Thu Feb 16 10:52:58 2017 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../main/webapp/app/controllers/home/index.js | 22 +++++++++++++++++++- tez-ui/src/main/webapp/app/router.js | 5 ++++- 3 files changed, 26 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/10ded7cb/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index c505964..f34252b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-3610. TEZ UI 0.7 0.9 compatibility for url query params and tez-app sub-routes TEZ-3625. Dag.getVertex should obtain a readlock. TEZ-3624. Split multiple calls on the same line in TaskCommunicatorContextImpl. TEZ-3550. Provide access to sessionId/dagId via DagClient. http://git-wip-us.apache.org/repos/asf/tez/blob/10ded7cb/tez-ui/src/main/webapp/app/controllers/home/index.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/controllers/home/index.js b/tez-ui/src/main/webapp/app/controllers/home/index.js index bf9dcde..61e7a9f 100644 --- a/tez-ui/src/main/webapp/app/controllers/home/index.js +++ b/tez-ui/src/main/webapp/app/controllers/home/index.js @@ -24,13 +24,17 @@ import TableDefinition from 'em-table/utils/table-definition'; export default TableController.extend({ - queryParams: ["dagName", "dagID", "submitter", "status", "appID", "callerID"], + queryParams: ["dagName", "dagID", "submitter", "status", "appID", "callerID", "appid", "id", "user", "dag_name"], dagName: "", dagID: "", submitter: "", status: "", appID: "", callerID: "", + appid: "", + id: "", + user: "", + dag_name: "", // Because pageNo is a query param added by table controller, and in the current design // we don't want page to be a query param as only the first page will be loaded first. @@ -52,6 +56,22 @@ export default TableController.extend({ "appID", "callerID", "pageNum", "moreAvailable", "loadingMore", function () { var definition = this.get("_definition"); + if (!this.get("appID")) { + this.set("appID", this.get("appid")); + this.set("appid", ""); + } + if (!this.get("dagID")) { + this.set("dagID", this.get("id")); + this.set("id", ""); + } + if (!this.get("submitter")) { + this.set("submitter", this.get("user")); + this.set("user", ""); + } + if (!this.get("dagName")) { + this.set("dagName", this.get("dag_name")); + this.set("dag_name", ""); + } definition.setProperties({ dagName: this.get("dagName"), http://git-wip-us.apache.org/repos/asf/tez/blob/10ded7cb/tez-ui/src/main/webapp/app/router.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/router.js b/tez-ui/src/main/webapp/app/router.js index 6aa0b2f..7a8901b 100644 --- a/tez-ui/src/main/webapp/app/router.js +++ b/tez-ui/src/main/webapp/app/router.js @@ -55,7 +55,10 @@ Router.map(function() { }); // Alias for backward compatibility with Tez UI V1 - this.route('app', {path: '/tez-app/:app_id'}, function () {}); + this.route('app', {path: '/tez-app/:app_id'}, function () { + this.route('dags'); + this.route('configs'); + }); this.route('app', {path: '/app/:app_id'}, function () { this.route('dags'); this.route('configs');
