qwc2 2026.7.1 → 2026.7.7

package/components/EditComboField.js

@@ -102,6 +102,7 @@ var EditComboField = /*#__PURE__*/function (_React$Component) {
           return _this.props.updateField(_this.props.fieldId, value);
         },
         placeholder: _this.state.showPlaceholder ? (_this$props$placehold = _this.props.placeholder) !== null && _this$props$placehold !== void 0 ? _this$props$placehold : LocaleUtils.tr("common.select") : undefined,
+        readOnly: _this.props.readOnly,
         required: _this.props.required,
         style: _this.props.style,
         value: String(_this.props.value)

package/components/ExportSelection.js

@@ -47,10 +47,12 @@ var ExportSelection = /*#__PURE__*/function (_React$Component) {
       }
       var startStateX = _this.state.x;
       var startStateY = _this.state.y;
+      var maxWidth = ev.target.parentElement.offsetWidth - _this.state.width;
+      var maxHeight = ev.target.parentElement.offsetHeight - _this.state.height;
       var onMouseMove = function onMouseMove(event) {
         _this.setState({
-          x: startStateX + event.clientX - ev.clientX,
-          y: startStateY + event.clientY - ev.clientY
+          x: Math.max(0, Math.min(maxWidth, startStateX + event.clientX - ev.clientX)),
+          y: Math.max(0, Math.min(maxHeight, startStateY + event.clientY - ev.clientY))
         });
       };
       ev.view.addEventListener('pointermove', onMouseMove);
@@ -66,6 +68,8 @@ var ExportSelection = /*#__PURE__*/function (_React$Component) {
       if (ev.ctrlKey) {
         return;
       }
+      var maxWidth = ev.target.parentElement.parentElement.offsetWidth;
+      var maxHeight = ev.target.parentElement.parentElement.offsetHeight;
       var _this$state = _this.state,
         x = _this$state.x,
         y = _this$state.y,
@@ -92,6 +96,10 @@ var ExportSelection = /*#__PURE__*/function (_React$Component) {
         if (sy === 0) {
           newy += 0.5 * (height - newheight);
         }
+        if (newx < 0 || newy < 0 || newx + newwidth > maxWidth || newy + newheight > maxHeight) {
+          // Don't set new size if it would overflow the container
+          return;
+        }
         _this.setState({
           x: newx,
           y: newy,

package/components/QtDesignerForm.js

@@ -766,7 +766,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "renderNRelation", function (widget) {
       var _widget$property2, _editConfig$fields, _this$props$feature$r;
       var parts = widget.name.split("__");
-      if (parts.length < 3) {
+      if (parts.length < 3 || !widget.layout) {
         return null;
       }
       var disabled = String((_widget$property2 = widget.property) === null || _widget$property2 === void 0 ? void 0 : _widget$property2.enabled) === "false";

package/components/widgets/LayerCatalogWidget.js

@@ -45,6 +45,22 @@ var LayerCatalogWidget = /*#__PURE__*/function (_React$PureComponent) {
       filteredCatalog: null,
       filter: ""
     });
+    _defineProperty(_this, "entryClicked", function (entry, path) {
+      if (entry.type || entry.resource) {
+        var _entry$resource;
+        if (entry.asGroup === true && ((_entry$resource = entry.resource) !== null && _entry$resource !== void 0 ? _entry$resource : entry.type).startsWith("wms")) {
+          if (!isEmpty(entry.sublayers) && entry.resource) {
+            _this.checkAddGroup(entry);
+          } else {
+            _this.checkAddServiceLayer(entry, true);
+          }
+        } else {
+          _this.checkAddServiceLayer(entry, false);
+        }
+      } else {
+        _this.toggleLayerListEntry(path);
+      }
+    });
     _defineProperty(_this, "toggleLayerListEntry", function (path) {
       _this.setState(function (state) {
         var catalogKey = _this.state.filteredCatalog ? "filteredCatalog" : "catalog";
@@ -135,8 +151,50 @@ var LayerCatalogWidget = /*#__PURE__*/function (_React$PureComponent) {
         _this.addServiceLayer(entry, resource, asGroup);
       }
     });
+    _defineProperty(_this, "checkAddGroup", function (group) {
+      // Collect sublayers
+      var sublayers = {};
+      var stripQuery = function stripQuery(url) {
+        return (url !== null && url !== void 0 ? url : "").split("?")[0];
+      };
+      var resource = LayerUtils.splitLayerUrlParam(group.resource);
+      var groupUrl = stripQuery(resource.url);
+      var _collectSublayers = function collectSublayers(entry) {
+        var _entry$resource2;
+        var entryParams = LayerUtils.splitLayerUrlParam((_entry$resource2 = entry.resource) !== null && _entry$resource2 !== void 0 ? _entry$resource2 : "");
+        if (stripQuery(entryParams.url) === groupUrl) {
+          sublayers[entryParams.name] = entryParams;
+        }
+        (entry.sublayers || []).forEach(_collectSublayers);
+      };
+      _collectSublayers(group);
+      // Check if one or more sublayers are already in the map
+      var existingSublayers = _this.props.layers.reduce(function (res, layer) {
+        if (layer.type === "wms" && stripQuery(layer.url) === stripQuery(groupUrl)) {
+          return [].concat(_toConsumableArray(res), _toConsumableArray(LayerUtils.getSublayerNames(layer)), [layer.name]);
+        }
+        return res;
+      }, []);
+      var overlappingSublayers = Object.keys(sublayers).filter(function (name) {
+        return existingSublayers.includes(name);
+      });
+      if (!isEmpty(overlappingSublayers)) {
+        var text = LocaleUtils.tr("themelayerslist.existinglayers") + ": " + overlappingSublayers.join(", ");
+        var actions = [{
+          name: LocaleUtils.tr("themelayerslist.addanyway"),
+          onClick: function onClick() {
+            _this.addServiceLayer(group, resource, true, sublayers);
+            return true;
+          }
+        }];
+        _this.props.showNotification("existinglayers", text, NotificationType.INFO, false, actions);
+      } else {
+        _this.addServiceLayer(group, resource, true, sublayers);
+      }
+    });
     _defineProperty(_this, "addServiceLayer", function (entry, resource) {
       var asGroup = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      var sublayerSubset = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
       _this.props.closeWindow("existinglayers");
       if (resource) {
         var _entry$title2;
@@ -151,8 +209,21 @@ var LayerCatalogWidget = /*#__PURE__*/function (_React$PureComponent) {
         });
         ServiceLayerUtils.findLayers(resource.type, resource.url, [resource], _this.props.mapCrs, function (id, layer) {
           if (layer) {
-            if (entry.sublayers === false || !asGroup) {
+            if (!asGroup) {
               layer.sublayers = null;
+            } else if (sublayerSubset) {
+              var _filterSublayers = function filterSublayers(sublayers) {
+                return sublayers.map(function (sublayer) {
+                  if (sublayer.sublayers) {
+                    return _filterSublayers(sublayer.sublayers);
+                  } else if (sublayer.name in sublayerSubset) {
+                    return _objectSpread(_objectSpread({}, sublayer), sublayerSubset);
+                  } else {
+                    return null;
+                  }
+                }).filter(Boolean);
+              };
+              layer.sublayers = _filterSublayers(layer.sublayers);
             }
             LayerUtils.propagateLayerProperty(layer, "opacity", resource.opacity);
             _this.props.replacePlaceholderLayer(resource.id, layer);
@@ -202,7 +273,9 @@ var LayerCatalogWidget = /*#__PURE__*/function (_React$PureComponent) {
   }, {
     key: "renderCatalogEntry",
     value: function renderCatalogEntry(entry, path) {
-      var _this2 = this;
+      var _this2 = this,
+        _ref2,
+        _entry$resource3;
       var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
       var idx = arguments.length > 3 ? arguments[3] : undefined;
       var hasSublayers = !isEmpty(entry.sublayers);
@@ -229,16 +302,16 @@ var LayerCatalogWidget = /*#__PURE__*/function (_React$PureComponent) {
       }), /*#__PURE__*/React.createElement("span", {
         className: "layer-catalog-widget-entry-contents",
         onClick: function onClick() {
-          return type ? _this2.checkAddServiceLayer(entry, !hasSublayers) : _this2.toggleLayerListEntry(path);
+          return _this2.entryClicked(entry, path);
         },
         onKeyDown: MiscUtils.checkKeyActivate,
         tabIndex: 0
       }, type ? /*#__PURE__*/React.createElement("span", {
         className: "layer-catalog-widget-entry-service"
-      }, type) : null, entry.title), hasSublayers && type === "wms" ? /*#__PURE__*/React.createElement(Icon, {
+      }, type) : null, entry.title), (hasSublayers && !entry.asGroup || entry.asGroup === "option") && ((_ref2 = (_entry$resource3 = entry.resource) !== null && _entry$resource3 !== void 0 ? _entry$resource3 : entry.type) !== null && _ref2 !== void 0 ? _ref2 : "").startsWith("wms") ? /*#__PURE__*/React.createElement(Icon, {
         icon: "group",
         onClick: function onClick() {
-          return _this2.checkAddServiceLayer(entry, true);
+          return hasSublayers && entry.resource ? _this2.checkAddGroup(entry) : _this2.checkAddServiceLayer(entry, true);
         },
         title: LocaleUtils.tr("importlayer.asgroup")
       }) : null, entry.link ? /*#__PURE__*/React.createElement(Icon, {

package/package.json

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

package/plugins/FeatureSearch.js

@@ -389,7 +389,7 @@ var FeatureSearch = /*#__PURE__*/function (_React$Component) {
         var defaultProvider = '';
         var providerGroups = {};
         var searchProviders = (((_this$props$theme = this.props.theme) === null || _this$props$theme === void 0 ? void 0 : _this$props$theme.searchProviders) || []).reduce(function (res, entry) {
-          if (entry.provider === "qgis" && entry.params) {
+          if (entry.provider === "qgis" && entry.params && entry.params.featuresearch !== false) {
             var providerDef = _objectSpread({}, entry);
             if (!providerDef.params.fields) {
               providerDef.params = _objectSpread({}, providerDef.params);

package/plugins/LayerCatalog.js

@@ -38,8 +38,11 @@ import './style/LayerCatalog.css';
  *
  * Configured through a catalog JSON containing a tree of external layer identifiers.
  *
- * For `wms` layers, `sublayers: false` denotes that the sublayer structure of the added layer should not
- * be exposed in the layer tree.
+ * For catalog entries containing a `wms` resource, you can specify `"asGroup": <true|false|"option">`, which behaves as follows:
+ *
+ * * `false`: imports the layer as a flat layer, without sublayer structure. This is the default behaviour for entries without sublayers if `asGroup` is not specified.
+ * * `true`:  imports the layer as a group, with sublayer structure. If the catalog entry has sublayers, the sublayer structure will be filtered to only include these sublayers.
+ * * `"option"`: imports the layer as a flat layer when clicking on the catalog entry, but displays an icon to optionally import the layer as a group layer. This is the default behaviour for entries with sublayers if `asGroup` is not specified.
  *
  * Example:
  * ```json
@@ -48,11 +51,11 @@ import './style/LayerCatalog.css';
  *     {
  *       "title": "Öffentlicher Verkehr swissTLMRegio",
  *       "resource": "wms:http://wms.geo.admin.ch#ch.swisstopo.vec200-transportation-oeffentliche-verkehr",
- *       "sublayers": false
+ *       "asGroup": true
  *     },
  *     {
  *       "title": "Gewässerschutz",
- *        "resource": "wms:https://geo.so.ch/api/wms#ch.so.afu.gewaesserschutz[50]"
+ *       "resource": "wms:https://geo.so.ch/api/wms#ch.so.afu.gewaesserschutz[50]"
  *     },
  *     {
  *       "title": "Landeskarten",
@@ -66,6 +69,19 @@ import './style/LayerCatalog.css';
  *           "resource": "wms:http://wms.geo.admin.ch#ch.swisstopo.pixelkarte-farbe-pk100.noscale"
  *         }
  *       ]
+ *     },
+ *     {
+ *       "title": "Edit Demo",
+ *       "resource": "wms:https://demo.qwc.app/ows/qwc_demo#edit_demo",
+ *       "sublayers": [{
+ *         "title": "Edit Points",
+ *         "resource": "wms:https://demo.qwc.app/ows/qwc_demo#edit_points"
+ *       },
+ *       {
+ *         "title": "Edit Lines",
+ *         "resource": "wms:https://demo.qwc.app/ows/qwc_demo#edit_lines"
+ *       }],
+ *       "asGroup": "option"
  *     }
  *   ]
  * }

package/plugins/ThemeBrowser.js

@@ -407,6 +407,17 @@ var ThemeBrowser = /*#__PURE__*/function (_React$Component) {
         });
         this.props.setCurrentTask(null);
       }
+      var width = this.maxLayerTitleLength + "px";
+      if (this.props.fillIfWiderThanPerc && this.maxLayerTitleLength > window.innerWidth * this.props.fillIfWiderThanPerc / 100) {
+        width = '100%';
+      }
+      this.measureCanvas = undefined;
+      this.measureContext = undefined;
+      if (width !== this.state.width) {
+        this.setState({
+          width: width
+        });
+      }
     }
   }, {
     key: "render",
@@ -429,17 +440,6 @@ var ThemeBrowser = /*#__PURE__*/function (_React$Component) {
         className: "themebrowser-body",
         role: "body"
       }, this.renderThemes(this.props.themes)));
-      var width = this.maxLayerTitleLength + "px";
-      if (this.props.fillIfWiderThanPerc && this.maxLayerTitleLength > window.innerWidth * this.props.fillIfWiderThanPerc / 100) {
-        width = '100%';
-      }
-      this.measureCanvas = undefined;
-      this.measureContext = undefined;
-      if (width !== this.state.width) {
-        this.setState({
-          width: width
-        });
-      }
       return result;
     }
   }]);

package/plugins/map3d/LayerTree3D.js

@@ -96,6 +96,8 @@ var LayerTree3D = /*#__PURE__*/function (_React$Component) {
           return entry.sublayers.map(function (sublayer, idx) {
             return _this.renderLayerEntry(layerId, sublayer, entry, _this.updateColorLayer, false, true, [idx]);
           });
+        } else if (entry.role === LayerRole.THEME && showRootEntry && isEmpty(entry.sublayers)) {
+          return null;
         } else {
           return _this.renderLayerEntry(layerId, entry, null, _this.updateColorLayer, false, true, [], layersHaveSublayers);
         }

package/plugins/map3d/MapExport3D.js

@@ -67,11 +67,12 @@ var MapExport3D = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "onShow", function () {
       var _this$props$theme;
       var rect = _this.props.sceneContext.scene.domElement.getBoundingClientRect();
+      var rectHeight = rect.height - _this.props.topbarHeight - _this.props.bottombarHeight;
       var frame = {
         x: 0.125 * rect.width,
-        y: 0.125 * rect.height,
+        y: 0.125 * rectHeight,
         width: 0.75 * rect.width,
-        height: 0.75 * rect.height
+        height: 0.75 * rectHeight
       };
       if (!isEmpty((_this$props$theme = _this.props.theme) === null || _this$props$theme === void 0 ? void 0 : _this$props$theme.print)) {
         var _ref, _this$props$theme$pri, _this$props$theme$pri2, _this$props$theme$pri3;
@@ -571,10 +572,12 @@ var MapExport3D = /*#__PURE__*/function (_React$Component) {
   }]);
 }(React.Component);
 _defineProperty(MapExport3D, "propTypes", {
+  bottombarHeight: PropTypes.number,
   hideAutopopulatedFields: PropTypes.bool,
   sceneContext: PropTypes.object,
   setCurrentTask: PropTypes.func,
-  theme: PropTypes.object
+  theme: PropTypes.object,
+  topbarHeight: PropTypes.number
 });
 _defineProperty(MapExport3D, "defaultState", {
   minimized: false,
@@ -589,6 +592,8 @@ _defineProperty(MapExport3D, "defaultState", {
 });
 export default connect(function (state) {
   return {
+    topbarHeight: state.windows.topbarHeight,
+    bottombarHeight: state.windows.bottombarHeight,
     theme: state.theme.current
   };
 }, {