@eeacms/volto-arcgis-block 0.1.329 → 0.1.331

package/CHANGELOG.md

@@ -4,10 +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.331](https://github.com/eea/volto-arcgis-block/compare/0.1.330...0.1.331) - 17 January 2025
+
+### [0.1.330](https://github.com/eea/volto-arcgis-block/compare/0.1.329...0.1.330) - 16 January 2025
+
 ### [0.1.329](https://github.com/eea/volto-arcgis-block/compare/0.1.328...0.1.329) - 14 January 2025
 
 #### :hammer_and_wrench: Others
 
+- Merge pull request #881 from eea/develop [Unai Bolivar - [`c2bef1e`](https://github.com/eea/volto-arcgis-block/commit/c2bef1e50a2c6a1058ce542b888dca0118f4d61b)]
 - CLMS-270893 (bug): Fixed scroll positioning of checked dataset in dataviewer when coming from dataset catalogue result [Unai Bolivar - [`8a2cf7f`](https://github.com/eea/volto-arcgis-block/commit/8a2cf7f3184b81c653d3ba420921d481bc5619fa)]
 ### [0.1.328](https://github.com/eea/volto-arcgis-block/compare/0.1.327...0.1.328) - 9 January 2025
 

package/package.json

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

package/src/components/MapViewer/MenuWidget.jsx

@@ -4221,93 +4221,91 @@ class MenuWidget extends React.Component {
     // if (document.getElementById('select-family')) {
     //   familyFilter = document.getElementById('select-family').text;
     // }
+    let checkedLayers = JSON.parse(sessionStorage.getItem('checkedLayers'));
     for (let index = 0; index < this.compCfg.length; index++) {
       let componentFound = false;
-      if (
-        this.compCfg[index].ComponentPosition.toString() === componentFilter ||
-        componentFilter === 'default'
-      ) {
-        for (let j = 0; j < this.compCfg[index].Products.length; j++) {
-          const product = this.compCfg[index].Products[j];
-          let productFound = false;
+      let componentChecked = false;
+      let componentElem = document.querySelector('#component_' + index);
+      for (let j = 0; j < this.compCfg[index].Products.length; j++) {
+        const product = this.compCfg[index].Products[j];
+        let productFound = false;
+        let productChecked = false;
+        let productElem = document.querySelector(
+          '[productid="' + product.ProductId + '"]',
+        );
+        for (let k = 0; k < product.Datasets.length; k++) {
+          const dataset = product.Datasets[k];
+          let datasetChecked = false;
+          let datasetElem = document.querySelector(
+            '[datasetid="' + dataset.DatasetId + '"]',
+          );
+          for (let l = 0; l < checkedLayers?.length; l++) {
+            if (
+              dataset.DatasetTitle ===
+              this.layers[checkedLayers[l]].DatasetTitle
+            ) {
+              componentChecked = true;
+              productChecked = true;
+              datasetChecked = true;
+            }
+          }
           if (
-            product.ProductId === productFilter ||
+            searchText === '' &&
+            componentFilter === 'default' &&
             productFilter === 'default'
           ) {
-            for (let k = 0; k < product.Datasets.length; k++) {
-              const dataset = product.Datasets[k];
-
-              if (
-                searchText === '' &&
-                componentFilter === 'default' &&
-                productFilter === 'default'
-              ) {
-                componentFound = true;
-                productFound = true;
-                result = true;
-                let componentElem = document.querySelector(
-                  '#component_' + index,
-                );
-                componentElem
-                  .querySelector('.ccl-expandable__button')
-                  .setAttribute('aria-expanded', 'false');
-
-                let productElem = document.querySelector(
-                  '[productid="' + product.ProductId + '"]',
-                );
-                productElem
-                  .querySelector('.ccl-expandable__button')
-                  .setAttribute('aria-expanded', 'false');
-                let datasetElem = document.querySelector(
-                  '[datasetid="' + dataset.DatasetId + '"]',
-                );
-                datasetElem.removeAttribute('style');
-                productElem.removeAttribute('style');
-                componentElem.removeAttribute('style');
-              } else if (
-                dataset?.DatasetTitle?.toUpperCase().includes(searchText)
-              ) {
-                componentFound = true;
-                productFound = true;
-                result = true;
-                let componentElem = document.querySelector(
-                  '#component_' + index,
-                );
-                componentElem
-                  .querySelector('.ccl-expandable__button')
-                  .setAttribute('aria-expanded', 'true');
-
-                let productElem = document.querySelector(
-                  '[productid="' + product.ProductId + '"]',
-                );
-                productElem
-                  .querySelector('.ccl-expandable__button')
-                  .setAttribute('aria-expanded', 'true');
-                let datasetElem = document.querySelector(
-                  '[datasetid="' + dataset.DatasetId + '"]',
-                );
-                datasetElem.removeAttribute('style');
-                productElem.removeAttribute('style');
-                componentElem.removeAttribute('style');
-              } else {
-                let datasetElem = document.querySelector(
-                  '[datasetid="' + dataset.DatasetId + '"]',
-                );
-                datasetElem.setAttribute('style', 'display: none;');
-              }
-            }
-          }
-          if (!productFound) {
-            let productElem = document.querySelector(
-              '[productid="' + product.ProductId + '"]',
-            );
-            productElem.setAttribute('style', 'display: none;');
+            componentFound = true;
+            productFound = true;
+            result = true;
+            componentElem
+              .querySelector('.ccl-expandable__button')
+              .setAttribute('aria-expanded', 'false');
+            productElem
+              .querySelector('.ccl-expandable__button')
+              .setAttribute('aria-expanded', 'false');
+            datasetElem.removeAttribute('style');
+            productElem.removeAttribute('style');
+            componentElem.removeAttribute('style');
+          } else if (
+            datasetChecked ||
+            (dataset?.DatasetTitle?.toUpperCase().includes(searchText) &&
+              (product.ProductId === productFilter ||
+                productFilter === 'default') &&
+              (this.compCfg[index].ComponentPosition.toString() ===
+                componentFilter ||
+                componentFilter === 'default'))
+          ) {
+            componentFound = true;
+            productFound = true;
+            result = true;
+            componentElem
+              .querySelector('.ccl-expandable__button')
+              .setAttribute('aria-expanded', 'true');
+            productElem
+              .querySelector('.ccl-expandable__button')
+              .setAttribute('aria-expanded', 'true');
+            datasetElem.removeAttribute('style');
+            productElem.removeAttribute('style');
+            componentElem.removeAttribute('style');
+          } else {
+            datasetElem.setAttribute('style', 'display: none;');
           }
         }
-        this.compCfg[index].Products.forEach((product) => {});
+        if (productChecked) {
+          productElem
+            .querySelector('.ccl-expandable__button')
+            .setAttribute('aria-expanded', 'true');
+        }
+        if (!productFound && !productChecked) {
+          productElem.setAttribute('style', 'display: none;');
+        }
+      }
+      if (componentChecked) {
+        componentElem
+          .querySelector('.ccl-expandable__button')
+          .setAttribute('aria-expanded', 'true');
       }
-      if (!componentFound) {
-        let componentElem = document.querySelector('#component_' + index);
+      if (!componentFound && !componentChecked) {
         componentElem.setAttribute('style', 'display: none;');
       }
     }