@eeacms/volto-arcgis-block 0.1.295 → 0.1.297

package/CHANGELOG.md

@@ -4,12 +4,26 @@ 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.297](https://github.com/eea/volto-arcgis-block/compare/0.1.296...0.1.297) - 16 July 2024
+
+#### :hammer_and_wrench: Others
+
+- CLMS-272374 (Feat):Area search by code zoom [Urkorue - [`513bbf0`](https://github.com/eea/volto-arcgis-block/commit/513bbf0290aebabafd9a06e16cfd096fbe9fa6fa)]
+- CLMS-272327 (Feat): Upload file improvements [Urkorue - [`7abfe58`](https://github.com/eea/volto-arcgis-block/commit/7abfe58503fd83b532e5a74c15f3a61370fa1177)]
+### [0.1.296](https://github.com/eea/volto-arcgis-block/compare/0.1.295...0.1.296) - 15 July 2024
+
+#### :hammer_and_wrench: Others
+
+- Merge pull request #805 from eea/develop [Unai Bolivar - [`33ca8ca`](https://github.com/eea/volto-arcgis-block/commit/33ca8ca8f2751181398d91e0bb19826dce8a8dc6)]
+- Update package.json [Urkorue - [`f2367f1`](https://github.com/eea/volto-arcgis-block/commit/f2367f1080939a66d18f2ecce5f28fec0250b961)]
+- Update CHANGELOG.md [Urkorue - [`8bb1b46`](https://github.com/eea/volto-arcgis-block/commit/8bb1b465bf67e2d8aa243f99ab3fadd8975c0b4d)]
+- CLMS-272327 (Feat):Upload file improves [Urkorue - [`fc9104d`](https://github.com/eea/volto-arcgis-block/commit/fc9104d8984d1b8bd86672299a07389ba44294da)]
+- no lazy load rollback 2 [Unai Bolivar - [`5458a0e`](https://github.com/eea/volto-arcgis-block/commit/5458a0ec00966717f5aa5a56d2f215562489a649)]
 ### [0.1.295](https://github.com/eea/volto-arcgis-block/compare/0.1.294...0.1.295) - 12 July 2024
 
 #### :hammer_and_wrench: Others
 
 - Fix prettier [Tiberiu Ichim - [`cf8c30b`](https://github.com/eea/volto-arcgis-block/commit/cf8c30b494fc7c40578dbb6bf2ccc7518b31949f)]
-- Use icon component from fortawesome [Tiberiu Ichim - [`369a64d`](https://github.com/eea/volto-arcgis-block/commit/369a64d0cc977be402885dd9d24400dd11580aa4)]
 ### [0.1.294](https://github.com/eea/volto-arcgis-block/compare/0.1.293...0.1.294) - 11 July 2024
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/MapViewer/AreaWidget.jsx

@@ -153,6 +153,7 @@ class AreaWidget extends React.Component {
         showInfoPopup: false,
         infoPopupType: 'area',
       });
+      this.props.uploadFileHandler(true);
       this.clearWidget();
       this.removeFileUploadedLayer();
       this.container.current.querySelector(
@@ -188,6 +189,7 @@ class AreaWidget extends React.Component {
         showInfoPopup: true,
         infoPopupType: 'area',
       });
+      this.props.uploadFileHandler(true);
       this.container.current.querySelector('input:checked').click();
     }
   }
@@ -220,11 +222,13 @@ class AreaWidget extends React.Component {
         showInfoPopup: true,
         infoPopupType: 'prepackage',
       });
+      this.props.uploadFileHandler(true);
     } else {
       this.setState({
         showInfoPopup: true,
         infoPopupType: 'area',
       });
+      this.props.uploadFileHandler(true);
     }
   }
   nuts0handler(e) {
@@ -305,6 +309,7 @@ class AreaWidget extends React.Component {
   };
 
   handleFileUpload = (e) => {
+    this.removeNutsLayers();
     //Get the file name
 
     const fileName = e.target.value.toLowerCase();
@@ -340,6 +345,7 @@ class AreaWidget extends React.Component {
         showInfoPopup: true,
         infoPopupType: 'fileFormat',
       });
+      this.props.uploadFileHandler(false);
       return;
     }
 
@@ -354,6 +360,7 @@ class AreaWidget extends React.Component {
         showInfoPopup: true,
         infoPopupType: 'fileLimit',
       });
+      this.props.uploadFileHandler(false);
       return;
     }
 
@@ -362,6 +369,7 @@ class AreaWidget extends React.Component {
         showInfoPopup: true,
         infoPopupType: 'shapefileLimit',
       });
+      this.props.uploadFileHandler(false);
       return;
     }
 
@@ -389,6 +397,7 @@ class AreaWidget extends React.Component {
     setTimeout(() => {
       e.target.value = null;
     }, 2000);
+    this.props.uploadFileHandler(this.state.infoPopupType);
   };
 
   generateFeatureCollection(fileName, file, inputFormat) {
@@ -444,6 +453,7 @@ class AreaWidget extends React.Component {
               showInfoPopup: true,
               infoPopupType: 'invalidShapefile',
             });
+            this.props.uploadFileHandler(false);
             return;
           }
 
@@ -464,6 +474,7 @@ class AreaWidget extends React.Component {
             showInfoPopup: true,
             infoPopupType: 'invalidShapefile',
           });
+          this.props.uploadFileHandler(false);
         } else if (
           error &&
           error.details &&
@@ -474,7 +485,9 @@ class AreaWidget extends React.Component {
             showInfoPopup: true,
             infoPopupType: 'incorrectWkid',
           });
+          this.props.uploadFileHandler(false);
         } else {
+          this.props.uploadFileHandler(false);
           // Handle other errors
         }
       });
@@ -534,16 +547,13 @@ class AreaWidget extends React.Component {
         showInfoPopup: true,
         infoPopupType: 'fullDataset',
       });
+      this.props.uploadFileHandler(true);
     } else {
       //Remove old uploaded file and save new one to component props for reference
 
       this.removeFileUploadedLayer();
       this.fileUploadLayer = { layers: layers, sourceGraphics: sourceGraphics };
 
-      //remove NUTS and COUNTRIES layers from map
-
-      this.removeNutsLayers();
-
       //Add uploaded layer to the map and zoom to the extent
 
       this.props.view.graphics.addMany(sourceGraphics);
@@ -579,7 +589,7 @@ class AreaWidget extends React.Component {
         showInfoPopup: true,
         infoPopupType: 'download',
       });
-
+      this.props.uploadFileHandler(true);
       //Save file upload layer to session storage as a tag for adding item to cart action
 
       sessionStorage.setItem(
@@ -597,6 +607,7 @@ class AreaWidget extends React.Component {
         showInfoPopup: true,
         infoPopupType: 'singleFeature',
       });
+      this.props.uploadFileHandler(false);
       return false;
     } else {
       return true;
@@ -657,12 +668,23 @@ class AreaWidget extends React.Component {
 
       //Check if the file extent is larger than the limit
       //If checkExtent() is false, add the layer to the map
-
-      if (this.checkExtent(csvExtent.extent)) {
+      if (
+        csvExtent.extent.width === null ||
+        csvExtent.extent.width === undefined ||
+        csvExtent.extent.height === null ||
+        csvExtent.extent.height === undefined
+      ) {
+        this.setState({
+          showInfoPopup: true,
+          infoPopupType: 'fileFormat',
+        });
+        this.props.uploadFileHandler(false);
+      } else if (this.checkExtent(csvExtent.extent)) {
         this.setState({
           showInfoPopup: true,
           infoPopupType: 'fullDataset',
         });
+        this.props.uploadFileHandler(true);
       } else {
         //Draw a polygon around of the CSVlayer Features data
 
@@ -726,10 +748,6 @@ class AreaWidget extends React.Component {
           sourceGraphics: polygonGraphic,
         };
 
-        //Clean the map before adding the graphic
-
-        this.removeNutsLayers();
-
         //Add the polygon graphic to the map
 
         this.props.view.graphics.add(polygonGraphic);
@@ -759,6 +777,7 @@ class AreaWidget extends React.Component {
           showInfoPopup: true,
           infoPopupType: 'download',
         });
+        this.props.uploadFileHandler(true);
 
         //Save file upload layer to session storage as a tag for adding item to cart action
 
@@ -768,6 +787,11 @@ class AreaWidget extends React.Component {
         );
       }
     } catch (error) {
+      this.setState({
+        showInfoPopup: true,
+        infoPopupType: 'fileFormat',
+      });
+      this.props.uploadFileHandler(false);
       //console.error('Error: ', error);
     }
   }
@@ -784,6 +808,7 @@ class AreaWidget extends React.Component {
         showInfoPopup: true,
         infoPopupType: 'incorrectWkid',
       });
+      this.props.uploadFileHandler(false);
     }
   }
 
@@ -871,11 +896,13 @@ class AreaWidget extends React.Component {
             showInfoPopup: true,
             infoPopupType: 'fullDataset',
           });
+          this.props.uploadFileHandler(true);
         } else {
           this.setState({
             showInfoPopup: true,
             infoPopupType: 'download',
           });
+          this.props.uploadFileHandler(true);
         }
         if (this.props.download) {
           if (extentGraphic && this.checkExtent(extentGraphic.geometry)) {
@@ -915,11 +942,13 @@ class AreaWidget extends React.Component {
             showInfoPopup: true,
             infoPopupType: 'fullDataset',
           });
+          this.props.uploadFileHandler(true);
         } else {
           this.setState({
             showInfoPopup: true,
             infoPopupType: 'download',
           });
+          this.props.uploadFileHandler(true);
         }
         if (this.props.download) {
           if (extentGraphic && this.checkExtent(extentGraphic.geometry)) {
@@ -967,6 +996,7 @@ class AreaWidget extends React.Component {
     this.setState({
       infoPopupType: 'area',
     });
+    this.props.uploadFileHandler(true);
     if (sessionStorage.getItem('fileUploadLayer')) {
       sessionStorage.removeItem('fileUploadLayer');
     }
@@ -1039,6 +1069,8 @@ class AreaWidget extends React.Component {
               showInfoPopup: true,
               infoPopupType: 'download',
             });
+            this.props.uploadFileHandler(true);
+            this.props.view.goTo(feature.geometry);
           }
         });
         if (!found && count === 0) {
@@ -1106,6 +1138,7 @@ class AreaWidget extends React.Component {
                   showInfoPopup: true,
                   infoPopupType: 'download',
                 });
+                this.props.uploadFileHandler(true);
                 if (this.props.download) {
                   document.querySelector(
                     '.drawRectanglePopup-block',
@@ -1575,6 +1608,16 @@ class AreaWidget extends React.Component {
                       </div>
                     </>
                   )}
+                  {this.state.infoPopupType === 'invalidFileFormat' && (
+                    <>
+                      <span className="drawRectanglePopup-icon">
+                        <FontAwesomeIcon icon={['fas', 'info-circle']} />
+                      </span>
+                      <div className="drawRectanglePopup-text">
+                        The file content is not correctly formatted.
+                      </div>
+                    </>
+                  )}
                 </div>
               </div>
             </div>

package/src/components/MapViewer/MapViewer.jsx

@@ -56,6 +56,7 @@ class MapViewer extends React.Component {
     this.state = {
       layerLoading: false,
       layers: {},
+      uploadedFile: true,
     };
     this.activeLayersHandler = this.activeLayersHandler.bind(this);
     this.activeLayersArray = {};
@@ -67,6 +68,7 @@ class MapViewer extends React.Component {
     this.mapLayersHandler = this.mapLayersHandler.bind(this);
     this.bookmarkHandler = this.bookmarkHandler.bind(this);
     this.prepackageHandler = this.prepackageHandler.bind(this);
+    this.uploadFileHandler = this.uploadFileHandler.bind(this);
   }
 
   mapLayersHandler(newLayers) {
@@ -119,6 +121,10 @@ class MapViewer extends React.Component {
     this.setState({ prepackageChecked: prepackage });
   }
 
+  uploadFileHandler(message) {
+    this.setState({ uploadedFile: message });
+  }
+
   loader() {
     return loadModules([
       'esri/WebMap',
@@ -427,6 +433,8 @@ class MapViewer extends React.Component {
           bookmarkHandler={this.bookmarkHandler}
           prepackageChecked={this.state.prepackageChecked}
           prepackageHandler={this.prepackageHandler}
+          uploadedFile={this.state.uploadedFile}
+          uploadFileHandler={this.uploadFileHandler}
         />
       ); //call conf
   }
@@ -499,6 +507,8 @@ export const CheckLogin = ({ reference }) => {
           mapviewer_config={reference.props.mapviewer_config}
           prepackageChecked={reference.state.prepackageChecked}
           prepackageHandler={reference.prepackageHandler}
+          uploadedFile={reference.state.uploadedFile}
+          uploadFileHandler={reference.uploadFileHandler}
         />
       )}
     </>

package/src/components/MapViewer/MenuWidget.jsx

@@ -29,6 +29,7 @@ export const AddCartItem = ({
   dataset,
   handleOpenPopup,
   prepackage,
+  uploadedFile,
 }) => {
   const { addCartItem, isLoggedIn } = useCartState();
 
@@ -187,7 +188,7 @@ export const AddCartItem = ({
             Add to cart
           </button>
         </div>
-      ) : isLoggedIn && !prepackage ? ( // If isLoggedIn == true and user clicks download
+      ) : isLoggedIn && !prepackage && uploadedFile ? ( // If isLoggedIn == true and user clicks download
         <Popup
           trigger={
             <span
@@ -285,6 +286,25 @@ export const AddCartItem = ({
           }
           {...popupSettings}
         />
+      ) : isLoggedIn && !uploadedFile ? (
+        <Popup
+          trigger={
+            <span
+              className={'map-menu-icon map-menu-icon-login'}
+              onKeyDown={(e) => {}}
+              tabIndex="0"
+              role="button"
+            >
+              <FontAwesomeIcon
+                className={' locked'}
+                icon={['fas', 'download']}
+              />
+              <FontAwesomeIcon icon={['fas', 'lock']} />
+            </span>
+          }
+          content={'Uploaded file has an error'}
+          {...popupSettings}
+        />
       ) : (
         // If isLoggedIn == false and user clicks download
         <Popup
@@ -1500,6 +1520,7 @@ class MenuWidget extends React.Component {
                       dataset={dataset}
                       handleOpenPopup={this.handleOpenPopup}
                       prepackage={this.props.prepackageChecked}
+                      uploadedFile={this.props.uploadedFile}
                     />
                   ) : (
                     <span
@@ -4002,6 +4023,7 @@ class MenuWidget extends React.Component {
                     areaData={this.props.area}
                     handleOpenPopup={this.handleOpenPopup}
                     prepackage={this.props.prepackageChecked}
+                    uploadedFile={this.props.uploadedFile}
                   />
                 </div>
               )}