qwc2 2025.11.5 → 2025.11.12

package/actions/layers.js

@@ -1,9 +1,3 @@
-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 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 _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 /**
  * Copyright 2016-2024 Sourcepole AG
  * All rights reserved.
@@ -16,8 +10,6 @@ import ReducerIndex from '../reducers/index';
 import layersReducer from '../reducers/layers';
 ReducerIndex.register("layers", layersReducer);
 import ConfigUtils from '../utils/ConfigUtils';
-import LayerUtils from '../utils/LayerUtils';
-import LocaleUtils from '../utils/LocaleUtils';
 export var SET_LAYER_LOADING = 'SET_LAYER_LOADING';
 export var ADD_LAYER = 'ADD_LAYER';
 export var ADD_LAYER_SEPARATOR = 'ADD_LAYER_SEPARATOR';
@@ -45,27 +37,12 @@ export var LayerRole = {
 export function addLayer(layer) {
   var pos = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-  if (layer.serverType === 'qgis' && !layer.translations) {
-    return function (dispatch) {
-      return LocaleUtils.loadThemeTranslations(layer.url).then(function (translations) {
-        return dispatch({
-          type: ADD_LAYER,
-          layer: _objectSpread(_objectSpread({}, LayerUtils.applyTranslations(layer, translations)), {}, {
-            translations: translations
-          }),
-          pos: pos,
-          options: options
-        });
-      });
-    };
-  } else {
-    return {
-      type: ADD_LAYER,
-      layer: layer,
-      pos: pos,
-      options: options
-    };
-  }
+  return {
+    type: ADD_LAYER,
+    layer: layer,
+    pos: pos,
+    options: options
+  };
 }
 export function addLayerSeparator(title, afterLayerId, afterSublayerPath) {
   return {

package/components/AttributeForm.js

@@ -40,7 +40,7 @@ import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 import { v4 as uuidv4 } from 'uuid';
 import { setEditContext, clearEditContext } from '../actions/editing';
-import { LayerRole, refreshLayer } from '../actions/layers';
+import { refreshLayer } from '../actions/layers';
 import { setCurrentTaskBlocked } from '../actions/task';
 import ConfigUtils from '../utils/ConfigUtils';
 import CoordinatesUtils from '../utils/CoordinatesUtils';
@@ -65,9 +65,6 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
       formValid: true,
       captchaResponse: null
     });
-    _defineProperty(_this, "editLayerId", function (layerId) {
-      return _this.props.editConfig || layerId;
-    });
     _defineProperty(_this, "render", function () {
       var captchaRequired = ConfigUtils.getConfigProp("editServiceCaptchaSiteKey") && !ConfigUtils.getConfigProp("username");
       var captchaPending = captchaRequired && !_this.state.captchaResponse;
@@ -91,8 +88,8 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
           onClick: _this.onDiscard
         }); /* submit is handled via onSubmit in the form */
       }
-      var curConfig = _this.props.editConfig;
-      var editPermissions = curConfig.permissions || {};
+      var editConfig = _this.props.editContext.editConfig;
+      var editPermissions = editConfig.permissions || {};
       var readOnly = _this.props.readOnly || editPermissions.updatable === false && _this.props.editContext.action === 'Pick';
       var deleteBar = null;
       if (!_this.props.hideDelete && _this.props.editContext.action === 'Pick' && _this.props.editContext.feature && !_this.props.editContext.changed && editPermissions.deletable !== false && !_this.props.readOnly) {
@@ -140,8 +137,10 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         }, /*#__PURE__*/React.createElement(LinkFeatureForm, _extends({}, _this.state.childEdit, {
           finished: _this.state.childEdit.finishCallback,
           iface: _this.props.iface,
+          mapPrefix: _this.props.editContext.mapPrefix,
           pickFilter: _this.props.childPickFilter,
-          readOnly: _this.props.readOnly
+          readOnly: _this.props.readOnly,
+          translations: _this.props.translations
         })));
       }
       var captchaButton = null;
@@ -172,15 +171,14 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         },
         onSubmit: _this.onSubmit,
         ref: _this.setupChangedObserver
-      }, _this.props.editConfig.form ? /*#__PURE__*/React.createElement(QtDesignerForm, {
+      }, editConfig.form ? /*#__PURE__*/React.createElement(QtDesignerForm, {
         addRelationRecord: _this.addRelationRecord,
-        editConfig: _this.props.editConfig,
-        editConfigs: _this.props.theme.editConfig,
+        editConfig: editConfig,
         editRelationRecord: _this.editRelationRecord,
         feature: _this.props.editContext.feature,
         iface: _this.props.iface,
         mapCrs: _this.props.map.projection,
-        mapPrefix: _this.editMapPrefix(),
+        mapPrefix: _this.props.editContext.mapPrefix,
         readOnly: readOnly,
         removeRelationRecord: _this.removeRelationRecord,
         reorderRelationRecord: _this.reorderRelationRecord,
@@ -188,12 +186,12 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         setFormBusy: _this.setFormBusy,
         setRelationTables: _this.setRelationTables,
         switchEditContext: _this.startChildEdit,
-        translations: _this.props.theme.translations,
+        translations: _this.props.translations,
         updateField: _this.updateField,
         updateRelationField: _this.updateRelationField
       }) : /*#__PURE__*/React.createElement(AutoEditForm, {
-        editLayerId: _this.props.editConfig.editDataset,
-        fields: _this.props.editConfig.fields,
+        editLayerId: editConfig.editDataset,
+        fields: editConfig.fields,
         iface: _this.props.iface,
         readOnly: readOnly,
         touchFriendly: _this.props.touchFriendly,
@@ -217,9 +215,6 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
       });
       _this.validateFieldConstraints(newFeature);
     });
-    _defineProperty(_this, "editMapPrefix", function () {
-      return (_this.props.editConfig.editDataset.match(/^[^.]+\./) || [""])[0];
-    });
     _defineProperty(_this, "setRelationTables", function (relationTables) {
       _this.setState({
         relationTables: relationTables
@@ -238,7 +233,8 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
               return name + ":" + entry.fk;
             }
           }).join(",");
-          _this.props.iface.getRelations(_this.props.editConfig, feature.id, _this.props.map.projection, relTables, _this.props.theme.editConfig, function (relationValues) {
+          var mapEditConfigs = _this.props.editConfigs[_this.props.editContext.mapPrefix];
+          _this.props.iface.getRelations(_this.props.editContext.editConfig, feature.id, _this.props.map.projection, relTables, mapEditConfigs, function (relationValues) {
             var newFeature = _objectSpread(_objectSpread({}, feature), {}, {
               relationValues: relationValues
             });
@@ -263,12 +259,11 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "addRelationRecord", function (table) {
       var newRelationValues = _objectSpread({}, _this.props.editContext.feature.relationValues);
-      var editConfig = _this.props.theme.editConfig[table.split('.').slice(-1)];
-      var mapPrefix = (editConfig.editDataset.match(/^[^.]+\./) || [""])[0];
+      var editConfig = _this.props.editConfigs[_this.props.editContext.mapPrefix][table.split('.').slice(-1)];
       getFeatureTemplate(editConfig, {
         type: "Feature",
         properties: {}
-      }, _this.props.iface, mapPrefix, _this.props.map.projection, function (newRelFeature) {
+      }, _this.props.iface, _this.props.editContext.mapPrefix, _this.props.map.projection, function (newRelFeature) {
         newRelFeature.__status__ = "empty";
         if (editConfig.geomType === null) {
           newRelFeature.geometry = null;
@@ -348,21 +343,22 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         changed: true
       });
     });
-    _defineProperty(_this, "editRelationRecord", function (action, layer, dataset, idx, displayField) {
-      var editConfig = (_this.props.theme.editConfig || {})[layer];
-      var feature = _this.props.editContext.feature.relationValues[dataset].features[idx];
+    _defineProperty(_this, "editRelationRecord", function (action, layer, table, idx, displayField) {
+      var editConfig = _this.props.editConfigs[_this.props.editContext.mapPrefix][table.split('.').slice(-1)];
+      var feature = _this.props.editContext.feature.relationValues[table].features[idx];
+      var childEdit = {
+        action: action,
+        editConfig: editConfig,
+        editContextId: ':' + layer,
+        dataset: table,
+        idx: idx,
+        feature: feature,
+        finishCallback: _this.finishEditRelationRecord,
+        displayField: displayField,
+        hideDelete: true
+      };
       _this.setState({
-        childEdit: {
-          action: action,
-          editConfig: editConfig,
-          editContextId: ':' + layer,
-          dataset: dataset,
-          idx: idx,
-          feature: feature,
-          finishCallback: _this.finishEditRelationRecord,
-          displayField: displayField,
-          hideDelete: true
-        }
+        childEdit: childEdit
       });
     });
     _defineProperty(_this, "finishEditRelationRecord", function (feature) {
@@ -405,7 +401,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
             _this.setState({
               busy: true
             });
-            _this.props.iface.getFeatureById(_this.props.editConfig, _this.props.editContext.feature.id, _this.props.map.projection, function (feature) {
+            _this.props.iface.getFeatureById(_this.props.editContext.editConfig, _this.props.editContext.feature.id, _this.props.map.projection, function (feature) {
               _this.setState({
                 busy: false
               });
@@ -431,8 +427,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
               type: "Feature",
               properties: {}
             };
-            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.editContext.editConfig, featureSkel, _this.props.iface, _this.props.editContext.mapPrefix, _this.props.map.projection, function (feature) {
               _this.props.setEditContext(_this.props.editContext.id, {
                 feature: feature,
                 changed: false
@@ -475,7 +470,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "validateFieldConstraints", function (feature) {
       var validCallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       var invalidCallback = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-      var constraintExpressions = _this.props.editConfig.fields.reduce(function (res, cur) {
+      var constraintExpressions = _this.props.editContext.editConfig.fields.reduce(function (res, cur) {
         var _cur$constraints;
         if ((_cur$constraints = cur.constraints) !== null && _cur$constraints !== void 0 && _cur$constraints.expression) {
           return [].concat(_toConsumableArray(res), [{
@@ -485,7 +480,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         }
         return res;
       }, []);
-      parseExpressionsAsync(constraintExpressions, feature, _this.props.editConfig, _this.props.iface, _this.editMapPrefix(), _this.props.map.projection, false).then(function (result) {
+      parseExpressionsAsync(constraintExpressions, feature, _this.props.editContext.editConfig, _this.props.iface, _this.props.editContext.mapPrefix, _this.props.map.projection, false).then(function (result) {
         var valid = true;
         var reasons = [];
         Object.entries(result).forEach(function (_ref5) {
@@ -495,11 +490,11 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
           var element = _this.form.elements.namedItem(key);
           if (element) {
             if (value === false) {
-              var _this$props$editConfi, _this$props$editConfi2;
+              var _this$props$editConte, _this$props$editConte2;
               valid = false;
-              var reason = (_this$props$editConfi = (_this$props$editConfi2 = _this.props.editConfig.fields.find(function (field) {
+              var reason = (_this$props$editConte = (_this$props$editConte2 = _this.props.editContext.editConfig.fields.find(function (field) {
                 return field.id === key;
-              })) === null || _this$props$editConfi2 === void 0 || (_this$props$editConfi2 = _this$props$editConfi2.constraints) === null || _this$props$editConfi2 === void 0 ? void 0 : _this$props$editConfi2.placeholder) !== null && _this$props$editConfi !== void 0 ? _this$props$editConfi : LocaleUtils.tr("editing.contraintviolation");
+              })) === null || _this$props$editConte2 === void 0 || (_this$props$editConte2 = _this$props$editConte2.constraints) === null || _this$props$editConte2 === void 0 ? void 0 : _this$props$editConte2.placeholder) !== null && _this$props$editConte !== void 0 ? _this$props$editConte : LocaleUtils.tr("editing.contraintviolation");
               reasons.push(reason);
               element.setCustomValidity(reason);
             } else {
@@ -548,8 +543,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
       if (_this.props.editContext.geomReadOnly) {
         delete feature.geometry;
       }
-      var curConfig = _this.props.editConfig;
-      var mapPrefix = _this.editMapPrefix();
+      var editConfig = _this.props.editContext.editConfig;
       var textNullValue = ConfigUtils.getConfigProp("editTextNullValue");
 
       // Keep relation values separate
@@ -572,16 +566,17 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
           var nullElements = ["date", "number", "radio"];
           var nullFieldTypes = ["date", "number"];
           if (parts.length >= 3) {
-            var _this$props$theme$edi, _this$props$theme$edi2, _this$props$theme$edi3;
+            var _relEditConfig$fields, _relEditConfig$fields2, _relEditConfig$fields3;
             // Relation value
             // Usually <table>__<field>__<index>, but <field> might also contain __ (i.e. upload__user)
             var tablename = parts[0];
-            var datasetname = mapPrefix + tablename;
+            var datasetname = _this.props.editContext.mapPrefix + "." + tablename;
             var field = parts.slice(1, parts.length - 1).join("__");
             var index = parseInt(parts[parts.length - 1], 10);
-            var nrelFieldConfig = (_this$props$theme$edi = (_this$props$theme$edi2 = _this.props.theme.editConfig[tablename].fields) === null || _this$props$theme$edi2 === void 0 || (_this$props$theme$edi3 = _this$props$theme$edi2.find) === null || _this$props$theme$edi3 === void 0 ? void 0 : _this$props$theme$edi3.call(_this$props$theme$edi2, function (f) {
+            var relEditConfig = _this.props.editConfigs[_this.props.editContext.mapPrefix][tablename];
+            var nrelFieldConfig = (_relEditConfig$fields = (_relEditConfig$fields2 = relEditConfig.fields) === null || _relEditConfig$fields2 === void 0 || (_relEditConfig$fields3 = _relEditConfig$fields2.find) === null || _relEditConfig$fields3 === void 0 ? void 0 : _relEditConfig$fields3.call(_relEditConfig$fields2, function (f) {
               return f.id === field;
-            })) !== null && _this$props$theme$edi !== void 0 ? _this$props$theme$edi : {};
+            })) !== null && _relEditConfig$fields !== void 0 ? _relEditConfig$fields : {};
             var nrelFieldDataType = nrelFieldConfig.type;
             if (nrelFieldConfig.expression) {
               // Skip virtual fields
@@ -621,7 +616,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
               relationValues[datasetname].features[index].properties[field] = "";
             }
           } else {
-            var fieldConfig = (curConfig.fields || []).find(function (field) {
+            var fieldConfig = (editConfig.fields || []).find(function (field) {
               return field.id === name;
             }) || {};
             if (fieldConfig.expression) {
@@ -660,6 +655,37 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
           }
         }
       });
+      // Remove readonly fields
+      Object.keys(feature.properties).forEach(function (key) {
+        var _fieldConfig$constrai;
+        var fieldConfig = editConfig.fields.find(function (field) {
+          return field.id === key;
+        }) || {};
+        if (fieldConfig !== null && fieldConfig !== void 0 && (_fieldConfig$constrai = fieldConfig.constraints) !== null && _fieldConfig$constrai !== void 0 && _fieldConfig$constrai.readOnly) {
+          delete feature.properties[key];
+        }
+      });
+      Object.entries(relationValues).forEach(function (_ref7) {
+        var _ref8 = _slicedToArray(_ref7, 2),
+          dataset = _ref8[0],
+          entry = _ref8[1];
+        var _dataset$split = dataset.split(".", 2),
+          _dataset$split2 = _slicedToArray(_dataset$split, 2),
+          mapName = _dataset$split2[0],
+          layerName = _dataset$split2[1];
+        var relEditConfig = _this.props.editConfigs[mapName][layerName];
+        entry.features.forEach(function (f) {
+          Object.keys(f.properties).forEach(function (key) {
+            var _fieldConfig$constrai2;
+            var fieldConfig = relEditConfig.fields.find(function (field) {
+              return field.id === key;
+            }) || {};
+            if (fieldConfig !== null && fieldConfig !== void 0 && (_fieldConfig$constrai2 = fieldConfig.constraints) !== null && _fieldConfig$constrai2 !== void 0 && _fieldConfig$constrai2.readOnly) {
+              delete f.properties[key];
+            }
+          });
+        });
+      });
 
       // Set relation values CRS and sort index if necessary
       Object.keys(relationValues).forEach(function (relTable) {
@@ -686,38 +712,38 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
       feature.relationValues = relationValues;
       var featureData = new FormData();
       featureData.set('feature', JSON.stringify(feature));
-      Object.entries(featureUploads).forEach(function (_ref7) {
-        var _ref8 = _slicedToArray(_ref7, 2),
-          key = _ref8[0],
-          value = _ref8[1];
-        return featureData.set('file:' + key, value);
-      });
-      Object.entries(relationUploads).forEach(function (_ref9) {
+      Object.entries(featureUploads).forEach(function (_ref9) {
         var _ref10 = _slicedToArray(_ref9, 2),
           key = _ref10[0],
           value = _ref10[1];
-        return featureData.set('relfile:' + mapPrefix + key, value);
+        return featureData.set('file:' + key, value);
+      });
+      Object.entries(relationUploads).forEach(function (_ref11) {
+        var _ref12 = _slicedToArray(_ref11, 2),
+          key = _ref12[0],
+          value = _ref12[1];
+        return featureData.set('relfile:' + _this.props.editContext.mapPrefix + "." + key, value);
       });
       if (_this.state.captchaResponse) {
         featureData.set('g-recaptcha-response', _this.state.captchaResponse);
       }
       if (_this.props.editContext.action === "Draw") {
         if (_this.props.iface.addFeatureMultipart) {
-          _this.props.iface.addFeatureMultipart(_this.props.editConfig, _this.props.map.projection, featureData, function (success, result) {
+          _this.props.iface.addFeatureMultipart(editConfig, _this.props.map.projection, featureData, function (success, result) {
             return _this.featureCommited(success, result);
           });
         } else {
-          _this.props.iface.addFeature(_this.props.editConfig.editDataset, feature, _this.props.map.projection, function (success, result) {
+          _this.props.iface.addFeature(editConfig.editDataset, feature, _this.props.map.projection, function (success, result) {
             return _this.featureCommited(success, result);
           });
         }
       } else if (_this.props.editContext.action === "Pick") {
         if (_this.props.iface.editFeatureMultipart) {
-          _this.props.iface.editFeatureMultipart(_this.props.editConfig, _this.props.map.projection, feature.id, featureData, function (success, result) {
+          _this.props.iface.editFeatureMultipart(editConfig, _this.props.map.projection, feature.id, featureData, function (success, result) {
             return _this.featureCommited(success, result);
           });
         } else {
-          _this.props.iface.editFeature(_this.props.editConfig.editDataset, feature, _this.props.map.projection, function (success, result) {
+          _this.props.iface.editFeature(editConfig.editDataset, feature, _this.props.map.projection, function (success, result) {
             return _this.featureCommited(success, result);
           });
         }
@@ -761,7 +787,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         if (_this.state.captchaResponse) {
           recaptchaResponse = _this.state.captchaResponse;
         }
-        _this.props.iface.deleteFeature(_this.props.editConfig, _this.props.editContext.feature.id, _this.deleteFinished, recaptchaResponse);
+        _this.props.iface.deleteFeature(_this.props.editContext.editConfig, _this.props.editContext.feature.id, _this.deleteFinished, recaptchaResponse);
       } else {
         _this.setState({
           deleteClicked: false
@@ -775,7 +801,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
       });
       if (success) {
         _this.props.refreshLayer(function (layer) {
-          return layer.role === LayerRole.THEME;
+          return layer.wms_name === _this.props.editContext.mapPrefix;
         });
         _this.props.setCurrentTaskBlocked(false);
         if (!_this.props.onCommit || !_this.props.onCommit(result)) {
@@ -813,7 +839,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         });
         _this.props.setCurrentTaskBlocked(false);
         _this.props.refreshLayer(function (layer) {
-          return layer.role === LayerRole.THEME;
+          return layer.wms_name === _this.props.editContext.mapPrefix;
         });
         if (!_this.props.onDelete || !_this.props.onDelete(result)) {
           _this.props.setEditContext(_this.props.editContext.id, {
@@ -839,21 +865,22 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_this, "startChildEdit", function (action, layer, featureId, updateField, displayField) {
-      var editConfig = (_this.props.theme.editConfig || {})[layer];
+      var editConfig = _this.props.editConfigs[_this.props.editContext.mapPrefix][layer];
       if (!editConfig) {
         // eslint-disable-next-line
         console.warn("No edit config found for linked edit layer " + layer);
       } else {
+        var childEdit = {
+          action: action,
+          editConfig: editConfig,
+          editContextId: ':' + layer,
+          displayField: displayField,
+          featureId: featureId,
+          updateField: updateField,
+          finishCallback: _this.finishChildEdit
+        };
         _this.setState({
-          childEdit: {
-            action: action,
-            editConfig: editConfig,
-            editContextId: ':' + layer,
-            displayField: displayField,
-            featureId: featureId,
-            updateField: updateField,
-            finishCallback: _this.finishChildEdit
-          }
+          childEdit: childEdit
         });
       }
     });
@@ -901,7 +928,7 @@ _defineProperty(AttributeForm, "propTypes", {
   childPickFilter: PropTypes.func,
   clearEditContext: PropTypes.func,
   deleteLabel: PropTypes.string,
-  editConfig: PropTypes.object,
+  editConfigs: PropTypes.object,
   editContext: PropTypes.object,
   hideDelete: PropTypes.bool,
   iface: PropTypes.object,
@@ -915,7 +942,8 @@ _defineProperty(AttributeForm, "propTypes", {
   setCurrentTaskBlocked: PropTypes.func,
   setEditContext: PropTypes.func,
   theme: PropTypes.object,
-  touchFriendly: PropTypes.bool
+  touchFriendly: PropTypes.bool,
+  translations: PropTypes.object
 });
 _defineProperty(AttributeForm, "defaultProps", {
   touchFriendly: true
@@ -923,6 +951,7 @@ _defineProperty(AttributeForm, "defaultProps", {
 export default connect(function (state) {
   return {
     map: state.map,
+    editConfigs: state.layers.editConfigs,
     theme: state.theme.current
   };
 }, {