qwc2 2025.11.26 → 2025.12.2

package/components/IdentifyViewer.js

@@ -1100,7 +1100,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       return htmlReactParser(text, options);
     });
     _defineProperty(_this, "attributeLinkClicked", function (ev) {
-      _this.props.openExternalUrl(ev.target.href, ev.target.target, {
+      _this.props.openExternalUrl(ev.currentTarget.href, ev.target.target, {
         docked: _this.props.iframeDialogsInitiallyDocked
       });
       ev.preventDefault();

package/components/PluginsContainer.js

@@ -1,14 +1,14 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
@@ -59,7 +59,10 @@ var PluginsContainer = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "renderPlugins", function () {
       var device = ConfigUtils.isMobile() ? 'mobile' : 'desktop';
       var plugins = PluginStore.getPlugins();
-      return _this.props.pluginsConfig.map(function (pluginConf) {
+      return _toConsumableArray(_this.props.pluginsConfig).sort(function (a, b) {
+        var _ref, _a$order;
+        return (_ref = (_a$order = a.order) !== null && _a$order !== void 0 ? _a$order : 0 - b.order) !== null && _ref !== void 0 ? _ref : 0;
+      }).map(function (pluginConf) {
         var _this$props$theme, _this$props$theme2, _pluginConf$key;
         var Plugin = plugins[pluginConf.name + "Plugin"];
         if (!Plugin) {

package/components/StandardApp.js

@@ -199,7 +199,6 @@ var AppContainerComponent = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      // Filter 2D plugins
       var device = ConfigUtils.isMobile() ? 'mobile' : 'desktop';
       var pluginsConf = this.props.localConfig.plugins[device];
       return /*#__PURE__*/React.createElement(PluginsContainer, {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2025.11.26",
+    "version": "2025.12.02",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",

package/plugins/LayerTree.js

@@ -166,7 +166,7 @@ var LayerTree = /*#__PURE__*/function (_React$Component) {
         "layertree-item-menubutton": true,
         "layertree-item-menubutton-active": _this.state.activestylemenu === groupId
       });
-      var allowRemove = ConfigUtils.getConfigProp("allowRemovingThemeLayers", _this.props.theme) === true || layer.role !== LayerRole.THEME;
+      var allowRemove = _this.props.allowRemovingThemeLayers || ConfigUtils.getConfigProp("allowRemovingThemeLayers", _this.props.theme) === true || layer.role !== LayerRole.THEME;
       var allowReordering = ConfigUtils.getConfigProp("allowReorderingLayers", _this.props.theme) === true && !_this.state.filterinvisiblelayers;
       var sortable = allowReordering && ConfigUtils.getConfigProp("preventSplittingGroupsWhenReordering", _this.props.theme) === true;
       var styles = layer.type === "wms" && path.length === 0 ? _this.getLayerStyles(layer) : null;
@@ -252,7 +252,7 @@ var LayerTree = /*#__PURE__*/function (_React$Component) {
         return null;
       }
       var sublayerId = layer.id + ":" + sublayer.name;
-      var allowRemove = ConfigUtils.getConfigProp("allowRemovingThemeLayers", _this.props.theme) === true || layer.role !== LayerRole.THEME;
+      var allowRemove = _this.props.allowRemovingThemeLayers || ConfigUtils.getConfigProp("allowRemovingThemeLayers", _this.props.theme) === true || layer.role !== LayerRole.THEME;
       var allowReordering = ConfigUtils.getConfigProp("allowReorderingLayers", _this.props.theme) === true;
       var checkboxstate = sublayer.visibility === true ? 'checked' : 'unchecked';
       if (inMutuallyExclusiveGroup) {
@@ -355,7 +355,7 @@ var LayerTree = /*#__PURE__*/function (_React$Component) {
       }
       var allowOptions = layer.type !== "placeholder" && layer.type !== "separator";
       var flattenGroups = ConfigUtils.getConfigProp("flattenLayerTreeGroups", _this.props.theme) || _this.props.flattenGroups;
-      var allowSeparators = flattenGroups && allowReordering && ConfigUtils.getConfigProp("allowLayerTreeSeparators", _this.props.theme);
+      var allowSeparators = allowReordering && (_this.props.allowLayerTreeSeparators || ConfigUtils.getConfigProp("allowLayerTreeSeparators", _this.props.theme));
       var separatorTitle = LocaleUtils.tr("layertree.separator");
       var separatorTooltip = LocaleUtils.tr("layertree.separatortooltip");
       return /*#__PURE__*/React.createElement("div", {
@@ -1031,7 +1031,7 @@ var LayerTree = /*#__PURE__*/function (_React$Component) {
         });
       }
       var deleteAllLayersIcon = null;
-      if (ConfigUtils.getConfigProp("allowRemovingThemeLayers") === true) {
+      if (this.props.allowRemovingThemeLayers || ConfigUtils.getConfigProp("allowRemovingThemeLayers") === true) {
         var deleteAllLayersTooltip = LocaleUtils.tr("layertree.deletealllayers");
         deleteAllLayersIcon = /*#__PURE__*/React.createElement(Icon, {
           className: "layertree-delete-legend",
@@ -1082,8 +1082,12 @@ _defineProperty(LayerTree, "propTypes", {
   allowCompare: PropTypes.bool,
   /** Whether to allow importing external layers. */
   allowImport: PropTypes.bool,
+  /** Whether to allow adding layer tree separators. */
+  allowLayerTreeSeparators: PropTypes.bool,
   /** Whether to allow enabling map tips. */
   allowMapTips: PropTypes.bool,
+  /** Whether to allow removing theme layers. */
+  allowRemovingThemeLayers: PropTypes.bool,
   /** Whether to allow selection of identifyable layers. The `showQueryableIcon` property should be `true` to be able to select identifyable layers. */
   allowSelectIdentifyableLayers: PropTypes.bool,
   /** Whether to display a BBOX dependent legend. Can be `true|false|"theme"`, latter means only for theme layers. */

package/plugins/MapTip.js

@@ -177,7 +177,7 @@ var MapTip = /*#__PURE__*/function (_React$Component) {
       return htmlReactParser(text, options);
     });
     _defineProperty(_this, "attributeLinkClicked", function (ev) {
-      _this.props.openExternalUrl(ev.target.href, ev.target.target, {
+      _this.props.openExternalUrl(ev.currentTarget.href, ev.target.target, {
         docked: _this.props.iframeDialogsInitiallyDocked
       });
       ev.preventDefault();

package/utils/IdentifyUtils.js

@@ -295,6 +295,10 @@ var IdentifyUtils = {
     if (htmlContent.length > 0) {
       featureResult.properties.htmlContent = htmlContent[0].textContent;
       featureResult.properties.htmlContentInline = htmlContent[0].getAttribute("inline") === "1" || htmlContent[0].getAttribute("inline") === "true";
+      featureResult.properties.htmlContent = featureResult.properties.htmlContent.replace(/translate\(([^)]+)\)/g, function (match, cap) {
+        var _translations$layers$2, _translations$layers2;
+        return (_translations$layers$2 = translations === null || translations === void 0 || (_translations$layers2 = translations.layers) === null || _translations$layers2 === void 0 || (_translations$layers2 = _translations$layers2[layername]) === null || _translations$layers2 === void 0 || (_translations$layers2 = _translations$layers2.fields) === null || _translations$layers2 === void 0 ? void 0 : _translations$layers2[cap]) !== null && _translations$layers$2 !== void 0 ? _translations$layers$2 : cap;
+      });
     }
     if (!isEmpty(attrmapping)) {
       featureResult.attribnames = attrmapping;