Repository: hadoop Updated Branches: refs/heads/trunk 1312f9ae4 -> 034da8fc9
YARN-8171. [UI2] AM Node link from attempt page should not redirect to new tab. Contributed by Sunil G. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/034da8fc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/034da8fc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/034da8fc Branch: refs/heads/trunk Commit: 034da8fc97f01b8207de945828a28f25cadd77b0 Parents: 241d985 Author: Rohith Sharma K S <[email protected]> Authored: Wed Apr 18 13:33:59 2018 +0530 Committer: Rohith Sharma K S <[email protected]> Committed: Wed Apr 18 13:39:41 2018 +0530 ---------------------------------------------------------------------- .../src/main/webapp/app/models/yarn-app-attempt.js | 5 +++++ .../main/webapp/app/templates/components/app-attempt-table.hbs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/034da8fc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js index dd95765..cffe198 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js @@ -140,4 +140,9 @@ export default DS.Model.extend({ return this.get("state"); }.property(), + masterNodeURL: function() { + var addr = encodeURIComponent(this.get("nodeHttpAddress")); + return `#/yarn-node/${this.get("nodeId")}/${addr}/info/`; + }.property("nodeId", "nodeHttpAddress"), + }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/034da8fc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs index d33bf2f..c02c6f7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs @@ -53,7 +53,7 @@ {{#if attempt.nodeHttpAddress}} <tr> <td>AM Node Web UI</td> - <td title="{{attempt.nodeHttpAddress}}"><a href="{{prepend-protocol attempt.nodeHttpAddress}}" target="_blank">{{attempt.nodeHttpAddress}}</a></td> + <td title="{{attempt.nodeHttpAddress}}"><a href="{{attempt.masterNodeURL}}">{{attempt.nodeHttpAddress}}</a></td> </tr> {{/if}} {{#if attempt.logsLink}} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
