Skip to content

Commit 4b702b0

Browse files
authored
ATLAS-5015: UI: when server response date fields as '0', UI shows as current time. (#332)
1 parent c4c4cf2 commit 4b702b0

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

dashboardv2/public/js/utils/CommonViewFunction.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
291291
if (defEntity && defEntity.typeName) {
292292
var defEntityType = defEntity.typeName.toLocaleLowerCase();
293293
if (defEntityType === 'date') {
294-
keyValue = moment(keyValue)._isValid ? Utils.formatDate({ date: keyValue }) : null;
294+
keyValue = moment(keyValue).isValid() ? Utils.formatDate({ date: keyValue }) : null;
295295
} else if (_.isObject(keyValue)) {
296296
keyValue = extractObject({ "keyValue": keyValue, "key": key, 'defEntity': defEntity });
297297
}

dashboardv2/public/js/utils/Utils.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -953,15 +953,19 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
953953
var dateValue = null,
954954
dateFormat = Globals.dateTimeFormat,
955955
isValidDate = false;
956-
if (options && options.date) {
956+
957+
if (options && !options.date) {
958+
return null;
959+
}
960+
else {
957961
dateValue = options.date;
958962
if (dateValue !== "-") {
959963
dateValue = parseInt(dateValue);
960964
if (_.isNaN(dateValue)) {
961965
dateValue = options.date;
962966
}
963967
dateValue = moment(dateValue);
964-
if (dateValue._isValid) {
968+
if (dateValue.isValid) {
965969
isValidDate = true;
966970
dateValue = dateValue.format(dateFormat);
967971
}

dashboardv3/public/js/utils/CommonViewFunction.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
291291
if (defEntity && defEntity.typeName) {
292292
var defEntityType = defEntity.typeName.toLocaleLowerCase();
293293
if (defEntityType === 'date') {
294-
keyValue = moment(keyValue)._isValid ? Utils.formatDate({ date: keyValue }) : null;
294+
keyValue = moment(keyValue).isValid() ? Utils.formatDate({ date: keyValue }) : null;
295295
} else if (_.isObject(keyValue)) {
296296
keyValue = extractObject({ "keyValue": keyValue, "key": key, 'defEntity': defEntity });
297297
}

dashboardv3/public/js/utils/Utils.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -971,15 +971,18 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
971971
var dateValue = null,
972972
dateFormat = Globals.dateTimeFormat,
973973
isValidDate = false;
974-
if (options && options.date) {
974+
if (options && !options.date) {
975+
return null;
976+
}
977+
else {
975978
dateValue = options.date;
976979
if (dateValue !== "-") {
977980
dateValue = parseInt(dateValue);
978981
if (_.isNaN(dateValue)) {
979982
dateValue = options.date;
980983
}
981984
dateValue = moment(dateValue);
982-
if (dateValue._isValid) {
985+
if (dateValue.isValid) {
983986
isValidDate = true;
984987
dateValue = dateValue.format(dateFormat);
985988
}

0 commit comments

Comments
 (0)