@eeacms/volto-clms-theme 1.1.263 → 1.1.264

package/CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [1.1.264](https://github.com/eea/volto-clms-theme/compare/1.1.263...1.1.264) - 11 December 2025
+
 ### [1.1.263](https://github.com/eea/volto-clms-theme/compare/1.1.262...1.1.263) - 10 December 2025
 
 ### [1.1.262](https://github.com/eea/volto-clms-theme/compare/1.1.261...1.1.262) - 13 November 2025

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.263",
+  "version": "1.1.264",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

package/src/components/CLMSDownloadCartView/Fields/TimeseriesPicker.jsx

@@ -4,7 +4,10 @@ import { Grid, Popup } from 'semantic-ui-react';
 import calendarSVG from '@plone/volto/icons/calendar.svg';
 import { Icon } from '@plone/volto/components';
 
-import { cclDateFormat } from '@eeacms/volto-clms-theme/components/CclUtils';
+import {
+  cclCartDateFormat,
+  toUTCTimestamp,
+} from '@eeacms/volto-clms-theme/components/CclUtils';
 import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
 
 export const TimeseriesPicker = (props) => {
@@ -18,12 +21,12 @@ export const TimeseriesPicker = (props) => {
   } = props;
   const [startValue, setStartValue] = useState(
     item?.TemporalFilter?.StartDate
-      ? new Date(cclDateFormat(item.TemporalFilter.StartDate))
+      ? new Date(cclCartDateFormat(item.TemporalFilter.StartDate))
       : null,
   );
   const [endValue, setEndValue] = useState(
     item?.TemporalFilter?.EndDate
-      ? new Date(cclDateFormat(item.TemporalFilter.EndDate))
+      ? new Date(cclCartDateFormat(item.TemporalFilter.EndDate))
       : null,
   );
   const [isOpen, setIsOpen] = useState(false);
@@ -62,9 +65,9 @@ export const TimeseriesPicker = (props) => {
               <br />
               <span>
                 {item.TemporalFilter
-                  ? `${cclDateFormat(
+                  ? `${cclCartDateFormat(
                       item.TemporalFilter.StartDate,
-                    )}-${cclDateFormat(item.TemporalFilter.EndDate)}`
+                    )}-${cclCartDateFormat(item.TemporalFilter.EndDate)}`
                   : 'Select dates'}
               </span>
             </button>
@@ -125,9 +128,9 @@ export const TimeseriesPicker = (props) => {
               {(item?.TemporalFilter?.StartDate ||
                 item?.TemporalFilter?.EndDate) && (
                 <span>
-                  {cclDateFormat(item?.TemporalFilter?.StartDate)} -{' '}
+                  {cclCartDateFormat(item?.TemporalFilter?.StartDate)} -{' '}
                   {item?.TemporalFilter?.EndDate &&
-                    cclDateFormat(item?.TemporalFilter?.EndDate)}
+                    cclCartDateFormat(item?.TemporalFilter?.EndDate)}
                 </span>
               )}
               <br />
@@ -192,12 +195,12 @@ export const TimeseriesPicker = (props) => {
                 }
                 onClick={() => {
                   item.TemporalFilter = {
-                    StartDate: startValue,
-                    EndDate: endValue,
+                    StartDate: toUTCTimestamp(startValue, false),
+                    EndDate: toUTCTimestamp(endValue, true),
                   };
                   setTimeseriesValue(item.unique_id, {
-                    StartDate: startValue,
-                    EndDate: endValue,
+                    StartDate: toUTCTimestamp(startValue, false),
+                    EndDate: toUTCTimestamp(endValue, true),
                   });
                   setIsOpen(false);
                 }}

package/src/components/CLMSDownloadCartView/cartUtils.js

@@ -61,10 +61,8 @@ export const getDownloadToolPostBody = (selectedItems) => {
         body_extras['Layer'] = item?.layer;
       }
       if (item?.TemporalFilter) {
-        body_extras['TemporalFilter'] = {
-          StartDate: new Date(item?.TemporalFilter?.StartDate).getTime(),
-          EndDate: new Date(item?.TemporalFilter?.EndDate).getTime(),
-        };
+        // TemporalFilter now contains UTC timestamps directly
+        body_extras['TemporalFilter'] = item.TemporalFilter;
       }
     }
     return { DatasetID: item?.dataset_uid, ...body_extras };

package/src/components/CclUtils/dateFormats.js

@@ -30,6 +30,15 @@ export const cclDateFormat = (date) => {
   return `${day}.${month}.${year}`;
 };
 
+export const cclCartDateFormat = (date) => {
+  const dateObj = new Date(date);
+  // Use UTC methods to ensure consistent display regardless of user timezone
+  const day = ('0' + dateObj.getUTCDate()).slice(-2);
+  const month = ('0' + (dateObj.getUTCMonth() + 1)).slice(-2);
+  const year = dateObj.getUTCFullYear();
+  return `${day}.${month}.${year}`;
+};
+
 export const workOpportunitiesCclDateFormat = (date, lang) => {
   const internal = getInternalValue(date, lang);
   return internal.format('DD.MM.YYYY');
@@ -41,3 +50,26 @@ export const cclTimeFormat = (date) => {
   const minutes = ('0' + dateObj.getMinutes()).slice(-2);
   return `${hours}.${minutes}`;
 };
+
+/**
+ * Convert a Date object to UTC timestamp, preserving the calendar date
+ * regardless of the user's timezone.
+ *
+ * @param {Date} date - The date to convert
+ * @param {boolean} isEndOfDay - If true, set time to 23:59:59.999, otherwise 00:00:00.000
+ * @returns {number|null} UTC timestamp in milliseconds, or null if date is falsy
+ */
+export const toUTCTimestamp = (date, isEndOfDay = false) => {
+  if (!date) return null;
+
+  // Adjust for timezone offset to get the intended UTC date
+  const offsetDate = new Date(
+    date.getTime() - date.getTimezoneOffset() * 60000,
+  );
+
+  if (isEndOfDay) {
+    offsetDate.setUTCHours(23, 59, 59, 999);
+  }
+
+  return offsetDate.getTime();
+};

package/src/components/CclUtils/index.js

@@ -9,6 +9,8 @@ export {
   cclDateFormat,
   cclDateTimeFormat,
   cclTimeFormat,
+  cclCartDateFormat,
+  toUTCTimestamp,
 } from './dateFormats';
 export { helmetTitle } from './helmetTitle';
 export { sanitizedHTML } from './sanitizedHTML';