@eeacms/volto-arcgis-block 0.1.429 → 0.1.430

package/CHANGELOG.md

@@ -4,10 +4,17 @@ 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.430](https://github.com/eea/volto-arcgis-block/compare/0.1.429...0.1.430) - 19 February 2026
+
+#### :hammer_and_wrench: Others
+
+- (bug): WFS fix [Unai Bolivar - [`dd08e60`](https://github.com/eea/volto-arcgis-block/commit/dd08e60240a885b9e611b6e096d413027a4d2b2c)]
+- (bug): shapefileLimit error popup [Unai Bolivar - [`70d95a5`](https://github.com/eea/volto-arcgis-block/commit/70d95a5d58feed47bf027a0a213eb892a6d1a661)]
 ### [0.1.429](https://github.com/eea/volto-arcgis-block/compare/0.1.428...0.1.429) - 17 February 2026
 
 #### :hammer_and_wrench: Others
 
+- Merge pull request #1104 from eea/develop [Unai Bolivar - [`b5afb9b`](https://github.com/eea/volto-arcgis-block/commit/b5afb9bb2ca6486c1d0b72c87caebf4acc630e07)]
 - (bug): styles for buttons in upload widget and error popup message for file size limit on hspae files [Unai Bolivar - [`d9ca59e`](https://github.com/eea/volto-arcgis-block/commit/d9ca59ec245fdc94a2d1bf678b6e3d610d5a792d)]
 - (bug): reset upload widget to allow users to start from zero without finishing a process first [Unai Bolivar - [`1539a3a`](https://github.com/eea/volto-arcgis-block/commit/1539a3ada8fef0fbda5203b61ec2aed60ab014b5)]
 - (bug): truncate title to 33 max char and add ellipsis for user created services and move trashcan icon to the right edge of the menu item div [Unai Bolivar - [`a31612d`](https://github.com/eea/volto-arcgis-block/commit/a31612df1ee629937e115b1fec1c50092b659626)]

package/package.json

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

package/src/components/MapViewer/MenuWidget.jsx

@@ -2474,6 +2474,17 @@ class MenuWidget extends React.Component {
       const versionList = Array.from(versionSet);
       const formatList = Array.from(formatSet);
       const srsList = Array.from(srsSet);
+      const normalizedSrsList = srsList
+        .map((srsValue) => {
+          const textValue = (srsValue || '').trim();
+          const epsgMatch = textValue.match(/EPSG(?::|::|\/)(\d+)/i);
+          if (epsgMatch && epsgMatch[1]) {
+            return `EPSG:${epsgMatch[1]}`;
+          }
+          const normalizedSrsValue = textValue.toUpperCase();
+          return normalizedSrsValue || null;
+        })
+        .filter(Boolean);
       const requestVersion = versionList.includes('2.0.0')
         ? '2.0.0'
         : versionList.includes('1.1.0')
@@ -2487,9 +2498,9 @@ class MenuWidget extends React.Component {
       const preferredXmlFormat = formatList.find((item) =>
         /text\/xml|xml|gml/i.test(item),
       );
-      const requestSrsName = srsList.includes('EPSG:4326')
+      const requestSrsName = normalizedSrsList.includes('EPSG:4326')
         ? 'EPSG:4326'
-        : srsList[0] || 'EPSG:4326';
+        : normalizedSrsList[0] || 'EPSG:4326';
       return {
         requestVersion,
         requestFormat: preferredJsonFormat || preferredXmlFormat || null,
@@ -2581,6 +2592,69 @@ class MenuWidget extends React.Component {
     );
   }
 
+  resolveResponseData(responseData) {
+    const resolveJsonData = (dataValue) => {
+      if (!dataValue || typeof dataValue !== 'object') {
+        return null;
+      }
+      if (
+        dataValue.type === 'FeatureCollection' &&
+        Array.isArray(dataValue.features)
+      ) {
+        return {
+          ...dataValue,
+          type: 'FeatureCollection',
+          features: dataValue.features,
+        };
+      }
+      if (Array.isArray(dataValue.features)) {
+        return {
+          ...dataValue,
+          type: 'FeatureCollection',
+          features: dataValue.features,
+        };
+      }
+      if (dataValue.type === 'Feature' && dataValue.geometry) {
+        return {
+          type: 'FeatureCollection',
+          features: [dataValue],
+        };
+      }
+      return null;
+    };
+
+    if (typeof responseData === 'string') {
+      const textValue = responseData.trim();
+      if (!textValue) {
+        return null;
+      }
+      if (this.hasExceptionResponse(textValue)) {
+        const exceptionMessage = this.resolveExceptionMessage(textValue);
+        throw new Error(exceptionMessage || 'WFS request failed');
+      }
+      let parsedData = null;
+      try {
+        parsedData = JSON.parse(textValue);
+      } catch (e) {}
+      const jsonData = resolveJsonData(parsedData);
+      if (jsonData) {
+        return jsonData;
+      }
+      const xmlData = this.processXmlData(textValue);
+      return this.resolveFeatureCollection(xmlData);
+    }
+
+    return resolveJsonData(responseData);
+  }
+
+  hasResultData(resultData) {
+    return Boolean(
+      resultData &&
+        Array.isArray(resultData.features) &&
+        resultData.features.length > 0,
+    );
+  }
+
   processXmlData(xmlInput) {
     let doc = xmlInput;
     if (typeof xmlInput === 'string') {
@@ -2993,34 +3067,16 @@ class MenuWidget extends React.Component {
             const requestParams = this.buildRequestParams(name, requestConfig);
             if (requestConfig.hasJsonFormat && requestConfig.requestFormat) {
               requestParams.outputFormat = requestConfig.requestFormat;
+              requestParams.outputformat = requestConfig.requestFormat;
             }
             const requestQuery = new URLSearchParams(requestParams).toString();
             const requestUrl = baseUrl + '?' + requestQuery;
 
             const id = (name || baseUrl).toUpperCase().replace(/[: ]/g, '_');
-            if (requestConfig.hasJsonFormat) {
-              const layer = new GeoJSONLayer({
-                url: requestUrl,
-                id: id,
-                title: title || name,
-              });
-              layer.LayerId = id;
-              layer.ViewService = baseUrl;
-              layer.name = name;
-              return layer;
-            }
-
-            const xmlResponse = await esriRequest(requestUrl, {
+            const response = await esriRequest(requestUrl, {
               responseType: 'text',
             });
-            if (this.hasExceptionResponse(xmlResponse.data)) {
-              const exceptionMessage = this.resolveExceptionMessage(
-                xmlResponse.data,
-              );
-              throw new Error(exceptionMessage || 'WFS request failed');
-            }
-            const xmlData = this.processXmlData(xmlResponse.data);
-            const featureCollection = this.resolveFeatureCollection(xmlData);
+            const featureCollection = this.resolveResponseData(response.data);
             if (
               featureCollection &&
               featureCollection.memberCount > 0 &&
@@ -3031,7 +3087,7 @@ class MenuWidget extends React.Component {
                 'Selected WFS feature type has no geometry and cannot be displayed on map',
               );
             }
-            if (!featureCollection || !featureCollection.features?.length) {
+            if (!this.hasResultData(featureCollection)) {
               throw new Error('No WFS features were returned for this layer');
             }
             const blobData = new Blob([JSON.stringify(featureCollection)], {

package/src/components/MapViewer/UploadWidget.jsx

@@ -4,6 +4,7 @@ import { loadModules } from 'esri-loader';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
 var WMSLayer, WMTSLayer, WFSLayer, esriRequest;
+const SHAPEFILE_MAX_SIZE_BYTES = 2097152;
 
 class UploadWidget extends React.Component {
   /**
@@ -193,18 +194,39 @@ class UploadWidget extends React.Component {
     if (!file) {
       return;
     }
-    const name = (file.name || '').toLowerCase();
-    const ext = name.split('.').pop();
-    if (ext !== 'zip') {
-      this.setState({ showInfoPopup: true, infoPopupType: 'fileUploadError' });
+    this.processInputPayload(file);
+    e.target.value = null;
+  }
+
+  resolveInputError(filePayload) {
+    const inputName = ((filePayload && filePayload.name) || '').toLowerCase();
+    const inputExtension = inputName.split('.').pop();
+    if (inputExtension !== 'zip') {
+      return 'fileUploadError';
+    }
+    const inputSize = (filePayload && filePayload.size) || 0;
+    if (inputSize > SHAPEFILE_MAX_SIZE_BYTES) {
+      return 'shapefileLimit';
+    }
+    return null;
+  }
+
+  processInputPayload(filePayload) {
+    const inputError = this.resolveInputError(filePayload);
+    if (inputError) {
+      this.setState({
+        showInfoPopup: true,
+        infoPopupType: inputError,
+        selectedFile: null,
+        globalDragActive: false,
+      });
       if (typeof this.uploadFileErrorHandler === 'function') {
-        this.uploadFileErrorHandler();
+        this.uploadFileErrorHandler(inputError);
       }
-      e.target.value = null;
-      return;
+      return false;
     }
-    this.setState({ selectedFile: file, globalDragActive: false });
-    e.target.value = null;
+    this.setState({ selectedFile: filePayload, globalDragActive: false });
+    return true;
   }
 
   getNormalizedUrlForType = (serviceUrl, serviceType) => {
@@ -259,14 +281,13 @@ class UploadWidget extends React.Component {
       ) {
         return queryService;
       }
-      const encodedUrl = (
-        (parsedUrl.hostname || '') + (parsedUrl.pathname || '')
-      ).toLowerCase();
-      const serviceMatch = encodedUrl.match(
-        /(^|[^a-z])(wmts|wms|wfs)([^a-z]|$)/i,
+      const pathName = (parsedUrl.pathname || '').toLowerCase();
+      const pathSegments = pathName.split('/').filter(Boolean);
+      const serviceMatch = pathSegments.find((segment) =>
+        /^(wmts|wms|wfs)$/i.test(segment),
       );
-      if (serviceMatch && serviceMatch[2]) {
-        return serviceMatch[2].toUpperCase();
+      if (serviceMatch) {
+        return serviceMatch.toUpperCase();
       }
       return null;
     } catch (e) {
@@ -1095,25 +1116,28 @@ class UploadWidget extends React.Component {
     const file =
       e.dataTransfer && e.dataTransfer.files && e.dataTransfer.files[0];
     if (!file) return;
-    const name = (file.name || '').toLowerCase();
-    const ext = name.split('.').pop();
-    if (ext !== 'zip') {
+    this.processInputPayload(file);
+  }
+
+  handleAddClick() {
+    const file = this.state.selectedFile;
+    if (!file) return;
+    const inputError = this.resolveInputError(file);
+    if (inputError) {
       this.setState({
         showInfoPopup: true,
-        infoPopupType: 'fileUploadError',
+        infoPopupType: inputError,
         selectedFile: null,
+        globalDragActive: false,
       });
       if (typeof this.uploadFileErrorHandler === 'function') {
-        this.uploadFileErrorHandler();
+        this.uploadFileErrorHandler(inputError);
+      }
+      if (this.fileInput && this.fileInput.current) {
+        this.fileInput.current.value = null;
       }
       return;
     }
-    this.setState({ selectedFile: file, globalDragActive: false });
-  }
-
-  handleAddClick() {
-    const file = this.state.selectedFile;
-    if (!file) return;
     try {
       this.uploadUrlServiceHandler(file, 'FILE');
     } catch (err) {