qwc2 2026.8.6 → 2026.8.9

package/components/AttributeForm.js

@@ -575,6 +575,10 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
               // Ensure numeric values are numbers and not strings
               value = Number(value);
             }
+            if (nrelFieldConfig.type === 'boolean' && value !== null && typeof value === "string") {
+              // Ensure boolean values are bools
+              value = value.trim().toLowerCase() === "true";
+            }
 
             // relationValues for table must exist as rows are either pre-existing or were added
             if (!(field in relationValues[datasetname].features[index].properties)) {
@@ -621,6 +625,10 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
               // Ensure numeric values are numbers and not strings
               value = Number(value);
             }
+            if (fieldConfig.type === 'boolean' && value !== null && typeof value === "string") {
+              // Ensure boolean values are bools
+              value = value.trim().toLowerCase() === "true";
+            }
             if (!(name in feature.properties)) {
               feature.defaultedProperties = [].concat(_toConsumableArray(feature.defaultedProperties || []), [name]);
             }

package/components/EditUploadField.js

@@ -1,7 +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 _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; }
@@ -210,18 +208,21 @@ var EditUploadField = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$state$imageData2,
+      var _this$props$constrain,
+        _this$props$constrain2,
+        _this$state$imageData2,
         _fileType$startsWith2,
         _this2 = this;
       var isAttachment = this.props.value.startsWith("attachment:");
       var fileValue = isAttachment ? this.props.value.replace(/attachment:\/\//, '') : this.props.value;
       var fileType = mime.lookup(fileValue);
       var fileUrl = isAttachment ? this.props.iface.resolveAttachmentUrl(this.props.dataset, fileValue) : fileValue;
-      var constraints = _objectSpread(_objectSpread({}, this.props.constraints), {}, {
-        accept: (this.props.constraints.accept || "").split(",").map(function (ext) {
+      var constraints = {
+        required: (_this$props$constrain = this.props.constraints) === null || _this$props$constrain === void 0 ? void 0 : _this$props$constrain.required,
+        accept: (((_this$props$constrain2 = this.props.constraints) === null || _this$props$constrain2 === void 0 ? void 0 : _this$props$constrain2.accept) || "").split(",").map(function (ext) {
           return mime.lookup(ext);
         }).join(",")
-      });
+      };
       var mediaSupport = 'mediaDevices' in navigator && constraints.accept.split(",").includes("image/jpeg");
       var imageData = (_this$state$imageData2 = this.state.imageData) !== null && _this$state$imageData2 !== void 0 ? _this$state$imageData2 : fileType !== null && fileType !== void 0 && (_fileType$startsWith2 = fileType.startsWith) !== null && _fileType$startsWith2 !== void 0 && _fileType$startsWith2.call(fileType, 'image/') ? fileUrl : null;
       if (imageData) {

package/components/IdentifyViewer.js

@@ -363,11 +363,33 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "storeIdentifyResults", function () {
       return new Promise(function (resolve) {
         return resolve({
-          identifyResults: _this.state.resultTree,
+          identifyResults: _this.serializeResults(),
           currentResultDisplayMode: _this.props.resultDisplayMode
         });
       });
     });
+    _defineProperty(_this, "serializeResults", function () {
+      return Object.fromEntries(Object.entries(_this.state.resultTree).map(function (_ref10) {
+        var _ref11 = _slicedToArray(_ref10, 2),
+          layerid = _ref11[0],
+          features = _ref11[1];
+        var _layerid$split = layerid.split("#", 2),
+          _layerid$split2 = _slicedToArray(_layerid$split, 2),
+          layerUrl = _layerid$split2[0],
+          layerName = _layerid$split2[1];
+        var match = LayerUtils.searchLayer(_this.props.layers, 'url', layerUrl, 'name', layerName);
+        if (match && match.sublayer.primary_key) {
+          return [layerid, {
+            key: match.sublayer.primary_key,
+            values: features.map(function (feature) {
+              return MiscUtils.isNumeric(feature.id) ? Number(feature.id) : feature.id;
+            })
+          }];
+        } else {
+          return [layerid, features];
+        }
+      }));
+    });
     _defineProperty(_this, "getCurrentResultFeature", function () {
       var _this$state$resultTre, _this$state$resultTre2, _this$state$resultTre3, _this$state$currentRe;
       return (_this$state$resultTre = (_this$state$resultTre2 = _this.state.resultTree[(_this$state$currentRe = _this.state.currentResult) === null || _this$state$currentRe === void 0 ? void 0 : _this$state$currentRe.layerid]) === null || _this$state$resultTre2 === void 0 || (_this$state$resultTre3 = _this$state$resultTre2.find) === null || _this$state$resultTre3 === void 0 ? void 0 : _this$state$resultTre3.call(_this$state$resultTre2, function (feature) {
@@ -490,10 +512,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       });
       if (exporter) {
         if (!_this.props.exportGeometry) {
-          json = Object.entries(json).reduce(function (res, _ref12) {
-            var _ref13 = _slicedToArray(_ref12, 2),
-              layerId = _ref13[0],
-              features = _ref13[1];
+          json = Object.entries(json).reduce(function (res, _ref14) {
+            var _ref15 = _slicedToArray(_ref14, 2),
+              layerId = _ref15[0],
+              features = _ref15[1];
             return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, layerId, features.map(function (feature) {
               return MiscUtils.objectOmit(feature, ['geometry']);
             })));
@@ -521,10 +543,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         style: {
           maxHeight: _this.state.currentResult ? '10em' : 'initial'
         }
-      }, Object.entries(_this.state.resultTree).map(function (_ref14) {
-        var _ref15 = _slicedToArray(_ref14, 2),
-          layerid = _ref15[0],
-          features = _ref15[1];
+      }, Object.entries(_this.state.resultTree).map(function (_ref16) {
+        var _ref17 = _slicedToArray(_ref16, 2),
+          layerid = _ref17[0],
+          features = _ref17[1];
         if (features.length === 0) {
           return null;
         }
@@ -805,20 +827,20 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "renderResultsTable", function () {
       return /*#__PURE__*/React.createElement("div", {
         className: "identify-results-tables"
-      }, Object.entries(_this.state.resultTree).map(function (_ref16) {
-        var _ref17 = _slicedToArray(_ref16, 2),
-          layerid = _ref17[0],
-          features = _ref17[1];
+      }, Object.entries(_this.state.resultTree).map(function (_ref18) {
+        var _ref19 = _slicedToArray(_ref18, 2),
+          layerid = _ref19[0],
+          features = _ref19[1];
         if (features.length === 0 || _this.state.selectedLayer && layerid !== _this.state.selectedLayer) {
           return null;
         }
         var fields = {};
         features.map(function (feature) {
-          Object.entries(feature.properties).map(function (_ref18) {
-            var _ref19 = _slicedToArray(_ref18, 2),
-              attr = _ref19[0],
-              value = _ref19[1];
-            if (!(attr in fields)) {
+          Object.entries(feature.properties).map(function (_ref20) {
+            var _ref21 = _slicedToArray(_ref20, 2),
+              attr = _ref21[0],
+              value = _ref21[1];
+            if (!(attr in fields) && !['htmlContent', 'htmlContentInline'].includes(attr)) {
               fields[attr] = {
                 id: attr,
                 name: attr
@@ -1061,10 +1083,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React.createElement("option", {
         disabled: true,
         value: ""
-      }, LocaleUtils.tr("identify.selectreport")), Object.entries(_this.state.reports).map(function (_ref21) {
-        var _ref22 = _slicedToArray(_ref21, 2),
-          layername = _ref22[0],
-          reports = _ref22[1];
+      }, LocaleUtils.tr("identify.selectreport")), Object.entries(_this.state.reports).map(function (_ref23) {
+        var _ref24 = _slicedToArray(_ref23, 2),
+          layername = _ref24[0],
+          reports = _ref24[1];
         return reports.map(function (report, idx) {
           return /*#__PURE__*/React.createElement("option", {
             key: layername + "::" + idx,
@@ -1328,6 +1350,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
     key: "componentDidMount",
     value: function componentDidMount() {
       this.updateResultTree();
+      this.props.innerRef(this);
     }
   }, {
     key: "componentDidUpdate",
@@ -1360,6 +1383,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
+      this.props.innerRef(null);
       this.props.removeLayer("__identifyviewerhighlight");
       unregisterPermalinkDataStoreHook("identifyresultstate");
     }
@@ -1369,10 +1393,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       var _this2 = this;
       var body = null;
       var resultTree = this.state.selectedLayer !== '' ? _defineProperty({}, this.state.selectedLayer, this.state.resultTree[this.state.selectedLayer]) : this.state.resultTree;
-      var flatResults = Object.entries(resultTree).map(function (_ref25) {
-        var _ref26 = _slicedToArray(_ref25, 2),
-          layerid = _ref26[0],
-          features = _ref26[1];
+      var flatResults = Object.entries(resultTree).map(function (_ref27) {
+        var _ref28 = _slicedToArray(_ref27, 2),
+          layerid = _ref28[0],
+          features = _ref28[1];
         return features.map(function (feature) {
           return [layerid, feature];
         });
@@ -1400,10 +1424,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       } else if (this.props.resultDisplayMode === 'flat') {
         body = /*#__PURE__*/React.createElement("div", {
           className: "identify-flat-results-list"
-        }, Object.entries(resultTree).map(function (_ref27) {
-          var _ref28 = _slicedToArray(_ref27, 2),
-            layerid = _ref28[0],
-            features = _ref28[1];
+        }, Object.entries(resultTree).map(function (_ref29) {
+          var _ref30 = _slicedToArray(_ref29, 2),
+            layerid = _ref30[0],
+            features = _ref30[1];
           return features.map(function (feature) {
             return _this2.renderResultAttributes(layerid, feature, 'identify-result-frame');
           });
@@ -1417,10 +1441,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
           body = /*#__PURE__*/React.createElement("div", {
             className: "identify-compare-results",
             style: _style
-          }, results.map(function (_ref29) {
-            var _ref30 = _slicedToArray(_ref29, 2),
-              layerid = _ref30[0],
-              feature = _ref30[1];
+          }, results.map(function (_ref31) {
+            var _ref32 = _slicedToArray(_ref31, 2),
+              layerid = _ref32[0],
+              feature = _ref32[1];
             return _this2.renderResultAttributes(layerid, feature, 'identify-result-frame');
           }));
         } else if (this.state.currentPage < flatResults.length) {
@@ -1455,6 +1479,7 @@ _defineProperty(IdentifyViewer, "propTypes", {
   highlightAllResults: PropTypes.bool,
   identifyResults: PropTypes.object,
   iframeDialogsInitiallyDocked: PropTypes.bool,
+  innerRef: PropTypes.func,
   layers: PropTypes.array,
   longAttributesDisplay: PropTypes.oneOf(['ellipsis', 'wrap']),
   map: PropTypes.object,

package/components/LinkFeatureForm.js

@@ -31,6 +31,7 @@ import { getFeatureTemplate } from '../utils/EditingUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MapUtils from '../utils/MapUtils';
 import AttributeForm from './AttributeForm';
+import Icon from './Icon';
 import './style/LinkFeatureForm.css';
 var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
   function LinkFeatureForm() {
@@ -203,7 +204,9 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
         }, /*#__PURE__*/React.createElement("button", {
           className: "button",
           onClick: this.close
-        }, LocaleUtils.tr("common.close"))));
+        }, /*#__PURE__*/React.createElement(Icon, {
+          icon: "remove"
+        }), LocaleUtils.tr("common.close"))));
       } else if (editContext.feature) {
         var drawing = editContext.action === 'Draw' && !editContext.feature.geometry && this.props.editConfig.geomType;
         return /*#__PURE__*/React.createElement("div", {
@@ -223,7 +226,9 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
         }, /*#__PURE__*/React.createElement("button", {
           className: "button",
           onClick: this.close
-        }, editContext.action === 'Draw' ? LocaleUtils.tr("common.cancel") : LocaleUtils.tr("common.close"))));
+        }, /*#__PURE__*/React.createElement(Icon, {
+          icon: "remove"
+        }), editContext.action === 'Draw' ? LocaleUtils.tr("common.cancel") : LocaleUtils.tr("common.close"))));
       } else {
         return null;
       }