@eeacms/volto-arcgis-block 0.1.61 → 0.1.63

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.63](https://github.com/eea/volto-arcgis-block/compare/0.1.62...0.1.63) - 20 September 2022
+
+#### :hammer_and_wrench: Others
+
+- CLMS-1367 [joewdavies - [`270a653`](https://github.com/eea/volto-arcgis-block/commit/270a65300bc0e6bd1c2d5b9e1ada6afc93c5cc61)]
+- CLMS-1368 [joewdavies - [`277813b`](https://github.com/eea/volto-arcgis-block/commit/277813b2ffbb079d6d762d7be48f2fca3c7f8b5a)]
+### [0.1.62](https://github.com/eea/volto-arcgis-block/compare/0.1.61...0.1.62) - 19 September 2022
+
+#### :hammer_and_wrench: Others
+
+- ESlint fix [joewdavies - [`d76b3f6`](https://github.com/eea/volto-arcgis-block/commit/d76b3f68a1f8b251209cf256e7351e690923b2ad)]
+- CLMS-1240 set opacity and visibility independently for sublayers [joewdavies - [`d2dc842`](https://github.com/eea/volto-arcgis-block/commit/d2dc84240351f618aea63d3e0daeea44c5d0660f)]
 ### [0.1.61](https://github.com/eea/volto-arcgis-block/compare/0.1.60...0.1.61) - 19 September 2022
 
 #### :hammer_and_wrench: Others
@@ -117,10 +129,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)]
@@ -180,6 +195,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
@@ -199,6 +215,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
 
@@ -293,6 +310,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
@@ -537,6 +555,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.61",
+  "version": "0.1.63",
   "description": "volto-arcgis-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: CodeSyntax",

package/src/components/MapViewer/AreaWidget.jsx

@@ -287,8 +287,11 @@ class AreaWidget extends React.Component {
             <div className="right-panel-content">
               <div className="area-panel">
                 <div className="area-header">
-                  Chose one of the above area selection modes from the list and
-                  select the desired area on the map to download the dataset
+                  For areas of interest in the EU, EFTA, candidate countries or
+                  the United Kingdom: choose NUTS classification or draw a
+                  rectangle on the map. For areas of interest outside the EU,
+                  EFTA, candidate countries and the United Kingdom: draw a
+                  rectangle on the map.
                 </div>
                 <div className="ccl-form">
                   <fieldset className="ccl-fieldset">
@@ -372,8 +375,10 @@ class AreaWidget extends React.Component {
                       >
                         <span>By rectangle</span>
                         <div>
-                          (Mantain the left button of the mouse clicked and draw
-                          a rectangle in the map)
+                          (Click and drag your mouse on the map. As you move
+                          your mouse, you’ll see the area of the rectangle next
+                          to your cursor. Finish the rectangle by releasing your
+                          mouse.)
                         </div>
                       </label>
                     </div>

package/src/components/MapViewer/MapViewer.jsx

@@ -94,6 +94,8 @@ class MapViewer extends React.Component {
       basemap: 'topo',
     });
 
+    mapStatus = this.recoverState();
+
     if (
       mapStatus === null ||
       (mapStatus.zoom === null && mapStatus.center === null) ||
@@ -104,8 +106,6 @@ class MapViewer extends React.Component {
       mapStatus.center = this.mapCfg.center;
       this.setCenterState(this.mapCfg.center);
       this.setZoomState(this.mapCfg.zoom);
-    } else {
-      mapStatus = this.recoverState();
     }
 
     this.view = new MapView({

package/src/components/MapViewer/MenuWidget.jsx

@@ -479,6 +479,8 @@ class MenuWidget extends React.Component {
     this.expandDropdowns();
     this.loadLayers();
     this.loadOpacity();
+
+    this.loadVisibility();
   }
 
   checkUrl() {
@@ -1622,23 +1624,23 @@ class MenuWidget extends React.Component {
   setOpacity() {
     let layer = document.querySelector('.opacity-slider input').dataset.layer;
     let value = document.querySelector('.opacity-panel input').value;
-    let group = this.getGroup(document.getElementById(layer));
-    let groupLayers = this.getGroupLayers(group);
-    if (group && groupLayers.length > 1) {
-      groupLayers.forEach((item) => {
-        this.layers[item].opacity = value / 100;
-        this.saveOpacity(item, value / 100);
-        document.querySelector(
-          '.active-layer[layer-id="' + item + '"] .active-layer-opacity',
-        ).dataset.opacity = value;
-      });
-    } else {
-      this.layers[layer].opacity = value / 100;
-      this.saveOpacity(layer, value / 100);
-      document.querySelector(
-        '.active-layer[layer-id="' + layer + '"] .active-layer-opacity',
-      ).dataset.opacity = value;
-    }
+    // let group = this.getGroup(document.getElementById(layer));
+    // let groupLayers = this.getGroupLayers(group);
+    // if (group && groupLayers.length > 1) {
+    //   groupLayers.forEach((item) => {
+    //     this.layers[item].opacity = value / 100;
+    //     this.saveOpacity(item, value / 100);
+    //     document.querySelector(
+    //       '.active-layer[layer-id="' + item + '"] .active-layer-opacity',
+    //     ).dataset.opacity = value;
+    //   });
+    // } else {
+    this.layers[layer].opacity = value / 100;
+    this.saveOpacity(layer, value / 100);
+    document.querySelector(
+      '.active-layer[layer-id="' + layer + '"] .active-layer-opacity',
+    ).dataset.opacity = value;
+    // }
   }
 
   /**
@@ -1699,44 +1701,61 @@ class MenuWidget extends React.Component {
    * @param {*} id id from elem
    */
   eyeLayer(elem) {
-    let group = this.getGroup(elem);
-    let groupLayers = this.getGroupLayers(group);
     if (this.visibleLayers[elem.id][1] === 'eye') {
-      if (group && groupLayers.length > 1) {
-        groupLayers.forEach((item) => {
-          this.layers[item].visible = false;
-          this.visibleLayers[item] = ['fas', 'eye-slash'];
-        });
-      } else {
-        this.layers[elem.id].visible = false;
-        this.visibleLayers[elem.id] = ['fas', 'eye-slash'];
-      }
-    } else {
-      if (group && groupLayers.length > 1) {
-        groupLayers.forEach((item) => {
-          this.map.add(this.layers[item]);
-          this.layers[item].visible = true;
-          this.visibleLayers[item] = ['fas', 'eye'];
-        });
-      } else {
-        this.map.add(this.layers[elem.id]);
-        this.layers[elem.id].visible = true;
-        this.visibleLayers[elem.id] = ['fas', 'eye'];
-      }
-    }
-    if (group && groupLayers.length > 1) {
-      groupLayers.forEach((item) => {
-        elem = document.getElementById(item);
-        this.activeLayersJSON[item] = this.addActiveLayer(elem, 0);
-      });
+      this.layers[elem.id].visible = false;
+      this.visibleLayers[elem.id] = ['fas', 'eye-slash'];
     } else {
-      this.activeLayersJSON[elem.id] = this.addActiveLayer(elem, 0);
+      this.map.add(this.layers[elem.id]);
+      this.layers[elem.id].visible = true;
+      this.visibleLayers[elem.id] = ['fas', 'eye'];
     }
+
+    this.saveVisibility();
+
+    this.activeLayersJSON[elem.id] = this.addActiveLayer(elem, 0);
     this.layersReorder();
     this.checkInfoWidget();
     this.setState({});
   }
 
+  /**
+   * Saves the layer visibility (eye icon state) to sessionStorage
+   */
+  saveVisibility() {
+    if (this.props.download) return;
+    sessionStorage.setItem('visibleLayers', JSON.stringify(this.visibleLayers));
+  }
+
+  /**
+   * Loads the layer visibility (eye icon state) from sessionStorage
+   */
+  loadVisibility() {
+    if (this.props.download) return;
+    let vl = JSON.parse(sessionStorage.getItem('visibleLayers'));
+    if (vl) {
+      this.visibleLayers = vl;
+
+      for (const key in this.visibleLayers) {
+        if (this.visibleLayers[key][1] === 'eye') {
+          this.layers[key].visible = true;
+        } else {
+          this.layers[key].visible = false;
+        }
+
+        let elem = document.getElementById(key);
+        if (this.activeLayersJSON[elem.id]) {
+          this.activeLayersJSON[elem.id] = this.addActiveLayer(elem, 0);
+        }
+
+        //this.layersReorder();
+        //this.checkInfoWidget();
+      }
+
+      // update DOM
+      this.setState({});
+    }
+  }
+
   /**
    * Method to delete layer from "Active Layers" and uncheck dataset and products
    * @param {*} e From the click event
@@ -1797,12 +1816,14 @@ class MenuWidget extends React.Component {
    */
   deleteLayer(layer) {
     let checkedLayers = JSON.parse(sessionStorage.getItem('checkedLayers'));
-    for (var i = 0; i < checkedLayers.length; i++) {
-      if (checkedLayers[i] === layer) {
-        checkedLayers.splice(i, 1);
+    if (checkedLayers) {
+      for (var i = 0; i < checkedLayers.length; i++) {
+        if (checkedLayers[i] === layer) {
+          checkedLayers.splice(i, 1);
+        }
       }
+      sessionStorage.setItem('checkedLayers', JSON.stringify(checkedLayers));
     }
-    sessionStorage.setItem('checkedLayers', JSON.stringify(checkedLayers));
   }
 
   /**