@eeacms/volto-arcgis-block 0.1.383 → 0.1.385

package/CHANGELOG.md

@@ -4,10 +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.385](https://github.com/eea/volto-arcgis-block/compare/0.1.384...0.1.385) - 4 September 2025
+
+### [0.1.384](https://github.com/eea/volto-arcgis-block/compare/0.1.383...0.1.384) - 1 September 2025
+
+#### :hammer_and_wrench: Others
+
+- (bug): fixed hardcoded value in fetch request byoc collection id's and service endpoints become are inyected into request programmatically now [Unai Bolivar - [`aea8135`](https://github.com/eea/volto-arcgis-block/commit/aea8135868d5fef944e27d31ad4e3188ce199ff6)]
 ### [0.1.383](https://github.com/eea/volto-arcgis-block/compare/0.1.382...0.1.383) - 29 August 2025
 
 #### :hammer_and_wrench: Others
 
+- Merge pull request #1007 from eea/develop [Unai Bolivar - [`4e2b9b6`](https://github.com/eea/volto-arcgis-block/commit/4e2b9b6e8fde0821243b917cde774dcf369bdc5d)]
 - (bug): implemented CDSE extent mod to full extent button in activelayers tab of the menu widget [Unai Bolivar - [`e9fdd2f`](https://github.com/eea/volto-arcgis-block/commit/e9fdd2f066d7d9cb2d2036e9e780473c751e0937)]
 ### [0.1.382](https://github.com/eea/volto-arcgis-block/compare/0.1.381...0.1.382) - 28 August 2025
 

package/package.json

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

package/src/components/MapViewer/MenuWidget.jsx

@@ -1697,6 +1697,7 @@ class MenuWidget extends React.Component {
             dataset.DatasetId,
             dataset.DatasetTitle,
             dataset.ProductId,
+            dataset.dataset_download_information,
           ),
         );
         index++;
@@ -1952,6 +1953,7 @@ class MenuWidget extends React.Component {
     DatasetId,
     DatasetTitle,
     ProductId,
+    dataset_download_information,
   ) {
     //For Legend request
     const legendRequest =
@@ -2027,6 +2029,7 @@ class MenuWidget extends React.Component {
           ViewService: viewService,
           StaticImageLegend: layer.StaticImageLegend,
           LayerTitle: layer.Title,
+          DatasetDownloadInformation: dataset_download_information || {},
           customLayerParameters: {
             SHOWLOGO: false,
           },
@@ -2052,7 +2055,17 @@ class MenuWidget extends React.Component {
         });
       }
     }
-
+    // const isCDSE = !!this.url && this.url.toLowerCase().includes('/ogc/');
+    // if (isCDSE) {
+    //   this.layers[
+    //     layer.LayerId + '_' + inheritedIndexLayer
+    //   ].datasetDownloadInformation = dataset_download_information || {};
+    //   this.layers[
+    //     layer.LayerId + '_' + inheritedIndexLayer
+    //   ].customLayerParameters = {
+    //     SHOWLOGO: false,
+    //   };
+    // }
     return (
       <div
         className="ccl-form-group map-menu-layer"
@@ -2934,12 +2947,20 @@ class MenuWidget extends React.Component {
       if (!userService) this.checkForHotspots(elem, productContainerId);
       // Auto-fit extent once for OGC WMS layers on manual toggle
       try {
-        const isCDSE = !!this.url && this.url.toLowerCase().includes('/ogc/');
+        // const isCDSE = !!this.url && this.url.toLowerCase().includes('/ogc/');
+        const isCDSE =
+          !!this.url &&
+          ['/ogc/', '/cdse/'].some((s) => this.url.toLowerCase().includes(s));
         if (isCDSE) {
-          const cdseGeometry = await this.getCDSEWFSGeoCoordinates(this.url);
+          const cdseGeometry = await this.getCDSEWFSGeoCoordinates(
+            this.url,
+            this.layers[elem.id],
+          );
           const extent = await this.createExtentFromCoordinates(cdseGeometry);
-          this.view.goTo(extent);
-          // layer._ogcExtentApplied = true;
+          this.view.goTo({
+            target: extent,
+            zoom: 4,
+          });
         }
       } catch (e) {}
       // try {
@@ -3491,11 +3512,19 @@ class MenuWidget extends React.Component {
     });
   }
 
-  async getCDSEWFSGeoCoordinates(url) {
+  async getCDSEWFSGeoCoordinates(url, layer) {
     if (!url) return {};
     const match = /\/ogc\/(?:wmts|wms)\/([^/?]+)/i.exec(url);
+    const datasetDownloadInformation =
+      layer?.DatasetDownloadInformation ||
+      layer?.DatasetDownloadInformation ||
+      {};
+    if (!datasetDownloadInformation) return {};
+    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-4bd995a1-dc49-4176-a285-b1d0084ba51a&COUNT=100&BBOX=-21039383,-22375217,21039383,22375217&OUTPUTFORMAT=application/json`;
+    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`;
     try {
       const res = await fetch(fetchUrl);
       const data = await res.json();
@@ -3802,12 +3831,21 @@ class MenuWidget extends React.Component {
     } else {
       this.url = serviceLayer.ViewService;
     }
-    let isCDSE = this.url?.toLowerCase().includes('/ogc/') ? true : false;
+    // const isCDSE = !!this.url && this.url.toLowerCase().includes('/ogc/');
+    const isCDSE =
+      !!this.url &&
+      ['/ogc/', '/cdse/'].some((s) => this.url.toLowerCase().includes(s));
     let BBoxes = {};
     if (isCDSE) {
-      const cdseGeometry = await this.getCDSEWFSGeoCoordinates(this.url);
+      const cdseGeometry = await this.getCDSEWFSGeoCoordinates(
+        this.url,
+        this.layers[elem.id],
+      );
       const extent = await this.createExtentFromCoordinates(cdseGeometry);
-      this.view.goTo(extent);
+      this.view.goTo({
+        target: extent,
+        zoom: 4,
+      });
       return;
     } else if (this.url?.toLowerCase().endsWith('mapserver')) {
       BBoxes = await this.parseBBOXMAPSERVER(this.layers[elem.id]);
@@ -3867,7 +3905,10 @@ class MenuWidget extends React.Component {
 
   async fullExtent(elem) {
     this.url = this.layers[elem.id]?.url;
-    const isCDSE = !!this.url && this.url.toLowerCase().includes('/ogc/');
+    // const isCDSE = !!this.url && this.url.toLowerCase().includes('/ogc/');
+    const isCDSE =
+      !!this.url &&
+      ['/ogc/', '/cdse/'].some((s) => this.url.toLowerCase().includes(s));
     const serviceLayer = this.state.wmsUserServiceLayers.find(
       (layer) => layer.LayerId === elem.id,
     );
@@ -3883,9 +3924,15 @@ class MenuWidget extends React.Component {
     let landCoverAndLandUseMapping = document.querySelector('#component_0');
     let productIds = [];
     if (isCDSE) {
-      const cdseGeometry = await this.getCDSEWFSGeoCoordinates(this.url);
+      const cdseGeometry = await this.getCDSEWFSGeoCoordinates(
+        this.url,
+        this.layers[elem.id],
+      );
       const extent = await this.createExtentFromCoordinates(cdseGeometry);
-      this.view.goTo(extent);
+      this.view.goTo({
+        target: extent,
+        zoom: 4,
+      });
       return;
     } else if (landCoverAndLandUseMapping) {
       const productElements = landCoverAndLandUseMapping.querySelectorAll(