@eeacms/volto-arcgis-block 0.1.97 → 0.1.99

package/CHANGELOG.md

@@ -4,7 +4,15 @@ 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.97](https://github.com/eea/volto-arcgis-block/compare/0.1.96...0.1.97) - 3 February 2023
+### [0.1.99](https://github.com/eea/volto-arcgis-block/compare/0.1.98...0.1.99) - 16 February 2023
+
+#### :hammer_and_wrench: Others
+
+- CLMS-1581 fix: Hotspot widget opens when a hotspot layer is checked and closes when a hotspot layer is unchecked. [ujbolivar - [`7c29869`](https://github.com/eea/volto-arcgis-block/commit/7c298698de9937754f447c3884082d930e676fd0)]
+- CLMS-1581 fix: Filtered layer is taken off map when hotspot layers are unchecked. [ujbolivar - [`0ef5a08`](https://github.com/eea/volto-arcgis-block/commit/0ef5a08ef15335baf32dd93ee2aacfc323eadfb9)]
+### [0.1.98](https://github.com/eea/volto-arcgis-block/compare/0.1.97...0.1.98) - 8 February 2023
+
+### [0.1.97](https://github.com/eea/volto-arcgis-block/compare/0.1.96...0.1.97) - 6 February 2023
 
 ### [0.1.96](https://github.com/eea/volto-arcgis-block/compare/0.1.95...0.1.96) - 3 February 2023
 

package/package.json

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

package/src/components/MapViewer/MapViewer.jsx

@@ -184,6 +184,7 @@ class MapViewer extends React.Component {
     this.closeActiveWidget();
     this.activeWidget = widget;
   }
+
   closeActiveWidget() {
     if (this.activeWidget) {
       this.activeWidget.openMenu();

package/src/components/MapViewer/MenuWidget.jsx

@@ -64,18 +64,18 @@ export const AddCartItem = ({
         let data = checkCartData(cartData, area);
         addCartItem(data).then(() => {
           setMessage('Added to cart');
-          showMessageTimer('Added to cart', 'Success');
+          showMessageTimer('Added to cart', 'success', 'Success');
         });
       } else {
         setMessage('Please select an area');
-        showMessageTimer('Please select an area', 'Warning');
+        showMessageTimer('Please select an area', 'warning', 'Warning');
       }
     } else {
       closeModal(e);
       let data = checkCartData(cartData, area, dataset);
       addCartItem(data).then(() => {
         setMessage('Added to cart');
-        showMessageTimer('Added to cart', 'Success');
+        showMessageTimer('Added to cart', 'success', 'Success');
       });
     }
   };
@@ -118,8 +118,8 @@ export const AddCartItem = ({
     props.updateArea('');
   };
 
-  const showMessageTimer = (msg, type) => {
-    toast[type](<Toast autoClose={4000} title={type} content={msg} />, {
+  const showMessageTimer = (msg, type, title) => {
+    toast[type](<Toast autoClose={4000} title={title} content={msg} />, {
       position: 'top-center',
       autoClose: 4000,
       hideProgressBar: true,
@@ -1468,6 +1468,7 @@ class MenuWidget extends React.Component {
    * Method to show/hide a layer. Update checkboxes from dataset and products
    * @param {*} elem Is the checkbox
    */
+
   toggleLayer(elem) {
     if (!this.visibleLayers) this.visibleLayers = {};
     if (!this.timeLayers) this.timeLayers = {};
@@ -1506,6 +1507,7 @@ class MenuWidget extends React.Component {
       }
     } else {
       this.deleteCheckedLayer(elem.id);
+      this.deleteFilteredLayer();
       this.layers[elem.id].opacity = 1;
       this.layers[elem.id].visible = false;
       let mapLayer = this.map.findLayerById(elem.id);
@@ -1516,6 +1518,7 @@ class MenuWidget extends React.Component {
       delete this.timeLayers[elem.id];
     }
     this.updateCheckDataset(parentId);
+    this.toggleHotspotWidget();
     this.layersReorder();
     this.checkInfoWidget();
 
@@ -1531,6 +1534,22 @@ class MenuWidget extends React.Component {
     //this.activeLayersHandler(this.activeLayersAsArray);
   }
 
+  /**
+   * Hide or show the hotspot widget for a hotspot layer
+   */
+
+  toggleHotspotWidget() {
+    let hotspotButton = document.querySelector('#hotspot_button');
+    let checkedLayers = JSON.parse(sessionStorage.getItem('checkedLayers'));
+    checkedLayers.forEach((key) => {
+      if (
+        key.includes('all_present_lc_a_pol') ||
+        key.includes('all_lcc_a_pol')
+      ) {
+        hotspotButton.click();
+      }
+    });
+  }
   /**
    * Hide or show a legend image in the legend widget for a WMTS or a TMS layer
    *
@@ -2369,6 +2388,17 @@ class MenuWidget extends React.Component {
     }
   }
 
+  deleteFilteredLayer() {
+    let layers = this.layers;
+    if (layers['lcc_filter']) {
+      layers['lcc_filter'].visible = false;
+      delete layers['lcc_filter'];
+    } else if (layers['lc_filter']) {
+      layers['lc_filter'].visible = false;
+      delete layers['lc_filter'];
+    }
+  }
+
   /**
    * Method to load previously expanded dropdowns according to sessionStorage
    */
@@ -2488,9 +2518,10 @@ class MenuWidget extends React.Component {
       if (sessionStorage.checkedLayers.includes('all_lcc_a_pol'))
         document.querySelector('.landCoverChangeContainer').style.display =
           'block';
-      else
+      else {
         document.querySelector('.landCoverChangeContainer').style.display =
           'none';
+      }
     }
   }