From b798fbe475948d248810970d3810ed11f763bbd3 Mon Sep 17 00:00:00 2001
From: chitin <chitin1027@gmail.com>
Date: Sun, 22 Jan 2017 14:37:06 +0800
Subject: [PATCH 1/2] [EAGLE-873] Add job name column to let user search their
 jobs using that field - Add jobName column in JPM job list. - Add jobName to
 searchList

https://issues.apache.org/jira/browse/EAGLE-873
---
 .../src/main/webapp/app/apps/jpm/ctrl/listCtrl.js              | 3 ++-
 .../src/main/webapp/app/apps/jpm/partials/job/list.html        | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/listCtrl.js b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/listCtrl.js
index ff9ed5e2c5..aa5fe4ceaa 100644
--- a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/listCtrl.js
+++ b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/listCtrl.js
@@ -30,7 +30,7 @@
 			$scope.tableScope = {};
 
 			$scope.site = $wrapState.param.siteId;
-			$scope.searchPathList = [["tags", "jobId"], ["tags", "user"], ["tags", "queue"], ["currentState"]];
+			$scope.searchPathList = [["tags", "jobId"],["tags", "jobName"], ["tags", "user"], ["tags", "queue"], ["currentState"]];
 
 			function getCommonOption(left) {
 				return {
@@ -62,6 +62,7 @@
 				 * @property {[]} jobList
 				 * @property {{}} jobList.tags						unique job key
 				 * @property {string} jobList.tags.jobId			Job Id
+				 * @property {string} jobList.tags.jobName			Job Name
 				 * @property {string} jobList.tags.user				Submit user
 				 * @property {string} jobList.tags.queue			Queue
 				 * @property {string} jobList.currentState			Job state
diff --git a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/list.html b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/list.html
index d64afe311c..f133026ba7 100644
--- a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/list.html
+++ b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/list.html
@@ -54,6 +54,7 @@ <h3 class="box-title">
 				<thead>
 					<tr>
 						<th sortpath="tags.jobId">Job ID</th>
+						<th sortpath="tags.jobName">Job Name</th>
 						<th sortpath="currentState">Status</th>
 						<th sortpath="tags.user" width="10">User</th>
 						<th sortpath="tags.queue">Queue</th>
@@ -71,6 +72,7 @@ <h3 class="box-title">
 						<td>
 							<a ui-sref="jpmDetail({siteId: site, jobId: item.tags.jobId})" target="_blank">{{item.tags.jobId}}</a>
 						</td>
+						<td>{{item.tags.jobName}}</td>
 						<td class="text-center">
 							<span class="label label-sm label-{{getStateClass(item.currentState)}}">
 								{{item.currentState}}

From 9da1f175ff199567b4cd6427abb003cf0f5748b1 Mon Sep 17 00:00:00 2001
From: chitin <chitin1027@gmail.com>
Date: Sun, 22 Jan 2017 16:25:21 +0800
Subject: [PATCH 2/2] [MINOR] Fix backupMaster search

---
 .../webapp/app/apps/hadoop_metric/ctrls/backupMasterListCtrl.js | 2 ++
 .../app/apps/hadoop_metric/partials/backupMasterList.html       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/ctrls/backupMasterListCtrl.js b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/ctrls/backupMasterListCtrl.js
index d7cdc4513e..ca6c47ee81 100644
--- a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/ctrls/backupMasterListCtrl.js
+++ b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/ctrls/backupMasterListCtrl.js
@@ -26,7 +26,9 @@
 
 			// Initialization
 			PageConfig.title = "HBASE BackupMasters";
+			$scope.tableScope = {};
 			$scope.site = $wrapState.param.siteId;
+			$scope.searchPathList = [["tags", "hostname"], ["tags", "rack"], ["tags", "site"], ["status"]];
 			$scope.backupMasterList = METRIC.hbaseMaster($scope.site, "standby", 1000);
 		});
 	});
diff --git a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/backupMasterList.html b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/backupMasterList.html
index 960a33c29a..96c8016941 100644
--- a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/backupMasterList.html
+++ b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/backupMasterList.html
@@ -18,7 +18,7 @@
 <div class="box box-primary">
 	<div class="box-header with-border">
 		<h3 class="box-title">
-			<span ng-show="!regionserverList._done || isSorting" class="fa fa-refresh fa-spin no-animate"></span>
+			<span ng-show="!backupMasterList._done || isSorting" class="fa fa-refresh fa-spin no-animate"></span>
 		</h3>
 	</div>
 	<div class="box-body">