qwc2 2026.1.31 → 2026.2.2

package/components/AttributeTableWidget.js

@@ -657,15 +657,21 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
         var resize = {
           anchor: resizeCol ? ev.clientX : ev.clientY,
           element: element,
-          initial: initial
+          initial: initial,
+          newsize: initial
         };
+        var contentsEl = element.parentElement.parentElement.parentElement.parentElement;
+        var origin = contentsEl.getBoundingClientRect()[resizeCol ? "left" : "top"];
+        var resizeLine = document.createElement('div');
+        resizeLine.className = resizeCol ? 'attribtable-resize-line-vert' : 'attribtable-resize-line-horiz';
+        resizeLine.style[resizeCol ? "left" : "top"] = resize.anchor - origin + "px";
+        contentsEl.appendChild(resizeLine);
         var resizeDo = resizeCol ? function (event) {
-          var delta = event.clientX - resize.anchor;
-          resize.element.style.minWidth = Math.max(resize.initial + delta, 16) + "px";
-          resize.element.style.width = Math.max(resize.initial + delta, 16) + "px";
+          resizeLine.style.left = event.clientX - origin + "px";
+          resize.newsize = resize.initial + event.clientX - resize.anchor;
         } : function (event) {
-          var delta = event.clientY - resize.anchor;
-          resize.element.style.height = Math.max(resize.initial + delta, 16) + "px";
+          resizeLine.style.top = event.clientY - origin + "px";
+          resize.newsize = resize.initial + event.clientY - resize.anchor;
         };
         var eventShield = ev.view.document.createElement("div");
         eventShield.className = '__event_shield';
@@ -674,8 +680,15 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
         ev.view.addEventListener("pointermove", resizeDo);
         ev.view.addEventListener("pointerup", function (event) {
           event.view.document.body.removeChild(eventShield);
+          contentsEl.removeChild(resizeLine);
           event.view.removeEventListener("pointermove", resizeDo);
           event.view.document.body.classList.remove(resizeCol ? 'ewresizing' : 'nsresizing');
+          if (resizeCol) {
+            resize.element.style.minWidth = Math.max(resize.newsize, 16) + "px";
+            resize.element.style.width = Math.max(resize.newsize, 16) + "px";
+          } else {
+            resize.element.style.height = Math.max(resize.newsize, 16) + "px";
+          }
         }, {
           once: true
         });

package/components/EditUploadField.js

@@ -27,7 +27,6 @@ import React from 'react';
 import mime from 'mime-to-extensions';
 import PropTypes from 'prop-types';
 import { v4 as uuidv4 } from 'uuid';
-import { showImageEditor } from '../utils/ImageEditor';
 import LocaleUtils from '../utils/LocaleUtils';
 import Icon from './Icon';
 import ButtonBar from './widgets/ButtonBar';
@@ -115,15 +114,18 @@ var EditUploadField = /*#__PURE__*/function (_React$Component) {
         var fileType = mime.lookup(fileValue);
         var fileUrl = _this.props.iface.resolveAttachmentUrl(_this.props.dataset, fileValue);
         var imageData = fileType && fileType.startsWith('image/') ? fileUrl : _this.state.imageData;
-        showImageEditor(imageData, function (newImageData) {
-          _this.setState({
-            imageData: newImageData,
-            imageFilename: fileValue.replace(/.*\//, '')
+        import('../utils/ImageEditor').then(function (_ref) {
+          var showImageEditor = _ref.showImageEditor;
+          showImageEditor(imageData, function (newImageData) {
+            _this.setState({
+              imageData: newImageData,
+              imageFilename: fileValue.replace(/.*\//, '')
+            });
+            _this.props.updateField(_this.props.fieldId, '');
+            _this.props.updateFile(_this.props.fieldId, new File([_this.dataUriToBlob(newImageData)], uuidv4() + ".jpg", {
+              type: "image/jpeg"
+            }));
           });
-          _this.props.updateField(_this.props.fieldId, '');
-          _this.props.updateFile(_this.props.fieldId, new File([_this.dataUriToBlob(newImageData)], uuidv4() + ".jpg", {
-            type: "image/jpeg"
-          }));
         });
       } else if (action === "Clear") {
         _this.clearImage();

package/components/PluginsContainer.js

@@ -1,6 +1,5 @@
 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(); }
@@ -30,7 +29,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React from 'react';
+import React, { Suspense } from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import ConfigUtils from '../utils/ConfigUtils';
@@ -71,9 +70,9 @@ var PluginsContainer = /*#__PURE__*/function (_React$Component) {
         var themeDevicePluginConfig = ((_this$props$theme = _this.props.theme) === null || _this$props$theme === void 0 || (_this$props$theme = _this$props$theme.config) === null || _this$props$theme === void 0 || (_this$props$theme = _this$props$theme[device]) === null || _this$props$theme === void 0 || (_this$props$theme = _this$props$theme.plugins) === null || _this$props$theme === void 0 ? void 0 : _this$props$theme[pluginConf.name]) || {};
         var themePluginConfig = ((_this$props$theme2 = _this.props.theme) === null || _this$props$theme2 === void 0 || (_this$props$theme2 = _this$props$theme2.config) === null || _this$props$theme2 === void 0 || (_this$props$theme2 = _this$props$theme2.plugins) === null || _this$props$theme2 === void 0 ? void 0 : _this$props$theme2[pluginConf.name]) || {};
         var cfg = _objectSpread(_objectSpread(_objectSpread({}, pluginConf.cfg || {}), themePluginConfig), themeDevicePluginConfig);
-        return /*#__PURE__*/React.createElement(Plugin, _extends({
+        return /*#__PURE__*/React.createElement(Suspense, {
           key: (_pluginConf$key = pluginConf.key) !== null && _pluginConf$key !== void 0 ? _pluginConf$key : pluginConf.name
-        }, cfg));
+        }, /*#__PURE__*/React.createElement(Plugin, cfg));
       });
     });
     _defineProperty(_this, "setupTouchEvents", function (el) {

package/components/ResizeableWindow.js

@@ -230,21 +230,15 @@ var ResizeableWindow = /*#__PURE__*/function (_React$Component) {
         minWidth: _this.props.minWidth,
         onDragStart: _this.onDragStart,
         onDragStop: _this.onDragStop,
-        onMouseDown: function onMouseDown() {
-          return _this.props.raiseWindow(_this.id);
-        },
+        onMouseDown: _this.raiseWindow,
         onResizeStop: _this.onResizeStop,
         ref: _this.initRnd
       }, /*#__PURE__*/React.createElement("div", {
         className: "resizeable-window-contents",
-        onFocus: function onFocus() {
-          return _this.props.raiseWindow(_this.id);
-        }
+        onFocus: _this.raiseWindow
       }, _this.renderTitleBar(), /*#__PURE__*/React.createElement("div", {
         className: bodyclasses,
-        onMouseDown: function onMouseDown() {
-          return _this.props.raiseWindow(_this.id);
-        },
+        onMouseDown: _this.raiseWindow,
         onScroll: _this.preventScroll
       }, /*#__PURE__*/React.createElement("div", {
         className: "resizeable-window-drag-shield",
@@ -263,6 +257,11 @@ var ResizeableWindow = /*#__PURE__*/function (_React$Component) {
         ev.target.scrollTop = 0;
       }
     });
+    _defineProperty(_this, "raiseWindow", function () {
+      if (_this.props.windowStacking[_this.props.windowStacking.length - 1] !== _this.id) {
+        _this.props.raiseWindow(_this.id);
+      }
+    });
     _defineProperty(_this, "setInitialSize", function (container) {
       if (!container) {
         return;
@@ -467,15 +466,9 @@ var ResizeableWindow = /*#__PURE__*/function (_React$Component) {
     _this.id = uuidv4();
     _this.portalNode = props.usePortal ? portals.createHtmlPortalNode() : null;
     if (_this.portalNode) {
-      _this.portalNode.element.addEventListener('click', function () {
-        return _this.props.raiseWindow(_this.id);
-      });
-      _this.portalNode.element.addEventListener('focus', function () {
-        return _this.props.raiseWindow(_this.id);
-      });
-      _this.portalNode.element.addEventListener('focusin', function () {
-        return _this.props.raiseWindow(_this.id);
-      });
+      _this.portalNode.element.addEventListener('click', _this.raiseWindow);
+      _this.portalNode.element.addEventListener('focus', _this.raiseWindow);
+      _this.portalNode.element.addEventListener('focusin', _this.raiseWindow);
     }
     return _this;
   }

package/components/style/AttributeTableWidget.css

@@ -219,3 +219,22 @@ body.nsresizing, body.nsresizing * {
     cursor: ns-resize!important;
     user-select: none;
 }
+
+div.attribtable-resize-line-vert,
+div.attribtable-resize-line-horiz {
+    position: absolute;
+    z-index: 2;
+    background-color: var(--border-color);
+}
+
+div.attribtable-resize-line-vert {
+    width: 4px;
+    top: 0;
+    bottom: 0;
+}
+
+div.attribtable-resize-line-horiz {
+    height: 4px;
+    left: 0;
+    right: 0;
+}

package/package.json

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

package/plugins/map/RedliningSupport.js

@@ -200,6 +200,7 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
         feature.set('measurements', undefined);
         feature.set('segment_labels', undefined);
         feature.set('label', '');
+        feature.set('end_label', undefined);
       }
     });
     _defineProperty(_this, "updateMeasurements", function (ev) {

package/stores/StandardStore.js

@@ -37,7 +37,10 @@ export var createStore = function createStore(reducers) {
     preloadedState: defaultState,
     middleware: function middleware(getDefaultMiddleware) {
       var middleware = getDefaultMiddleware({
-        serializableCheck: false
+        serializableCheck: false,
+        immutableCheck: {
+          ignoredPaths: ['theme.themes']
+        }
       });
       if (enableDevTools) {
         middleware.push(logger);

package/utils/ServiceLayerUtils.js

@@ -359,7 +359,7 @@ var ServiceLayerUtils = {
       dimensions: dimensions,
       styles: styles,
       style: style,
-      serverType: translationsUrl ? 'qgis' : null // If there is a translationsUrl, assume it is the qwc-ogc-service
+      serverType: translationsUrl ? 'qgis' : undefined // If there is a translationsUrl, assume it is the qwc-ogc-service
     };
   },
   getWFSLayers: function getWFSLayers(capabilities, calledServiceUrl, mapCrs) {

package/utils/expr_grammar/grammar.js

@@ -1921,7 +1921,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
         "literal": ")"
       }],
       "postprocess": function postprocess(d) {
-        return d[4].includes(d[8]);
+        return asFilter(d) ? [d[4], "HAS", d[8]] : d[4].includes(d[8]);
       }
     }, {
       "name": "N$string$51",

package/utils/expr_grammar/grammar.ne

@@ -135,7 +135,7 @@ N -> float                         {% id %}
     | "array_all" _ "(" _ P0 _ "," _ P0 _ ")"              {% function(d) { return d[8].every(val => d[4].includes(val)); } %}
     | "array_append" _ "(" _ P0 _ "," _ P0 _ ")"           {% function(d) { return [...d[4], d[8]]; } %}
     | "array_cat" _ "(" _ P0 _ "," _ P0 _ ")"              {% function(d) { return [...d[4], ...d[8]]; } %}
-    | "array_contains" _ "(" _ P0 _ "," _ P0 _ ")"         {% function(d) { return d[4].includes(d[8]); } %}
+    | "array_contains" _ "(" _ P0 _ "," _ P0 _ ")"         {% function(d) { return asFilter(d) ? [d[4], "HAS", d[8]] : d[4].includes(d[8]); } %}
     | "array_count" _ "(" _ P0 _ "," _ P0 _ ")"            {% function(d) { return d[4].filter(val => val === d[8]).length; } %}
     | "array_distinct" _ "(" _ P0 _ ")"                    {% function(d) { return [...new Set(d[4])].sort((a,b) => a-b); } %}
     # "array_filter" _ "(" _ P0 _ "," _ P1 _ ")"           TODO