qwc2 2026.9.10 → 2026.9.17

package/components/AttributeForm.js

@@ -223,6 +223,15 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "setRelationTables", function (relationTables) {
       _this.setState({
         relationTables: relationTables
+      }, function () {
+        if (_this.needRelationValueReload) {
+          _this.needRelationValueReload = false;
+          _this.loadRelationValues(_this.props.editContext.feature, function (newFeature) {
+            _this.props.setEditContext(_this.props.editContext.id, {
+              feature: newFeature
+            });
+          });
+        }
       });
     });
     _defineProperty(_this, "loadRelationValues", function (feature, callback) {
@@ -255,6 +264,8 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
           });
           callback(newFeature);
         }
+      } else {
+        callback(feature);
       }
     });
     _defineProperty(_this, "addRelationRecord", function (dataset) {
@@ -290,9 +301,10 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
             childEdit: childEdit
           });
         } else {
+          var _newRelationValues$da;
           var newRelationValues = _objectSpread({}, _this.props.editContext.feature.relationValues);
           newRelationValues[dataset] = _objectSpread({}, newRelationValues[dataset]);
-          newRelationValues[dataset].features = newRelationValues[dataset].features.concat([newRelFeature]);
+          newRelationValues[dataset].features = ((_newRelationValues$da = newRelationValues[dataset].features) !== null && _newRelationValues$da !== void 0 ? _newRelationValues$da : []).concat([newRelFeature]);
           var newFeature = _objectSpread(_objectSpread({}, _this.props.editContext.feature), {}, {
             relationValues: newRelationValues
           });
@@ -389,24 +401,12 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         var idx = (_this$state$childEdit = _this.state.childEdit.idx) !== null && _this$state$childEdit !== void 0 ? _this$state$childEdit : newRelationValues[dataset].features.length;
         newRelationValues[dataset] = _objectSpread({}, newRelationValues[dataset]);
         newRelationValues[dataset].features = newRelationValues[dataset].features.slice(0);
-        newRelationValues[dataset].features[idx] = _objectSpread(_objectSpread({}, feature), {}, {
-          __status__: "changed"
-        });
-        // If feature id is known, i.e. not when drawing new feature, set foreign key
-        var changed = _this.props.editContext.changed;
-        var relTable = _this.state.relationTables[dataset];
-        var fkVal = relTable.pkField ? _this.props.editContext.feature.properties[relTable.pkField] : _this.props.editContext.feature.id;
-        var fkField = _this.state.relationTables[dataset].fkField;
-        if (_this.props.editContext.action !== "Draw" && feature.properties[fkField] !== fkVal) {
-          newRelationValues[dataset].features[idx].properties = _objectSpread(_objectSpread({}, newRelationValues[dataset].features[idx].properties), {}, _defineProperty({}, fkField, fkVal));
-          changed = true;
-        }
+        newRelationValues[dataset].features[idx] = feature;
         var newFeature = _objectSpread(_objectSpread({}, _this.props.editContext.feature), {}, {
           relationValues: newRelationValues
         });
         _this.props.setEditContext(_this.props.editContext.id, {
-          feature: newFeature,
-          changed: changed
+          feature: newFeature
         });
       }
       _this.setState({
@@ -426,20 +426,13 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
               _this.setState({
                 busy: false
               });
-              if (!isEmpty(_this.state.relationTables)) {
-                // Re-load relation values
-                _this.loadRelationValues(feature, function (newFeature) {
-                  _this.props.setEditContext(_this.props.editContext.id, {
-                    feature: newFeature,
-                    changed: false
-                  });
-                });
-              } else {
+              // Re-load relation values
+              _this.loadRelationValues(feature, function (newFeature) {
                 _this.props.setEditContext(_this.props.editContext.id, {
-                  feature: feature,
+                  feature: newFeature,
                   changed: false
                 });
-              }
+              });
             });
           } else {
             var featureSkel = {
@@ -754,27 +747,44 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         }
       }
     });
-    _defineProperty(_this, "featureCommited", function (success, result) {
-      if (!success) {
-        _this.commitFinished(false, result);
-        return;
-      }
-      // Check for relation records which failed to commit
-      var relationValueErrors = Object.values(result.relationValues || []).find(function (entry) {
-        return (entry.features || []).find(function (f) {
-          return f.error;
-        });
-      }) !== undefined;
-      if (relationValueErrors) {
-        // Relation values commit failed, switch to pick to avoid adding feature again on next attempt
-        _this.commitFinished(false, LocaleUtils.tr("editing.relationcommitfailed"));
-        _this.props.setEditContext(_this.props.editContext.id, {
-          action: "Pick",
-          feature: result,
-          changed: true
+    _defineProperty(_this, "featureCommited", function (success, featureOrErrmsg) {
+      _this.setState({
+        busy: false
+      });
+      if (success) {
+        _this.props.refreshLayer(function (layer) {
+          return layer.wms_name === _this.props.editContext.mapPrefix;
         });
+        _this.props.setCurrentTaskBlocked(false);
+        // Check for relation records which failed to commit
+        var relationValueErrors = Object.values(featureOrErrmsg.relationValues || []).find(function (entry) {
+          return (entry.features || []).find(function (f) {
+            return f.error;
+          });
+        }) !== undefined;
+        if (relationValueErrors) {
+          // eslint-disable-next-line
+          alert(LocaleUtils.tr("editing.relationcommitfailed"));
+          // Switch to Pick mode to avoid recommitting new feature
+          _this.props.setEditContext(_this.props.editContext.id, {
+            action: 'Pick',
+            feature: featureOrErrmsg,
+            changed: true
+          });
+        } else {
+          _this.loadRelationValues(featureOrErrmsg, function (newFeature) {
+            var _this$props$onCommit, _this$props;
+            _this.props.setEditContext(_this.props.editContext.id, {
+              action: 'Pick',
+              feature: newFeature,
+              changed: false
+            });
+            (_this$props$onCommit = (_this$props = _this.props).onCommit) === null || _this$props$onCommit === void 0 || _this$props$onCommit.call(_this$props, newFeature);
+          });
+        }
       } else {
-        _this.commitFinished(true, result);
+        // eslint-disable-next-line
+        alert(featureOrErrmsg);
       }
     });
     _defineProperty(_this, "deleteClicked", function () {
@@ -800,38 +810,6 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         _this.props.setCurrentTaskBlocked(false);
       }
     });
-    _defineProperty(_this, "commitFinished", function (success, result) {
-      _this.setState({
-        busy: false
-      });
-      if (success) {
-        _this.props.refreshLayer(function (layer) {
-          return layer.wms_name === _this.props.editContext.mapPrefix;
-        });
-        _this.props.setCurrentTaskBlocked(false);
-        if (!_this.props.onCommit || !_this.props.onCommit(result)) {
-          if (!isEmpty(_this.state.relationTables)) {
-            // Re-load relation values
-            _this.loadRelationValues(result, function (newFeature) {
-              _this.props.setEditContext(_this.props.editContext.id, {
-                action: 'Pick',
-                feature: newFeature,
-                changed: false
-              });
-            });
-          } else {
-            _this.props.setEditContext(_this.props.editContext.id, {
-              action: 'Pick',
-              feature: result,
-              changed: false
-            });
-          }
-        }
-      } else {
-        // eslint-disable-next-line
-        alert(result);
-      }
-    });
     _defineProperty(_this, "deleteFinished", function (success, result) {
       _this.setState({
         busy: false
@@ -897,13 +875,14 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
       });
     });
     _this.form = null;
+    _this.needRelationValueReload = false;
     return _this;
   }
   _inherits(AttributeForm, _React$Component);
   return _createClass(AttributeForm, [{
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps, prevState) {
-      var _this2 = this;
+      var _prevProps$editContex;
       if (prevProps.editContext.changed !== this.props.editContext.changed) {
         this.props.setCurrentTaskBlocked(this.props.editContext.changed === true, LocaleUtils.tr("editing.unsavedchanged"));
       }
@@ -913,14 +892,8 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         });
       }
       // Reload relation values if necessary
-      var feature = this.props.editContext.feature;
-      var prevFeature = prevProps.editContext.feature;
-      if ((!this.props.editContext.changed || !feature.relationValues) && (this.state.relationTables !== prevState.relationTables || feature.id !== (prevFeature || {}).id)) {
-        this.loadRelationValues(this.props.editContext.feature, function (newFeature) {
-          _this2.props.setEditContext(_this2.props.editContext.id, {
-            feature: newFeature
-          });
-        });
+      if (this.props.editContext.feature !== ((_prevProps$editContex = prevProps.editContext.feature) === null || _prevProps$editContex === void 0 ? void 0 : _prevProps$editContex.id)) {
+        this.needRelationValueReload = true;
       }
       if (this.props.editContext.feature !== prevProps.editContext.feature) {
         this.validateForm(this.props.editContext.feature);

package/components/AutoEditForm.js

@@ -35,6 +35,7 @@ import PropTypes from 'prop-types';
 import EditComboField from './EditComboField';
 import EditUploadField from './EditUploadField';
 import NumberInput from './widgets/NumberInput';
+import TextInput from './widgets/TextInput';
 import ToggleSwitch from './widgets/ToggleSwitch';
 import './style/AutoEditForm.css';
 var AutoEditForm = /*#__PURE__*/function (_React$Component) {
@@ -85,9 +86,7 @@ var AutoEditForm = /*#__PURE__*/function (_React$Component) {
           _constraints$keyvalre2 = _slicedToArray(_constraints$keyvalre, 2),
           mapPrefix = _constraints$keyvalre2[0],
           keyvalrel = _constraints$keyvalre2[1];
-        input = /*#__PURE__*/React.createElement("span", {
-          className: "input-frame"
-        }, /*#__PURE__*/React.createElement(EditComboField, {
+        input = /*#__PURE__*/React.createElement(EditComboField, {
           editIface: _this.props.iface,
           fieldId: field.id,
           keyvalrel: keyvalrel,
@@ -98,7 +97,7 @@ var AutoEditForm = /*#__PURE__*/function (_React$Component) {
           updateField: _this.props.updateField,
           value: value,
           values: constraints.values
-        }));
+        });
       } else if (field.type === "number") {
         var precision = constraints.step > 0 ? Math.ceil(-Math.log10(constraints.step)) : 0;
         input = /*#__PURE__*/React.createElement(NumberInput, {
@@ -116,42 +115,26 @@ var AutoEditForm = /*#__PURE__*/function (_React$Component) {
       } else if (field.type === "date") {
         // Truncate time portion of ISO date string
         value = value.substr(0, 10);
-        input = /*#__PURE__*/React.createElement("span", {
-          className: "input-frame"
-        }, /*#__PURE__*/React.createElement("input", _extends({
+        input = /*#__PURE__*/React.createElement("input", _extends({
           name: field.id,
-          type: field.type
+          type: "date"
         }, constraints, {
           onChange: function onChange(ev) {
             return _this.props.updateField(field.id, ev.target.value);
           },
           value: value
-        })));
+        }));
       } else if (field.type === "text") {
-        if (multiline) {
-          input = /*#__PURE__*/React.createElement("textarea", {
-            name: field.id,
-            onChange: function onChange(ev) {
-              return _this.props.updateField(field.id, ev.target.value);
-            },
-            readOnly: readOnly,
-            required: constraints.required,
-            value: value
-          });
-        } else {
-          input = /*#__PURE__*/React.createElement("span", {
-            className: "input-frame"
-          }, /*#__PURE__*/React.createElement("input", {
-            name: field.id,
-            onChange: function onChange(ev) {
-              return _this.props.updateField(field.id, ev.target.value);
-            },
-            readOnly: readOnly,
-            required: constraints.required,
-            type: field.type,
-            value: value
-          }));
-        }
+        input = /*#__PURE__*/React.createElement(TextInput, {
+          multiline: multiline,
+          name: field.id,
+          onChange: function onChange(text) {
+            return _this.props.updateField(field.id, text);
+          },
+          readOnly: readOnly,
+          required: constraints.required,
+          value: value
+        });
       } else if (field.type === "file") {
         input = /*#__PURE__*/React.createElement(EditUploadField, {
           constraints: constraints,
@@ -163,9 +146,7 @@ var AutoEditForm = /*#__PURE__*/function (_React$Component) {
           value: value
         });
       } else {
-        input = /*#__PURE__*/React.createElement("span", {
-          className: "input-frame"
-        }, /*#__PURE__*/React.createElement("input", _extends({
+        input = /*#__PURE__*/React.createElement("input", _extends({
           name: field.id,
           type: field.type
         }, constraints, {
@@ -173,7 +154,7 @@ var AutoEditForm = /*#__PURE__*/function (_React$Component) {
             return _this.props.updateField(field.id, ev.target.value);
           },
           value: value
-        })));
+        }));
       }
       return /*#__PURE__*/React.createElement("tr", {
         key: field.id

package/components/EditUploadField.js

@@ -195,8 +195,6 @@ var EditUploadField = /*#__PURE__*/function (_React$Component) {
     });
     _this.cameraStream = null;
     _this.videoElement = null;
-    _this.portal = document.createElement("div");
-    document.body.appendChild(_this.portal);
     return _this;
   }
   _inherits(EditUploadField, _React$Component);

package/components/LinkFeatureForm.js

@@ -68,7 +68,7 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "close", function () {
       var editContext = _this.props.editing.contexts[_this.props.editContextId];
-      _this.props.finished(editContext.action === 'Draw' ? null : editContext.feature);
+      _this.props.finished(editContext.action === 'Pick' ? editContext.feature : null);
     });
     _defineProperty(_this, "hoverFeature", function (feature) {
       var layer = {
@@ -99,8 +99,13 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
         }
       }
     });
+    _defineProperty(_this, "onCommit", function (result) {
+      _this.props.finished(result);
+      return true;
+    });
     _defineProperty(_this, "onDiscard", function () {
       _this.props.finished(null);
+      return true;
     });
     return _this;
   }
@@ -133,14 +138,15 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
             }
           });
         }
-      } else if (this.props.action === 'Create') {
+      } else if (this.props.action === 'Create' || this.props.action === 'PickGeometry') {
         var featureSkel = _objectSpread({
           type: "Feature",
           properties: {}
         }, this.props.feature);
+        var editAction = this.props.action === 'Create' ? 'Draw' : this.props.action;
         getFeatureTemplate(this.props.editConfig, featureSkel, this.props.iface, this.props.mapPrefix, this.props.map.projection, function (feature) {
           _this2.props.setEditContext(_this2.props.editContextId, {
-            action: 'Draw',
+            action: editAction,
             geomType: _this2.props.editConfig.geomType,
             feature: feature,
             editConfig: _this2.props.editConfig,
@@ -203,6 +209,19 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
         }, /*#__PURE__*/React.createElement(Icon, {
           icon: "remove"
         }), LocaleUtils.tr("common.close"))));
+      } else if (editContext.action === 'PickGeometry') {
+        return /*#__PURE__*/React.createElement("div", {
+          className: "link-feature-form"
+        }, /*#__PURE__*/React.createElement("div", {
+          className: "link-feature-form-hint"
+        }, /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("linkfeatureform.pickhint"))), /*#__PURE__*/React.createElement("div", {
+          className: "link-feature-form-close"
+        }, /*#__PURE__*/React.createElement("button", {
+          className: "button",
+          onClick: this.close
+        }, /*#__PURE__*/React.createElement(Icon, {
+          icon: "remove"
+        }), LocaleUtils.tr("common.cancel"))));
       } else if (editContext.feature) {
         var drawing = editContext.action === 'Draw' && !editContext.feature.geometry && this.props.editConfig.geomType;
         return /*#__PURE__*/React.createElement("div", {
@@ -214,6 +233,7 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
           hideDelete: this.props.hideDelete,
           iface: this.props.iface,
           nested: true,
+          onCommit: this.onCommit,
           onDiscard: this.onDiscard,
           readOnly: this.props.readOnly,
           translations: this.props.translations

package/components/PluginsContainer.js

@@ -37,6 +37,7 @@ import PluginStore from '../utils/PluginStore';
 import ProcessNotifications from './ProcessNotifications';
 import WindowManager from './WindowManager';
 import './style/PluginsContainer.css';
+export var AppRootPortalContext = /*#__PURE__*/React.createContext(null);
 export var MapButtonPortalContext = /*#__PURE__*/React.createContext(null);
 export var MapContainerPortalContext = /*#__PURE__*/React.createContext(null);
 export var AppInfosPortalContext = /*#__PURE__*/React.createContext(null);
@@ -50,6 +51,7 @@ var PluginsContainer = /*#__PURE__*/function (_React$Component) {
     }
     _this = _callSuper(this, PluginsContainer, [].concat(args));
     _defineProperty(_this, "state", {
+      rootRef: null,
       mapButtonsContainerRef: null,
       mapContainerRef: null,
       appInfosContainerRef: null,
@@ -76,6 +78,9 @@ var PluginsContainer = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_this, "setupTouchEvents", function (el) {
+      _this.setState({
+        rootRef: el
+      });
       if (el) {
         el.addEventListener('touchstart', function (ev) {
           _this.touchY = ev.targetTouches[0].clientY;
@@ -245,10 +250,12 @@ var PluginsContainer = /*#__PURE__*/function (_React$Component) {
         right: 'calc(' + right + 'px)',
         bottom: 'calc(var(--bottombar-height) + ' + bottom + 'px)'
       };
-      var haveRefs = this.state.mapButtonsContainerRef && this.state.mapContainerRef && this.state.appInfosContainerRef && this.state.bottomToolContainerRef;
+      var haveRefs = this.state.rootRef && this.state.mapButtonsContainerRef && this.state.mapContainerRef && this.state.appInfosContainerRef && this.state.bottomToolContainerRef;
       return /*#__PURE__*/React.createElement("div", {
         className: "plugins-container " + ((_this$props$className = this.props.className) !== null && _this$props$className !== void 0 ? _this$props$className : ""),
         ref: this.setupTouchEvents
+      }, /*#__PURE__*/React.createElement(AppRootPortalContext.Provider, {
+        value: this.state.rootRef
       }, /*#__PURE__*/React.createElement(AppInfosPortalContext.Provider, {
         value: this.state.appInfosContainerRef
       }, /*#__PURE__*/React.createElement(MapButtonPortalContext.Provider, {
@@ -257,7 +264,7 @@ var PluginsContainer = /*#__PURE__*/function (_React$Component) {
         value: this.state.mapContainerRef
       }, /*#__PURE__*/React.createElement(BottomToolPortalContext.Provider, {
         value: this.state.bottomToolContainerRef
-      }, haveRefs ? this.renderPlugins() : null, haveRefs ? this.props.children : null)))), /*#__PURE__*/React.createElement(WindowManager, null), /*#__PURE__*/React.createElement("div", {
+      }, haveRefs ? this.renderPlugins() : null, haveRefs ? this.props.children : null))))), /*#__PURE__*/React.createElement(WindowManager, null), /*#__PURE__*/React.createElement("div", {
         className: "map-buttons-container",
         ref: this.setButtonContainerRef,
         style: mapContainerStyle