@eeacms/volto-clms-theme 1.1.265 → 1.1.267

package/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.267](https://github.com/eea/volto-clms-theme/compare/1.1.266...1.1.267) - 16 December 2025
+
+### [1.1.266](https://github.com/eea/volto-clms-theme/compare/1.1.265...1.1.266) - 11 December 2025
+
 ### [1.1.265](https://github.com/eea/volto-clms-theme/compare/1.1.264...1.1.265) - 11 December 2025
 
 ### [1.1.264](https://github.com/eea/volto-clms-theme/compare/1.1.263...1.1.264) - 11 December 2025

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.265",
+  "version": "1.1.267",
   "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,10 +4,7 @@ import { Grid, Popup } from 'semantic-ui-react';
 import calendarSVG from '@plone/volto/icons/calendar.svg';
 import { Icon } from '@plone/volto/components';
 
-import {
-  cclCartDateFormat,
-  toUTCTimestamp,
-} from '@eeacms/volto-clms-theme/components/CclUtils';
+import { cclDateFormat } from '@eeacms/volto-clms-theme/components/CclUtils';
 import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
 
 export const TimeseriesPicker = (props) => {
@@ -21,16 +18,27 @@ export const TimeseriesPicker = (props) => {
   } = props;
   const [startValue, setStartValue] = useState(
     item?.TemporalFilter?.StartDate
-      ? new Date(cclCartDateFormat(item.TemporalFilter.StartDate))
+      ? new Date(cclDateFormat(item.TemporalFilter.StartDate))
       : null,
   );
   const [endValue, setEndValue] = useState(
     item?.TemporalFilter?.EndDate
-      ? new Date(cclCartDateFormat(item.TemporalFilter.EndDate))
+      ? new Date(cclDateFormat(item.TemporalFilter.EndDate))
       : null,
   );
   const [isOpen, setIsOpen] = useState(false);
 
+  const toISOIgnoreTimezone = (inputDate) => {
+    return (
+      inputDate.getFullYear() +
+      '-' +
+      ('0' + (inputDate.getMonth() + 1)).slice(-2) +
+      '-' +
+      ('0' + inputDate.getDate()).slice(-2) +
+      'T00:00:00.000Z'
+    );
+  };
+
   const isValidDateRange = ({ start, end, limit }) => {
     /* Calculate if the difference in days is smaller than the allowed limit */
     const oneDay = 24 * 60 * 60 * 1000; // hours*minutes*seconds*milliseconds
@@ -65,9 +73,9 @@ export const TimeseriesPicker = (props) => {
               <br />
               <span>
                 {item.TemporalFilter
-                  ? `${cclCartDateFormat(
+                  ? `${cclDateFormat(
                       item.TemporalFilter.StartDate,
-                    )}-${cclCartDateFormat(item.TemporalFilter.EndDate)}`
+                    )}-${cclDateFormat(item.TemporalFilter.EndDate)}`
                   : 'Select dates'}
               </span>
             </button>
@@ -124,13 +132,14 @@ export const TimeseriesPicker = (props) => {
                 download_limit_temporal_extent < 180 ? dates_array : null
               }
               disabledKeyboardNavigation
+              timeZone="UTC"
             >
               {(item?.TemporalFilter?.StartDate ||
                 item?.TemporalFilter?.EndDate) && (
                 <span>
-                  {cclCartDateFormat(item?.TemporalFilter?.StartDate)} -{' '}
+                  {cclDateFormat(item?.TemporalFilter?.StartDate)} -{' '}
                   {item?.TemporalFilter?.EndDate &&
-                    cclCartDateFormat(item?.TemporalFilter?.EndDate)}
+                    cclDateFormat(item?.TemporalFilter?.EndDate)}
                 </span>
               )}
               <br />
@@ -195,12 +204,12 @@ export const TimeseriesPicker = (props) => {
                 }
                 onClick={() => {
                   item.TemporalFilter = {
-                    StartDate: toUTCTimestamp(startValue, false),
-                    EndDate: toUTCTimestamp(endValue, true),
+                    StartDate: toISOIgnoreTimezone(startValue),
+                    EndDate: toISOIgnoreTimezone(endValue),
                   };
                   setTimeseriesValue(item.unique_id, {
-                    StartDate: toUTCTimestamp(startValue, false),
-                    EndDate: toUTCTimestamp(endValue, true),
+                    StartDate: toISOIgnoreTimezone(startValue),
+                    EndDate: toISOIgnoreTimezone(endValue),
                   });
                   setIsOpen(false);
                 }}

package/src/components/CLMSDownloadCartView/cartUtils.js

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

package/src/components/CclUtils/dateFormats.js

@@ -30,15 +30,6 @@ 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');
@@ -50,31 +41,3 @@ 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;
-
-  // Extract local calendar date components
-  const year = date.getFullYear();
-  const month = date.getMonth();
-  const day = date.getDate();
-
-  // Create UTC timestamp for that calendar date
-  return Date.UTC(
-    year,
-    month,
-    day,
-    isEndOfDay ? 23 : 0,
-    isEndOfDay ? 59 : 0,
-    isEndOfDay ? 59 : 0,
-    isEndOfDay ? 999 : 0,
-  );
-};

package/src/components/CclUtils/index.js

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