@eeacms/volto-arcgis-block 0.1.368 → 0.1.370

package/CHANGELOG.md

@@ -4,6 +4,16 @@ 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.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.368",
+  "version": "0.1.370",
   "description": "volto-arcgis-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: CodeSyntax",

package/src/components/MapViewer/BookmarkWidget.jsx

@@ -27,7 +27,6 @@ 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 = [];
@@ -93,6 +92,72 @@ class BookmarkWidget extends React.Component {
     }
   }
 
+  processReorder(newOrder) {
+    const oldBookmarks = this.sessionBookmarks;
+    const reorderedBookmarks = newOrder.map((uid) => {
+      const index = oldBookmarks.findIndex(
+        (bookmark) => bookmark && bookmark.uid === uid,
+      );
+      return index !== -1 ? oldBookmarks[index] : null;
+    });
+
+    const hasEqualLength =
+      oldBookmarks.length === newOrder.length &&
+      newOrder.length === reorderedBookmarks.length;
+    const hasNullValues = reorderedBookmarks.some((item) => item === null);
+
+    if (hasEqualLength && !hasNullValues) {
+      return reorderedBookmarks;
+    }
+
+    let missingBookmark = null;
+    let missingIndex = -1;
+
+    for (let i = 0; i < oldBookmarks.length; i++) {
+      const oldBookmark = oldBookmarks[i];
+      const newUid = i < newOrder.length ? newOrder[i] : null;
+
+      if (
+        oldBookmark &&
+        newUid &&
+        oldBookmark.uid === newUid &&
+        !reorderedBookmarks.includes(oldBookmark)
+      ) {
+        missingBookmark = oldBookmark;
+        missingIndex = i;
+        break;
+      }
+    }
+
+    if (missingBookmark && missingIndex !== -1) {
+      if (reorderedBookmarks.length !== oldBookmarks.length) {
+        const finalBookmarks = [];
+        let reorderIndex = 0;
+
+        for (let i = 0; i < oldBookmarks.length; i++) {
+          if (i === missingIndex) {
+            finalBookmarks[i] = missingBookmark;
+          } else {
+            finalBookmarks[i] =
+              reorderIndex < reorderedBookmarks.length
+                ? reorderedBookmarks[reorderIndex]
+                : null;
+            reorderIndex++;
+          }
+        }
+        return finalBookmarks;
+      } else if (hasNullValues) {
+        const nullIndex = reorderedBookmarks.findIndex((item) => item === null);
+        if (nullIndex === missingIndex) {
+          reorderedBookmarks[nullIndex] = missingBookmark;
+        }
+        return reorderedBookmarks;
+      }
+    }
+
+    return reorderedBookmarks;
+  }
+
   async componentDidMount() {
     this._isMounted = true;
     await this.loader();
@@ -201,7 +266,6 @@ 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);
@@ -250,35 +314,37 @@ class BookmarkWidget extends React.Component {
               }
             }
           } else if (e.moved) {
-            let newSessionBookmarks = [];
-            let newSessionBookmarkIndexLinkUid = [];
-            let newSessionBookmarkLayers = [];
-            let newSessionBookmarkOpacity = [];
-            let newSessionBookmarkVisible = [];
-            let newSessionBookmarkHotspot = [];
-            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],
+            const newOrder = e.target?.items.map((bookmark) => bookmark.uid);
+            const reorderedBookmarks = this.processReorder(newOrder);
+
+            const reorderedLayers = [];
+            const reorderedOpacity = [];
+            const reorderedVisible = [];
+            const reorderedHotspot = [];
+
+            reorderedBookmarks.forEach((bookmark) => {
+              const originalIndex = this.sessionBookmarks.findIndex(
+                (original) => original && original.uid === bookmark.uid,
               );
+              if (originalIndex !== -1) {
+                reorderedLayers.push(this.sessionBookmarkLayers[originalIndex]);
+                reorderedOpacity.push(
+                  this.sessionBookmarkOpacity[originalIndex],
+                );
+                reorderedVisible.push(
+                  this.sessionBookmarkVisible[originalIndex],
+                );
+                reorderedHotspot.push(
+                  this.sessionBookmarkHotspot[originalIndex],
+                );
+              }
             });
-            this.sessionBookmarks = newSessionBookmarks;
-            this.sessionBookmarkIndexLinkUid = newSessionBookmarkIndexLinkUid;
-            this.sessionBookmarkLayers = newSessionBookmarkLayers;
-            this.sessionBookmarkOpacity = newSessionBookmarkOpacity;
-            this.sessionBookmarkVisible = newSessionBookmarkVisible;
-            this.sessionBookmarkHotspot = newSessionBookmarkHotspot;
+
+            this.sessionBookmarks = reorderedBookmarks;
+            this.sessionBookmarkLayers = reorderedLayers;
+            this.sessionBookmarkOpacity = reorderedOpacity;
+            this.sessionBookmarkVisible = reorderedVisible;
+            this.sessionBookmarkHotspot = reorderedHotspot;
             shouldUpdate = true;
           }
           // } else {

package/src/components/MapViewer/MenuWidget.jsx

@@ -2862,11 +2862,17 @@ 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 = isMapServer
+          ? 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,
@@ -3757,7 +3763,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)}