@eeacms/volto-arcgis-block 0.1.481 → 0.1.483

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).
 
+### [0.1.483](https://github.com/eea/volto-arcgis-block/compare/0.1.482...0.1.483) - 15 September 2026
+
+### [0.1.482](https://github.com/eea/volto-arcgis-block/compare/0.1.481...0.1.482) - 15 September 2026
+
 ### [0.1.481](https://github.com/eea/volto-arcgis-block/compare/0.1.480...0.1.481) - 14 September 2026
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/MapViewer/MenuWidget.jsx

@@ -3011,7 +3011,12 @@ class MenuWidget extends React.Component {
     return null;
   }
 
-  async applyWmtsSettingsData(layer, spatialReference, isSceneViewActive) {
+  async applyWmtsSettingsData(
+    layer,
+    spatialReference,
+    isSceneViewActive,
+    useProxy = false,
+  ) {
     if (!layer || layer.type !== 'wmts') {
       return true;
     }
@@ -3023,7 +3028,7 @@ class MenuWidget extends React.Component {
     let layerId = activeLayerData.id;
 
     this.xml = null;
-    await this.getCapabilities(serviceData, 'WMTS');
+    await this.getCapabilities(serviceData, 'WMTS', { useProxy });
     if (!this.xml) {
       return !isSceneViewActive;
     }
@@ -3829,7 +3834,7 @@ class MenuWidget extends React.Component {
 
       if (serviceType === 'WMTS') {
         this.xml = null;
-        await this.getCapabilities(viewService, 'WMTS');
+        await this.getCapabilities(viewService, 'WMTS', { useProxy: true });
         if (isInvalidCapabilitiesData(this.xml)) {
           throw new Error('Unable to load WMTS capabilities');
         }
@@ -3886,7 +3891,7 @@ class MenuWidget extends React.Component {
           }),
         ];
       } else if (isWFS) {
-        await this.getCapabilities(viewService, 'WFS');
+        await this.getCapabilities(viewService, 'WFS', { useProxy: true });
         if (isInvalidCapabilitiesData(this.xml)) {
           throw new Error('Unable to load WFS capabilities');
         }
@@ -3950,7 +3955,7 @@ class MenuWidget extends React.Component {
         );
         resourceLayers = layerResults.filter(Boolean);
       } else {
-        await this.getCapabilities(viewService, 'WMS');
+        await this.getCapabilities(viewService, 'WMS', { useProxy: true });
         if (isInvalidCapabilitiesData(this.xml)) {
           throw new Error('Unable to load WMS capabilities');
         }
@@ -4832,6 +4837,7 @@ class MenuWidget extends React.Component {
         this.layers[elem.id],
         this.view?.spatialReference,
         isSceneViewActive,
+        !!userService,
       );
       if (!canApplyWmtsSettings) {
         elem.checked = false;
@@ -5202,13 +5208,6 @@ class MenuWidget extends React.Component {
           ) {
             layerToRemove.clear();
           }
-          if (
-            layerToRemove.type !== 'group' &&
-            layerToRemove.type !== 'wmts' &&
-            typeof layerToRemove.destroy === 'function'
-          ) {
-            layerToRemove.destroy();
-          }
         }
         this.map.remove(layerToRemove);
         if (layerIdentity) {
@@ -6194,8 +6193,9 @@ class MenuWidget extends React.Component {
     return BBoxes;
   }
 
-  getCapabilities = async (url, serviceType) => {
-    const proxiedUrl = this.buildProxiedUrl(url);
+  getCapabilities = async (url, serviceType, options = {}) => {
+    const useProxy = !!options?.useProxy;
+    const targetUrl = useProxy ? this.buildProxiedUrl(url) : url;
     const evaluateXmlResponse = (responseData) => {
       const parser = new DOMParser();
       const xmlDoc = parser.parseFromString(responseData, 'text/xml');
@@ -6211,7 +6211,7 @@ class MenuWidget extends React.Component {
 
     const loadCapabilitiesResponse = async (requestData) => {
       try {
-        const response = await esriRequest(proxiedUrl, requestData);
+        const response = await esriRequest(targetUrl, requestData);
         const xmlData = evaluateXmlResponse(response.data);
         if (xmlData) {
           return xmlData;
@@ -6221,8 +6221,7 @@ class MenuWidget extends React.Component {
     };
 
     const hasCapabilitiesEndpoint =
-      typeof proxiedUrl === 'string' &&
-      /wmtscapabilities\.xml/i.test(proxiedUrl);
+      typeof targetUrl === 'string' && /wmtscapabilities\.xml/i.test(targetUrl);
     let xmlData = null;
 
     if (
@@ -6414,10 +6413,12 @@ class MenuWidget extends React.Component {
     } else if (this.url?.toLowerCase().endsWith('mapserver')) {
       BBoxes = await this.parseBBOXMAPSERVER(this.layers[elem.id]);
     } else if (this.url?.toLowerCase().includes('wms') || serviceLayer) {
-      await this.getCapabilities(this.url, 'wms');
+      await this.getCapabilities(this.url, 'wms', { useProxy: !!serviceLayer });
       BBoxes = this.parseBBOXWMS(this.xml);
     } else if (this.url?.toLowerCase().includes('wmts')) {
-      await this.getCapabilities(this.url, 'wmts');
+      await this.getCapabilities(this.url, 'wmts', {
+        useProxy: !!serviceLayer,
+      });
       BBoxes = this.parseBBOXWMTS(this.xml);
     }
     let myExtent;
@@ -6694,10 +6695,14 @@ class MenuWidget extends React.Component {
       if (this.url?.toLowerCase().endsWith('mapserver')) {
         BBoxes = await this.parseBBOXMAPSERVER(this.layers[elem.id]);
       } else if (this.url?.toLowerCase().includes('wms')) {
-        await this.getCapabilities(this.url, 'wms');
+        await this.getCapabilities(this.url, 'wms', {
+          useProxy: !!serviceLayer,
+        });
         BBoxes = this.parseBBOXWMS(this.xml);
       } else if (this.url?.toLowerCase().includes('wmts')) {
-        await this.getCapabilities(this.url, 'wmts');
+        await this.getCapabilities(this.url, 'wmts', {
+          useProxy: !!serviceLayer,
+        });
         BBoxes = this.parseBBOXWMTS(this.xml);
       }
     }