From 25b91fa98d288809523b69525458185cd02d9d51 Mon Sep 17 00:00:00 2001
From: Sunil G <sunilg@apache.org>
Date: Fri, 20 Apr 2018 20:05:05 +0530
Subject: [PATCH] =?UTF-8?q?YARN-7830.=20[UI2]=20Post=20selecting=20grid=20?=
 =?UTF-8?q?view=20in=20Attempt=20page,=20attempt=20info=20page=20should=20?=
 =?UTF-8?q?also=20be=20opened=20with=20grid=20view.=20Contributed=20by=20G?=
 =?UTF-8?q?ergely=20Nov=C3=A1k.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 55e4252fc5a30c5b1924208b824e44c4ec5bd140)
---
 .../src/main/webapp/app/components/timeline-view.js    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
index 3588009e7eb..dec677a6d39 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
@@ -30,6 +30,9 @@ export default Ember.Component.extend({
   actions: {
     changeViewType(param) {
       this.sendAction("changeViewType", param);
+      if (this.get('attemptModel')) {
+        this.setAttemptsGridColumnsAndRows();
+      }
     }
   },
 
@@ -324,10 +327,13 @@ export default Ember.Component.extend({
       minWidth: '300px',
       getCellContent: function(row) {
         var attemptId = row.get('id');
-        var query = serviceName? '?service='+serviceName : '';
+        var query = 'viewType=' + self.get("viewType");
+        if (serviceName) {
+          query += '&service=' + serviceName;
+        }
         return {
           displayText: attemptId,
-          href: `#/yarn-app-attempt/${attemptId}${query}`
+          href: `#/yarn-app-attempt/${attemptId}?${query}`
         };
       }
     }, {