@eeacms/volto-arcgis-block 0.1.446 → 0.1.448

package/CHANGELOG.md

@@ -4,6 +4,14 @@ 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.448](https://github.com/eea/volto-arcgis-block/compare/0.1.447...0.1.448) - 11 May 2026
+
+#### :hammer_and_wrench: Others
+
+- (bug): fix for tickets CLMS-297970, CLMS-288681, CLMS-288445, and implement proxy switching [Unai Bolivar - [`ce3e215`](https://github.com/eea/volto-arcgis-block/commit/ce3e215ed660836bc0f94fcd06536993b448d1b8)]
+- (bug): Area widget loads nuts and countries after using swipe widget [Unai Bolivar - [`324cee2`](https://github.com/eea/volto-arcgis-block/commit/324cee2be67845fd1170425180b5e6562c381fad)]
+### [0.1.447](https://github.com/eea/volto-arcgis-block/compare/0.1.446...0.1.447) - 8 May 2026
+
 ### [0.1.446](https://github.com/eea/volto-arcgis-block/compare/0.1.445...0.1.446) - 7 May 2026
 
 ### [0.1.445](https://github.com/eea/volto-arcgis-block/compare/0.1.444...0.1.445) - 28 April 2026

package/package.json

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

package/src/components/MapViewer/AreaWidget.jsx

@@ -358,7 +358,18 @@ class AreaWidget extends React.Component {
     });
   }
 
+  resolveNutsGroupLayerState() {
+    if (!this.nutsGroupLayer || !this.props.map || !this.props.map.layers) {
+      return;
+    }
+
+    if (!this.props.map.layers.includes(this.nutsGroupLayer)) {
+      this.props.map.add(this.nutsGroupLayer);
+    }
+  }
+
   loadNutsService(id, levels) {
+    this.resolveNutsGroupLayerState();
     this.clearWidget();
     document.querySelector('.esri-attribution__powered-by').style.display =
       'flex';
@@ -374,6 +385,7 @@ class AreaWidget extends React.Component {
   }
 
   loadCountriesService(id) {
+    this.resolveNutsGroupLayerState();
     document.querySelector('.esri-attribution__powered-by').style.display =
       'flex';
     var layer = new FeatureLayer({

package/src/components/MapViewer/MenuWidget.jsx

@@ -2307,8 +2307,8 @@ class MenuWidget extends React.Component {
   }
 
   getProxyBase = () => {
-    const href = window.location.href || '';
-    return href.replace('/en/map-viewer', '/ogcproxy/');
+    const origin = window?.location?.origin || '';
+    return origin ? `${origin}/ogcproxy/` : '/ogcproxy/';
     // return 'https://clmsdemo.devel6cph.eea.europa.eu/ogcproxy/';
     // return 'https://land.copernicus.eu/ogcproxy/';
   };
@@ -2316,7 +2316,12 @@ class MenuWidget extends React.Component {
   buildProxiedUrl(url) {
     if (!url) return url;
     const hasProxy = /\/ogcproxy\//i.test(url);
-    return hasProxy ? url : this.getProxyBase() + this.stripProtocol(url);
+    if (hasProxy) {
+      const strippedUrl = this.stripProtocol(url);
+      const proxyPath = strippedUrl.split(/\/ogcproxy\//i)[1] || '';
+      return this.getProxyBase() + proxyPath.replace(/^\/+/, '');
+    }
+    return this.getProxyBase() + this.stripProtocol(url);
   }
 
   parseWMSLayers(xml) {

package/src/components/MapViewer/UploadWidget.jsx

@@ -284,12 +284,9 @@ class UploadWidget extends React.Component {
         return queryService;
       }
       const pathName = (parsedUrl.pathname || '').toLowerCase();
-      const pathSegments = pathName.split('/').filter(Boolean);
-      const serviceMatch = pathSegments.find((segment) =>
-        /^(wmts|wms|wfs)$/i.test(segment),
-      );
-      if (serviceMatch) {
-        return serviceMatch.toUpperCase();
+      const pathServiceType = this.resolveServiceTypeFromPath(pathName);
+      if (pathServiceType) {
+        return pathServiceType;
       }
       return null;
     } catch (e) {
@@ -297,6 +294,23 @@ class UploadWidget extends React.Component {
     }
   };
 
+  resolveServiceTypeFromPath = (pathName) => {
+    const value = (pathName || '').toLowerCase();
+    if (!value) {
+      return null;
+    }
+    if (/\bwmts\b|\/wmts(?:[/._-]|$)/i.test(value)) {
+      return 'WMTS';
+    }
+    if (/\bwfs\b|\/wfs(?:[/._-]|$)/i.test(value)) {
+      return 'WFS';
+    }
+    if (/\bwms\b|\/wms(?:[/._-]|$)/i.test(value)) {
+      return 'WMS';
+    }
+    return null;
+  };
+
   isServiceTypeMatchingUrl = (serviceUrl, selectedServiceType) => {
     const encodedServiceType = this.getServiceTypeFromUrl(serviceUrl);
     if (!encodedServiceType) {
@@ -305,18 +319,40 @@ class UploadWidget extends React.Component {
     return encodedServiceType === selectedServiceType;
   };
 
+  clearUploadForm = (clearServiceType = false) => {
+    this.setState({
+      ...this.buildUploadResetState(),
+      ...(clearServiceType ? { selectedServiceType: '' } : {}),
+    });
+    if (this.fileInput && this.fileInput.current) {
+      this.fileInput.current.value = null;
+    }
+  };
+
+  handleServiceTypeMismatch = () => {
+    this.errorPopup('serviceTypeMismatch');
+    this.clearUploadForm(true);
+  };
+
   stripProtocol = (url) => {
     return (url || '').replace(/^https?:\/\//i, '');
   };
 
   getProxyBase = () => {
-    const href = window.location.href || '';
-    return href.replace('/en/map-viewer', '/ogcproxy/');
+    const origin = window?.location?.origin || '';
+    return origin ? `${origin}/ogcproxy/` : '/ogcproxy/';
     // return 'https://clmsdemo.devel6cph.eea.europa.eu/ogcproxy/';
     // return 'https://land.copernicus.eu/ogcproxy/';
   };
 
   buildProxiedUrl = (url) => {
+    if (!url) return url;
+    const hasProxy = /\/ogcproxy\//i.test(url);
+    if (hasProxy) {
+      const strippedUrl = this.stripProtocol(url);
+      const proxyPath = strippedUrl.split(/\/ogcproxy\//i)[1] || '';
+      return this.getProxyBase() + proxyPath.replace(/^\/+/, '');
+    }
     return this.getProxyBase() + this.stripProtocol(url);
   };
 
@@ -528,6 +564,15 @@ class UploadWidget extends React.Component {
   handleSelectLayers = async () => {
     const { serviceUrl, selectedServiceType } = this.state;
     const trimmedServiceUrl = (serviceUrl || '').trim();
+    if (
+      selectedServiceType &&
+      trimmedServiceUrl !== '' &&
+      this.isValidUrl(trimmedServiceUrl) &&
+      !this.isServiceTypeMatchingUrl(trimmedServiceUrl, selectedServiceType)
+    ) {
+      this.handleServiceTypeMismatch();
+      return;
+    }
     if (
       selectedServiceType === 'WFS' &&
       trimmedServiceUrl !== '' &&
@@ -553,6 +598,15 @@ class UploadWidget extends React.Component {
     const trimmedServiceUrl = (serviceUrl || '').trim();
     const selectedServiceType = this.state.selectedServiceType;
     const selectedFeatures = this.state.selectedFeatures;
+    if (
+      selectedServiceType &&
+      trimmedServiceUrl !== '' &&
+      this.isValidUrl(trimmedServiceUrl) &&
+      !this.isServiceTypeMatchingUrl(trimmedServiceUrl, selectedServiceType)
+    ) {
+      this.handleServiceTypeMismatch();
+      return;
+    }
     if (
       selectedServiceType &&
       trimmedServiceUrl !== '' &&
@@ -1018,6 +1072,16 @@ class UploadWidget extends React.Component {
                       </div>
                     </>
                   )}
+                  {this.state.infoPopupType === 'serviceTypeMismatch' && (
+                    <>
+                      <span className="drawRectanglePopup-icon">
+                        <FontAwesomeIcon icon={['fas', 'info-circle']} />
+                      </span>
+                      <div className="drawRectanglePopup-text">
+                        Selected service type does not match the provided URL.
+                      </div>
+                    </>
+                  )}
                 </div>
               </div>
             </div>