@eeacms/volto-arcgis-block 0.1.359 → 0.1.361

package/CHANGELOG.md

@@ -4,6 +4,13 @@ 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.361](https://github.com/eea/volto-arcgis-block/compare/0.1.360...0.1.361) - 20 May 2025
+
+### [0.1.360](https://github.com/eea/volto-arcgis-block/compare/0.1.359...0.1.360) - 19 May 2025
+
+#### :hammer_and_wrench: Others
+
+- CLMS-287785 (bug): all bookmark data updated on order shift [Unai Bolivar - [`ebc49f7`](https://github.com/eea/volto-arcgis-block/commit/ebc49f73a4bae9bd29d0ee1c4706b0e1ce42c5c8)]
 ### [0.1.359](https://github.com/eea/volto-arcgis-block/compare/0.1.358...0.1.359) - 16 May 2025
 
 ### [0.1.358](https://github.com/eea/volto-arcgis-block/compare/0.1.357...0.1.358) - 14 May 2025

package/package.json

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

package/src/components/MapViewer/BookmarkWidget.jsx

@@ -27,6 +27,7 @@ class BookmarkWidget extends React.Component {
     this.menuClass =
       'esri-icon-bookmark esri-widget--button esri-widget esri-interactive';
     this.sessionBookmarks = [];
+    this.sessionBookmarkIndexLinkUid = [];
     this.sessionBookmarkLayers = [];
     this.sessionBookmarkOpacity = [];
     this.sessionBookmarkVisible = [];
@@ -200,6 +201,7 @@ class BookmarkWidget extends React.Component {
               }
             });
             this.sessionBookmarks.push(e.added[0]);
+            this.sessionBookmarkIndexLinkUid.push(e.added[0].uid);
             this.sessionBookmarkLayers.push(check);
             this.sessionBookmarkOpacity.push(opacity);
             this.sessionBookmarkVisible.push(visible);
@@ -237,55 +239,92 @@ class BookmarkWidget extends React.Component {
                 this.sessionBookmarkLayers.splice(index, 1);
                 this.sessionBookmarkOpacity.splice(index, 1);
                 this.sessionBookmarkVisible.splice(index, 1);
-                this.sessionBookmarkHotspot.splice(index, 1);
+                if (
+                  this.sessionBookmarkHotspot &&
+                  Array.isArray(this.sessionBookmarkHotspot)
+                ) {
+                  this.sessionBookmarkHotspot.splice(index, 1);
+                }
                 shouldUpdate = true;
                 break;
               }
             }
-          } else {
-            let newSessionBookmark = [];
+          } else if (e.moved) {
+            let newSessionBookmarks = [];
+            let newSessionBookmarkIndexLinkUid = [];
             let newSessionBookmarkLayers = [];
             let newSessionBookmarkOpacity = [];
             let newSessionBookmarkVisible = [];
             let newSessionBookmarkHotspot = [];
-            for (let i = 0; i < this.Bookmarks.bookmarks.items.length; i++) {
-              for (let j = 0; j < this.sessionBookmarks.length; j++) {
-                if (
-                  this.Bookmarks.bookmarks.items[i] === this.sessionBookmarks[j]
-                ) {
-                  newSessionBookmark.push(this.sessionBookmarks[j]);
-                  newSessionBookmarkLayers.push(this.sessionBookmarkLayers[j]);
-                  newSessionBookmarkOpacity.push(
-                    this.sessionBookmarkOpacity[j],
-                  );
-                  newSessionBookmarkVisible.push(
-                    this.sessionBookmarkVisible[j],
-                  );
-                  newSessionBookmarkHotspot.push(
-                    this.sessionBookmarkHotspot[j],
-                  );
-                }
-              }
-            }
-            if (
-              newSessionBookmark.length !== this.sessionBookmarks.length ||
-              newSessionBookmarkLayers.length !==
-                this.sessionBookmarkLayers.length ||
-              newSessionBookmarkOpacity.length !==
-                this.sessionBookmarkOpacity.length ||
-              newSessionBookmarkVisible.length !==
-                this.sessionBookmarkVisible.length ||
-              newSessionBookmarkHotspot.length !==
-                this.sessionBookmarkHotspot.length
-            ) {
-              this.sessionBookmarks = newSessionBookmark;
-              this.sessionBookmarkLayers = newSessionBookmarkLayers;
-              this.sessionBookmarkOpacity = newSessionBookmarkOpacity;
-              this.sessionBookmarkVisible = newSessionBookmarkVisible;
-              this.sessionBookmarkHotspot = newSessionBookmarkHotspot;
-              shouldUpdate = true;
-            }
+            e.moved.forEach((bookmark) => {
+              let index = this.sessionBookmarkIndexLinkUid.indexOf(
+                bookmark.uid,
+              );
+              newSessionBookmarks.push(bookmark);
+              newSessionBookmarkIndexLinkUid.push(bookmark.uid);
+              newSessionBookmarkLayers.push(this.sessionBookmarkLayers[index]);
+              newSessionBookmarkOpacity.push(
+                this.sessionBookmarkOpacity[index],
+              );
+              newSessionBookmarkVisible.push(
+                this.sessionBookmarkVisible[index],
+              );
+              newSessionBookmarkHotspot.push(
+                this.sessionBookmarkHotspot[index],
+              );
+            });
+            this.sessionBookmarks = newSessionBookmarks;
+            this.sessionBookmarkIndexLinkUid = newSessionBookmarkIndexLinkUid;
+            this.sessionBookmarkLayers = newSessionBookmarkLayers;
+            this.sessionBookmarkOpacity = newSessionBookmarkOpacity;
+            this.sessionBookmarkVisible = newSessionBookmarkVisible;
+            this.sessionBookmarkHotspot = newSessionBookmarkHotspot;
+            shouldUpdate = true;
           }
+          // } else {
+          // let newSessionBookmark = [];
+          // let newSessionBookmarkLayers = [];
+          // let newSessionBookmarkOpacity = [];
+          // let newSessionBookmarkVisible = [];
+          // let newSessionBookmarkHotspot = [];
+          // for (let i = 0; i < this.Bookmarks.bookmarks.items.length; i++) {
+          // for (let j = 0; j < this.sessionBookmarks.length; j++) {
+          // if (
+          // this.Bookmarks.bookmarks.items[i] === this.sessionBookmarks[j]
+          // ) {
+          // newSessionBookmark.push(this.sessionBookmarks[j]);
+          // newSessionBookmarkLayers.push(this.sessionBookmarkLayers[j]);
+          // newSessionBookmarkOpacity.push(
+          // this.sessionBookmarkOpacity[j],
+          // );
+          // newSessionBookmarkVisible.push(
+          // this.sessionBookmarkVisible[j],
+          // );
+          // newSessionBookmarkHotspot.push(
+          // this.sessionBookmarkHotspot[j],
+          // );
+          // }
+          // }
+          // }
+          // }
+          // if (
+          // newSessionBookmark.length !== this.sessionBookmarks.length ||
+          // newSessionBookmarkLayers.length !==
+          // this.sessionBookmarkLayers.length ||
+          // newSessionBookmarkOpacity.length !==
+          // this.sessionBookmarkOpacity.length ||
+          // newSessionBookmarkVisible.length !==
+          // this.sessionBookmarkVisible.length ||
+          // newSessionBookmarkHotspot.length !==
+          // this.sessionBookmarkHotspot.length
+          // ) {
+          // this.sessionBookmarks = newSessionBookmark;
+          // this.sessionBookmarkLayers = newSessionBookmarkLayers;
+          // this.sessionBookmarkOpacity = newSessionBookmarkOpacity;
+          // this.sessionBookmarkVisible = newSessionBookmarkVisible;
+          // this.sessionBookmarkHotspot = newSessionBookmarkHotspot;
+          // shouldUpdate = true;
+          // }
           if (shouldUpdate && this.userID != null) {
             localStorage.setItem(
               BOOKMARK_SESSION_KEY + '_' + this.userID,
@@ -431,6 +470,13 @@ class BookmarkWidget extends React.Component {
               );
             }
           }
+          if (
+            !Array.isArray(selectLayers) ||
+            !Array.isArray(selectOpacity) ||
+            !Array.isArray(selectVisible)
+          ) {
+            return;
+          }
           let layerOpacities = {};
           const layerKeys = {
             lcc_filter: 'all_lcc',

package/src/components/MapViewer/MapViewer.jsx

@@ -336,7 +336,9 @@ class MapViewer extends React.Component {
           this.location.search.includes('dataset=')))
     ) {
       let toc_panel_scrolls = sessionStorage.getItem('toc_panel_scrolls');
-      sessionStorage.clear();
+      if (!sessionStorage.getItem('TMSLayerObj')) {
+        sessionStorage.clear();
+      }
       sessionStorage.setItem('toc_panel_scrolls', toc_panel_scrolls);
     }
     // if (

package/src/components/MapViewer/MenuWidget.jsx

@@ -4505,8 +4505,7 @@ class MenuWidget extends React.Component {
     let dataset = url.searchParams.get('dataset');
     if (
       this.state.wmsUserServiceLayers.length > 0 &&
-      prevState.wmsUserServiceLayers.length === 0 &&
-      !(product || dataset)
+      prevState.wmsUserServiceLayers.length === 0
     ) {
       // Close other tabs and open "My Services" tab
       let dropdownsMapMenu = document.querySelectorAll('.map-menu-dropdown');
@@ -4515,13 +4514,16 @@ class MenuWidget extends React.Component {
       let dropdownId = 'dropdown_' + i;
       // let myServicesId = 'component_' + i;
       // let mapMenuServiceDropdownId = 'product_' + i + '_' + j;
-      dropdownsMapMenu.forEach((dropdown) => {
-        if (dropdown.id !== dropdownId) {
-          dropdown
-            .querySelector('.ccl-expandable__button')
-            .setAttribute('aria-expanded', 'false');
-        }
-      });
+      if (!(product || dataset)) {
+        dropdownsMapMenu.forEach((dropdown) => {
+          if (dropdown.id !== dropdownId) {
+            dropdown
+              .querySelector('.ccl-expandable__button')
+              .setAttribute('aria-expanded', 'false');
+          }
+        });
+      }
+
       document.getElementById(dropdownId).setAttribute('aria-expanded', 'true');
     }