Skip to content

Commit 1ad220c

Browse files
author
Jose Chirivella
committed
FOUR-14060 Setting UTC as the fallback if the user timezone is not present
1 parent ef5c60d commit 1ad220c

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/dateUtils.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
/* global ProcessMaker*/
2-
import moment from 'moment-timezone';
1+
/* global ProcessMaker */
2+
import moment from "moment-timezone";
33

4-
moment.tz.setDefault(getTimezone())
4+
moment.tz.setDefault(getTimezone());
55

66
const startsWithNumbers = /^\d{4}-/;
77

88
function getProcessMakerUserValue(key) {
9-
if (typeof ProcessMaker !== 'undefined' && ProcessMaker.user) {
9+
if (ProcessMaker?.user) {
1010
return ProcessMaker.user[key];
1111
}
1212
}
1313

1414
export function getTimezone() {
15-
return getProcessMakerUserValue('timezone') || moment.tz.guess();
15+
return getProcessMakerUserValue("timezone") || "UTC";
1616
}
1717

1818
export function getLang() {
19-
return getProcessMakerUserValue('lang') || 'en';
19+
return getProcessMakerUserValue("lang") || "en";
2020
}
2121

2222
export function getUserDateFormat() {
23-
if (typeof ProcessMaker !== 'undefined' && ProcessMaker.user && ProcessMaker.user.datetime_format) {
24-
return ProcessMaker.user.datetime_format.replace(/[\sHh:msaAzZ]/g, '');
23+
if (ProcessMaker?.user?.datetime_format) {
24+
return ProcessMaker.user.datetime_format.replace(/[\sHh:msaAzZ]/g, "");
2525
}
2626

27-
return 'MM/DD/YYYY';
27+
return "MM/DD/YYYY";
2828
}
2929

3030
export function getUserDateTimeFormat() {
31-
return getProcessMakerUserValue('datetime_format') || 'MM/DD/YYYY h:mm A';
31+
return getProcessMakerUserValue("datetime_format") || "MM/DD/YYYY h:mm A";
3232
}
3333

3434
export function isValidDate(date, format = getUserDateFormat()) {
@@ -43,12 +43,12 @@ export function formatIfDate(string) {
4343
return string;
4444
}
4545

46-
d = moment(string, 'YYYY-MM-DDTHH:mm:ss.SSSZ', true);
46+
d = moment(string, "YYYY-MM-DDTHH:mm:ss.SSSZ", true);
4747
if (d.isValid()) {
4848
return d.format(getUserDateTimeFormat());
4949
}
50-
51-
d = moment(string, 'YYYY-MM-DD', true);
50+
51+
d = moment(string, "YYYY-MM-DD", true);
5252
if (d.isValid()) {
5353
return d.format(getUserDateFormat());
5454
}

0 commit comments

Comments
 (0)