@eeacms/volto-arcgis-block 0.1.268 → 0.1.269

package/CHANGELOG.md

@@ -4,6 +4,12 @@ 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.269](https://github.com/eea/volto-arcgis-block/compare/0.1.268...0.1.269) - 21 March 2024
+
+#### :hammer_and_wrench: Others
+
+- CLMS-2383-3050 (bug): commented unused var [Unai Bolivar - [`a8e696b`](https://github.com/eea/volto-arcgis-block/commit/a8e696bdf0252c3a8401c822e1b2bf56246dafba)]
+- CLMS-2383-3050 (bug): implemented file upload form cache cleaning, disabled geojson process, centered NUTS icon [Unai Bolivar - [`84c5677`](https://github.com/eea/volto-arcgis-block/commit/84c5677ef8af6568151ae2a9ce1dd0eaff966466)]
 ### [0.1.268](https://github.com/eea/volto-arcgis-block/compare/0.1.267...0.1.268) - 21 March 2024
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/MapViewer/AreaWidget.jsx

@@ -265,14 +265,17 @@ class AreaWidget extends React.Component {
     //console.log('uploaded file from form: ', file);
 
     //List allowed file extensions
-    let fileExtensions = ['zip', 'geojson'];
+
+    //let fileExtensions = ['zip', 'geojson'];
 
     // Get the file extension
     let fileExtension = fileName.split('.').pop();
 
     //console.log('file extension: ', fileExtension);
     //Check if the file format is not supported
-    if (fileExtensions.indexOf(fileExtension) === -1) {
+
+    // if (fileExtensions.indexOf(fileExtension) === -1) {
+    if (fileExtension !== 'zip') {
       this.setState({
         showInfoPopup: true,
         infoPopupType: 'fileFormat',
@@ -282,13 +285,14 @@ class AreaWidget extends React.Component {
 
     // Check if the file is a geojson or CSV and the file size is over the 10mb file size limit
     // or file is a shape file and the file size is over the 2mb file size limit
-    if (fileSize > 10485760 && fileExtension === 'geojson') {
-      this.setState({
-        showInfoPopup: true,
-        infoPopupType: 'fileLimit',
-      });
-      return;
-    }
+
+    //if (fileSize > 10485760 && fileExtension === 'geojson') {
+    //  this.setState({
+    //    showInfoPopup: true,
+    //    infoPopupType: 'fileLimit',
+    //  });
+    //  return;
+    //}
 
     if (fileSize > 2097152 && fileExtension === 'zip') {
       this.setState({
@@ -301,12 +305,11 @@ class AreaWidget extends React.Component {
     switch (fileExtension) {
       case 'zip':
         this.generateFeatureCollection(fileName, file, 'shapefile');
-        //reader.readAsArrayBuffer(file);
-        break;
-      case 'geojson':
-        this.generateFeatureCollection(fileName, file, 'geojson');
-        //reader.readAsText(file);
         break;
+      //case 'geojson':
+      //  this.generateFeatureCollection(fileName, file, 'geojson');
+      //  //reader.readAsText(file);
+      //  break;
       //case 'csv':
       //this.generateFeatureCollection(
       //  fileName,
@@ -318,6 +321,9 @@ class AreaWidget extends React.Component {
       default:
         break;
     }
+    setTimeout(() => {
+      e.target.value = null;
+    }, 2000);
   };
 
   generateFeatureCollection(fileName, file, inputFormat) {
@@ -372,37 +378,6 @@ class AreaWidget extends React.Component {
         //console.error('Failed to generate feature collection:', error);
       });
   }
-
-  loadFileUploadService(data) {
-    //debugger;
-    document.querySelector('.esri-attribution__powered-by').style.display =
-      'flex';
-    const blob = new Blob([data], {
-      type: 'json',
-    });
-    const url = URL.createObjectURL(blob);
-
-    var layer = new FeatureLayer({
-      id: 9,
-      //url: this.props.urls.outsideEu,
-      url: url,
-      layerId: 9,
-      outFields: ['*'],
-      popupEnabled: false,
-      title: 'upload',
-    });
-
-    //this.removeFileUploadedLayer();
-
-    this.removeNutsLayers();
-
-    this.nutsGroupLayer.add(layer);
-
-    let index = this.getHighestIndex();
-
-    this.props.map.reorder(this.nutsGroupLayer, index + 1);
-  }
-
   // add the feature collection to the map and zoom to the feature collection extent
   // if you want to persist the feature collection when you reload browser, you could store the
   // collection in local storage by serializing the layer using featureLayer.toJson()
@@ -473,7 +448,7 @@ class AreaWidget extends React.Component {
     });
     //Check for the correct spatial reference
     //console.log('layer: ', layers);
-    if (this.checkWkid(layers[0]?.spatialReference) === false) return;
+    //if (this.checkWkid(layers[0]?.spatialReference) === false) return;
 
     let geometry = new Extent(
       featureCollection.layers[0].layerDefinition.extent,
@@ -1113,7 +1088,7 @@ class AreaWidget extends React.Component {
                   >
                     <div className="field">
                       <label className="file-upload">
-                        <span>File formats supported: shp(zip), geojson</span>
+                        <span>File formats supported: shp(zip)</span>
                         <input
                           type="file"
                           name="file"

package/src/components/MapViewer/css/ArcgisMap.css

@@ -349,8 +349,14 @@ div.esri-popover
   margin-left: 2rem;
 }
 
+div.area-container .ccl-form .ccl-form-check-input + .ccl-form-radio-label {
+  display: flex;
+  justify-content: space-between;
+  padding-left: 1.75rem;
+}
+
 label.ccl-form-radio-label span.nuts-menu-icon {
-  margin-left: 9rem;
+  max-width: 30px;
 }
 
 .area-container .esri-button {