@eeacms/volto-arcgis-block 0.1.349 → 0.1.352

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.352](https://github.com/eea/volto-arcgis-block/compare/0.1.351...0.1.352) - 11 April 2025
+
+#### :hammer_and_wrench: Others
+
+- CLMS-285178 (bug): Swipe widget loads if coming from dataset catalogue and also auto updates without having to close and open widget manually. [Unai Bolivar - [`2d18dc2`](https://github.com/eea/volto-arcgis-block/commit/2d18dc28cdba2a1056894c70a0ebb06f8bf30c41)]
+### [0.1.351](https://github.com/eea/volto-arcgis-block/compare/0.1.350...0.1.351) - 11 April 2025
+
+### [0.1.350](https://github.com/eea/volto-arcgis-block/compare/0.1.349...0.1.350) - 11 April 2025
+
+#### :hammer_and_wrench: Others
+
+- CLMS-286418 (bug): saved user services correctly load opacity level on slider [Unai Bolivar - [`b2276c6`](https://github.com/eea/volto-arcgis-block/commit/b2276c640a050067bbfc0edcffff4bec719e3b89)]
 ### [0.1.349](https://github.com/eea/volto-arcgis-block/compare/0.1.348...0.1.349) - 7 April 2025
 
 ### [0.1.348](https://github.com/eea/volto-arcgis-block/compare/0.1.347...0.1.348) - 3 April 2025

package/package.json

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

package/src/components/MapViewer/MenuWidget.jsx

@@ -926,9 +926,15 @@ class MenuWidget extends React.Component {
     this.openMenu();
     this.loadComponentFilters();
     this.expandDropdowns();
+    // Add "My Services" component to the UI
+    const myServicesComponent = this.createMyServicesComponent();
+    const myServicesContainer = document.createElement('div');
+    ReactDOM.render(myServicesComponent, myServicesContainer);
+    this.container.current.appendChild(myServicesContainer.firstChild);
+    this.loadUserServicesFromStorage();
     this.loadLayers();
-    this.loadOpacity();
-    this.loadVisibility();
+    // this.loadOpacity();
+    // this.loadVisibility();
     this.handleRasterVectorLegend();
     this.map.when(() => {
       this.map.layers.on('change', () => {
@@ -998,13 +1004,6 @@ class MenuWidget extends React.Component {
         this.props.bookmarkHandler(bookmarkData);
       });
     });
-
-    // Add "My Services" component to the UI
-    const myServicesComponent = this.createMyServicesComponent();
-    const myServicesContainer = document.createElement('div');
-    ReactDOM.render(myServicesComponent, myServicesContainer);
-    this.container.current.appendChild(myServicesContainer.firstChild);
-    this.loadUserServicesFromStorage();
   }
 
   setSliderTag(val) {
@@ -1962,10 +1961,46 @@ class MenuWidget extends React.Component {
     }
   }
 
+  createMyServicesComponent() {
+    let dropdowns = document.querySelectorAll('.map-menu-dropdown');
+    let i = dropdowns.length === 0 ? 0 : dropdowns.length - 1;
+    let componentId = `component_${i}`;
+    let dropdownId = `dropdown_${i}`;
+
+    // Create "My Services" component from the start and set its display to none
+    let myServicesStyle =
+      this.state.wmsUserServiceLayers.length > 0 ? {} : { display: 'none' };
+    return (
+      <div
+        className="map-menu-dropdown"
+        id={componentId}
+        key="a5"
+        style={myServicesStyle}
+      >
+        <div
+          id={dropdownId}
+          className="ccl-expandable__button"
+          aria-expanded="false"
+          onClick={this.toggleDropdownContent.bind(this)}
+          onKeyDown={this.toggleDropdownContent.bind(this)}
+          tabIndex="0"
+          role="button"
+        >
+          <div className="dropdown-icon">
+            <FontAwesomeIcon icon={['fas', 'caret-right']} />
+          </div>
+          {<span>{'My Service'}</span>}
+        </div>
+        <div className="map-menu-components-container" id="map-menu-services" />
+      </div>
+    );
+  }
+
   async handleNewMapServiceLayer(viewService) {
     // First, properly normalize the URL for comparison
     const normalizedViewService = viewService.trim();
 
+    // Check if the layer already exists in this.layers before adding
     if (
       this.state.wmsUserServiceLayers.some(
         (layer) =>
@@ -2063,41 +2098,6 @@ class MenuWidget extends React.Component {
     }
   }
 
-  createMyServicesComponent() {
-    let dropdowns = document.querySelectorAll('.map-menu-dropdown');
-    let i = dropdowns.length === 0 ? 0 : dropdowns.length - 1;
-    let componentId = `component_${i}`;
-    let dropdownId = `dropdown_${i}`;
-
-    // Create "My Services" component from the start and set its display to none
-    let myServicesStyle =
-      this.state.wmsUserServiceLayers.length > 0 ? {} : { display: 'none' };
-    return (
-      <div
-        className="map-menu-dropdown"
-        id={componentId}
-        key="a5"
-        style={myServicesStyle}
-      >
-        <div
-          id={dropdownId}
-          className="ccl-expandable__button"
-          aria-expanded="false"
-          onClick={this.toggleDropdownContent.bind(this)}
-          onKeyDown={this.toggleDropdownContent.bind(this)}
-          tabIndex="0"
-          role="button"
-        >
-          <div className="dropdown-icon">
-            <FontAwesomeIcon icon={['fas', 'caret-right']} />
-          </div>
-          {<span>{'My Service'}</span>}
-        </div>
-        <div className="map-menu-components-container" id="map-menu-services" />
-      </div>
-    );
-  }
-
   createUserServices(serviceLayers) {
     const fieldset = document.getElementById('map-menu-services');
     if (!fieldset) return;
@@ -2273,17 +2273,18 @@ class MenuWidget extends React.Component {
           // Update state with recreated layers
           this.setState({ wmsUserServiceLayers: validLayers });
           // Get checked layers from session storage
-          const checkedLayers =
-            JSON.parse(sessionStorage.getItem('checkedLayers')) || [];
+          // const checkedLayers =
+          // JSON.parse(sessionStorage.getItem('checkedLayers')) || [];
 
           // For each valid layer that was previously checked, make it visible
           validLayers.forEach((layer) => {
-            if (checkedLayers.includes(layer.LayerId)) {
-              const node = document.getElementById(layer.LayerId);
-              if (node) {
-                node.checked = true;
-                this.toggleLayer(node);
-              }
+            // if (checkedLayers.includes(layer.LayerId)) {
+            const node = document.getElementById(layer.LayerId);
+            if (node) {
+              layer.visible === true
+                ? (node.checked = true)
+                : (node.checked = false);
+              this.toggleLayer(node);
             }
           });
         }
@@ -2516,7 +2517,6 @@ class MenuWidget extends React.Component {
 
     let group = this.getGroup(elem);
     if (elem.checked) {
-      //this.props.loadingHandler(true);
       if (
         this.props.download ||
         this.location.search.includes('product=') ||
@@ -4039,6 +4039,22 @@ class MenuWidget extends React.Component {
       layerOpacities[layer] = value;
       sessionStorage.setItem('layerOpacities', JSON.stringify(layerOpacities));
     }
+    let savedServices = JSON.parse(
+      localStorage.getItem(USER_SERVICES_KEY + '_' + this.userID),
+    );
+    if (savedServices === null) {
+      return;
+    } else {
+      for (const service of Object.values(savedServices)) {
+        if (service.LayerId === layer) {
+          service.opacity = value;
+        }
+        localStorage.setItem(
+          USER_SERVICES_KEY + '_' + this.userID,
+          JSON.stringify(savedServices),
+        );
+      }
+    }
   }
 
   /**
@@ -4047,7 +4063,32 @@ class MenuWidget extends React.Component {
    * @param {*} value The opacity value retrieved from the input
    */
   loadOpacity() {
-    let layerOpacities = JSON.parse(sessionStorage.getItem('layerOpacities'));
+    let layerOpacities =
+      JSON.parse(sessionStorage.getItem('layerOpacities')) || {};
+    const savedUserServices = JSON.parse(
+      localStorage.getItem(USER_SERVICES_KEY + '_' + this.userID),
+    );
+    if (savedUserServices) {
+      Object.values(savedUserServices).forEach((service) => {
+        let layer = service.LayerId;
+        let value = service.opacity;
+        // Check if the layer is already in layerOpacities
+        if (layerOpacities[layer] === undefined) {
+          //add to layerOpacties
+          layerOpacities[layer] = value;
+          // if (this.layers[service]) {
+          //   // set map
+          //   this.layers[service].opacity = value;
+          //   // set slider
+          //   let nodeValue = `.active-layer[layer-id="${layer}"] .active-layer-opacity`;
+          //   let node = document.querySelector(nodeValue);
+          //   if (node) {
+          //     node.dataset.opacity = value * 100;
+          //   }
+          // }
+        }
+      });
+    }
     if (layerOpacities) {
       for (const layer in layerOpacities) {
         if (this.layers[layer]) {
@@ -4245,6 +4286,8 @@ class MenuWidget extends React.Component {
       });
     }
     this.setLegendOpacity();
+    this.loadOpacity();
+    this.loadVisibility();
   }
 
   /**
@@ -4260,11 +4303,38 @@ class MenuWidget extends React.Component {
    */
   loadVisibility() {
     if (this.props.download) return;
+
+    // Load visibility settings from sessionStorage
     let vl = JSON.parse(sessionStorage.getItem('visibleLayers'));
     if (vl) {
       this.visibleLayers = vl;
+    } else {
+      this.visibleLayers = {};
+    }
+
+    // Load visibility settings from saved user services in localStorage
+    const savedUserServices = JSON.parse(
+      localStorage.getItem(USER_SERVICES_KEY + '_' + this.userID),
+    );
+
+    if (savedUserServices) {
+      Object.values(savedUserServices).forEach((service) => {
+        let layerId = service.LayerId;
+        let visibility = service.visibility;
+        // Only add visibility from localStorage if not already in sessionStorage
+        if (this.visibleLayers[layerId] === undefined) {
+          if (visibility) {
+            this.visibleLayers[layerId] = ['fas', 'eye'];
+          } else {
+            this.visibleLayers[layerId] = ['fas', 'eye-slash'];
+          }
+        }
+      });
+    }
 
-      for (const key in this.visibleLayers) {
+    // Apply visibility settings to layers
+    for (const key in this.visibleLayers) {
+      if (this.layers[key]) {
         if (this.visibleLayers[key][1] === 'eye') {
           this.layers[key].visible = true;
         } else {
@@ -4272,10 +4342,10 @@ class MenuWidget extends React.Component {
         }
 
         let elem = document.getElementById(key);
-        if (this.activeLayersJSON[elem.id]) {
-          let order = this.activeLayersJSON[elem.id].props['layer-order'];
+        if (elem && this.activeLayersJSON[key]) {
+          let order = this.activeLayersJSON[key].props['layer-order'];
           // add active layer to DOM
-          this.activeLayersJSON[elem.id] = this.addActiveLayer(elem, order);
+          this.activeLayersJSON[key] = this.addActiveLayer(elem, order);
           // reorder layers
           this.layersReorder();
           // show/hide info widget

package/src/components/MapViewer/SwipeWidget.jsx

@@ -73,6 +73,7 @@ class SwipeWidget extends React.Component {
       // and ensure that the component is rendered again
       this.loadOptions();
       this.map.layers.on('change', () => {
+        this.loadOptions();
         if (this.hasSwipe) {
           this.map.layers.removeAll();
           if (this.swipe.leadingLayers && this.swipe.leadingLayers.items[0]) {
@@ -82,7 +83,6 @@ class SwipeWidget extends React.Component {
             this.map.layers.add(this.swipe.trailingLayers.items[0]);
           }
         }
-        this.loadOptions();
       });
       this.setState({ showMapMenu: true });
     }
@@ -136,7 +136,31 @@ class SwipeWidget extends React.Component {
       selectTrailingLayer.options[0].disabled = true;
     }
     let cl = JSON.parse(sessionStorage.getItem('checkedLayers'));
-    if (cl) {
+    if (
+      (!cl || cl.length === 0) &&
+      this.map &&
+      this.map.layers &&
+      this.map.layers.items.length > 0
+    ) {
+      cl = [];
+      // Find the layer ID in this.layers that corresponds to each map.layers item
+      for (const mapLayer of this.map.layers.items) {
+        for (const [layerKey, layerObj] of Object.entries(this.layers)) {
+          if (layerObj.id === mapLayer.id) {
+            cl.push(layerKey);
+            break;
+          }
+        }
+      }
+
+      // Save the newly created checkedLayers to sessionStorage
+      if (cl.length > 0) {
+        sessionStorage.setItem('checkedLayers', JSON.stringify(cl));
+      }
+    }
+
+    // Process the layers
+    if (cl && cl.length > 0) {
       cl.forEach((layer) => {
         if (this.layers[layer]) {
           let layerId = this.layers[layer].id;