@eeacms/volto-arcgis-block 0.1.115 → 0.1.117

package/CHANGELOG.md

@@ -4,6 +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.117](https://github.com/eea/volto-arcgis-block/compare/0.1.116...0.1.117) - 21 March 2023
+
+#### :hammer_and_wrench: Others
+
+- CLMS-1634 (fix): final details to make sure legend and watch functions works on general and custom mapviewers without errors [ujbolivar - [`2470714`](https://github.com/eea/volto-arcgis-block/commit/2470714f39a272c79a30625c546948ce772395fa)]
+### [0.1.116](https://github.com/eea/volto-arcgis-block/compare/0.1.115...0.1.116) - 21 March 2023
+
+#### :hammer_and_wrench: Others
+
+- CLMS-1634 (fix): Ran linting scripts [ujbolivar - [`87a909c`](https://github.com/eea/volto-arcgis-block/commit/87a909cf4d1fa77b0abe6d818de9bddb199a9e63)]
+- CLMS-1634 (bug): fixed the watch zoom for legend function from breaking the map. [ujbolivar - [`a14cf06`](https://github.com/eea/volto-arcgis-block/commit/a14cf06543735b20b85f4ba27c18f75521aa47e4)]
 ### [0.1.115](https://github.com/eea/volto-arcgis-block/compare/0.1.114...0.1.115) - 20 March 2023
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/MapViewer/HotspotWidget.jsx

@@ -38,6 +38,7 @@ class HotspotWidget extends React.Component {
     this.layerModelInit = this.layerModelInit.bind(this);
     this.handleApplyFilter = this.handleApplyFilter.bind(this);
     //this.getLayerParameters();
+    this.selectedArea = null;
   }
 
   loader() {
@@ -207,7 +208,7 @@ class HotspotWidget extends React.Component {
 
   openMenu() {
     if (this.state.showMapMenu) {
-      this.getKLCNames(this.dataJSONNames, this.dataJSONNames[0].node.klc_name);
+      this.getKLCNames(this.dataJSONNames, this.selectedArea);
       this.props.mapViewer.setActiveWidget();
       this.container.current.querySelector('.right-panel').style.display =
         'none';
@@ -223,10 +224,7 @@ class HotspotWidget extends React.Component {
     } else {
       this.getLayerParameters();
       if (this.getLayerParameters.length !== 0)
-        this.getKLCNames(
-          this.dataJSONNames,
-          this.dataJSONNames[0].node.klc_name,
-        );
+        this.getKLCNames(this.dataJSONNames, this.selectedArea);
       this.props.mapViewer.setActiveWidget(this);
       this.container.current.querySelector('.right-panel').style.display =
         'flex';
@@ -253,7 +251,10 @@ class HotspotWidget extends React.Component {
       })
       .then((data) => {
         this.dataJSONNames = data.nodes;
-        this.getKLCNames(data.nodes, data.nodes[0].node.klc_name);
+        if (this.selectedArea == null) {
+          this.selectedArea = data.nodes[0].node.klc_name;
+        }
+        this.getKLCNames(data.nodes, this.selectedArea);
       })
       .catch(function (error) {
         /* console.log('error while getting data'); */
@@ -326,6 +327,7 @@ class HotspotWidget extends React.Component {
     var selectBoxLcTime;
     var selectBoxHighlightsLcc;
     var selectBoxLccTime;
+    this.selectedArea = selectedOption;
 
     selectBox = document.getElementById('select-klc-area');
     selectBoxHighlightsLcc = document.getElementById(
@@ -334,7 +336,6 @@ class HotspotWidget extends React.Component {
     selectBoxLccTime = document.getElementById('select-klc-lccTime');
     selectBoxHighlightsLc = document.getElementById('select-klc-highlights-lc');
     selectBoxLcTime = document.getElementById('select-klc-lcTime');
-
     for (let i = 0; i < data.length; i++) {
       var option = data[i].node.klc_name;
       if (option === selectedOption) {

package/src/components/MapViewer/MenuWidget.jsx

@@ -332,20 +332,43 @@ class MenuWidget extends React.Component {
 
     // add zoomend listener to map to show/hide zoom in message
     this.view.watch('stationary', (isStationary) => {
+      let dropDownActive = sessionStorage.getItem('expandedDropdowns');
+      let node;
       if (isStationary) {
-        let node = document.getElementById('snow-and-ice-zoom-message');
-        let nodes = document.querySelectorAll('.zoom-in-message-dataset');
         let zoom = this.view.get('zoom');
-        if (node !== null) {
-          node.style.display = zoom > 6 ? 'none' : 'block';
+        if (this.props.download) {
+          node = document.querySelector('.zoom-in-message-dataset');
+          if (node && node !== null) {
+            node.style.display = zoom > 6 ? 'none' : 'block';
+          }
         }
-        if (nodes !== null) {
-          nodes.forEach((node) => {
-            let isChecked = node.parentElement.offsetParent.offsetParent.querySelector(
-              'input',
-            ).checked;
-            if (isChecked) node.style.display = zoom > 6 ? 'none' : 'block';
-          });
+        if (!this.props.download && dropDownActive) {
+          if (dropDownActive.includes('dropdown_2')) {
+            node = document.getElementById('snow-and-ice-zoom-message');
+            if (node && node !== null) {
+              node.style.display = zoom > 6 ? 'none' : 'block';
+            }
+          }
+          if (dropDownActive.includes('dropdown_2_0')) {
+            let checks = document
+              .getElementById('dropdown_2_0')
+              .nextSibling.querySelectorAll('[parentid="map_product_2_0"]');
+            let checksList = Array.prototype.slice.call(checks);
+            if (checksList && checksList !== null) {
+              checksList.forEach((check) => {
+                if (check !== null) {
+                  if (check.checked) {
+                    let node = Array.prototype.slice.call(
+                      check.nextSibling.getElementsByClassName(
+                        'zoom-in-message-dataset',
+                      ),
+                    )[0];
+                    node.style.display = zoom > 6 ? 'none' : 'block';
+                  }
+                }
+              });
+            }
+          }
         }
       }
     });