@eeacms/volto-arcgis-block 0.1.473 → 0.1.475

package/CHANGELOG.md

@@ -4,10 +4,22 @@ 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.475](https://github.com/eea/volto-arcgis-block/compare/0.1.474...0.1.475) - 19 August 2026
+
+#### :hammer_and_wrench: Others
+
+- CLMS-303602 (bug): Family checkbox solved, checked layers saved when coming from catalogue [Urkorue - [`55af373`](https://github.com/eea/volto-arcgis-block/commit/55af3739469bbb8a738f32d15d975e06b4631cad)]
+### [0.1.474](https://github.com/eea/volto-arcgis-block/compare/0.1.473...0.1.474) - 17 August 2026
+
+#### :hammer_and_wrench: Others
+
+- (chore): fix linting [Unai Bolivar - [`4c46f70`](https://github.com/eea/volto-arcgis-block/commit/4c46f701128b5068f921b34e98564cbb2471610f)]
+- (chore): fix linting [Unai Bolivar - [`3d938ad`](https://github.com/eea/volto-arcgis-block/commit/3d938add367c4f22b178748722b4f5bff4b500e1)]
 ### [0.1.473](https://github.com/eea/volto-arcgis-block/compare/0.1.472...0.1.473) - 17 August 2026
 
 #### :hammer_and_wrench: Others
 
+- Merge pull request #1202 from eea/develop [Unai Bolivar - [`7a77993`](https://github.com/eea/volto-arcgis-block/commit/7a77993e4249100ed44eb1e47ee655fc56563f4a)]
 - Merge pull request #1201 from eea/CLMS-304632-RESTORE-GROUP-FUNCTION [Unai Bolivar - [`1e1e81d`](https://github.com/eea/volto-arcgis-block/commit/1e1e81d9fe93653cfa7902923fd8a94ee453b90e)]
 - (bug): group layer toc menu fix for rechecking these datasets [Unai Bolivar - [`6c2a8e9`](https://github.com/eea/volto-arcgis-block/commit/6c2a8e9e9cc46187eb127108816329685bca83a7)]
 ### [0.1.472](https://github.com/eea/volto-arcgis-block/compare/0.1.471...0.1.472) - 14 August 2026

package/package.json

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

package/src/components/MapViewer/MenuWidget.jsx

@@ -1260,6 +1260,7 @@ class MenuWidget extends React.Component {
     }
 
     this.layers[layer.LayerId + '_' + inheritedIndexLayer] = new GroupLayer({
+      id: layer.LayerId + '_' + inheritedIndexLayer,
       title: baseLayerTitle,
       visibilityMode: 'independent',
       layers: dualResolutionLayers,
@@ -1934,7 +1935,7 @@ class MenuWidget extends React.Component {
                   key={'h' + familyId}
                   defcheck={familyDatasetDef}
                   onChange={(e) =>
-                    this.toggleFamily(e.target.checked, checkFamily, e)
+                    this.toggleFamily(e.target.checked, checkFamily, e.target)
                   }
                 ></input>
                 <label
@@ -5129,11 +5130,18 @@ class MenuWidget extends React.Component {
       ) {
         mapLayersToRemove.push(currentLayerData);
       }
-      const currentLayerService = String(
-        currentLayerData?.ViewService || currentLayerData?.url || '',
-      ).toLowerCase();
-      const currentLayerActive = currentLayerData?.activeLayer?.id || null;
-      const currentLayerDataset = currentLayerData?.DatasetId || null;
+      const shouldMatchServiceData = currentLayerData?.type === 'wmts';
+      const currentLayerService = shouldMatchServiceData
+        ? String(
+            currentLayerData?.ViewService || currentLayerData?.url || '',
+          ).toLowerCase()
+        : '';
+      const currentLayerActive = shouldMatchServiceData
+        ? currentLayerData?.activeLayer?.id || null
+        : null;
+      const currentLayerDataset = shouldMatchServiceData
+        ? currentLayerData?.DatasetId || null
+        : null;
       const mapLayerItems = this.map?.layers?.items || [];
       mapLayerItems.forEach((candidateLayer) => {
         if (!candidateLayer) {
@@ -5150,6 +5158,9 @@ class MenuWidget extends React.Component {
           mapLayersToRemove.push(candidateLayer);
           return;
         }
+        if (!shouldMatchServiceData) {
+          return;
+        }
         const candidateService = String(
           candidateLayer.ViewService || candidateLayer.url || '',
         ).toLowerCase();
@@ -8124,7 +8135,7 @@ class MenuWidget extends React.Component {
         }
       } catch (e) {}
     }
-    if (layers && !this.props.download && Array.isArray(expandedDropdowns)) {
+    if (layers && !this.props.download) {
       for (var i = layers.length - 1; i >= 0; i--) {
         let layer = layers[i];
         let node = document.getElementById(layer);
@@ -8146,43 +8157,45 @@ class MenuWidget extends React.Component {
               delete node.dataset.preserveCheckedLayerState;
             }
           }
-          let dropdown = node.closest('.map-menu-dropdown');
-          if (dropdown) {
-            let button = dropdown.querySelector('.ccl-expandable__button');
-            if (button && expandedDropdowns.includes(button.id)) {
-              button.setAttribute('aria-expanded', 'true');
-            }
-          }
-          let productDropdown = node.closest('.map-menu-product-dropdown');
-          if (productDropdown) {
-            let familyDropdown = node.closest('.map-menu-family-dropdown');
-            if (familyDropdown) {
-              let button = familyDropdown.querySelector(
-                '.ccl-expandable__button',
-              );
+          if (Array.isArray(expandedDropdowns)) {
+            let dropdown = node.closest('.map-menu-dropdown');
+            if (dropdown) {
+              let button = dropdown.querySelector('.ccl-expandable__button');
               if (button && expandedDropdowns.includes(button.id)) {
                 button.setAttribute('aria-expanded', 'true');
               }
             }
-            let datasetDropdown = node.closest('.map-menu-product-dropdown');
-            if (datasetDropdown) {
-              let button = datasetDropdown.querySelector(
-                '.ccl-expandable__button',
-              );
-              if (button && expandedDropdowns.includes(button.id)) {
-                button.setAttribute('aria-expanded', 'true');
+            let productDropdown = node.closest('.map-menu-product-dropdown');
+            if (productDropdown) {
+              let familyDropdown = node.closest('.map-menu-family-dropdown');
+              if (familyDropdown) {
+                let button = familyDropdown.querySelector(
+                  '.ccl-expandable__button',
+                );
+                if (button && expandedDropdowns.includes(button.id)) {
+                  button.setAttribute('aria-expanded', 'true');
+                }
+              }
+              let datasetDropdown = node.closest('.map-menu-product-dropdown');
+              if (datasetDropdown) {
+                let button = datasetDropdown.querySelector(
+                  '.ccl-expandable__button',
+                );
+                if (button && expandedDropdowns.includes(button.id)) {
+                  button.setAttribute('aria-expanded', 'true');
+                }
               }
             }
-          }
-          // set scroll position
-          dropdown = node.closest('.map-menu-dropdown');
-          productDropdown = node.closest('.map-menu-product-dropdown');
-          let scrollPosition = productDropdown
-            ? productDropdown.offsetTop
-            : dropdown.offsetTop;
-          let panelsElem = document.querySelector('.panels');
-          if (panelsElem) {
-            panelsElem.scrollTop = scrollPosition;
+            // set scroll position
+            dropdown = node.closest('.map-menu-dropdown');
+            productDropdown = node.closest('.map-menu-product-dropdown');
+            let scrollPosition = productDropdown
+              ? productDropdown.offsetTop
+              : dropdown.offsetTop;
+            let panelsElem = document.querySelector('.panels');
+            if (panelsElem) {
+              panelsElem.scrollTop = scrollPosition;
+            }
           }
         }
       }