From 3d2e6d6fc54fdf5c22f2879f899875d1fcc11769 Mon Sep 17 00:00:00 2001 From: Vasu Date: Tue, 9 Jan 2018 12:21:22 +0530 Subject: [PATCH] Use local time to render dates --- .../hadoop-yarn-ui/src/main/webapp/app/utils/converter.js | 7 +++---- .../hadoop-yarn-ui/src/main/webapp/app/utils/date-utils.js | 8 ++++++++ .../hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js | 1 + 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/date-utils.js diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js index 74cc9161d31c..d7de4e7dca1c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js @@ -17,6 +17,7 @@ */ import Constants from 'yarn-ui/constants'; +import { convertTimestampWithTz } from "./date-utils"; export default { containerIdToAttemptId: function(containerId) { @@ -82,12 +83,10 @@ export default { return total * 1000; }, timeStampToDate: function(timeStamp) { - var dateTimeString = moment(parseInt(timeStamp)).format("YYYY/MM/DD HH:mm:ss"); - return dateTimeString; + return convertTimestampWithTz(timeStamp, "YYYY/MM/DD HH:mm:ss"); }, timeStampToDateOnly: function(timeStamp) { - var dateTimeString = moment(parseInt(timeStamp)).format("YYYY/MM/DD"); - return dateTimeString; + return convertTimestampWithTz(timeStamp, "YYYY/MM/DD"); }, dateToTimeStamp: function(date) { if (date) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/date-utils.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/date-utils.js new file mode 100644 index 000000000000..ef1c3470bf90 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/date-utils.js @@ -0,0 +1,8 @@ +const defaultTz = "America/Los_Angeles"; + +const getDefaultTimezone = () => { + return moment.tz.guess() || defaultTz; +}; + +export const convertTimestampWithTz = (timestamp, format = "YYYY/MM/DD") => + moment.tz(timestamp, getDefaultTimezone()).format(format); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js index 6af45fc9c357..db09ae3c7e8d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js @@ -42,6 +42,7 @@ module.exports = function(defaults) { app.import("bower_components/datatables/media/css/jquery.dataTables.min.css"); app.import("bower_components/datatables/media/js/jquery.dataTables.min.js"); app.import("bower_components/momentjs/min/moment.min.js"); + app.import("bower_components/moment-timezone/builds/moment-timezone-with-data-2010-2020.min.js"); app.import("bower_components/select2/dist/css/select2.min.css"); app.import("bower_components/select2/dist/js/select2.min.js"); app.import('bower_components/jquery-ui/jquery-ui.js');