qwc2 2026.8.24 → 2026.8.31

package/components/AttributeForm.js

@@ -257,50 +257,67 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         }
       }
     });
-    _defineProperty(_this, "addRelationRecord", function (table) {
+    _defineProperty(_this, "addRelationRecord", function (dataset) {
       var initialProperties = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      var newRelationValues = _objectSpread({}, _this.props.editContext.feature.relationValues);
-      var editConfig = _this.props.editConfigs[_this.props.editContext.mapPrefix][table.split('.').slice(-1)];
+      var action = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+      var layer = dataset.slice(_this.props.editContext.mapPrefix.length + 1);
+      var editConfig = _this.props.editConfigs[_this.props.editContext.mapPrefix][layer];
       getFeatureTemplate(editConfig, {
         type: "Feature",
         properties: _objectSpread({}, initialProperties)
       }, _this.props.iface, _this.props.editContext.mapPrefix, _this.props.map.projection, function (newRelFeature) {
-        newRelFeature.__status__ = "empty";
+        newRelFeature.__status__ = "new";
         if (editConfig.geomType === null) {
           newRelFeature.geometry = null;
         }
         // If feature id is known, i.e. not when drawing new feature, set foreign key
         if (_this.props.editContext.action !== "Draw") {
-          var relTable = _this.state.relationTables[table];
+          var relTable = _this.state.relationTables[dataset];
           var fkVal = relTable.pkField ? _this.props.editContext.feature.properties[relTable.pkField] : _this.props.editContext.feature.id;
           newRelFeature.properties[relTable.fkField] = fkVal;
         }
-        newRelationValues[table] = _objectSpread({}, newRelationValues[table]);
-        newRelationValues[table].features = newRelationValues[table].features.concat([newRelFeature]);
-        var newFeature = _objectSpread(_objectSpread({}, _this.props.editContext.feature), {}, {
-          relationValues: newRelationValues
-        });
-        _this.props.setEditContext(_this.props.editContext.id, {
-          feature: newFeature,
-          changed: true
-        });
+        if (action) {
+          var childEdit = {
+            action: action,
+            editConfig: editConfig,
+            editContextId: ':' + dataset,
+            idx: null,
+            feature: newRelFeature,
+            finishCallback: _this.finishEditRelationRecord,
+            hideDelete: true
+          };
+          _this.setState({
+            childEdit: childEdit
+          });
+        } else {
+          var newRelationValues = _objectSpread({}, _this.props.editContext.feature.relationValues);
+          newRelationValues[dataset] = _objectSpread({}, newRelationValues[dataset]);
+          newRelationValues[dataset].features = newRelationValues[dataset].features.concat([newRelFeature]);
+          var newFeature = _objectSpread(_objectSpread({}, _this.props.editContext.feature), {}, {
+            relationValues: newRelationValues
+          });
+          _this.props.setEditContext(_this.props.editContext.id, {
+            feature: newFeature,
+            changed: true
+          });
+        }
       });
     });
-    _defineProperty(_this, "reorderRelationRecord", function (table, idx, dir) {
-      var nFeatures = _this.props.editContext.feature.relationValues[table].features.length;
+    _defineProperty(_this, "reorderRelationRecord", function (dataset, idx, dir) {
+      var nFeatures = _this.props.editContext.feature.relationValues[dataset].features.length;
       if (dir < 0 && idx === 0 || dir > 0 && idx >= nFeatures - 1) {
         return;
       }
       var newRelationValues = _objectSpread({}, _this.props.editContext.feature.relationValues);
-      newRelationValues[table] = _objectSpread({}, newRelationValues[table]);
-      var newFeatures = newRelationValues[table].features.slice(0);
+      newRelationValues[dataset] = _objectSpread({}, newRelationValues[dataset]);
+      var newFeatures = newRelationValues[dataset].features.slice(0);
       var offset = dir < 0 ? 0 : 1;
       newFeatures.splice(idx - 1 + offset, 2, newFeatures[idx + offset], newFeatures[idx - 1 + offset]);
       newFeatures[idx - 1 + offset].properties = _objectSpread({}, newFeatures[idx - 1 + offset].properties);
       newFeatures[idx + offset].properties = _objectSpread({}, newFeatures[idx + offset].properties);
-      newFeatures[idx - 1 + offset].__status__ = ["new", "empty"].includes(newFeatures[idx - 1 + offset].__status__) ? "new" : "changed";
-      newFeatures[idx + offset].__status__ = ["new", "empty"].includes(newFeatures[idx + offset].__status__) ? "new" : "changed";
-      newRelationValues[table].features = newFeatures;
+      newFeatures[idx - 1 + offset].__status__ = newFeatures[idx - 1 + offset].__status__ === "new" ? "new" : "changed";
+      newFeatures[idx + offset].__status__ = newFeatures[idx + offset].__status__ === "new" ? "new" : "changed";
+      newRelationValues[dataset].features = newFeatures;
       var newFeature = _objectSpread(_objectSpread({}, _this.props.editContext.feature), {}, {
         relationValues: newRelationValues
       });
@@ -309,16 +326,16 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         changed: true
       });
     });
-    _defineProperty(_this, "removeRelationRecord", function (table, idx) {
+    _defineProperty(_this, "removeRelationRecord", function (dataset, idx) {
       var newRelationValues = _objectSpread({}, _this.props.editContext.feature.relationValues);
-      newRelationValues[table] = _objectSpread({}, newRelationValues[table]);
-      newRelationValues[table].features = newRelationValues[table].features.slice(0);
-      var fieldStatus = newRelationValues[table].features[idx].__status__ || "";
+      newRelationValues[dataset] = _objectSpread({}, newRelationValues[dataset]);
+      newRelationValues[dataset].features = newRelationValues[dataset].features.slice(0);
+      var fieldStatus = newRelationValues[dataset].features[idx].__status__ || "";
       // If field was new, delete it directly, else mark it as deleted
-      if (["new", "empty"].includes(fieldStatus)) {
-        newRelationValues[table].features.splice(idx, 1);
+      if (fieldStatus === "new") {
+        newRelationValues[dataset].features.splice(idx, 1);
       } else {
-        newRelationValues[table].features[idx] = _objectSpread(_objectSpread({}, newRelationValues[table].features[idx]), {}, {
+        newRelationValues[dataset].features[idx] = _objectSpread(_objectSpread({}, newRelationValues[dataset].features[idx]), {}, {
           __status__: fieldStatus.startsWith("deleted") ? fieldStatus.substr(8) : "deleted:" + fieldStatus
         });
       }
@@ -330,13 +347,13 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         changed: true
       });
     });
-    _defineProperty(_this, "updateRelationField", function (table, idx, key, value) {
+    _defineProperty(_this, "updateRelationField", function (dataset, idx, key, value) {
       var newRelationValues = _objectSpread({}, _this.props.editContext.feature.relationValues);
-      newRelationValues[table] = _objectSpread({}, newRelationValues[table]);
-      newRelationValues[table].features = newRelationValues[table].features.slice(0);
-      newRelationValues[table].features[idx] = _objectSpread(_objectSpread({}, newRelationValues[table].features[idx]), {}, {
-        properties: _objectSpread(_objectSpread({}, newRelationValues[table].features[idx].properties), {}, _defineProperty({}, key, value)),
-        __status__: ["new", "empty"].includes(newRelationValues[table].features[idx].__status__) ? "new" : "changed"
+      newRelationValues[dataset] = _objectSpread({}, newRelationValues[dataset]);
+      newRelationValues[dataset].features = newRelationValues[dataset].features.slice(0);
+      newRelationValues[dataset].features[idx] = _objectSpread(_objectSpread({}, newRelationValues[dataset].features[idx]), {}, {
+        properties: _objectSpread(_objectSpread({}, newRelationValues[dataset].features[idx].properties), {}, _defineProperty({}, key, value)),
+        __status__: newRelationValues[dataset].features[idx].__status__ === "new" ? "new" : "changed"
       });
       var newFeature = _objectSpread(_objectSpread({}, _this.props.editContext.feature), {}, {
         relationValues: newRelationValues
@@ -346,19 +363,17 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         changed: true
       });
     });
-    _defineProperty(_this, "editRelationRecord", function (action, layer, idx, displayField) {
-      var dataset = _this.props.editContext.mapPrefix + "." + layer;
+    _defineProperty(_this, "editRelationRecord", function (dataset, idx) {
+      var layer = dataset.slice(_this.props.editContext.mapPrefix.length + 1);
       var editConfig = _this.props.editConfigs[_this.props.editContext.mapPrefix][layer];
-      var feature = _this.props.editContext.feature.relationValues[dataset].features[idx];
+      var feature = _this.props.editContext.feature.relationValues[editConfig.editDataset].features[idx];
       var childEdit = {
-        action: action,
+        action: feature.__status__ === 'new' ? 'Create' : 'Edit',
         editConfig: editConfig,
-        editContextId: ':' + layer,
-        dataset: dataset,
+        editContextId: ':' + dataset,
         idx: idx,
         feature: feature,
         finishCallback: _this.finishEditRelationRecord,
-        displayField: displayField,
         hideDelete: true
       };
       _this.setState({
@@ -368,22 +383,22 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "finishEditRelationRecord", function (feature) {
       _this.props.clearEditContext(_this.state.childEdit.editContextId, _this.props.editContext.id);
       if (feature) {
-        var table = _this.state.childEdit.dataset;
-        var idx = _this.state.childEdit.idx;
+        var _this$state$childEdit;
+        var dataset = _this.state.childEdit.editConfig.editDataset;
         var newRelationValues = _objectSpread({}, _this.props.editContext.feature.relationValues);
-        newRelationValues[table] = _objectSpread({}, newRelationValues[table]);
-        newRelationValues[table].features = newRelationValues[table].features.slice(0);
-        newRelationValues[table].features[idx] = _objectSpread(_objectSpread({}, feature), {}, {
-          properties: _objectSpread({}, feature.properties)
+        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[table];
+        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[table].fkField;
+        var fkField = _this.state.relationTables[dataset].fkField;
         if (_this.props.editContext.action !== "Draw" && feature.properties[fkField] !== fkVal) {
-          newRelationValues[table].features[idx].properties[fkField] = fkVal;
-          newRelationValues[table].features[idx].__status__ = "changed";
+          newRelationValues[dataset].features[idx].properties = _objectSpread(_objectSpread({}, newRelationValues[dataset].features[idx].properties), {}, _defineProperty({}, fkField, fkVal));
           changed = true;
         }
         var newFeature = _objectSpread(_objectSpread({}, _this.props.editContext.feature), {}, {
@@ -586,9 +601,6 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
               relationValues[datasetname].features[index].defaultedProperties = [].concat(_toConsumableArray(relationValues[datasetname].features[index].defaultedProperties || []), [field]);
             }
             relationValues[datasetname].features[index].properties[field] = value;
-            if (relationValues[datasetname].features[index].__status__ === "empty") {
-              relationValues[datasetname].features[index].__status__ = "new";
-            }
             if (element.type === "file" && element.files.length > 0) {
               relationUploads[name] = element.files[0];
               relationValues[datasetname].features[index].properties[field] = "";
@@ -684,9 +696,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
 
       // Set relation values CRS and sort index if necessary
       Object.keys(relationValues).forEach(function (relTable) {
-        relationValues[relTable].features = relationValues[relTable].features.filter(function (relFeature) {
-          return relFeature.__status__ !== "empty";
-        }).map(function (relFeature, idx) {
+        relationValues[relTable].features = relationValues[relTable].features.map(function (relFeature, idx) {
           var newRelFeature = _objectSpread(_objectSpread({}, relFeature), {}, {
             crs: {
               type: "name",
@@ -857,7 +867,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         type: mimeString
       });
     });
-    _defineProperty(_this, "startChildEdit", function (action, layer, featureId, updateField, displayField) {
+    _defineProperty(_this, "startChildEdit", function (action, layer, featureId, updateField) {
       var editConfig = _this.props.editConfigs[_this.props.editContext.mapPrefix][layer];
       if (!editConfig) {
         // eslint-disable-next-line
@@ -867,7 +877,6 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
           action: action,
           editConfig: editConfig,
           editContextId: ':' + layer,
-          displayField: displayField,
           featureId: featureId,
           updateField: updateField,
           finishCallback: _this.finishChildEdit,

package/components/AttributeTableWidget.js

@@ -56,6 +56,7 @@ import LayerUtils from '../utils/LayerUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MapUtils from '../utils/MapUtils';
 import VectorLayerUtils from '../utils/VectorLayerUtils';
+import ComboBox from './widgets/ComboBox';
 import FeaturesTable from './widgets/FeaturesTable';
 import './style/AttributeTableWidget.css';
 var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
@@ -215,7 +216,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       var forceReload = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var stateChange = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       _this.setState(function (state) {
-        var _this$props$filter$fi, _newState$curEditConf, _fieldMap$newState$fi, _fieldMap$newState$so, _newState$sortField;
+        var _this$props$layers$fi, _this$props$layers$fi2, _this$props$filter$fi, _newState$curEditConf, _fieldMap$newState$fi, _fieldMap$newState$so, _newState$sortField;
         selectedLayer = selectedLayer || state.selectedLayer;
         var _selectedLayer$split = selectedLayer.split("#"),
           _selectedLayer$split2 = _slicedToArray(_selectedLayer$split, 2),
@@ -223,27 +224,27 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           layerName = _selectedLayer$split2[1];
         var newState = _objectSpread(_objectSpread({}, state), stateChange);
         var editConfig = _this.props.editConfigs[wmsName][layerName];
+        var fieldTranslations = (_this$props$layers$fi = (_this$props$layers$fi2 = _this.props.layers.find(function (layer) {
+          return layer.wms_name === wmsName;
+        })) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2.translations) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2.layers) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2[layerName]) === null || _this$props$layers$fi2 === void 0 ? void 0 : _this$props$layers$fi2.fields) !== null && _this$props$layers$fi !== void 0 ? _this$props$layers$fi : {};
         var fields = (_this.props.showDisplayFieldOnly ? editConfig.fields.filter(function (field) {
           return field.name === editConfig.displayField;
         }) : editConfig.fields.filter(function (field) {
           var _field$constraints;
           return _this.props.showHiddenFields || ((_field$constraints = field.constraints) === null || _field$constraints === void 0 ? void 0 : _field$constraints.hidden) !== true;
         })).map(function (field) {
+          var _fieldTranslations$fi;
           return _objectSpread(_objectSpread({}, field), {}, {
-            name: _this.translateFieldName(field.name)
+            name: (_fieldTranslations$fi = fieldTranslations === null || fieldTranslations === void 0 ? void 0 : fieldTranslations[field.name]) !== null && _fieldTranslations$fi !== void 0 ? _fieldTranslations$fi : field.name
           });
         });
         if (selectedLayer !== state.loadedLayer) {
-          var _this$props$layers$fi, _this$props$layers$fi2;
           KeyValCache.clear();
           FeatureCache.clear();
           Object.assign(newState, AttributeTableWidget.defaultState);
           newState.limitToExtent = state.limitToExtent;
           newState.curEditConfig = editConfig;
           newState.curFields = fields;
-          newState.fieldTranslations = (_this$props$layers$fi = (_this$props$layers$fi2 = _this.props.layers.find(function (layer) {
-            return layer.wms_name === wmsName;
-          })) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2.translations) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2.layers) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2[layerName]) === null || _this$props$layers$fi2 === void 0 ? void 0 : _this$props$layers$fi2.fields) !== null && _this$props$layers$fi !== void 0 ? _this$props$layers$fi : {};
         }
         newState.selectedLayer = selectedLayer;
         newState.selectedFeatures = {};
@@ -706,10 +707,6 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
         }, options);
       }
     });
-    _defineProperty(_this, "translateFieldName", function (fieldName) {
-      var _this$state$fieldTran, _this$state$fieldTran2;
-      return (_this$state$fieldTran = (_this$state$fieldTran2 = _this.state.fieldTranslations) === null || _this$state$fieldTran2 === void 0 ? void 0 : _this$state$fieldTran2[fieldName]) !== null && _this$state$fieldTran !== void 0 ? _this$state$fieldTran : fieldName;
-    });
     _this.changedFiles = {};
     _this.state = AttributeTableWidget.defaultState;
     _this.table = null;
@@ -827,17 +824,17 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           if (fieldConfig.constraints.keyvalrel) {
             values = KeyValCache.getSync(this.props.iface, fieldConfig.constraints.keyvalrel);
           }
-          valueInput = /*#__PURE__*/React.createElement("select", {
+          valueInput = /*#__PURE__*/React.createElement(ComboBox, {
             className: "attribtable-filter-value",
             disabled: footbarDisabled,
-            onChange: function onChange(ev) {
-              return _this2.updateFilter("filterVal", ev.target.value);
+            onChange: function onChange(value) {
+              return _this2.updateFilter("filterVal", value);
             },
             value: this.state.filterVal
-          }, /*#__PURE__*/React.createElement("option", {
+          }, /*#__PURE__*/React.createElement("div", {
             value: ""
           }, LocaleUtils.tr("common.select")), values.map(function (entry) {
-            return /*#__PURE__*/React.createElement("option", {
+            return /*#__PURE__*/React.createElement("div", {
               key: entry.value,
               value: entry.value
             }, entry.label);
@@ -874,44 +871,46 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           className: "attribtable-filter controlgroup"
         }, /*#__PURE__*/React.createElement(Icon, {
           icon: "filter"
-        }), /*#__PURE__*/React.createElement("select", {
+        }), /*#__PURE__*/React.createElement(ComboBox, {
           disabled: footbarDisabled,
-          onChange: function onChange(ev) {
-            return _this2.updateFilter("filterField", ev.target.value);
+          onChange: function onChange(value) {
+            return _this2.updateFilter("filterField", value);
           },
           value: this.state.filterField
-        }, /*#__PURE__*/React.createElement("option", {
+        }, /*#__PURE__*/React.createElement("div", {
           disabled: true,
           value: ""
-        }, LocaleUtils.tr("common.select")), showIdColumn ? /*#__PURE__*/React.createElement("option", {
+        }, LocaleUtils.tr("common.select")), showIdColumn ? /*#__PURE__*/React.createElement("div", {
           value: "<id>"
-        }, this.translateFieldName(primaryKey)) : null, this.state.curFields.map(function (field) {
+        }, this.state.curFields.find(function (field) {
+          return field.id === primaryKey;
+        }).name) : null, this.state.curFields.map(function (field) {
           if (field.id !== primaryKey) {
             return /*#__PURE__*/React.createElement("option", {
               key: field.id,
               value: field.id
-            }, _this2.translateFieldName(field.name));
+            }, field.name);
           }
           return null;
-        })), /*#__PURE__*/React.createElement("select", {
+        })), /*#__PURE__*/React.createElement(ComboBox, {
           disabled: footbarDisabled,
-          onChange: function onChange(ev) {
-            return _this2.updateFilter("filterOp", ev.target.value);
+          onChange: function onChange(value) {
+            return _this2.updateFilter("filterOp", value);
           },
           value: this.state.filterOp
-        }, /*#__PURE__*/React.createElement("option", {
+        }, /*#__PURE__*/React.createElement("div", {
           value: "~"
-        }, "~"), /*#__PURE__*/React.createElement("option", {
+        }, "~"), /*#__PURE__*/React.createElement("div", {
           value: "="
-        }, "="), /*#__PURE__*/React.createElement("option", {
+        }, "="), /*#__PURE__*/React.createElement("div", {
           value: "!="
-        }, "!="), /*#__PURE__*/React.createElement("option", {
+        }, "!="), /*#__PURE__*/React.createElement("div", {
           value: ">"
-        }, ">"), /*#__PURE__*/React.createElement("option", {
+        }, ">"), /*#__PURE__*/React.createElement("div", {
           value: ">="
-        }, ">="), /*#__PURE__*/React.createElement("option", {
+        }, ">="), /*#__PURE__*/React.createElement("div", {
           value: "<="
-        }, "<="), /*#__PURE__*/React.createElement("option", {
+        }, "<="), /*#__PURE__*/React.createElement("div", {
           value: "<"
         }, "<")), valueInput), this.props.showLimitToExtent ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("input", {
           checked: this.state.limitToExtent,
@@ -988,19 +987,19 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
         className: "AttributeTable"
       }, /*#__PURE__*/React.createElement("div", {
         className: "attribtable-toolbar"
-      }, this.props.showLayerSelection ? /*#__PURE__*/React.createElement("select", {
+      }, this.props.showLayerSelection ? /*#__PURE__*/React.createElement(ComboBox, {
         disabled: loading || editing,
-        onChange: function onChange(ev) {
+        onChange: function onChange(value) {
           return _this2.setState({
-            selectedLayer: ev.target.value
+            selectedLayer: value
           });
         },
         value: this.state.selectedLayer || ""
-      }, /*#__PURE__*/React.createElement("option", {
+      }, /*#__PURE__*/React.createElement("div", {
         disabled: true,
         value: ""
       }, LocaleUtils.tr("common.selectlayer")), editLayers.map(function (entry) {
-        return /*#__PURE__*/React.createElement("option", {
+        return /*#__PURE__*/React.createElement("div", {
           key: entry.value,
           value: entry.value
         }, entry.title);
@@ -1128,7 +1127,6 @@ _defineProperty(AttributeTableWidget, "defaultState", {
   loadedLayer: "",
   curEditConfig: null,
   curFields: null,
-  fieldTranslations: null,
   features: [],
   allFeatures: null,
   totFeatureCount: 0,