@eeacms/volto-arcgis-block 0.1.369 → 0.1.371

package/CHANGELOG.md

@@ -4,8 +4,21 @@ 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.371](https://github.com/eea/volto-arcgis-block/compare/0.1.370...0.1.371) - 25 June 2025
+
+#### :hammer_and_wrench: Others
+
+- (bug): Fixed families, and fixed active layer elements for rest map image layers [Unai Bolivar - [`9b0018e`](https://github.com/eea/volto-arcgis-block/commit/9b0018ed0f03d272945ce5f0f2bc4e1f581cf917)]
+### [0.1.370](https://github.com/eea/volto-arcgis-block/compare/0.1.369...0.1.370) - 19 June 2025
+
+#### :hammer_and_wrench: Others
+
+- CLMS-287480 (bug): Implement the regrouping of layers when REST services exist [Unai Bolivar - [`0e9ed21`](https://github.com/eea/volto-arcgis-block/commit/0e9ed218e0fbe691773220afd7cbd4f2a948c33d)]
 ### [0.1.369](https://github.com/eea/volto-arcgis-block/compare/0.1.368...0.1.369) - 18 June 2025
 
+#### :hammer_and_wrench: Others
+
+- Merge pull request #978 from eea/develop [Unai Bolivar - [`32cddf9`](https://github.com/eea/volto-arcgis-block/commit/32cddf9f880a50082094cf73e10316848555d792)]
 ### [0.1.368](https://github.com/eea/volto-arcgis-block/compare/0.1.367...0.1.368) - 17 June 2025
 
 ### [0.1.367](https://github.com/eea/volto-arcgis-block/compare/0.1.366...0.1.367) - 17 June 2025

package/package.json

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

package/src/components/MapViewer/MenuWidget.jsx

@@ -434,6 +434,7 @@ class MenuWidget extends React.Component {
     this.activeLayersToHotspotData = this.activeLayersToHotspotData.bind(this);
     this.getLimitScale = this.getLimitScale.bind(this);
     this.handleOpenPopup = this.handleOpenPopup.bind(this);
+    this.datasetFamilies = {};
     this.filtersApplied = false;
     this.filtersApplied = false;
     // add zoomend listener to map to show/hide zoom in message
@@ -1263,6 +1264,7 @@ class MenuWidget extends React.Component {
     var dataset_def = [];
     var datasets = [];
     var families = [];
+    this.DatasetFamilies = {};
     var index = 0;
     var inheritedIndexProduct = inheritedIndex + '_' + prodIndex;
     var checkProduct = 'map_product_' + inheritedIndexProduct;
@@ -1272,69 +1274,117 @@ class MenuWidget extends React.Component {
         : product.ProductDescription;
 
     if (product.Datasets && Array.isArray(product.Datasets)) {
-      let familiesMap = new Map();
-      familiesMap['noFamily'] = [];
-      for (let index = 0; index < product.Datasets.length; index++) {
-        if (familiesMap[product.Datasets[index].FamilyTitle]) {
-          familiesMap[product.Datasets[index].FamilyTitle].push(
-            product.Datasets[index],
-          );
-        } else if (product.Datasets[index].FamilyTitle) {
-          familiesMap[product.Datasets[index].FamilyTitle] = [
-            product.Datasets[index],
-          ];
+      var familyIndex = 0;
+      var firstChildAdded = false;
+      for (
+        let datasetIndex = 0;
+        datasetIndex < product.Datasets.length;
+        datasetIndex++
+      ) {
+        const dataset = product.Datasets[datasetIndex];
+
+        if (dataset.FamilyTitle) {
+          if (!this.DatasetFamilies[dataset.FamilyTitle]) {
+            this.DatasetFamilies[dataset.FamilyTitle] = [];
+          }
+          this.DatasetFamilies[dataset.FamilyTitle].push(dataset);
         } else {
-          familiesMap['noFamily'].push(product.Datasets[index]);
+          if (this.filtersApplied) {
+            dataset_def = document
+              .querySelector('#' + checkProduct)
+              ?.getAttribute('defcheck');
+          } else if (
+            dataset &&
+            dataset.Default_active === true &&
+            !firstChildAdded
+          ) {
+            var idDataset =
+              'map_dataset_' + inheritedIndexProduct + '_' + index;
+            dataset_def.push(idDataset);
+            firstChildAdded = true;
+          }
+
+          if (dataset) {
+            datasets.push(
+              this.metodProcessDataset(
+                dataset,
+                index,
+                inheritedIndexProduct,
+                checkProduct,
+              ),
+            );
+            index++;
+          }
         }
       }
-      for (var j in familiesMap) {
-        if (j === 'noFamily') {
-          for (var i in familiesMap[j]) {
-            if (this.filtersApplied) {
-              dataset_def = document
-                .querySelector('#' + checkProduct)
-                ?.getAttribute('defcheck');
-            } else if (
-              product.Datasets[i] &&
-              product.Datasets[i].Default_active === true
-            ) {
-              var idDataset =
-                'map_dataset_' + inheritedIndexProduct + '_' + index;
-              dataset_def.push(idDataset);
-            }
 
-            // CLMS-1545
-            // if (!product.Datasets[i].MarkAsDownloadableNoServiceToVisualize) {
-            if (product.Datasets[i]) {
-              datasets.push(
-                this.metodProcessDataset(
-                  product.Datasets[i],
-                  index,
-                  inheritedIndexProduct,
-                  checkProduct,
-                ),
-              );
-              index++;
-            }
-            // }
+      Object.keys(this.DatasetFamilies).forEach((familyTitle) => {
+        var inheritedIndexFamily = inheritedIndexProduct + '_' + familyIndex;
+        var checkFamily = 'map_family_' + inheritedIndexFamily;
+        var familyDatasets = [];
+        var familyDatasetDef = [];
+
+        this.DatasetFamilies[familyTitle].forEach((dataset) => {
+          if (this.filtersApplied) {
+            familyDatasetDef = document
+              .querySelector('#' + checkFamily)
+              ?.getAttribute('defcheck');
+          } else if (dataset && dataset.Default_active === true) {
+            var idDataset = 'map_dataset_' + inheritedIndexFamily + '_' + index;
+            familyDatasetDef.push(idDataset);
           }
-        } else {
-          families.push(
-            this.metodProcessFamily(
-              familiesMap[j],
-              j,
-              inheritedIndexProduct,
-              checkProduct,
+          familyDatasets.push(
+            this.metodProcessDataset(
+              dataset,
+              index,
+              inheritedIndexFamily,
+              checkFamily,
             ),
           );
+          index++;
+        });
+
+        if (familyDatasets.length > 0) {
+          var firstFamilyDatasetId =
+            'map_dataset_' +
+            inheritedIndexFamily +
+            '_' +
+            (index - familyDatasets.length);
+
+          if (!familyDatasetDef.length) {
+            familyDatasetDef.push(firstFamilyDatasetId);
+          }
+
+          if (!firstChildAdded) {
+            dataset_def.push(checkFamily);
+            firstChildAdded = true;
+          }
         }
-      }
+
+        families.push(
+          this.metodProcessFamily(
+            familyTitle,
+            familyDatasets,
+            inheritedIndexFamily,
+            checkFamily,
+            checkProduct,
+            familyDatasetDef,
+          ),
+        );
+
+        familyIndex++;
+      });
     }
 
     // Empty vector, add the first dataset
     if (!dataset_def.length) {
-      var idDatasetB = 'map_dataset_' + inheritedIndexProduct + '_0';
-      dataset_def.push(idDatasetB);
+      if (families.length > 0) {
+        var firstFamilyId = 'map_family_' + inheritedIndexProduct + '_0';
+        dataset_def.push(firstFamilyId);
+      } else {
+        var idDatasetB = 'map_dataset_' + inheritedIndexProduct + '_0';
+        dataset_def.push(idDatasetB);
+      }
     }
     let style = this.props.download ? { display: 'none' } : {};
 
@@ -1411,15 +1461,18 @@ class MenuWidget extends React.Component {
     );
   }
 
-  metodProcessFamily(family, familyTitle, inheritedIndex, checkFamily) {
-    var dataset_def = [];
+  metodProcessFamily(
+    familyTitle,
+    familyDatasets,
+    inheritedIndexFamily,
+    checkFamily,
+    checkProduct,
+    familyDatasetDef,
+  ) {
     var datasets = [];
-    var index = 0;
     var familyId = familyTitle.replace(/\s+/g, '');
-    var inheritedIndexFamily = inheritedIndex + '_' + familyId;
-    checkFamily = 'map_family_' + inheritedIndexFamily;
-    var checkProduct = 'map_product_' + inheritedIndex;
     var familyTitleName = '';
+
     this.tax.tree.forEach((element) => {
       element.children.forEach((element) => {
         if (element.key === familyTitle) {
@@ -1427,27 +1480,16 @@ class MenuWidget extends React.Component {
         }
       });
     });
-    if (family && Array.isArray(family)) {
-      for (var i in family) {
-        if (family[i]) {
-          datasets.push(
-            this.metodProcessDataset(
-              family[i],
-              index,
-              inheritedIndex,
-              checkFamily,
-            ),
-          );
-          index++;
-        }
-      }
-    }
 
-    // Empty vector, add the first dataset
-    if (!dataset_def.length) {
+    familyDatasets.forEach((dataset) => {
+      datasets.push(dataset);
+    });
+
+    if (!familyDatasetDef.length && familyDatasets.length > 0) {
       var idDatasetB = 'map_dataset_' + inheritedIndexFamily + '_0';
-      dataset_def.push(idDatasetB);
+      familyDatasetDef.push(idDatasetB);
     }
+
     let style = this.props.download ? { display: 'none' } : {};
 
     return (
@@ -1482,9 +1524,9 @@ class MenuWidget extends React.Component {
                   value="name"
                   className="ccl-checkbox ccl-required ccl-form-check-input"
                   key={'h' + familyId}
-                  defcheck={dataset_def}
+                  defcheck={familyDatasetDef}
                   onChange={(e) =>
-                    this.toggleProduct(e.target.checked, checkProduct, e)
+                    this.toggleFamily(e.target.checked, checkFamily, e)
                   }
                 ></input>
                 <label
@@ -1493,19 +1535,7 @@ class MenuWidget extends React.Component {
                   key={'f' + familyId}
                 >
                   <legend className="ccl-form-legend">
-                    {
-                      /* {description ? (
-                      <Popup
-                        trigger={<span>{familyTitle}</span>}
-                        content={description}
-                        basic
-                        className="custom"
-                        style={{ transform: 'translateX(-4rem)' }}
-                      />
-                    ) : (*/
-                      <span>{familyTitleName}</span>
-                      /*)} */
-                    }
+                    {<span>{familyTitleName}</span>}
                   </legend>
                 </label>
               </div>
@@ -2267,7 +2297,6 @@ class MenuWidget extends React.Component {
 
         this.saveCheckedLayer(layerId);
 
-        // Update state to include the new layer, which will trigger componentDidUpdate
         this.setState((prevState) => {
           const updatedLayers = [
             ...prevState.wmsUserServiceLayers,
@@ -2862,11 +2891,18 @@ class MenuWidget extends React.Component {
       }
       this.visibleLayers[elem.id] = ['fas', 'eye'];
       this.timeLayers[elem.id] = ['far', 'clock'];
+      let layer = this.layers[elem.id];
+      let isMapServer = layer?.url.toLowerCase().endsWith('mapserver')
+        ? true
+        : false;
       if (group) {
-        elem.title = this.getLayerTitle(this.layers[elem.id]);
+        elem.title =
+          this.layers[elem.id].type === 'map-image'
+            ? this.layers[elem.id].DatasetTitle
+            : this.getLayerTitle(this.layers[elem.id]);
         let groupLayers = this.getGroupLayers(group);
         if (groupLayers.length > 0 && groupLayers[0] in this.activeLayersJSON) {
-          elem.hide = true;
+          elem.hide = isMapServer;
         }
         this.activeLayersJSON[elem.id] = this.addActiveLayer(
           elem,
@@ -3140,7 +3176,18 @@ class MenuWidget extends React.Component {
     if (value) {
       for (let i = 0; i < splitdefCheck.length; i++) {
         selector = document.querySelector(`[id="${splitdefCheck[i]}"]`);
-        layerChecks.push(selector);
+        if (selector) {
+          const layer = this.layers[splitdefCheck[i]];
+          if (
+            layer?.url?.toLowerCase().includes('/rest/') &&
+            layer?.type === 'map-image'
+          ) {
+            layerChecks.push(selector);
+            break;
+          } else {
+            layerChecks.push(selector);
+          }
+        }
       }
     } else {
       layerChecks = document.querySelectorAll(`[parentid=${id}]`);
@@ -3183,6 +3230,29 @@ class MenuWidget extends React.Component {
     });
   }
 
+  toggleFamily(value, id, element) {
+    let familyDefCheck = element.target.getAttribute('defcheck');
+    let splitdefCheck = familyDefCheck.split(',');
+
+    let datasetChecks = [];
+    let selector = [];
+
+    if (value) {
+      for (let i = 0; i < splitdefCheck.length; i++) {
+        selector = document.querySelector(`[id="${splitdefCheck[i]}"]`);
+        datasetChecks.push(selector);
+      }
+    } else {
+      datasetChecks = document.querySelectorAll(`[parentid=${id}]`);
+    }
+
+    datasetChecks.forEach((element) => {
+      if (element) {
+        element.checked = value;
+        this.toggleDataset(value, element.id, element);
+      }
+    });
+  }
   /**
    * Method to toggle dropdown content (datasets and layers)
    * @param {*} e
@@ -3757,7 +3827,7 @@ class MenuWidget extends React.Component {
         layer-id={elem.id}
         layer-order={order}
         draggable="true"
-        // {...(elem.hide && { style: { display: 'none' } })}
+        {...(elem.hide && { style: { display: 'none' } })}
         onDrop={(e) => this.onDrop(e)}
         onDragOver={(e) => this.onDragOver(e)}
         onDragStart={(e) => this.onDragStart(e)}