qwc2 2025.11.5 → 2025.11.12

package/components/AttributeTableWidget.js

@@ -1,17 +1,17 @@
 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 _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 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 _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 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; }
@@ -93,37 +93,43 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_this, "reload", function () {
-      var layerName = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+      var selectedLayer = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
       _this.setState(function (state) {
         var _this$props$filter$fi;
-        var selectedLayer = layerName || state.selectedLayer;
-        var editConfig = _this.props.theme.editConfig || {};
-        var currentEditConfig = editConfig[selectedLayer];
+        selectedLayer = selectedLayer || state.selectedLayer;
+        var _selectedLayer$split = selectedLayer.split("#"),
+          _selectedLayer$split2 = _slicedToArray(_selectedLayer$split, 2),
+          wmsName = _selectedLayer$split2[0],
+          layerName = _selectedLayer$split2[1];
+        var editConfig = _this.props.editConfigs[wmsName][layerName];
         KeyValCache.clear();
         FeatureCache.clear();
         var bbox = _this.state.limitToExtent ? _this.props.mapBbox.bounds : null;
-        _this.props.iface.getFeatures(currentEditConfig, _this.props.mapCrs, function (result) {
+        _this.props.iface.getFeatures(editConfig, _this.props.mapCrs, function (result) {
           if (result) {
+            var _this$props$layers$fi, _this$props$layers$fi2;
             var features = result.features || [];
+            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 : {};
             _this.setState(function (state2) {
               return {
                 loading: false,
                 features: features,
                 filteredSortedFeatures: _this.filteredSortedFeatures(features, state2),
-                loadedLayer: selectedLayer
+                loadedLayer: selectedLayer,
+                curEditConfig: editConfig,
+                curFieldTranslations: fieldTranslations
               };
             });
           } else {
             // eslint-disable-next-line
             alert(LocaleUtils.tr("attribtable.loadfailed"));
             _this.setState({
-              loading: false,
-              features: [],
-              filteredSortedFeatures: [],
-              loadedLayer: ""
+              loading: false
             });
           }
-        }, bbox, (_this$props$filter$fi = _this.props.filter.filterParams) === null || _this$props$filter$fi === void 0 ? void 0 : _this$props$filter$fi[selectedLayer], _this.props.filter.filterGeom, _this.props.showDisplayFieldOnly ? [currentEditConfig.displayField, "geometry"] : null);
+        }, bbox, (_this$props$filter$fi = _this.props.filter.filterParams) === null || _this$props$filter$fi === void 0 ? void 0 : _this$props$filter$fi[selectedLayer], _this.props.filter.filterGeom, _this.props.showDisplayFieldOnly ? [editConfig.displayField, "geometry"] : null);
         return _objectSpread(_objectSpread({}, AttributeTableWidget.defaultState), {}, {
           loading: true,
           selectedLayer: selectedLayer,
@@ -151,13 +157,12 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       newState.filteredSortedFeatures = _this.filteredSortedFeatures(_this.state.features, _objectSpread(_objectSpread({}, _this.state), newState));
       _this.setState(newState);
     });
-    _defineProperty(_this, "renderField", function (currentEditConfig, field, featureidx, filteredIndex, fielddisabled) {
+    _defineProperty(_this, "renderField", function (editConfig, mapPrefix, field, featureidx, filteredIndex, fielddisabled) {
       var feature = _this.state.features[featureidx];
       var value = feature.properties[field.id];
       if (value === undefined || value === null) {
         value = "";
       }
-      var mapPrefix = (currentEditConfig.editDataset.match(/^[^.]+\./) || [""])[0];
       var updateField = function updateField(fieldid, val) {
         var emptynull = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
         return _this.updateField(featureidx, filteredIndex, fieldid, val, emptynull);
@@ -179,7 +184,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       } else if (constraints.values || constraints.keyvalrel) {
         var filterExpr = null;
         if (field.filterExpression) {
-          filterExpr = parseExpression(field.filterExpression, feature, currentEditConfig, _this.props.iface, mapPrefix, _this.props.mapCrs, function () {
+          filterExpr = parseExpression(field.filterExpression, feature, editConfig, _this.props.iface, mapPrefix, _this.props.mapCrs, function () {
             return _this.setState({
               reevaluate: +new Date()
             });
@@ -233,7 +238,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       } else if (field.type === "file") {
         return /*#__PURE__*/React.createElement(EditUploadField, {
           constraints: constraints,
-          dataset: currentEditConfig.editDataset,
+          dataset: editConfig.editDataset,
           disabled: disabled,
           fieldId: field.id,
           iface: _this.props.iface,
@@ -284,12 +289,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       return input;
     });
     _defineProperty(_this, "addFeature", function () {
-      var editConfig = _this.props.theme.editConfig || {};
-      var currentEditConfig = editConfig[_this.state.loadedLayer];
-      if (!currentEditConfig) {
-        return;
-      }
-      var hasGeometry = (currentEditConfig || {}).geomType !== null;
+      var hasGeometry = _this.state.curEditConfig.geomType !== null;
       if (!_this.props.allowAddForGeometryLayers && hasGeometry) {
         // eslint-disable-next-line
         alert(LocaleUtils.tr("attribtable.geomnoadd"));
@@ -298,15 +298,15 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       var featureSkel = {
         type: "Feature",
         geometry: null,
-        properties: currentEditConfig.fields.reduce(function (res, field) {
+        properties: _this.state.curEditConfig.fields.reduce(function (res, field) {
           if (field.id !== "id") {
             res[field.id] = field.type === "text" ? "" : null;
           }
           return res;
         }, {})
       };
-      var mapPrefix = (currentEditConfig.editDataset.match(/^[^.]+\./) || [""])[0];
-      getFeatureTemplate(currentEditConfig, featureSkel, _this.props.iface, mapPrefix, _this.props.mapCrs, function (feature) {
+      var mapPrefix = _this.state.curEditConfig.editDataset.split(".")[0];
+      getFeatureTemplate(_this.state.curEditConfig, featureSkel, _this.props.iface, mapPrefix, _this.props.mapCrs, function (feature) {
         _this.setState(function (state) {
           return {
             features: [].concat(_toConsumableArray(state.features), [feature]),
@@ -327,11 +327,8 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
         var features = state.filteredSortedFeatures.filter(function (feature) {
           return state.selectedFeatures[feature.id] === true;
         });
-        var selectedLayer = state.selectedLayer;
-        var editConfig = _this.props.theme.editConfig || {};
-        var currentEditConfig = editConfig[selectedLayer];
         features.forEach(function (feature) {
-          _this.props.iface.deleteFeature(currentEditConfig, feature.id, function (success) {
+          _this.props.iface.deleteFeature(state.curEditConfig, feature.id, function (success) {
             _this.setState(function (state2) {
               var newState = {
                 deleteTask: _objectSpread(_objectSpread({}, state2.deleteTask), {}, {
@@ -399,20 +396,18 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           }
         }
       });
-      var editConfig = _this.props.theme.editConfig || {};
-      var currentEditConfig = editConfig[_this.state.loadedLayer];
       Object.keys(feature.properties || {}).forEach(function (name) {
-        var _currentEditConfig$fi, _currentEditConfig$fi2, _currentEditConfig$fi3;
-        var fieldConfig = (_currentEditConfig$fi = (_currentEditConfig$fi2 = currentEditConfig.fields) === null || _currentEditConfig$fi2 === void 0 || (_currentEditConfig$fi3 = _currentEditConfig$fi2.find) === null || _currentEditConfig$fi3 === void 0 ? void 0 : _currentEditConfig$fi3.call(_currentEditConfig$fi2, function (f) {
+        var _this$state$curEditCo, _this$state$curEditCo2, _this$state$curEditCo3;
+        var fieldConfig = (_this$state$curEditCo = (_this$state$curEditCo2 = _this.state.curEditConfig.fields) === null || _this$state$curEditCo2 === void 0 || (_this$state$curEditCo3 = _this$state$curEditCo2.find) === null || _this$state$curEditCo3 === void 0 ? void 0 : _this$state$curEditCo3.call(_this$state$curEditCo2, function (f) {
           return f.id === name;
-        })) !== null && _currentEditConfig$fi !== void 0 ? _currentEditConfig$fi : {};
+        })) !== null && _this$state$curEditCo !== void 0 ? _this$state$curEditCo : {};
         if (fieldConfig.expression) {
           // Skip virtual fields
           delete feature.properties[name];
         }
       });
       // Omit geometry if it is read-only
-      var canEditGeometry = ['Point', 'LineString', 'Polygon'].includes((currentEditConfig.geomType || "").replace(/^Multi/, '').replace(/Z$/, ''));
+      var canEditGeometry = ['Point', 'LineString', 'Polygon'].includes((_this.state.curEditConfig.geomType || "").replace(/^Multi/, '').replace(/Z$/, ''));
       if (!canEditGeometry) {
         delete feature.geometry;
       }
@@ -428,11 +423,11 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
         featureData.set('g-recaptcha-response', _this.state.captchaResponse);
       }
       if (_this.state.newFeature) {
-        _this.props.iface.addFeatureMultipart(currentEditConfig, _this.props.mapCrs, featureData, function (success, result) {
+        _this.props.iface.addFeatureMultipart(_this.state.curEditConfig, _this.props.mapCrs, featureData, function (success, result) {
           return _this.featureCommited(success, result);
         });
       } else {
-        _this.props.iface.editFeatureMultipart(currentEditConfig, _this.props.mapCrs, feature.id, featureData, function (success, result) {
+        _this.props.iface.editFeatureMultipart(_this.state.curEditConfig, _this.props.mapCrs, feature.id, featureData, function (success, result) {
           return _this.featureCommited(success, result);
         });
       }
@@ -513,9 +508,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       }
     });
     _defineProperty(_this, "switchToFormEditMode", function () {
-      var editConfig = _this.props.theme.editConfig || {};
-      var currentEditConfig = editConfig[_this.state.loadedLayer];
-      var hasGeometry = (currentEditConfig || {}).geomType !== null;
+      var hasGeometry = _this.state.curEditConfig.geomType !== null;
       if (!hasGeometry) {
         // eslint-disable-next-line
         alert(LocaleUtils.tr("attribtable.nogeomnoform"));
@@ -572,9 +565,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           };
         }
         // Build value relation lookup
-        var editConfig = _this.props.theme.editConfig || {};
-        var currentEditConfig = editConfig[_this.state.loadedLayer];
-        var valueLookup = currentEditConfig.fields.reduce(function (res, field) {
+        var valueLookup = _this.state.curEditConfig.fields.reduce(function (res, field) {
           if (field.constraints && field.constraints.values) {
             res[field.id] = field.constraints.values.reduce(function (res2, constraint) {
               res2[constraint.value] = constraint.label;
@@ -658,14 +649,9 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       }
     });
     _defineProperty(_this, "csvExport", function () {
-      var editConfig = _this.props.theme.editConfig || {};
-      var currentEditConfig = editConfig[_this.state.loadedLayer];
-      if (!currentEditConfig) {
-        return;
-      }
-      var fields = _this.props.showDisplayFieldOnly ? currentEditConfig.fields.filter(function (field) {
-        return field.name === currentEditConfig.displayField;
-      }) : currentEditConfig.fields.filter(function (field) {
+      var fields = _this.props.showDisplayFieldOnly ? _this.state.curEditConfig.fields.filter(function (field) {
+        return field.name === _this.state.curEditConfig.displayField;
+      }) : _this.state.curEditConfig.fields.filter(function (field) {
         return field.id !== 'id';
       });
       var data = "";
@@ -686,9 +672,9 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
         type: "text/plain;charset=utf-8"
       }), _this.state.loadedLayer + ".csv");
     });
-    _defineProperty(_this, "translateFieldName", function (fieldName, layerName) {
-      var _this$props$theme$tra, _this$props$theme$tra2;
-      return (_this$props$theme$tra = (_this$props$theme$tra2 = _this.props.theme.translations) === null || _this$props$theme$tra2 === void 0 || (_this$props$theme$tra2 = _this$props$theme$tra2.layers) === null || _this$props$theme$tra2 === void 0 || (_this$props$theme$tra2 = _this$props$theme$tra2[layerName]) === null || _this$props$theme$tra2 === void 0 || (_this$props$theme$tra2 = _this$props$theme$tra2.fields) === null || _this$props$theme$tra2 === void 0 ? void 0 : _this$props$theme$tra2[fieldName]) !== null && _this$props$theme$tra !== void 0 ? _this$props$theme$tra : fieldName;
+    _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;
@@ -735,9 +721,8 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       var _this2 = this;
       var captchaRequired = ConfigUtils.getConfigProp("editServiceCaptchaSiteKey") && !ConfigUtils.getConfigProp("username");
       var captchaPending = captchaRequired && !this.state.captchaResponse;
-      var editConfig = this.props.theme.editConfig || {};
-      var currentEditConfig = editConfig[this.state.loadedLayer];
-      var editPermissions = (editConfig[this.state.loadedLayer] || {}).permissions || {};
+      var curEditConfig = this.state.curEditConfig;
+      var editPermissions = (curEditConfig === null || curEditConfig === void 0 ? void 0 : curEditConfig.permissions) || {};
       var readOnly = this.props.readOnly || editPermissions.updatable === false;
       var loadOverlay = null;
       if (this.state.selectedLayer && this.state.selectedLayer !== this.state.loadedLayer) {
@@ -750,17 +735,18 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
             className: "attribtable-overlay"
           }, /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("attribtable.pleasereload")));
         }
-      } else if (this.state.selectedLayer && this.state.deleteTask) {
+      } else if (this.state.deleteTask) {
         loadOverlay = /*#__PURE__*/React.createElement("div", {
           className: "attribtable-overlay"
         }, /*#__PURE__*/React.createElement(Spinner, null), /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("attribtable.deleting")));
       }
       var table = null;
       var footbar = null;
-      if (currentEditConfig && this.state.features) {
-        var fields = this.props.showDisplayFieldOnly ? currentEditConfig.fields.filter(function (field) {
-          return field.name === currentEditConfig.displayField;
-        }) : currentEditConfig.fields.filter(function (field) {
+      if (curEditConfig && this.state.features) {
+        var mapPrefix = this.state.curEditConfig.editDataset.split(".")[0];
+        var fields = this.props.showDisplayFieldOnly ? curEditConfig.fields.filter(function (field) {
+          return field.name === curEditConfig.displayField;
+        }) : curEditConfig.fields.filter(function (field) {
           var _field$constraints;
           return field.id !== "id" && (_this2.props.showHiddenFields || ((_field$constraints = field.constraints) === null || _field$constraints === void 0 ? void 0 : _field$constraints.hidden) !== true);
         });
@@ -775,19 +761,19 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           onClick: function onClick() {
             return _this2.sortBy("id");
           },
-          title: this.translateFieldName("id", this.state.loadedLayer)
+          title: this.translateFieldName("id")
         }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("span", {
           className: "attribtable-table-headername"
-        }, this.translateFieldName("id", this.state.loadedLayer)), this.renderSortIndicator("id"), this.renderColumnResizeHandle(1, 'r'))) : null, fields.map(function (field, idx) {
+        }, this.translateFieldName("id")), this.renderSortIndicator("id"), this.renderColumnResizeHandle(1, 'r'))) : null, fields.map(function (field, idx) {
           return /*#__PURE__*/React.createElement("th", {
             key: field.id,
             onClick: function onClick() {
               return _this2.sortBy(field.id);
             },
-            title: _this2.translateFieldName(field.name, _this2.state.loadedLayer)
+            title: _this2.translateFieldName(field.name)
           }, /*#__PURE__*/React.createElement("span", null, _this2.renderColumnResizeHandle(idx + 1, 'l'), /*#__PURE__*/React.createElement("span", {
             className: "attribtable-table-headername"
-          }, _this2.translateFieldName(field.name, _this2.state.loadedLayer)), _this2.renderSortIndicator(field.id), idx < fields.length - 1 ? _this2.renderColumnResizeHandle(idx + 2, 'r') : null));
+          }, _this2.translateFieldName(field.name)), _this2.renderSortIndicator(field.id), idx < fields.length - 1 ? _this2.renderColumnResizeHandle(idx + 2, 'r') : null));
         }))), /*#__PURE__*/React.createElement("tbody", null, features.map(function (feature, filteredIndex) {
           var featureidx = feature.originalIndex;
           var disabled = readOnly || _this2.state.changedFeatureIdx !== null && _this2.state.changedFeatureIdx !== featureidx;
@@ -820,7 +806,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           }), _this2.renderRowResizeHandle(filteredIndex + 1, 'b'))), !_this2.props.showDisplayFieldOnly ? /*#__PURE__*/React.createElement("td", null, feature.id) : null, fields.map(function (field) {
             return /*#__PURE__*/React.createElement("td", {
               key: field.id
-            }, _this2.renderField(currentEditConfig, field, featureidx, indexOffset + filteredIndex, disabled || !!_this2.state.filterVal && field.id === _this2.state.filterField));
+            }, _this2.renderField(curEditConfig, mapPrefix, field, featureidx, indexOffset + filteredIndex, disabled || !!_this2.state.filterVal && field.id === _this2.state.filterField));
           }));
         })));
         var npages = Math.ceil(this.state.filteredSortedFeatures.length / this.state.pageSize);
@@ -866,11 +852,11 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           value: this.state.filterField
         }, /*#__PURE__*/React.createElement("option", {
           value: "id"
-        }, this.translateFieldName("id", this.state.loadedLayer)), fields.map(function (field) {
+        }, this.translateFieldName("id")), fields.map(function (field) {
           return /*#__PURE__*/React.createElement("option", {
             key: field.id,
             value: field.id
-          }, _this2.translateFieldName(field.name, _this2.state.loadedLayer));
+          }, _this2.translateFieldName(field.name));
         })), /*#__PURE__*/React.createElement("select", {
           disabled: this.state.changedFeatureIdx !== null,
           onChange: function onChange(ev) {
@@ -905,11 +891,11 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           type: "checkbox"
         }), " ", LocaleUtils.tr("attribtable.limittoextent"))) : null);
       }
-      var nolayer = !this.state.selectedLayer;
+      var nolayer = curEditConfig === null;
       var loading = this.state.loading;
       var editing = this.state.changedFeatureIdx !== null;
       var layerChanged = this.state.selectedLayer !== this.state.loadedLayer;
-      var hasGeometry = (currentEditConfig || {}).geomType !== null;
+      var hasGeometry = (curEditConfig || {}).geomType !== null;
       var showAddButton = !this.props.readOnly && editPermissions.creatable !== false && (this.props.allowAddForGeometryLayers || !hasGeometry);
       var showDelButton = !this.props.readOnly && editPermissions.deletable !== false;
       var showEditButton = !this.props.readOnly && ConfigUtils.havePlugin("Editing") && this.props.showEditFormButton;
@@ -951,17 +937,29 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React.createElement("option", {
         disabled: true,
         value: ""
-      }, LocaleUtils.tr("attribtable.selectlayer")), Object.keys(editConfig).map(function (layerId) {
-        var _this2$props$theme$tr, _this2$props$theme$tr2, _LayerUtils$searchLay, _LayerUtils$searchLay2;
-        var layerName = editConfig[layerId].layerName;
-        var layerTitle = editConfig[layerId].layerTitle ? (_this2$props$theme$tr = (_this2$props$theme$tr2 = _this2.props.theme.translations) === null || _this2$props$theme$tr2 === void 0 || (_this2$props$theme$tr2 = _this2$props$theme$tr2.layertree) === null || _this2$props$theme$tr2 === void 0 ? void 0 : _this2$props$theme$tr2[layerName]) !== null && _this2$props$theme$tr !== void 0 ? _this2$props$theme$tr : editConfig[layerId].layerTitle : (_LayerUtils$searchLay = (_LayerUtils$searchLay2 = LayerUtils.searchLayer(_this2.props.layers, _this2.props.theme.url, layerName)) === null || _LayerUtils$searchLay2 === void 0 || (_LayerUtils$searchLay2 = _LayerUtils$searchLay2.sublayer) === null || _LayerUtils$searchLay2 === void 0 ? void 0 : _LayerUtils$searchLay2.title) !== null && _LayerUtils$searchLay !== void 0 ? _LayerUtils$searchLay : layerName;
-        return /*#__PURE__*/React.createElement("option", {
-          key: layerId,
-          value: layerId
-        }, layerTitle);
+      }, LocaleUtils.tr("attribtable.selectlayer")), Object.entries(this.props.editConfigs).map(function (_ref4) {
+        var _ref5 = _slicedToArray(_ref4, 2),
+          wmsName = _ref5[0],
+          serviceConfigs = _ref5[1];
+        return Object.entries(serviceConfigs).map(function (_ref6) {
+          var _ref8, _ref9, _match$layer$translat, _match$layer$translat2, _match$sublayer;
+          var _ref7 = _slicedToArray(_ref6, 2),
+            layerName = _ref7[0],
+            editConfig = _ref7[1];
+          var match = LayerUtils.searchLayer(_this2.props.layers, 'wms_name', wmsName, 'name', layerName);
+          if (!match) {
+            return null;
+          }
+          var layerTitle = (_ref8 = (_ref9 = (_match$layer$translat = (_match$layer$translat2 = match.layer.translations) === null || _match$layer$translat2 === void 0 || (_match$layer$translat2 = _match$layer$translat2.layertree) === null || _match$layer$translat2 === void 0 ? void 0 : _match$layer$translat2[layerName]) !== null && _match$layer$translat !== void 0 ? _match$layer$translat : editConfig.layerTitle) !== null && _ref9 !== void 0 ? _ref9 : match === null || match === void 0 || (_match$sublayer = match.sublayer) === null || _match$sublayer === void 0 ? void 0 : _match$sublayer.title) !== null && _ref8 !== void 0 ? _ref8 : layerName;
+          var value = wmsName + "#" + layerName;
+          return /*#__PURE__*/React.createElement("option", {
+            key: value,
+            value: value
+          }, layerTitle);
+        });
       })) : null, /*#__PURE__*/React.createElement("button", {
         className: "button",
-        disabled: editing || nolayer || this.state.loading,
+        disabled: !this.state.selectedLayer || editing || this.state.loading,
         onClick: function onClick() {
           return _this2.reload();
         },
@@ -1042,6 +1040,7 @@ _defineProperty(AttributeTableWidget, "propTypes", {
   addLayerFeatures: PropTypes.func,
   /** Whether to allow adding records for datasets which have a geometry column. */
   allowAddForGeometryLayers: PropTypes.bool,
+  editConfigs: PropTypes.object,
   filter: PropTypes.object,
   iface: PropTypes.object,
   initialLayer: PropTypes.string,
@@ -1065,7 +1064,6 @@ _defineProperty(AttributeTableWidget, "propTypes", {
   showLayerSelection: PropTypes.bool,
   /** Whether to show the "Limit to extent" checkbox */
   showLimitToExtent: PropTypes.bool,
-  theme: PropTypes.object,
   /** The zoom level for zooming to point features. */
   zoomLevel: PropTypes.number,
   zoomToExtent: PropTypes.func,
@@ -1082,6 +1080,9 @@ _defineProperty(AttributeTableWidget, "defaultState", {
   loading: false,
   selectedLayer: "",
   loadedLayer: "",
+  curEditConfig: null,
+  curTranslations: null,
+  fieldTranslations: null,
   features: [],
   filteredSortedFeatures: [],
   selectedFeatures: {},
@@ -1102,12 +1103,12 @@ _defineProperty(AttributeTableWidget, "defaultState", {
 });
 export default connect(function (state) {
   return {
+    editConfigs: state.layers.editConfigs,
     layers: state.layers.flat,
     filter: state.layers.filter,
     mapBbox: state.map.bbox,
     mapCrs: state.map.projection,
-    mapScales: state.map.scales,
-    theme: state.theme.current
+    mapScales: state.map.scales
   };
 }, {
   addLayerFeatures: addLayerFeatures,

package/components/IdentifyViewer.js

@@ -671,7 +671,9 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
           }, /*#__PURE__*/React.createElement("i", null, LocaleUtils.tr("identify.featureReport") + ": " + report.title)), /*#__PURE__*/React.createElement("td", {
             className: "identify-attr-value " + _this.props.longAttributesDisplay
           }, /*#__PURE__*/React.createElement("a", {
-            href: _this.getFeatureReportUrl(report, feature)
+            href: _this.getFeatureReportUrl(report, feature),
+            rel: "noreferrer",
+            target: "_blank"
           }, LocaleUtils.tr("identify.link")))));
         });
         if (isEmpty(rows)) {
@@ -1056,7 +1058,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         _layer$split2 = _slicedToArray(_layer$split, 2),
         layerUrl = _layer$split2[0],
         layerName = _layer$split2[1];
-      var match = LayerUtils.searchLayer(_this.props.layers, layerUrl, layerName);
+      var match = LayerUtils.searchLayer(_this.props.layers, 'url', layerUrl, 'name', layerName);
       if (match) {
         _this.props.setActiveLayerInfo(match.layer, match.sublayer);
       }

package/components/LinkFeatureForm.js

@@ -117,7 +117,9 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
           this.props.setEditContext(this.props.editContextId, {
             action: 'Pick',
             feature: this.props.feature,
-            geomType: this.props.editConfig.geomType
+            geomType: this.props.editConfig.geomType,
+            editConfig: this.props.editConfig,
+            mapPrefix: this.props.mapPrefix
           });
         } else {
           this.props.iface.getFeatureById(this.props.editConfig, this.props.featureId, this.props.map.projection, function (result) {
@@ -125,7 +127,9 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
               _this2.props.setEditContext(_this2.props.editContextId, {
                 action: 'Pick',
                 feature: result,
-                geomType: _this2.props.editConfig.geomType
+                geomType: _this2.props.editConfig.geomType,
+                editConfig: _this2.props.editConfig,
+                mapPrefix: _this2.props.mapPrefix
               });
             }
           });
@@ -135,17 +139,19 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
           type: "Feature",
           properties: {}
         }, this.props.feature);
-        var mapPrefix = (this.props.editConfig.editDataset.match(/^[^.]+\./) || [""])[0];
-        getFeatureTemplate(this.props.editConfig, featureSkel, this.props.iface, mapPrefix, this.props.map.projection, function (feature) {
+        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',
             geomType: _this2.props.editConfig.geomType,
-            feature: feature
+            feature: feature,
+            editConfig: _this2.props.editConfig,
+            mapPrefix: _this2.props.mapPrefix
           });
         });
       } else if (this.props.action === 'Pick') {
         this.props.setEditContext(this.props.editContextId, {
-          action: null
+          editConfig: this.props.editConfig,
+          mapPrefix: this.props.mapPrefix
         });
       }
     }
@@ -202,12 +208,12 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
         }, drawing ? /*#__PURE__*/React.createElement("div", {
           className: "link-feature-form-hint"
         }, /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("linkfeatureform.drawhint"))) : /*#__PURE__*/React.createElement(AttributeForm, {
-          editConfig: this.props.editConfig,
           editContext: editContext,
           hideDelete: this.props.hideDelete,
           iface: this.props.iface,
           onDiscard: this.onDiscard,
-          readOnly: this.props.readOnly
+          readOnly: this.props.readOnly,
+          translations: this.props.translations
         }), /*#__PURE__*/React.createElement("div", {
           className: "link-feature-form-close"
         }, /*#__PURE__*/React.createElement("button", {
@@ -234,10 +240,12 @@ _defineProperty(LinkFeatureForm, "propTypes", {
   hideDelete: PropTypes.bool,
   iface: PropTypes.object,
   map: PropTypes.object,
+  mapPrefix: PropTypes.string,
   pickFilter: PropTypes.func,
   readOnly: PropTypes.bool,
   removeLayer: PropTypes.func,
-  setEditContext: PropTypes.func
+  setEditContext: PropTypes.func,
+  translations: PropTypes.object
 });
 export default connect(function (state) {
   return {

package/components/LocationRecorder.js

@@ -56,7 +56,7 @@ var LocationRecorder = /*#__PURE__*/function (_React$Component) {
           console.error("Geolocation not supported");
         } else {
           _this.props.drawInteraction.appendCoordinates([_this.props.locatePosition]);
-          if (_this.props.geomType === "Point") {
+          if (_this.props.geomType.replace(/^Multi/, '') === "Point") {
             _this.stopRecording();
           } else {
             _this.pollInterval = setInterval(function () {