@eeacms/volto-arcgis-block 0.1.468 → 0.1.469

package/CHANGELOG.md

@@ -4,6 +4,12 @@ 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).
 
+### [0.1.469](https://github.com/eea/volto-arcgis-block/compare/0.1.468...0.1.469) - 12 August 2026
+
+#### :hammer_and_wrench: Others
+
+- (chore): fix linting [Unai Bolivar - [`df6b223`](https://github.com/eea/volto-arcgis-block/commit/df6b223aa3b8b2e0bf098e191e210ec4022f059f)]
+- (bug): dynamically pull time range from catalog for hi/lo res tile requests [Unai Bolivar - [`810b22d`](https://github.com/eea/volto-arcgis-block/commit/810b22d9b555fb18d9f8d5a810a5099f6ae29ab6)]
 ### [0.1.468](https://github.com/eea/volto-arcgis-block/compare/0.1.467...0.1.468) - 12 August 2026
 
 #### :rocket: New Features
@@ -17,6 +23,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- Merge pull request #1190 from eea/develop [Unai Bolivar - [`5d9e33f`](https://github.com/eea/volto-arcgis-block/commit/5d9e33f1470e6776920657aac835360aff91e47c)]
 - Merge pull request #1189 from eea/CLMS-304632-REFACTOR [Unai Bolivar - [`ffba286`](https://github.com/eea/volto-arcgis-block/commit/ffba286c6368fae6167ffedf3c89a18d74a31edd)]
 - (task): refactor dual layers support [Unai Bolivar - [`c13aaa0`](https://github.com/eea/volto-arcgis-block/commit/c13aaa089d91f476f1fa02e94673dc4d847704c9)]
 - (task): refactor dual layer support [Unai Bolivar - [`7c3a1cf`](https://github.com/eea/volto-arcgis-block/commit/7c3a1cfe18ed8be53b80fb2205b54cce90f0ad68)]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-arcgis-block",
-  "version": "0.1.468",
+  "version": "0.1.469",
   "description": "volto-arcgis-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: CodeSyntax",

package/src/components/MapViewer/MenuWidget.jsx

@@ -952,7 +952,7 @@ class MenuWidget extends React.Component {
     }
   }
 
-  supportDualLayers(layer, inheritedIndexLayer) {
+  supportDualLayers(layer, inheritedIndexLayer, datasetCollectionId) {
     const resolutionData = layer.resolution_data || {};
     const thresholdScale = Number(resolutionData.thresholdScale);
     const normalizeScaleValue = (scaleValue, fallbackValue = 0) => {
@@ -988,10 +988,73 @@ class MenuWidget extends React.Component {
     const CDSEProcessTileLayer = BaseTileLayer.createSubclass({
       properties: {
         collectionId: null,
+        catalogByoc: null,
         evalscript: null,
         processUrl: '/++api++/@proxyrunprocessapi',
       },
 
+      _resolveCatalogDateRange: function (options) {
+        const rawCollectionId = this.catalogByoc || '';
+        const normalizedCollectionId = String(rawCollectionId).replace(
+          /^byoc-/i,
+          '',
+        );
+        if (!normalizedCollectionId) {
+          return Promise.resolve(null);
+        }
+
+        const cacheByCollection =
+          this.constructor._catalogDateRangeCache ||
+          (this.constructor._catalogDateRangeCache = {});
+        const pendingByCollection =
+          this.constructor._catalogDateRangePending ||
+          (this.constructor._catalogDateRangePending = {});
+
+        if (cacheByCollection[normalizedCollectionId]) {
+          return Promise.resolve(cacheByCollection[normalizedCollectionId]);
+        }
+        if (pendingByCollection[normalizedCollectionId]) {
+          return pendingByCollection[normalizedCollectionId];
+        }
+
+        const requestUrl =
+          '/++api++/@get_catalogapi_dates?byoc=' +
+          encodeURIComponent(normalizedCollectionId) +
+          '&force_refresh=false';
+
+        pendingByCollection[normalizedCollectionId] = fetch(requestUrl, {
+          headers: {
+            Accept: 'application/json',
+          },
+          signal: options && options.signal,
+        })
+          .then((response) => {
+            if (!response.ok) {
+              return null;
+            }
+            return response.json();
+          })
+          .then((payload) => {
+            const dates = Array.isArray(payload?.dates) ? payload.dates : [];
+            const resolvedDateRange =
+              dates.length > 0
+                ? {
+                    from: dates[0],
+                    to: dates[dates.length - 1],
+                  }
+                : null;
+            cacheByCollection[normalizedCollectionId] = resolvedDateRange;
+            delete pendingByCollection[normalizedCollectionId];
+            return resolvedDateRange;
+          })
+          .catch(() => {
+            delete pendingByCollection[normalizedCollectionId];
+            return null;
+          });
+
+        return pendingByCollection[normalizedCollectionId];
+      },
+
       // Computes the tile bounding box in EPSG:3857 (without projections)
       _tileToBBox3857: function (level, row, col) {
         const tileInfo = this.tileInfo;
@@ -1024,81 +1087,94 @@ class MenuWidget extends React.Component {
         const width = this.tileInfo.size[0];
         const height = this.tileInfo.size[1];
 
-        const payload = {
-          input: {
-            bounds: {
-              bbox: [
-                bbox3857.west,
-                bbox3857.south,
-                bbox3857.east,
-                bbox3857.north,
-              ],
-              properties: {
-                crs: 'http://www.opengis.net/def/crs/EPSG/0/3857',
-              },
-            },
-            data: [
-              {
-                type: this.collectionId,
-                dataFilter: {
-                  timeRange: {
-                    from: '2021-01-01T00:00:00Z',
-                    to: '2022-01-01T23:59:59Z',
+        return this._resolveCatalogDateRange(options).then(
+          (catalogDateRange) => {
+            const resolvedTimeRangeFrom = catalogDateRange?.from || null;
+            const resolvedTimeRangeTo = catalogDateRange?.to || null;
+            const timeRange = {};
+            if (resolvedTimeRangeFrom) {
+              timeRange.from = resolvedTimeRangeFrom;
+            }
+            if (resolvedTimeRangeTo) {
+              timeRange.to = resolvedTimeRangeTo;
+            }
+            const dataFilter = {};
+            if (Object.keys(timeRange).length) {
+              dataFilter.timeRange = timeRange;
+            }
+
+            const payload = {
+              input: {
+                bounds: {
+                  bbox: [
+                    bbox3857.west,
+                    bbox3857.south,
+                    bbox3857.east,
+                    bbox3857.north,
+                  ],
+                  properties: {
+                    crs: 'http://www.opengis.net/def/crs/EPSG/0/3857',
                   },
                 },
+                data: [
+                  {
+                    type: this.collectionId,
+                    ...(Object.keys(dataFilter).length ? { dataFilter } : {}),
+                  },
+                ],
               },
-            ],
-          },
-          output: {
-            width: width,
-            height: height,
-            responses: [
-              {
-                identifier: 'default',
-                format: { type: 'image/png' },
+              output: {
+                width: width,
+                height: height,
+                responses: [
+                  {
+                    identifier: 'default',
+                    format: { type: 'image/png' },
+                  },
+                ],
               },
-            ],
-          },
-          evalscript: this.evalscript,
-        };
-
-        return fetch(this.processUrl, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            Accept: 'image/png',
+              evalscript: this.evalscript,
+            };
+
+            return fetch(this.processUrl, {
+              method: 'POST',
+              headers: {
+                'Content-Type': 'application/json',
+                Accept: 'image/png',
+              },
+              body: JSON.stringify(payload),
+              signal: options && options.signal,
+            })
+              .then((response) => {
+                if (!response.ok) {
+                  throw new Error(
+                    `Process API error ${response.status}: ${response.statusText}`,
+                  );
+                }
+                return response.blob();
+              })
+              .then((blob) => {
+                return new Promise((resolve, reject) => {
+                  const url = URL.createObjectURL(blob);
+                  const img = new Image();
+                  img.onload = () => {
+                    const canvas = document.createElement('canvas');
+                    canvas.width = width;
+                    canvas.height = height;
+                    const ctx = canvas.getContext('2d');
+                    ctx.drawImage(img, 0, 0, width, height);
+                    URL.revokeObjectURL(url);
+                    resolve(canvas);
+                  };
+                  img.onerror = (err) => {
+                    URL.revokeObjectURL(url);
+                    reject(err);
+                  };
+                  img.src = url;
+                });
+              });
           },
-          body: JSON.stringify(payload),
-          signal: options && options.signal,
-        })
-          .then((response) => {
-            if (!response.ok) {
-              throw new Error(
-                `Process API error ${response.status}: ${response.statusText}`,
-              );
-            }
-            return response.blob();
-          })
-          .then((blob) => {
-            return new Promise((resolve, reject) => {
-              const url = URL.createObjectURL(blob);
-              const img = new Image();
-              img.onload = () => {
-                const canvas = document.createElement('canvas');
-                canvas.width = width;
-                canvas.height = height;
-                const ctx = canvas.getContext('2d');
-                ctx.drawImage(img, 0, 0, width, height);
-                URL.revokeObjectURL(url);
-                resolve(canvas);
-              };
-              img.onerror = (err) => {
-                URL.revokeObjectURL(url);
-                reject(err);
-              };
-              img.src = url;
-            });
-          });
+        );
       },
     });
     const tileInfo = {
@@ -1132,6 +1208,7 @@ class MenuWidget extends React.Component {
         new CDSEProcessTileLayer({
           ...sharedLayerProps,
           collectionId: lowResLayerData.collectionId,
+          catalogByoc: datasetCollectionId || null,
           evalscript: lowResLayerData.evalscript,
           minScale: lowResLayerData.minScale,
           maxScale: lowResLayerData.maxScale,
@@ -1144,6 +1221,7 @@ class MenuWidget extends React.Component {
         new CDSEProcessTileLayer({
           ...sharedLayerProps,
           collectionId: highResLayerData.collectionId,
+          catalogByoc: datasetCollectionId || null,
           evalscript: highResLayerData.evalscript,
           minScale: highResLayerData.minScale,
           maxScale: highResLayerData.maxScale,
@@ -2279,7 +2357,9 @@ class MenuWidget extends React.Component {
         layer.hasLowRes === true ||
         (layer.resolution_data?.lowRes && layer.resolution_data?.highRes)
       ) {
-        this.supportDualLayers(layer, inheritedIndexLayer);
+        const datasetCollectionId =
+          dataset_download_information?.items?.[0]?.byoc_collection || null;
+        this.supportDualLayers(layer, inheritedIndexLayer, datasetCollectionId);
       } else if (viewService?.toLowerCase().includes('wms')) {
         viewService = viewService?.includes('?')
           ? viewService + '&'