You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2018/08/08 20:11:51 UTC
[10/50] [abbrv] hadoop git commit: YARN-8603. [UI2] Latest run
application should be listed first in the RM UI. Contributed by Akhil PB.
YARN-8603. [UI2] Latest run application should be listed first in the RM UI. Contributed by Akhil PB.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/33482d35
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/33482d35
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/33482d35
Branch: refs/heads/HDFS-12943
Commit: 33482d35e802ac3468317b844122b347fe486861
Parents: db465af
Author: Rohith Sharma K S <ro...@apache.org>
Authored: Fri Aug 3 13:58:41 2018 +0530
Committer: Rohith Sharma K S <ro...@apache.org>
Committed: Fri Aug 3 15:30:39 2018 +0530
----------------------------------------------------------------------
.../src/main/webapp/app/controllers/app-table-columns.js | 7 +++++++
.../src/main/webapp/app/controllers/yarn-apps/apps.js | 4 +++-
.../src/main/webapp/app/serializers/yarn-app.js | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/33482d35/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
index 33e3bb7..552a157 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
@@ -20,6 +20,7 @@
import Ember from 'ember';
import ColumnDef from 'em-table/utils/column-definition';
import TableDef from 'em-table/utils/table-definition';
+import Converter from 'yarn-ui/utils/converter';
export default Ember.Controller.extend({
tableDefinition: TableDef.create({
@@ -83,6 +84,9 @@ export default Ember.Controller.extend({
headerTitle: 'Start Time',
contentPath: 'startTime',
facetType: null,
+ getCellContent: function(row) {
+ return Converter.timeStampToDate(row.get('startTime'));
+ }
}, {
id: 'elTime',
headerTitle: 'Elapsed Time',
@@ -169,6 +173,9 @@ export default Ember.Controller.extend({
headerTitle: 'Started Time',
contentPath: 'startTime',
facetType: null,
+ getCellContent: function(row) {
+ return Converter.timeStampToDate(row.get('startTime'));
+ }
}, {
id: 'finishTime',
headerTitle: 'Finished Time',
http://git-wip-us.apache.org/repos/asf/hadoop/blob/33482d35/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
index 55d5a88..10965cf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
@@ -25,7 +25,9 @@ export default AppTableController.extend({
tableDefinition: TableDefinition.create({
searchType: 'manual',
enableFaceting: true,
- rowCount: 25
+ rowCount: 25,
+ sortColumnId: 'stTime',
+ sortOrder: 'desc'
}),
searchText: Ember.computed.alias('tableDefinition.searchText'),
sortColumnId: Ember.computed.alias('tableDefinition.sortColumnId'),
http://git-wip-us.apache.org/repos/asf/hadoop/blob/33482d35/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
----------------------------------------------------------------------
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 36d1260..f4de725 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
@@ -42,7 +42,7 @@ export default DS.JSONAPISerializer.extend({
user: payload.user,
queue: payload.queue,
state: payload.state,
- startTime: Converter.timeStampToDate(payload.startedTime),
+ startTime: payload.startedTime, // will be formatted in em-table
elapsedTime: payload.elapsedTime,
finishedTime: Converter.timeStampToDate(payload.finishedTime),
finalStatus: payload.finalStatus,
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org