From 58a5ee378ab04013a08333595ee4c330479ed79c Mon Sep 17 00:00:00 2001
From: Sunil G <sunilg@apache.org>
Date: Fri, 6 Apr 2018 21:53:14 +0530
Subject: [PATCH] =?UTF-8?q?YARN-8083.=20[UI2]=20All=20YARN=20related=20con?=
 =?UTF-8?q?figurations=20are=20paged=20together=20in=20conf=20page.=20Cont?=
 =?UTF-8?q?ributed=20by=20Gergely=20Nov=C3=A1k.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit b17dc9f5f54fd91defc1d8646f8229da5fe7ccbb)
---
 .../webapp/app/controllers/yarn-tools/yarn-conf.js     | 10 +++++++++-
 .../main/webapp/app/templates/yarn-tools/yarn-conf.hbs |  6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js
index 29843466315..cc3be2e526f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js
@@ -24,7 +24,15 @@ import ColumnDef from 'em-table/utils/column-definition';
 import YarnConf from '../../models/yarn-conf';
 
 export default Ember.Controller.extend({
-  tableDefinition: TableDef.create({
+  coreTableDefinition: TableDef.create({
+    searchType: 'manual',
+  }),
+
+  mapredTableDefinition: TableDef.create({
+    searchType: 'manual',
+  }),
+
+  yarnTableDefinition: TableDef.create({
     searchType: 'manual',
   }),
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs
index 09a14106175..c2108a253eb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs
@@ -17,12 +17,12 @@
 }}
 
 <h1>Core Configuration</h1>
-{{em-table columns=columnsFromModel rows=rowsForCoreColumnsFromModel rowCount=10 definition=tableDefinition}}
+{{em-table columns=columnsFromModel rows=rowsForCoreColumnsFromModel rowCount=10 definition=coreTableDefinition}}
 
 <h1>YARN Configuration</h1>
-{{em-table columns=columnsFromModel rows=rowsForYarnColumnsFromModel rowCount=10 definition=tableDefinition}}
+{{em-table columns=columnsFromModel rows=rowsForYarnColumnsFromModel rowCount=10 definition=yarnTableDefinition}}
 
 <h1>MapReduce Configuration</h1>
-{{em-table columns=columnsFromModel rows=rowsForMapredColumnsFromModel rowCount=10 definition=tableDefinition}}
+{{em-table columns=columnsFromModel rows=rowsForMapredColumnsFromModel rowCount=10 definition=mapredTableDefinition}}
 
 {{outlet}}