@configuratorware/configurator-admingui 1.53.6 → 1.54.0

package/App/Data.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.whiteSpacePattern = exports.validateDataObject = exports.identifierPattern = exports.getErrorsFromValidatedDataObject = exports["default"] = exports.DataValidator = void 0;
+exports.whiteSpacePattern = exports.validateDataObject = exports.identifierWithUmlautsPattern = exports.identifierPattern = exports.getErrorsFromValidatedDataObject = exports["default"] = exports.DataValidator = void 0;
 var _lodash = _interopRequireDefault(require("lodash"));
 var _validate = require("validate.js");
 var _isArray = _interopRequireDefault(require("lodash/isArray"));
@@ -20,6 +20,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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); }
 var whiteSpacePattern = exports.whiteSpacePattern = /^[\S]+$/;
 var identifierPattern = exports.identifierPattern = /^[A-za-z0-9_.-]+$/;
+var identifierWithUmlautsPattern = exports.identifierWithUmlautsPattern = /^[A-za-z0-9äöüÄÖÜß_.-]+$/;
 _validate.validate.validators.nonEmptyArray = function (value, options) {
   if (options && options === true && (0, _isArray["default"])(value) && value.length !== 0) {
     return null;
@@ -45,8 +46,10 @@ _validate.validate.validators.numericOrEmpty = function (value, options) {
     return _validate.validate.validators.numericality(value, options);
   }
 };
-_validate.validate.validators.identifier = function (value, options) {
-  if (options && options === true && typeof value === 'string' && value.match(identifierPattern) && value.match(identifierPattern)[0] === value) {
+_validate.validate.validators.identifier = function (value, options, key, attributes, globalOptions) {
+  var allowUmlauts = (globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.allowUmlauts) || false;
+  var pattern = allowUmlauts ? identifierWithUmlautsPattern : identifierPattern;
+  if (options && options === true && typeof value === 'string' && value.match(pattern) && value.match(pattern)[0] === value) {
     return null;
   }
   return (0, _i18n.t)('customValidators.identifier');
@@ -79,9 +82,15 @@ _validate.validate.validators.noWhitespace = function (value, options) {
 var Data = exports["default"] = /*#__PURE__*/function () {
   function Data(dataObject) {
     var mutate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     _classCallCheck(this, Data);
     Data.instances++;
     this._listeners = {};
+    Object.defineProperty(this, '_allowUmlauts', {
+      value: options.allowUmlauts,
+      writable: true,
+      enumerable: false
+    });
     if (dataObject) {
       this.init(dataObject, mutate);
     }
@@ -236,7 +245,11 @@ var Data = exports["default"] = /*#__PURE__*/function () {
     key: "validate",
     value: function validate() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      var isValid = this._validator.validate(options);
+      var allowUmlauts = options.allowUmlauts !== undefined ? options.allowUmlauts : this._allowUmlauts;
+      var mergedOptions = _objectSpread(_objectSpread({}, options), {}, {
+        allowUmlauts: allowUmlauts
+      });
+      var isValid = this._validator.validate(mergedOptions);
       this._trigger(Data.EventTypes.validate, {
         isValid: isValid
       });
@@ -315,13 +328,13 @@ var DataValidator = exports.DataValidator = /*#__PURE__*/function () {
       for (var prop in this._data) {
         var dataSchema = _lodash["default"].get(this._data[prop], 'schema');
         if (dataSchema instanceof Data) {
-          isValid = dataSchema.validate() && isValid;
+          isValid = dataSchema.validate(options) && isValid;
         }
       }
       var valueObject = options.valueObject,
         idx = options.idx,
         dataArr = options.dataArr;
-      isValid = _validateDataObject(this._data, valueObject, idx, dataArr) && isValid;
+      isValid = _validateDataObject(this._data, valueObject, idx, dataArr, options) && isValid;
       this._validation.isDone = true;
       return isValid;
     }
@@ -356,7 +369,7 @@ var prepareConstraints = function prepareConstraints() {
   });
   return constraints;
 };
-var validateField = function validateField(prop, valueToValidate, idx, dataArr, dataObject) {
+var validateField = function validateField(prop, valueToValidate, idx, dataArr, dataObject, validationOptions) {
   var valid = true;
   if (prop.constraints) {
     var constraints = prepareConstraints({
@@ -364,12 +377,14 @@ var validateField = function validateField(prop, valueToValidate, idx, dataArr,
       valueToValidate: valueToValidate,
       idx: idx,
       dataArr: dataArr,
-      dataObject: dataObject
+      dataObject: dataObject,
+      validationOptions: validationOptions
     });
     if (!constraints) {
       return valid;
     }
-    var result = _validate.validate.single(valueToValidate, constraints);
+    var globalOptions = _objectSpread({}, validationOptions);
+    var result = _validate.validate.single(valueToValidate, constraints, globalOptions);
     if (Number.isInteger(idx) && idx >= 0) {
       if (result) {
         prop.error = prop.error || [];
@@ -386,32 +401,34 @@ var validateField = function validateField(prop, valueToValidate, idx, dataArr,
   }
   return valid;
 };
-var _validateDataObject = exports.validateDataObject = function validateDataObject(dataObject, valueObject, idx, dataArr) {
+var _validateDataObject = exports.validateDataObject = function validateDataObject(dataObject, valueObject, idx, dataArr, validationOptions) {
   var valid = true;
   var _loop2 = function _loop2() {
     var prop = dataObject[p];
+    if (!prop || _typeof(prop) !== 'object') {
+      return 1; // continue
+    }
     prop.beforeValidate && prop.beforeValidate({
       prop: prop,
       idx: idx,
       dataArr: dataArr
     });
     var valueToValidate = valueObject ? valueObject[p] : prop.value;
-    valid = validateField(prop, valueToValidate, idx, dataArr || prop.value, dataObject) && valid;
+    valid = validateField(prop, valueToValidate, idx, dataArr || prop.value, dataObject, validationOptions) && valid;
     if (prop.schema) {
       if (_lodash["default"].isArray(prop.value)) {
-        // validate all values against the schema rules
         prop.value.forEach(function (value, idx) {
-          valid = _validateDataObject(prop.schema, value, idx, prop.value) && valid;
+          valid = _validateDataObject(prop.schema, value, idx, prop.value, validationOptions) && valid;
         });
       } else if (prop.value === null) {
         // skip validation, if the value is null
       } else {
-        valid = _validateDataObject(prop.schema, prop.value) && valid;
+        valid = _validateDataObject(prop.schema, prop.value, null, null, validationOptions) && valid;
       }
     }
   };
   for (var p in dataObject) {
-    _loop2();
+    if (_loop2()) continue;
   }
   return valid;
 };

package/App/Reducers/Entity/Actions.js

@@ -5,10 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.reportUnsavedEntity = exports.reportDeleteEntities = exports.releaseUnsavedEntity = exports.initUnsavedEntity = exports.generateListActions = exports.generateDeleteAction = exports.generateDefaultActions = exports.dataIsModified = exports.cancelUnsavedEntityDialog = exports.cancelDeleteEntitiesDialog = exports.UNMOUNT_ENTITY = exports.SHOW_DETAILS = exports.SET_VALIDATION_ERRORS = exports.SET_VALIDATED_DATA = exports.SET_DATA_SOURCE = exports.SET_DATA = exports.REPORT_UNSAVED_ENTITY = exports.REPORT_DELETE_ENTITIES = exports.RELEASE_UNSAVED_ENTITY = exports.MOUNT_NEXT = exports.MOUNT_ENTITY = exports.MODIFIED_UNSAVED_ENTITY = exports.INIT_UNSAVED_ENTITY = exports.HIDE_DETAILS = exports.ENTITY_WILL_UNMOUNT = exports.ENTITY_WILL_MOUNT = exports.CANCEL_UNSAVED_ENTITY_DIALOG = exports.CANCEL_DELETE_ENTITIES_DIALOG = void 0;
 var _Helpers = require("../Api/Helpers");
+var _get = _interopRequireDefault(require("lodash/get"));
 var _Actions = require("../Api/Actions");
 var _Data = require("../../Data");
 var _Actions2 = require("../Frame/Actions");
 var _i18n = require("../../i18n");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 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; }
@@ -408,8 +410,11 @@ var generateDefaultActions = exports.generateDefaultActions = function generateD
   var validateData = function validateData() {
     return function (dispatch, getState) {
       var state = getState();
+      var allowUmlauts = !!(0, _get["default"])(state, 'settingData.data.allowUmlautsInIdentifiers.value', false);
       var data = new _Data.DataValidator(state[reducerName].data, false);
-      if (data.validate()) {
+      if (data.validate({
+        allowUmlauts: allowUmlauts
+      })) {
         return true;
       } else {
         dispatch({

package/App/Translations.js

@@ -32,7 +32,6 @@ require("./i18n").use({
     coredata: 'Core data',
     productdata: 'All items',
     creatoritems: 'creator',
-    assembly_points: 'Assembly points',
     configurations: 'Saved configurations',
     user_configuration: 'User configurations',
     receive_offer_requests: 'Receive offer requests',
@@ -105,7 +104,6 @@ require("./i18n").use({
     productdata: 'Alle Produkte',
     creatoritems: 'creator',
     designeritems: 'designer',
-    assembly_points: 'Anbaupunkte',
     configurations: 'Gespeicherte Konfigurationen',
     user_configuration: 'Nutzer-Konfigurationen',
     receive_offer_requests: 'Angebotsanfragen',

package/Components/DefaultConnectedForm.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.generateMappings = exports.generateConnectedForm = exports["default"] = exports.connectDefault = exports.SaveAndStayButton = exports.CancelButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactRedux = require("react-redux");
+var _get = _interopRequireDefault(require("lodash/get"));
 var _DefaultForm = require("./DefaultForm");
 var _i18n = require("../App/i18n");
 var _RaisedButton = _interopRequireDefault(require("../UIComponents/RaisedButton"));
@@ -20,8 +21,10 @@ var generateMappings = exports.generateMappings = function generateMappings(enti
   return {
     mapStateToProps: function mapStateToProps(state) {
       var entityState = state[entityReducerName];
+      var allowUmlauts = !!(0, _get["default"])(state, 'settingData.data.allowUmlautsInIdentifiers.value', false);
       return {
-        entityState: entityState
+        entityState: entityState,
+        allowUmlauts: allowUmlauts
       };
     },
     mapDispatchToProps: function mapDispatchToProps(dispatch) {

package/Components/DefaultForm.js

@@ -41,7 +41,8 @@ var DefaultForm = exports["default"] = /*#__PURE__*/function (_Component) {
         onAction = _this$props.onAction,
         config = _this$props.config,
         closeAfterSave = _this$props.closeAfterSave,
-        customPostData = _this$props.customPostData;
+        customPostData = _this$props.customPostData,
+        allowUmlauts = _this$props.allowUmlauts;
       var actionButtons = config.actionButtons;
       var onSubmit = customPostData ? customPostData : !closeAfterSave ? postData : function () {
         return postData(true);
@@ -53,7 +54,8 @@ var DefaultForm = exports["default"] = /*#__PURE__*/function (_Component) {
         onSubmit: onSubmit,
         onCancel: onCancel,
         onAction: onAction,
-        actionButtons: actionButtons
+        actionButtons: actionButtons,
+        allowUmlauts: allowUmlauts
       }) : /*#__PURE__*/_react["default"].createElement("div", null, (0, _i18n.T)('Loading entity data'), "...");
     }
   }]);

package/Components/Form.js

@@ -191,7 +191,8 @@ var ConfigurableForm = exports.ConfigurableForm = /*#__PURE__*/function (_Compon
         onChange: _this.onChange,
         onAction: _this.onAction,
         renderWrappedInput: _this.renderWrappedInput,
-        helperText: input.helperText && (0, _i18n.T)(input.helperText)
+        helperText: input.helperText && (0, _i18n.T)(input.helperText),
+        allowUmlauts: _this.props.allowUmlauts
       });
       if (input.name) {
         var field = input.name;

package/Components/FormFragments/InputArray.js

@@ -72,7 +72,8 @@ var InputArray = /*#__PURE__*/function (_Component) {
       var dataArr = _this.props.value instanceof Array ? _this.props.value : undefined;
       if (schema.validate({
         dataArr: dataArr,
-        idx: selectedRow
+        idx: selectedRow,
+        allowUmlauts: _this.props.allowUmlauts
       })) {
         var value = _lodash["default"].isArray(_this.props.value) ? _this.props.value : [];
         var data = schema.getData();

package/Components/FormFragments/NestedDataComponent.js

@@ -41,7 +41,9 @@ var nestedDataComponent = function nestedDataComponent(NestingComponent) {
         if (schema instanceof _Data["default"]) {
           data = schema;
         } else {
-          data = new _Data["default"](schema);
+          data = new _Data["default"](schema, false, {
+            allowUmlauts: _this.props.allowUmlauts
+          });
         }
         data.addListener(_Data["default"].EventTypes.validate, _this.onDataModified);
         data.addListener(_Data["default"].EventTypes.setValue, _this.onDataModified);

package/Components/FormHooks/useDataSchema.js

@@ -29,7 +29,8 @@ function fillDataSchema(dataSchema, data) {
 }
 var useDataSchema = exports.useDataSchema = function useDataSchema(_ref) {
   var dataSchema = _ref.dataSchema,
-    data = _ref.data;
+    data = _ref.data,
+    allowUmlauts = _ref.allowUmlauts;
   var _useState = (0, _react.useState)(fillDataSchema(dataSchema, data)),
     _useState2 = _slicedToArray(_useState, 2),
     currentData = _useState2[0],
@@ -39,13 +40,15 @@ var useDataSchema = exports.useDataSchema = function useDataSchema(_ref) {
   }, [dataSchema, data]);
   var validate = (0, _react.useCallback)(function () {
     var validator = new _Data.DataValidator(currentData, false);
-    if (validator.validate()) {
+    if (validator.validate({
+      allowUmlauts: allowUmlauts
+    })) {
       return true;
     } else {
       setCurrentData(validator.getValidatedData());
       return false;
     }
-  }, [currentData]);
+  }, [currentData, allowUmlauts]);
   return {
     currentData: currentData,
     validate: validate

package/Screens/Creator/Components/OptionPriceEditor.js

@@ -98,10 +98,12 @@ var OptionPriceEditor = exports.OptionPriceEditor = function OptionPriceEditor(p
   var selectedOption = props.selectedOption,
     product = props.product,
     selectedComponent = props.selectedComponent,
-    showOptionPriceEditorDialog = props.showOptionPriceEditorDialog;
+    showOptionPriceEditorDialog = props.showOptionPriceEditorDialog,
+    allowUmlauts = props.allowUmlauts;
   var _useDataSchema = (0, _useDataSchema2.useDataSchema)({
       dataSchema: deltaPriceDataSchema,
-      data: selectedOption
+      data: selectedOption,
+      allowUmlauts: allowUmlauts
     }),
     currentData = _useDataSchema.currentData,
     validate = _useDataSchema.validate;

package/Screens/Creator/Components/OptionclassificationEditor.js

@@ -470,9 +470,9 @@ var OptionEditor = /*#__PURE__*/function (_React$Component5) {
     }
   }]);
 }(_react["default"].Component);
-function mapStateToProps(_ref4) {
-  var baseConfigurationData = _ref4.baseConfigurationData,
-    creatorData = _ref4.creatorData;
+function mapStateToProps(state) {
+  var baseConfigurationData = state.baseConfigurationData,
+    creatorData = state.creatorData;
   return {
     showOptionSelectionDialog: baseConfigurationData.showOptionSelectionDialog,
     selectedComponent: baseConfigurationData.selectedComponent,
@@ -482,7 +482,8 @@ function mapStateToProps(_ref4) {
     options: baseConfigurationData.selectableOptions,
     product: creatorData.source,
     showOverrideOptionOrderSaveHint: baseConfigurationData.showOverrideOptionOrderSaveHint,
-    priceEditEnabled: _lodash["default"].get(baseConfigurationData, 'dataSources.settings.calculationMethod') === 'deltaprices'
+    priceEditEnabled: _lodash["default"].get(baseConfigurationData, 'dataSources.settings.calculationMethod') === 'deltaprices',
+    allowUmlauts: !!_lodash["default"].get(state, 'settingData.data.allowUmlautsInIdentifiers.value', false)
   };
 }
 function mapDispatchToProps(dispatch) {

package/Screens/Designer/SubScreens/DesignAreas/Components/FormArray.js

@@ -145,20 +145,24 @@ var FormArray = /*#__PURE__*/function (_Component) {
   return _createClass(FormArray, [{
     key: "initSchema",
     value: function initSchema() {
-      var schema = this.props.schema;
-      return new _Data["default"](schema);
+      var _this$props4 = this.props,
+        schema = _this$props4.schema,
+        allowUmlauts = _this$props4.allowUmlauts;
+      return new _Data["default"](schema, false, {
+        allowUmlauts: allowUmlauts
+      });
     }
   }, {
     key: "render",
     value: function render() {
       var _this2 = this;
-      var _this$props4 = this.props,
-        label = _this$props4.label,
-        formArray = _this$props4.formArray,
-        value = _this$props4.value,
-        errors = _this$props4.errors,
-        classes = _this$props4.classes,
-        props = _objectWithoutProperties(_this$props4, _excluded);
+      var _this$props5 = this.props,
+        label = _this$props5.label,
+        formArray = _this$props5.formArray,
+        value = _this$props5.value,
+        errors = _this$props5.errors,
+        classes = _this$props5.classes,
+        props = _objectWithoutProperties(_this$props5, _excluded);
       var disableAdd = formArray.disableAdd,
         FormComponent = formArray.FormComponent,
         updateOnPropertyMatch = formArray.updateOnPropertyMatch;

package/Screens/Designer/SubScreens/Visualization/Containers/Edit/Edit.js

@@ -15,6 +15,7 @@ var _merge = _interopRequireDefault(require("lodash/merge"));
 var _withStyles = _interopRequireDefault(require("@material-ui/core/styles/withStyles"));
 var _visualizationAdapterCreator = require("redhotmagma-visualization/visualizationAdapterCreator");
 var _Constants = require("redhotmagma-visualization/Constants");
+var _reactRedux = require("react-redux");
 var _RemappedProps = require("../../../../../../Utils/HOCs/RemappedProps");
 var _AsyncProps = require("../../../../../../Utils/HOCs/AsyncProps");
 var _DefaultConnectedForm = require("../../../../../../Components/DefaultConnectedForm");
@@ -277,7 +278,10 @@ var VisualizationSettingsEdit = exports.VisualizationSettingsEdit = /*#__PURE__*
     _defineProperty(_this, "updateData", function () {
       var customData = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var designAreas = (0, _get["default"])(_this.props, 'entityState.data.designAreas');
-      var data = new _Data["default"](designAreas.schema);
+      var allowUmlauts = _this.props.allowUmlauts || false;
+      var data = new _Data["default"](designAreas.schema, false, {
+        allowUmlauts: allowUmlauts
+      });
       var previousData = (0, _Three2DEditor.fixIncompletePosition)(_this.getCurrentDesignAreaData());
       var baseShapeData = previousData.baseShape || {
         type: 'Plane'
@@ -869,4 +873,9 @@ var StyledVisualizationSettingsEdit = exports.StyledVisualizationSettingsEdit =
     mode: mode
   };
 })(VisualizationSettingsEdit))));
-var _default = exports["default"] = (0, _DefaultConnectedForm.connectDefault)(StyledVisualizationSettingsEdit, _Actions.REDUCER_NAME, _Actions["default"].setFieldData, _Actions["default"].postData, _Actions["default"].hideDetails);
+var ConnectedEdit = (0, _DefaultConnectedForm.connectDefault)(StyledVisualizationSettingsEdit, _Actions.REDUCER_NAME, _Actions["default"].setFieldData, _Actions["default"].postData, _Actions["default"].hideDetails);
+var _default = exports["default"] = (0, _reactRedux.connect)(function (state) {
+  return {
+    allowUmlauts: !!(0, _get["default"])(state, 'settingData.data.allowUmlautsInIdentifiers.value', false)
+  };
+})(ConnectedEdit);

package/Screens/Login/Reducers/Actions.js

@@ -6,11 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.setLicense = exports.postLoginData = exports.logout = exports.loginError = exports.SET_LICENSE = exports.LOGIN_SET_DATA = exports.LOGIN_RESET = exports.LOGIN_REDUCER_NAME = exports.LOGIN_ERROR = exports.LOGIN_DATA_KEY = void 0;
 var _reactRouter = require("react-router");
 var _Helpers = require("../../../App/Reducers/Api/Helpers");
-var _Actions = require("../../../App/Reducers/Frame/Actions");
+var _Actions = require("../../../App/Reducers/Api/Actions");
+var _Actions2 = require("../../../App/Reducers/Entity/Actions");
+var _Actions3 = require("../../Setting/Reducers/Actions");
+var _Actions4 = require("../../../App/Reducers/Frame/Actions");
 var _Api = require("../../../App/Api");
 var _ReduxListener = require("../../../App/ReduxListener");
 var _network = _interopRequireDefault(require("../../../App/Config/network"));
-var _Listener = _interopRequireDefault(require("./Listener"));
+var _Listener = require("./Listener");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 var LOGIN_DATA_KEY = exports.LOGIN_DATA_KEY = 'login';
 var LOGIN_REDUCER_NAME = exports.LOGIN_REDUCER_NAME = 'loginData';
@@ -47,13 +50,35 @@ var receiveHandler = function receiveHandler(dispatch) {
     if (source.isPosted) {
       //browserHistory.push(basePath); // redirect to dashboard
       dispatch(setLoginData(source.data));
+      // Fetch settings after successful login and mount into settingData so allowUmlautsInIdentifiers etc. are available
+      dispatch(function (dispatchThunk, getState) {
+        return (0, _Helpers.dispatchFetchData)(dispatchThunk)(_Actions3.SETTING_LIST_KEY, 'settings/1').then(function (apiAction) {
+          if (apiAction && apiAction.type === _Actions.RECEIVE_DATA) {
+            var state = getState();
+            var sourceData = state.dataBySource[_Actions3.SETTING_LIST_KEY];
+            if (sourceData && sourceData.data) {
+              dispatchThunk({
+                type: _Actions2.ENTITY_WILL_MOUNT,
+                key: _Actions3.SETTING_DATA_KEY,
+                data: sourceData.data
+              });
+              dispatchThunk({
+                type: _Actions2.MOUNT_ENTITY,
+                key: _Actions3.SETTING_DATA_KEY,
+                data: sourceData.data,
+                isSaved: sourceData.isPosted || false
+              });
+            }
+          }
+        });
+      });
     }
   };
 };
 var errorHandler = function errorHandler(dispatch) {
   return function (error) {
     dispatch(loginError(error.response.data.message));
-    dispatch((0, _Actions.showErrorMessage)(error.response.data.message));
+    dispatch((0, _Actions4.showErrorMessage)(error.response.data.message));
   };
 };
 var postLoginData = exports.postLoginData = function postLoginData(username, password) {
@@ -66,4 +91,4 @@ var postLoginData = exports.postLoginData = function postLoginData(username, pas
     });
   };
 };
-(0, _ReduxListener.addReduxListener)(_Listener["default"]);
+(0, _ReduxListener.addReduxListener)(_Listener.loginListener);

package/Screens/Setting/Reducers/Reducer.js

@@ -34,7 +34,8 @@ var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)({
   showItemIdentifier: false,
   calculationMethod: 'sumofall',
   configurationsClientRestricted: true,
-  shareurl: ''
+  shareurl: '',
+  allowUmlautsInIdentifiers: false
 }, {}, _Actions.SETTING_DATA_KEY));
 var settingData = exports.settingData = (0, _FeatureReducers.createFeatureReducer)(_Actions.SETTING_REDUCER_NAME, function () {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;

package/Screens/index.js

@@ -96,9 +96,6 @@ function addFeature(key, module) {
 function importFeature(featureName) {
   var module;
   switch (featureName) {
-    case 'assembly_points':
-      module = require("./Assemblypointeditor");
-      break;
     case 'color_palettes':
       module = require("./ColorPalettes");
       break;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.53.6",
+  "version": "1.54.0",
   "license": "UNLICENSED",
   "private": false,
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.53.6",
+    "@configuratorware/scripts": "1.54.0",
     "@material-ui/core": "^3.9.4",
     "@material-ui/icons": "^3.0.2",
     "@tweenjs/tween.js": "^17.6.0",
@@ -29,7 +29,7 @@
     "react-redux-i18n": "^1.9.3",
     "react-router": "^3.2.6",
     "react-sortable-hoc": "^1.11.0",
-    "redhotmagma-visualization": "1.53.6",
+    "redhotmagma-visualization": "1.54.0",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/Screens/Assemblypointeditor/Components/AssemblypointTable.js

@@ -1,125 +0,0 @@
-"use strict";
-
-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); }
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _i18n = require("../../../App/i18n");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": 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 _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; }
-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); }
-function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
-function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
-function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
-function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
-function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
-var AssemblypointTable = /*#__PURE__*/function (_React$Component) {
-  function AssemblypointTable() {
-    _classCallCheck(this, AssemblypointTable);
-    return _callSuper(this, AssemblypointTable, arguments);
-  }
-  _inherits(AssemblypointTable, _React$Component);
-  return _createClass(AssemblypointTable, [{
-    key: "render",
-    value: function render() {
-      var _this$props = this.props,
-        activeAssemblyPoints = _this$props.activeAssemblyPoints,
-        onSelect = _this$props.onSelect,
-        onChange = _this$props.onChange,
-        sampleOptions = _this$props.sampleOptions,
-        assemblyPoints = _this$props.assemblyPoints;
-      return /*#__PURE__*/_react["default"].createElement("table", {
-        style: {
-          width: '100%'
-        }
-      }, /*#__PURE__*/_react["default"].createElement("thead", null, /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("th", null, (0, _i18n.T)('Name')), /*#__PURE__*/_react["default"].createElement("th", null, (0, _i18n.T)('X')), /*#__PURE__*/_react["default"].createElement("th", null, (0, _i18n.T)('Y')), /*#__PURE__*/_react["default"].createElement("th", null, (0, _i18n.T)('Rotation')), /*#__PURE__*/_react["default"].createElement("th", null, (0, _i18n.T)('Product')))), /*#__PURE__*/_react["default"].createElement("tbody", null, assemblyPoints.map(function (assemblyPoint, idx) {
-        var products = sampleOptions[assemblyPoint.optionclassification] && sampleOptions[assemblyPoint.optionclassification][assemblyPoint.identifier] || [];
-        return /*#__PURE__*/_react["default"].createElement(AssemblypointTableRow, {
-          key: idx,
-          assemblyPoint: assemblyPoint,
-          onChange: onChange,
-          onSelect: onSelect,
-          products: products,
-          active: activeAssemblyPoints.indexOf(assemblyPoint.identifier) > -1
-        });
-      })));
-    }
-  }]);
-}(_react["default"].Component);
-var AssemblypointTableRow = /*#__PURE__*/function (_React$Component2) {
-  function AssemblypointTableRow() {
-    var _this;
-    _classCallCheck(this, AssemblypointTableRow);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _callSuper(this, AssemblypointTableRow, [].concat(args));
-    _defineProperty(_this, "onChange", function (e) {
-      var _e$target = e.target,
-        name = _e$target.name,
-        value = _e$target.value;
-      var _this$props2 = _this.props,
-        assemblyPoint = _this$props2.assemblyPoint,
-        onSelect = _this$props2.onSelect,
-        onChange = _this$props2.onChange;
-      onSelect(assemblyPoint.identifier);
-      assemblyPoint[name] = value;
-      onChange(assemblyPoint);
-    });
-    _defineProperty(_this, "onSelect", function (e) {
-      if (['INPUT', 'SELECT'].indexOf(e.target.tagName) === -1) {
-        var _this$props3 = _this.props,
-          assemblyPoint = _this$props3.assemblyPoint,
-          onSelect = _this$props3.onSelect;
-        onSelect(assemblyPoint.identifier);
-      }
-    });
-    return _this;
-  }
-  _inherits(AssemblypointTableRow, _React$Component2);
-  return _createClass(AssemblypointTableRow, [{
-    key: "render",
-    value: function render() {
-      var _this$props4 = this.props,
-        assemblyPoint = _this$props4.assemblyPoint,
-        active = _this$props4.active,
-        products = _this$props4.products;
-      return /*#__PURE__*/_react["default"].createElement("tr", {
-        className: active ? 'active' : '',
-        onClick: this.onSelect
-      }, /*#__PURE__*/_react["default"].createElement("td", null, assemblyPoint.identifier), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement("input", {
-        type: "number",
-        name: "x",
-        value: assemblyPoint.x || '',
-        onChange: this.onChange
-      })), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement("input", {
-        type: "number",
-        name: "y",
-        value: assemblyPoint.y || '',
-        onChange: this.onChange
-      })), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement("input", {
-        type: "number",
-        name: "rotation",
-        value: assemblyPoint.rotation || '',
-        onChange: this.onChange
-      })), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement("select", {
-        name: "product",
-        onChange: this.onChange
-      }, products.map(function (product, idx) {
-        return /*#__PURE__*/_react["default"].createElement("option", {
-          value: product.identifier,
-          key: idx
-        }, product.identifier);
-      }))));
-    }
-  }]);
-}(_react["default"].Component);
-var _default = exports["default"] = AssemblypointTable;