@eeacms/volto-arcgis-block 0.1.389 → 0.1.391

package/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.391](https://github.com/eea/volto-arcgis-block/compare/0.1.390...0.1.391) - 24 September 2025
+
+#### :hammer_and_wrench: Others
+
+- Merge pull request #1022 from eea/CLMS-292477 [Unai Bolivar - [`4ccf86e`](https://github.com/eea/volto-arcgis-block/commit/4ccf86e244145c0b3e3e899ef122449d0e7e37fa)]
+- (bug): The time slider doesn't load when the web service URL is in proxy format. FIXED [Unai Bolivar - [`fb9980b`](https://github.com/eea/volto-arcgis-block/commit/fb9980b17a0754fe0f50c87c0c8bbc0d20422a27)]
+### [0.1.390](https://github.com/eea/volto-arcgis-block/compare/0.1.389...0.1.390) - 23 September 2025
+
+#### :hammer_and_wrench: Others
+
+- Merge pull request #1021 from eea/develop [Unai Bolivar - [`3a1db8d`](https://github.com/eea/volto-arcgis-block/commit/3a1db8db8d64e7ca63f1f1551255df9f443dd695)]
+- (bug): Download area button didn't popup no available data showed up for cdse datasets in certain NUTS 3 counties. [Unai Bolivar - [`1b46d88`](https://github.com/eea/volto-arcgis-block/commit/1b46d88642fdae3ae5235c2a5b91ba02e2a6bbdc)]
 ### [0.1.389](https://github.com/eea/volto-arcgis-block/compare/0.1.388...0.1.389) - 18 September 2025
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/MapViewer/MenuWidget.jsx

@@ -92,7 +92,8 @@ export const AddCartItem = ({
       }
     });
   };
-  const checkExtent = (e) => {
+  const checkExtent = async (e) => {
+    let target = e?.currentTarget;
     let intersection = false;
     let areaExtent = null;
     let check = document.querySelector('.area-panel input:checked')?.value;
@@ -123,7 +124,7 @@ export const AddCartItem = ({
       areaExtent = areaData?.geometry;
     }
     if (dataset?.DatasetTitle) {
-      Object.keys(props.layers).forEach((id) => {
+      for (const id of Object.keys(props.layers)) {
         if (
           props.layers[id]?.DatasetTitle &&
           dataset.DatasetTitle === props.layers[id].DatasetTitle
@@ -140,25 +141,38 @@ export const AddCartItem = ({
             props.layers[id].fullExtents &&
             props.layers[id].fullExtents[0]
           ) {
-            layerExtent = new Extent({
-              xmin: props.layers[id].fullExtents[0].xmin,
-              ymin: props.layers[id].fullExtents[0].ymin,
-              xmax: props.layers[id].fullExtents[0].xmax,
-              ymax: props.layers[id].fullExtents[0].ymax,
-              spatialReference:
-                props.layers[id].fullExtents[0].spatialReference ||
-                mapViewer?.view?.spatialReference,
-            });
             if (isCDSE) {
-              try {
-                const projected = projection.project(
-                  layerExtent,
-                  mapViewer.view.spatialReference,
-                );
-                if (projected) {
-                  layerExtent = projected;
-                }
-              } catch (e) {}
+              let e0 = props.layers[id].fullExtents[0];
+              let xmin = e0.xmin;
+              let ymin = e0.ymin;
+              let xmax = e0.xmax;
+              let ymax = e0.ymax;
+              for (let i = 1; i < props.layers[id].fullExtents.length; i++) {
+                let ex = props.layers[id].fullExtents[i];
+                if (!ex) continue;
+                if (ex.xmin < xmin) xmin = ex.xmin;
+                if (ex.ymin < ymin) ymin = ex.ymin;
+                if (ex.xmax > xmax) xmax = ex.xmax;
+                if (ex.ymax > ymax) ymax = ex.ymax;
+              }
+              layerExtent = new Extent({
+                xmin: xmin,
+                ymin: ymin,
+                xmax: xmax,
+                ymax: ymax,
+                spatialReference:
+                  e0.spatialReference || mapViewer?.view?.spatialReference,
+              });
+            } else {
+              layerExtent = new Extent({
+                xmin: props.layers[id].fullExtents[0].xmin,
+                ymin: props.layers[id].fullExtents[0].ymin,
+                xmax: props.layers[id].fullExtents[0].xmax,
+                ymax: props.layers[id].fullExtents[0].ymax,
+                spatialReference:
+                  props.layers[id].fullExtents[0].spatialReference ||
+                  mapViewer?.view?.spatialReference,
+              });
             }
           } else {
             layerExtent = new Extent({
@@ -179,13 +193,15 @@ export const AddCartItem = ({
             intersection = true;
           }
         }
-      });
+      }
       if (intersection) {
-        checkArea();
+        try {
+          checkArea();
+        } catch (error) {}
       } else {
         const popupContainer = document.querySelector('.popup-container');
         if (popupContainer) {
-          e.currentTarget.appendChild(popupContainer);
+          target.appendChild(popupContainer);
           handleOpenPopup();
         }
       }

package/src/components/MapViewer/TimesliderWidget.jsx

@@ -86,7 +86,6 @@ class TimesliderWidget extends React.Component {
 
   async getCDSEWFSTemporalData(url, layer) {
     if (!url) return {};
-    const match = /\/ogc\/(?:wmts|wms)\/([^/?]+)/i.exec(url);
     const datasetDownloadInformation =
       layer?.DatasetDownloadInformation ||
       layer?.DatasetDownloadInformation ||
@@ -95,8 +94,47 @@ class TimesliderWidget extends React.Component {
     const byocCollectionId =
       datasetDownloadInformation?.items[0].byoc_collection || null;
     if (!byocCollectionId) return {};
-    if (!match) return {};
-    const fetchUrl = `https://sh.dataspace.copernicus.eu/ogc/wfs/${match[1]}?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=byoc-${byocCollectionId}&COUNT=100&BBOX=-21039383,-22375217,21039383,22375217&OUTPUTFORMAT=application/json`;
+    let revProxyUrl = '';
+    let cdseDatasetId = '';
+    if (typeof url === 'string') {
+      try {
+        const u = new URL(
+          url,
+          window.location && window.location.href
+            ? window.location.href
+            : undefined,
+        );
+        const parts = u.pathname.split('/').filter(Boolean);
+        const idx = parts.indexOf('cdse');
+        if (idx !== -1) {
+          revProxyUrl = u.origin + '/' + parts[idx] + '/';
+          cdseDatasetId = parts[idx + 1] || '';
+        } else {
+          const base = url.split('?')[0];
+          const b = new URL(
+            base,
+            window.location && window.location.href
+              ? window.location.href
+              : undefined,
+          );
+          const bparts = b.pathname.split('/').filter(Boolean);
+          cdseDatasetId = bparts[bparts.length - 1] || '';
+          revProxyUrl = b.origin + '/';
+        }
+      } catch (_e) {
+        const base = url.split('?')[0];
+        const path = base.split('/');
+        cdseDatasetId = path[path.length - 1] || '';
+        const idx = path.findIndex((p) => p === 'cdse');
+        if (idx > 0) {
+          revProxyUrl = path.slice(0, idx + 1).join('/') + '/';
+        } else {
+          revProxyUrl = base.replace(cdseDatasetId, '');
+        }
+      }
+    }
+    if (!revProxyUrl || !cdseDatasetId) return {};
+    const fetchUrl = `${revProxyUrl}wfs/${cdseDatasetId}?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=byoc-${byocCollectionId}&COUNT=100&BBOX=-21039383,-22375217,21039383,22375217&OUTPUTFORMAT=application/json`;
     try {
       const res = await fetch(fetchUrl);
       const data = await res.json();