@eeacms/volto-arcgis-block 0.1.114 → 0.1.116

package/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.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
+
+- CLMS-1920 (lint):Ran linting scripts before push [Urkorue - [`e4f2f03`](https://github.com/eea/volto-arcgis-block/commit/e4f2f03be739a8fa4db5dfcc8f88b28f98a5242b)]
+- CLMS-1920 (bug):filters clean when deselecting layers [uorue - [`860ff61`](https://github.com/eea/volto-arcgis-block/commit/860ff61603f0335a7565bef8d7e87afdb2e068d3)]
 ### [0.1.114](https://github.com/eea/volto-arcgis-block/compare/0.1.113...0.1.114) - 20 March 2023
 
 #### :hammer_and_wrench: Others
@@ -468,10 +480,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Merge pull request #148 from eea/develop [KCarpinteroBM - [`24266fb`](https://github.com/eea/volto-arcgis-block/commit/24266fb3a0c1662d22ae0529dc1d5a25c711cf97)]
+- Revert "[JENKINS] Use eeacms/plone-backend and Volto alpha version- Refs #151967" [Mikel Larreategi - [`f751f69`](https://github.com/eea/volto-arcgis-block/commit/f751f69f652f0340ae55af6a4dab89d6bdc80906)]
 - Revert "Revert "Mapviewer menu and map viewer options persistence"" [Mikel Larreategi - [`ad6e440`](https://github.com/eea/volto-arcgis-block/commit/ad6e440cdc160cffb1e86e1b26e501dbe648476c)]
 - Revert "code coverage removal" [Mikel Larreategi - [`376f2d1`](https://github.com/eea/volto-arcgis-block/commit/376f2d1cd6e4e5110b3b63d5114af1bcfebe094b)]
 - Revert "Update cypress.json" [Mikel Larreategi - [`43d01a0`](https://github.com/eea/volto-arcgis-block/commit/43d01a0a95a58ef5215c6cbf18223ca30a11b9cc)]
 - Revert "Update cypress.json" [Mikel Larreategi - [`054c4ae`](https://github.com/eea/volto-arcgis-block/commit/054c4ae1767e1f26e6ec7e96a0e26a9711f29f04)]
+- Revert "revert [JENKINS] Use eeacms/plone-backend and Volto alpha version- Refs #151967" [Mikel Larreategi - [`64ab56e`](https://github.com/eea/volto-arcgis-block/commit/64ab56e0f1f8dddc26f26039509a028e34653e64)]
+- revert [JENKINS] Use eeacms/plone-backend and Volto alpha version- Refs #151967 [Mikel Larreategi - [`85ee194`](https://github.com/eea/volto-arcgis-block/commit/85ee1941e029df2b7dc910bf75231c75ffeca8c2)]
 - Update cypress.json [KCarpinteroBM - [`be285ff`](https://github.com/eea/volto-arcgis-block/commit/be285fff0c53e06a0180d5318cce81195eabcf80)]
 - Update cypress.json [KCarpinteroBM - [`a7f2118`](https://github.com/eea/volto-arcgis-block/commit/a7f2118acb7b048b4cef85aa9663c2244a1c9ca0)]
 - linting fix [KCarpinteroBM - [`27e969a`](https://github.com/eea/volto-arcgis-block/commit/27e969a7a411fd4646e0e742ce846efc0d79703e)]
@@ -531,6 +546,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - UX improvements [rodriama - [`151dc4b`](https://github.com/eea/volto-arcgis-block/commit/151dc4b02d0a73fdd66de9d594620ac0fa5f1dbf)]
 - deleted failing tests [KCarpinteroBM - [`ddaa9e6`](https://github.com/eea/volto-arcgis-block/commit/ddaa9e6f06db6960a4c214d3be2420c48b26715d)]
 - cleaning unnecessary files [KCarpinteroBM - [`2c02199`](https://github.com/eea/volto-arcgis-block/commit/2c021990912beb02b603a1de89aecd62e0063769)]
+- Reverting to Automated release 0.1.39 [KCarpinteroBM - [`fb9f317`](https://github.com/eea/volto-arcgis-block/commit/fb9f3176ccdea18fceb329eaac13ced0566ee648)]
 - commands added [KCarpinteroBM - [`049e60b`](https://github.com/eea/volto-arcgis-block/commit/049e60b7d124d1c05abd0b2775b510795f4ed59f)]
 - Mapviewer testing implementation [KCarpinteroBM - [`0103002`](https://github.com/eea/volto-arcgis-block/commit/0103002869eea108e16e3b5ff2e77a725dcc7c4b)]
 ### [0.1.39](https://github.com/eea/volto-arcgis-block/compare/0.1.38...0.1.39) - 24 March 2022
@@ -550,6 +566,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - ESLint fix [rodriama - [`75dae9b`](https://github.com/eea/volto-arcgis-block/commit/75dae9b5bba18ab6d9624f6c99714b4bd2179003)]
 - Remove section title [rodriama - [`ece860e`](https://github.com/eea/volto-arcgis-block/commit/ece860eae3519c7e611abac16e8d53c9a9408b34)]
 - Es-Lint [manuelmartinezbilbomatica - [`39d8d11`](https://github.com/eea/volto-arcgis-block/commit/39d8d11b9096fd603df8510c119d2e12817415d6)]
+- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`bf9f683`](https://github.com/eea/volto-arcgis-block/commit/bf9f683dd35a9edb4cfd9111affcb8f8edbeae89)]
 - FEAT: Parser Time implemented [manuelmartinezbilbomatica - [`689c99e`](https://github.com/eea/volto-arcgis-block/commit/689c99e55221fee6c7c7fafc4ab95ae7a646d3dd)]
 ### [0.1.38](https://github.com/eea/volto-arcgis-block/compare/0.1.37...0.1.38) - 18 March 2022
 
@@ -644,6 +661,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - ESLint fix [rodriama - [`5fd3772`](https://github.com/eea/volto-arcgis-block/commit/5fd3772f197a3a380067962a5638dbf901a4624e)]
 - Pixel info [rodriama - [`1ccef39`](https://github.com/eea/volto-arcgis-block/commit/1ccef39a9adcc3ee94655c77a5a166b613600a08)]
 - NUTS bug fix [rodriama - [`37fe7f3`](https://github.com/eea/volto-arcgis-block/commit/37fe7f3fad2c005e3b7c234b3b0564d5df92fa8c)]
+- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`ea5af8b`](https://github.com/eea/volto-arcgis-block/commit/ea5af8b02a5f2ee25b9b0be67cf3792bbbe84ed7)]
 ### [0.1.23](https://github.com/eea/volto-arcgis-block/compare/0.1.22...0.1.23) - 17 December 2021
 
 #### :hammer_and_wrench: Others
@@ -888,6 +906,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Trying to delay ArcGIS modules load [gonzalezsd - [`ff16985`](https://github.com/eea/volto-arcgis-block/commit/ff169858e42d30bfcacc423ffc27762bb9ef05a4)]
 - Run bootstrap to fix files [valentinab25 - [`236893f`](https://github.com/eea/volto-arcgis-block/commit/236893f03314eb638b7667f81b1f91491a98ee17)]
 - fix git_name [valentinab25 - [`c7806c3`](https://github.com/eea/volto-arcgis-block/commit/c7806c312964425dc23e5d4c6973de8b81ddaeac)]
+- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`e3afb51`](https://github.com/eea/volto-arcgis-block/commit/e3afb515dda459ee03e2b5d4b56465d2d4ad1503)]
 - Trying to change imports [gonzalezsd - [`d83d7e2`](https://github.com/eea/volto-arcgis-block/commit/d83d7e2f68da4b2a284735847f93c0763a7e13b6)]
 - default design [bipoza - [`88fbe0b`](https://github.com/eea/volto-arcgis-block/commit/88fbe0b2bc73e732e2993324a567f53902e85506)]
 - cleanup of unused code [bipoza - [`b167677`](https://github.com/eea/volto-arcgis-block/commit/b1676771f637f056cad50cb0bc186f2ea79e8517)]

package/package.json

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

package/src/components/MapViewer/HotspotWidget.jsx

@@ -22,7 +22,9 @@ class HotspotWidget extends React.Component {
       'esri-icon-filter esri-widget--button esri-widget esri-interactive';
     this.dataKlc_code = null;
     this.esriLayer_lcc = null;
+    this.esriLayer_lcc2 = null;
     this.esriLayer_lc = null;
+    this.esriLayer_lc2 = null;
     this.subscribedLayers = sessionStorage;
     this.checkedLayers = this.props.layers
       ? this.props.layers.checkedLayers
@@ -36,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() {
@@ -125,6 +128,10 @@ class HotspotWidget extends React.Component {
             ? 'all_lcc_a_pol'
             : 'all_lcc_b_pol';
         if (this.esriLayer_lcc !== null) {
+          if (this.esriLayer_lcc2 != null) {
+            this.props.map.remove(this.esriLayer_lcc2);
+          }
+
           this.esriLayer_lcc.sublayers.items[0].name = this.addLegendName(
             typeLegend,
           );
@@ -141,6 +148,7 @@ class HotspotWidget extends React.Component {
           this.props.map.add(this.esriLayer_lcc);
           this.props.selectedLayers['lcc_filter'] = this.esriLayer_lcc;
           this.props.selectedLayers['lcc_filter'].visible = true;
+          this.esriLayer_lcc2 = this.esriLayer_lcc;
           this.layerModelInit();
         }
       }
@@ -155,6 +163,9 @@ class HotspotWidget extends React.Component {
           .value.match(/\d+/g)
           .map(Number)[0];
         if (this.esriLayer_lc !== null) {
+          if (this.esriLayer_lc2 != null) {
+            this.props.map.remove(this.esriLayer_lc2);
+          }
           this.esriLayer_lc.sublayers.items[0].name = this.addLegendName(
             typeLegend,
           );
@@ -171,6 +182,7 @@ class HotspotWidget extends React.Component {
           this.props.map.add(this.esriLayer_lc);
           this.props.selectedLayers['lc_filter'] = this.esriLayer_lc;
           this.props.selectedLayers['lc_filter'].visible = true;
+          this.esriLayer_lc2 = this.esriLayer_lc;
           this.layerModelInit();
         }
       }
@@ -196,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';
@@ -212,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';
@@ -242,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'); */
@@ -315,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(
@@ -323,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,34 @@ class MenuWidget extends React.Component {
 
     // add zoomend listener to map to show/hide zoom in message
     this.view.watch('stationary', (isStationary) => {
-      if (isStationary) {
-        let node = document.getElementById('snow-and-ice-zoom-message');
-        let nodes = document.querySelectorAll('.zoom-in-message-dataset');
+      let dropDownActive = sessionStorage.getItem('expandedDropdowns');
+      if (isStationary && dropDownActive) {
         let zoom = this.view.get('zoom');
-        if (node !== null) {
-          node.style.display = zoom > 6 ? 'none' : 'block';
+        if (dropDownActive.includes('dropdown_2')) {
+          let node = document.getElementById('snow-and-ice-zoom-message');
+          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 (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';
+                }
+              }
+            });
+          }
         }
       }
     });
@@ -744,7 +758,7 @@ class MenuWidget extends React.Component {
     });
   }
 
-  /**
+  /**elem
    * Processes the JSON file containing layers info
    * @returns
    */
@@ -1568,7 +1582,7 @@ class MenuWidget extends React.Component {
       sessionStorage.removeItem('downloadButtonClicked');
       sessionStorage.removeItem('timeSliderTag');
       this.deleteCheckedLayer(elem.id);
-      this.deleteFilteredLayer();
+      this.deleteFilteredLayer(elem.id);
       this.layers[elem.id].opacity = 1;
       this.layers[elem.id].visible = false;
       let mapLayer = this.map.findLayerById(elem.id);
@@ -1582,7 +1596,6 @@ class MenuWidget extends React.Component {
     this.toggleHotspotWidget();
     this.layersReorder();
     this.checkInfoWidget();
-
     // toggle custom legend for WMTS and TMS
     if (
       this.layers[elem.id].ViewService.toLowerCase().includes('wmts') ||
@@ -2506,12 +2519,12 @@ class MenuWidget extends React.Component {
     }
   }
 
-  deleteFilteredLayer() {
+  deleteFilteredLayer(layer) {
     let layers = this.layers;
-    if (layers['lcc_filter']) {
+    if (layers['lcc_filter'] && layer.includes('all_lcc')) {
       layers['lcc_filter'].visible = false;
       delete layers['lcc_filter'];
-    } else if (layers['lc_filter']) {
+    } else if (layers['lc_filter'] && layer.includes('all_present_lc')) {
       layers['lc_filter'].visible = false;
       delete layers['lc_filter'];
     }