From 4607a77e8329cbb67515e5c189242f770f6cefdc Mon Sep 17 00:00:00 2001 From: Antonio Cerciello Date: Fri, 27 Feb 2026 18:24:59 +0100 Subject: [PATCH 1/5] Do not set humanized date when not set --- .../main/resources/catalog/components/utility/UtilityService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-ui/src/main/resources/catalog/components/utility/UtilityService.js b/web-ui/src/main/resources/catalog/components/utility/UtilityService.js index 72187f6de274..45b3c14d2e47 100644 --- a/web-ui/src/main/resources/catalog/components/utility/UtilityService.js +++ b/web-ui/src/main/resources/catalog/components/utility/UtilityService.js @@ -623,7 +623,7 @@ }; } else { return { - title: fromNow, + title: date, value: format ? parsedDate.format(format) : parsedDate.toString() }; } From ba36f1fa0c49a87d5eef80be9abde6d5cdcb491c Mon Sep 17 00:00:00 2001 From: Antonio Cerciello Date: Wed, 4 Mar 2026 17:28:07 +0100 Subject: [PATCH 2/5] Extra scenarios --- .../components/utility/UtilityService.js | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/web-ui/src/main/resources/catalog/components/utility/UtilityService.js b/web-ui/src/main/resources/catalog/components/utility/UtilityService.js index 45b3c14d2e47..eb5d4aa15062 100644 --- a/web-ui/src/main/resources/catalog/components/utility/UtilityService.js +++ b/web-ui/src/main/resources/catalog/components/utility/UtilityService.js @@ -594,36 +594,41 @@ "gnGlobalSettings", function (gnGlobalSettings) { return function (date, format, contextAllowToUseFromNow) { - function isDateGmlFormat(date) { - return date.match("[Zz]$") !== null; - } - var settingAllowToUseFromNow = gnGlobalSettings.gnCfg.mods.global.humanizeDates, - timezone = gnGlobalSettings.gnCfg.mods.global.timezone; + const isDateGmlFormat = /[Zz]$/.test(date); + const isDateTimeFormat = date.includes("T"); + var settingAllowToUseFromNow = gnGlobalSettings.gnCfg.mods.global.humanizeDates; + var timezone = gnGlobalSettings.gnCfg.mods.global.timezone; var parsedDate = null; - if (isDateGmlFormat(date)) { + + if (isDateGmlFormat) { parsedDate = moment(date, "YYYY-MM-DDtHH-mm-SSSZ"); - } else { + } else if (isDateTimeFormat) { parsedDate = moment(date); + } else { + parsedDate = moment.utc(date); // Date only } + if (parsedDate.isValid()) { if (!!timezone) { parsedDate = parsedDate.tz( timezone === "Browser" ? moment.tz.guess() : timezone ); } - var fromNow = parsedDate.fromNow(); if (date.length === 4) { - format = "YYYY"; - } + format = "YYYY"; // Year only format + } // Otherwise defaults to the format provided as input + + var fromNow = parsedDate.fromNow(); + if (settingAllowToUseFromNow && contextAllowToUseFromNow) { return { - value: fromNow, - title: format ? parsedDate.format(format) : parsedDate.toString() + title: format ? parsedDate.format(format) : parsedDate.toString(), + value: fromNow }; } else { return { - title: date, + title: isDateTimeFormat ? parsedDate.toString() : fromNow, value: format ? parsedDate.format(format) : parsedDate.toString() }; } From f5c61899f9624ec769e887510c4ef37d39f248c3 Mon Sep 17 00:00:00 2001 From: Antonio Cerciello Date: Mon, 9 Mar 2026 15:24:38 +0100 Subject: [PATCH 3/5] Show raw date when no humanize date is active --- .../catalog/components/utility/UtilityService.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/web-ui/src/main/resources/catalog/components/utility/UtilityService.js b/web-ui/src/main/resources/catalog/components/utility/UtilityService.js index eb5d4aa15062..7ac622503cab 100644 --- a/web-ui/src/main/resources/catalog/components/utility/UtilityService.js +++ b/web-ui/src/main/resources/catalog/components/utility/UtilityService.js @@ -594,22 +594,20 @@ "gnGlobalSettings", function (gnGlobalSettings) { return function (date, format, contextAllowToUseFromNow) { - const isDateGmlFormat = /[Zz]$/.test(date); - const isDateTimeFormat = date.includes("T"); + var isDateGmlFormat = /[Zz]$/.test(date); + var isDateTimeFormat = date.includes("T"); var settingAllowToUseFromNow = gnGlobalSettings.gnCfg.mods.global.humanizeDates; var timezone = gnGlobalSettings.gnCfg.mods.global.timezone; var parsedDate = null; if (isDateGmlFormat) { parsedDate = moment(date, "YYYY-MM-DDtHH-mm-SSSZ"); - } else if (isDateTimeFormat) { - parsedDate = moment(date); } else { - parsedDate = moment.utc(date); // Date only + parsedDate = moment(date); } if (parsedDate.isValid()) { - if (!!timezone) { + if (!!timezone && isDateTimeFormat) { parsedDate = parsedDate.tz( timezone === "Browser" ? moment.tz.guess() : timezone ); @@ -628,7 +626,7 @@ }; } else { return { - title: isDateTimeFormat ? parsedDate.toString() : fromNow, + title: settingAllowToUseFromNow ? fromNow : date, value: format ? parsedDate.format(format) : parsedDate.toString() }; } From 70d4e368494e61e0593cc439affa484ab88e133c Mon Sep 17 00:00:00 2001 From: Antonio Cerciello Date: Mon, 9 Mar 2026 16:08:14 +0100 Subject: [PATCH 4/5] Typo --- .../main/resources/catalog/components/utility/UtilityService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-ui/src/main/resources/catalog/components/utility/UtilityService.js b/web-ui/src/main/resources/catalog/components/utility/UtilityService.js index 7ac622503cab..7001056aa2df 100644 --- a/web-ui/src/main/resources/catalog/components/utility/UtilityService.js +++ b/web-ui/src/main/resources/catalog/components/utility/UtilityService.js @@ -626,7 +626,7 @@ }; } else { return { - title: settingAllowToUseFromNow ? fromNow : date, + title: settingAllowToUseFromNow ? fromNow : date, value: format ? parsedDate.format(format) : parsedDate.toString() }; } From e0759cca28e8eaf8391dd1ada5c08fed93d70887 Mon Sep 17 00:00:00 2001 From: Antonio Cerciello Date: Tue, 24 Mar 2026 15:56:33 +0100 Subject: [PATCH 5/5] Remove unnecessary code --- .../catalog/components/utility/UtilityService.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/web-ui/src/main/resources/catalog/components/utility/UtilityService.js b/web-ui/src/main/resources/catalog/components/utility/UtilityService.js index 7001056aa2df..17c250235a4e 100644 --- a/web-ui/src/main/resources/catalog/components/utility/UtilityService.js +++ b/web-ui/src/main/resources/catalog/components/utility/UtilityService.js @@ -594,17 +594,10 @@ "gnGlobalSettings", function (gnGlobalSettings) { return function (date, format, contextAllowToUseFromNow) { - var isDateGmlFormat = /[Zz]$/.test(date); var isDateTimeFormat = date.includes("T"); var settingAllowToUseFromNow = gnGlobalSettings.gnCfg.mods.global.humanizeDates; var timezone = gnGlobalSettings.gnCfg.mods.global.timezone; - var parsedDate = null; - - if (isDateGmlFormat) { - parsedDate = moment(date, "YYYY-MM-DDtHH-mm-SSSZ"); - } else { - parsedDate = moment(date); - } + var parsedDate = moment(date); if (parsedDate.isValid()) { if (!!timezone && isDateTimeFormat) {