qwc2 2026.8.9 → 2026.8.14

package/actions/bookmark.js

@@ -8,7 +8,6 @@
 
 import bookmarkReducer from '../reducers/bookmark';
 import ReducerIndex from '../reducers/index';
-import { getBookmarks, getVisibilityPresets } from '../utils/PermaLinkUtils';
 ReducerIndex.register("bookmark", bookmarkReducer);
 export var SET_BOOKMARKS = 'SET_BOOKMARKS';
 export var SET_VISIBILITY_PRESETS = 'SET_VISIBILITY_PRESETS';
@@ -23,18 +22,4 @@ export function setVisibilityPresets(visibilityPresets) {
     type: SET_VISIBILITY_PRESETS,
     visibilityPresets: visibilityPresets
   };
-}
-export function refreshBookmarks() {
-  return function (dispatch) {
-    getBookmarks(function (bookmarks) {
-      return dispatch(setBookmarks(bookmarks));
-    });
-  };
-}
-export function refreshVisibilityPresets() {
-  return function (dispatch) {
-    getVisibilityPresets(function (presets) {
-      return dispatch(setVisibilityPresets(presets));
-    });
-  };
 }

package/actions/localConfig.js

@@ -13,7 +13,6 @@ export var LOCAL_CONFIG_LOADED = 'LOCAL_CONFIG_LOADED';
 export var SET_STARTUP_PARAMETERS = 'SET_STARTUP_PARAMETERS';
 export var SET_COLOR_SCHEME = 'SET_COLOR_SCHEME';
 export var SET_USER_INFO_FIELDS = 'SET_USER_INFO_FIELDS';
-export var SET_PERMALINK_PARAMETERS = 'SET_PERMALINK_PARAMETERS';
 export var REGISTER_CUSTOM_PLUGIN = 'REGISTER_CUSTOM_PLUGIN';
 export var UNREGISTER_CUSTOM_PLUGIN = 'UNREGISTER_CUSTOM_PLUGIN';
 export function localConfigLoaded(config) {
@@ -43,12 +42,6 @@ export function setUserInfoFields(fields) {
     fields: fields
   };
 }
-export function setPermalinkParameters(params) {
-  return {
-    type: SET_PERMALINK_PARAMETERS,
-    params: params
-  };
-}
 export function registerCustomPlugin(name, availableIn3D) {
   return {
     type: REGISTER_CUSTOM_PLUGIN,

package/components/BookmarkPanel.js

@@ -31,15 +31,6 @@ import ConfigUtils from '../utils/ConfigUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MiscUtils from '../utils/MiscUtils';
 import './style/BookmarkPanel.css';
-
-/**
- * Allows managing user bookmarks.
- * or user visibility presets if `visibilityPresetsMode` is true.
- *
- * Bookmarks are only allowed for authenticated users.
- *
- * Requires `permalinkServiceUrl` to point to a `qwc-permalink-service`.
- */
 var BookmarkPanel = /*#__PURE__*/function (_React$Component) {
   function BookmarkPanel() {
     var _this;
@@ -49,193 +40,203 @@ var BookmarkPanel = /*#__PURE__*/function (_React$Component) {
     }
     _this = _callSuper(this, BookmarkPanel, [].concat(args));
     _defineProperty(_this, "state", {
-      renameBookmark: null,
       currentBookmark: null,
+      rename: false,
       busy: false
     });
     _defineProperty(_this, "bookmarkClicked", function (ev, bookmark) {
-      if (_this.state.renameBookmark) {
+      if (_this.state.rename) {
         // pass
       } else if (_this.props.openOnClick) {
         _this.props.onOpen(bookmark.key, ev.button === 1);
-      } else if (_this.state.currentBookmark === bookmark.key) {
+      } else if (_this.state.currentBookmark === bookmark) {
         _this.setState({
           currentBookmark: null,
           description: ""
         });
       } else {
         _this.setState({
-          currentBookmark: bookmark.key,
+          currentBookmark: bookmark,
           description: bookmark.description
         });
       }
     });
     _defineProperty(_this, "bookmarkDoubleClicked", function (ev, bookmark) {
-      if (!_this.state.renameBookmark) {
+      if (!_this.state.rename) {
         _this.props.onOpen(bookmark.key, false);
       }
     });
-    _defineProperty(_this, "updateBookmarkName", function (text) {
-      _this.setState({
-        busy: true
-      });
-      _this.props.onRename(_this.state.renameBookmark, text, function (success) {
-        if (!success) {
-          var _this$props$translati;
-          /* eslint-disable-next-line */
-          alert((_this$props$translati = _this.props.translations) === null || _this$props$translati === void 0 ? void 0 : _this$props$translati.savefailed);
-        }
-        _this.props.onRefresh();
-      });
-    });
     _defineProperty(_this, "addBookmark", function () {
-      var _this$props$translati2;
       _this.setState({
         busy: true
       });
-      _this.props.onAdd((_this$props$translati2 = _this.props.translations) === null || _this$props$translati2 === void 0 ? void 0 : _this$props$translati2.newbookmark, function (success, key) {
+      _this.props.bookmarkIface.create(_this.props.translations["new"], function (success, key) {
         if (!success) {
-          var _this$props$translati3;
           /* eslint-disable-next-line */
-          alert((_this$props$translati3 = _this.props.translations) === null || _this$props$translati3 === void 0 ? void 0 : _this$props$translati3.addfailed);
+          alert(_this.props.translations.addfailed);
+          _this.setState({
+            busy: false
+          });
+        } else {
+          _this.props.bookmarkIface.getList(function (bookmarks) {
+            _this.props.setList(bookmarks);
+            _this.setState({
+              rename: true,
+              currentBookmark: bookmarks.find(function (bk) {
+                return bk.key === key;
+              }),
+              busy: false
+            });
+          });
         }
-        _this.props.onRefresh();
-      });
-      _this.setState({
-        description: "",
-        currentBookmark: null
       });
     });
-    _defineProperty(_this, "updateBookmark", function (key) {
+    _defineProperty(_this, "updateBookmark", function (bookmark, params) {
+      var updateData = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      // eslint-disable-next-line no-alert
+      if (updateData && !confirm(_this.props.translations.confirmOverwrite)) {
+        return;
+      }
       _this.setState({
         busy: true
       });
-      var description = _this.props.bookmarks.find(function (bk) {
-        return bk.key === key;
-      }).description;
-      _this.props.onUpdate(key, description, function (success) {
+      _this.props.bookmarkIface.update(bookmark.key, params, updateData, function (success) {
         if (!success) {
-          var _this$props$translati4;
           /* eslint-disable-next-line */
-          alert((_this$props$translati4 = _this.props.translations) === null || _this$props$translati4 === void 0 ? void 0 : _this$props$translati4.savefailed);
+          alert(_this.props.translations.savefailed);
+          _this.setState({
+            busy: false,
+            rename: false
+          });
+        } else {
+          _this.props.bookmarkIface.getList(function (bookmarks) {
+            _this.props.setList(bookmarks);
+            _this.setState({
+              rename: false,
+              currentBookmark: bookmarks.find(function (bk) {
+                return bk.key === bookmark.key;
+              }),
+              busy: false
+            });
+          });
         }
-        _this.props.onRefresh();
       });
     });
-    _defineProperty(_this, "removeBookmark", function (key) {
+    _defineProperty(_this, "removeBookmark", function (bookmark) {
+      // eslint-disable-next-line no-alert
+      if (!confirm(_this.props.translations.confirmDelete)) {
+        return;
+      }
       _this.setState({
         busy: true
       });
-      _this.props.onRemove(key, function (success) {
+      _this.props.bookmarkIface["delete"](bookmark.key, function (success) {
         if (!success) {
-          var _this$props$translati5;
           /* eslint-disable-next-line */
-          alert((_this$props$translati5 = _this.props.translations) === null || _this$props$translati5 === void 0 ? void 0 : _this$props$translati5.removefailed);
+          alert(_this.props.translations.removefailed);
+          _this.setState({
+            busy: false
+          });
         }
-        _this.props.onRefresh();
+        _this.props.bookmarkIface.getList(function (bookmarks) {
+          _this.props.setList(bookmarks);
+          _this.setState({
+            rename: false,
+            currentBookmark: null,
+            busy: false
+          });
+        });
       });
     });
     return _this;
   }
   _inherits(BookmarkPanel, _React$Component);
   return _createClass(BookmarkPanel, [{
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
-      // Check exact identity of bookmarks array to reset busy state in all cases
-      if (prevProps.bookmarks !== this.props.bookmarks) {
-        this.setState({
-          renameBookmark: null,
-          busy: false
-        });
-        // Select a recently added bookmark
-        var addedBookmark = this.props.bookmarks.find(function (bookmark) {
-          return !prevProps.bookmarks.some(function (prevBookmark) {
-            return prevBookmark.key === bookmark.key;
-          });
-        });
-        if (addedBookmark) {
-          this.setState({
-            renameBookmark: addedBookmark.key,
-            currentBookmark: null
-          });
-        }
-      }
-    }
-  }, {
     key: "render",
     value: function render() {
-      var _this$props$translati6,
-        _this$props$translati7,
-        _this$props$translati8,
-        _this2 = this,
-        _this$props$translati9,
-        _this$props$translati0,
-        _this$props$translati1,
-        _this$props$translati10,
-        _this$props$translati11;
+      var _this2 = this;
       var username = ConfigUtils.getConfigProp("username");
+      var hasPublicBookmarksCap = ConfigUtils.getConfigProp("capabilities", null, []).includes("public_bookmarks");
       var currentBookmark = this.state.currentBookmark;
       var buttonsDisabled = !currentBookmark || this.state.busy;
-      return !username ? /*#__PURE__*/React.createElement("div", {
-        className: "bookmark-body",
-        role: "body"
-      }, " ", (_this$props$translati6 = this.props.translations) === null || _this$props$translati6 === void 0 ? void 0 : _this$props$translati6.notloggedin) : /*#__PURE__*/React.createElement("div", {
+      var updatable = (currentBookmark === null || currentBookmark === void 0 ? void 0 : currentBookmark.own) && !this.state.rename;
+      return /*#__PURE__*/React.createElement("div", {
         className: "bookmark-body",
         role: "body"
       }, /*#__PURE__*/React.createElement("h4", {
         className: "bookmark-header"
-      }, /*#__PURE__*/React.createElement("span", null, (_this$props$translati7 = this.props.translations) === null || _this$props$translati7 === void 0 ? void 0 : _this$props$translati7.manage), /*#__PURE__*/React.createElement("button", {
+      }, /*#__PURE__*/React.createElement("span", null, this.props.translations.title), username ? /*#__PURE__*/React.createElement("button", {
         className: "button",
         onClick: this.addBookmark,
-        title: (_this$props$translati8 = this.props.translations) === null || _this$props$translati8 === void 0 ? void 0 : _this$props$translati8.add
+        title: this.props.translations["new"]
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "plus"
-      }))), !this.props.openOnClick ? /*#__PURE__*/React.createElement("div", {
+      })) : null), !this.props.openOnClick ? /*#__PURE__*/React.createElement("div", {
         className: "bookmark-actions controlgroup"
       }, /*#__PURE__*/React.createElement("button", {
         className: "button",
         disabled: buttonsDisabled,
         onClick: function onClick() {
-          return _this2.props.onOpen(currentBookmark, false);
+          return _this2.props.onOpen(currentBookmark.key, false);
         },
-        title: (_this$props$translati9 = this.props.translations) === null || _this$props$translati9 === void 0 ? void 0 : _this$props$translati9.open
+        title: this.props.translations.open
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "folder-open"
-      })), this.props.showOpenTab ? /*#__PURE__*/React.createElement("button", {
+      })), /*#__PURE__*/React.createElement("button", {
         className: "button",
         disabled: buttonsDisabled,
         onClick: function onClick() {
-          return _this2.props.onOpen(currentBookmark, true);
+          return _this2.props.onOpen(currentBookmark.key, true);
         },
-        title: (_this$props$translati0 = this.props.translations) === null || _this$props$translati0 === void 0 ? void 0 : _this$props$translati0.openTab
+        title: this.props.translations.openTab
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "open_link"
-      })) : null, this.props.showZoomToExtent ? /*#__PURE__*/React.createElement("button", {
+      })), this.props.onZoomToExtent ? /*#__PURE__*/React.createElement("button", {
         className: "button",
         disabled: buttonsDisabled,
         onClick: function onClick() {
-          return _this2.props.onZoomToExtent(currentBookmark);
+          return _this2.props.onZoomToExtent(currentBookmark.key);
         },
-        title: (_this$props$translati1 = this.props.translations) === null || _this$props$translati1 === void 0 ? void 0 : _this$props$translati1.zoomToExtent
+        title: this.props.translations.zoomToExtent
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "zoom"
       })) : null, /*#__PURE__*/React.createElement("button", {
         className: "button",
-        disabled: buttonsDisabled,
+        disabled: !updatable,
         onClick: function onClick() {
-          return _this2.updateBookmark(currentBookmark);
+          return _this2.updateBookmark(currentBookmark, {}, true);
         },
-        title: (_this$props$translati10 = this.props.translations) === null || _this$props$translati10 === void 0 ? void 0 : _this$props$translati10.update
+        title: this.props.translations.update
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "save"
       }))) : null, /*#__PURE__*/React.createElement("div", {
         className: "bookmark-list"
       }, this.props.bookmarks.map(function (bookmark) {
-        var _this2$props$translat;
         var itemclasses = classnames({
           "bookmark-list-item": true,
-          "bookmark-list-item-active": currentBookmark === bookmark.key
+          "bookmark-list-item-active": (currentBookmark === null || currentBookmark === void 0 ? void 0 : currentBookmark.key) === bookmark.key
         });
+        var renaming = (currentBookmark === null || currentBookmark === void 0 ? void 0 : currentBookmark.key) === bookmark.key && _this2.state.rename;
+        var publicIcon = null;
+        if (bookmark.own && hasPublicBookmarksCap) {
+          publicIcon = /*#__PURE__*/React.createElement(Icon, {
+            disabled: _this2.state.busy,
+            icon: "public",
+            inactive: !bookmark["public"],
+            onClick: function onClick(ev) {
+              _this2.updateBookmark(bookmark, {
+                "public": !bookmark["public"]
+              });
+              MiscUtils.killEvent(ev);
+            },
+            title: _this2.props.translations.togglePublic
+          });
+        } else if (bookmark["public"]) {
+          publicIcon = /*#__PURE__*/React.createElement(Icon, {
+            icon: "public",
+            title: _this2.props.translations["public"]
+          });
+        }
         return /*#__PURE__*/React.createElement("div", {
           className: itemclasses,
           key: bookmark.key,
@@ -248,13 +249,17 @@ var BookmarkPanel = /*#__PURE__*/function (_React$Component) {
           onDoubleClick: function onDoubleClick(ev) {
             return _this2.bookmarkDoubleClicked(ev, bookmark);
           },
-          title: ((_this2$props$translat = _this2.props.translations) === null || _this2$props$translat === void 0 ? void 0 : _this2$props$translat.lastUpdate) + ": " + bookmark.date
-        }, _this2.state.renameBookmark === bookmark.key ? /*#__PURE__*/React.createElement(InputContainer, null, /*#__PURE__*/React.createElement(TextInput, {
+          title: _this2.props.translations.lastUpdate + ": " + bookmark.date
+        }, renaming ? /*#__PURE__*/React.createElement(InputContainer, null, /*#__PURE__*/React.createElement(TextInput, {
           focusOnRef: true,
-          onChange: _this2.updateBookmarkName,
+          onChange: function onChange(text) {
+            return _this2.updateBookmark(bookmark, {
+              description: text
+            });
+          },
           onNoChange: function onNoChange() {
             return _this2.setState({
-              renameBookmark: null
+              rename: false
             });
           },
           role: "input",
@@ -264,49 +269,42 @@ var BookmarkPanel = /*#__PURE__*/function (_React$Component) {
           icon: "ok",
           onClick: MiscUtils.killEvent,
           role: "suffix"
-        })) : /*#__PURE__*/React.createElement("span", null, bookmark.description), _this2.state.renameBookmark !== bookmark.key ? /*#__PURE__*/React.createElement(Icon, {
+        })) : /*#__PURE__*/React.createElement("span", null, bookmark.description), !renaming ? publicIcon : null, bookmark.own && !renaming ? [/*#__PURE__*/React.createElement(Icon, {
+          disabled: _this2.state.busy,
           icon: "draw",
+          key: "draw",
           onClick: function onClick(ev) {
             _this2.setState({
-              renameBookmark: bookmark.key,
-              currentBookmark: null
+              currentBookmark: bookmark,
+              rename: true
             });
             MiscUtils.killEvent(ev);
           },
           title: LocaleUtils.tr("common.rename")
-        }) : null, _this2.state.renameBookmark !== bookmark.key ? /*#__PURE__*/React.createElement(Icon, {
+        }), /*#__PURE__*/React.createElement(Icon, {
           disabled: _this2.state.busy,
           icon: "trash",
+          key: "trash",
           onClick: function onClick(ev) {
-            _this2.removeBookmark(bookmark.key);
+            _this2.removeBookmark(bookmark);
             MiscUtils.killEvent(ev);
           },
           title: LocaleUtils.tr("common.delete")
-        }) : null);
+        })] : null);
       }), isEmpty(this.props.bookmarks) ? /*#__PURE__*/React.createElement("div", {
         className: "bookmark-list-item-empty"
-      }, (_this$props$translati11 = this.props.translations) === null || _this$props$translati11 === void 0 ? void 0 : _this$props$translati11.nobookmarks) : null));
+      }, this.props.translations.noitems) : null));
     }
   }]);
 }(React.Component);
 _defineProperty(BookmarkPanel, "availableIn3D", true);
 _defineProperty(BookmarkPanel, "propTypes", {
+  bookmarkIface: PropTypes.object,
   bookmarks: PropTypes.array,
-  onAdd: PropTypes.func,
   onOpen: PropTypes.func,
-  onRefresh: PropTypes.func,
-  onRemove: PropTypes.func,
-  onRename: PropTypes.func,
-  onUpdate: PropTypes.func,
   onZoomToExtent: PropTypes.func,
-  /** Whether to directly open the bookmark on click / middle click, instead of showing dedicated open buttons. */
   openOnClick: PropTypes.bool,
-  showOpenTab: PropTypes.bool,
-  showZoomToExtent: PropTypes.bool,
+  setList: PropTypes.func,
   translations: PropTypes.objectOf(PropTypes.string)
 });
-_defineProperty(BookmarkPanel, "defaultProps", {
-  showOpenTab: true,
-  showZoomToExtent: false
-});
 export default BookmarkPanel;

package/components/Icon.js

@@ -38,6 +38,7 @@ var Icon = /*#__PURE__*/function (_React$Component) {
       var classes = classnames(_defineProperty(_defineProperty(_defineProperty({
         icon: true,
         icon_disabled: this.props.disabled,
+        icon_inactive: this.props.inactive,
         icon_clickable: !!this.props.onClick || !!this.props.onMouseDown || !!this.props.onPointerDown
       }, "icon-" + this.props.icon, true), "icon_" + this.props.size, !!this.props.size), this.props.className, !!this.props.className));
       var tabIndex = undefined;
@@ -85,6 +86,7 @@ _defineProperty(Icon, "propTypes", {
   className: PropTypes.string,
   disabled: PropTypes.bool,
   icon: PropTypes.string,
+  inactive: PropTypes.bool,
   onClick: PropTypes.func,
   onMouseDown: PropTypes.func,
   onMouseUp: PropTypes.func,

package/components/IdentifyViewer.js

@@ -363,8 +363,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "storeIdentifyResults", function () {
       return new Promise(function (resolve) {
         return resolve({
-          identifyResults: _this.serializeResults(),
-          currentResultDisplayMode: _this.props.resultDisplayMode
+          state: {
+            identifyResults: _this.serializeResults(),
+            currentResultDisplayMode: _this.props.resultDisplayMode
+          }
         });
       });
     });
@@ -881,6 +883,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
           fields: Object.values(fields),
           hideIdColumn: true,
           highlightFeatures: _this.setHighlightedFeatures,
+          renderField: _this.renderTableField,
           selectionChanged: function selectionChanged(sel) {
             return _this.setState(function (state) {
               return {
@@ -891,6 +894,9 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         }) : null);
       }));
     });
+    _defineProperty(_this, "renderTableField", function (feature, field) {
+      return _this.attribValue(feature.properties[field.name], field.name, feature.layername, feature);
+    });
     _defineProperty(_this, "tableAction", function (layerid, action) {
       if (action === "Export") {
         var features = isEmpty(_this.state.tableSelection[layerid]) ? _this.state.resultTree[layerid] : Object.values(_this.state.tableSelection[layerid]);