From 113f401f41ee575cb303ceb647bc243108d93a04 Mon Sep 17 00:00:00 2001
From: Sunil G <sunilg@apache.org>
Date: Thu, 8 Mar 2018 23:52:38 +0530
Subject: [PATCH] YARN-7944. [UI2] Remove master node link from headers of
 application pages. Contributed by Yesha Vora.

---
 .../src/main/webapp/app/models/yarn-app-timeline.js          | 1 -
 .../hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js    | 5 -----
 .../src/main/webapp/app/serializers/yarn-app-timeline.js     | 1 -
 .../src/main/webapp/app/serializers/yarn-app.js              | 1 -
 .../src/main/webapp/app/templates/yarn-app.hbs               | 2 --
 5 files changed, 10 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-timeline.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-timeline.js
index fa5223f525..8b2702f63f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-timeline.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-timeline.js
@@ -30,7 +30,6 @@ export default DS.Model.extend({
   finishedTime: DS.attr('finishedTime'),
   progress: DS.attr('number'),
   diagnostics: DS.attr('string'),
-  amContainerLogs: DS.attr('string'),
   amHostHttpAddress: DS.attr('string'),
   logAggregationStatus: DS.attr('string'),
   unmanagedApplication: DS.attr('string'),
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
index 5d0f23b1e3..fcc8490461 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
@@ -30,7 +30,6 @@ export default DS.Model.extend({
   finishedTime: DS.attr("finishedTime"),
   progress: DS.attr("number"),
   diagnostics: DS.attr("string"),
-  amContainerLogs: DS.attr("string"),
   amHostHttpAddress: DS.attr("string"),
   masterNodeId: DS.attr("string"),
   logAggregationStatus: DS.attr("string"),
@@ -97,10 +96,6 @@ export default DS.Model.extend({
     );
   }.property("memorySeconds", "vcoreSeconds"),
 
-  masterNodeURL: function() {
-    return `#/yarn-node/${this.get("masterNodeId")}/${this.get("amHostHttpAddress")}/info/`;
-  }.property("masterNodeId", "amHostHttpAddress"),
-
   progressStyle: function() {
     return "width: " + this.get("progress") + "%";
   }.property("progress"),
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
index 680fe8ccdf..0496d7749a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
@@ -45,7 +45,6 @@ export default DS.JSONAPISerializer.extend({
         progress: 100,
         applicationType: payload.info.YARN_APPLICATION_TYPE,
         diagnostics: (diagnostics && diagnostics !== 'null')? diagnostics : '',
-        amContainerLogs: '',
         amHostHttpAddress: '',
         logAggregationStatus: '',
         unmanagedApplication: payload.info.YARN_APPLICATION_UNMANAGED_APPLICATION || 'N/A',
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
index bd9e9842da..b21c52a011 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
@@ -49,7 +49,6 @@ export default DS.JSONAPISerializer.extend({
           progress: payload.progress,
           applicationType: payload.applicationType,
           diagnostics: (payload.diagnostics && payload.diagnostics !== 'null')? payload.diagnostics : '',
-          amContainerLogs: payload.amContainerLogs,
           amHostHttpAddress: payload.amHostHttpAddress,
           masterNodeId: payload.masterNodeId,
           logAggregationStatus: payload.logAggregationStatus,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
index a42dcd353b..62e9350a08 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
@@ -64,8 +64,6 @@
 
         <div class="flex-right">
           <div class="links">
-            <a href="{{model.app.amContainerLogs}}" target="_blank">Master Container Log</a> &nbsp;|&nbsp;
-            <a href="{{model.app.masterNodeURL}}">Master Node</a> &nbsp;|&nbsp;
             {{#if isRunningService}}
               <div class="btn-group">
                 <button type="button" class="btn btn-unstyled dropdown-toggle" title="Settings" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">