@configuratorware/configurator-admingui 1.56.4 → 1.57.1

package/Screens/DesignProductionMethods/Reducers/DesignProductionMethodsReducer.js

@@ -7,6 +7,7 @@ exports.designProductionMethodsData = exports["default"] = void 0;
 var _Actions = require("./Actions");
 var _Reducer = require("../../../App/Reducers/Entity/Reducer");
 var _FeatureReducers = require("../../../App/FeatureReducers");
+var _ActionHelpers = require("../../Item/DataStructures/Prices/ActionHelpers");
 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; }
@@ -153,6 +154,7 @@ var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)({
 var designProductionMethodsData = exports.designProductionMethodsData = (0, _FeatureReducers.createFeatureReducer)(_Actions.REDUCER_NAME, function () {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
   var action = arguments.length > 1 ? arguments[1] : undefined;
+  (0, _ActionHelpers.removeInvalidPriceEntries)(state, action);
   state = (0, _Reducer.defaultEntityReducer)(state, action, initialState);
   return state;
 });

package/Screens/Designer/SubScreens/Visualization/Components/AdvancedShapeEditor.js

@@ -16,6 +16,7 @@ var _Typography = _interopRequireDefault(require("../../../../../UIComponents/Ty
 var _FormControlLabel = _interopRequireDefault(require("../../../../../UIComponents/FormControlLabel"));
 var _RadioButton = require("../../../../../UIComponents/RadioButton");
 var _Checkbox = _interopRequireDefault(require("../../../../../UIComponents/Checkbox"));
+var _Constants = require("../Containers/Edit/Constants");
 var _excluded = ["classes", "onChange", "value"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -144,6 +145,18 @@ var AdvancedShapeEditor = exports.AdvancedShapeEditor = (0, _styles.withStyles)(
     var formatter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : formatters.number;
     return formatter(toNumber((0, _get["default"])(designAreaData, path)));
   };
+
+  // special handler for position values to add the base shape padding
+  var positionChangeHandler = function positionChangeHandler(evt) {
+    if (evt.target.value) {
+      onChange(evt.target.name, toNumber(evt.target.value) + _Constants.DEFAULT_BASE_SHAPE_PADDING);
+    }
+  };
+
+  // special formatter for position values to subtract the base shape padding
+  var formatPosition = function formatPosition(path) {
+    return formatters.number(toNumber((0, _get["default"])(designAreaData, path)) - _Constants.DEFAULT_BASE_SHAPE_PADDING);
+  };
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: className
   }, /*#__PURE__*/_react["default"].createElement(_RaisedButton["default"], {
@@ -250,13 +263,13 @@ var AdvancedShapeEditor = exports.AdvancedShapeEditor = (0, _styles.withStyles)(
   }, (0, _i18n.t)('designer.advancedEditor.positioning')), /*#__PURE__*/_react["default"].createElement(NumberInput, {
     name: 'position.x',
     label: 'x',
-    onChange: numberChangeHandler,
-    value: format('position.x')
+    onChange: positionChangeHandler,
+    value: formatPosition('position.x')
   }), /*#__PURE__*/_react["default"].createElement(NumberInput, {
     name: 'position.y',
     label: 'y',
-    onChange: numberChangeHandler,
-    value: format('position.y')
+    onChange: positionChangeHandler,
+    value: formatPosition('position.y')
   }))));
 });
 var _default = exports["default"] = AdvancedShapeEditor;

package/Screens/Designer/SubScreens/Visualization/Components/DesignAreaDimensionsEditor.js

@@ -0,0 +1,198 @@
+"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"] = exports.DesignAreaDimensionsEditor = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _withStyles = _interopRequireDefault(require("@material-ui/core/styles/withStyles"));
+var _Edit = _interopRequireDefault(require("@material-ui/icons/Edit"));
+var _TextField = _interopRequireDefault(require("@material-ui/core/TextField"));
+var _CircularProgress = _interopRequireDefault(require("@material-ui/core/CircularProgress"));
+var _Button = _interopRequireDefault(require("../../../../../UIComponents/Button"));
+var _Tooltip = _interopRequireDefault(require("../../../../../UIComponents/Tooltip"));
+var _CheckmarkIcon = _interopRequireDefault(require("../../../../../UIComponents/icons/CheckmarkIcon"));
+var _CloseIcon = _interopRequireDefault(require("../../../../../UIComponents/icons/CloseIcon"));
+var _i18n = require("../../../../../App/i18n");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+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; }
+var styles = function styles(theme) {
+  return {
+    root: {
+      display: 'flex',
+      flexDirection: 'row',
+      alignItems: 'center',
+      flexWrap: 'wrap'
+    },
+    data: {
+      padding: 0,
+      marginBottom: theme.spacing.unit,
+      marginTop: 0,
+      listStyle: 'none',
+      '& li': {
+        display: 'inline-flex',
+        alignItems: 'center',
+        marginRight: 2 * theme.spacing.unit
+      }
+    },
+    dimensionInput: {
+      maxWidth: 60,
+      margin: 0,
+      marginRight: theme.spacing.unit / 2
+    },
+    dimensionInputRoot: {
+      font: 'inherit',
+      color: 'inherit'
+    },
+    dimensionInputField: {
+      padding: 0,
+      textAlign: 'right'
+    },
+    actions: {
+      display: 'inline-flex',
+      alignItems: 'center',
+      verticalAlign: 'middle'
+    },
+    actionButton: {
+      minWidth: 'auto',
+      padding: theme.spacing.unit / 2
+    }
+  };
+};
+var toNumber = function toNumber(value) {
+  var parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : null;
+};
+var DesignAreaDimensionsEditor = exports.DesignAreaDimensionsEditor = (0, _withStyles["default"])(styles)(function (_ref) {
+  var classes = _ref.classes,
+    width = _ref.width,
+    height = _ref.height,
+    onSave = _ref.onSave,
+    disabled = _ref.disabled;
+  var _useState = (0, _react.useState)(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    editing = _useState2[0],
+    setEditing = _useState2[1];
+  var _useState3 = (0, _react.useState)(String(width !== null && width !== void 0 ? width : '')),
+    _useState4 = _slicedToArray(_useState3, 2),
+    draftWidth = _useState4[0],
+    setDraftWidth = _useState4[1];
+  var _useState5 = (0, _react.useState)(String(height !== null && height !== void 0 ? height : '')),
+    _useState6 = _slicedToArray(_useState5, 2),
+    draftHeight = _useState6[0],
+    setDraftHeight = _useState6[1];
+  var _useState7 = (0, _react.useState)(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    saving = _useState8[0],
+    setSaving = _useState8[1];
+  (0, _react.useEffect)(function () {
+    if (!editing) {
+      setDraftWidth(String(width !== null && width !== void 0 ? width : ''));
+      setDraftHeight(String(height !== null && height !== void 0 ? height : ''));
+    }
+  }, [width, height, editing]);
+  var startEditing = function startEditing() {
+    setDraftWidth(String(width !== null && width !== void 0 ? width : ''));
+    setDraftHeight(String(height !== null && height !== void 0 ? height : ''));
+    setEditing(true);
+  };
+  var cancelEditing = function cancelEditing() {
+    setDraftWidth(String(width !== null && width !== void 0 ? width : ''));
+    setDraftHeight(String(height !== null && height !== void 0 ? height : ''));
+    setEditing(false);
+  };
+  var save = function save() {
+    var nextWidth = toNumber(draftWidth);
+    var nextHeight = toNumber(draftHeight);
+    if (!nextWidth || !nextHeight || nextWidth <= 0 || nextHeight <= 0) {
+      return;
+    }
+    setSaving(true);
+    onSave(nextWidth, nextHeight).then(function () {
+      return setEditing(false);
+    })["finally"](function () {
+      return setSaving(false);
+    });
+  };
+  var dimensionInputProps = {
+    disableUnderline: true,
+    classes: {
+      root: classes.dimensionInputRoot,
+      input: classes.dimensionInputField
+    }
+  };
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: classes.root
+  }, /*#__PURE__*/_react["default"].createElement("ul", {
+    className: classes.data
+  }, /*#__PURE__*/_react["default"].createElement("li", null, (0, _i18n.T)('designer.visualization.width'), ":", ' ', editing ? /*#__PURE__*/_react["default"].createElement(_TextField["default"], {
+    type: "number",
+    className: classes.dimensionInput,
+    value: draftWidth,
+    onChange: function onChange(evt) {
+      return setDraftWidth(evt.target.value);
+    },
+    disabled: saving || disabled,
+    inputProps: {
+      min: 0,
+      step: 'any'
+    },
+    InputProps: dimensionInputProps
+  }) : width, ' ', "mm"), /*#__PURE__*/_react["default"].createElement("li", null, (0, _i18n.T)('designer.visualization.height'), ":", ' ', editing ? /*#__PURE__*/_react["default"].createElement(_TextField["default"], {
+    type: "number",
+    className: classes.dimensionInput,
+    value: draftHeight,
+    onChange: function onChange(evt) {
+      return setDraftHeight(evt.target.value);
+    },
+    disabled: saving || disabled,
+    inputProps: {
+      min: 0,
+      step: 'any'
+    },
+    InputProps: dimensionInputProps
+  }) : height, ' ', "mm")), /*#__PURE__*/_react["default"].createElement("span", {
+    className: classes.actions
+  }, saving ? /*#__PURE__*/_react["default"].createElement(_CircularProgress["default"], {
+    size: 20
+  }) : editing ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    className: classes.actionButton,
+    "aria-label": (0, _i18n.T)('Ok'),
+    onClick: save,
+    disabled: disabled,
+    size: "small"
+  }, /*#__PURE__*/_react["default"].createElement(_CheckmarkIcon["default"], null)), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    className: classes.actionButton,
+    "aria-label": (0, _i18n.T)('Cancel'),
+    onClick: cancelEditing,
+    disabled: disabled,
+    size: "small"
+  }, /*#__PURE__*/_react["default"].createElement(_CloseIcon["default"], null))) : /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
+    title: (0, _i18n.T)('designer.visualization.editDimensions'),
+    placement: "right"
+  }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    className: classes.actionButton,
+    "aria-label": (0, _i18n.T)('designer.visualization.editDimensions'),
+    onClick: startEditing,
+    disabled: disabled,
+    size: "small"
+  }, /*#__PURE__*/_react["default"].createElement(_Edit["default"], null)))));
+});
+DesignAreaDimensionsEditor.propTypes = {
+  width: _propTypes["default"].number,
+  height: _propTypes["default"].number,
+  onSave: _propTypes["default"].func.isRequired,
+  disabled: _propTypes["default"].bool
+};
+DesignAreaDimensionsEditor.defaultProps = {
+  disabled: false
+};
+var _default = exports["default"] = DesignAreaDimensionsEditor;

package/Screens/Designer/SubScreens/Visualization/Components/Three2DEditor.js

@@ -244,6 +244,11 @@ var createThree2DEditor = exports.createThree2DEditor = /*#__PURE__*/function ()
             group.position.copy(obj.position);
             group.rotation.copy(obj.rotation);
             var geometry = obj.geometry;
+            if (!geometry) {
+              return {
+                update: function update() {}
+              };
+            }
             geometry.computeBoundingBox();
             var boundingBox = geometry.boundingBox;
             obj.rotation.set(0, 0, 0);

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

@@ -85,6 +85,9 @@ var applyLinks = exports.applyLinks = function applyLinks(prevData, nextData) {
       });
     }
   });
+  if (positionRatio > 0 && Math.abs(nextData.baseShape.width / nextData.baseShape.height - positionRatio) > 0.01) {
+    calcPathValue(nextData, 'baseShape.width', multiplyToPixel(positionRatio));
+  }
   withRatio(prevData, nextData, 'baseShape.width', function (r) {
     calcPathValue(nextData, 'position.width', multiplyToPixel(r));
   }) || withRatio(prevData, nextData, 'baseShape.height', function (r) {
@@ -104,8 +107,8 @@ var applyLinks = exports.applyLinks = function applyLinks(prevData, nextData) {
   var _calculateBoundingBox = (0, _calculateBoundingBoxSize.calculateBoundingBoxSize)(nextData.position),
     width = _calculateBoundingBox.width,
     height = _calculateBoundingBox.height;
-  (0, _set["default"])(nextData, 'baseShape.width', Math.round(width) + baseShapePadding);
-  (0, _set["default"])(nextData, 'baseShape.height', Math.round(height) + baseShapePadding);
+  (0, _set["default"])(nextData, 'baseShape.width', Math.ceil(width) + baseShapePadding * 2);
+  (0, _set["default"])(nextData, 'baseShape.height', Math.ceil(height) + baseShapePadding * 2);
 
   // set min value for base shape size
   if ((0, _get["default"])(nextData, 'baseShape.width') <= sizeMin) {

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

@@ -45,6 +45,8 @@ var _FormControlLabel = _interopRequireDefault(require("../../../../../../UIComp
 var _sendMessage = require("../../../../../../Utils/Function/sendMessage");
 var _CircularProgress = _interopRequireDefault(require("@material-ui/core/CircularProgress"));
 var _AreaEditorForm = _interopRequireDefault(require("../../Components/AreaEditorForm"));
+var _DesignAreaDimensionsEditor = _interopRequireDefault(require("../../Components/DesignAreaDimensionsEditor"));
+var _Actions2 = _interopRequireWildcard(require("../../../DesignAreas/Reducers/Actions"));
 var _TextField = _interopRequireDefault(require("@material-ui/core/TextField"));
 var _excluded = ["classes", "onChange", "value"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
@@ -427,6 +429,12 @@ var VisualizationSettingsEdit = exports.VisualizationSettingsEdit = /*#__PURE__*
     _defineProperty(_assertThisInitialized(_this), "cancel", function () {
       return _this.props.hideDetails();
     });
+    _defineProperty(_assertThisInitialized(_this), "saveDesignAreaDimensions", function (width, height) {
+      var _this$props = _this.props,
+        designArea = _this$props.designArea,
+        saveDesignAreaDimensions = _this$props.saveDesignAreaDimensions;
+      return saveDesignAreaDimensions(designArea.id, width, height);
+    });
     _defineProperty(_assertThisInitialized(_this), "areaEditorRef", /*#__PURE__*/_react["default"].createRef());
     return _this;
   }
@@ -528,9 +536,9 @@ var VisualizationSettingsEdit = exports.VisualizationSettingsEdit = /*#__PURE__*
   }, {
     key: "getCurrentDesignAreaData",
     value: function getCurrentDesignAreaData() {
-      var _this$props = this.props,
-        designArea = _this$props.designArea,
-        entityState = _this$props.entityState;
+      var _this$props2 = this.props,
+        designArea = _this$props2.designArea,
+        entityState = _this$props2.entityState;
       if (!designArea) {
         return null;
       }
@@ -626,9 +634,9 @@ var VisualizationSettingsEdit = exports.VisualizationSettingsEdit = /*#__PURE__*
   }, {
     key: "getCurrentMaskObject",
     value: function getCurrentMaskObject() {
-      var _this$props2 = this.props,
-        designArea = _this$props2.designArea,
-        itemIdentifier = _this$props2.item.identifier;
+      var _this$props3 = this.props,
+        designArea = _this$props3.designArea,
+        itemIdentifier = _this$props3.item.identifier;
       var _designArea$this$getC = _objectSpread(_objectSpread({}, designArea), this.getCurrentDesignAreaData()),
         mask = _designArea$this$getC.mask,
         designAreaIdentifier = _designArea$this$getC.identifier;
@@ -658,11 +666,11 @@ var VisualizationSettingsEdit = exports.VisualizationSettingsEdit = /*#__PURE__*
     function () {
       var _loadModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
         var _this2 = this;
-        var _this$props3, item, mode, variant, three;
+        var _this$props4, item, mode, variant, three;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _this$props3 = this.props, item = _this$props3.item, mode = _this$props3.mode;
+              _this$props4 = this.props, item = _this$props4.item, mode = _this$props4.mode;
               try {
                 variant = (0, _get["default"])(item, 'children[0]', item);
                 if (!item || !variant) {
@@ -792,10 +800,10 @@ var VisualizationSettingsEdit = exports.VisualizationSettingsEdit = /*#__PURE__*
     key: "renderHeader",
     value: function renderHeader(designAreaData) {
       var _this3 = this;
-      var _this$props4 = this.props,
-        designArea = _this$props4.designArea,
-        classes = _this$props4.classes,
-        mode = _this$props4.mode;
+      var _this$props5 = this.props,
+        designArea = _this$props5.designArea,
+        classes = _this$props5.classes,
+        mode = _this$props5.mode;
       var designProductionMethods = (designArea.designProductionMethods || []).map(function (dpm) {
         return dpm.title;
       }).join(', ');
@@ -810,9 +818,12 @@ var VisualizationSettingsEdit = exports.VisualizationSettingsEdit = /*#__PURE__*
         fallback: designArea.identifier || 'Title of the design area'
       })), /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.data
-      }, designProductionMethods), /*#__PURE__*/_react["default"].createElement("ul", {
-        className: classes.data
-      }, /*#__PURE__*/_react["default"].createElement("li", null, (0, _i18n.T)('designer.visualization.width'), ": ", designArea.width, " mm"), /*#__PURE__*/_react["default"].createElement("li", null, (0, _i18n.T)('designer.visualization.height'), ": ", designArea.height, " mm")), this.state.cameraViews.length > 0 && /*#__PURE__*/_react["default"].createElement(_SelectField["default"], {
+      }, designProductionMethods), /*#__PURE__*/_react["default"].createElement(_DesignAreaDimensionsEditor["default"], {
+        width: designArea.width,
+        height: designArea.height,
+        onSave: this.saveDesignAreaDimensions,
+        disabled: !designArea.id
+      }), this.state.cameraViews.length > 0 && /*#__PURE__*/_react["default"].createElement(_SelectField["default"], {
         onChange: this.onChangeCameraView,
         label: (0, _i18n.T)('designer.visualization.cameraPosition'),
         value: this.state.selectedCameraView,
@@ -852,9 +863,9 @@ var VisualizationSettingsEdit = exports.VisualizationSettingsEdit = /*#__PURE__*
     key: "renderVisualization",
     value: function renderVisualization(designAreaData) {
       var _this4 = this;
-      var _this$props5 = this.props,
-        mode = _this$props5.mode,
-        classes = _this$props5.classes;
+      var _this$props6 = this.props,
+        mode = _this$props6.mode,
+        classes = _this$props6.classes;
       var three = this.three;
       if (isKindOf2D(mode)) {
         return /*#__PURE__*/_react["default"].createElement("div", {
@@ -910,7 +921,7 @@ var VisualizationSettingsEdit = exports.VisualizationSettingsEdit = /*#__PURE__*
         },
         label: (0, _i18n.T)('designer.productSizeControls.dimension'),
         disableUnderline: true,
-        value: prodVisSize.dimension
+        value: (prodVisSize === null || prodVisSize === void 0 ? void 0 : prodVisSize.dimension) || 'width'
       }, /*#__PURE__*/_react["default"].createElement(_MenuItem["default"], {
         value: "width"
       }, (0, _i18n.T)('designer.productSizeControls.width')), /*#__PURE__*/_react["default"].createElement(_MenuItem["default"], {
@@ -918,10 +929,11 @@ var VisualizationSettingsEdit = exports.VisualizationSettingsEdit = /*#__PURE__*
       }, (0, _i18n.T)('designer.productSizeControls.height'))), /*#__PURE__*/_react["default"].createElement(NumberInput, {
         label: 'mm',
         name: "productSize",
-        value: prodVisSize.value,
+        value: prodVisSize === null || prodVisSize === void 0 ? void 0 : prodVisSize.value,
         onChange: function onChange(evt) {
           _this5.setState({
             productVisualizationSize: _objectSpread(_objectSpread({}, prodVisSize), {}, {
+              dimension: (prodVisSize === null || prodVisSize === void 0 ? void 0 : prodVisSize.dimension) || 'width',
               value: evt.target.value
             })
           });
@@ -935,6 +947,7 @@ var VisualizationSettingsEdit = exports.VisualizationSettingsEdit = /*#__PURE__*
         }
       }), /*#__PURE__*/_react["default"].createElement(_RaisedButton["default"], {
         label: (0, _i18n.T)('designer.productSizeControls.apply'),
+        disabled: !(prodVisSize !== null && prodVisSize !== void 0 && prodVisSize.value) || !(prodVisSize !== null && prodVisSize !== void 0 && prodVisSize.dimension) || (prodVisSize === null || prodVisSize === void 0 ? void 0 : prodVisSize.value) <= 0,
         onClick: function onClick() {
           _this5.updateData({
             baseShape: _this5.calculateBaseShapeSize()
@@ -945,11 +958,11 @@ var VisualizationSettingsEdit = exports.VisualizationSettingsEdit = /*#__PURE__*
   }, {
     key: "render",
     value: function render() {
-      var _this$props6 = this.props,
-        designArea = _this$props6.designArea,
-        classes = _this$props6.classes,
-        mode = _this$props6.mode,
-        entityState = _this$props6.entityState;
+      var _this$props7 = this.props,
+        designArea = _this$props7.designArea,
+        classes = _this$props7.classes,
+        mode = _this$props7.mode,
+        entityState = _this$props7.entityState;
       var three = this.three;
       if (!designArea || !entityState.showDetails) {
         return null;
@@ -1012,7 +1025,9 @@ _defineProperty(VisualizationSettingsEdit, "propTypes", {
   entityState: _propTypes["default"].object,
   classes: _propTypes["default"].object,
   setData: _propTypes["default"].func.isRequired,
-  postData: _propTypes["default"].func.isRequired
+  postData: _propTypes["default"].func.isRequired,
+  saveDesignAreaDimensions: _propTypes["default"].func.isRequired,
+  setState: _propTypes["default"].func
 });
 _defineProperty(VisualizationSettingsEdit, "defaultProps", {
   classes: {}
@@ -1087,8 +1102,42 @@ var StyledVisualizationSettingsEdit = exports.StyledVisualizationSettingsEdit =
   };
 })(VisualizationSettingsEdit))));
 var ConnectedEdit = (0, _DefaultConnectedForm.connectDefault)(StyledVisualizationSettingsEdit, _Actions.REDUCER_NAME, _Actions["default"].setFieldData, _Actions["default"].postData, _Actions["default"].hideDetails);
+var _saveDesignAreaDimensions = function saveDesignAreaDimensions(designAreaId, width, height) {
+  return function (dispatch, getState) {
+    return dispatch(_Actions2["default"].detailsAction({
+      id: designAreaId
+    })).then(function () {
+      dispatch(_Actions2["default"].setFieldData('width', width));
+      dispatch(_Actions2["default"].setFieldData('height', height));
+      return dispatch(_Actions2["default"].postData(true));
+    }).then(function () {
+      var savedDesignArea = (0, _get["default"])(getState(), "dataBySource.".concat(_Actions2.DATA_KEY, ".data"));
+      if (!savedDesignArea) {
+        return Promise.reject(new Error('Failed to save design area dimensions'));
+      }
+      return savedDesignArea;
+    });
+  };
+};
 var _default = exports["default"] = (0, _reactRedux.connect)(function (state) {
   return {
-    allowUmlauts: !!(0, _get["default"])(state, 'settingData.data.allowUmlautsInIdentifiers.value', false)
+    allowUmlauts: !!(0, _get["default"])(state, 'settingData.data.allowUmlautsInIdentifiers.value', false),
+    designViewId: state[_Actions.REDUCER_NAME].data.id.value
+  };
+}, function (dispatch) {
+  return {
+    saveDesignAreaDimensions: function saveDesignAreaDimensions(designAreaId, width, height) {
+      return dispatch(_saveDesignAreaDimensions(designAreaId, width, height)).then(function (savedDesignArea) {
+        dispatch(_Actions2["default"].invalidateList());
+        dispatch(_Actions2["default"].listAction());
+        dispatch(function (dispatch, getState) {
+          var designViewId = getState()[_Actions.REDUCER_NAME].data.id.value;
+          dispatch(_Actions["default"].detailsAction({
+            id: designViewId
+          }));
+        });
+        return savedDesignArea;
+      });
+    }
   };
 })(ConnectedEdit);

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

@@ -50,6 +50,19 @@ var VisualizationSettings = /*#__PURE__*/function (_React$Component) {
       if (didInvalidate && didInvalidate !== prevProps.didInvalidate) {
         loadList({});
       }
+      var prevDesignAreaList = (0, _get["default"])(prevProps, 'designAreaList.data.data');
+      var designAreaList = (0, _get["default"])(this.props, 'designAreaList.data.data');
+      var selectedDesignArea = this.props.designArea;
+      if (selectedDesignArea !== null && selectedDesignArea !== void 0 && selectedDesignArea.identifier && (designAreaList === null || designAreaList === void 0 ? void 0 : designAreaList.length) > 0 && designAreaList !== prevDesignAreaList) {
+        var newDesignArea = designAreaList.find(function (designArea) {
+          return designArea.identifier === selectedDesignArea.identifier;
+        });
+        if (newDesignArea) {
+          this.props.setState({
+            designArea: newDesignArea
+          });
+        }
+      }
     }
   }, {
     key: "renderDesignAreaList",

package/Screens/Designer/SubScreens/Visualization/Translations.js

@@ -15,6 +15,7 @@ require("../../../../App/i18n").use({
         },
         width: 'Breite',
         height: 'Höhe',
+        editDimensions: 'Breite und Höhe editieren',
         cameraPosition: 'Kameraposition',
         mode: 'Visualization mode'
       },
@@ -63,6 +64,7 @@ require("../../../../App/i18n").use({
         },
         width: 'Width',
         height: 'Height',
+        editDimensions: 'Edit width and height',
         cameraPosition: 'Camera position',
         mode: 'Visualization mode'
       },

package/Screens/ImageGallery/Reducers/Reducer.js

@@ -9,6 +9,7 @@ var _Reducer = require("../../../App/Reducers/Entity/Reducer");
 var _Actions2 = require("../../../App/Reducers/Entity/Actions");
 var _FeatureReducers = require("../../../App/FeatureReducers");
 var _Reducer2 = _interopRequireDefault(require("../../ImageGallery/ImageTags/Reducer"));
+var _ActionHelpers = require("../../Item/DataStructures/Prices/ActionHelpers");
 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; }
@@ -68,6 +69,7 @@ var initialState = _objectSpread(_objectSpread({}, (0, _Reducer.getDefaultEntity
 var imagegalleryimageData = exports.imagegalleryimageData = (0, _FeatureReducers.createFeatureReducer)(_Actions.IMAGE_GALLERY_REDUCER_NAME, function () {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
   var action = arguments.length > 1 ? arguments[1] : undefined;
+  (0, _ActionHelpers.removeInvalidPriceEntries)(state, action);
   if (action.key === _Actions.IMAGE_GALLERY_DATA_KEY) {
     if (action.type === _Actions2.SET_DATA) {
       if (action.field === 'imageUrl') {

package/Screens/Item/Components/ExportCreatorItemDialog.js

@@ -12,7 +12,7 @@ var _Dialog = _interopRequireDefault(require("../../../UIComponents/Dialog"));
 var _FlatButton = _interopRequireDefault(require("../../../UIComponents/FlatButton"));
 var _IconButton = _interopRequireDefault(require("../../../UIComponents/IconButton"));
 var _Tooltip = _interopRequireDefault(require("../../../UIComponents/Tooltip"));
-var _CloudDownload = _interopRequireDefault(require("@material-ui/icons/CloudDownload"));
+var _Publish = _interopRequireDefault(require("@material-ui/icons/Publish"));
 var _Actions = _interopRequireDefault(require("../Reducers/Actions"));
 var _Actions2 = require("../../../App/Reducers/Frame/Actions");
 var _FormControlLabel = _interopRequireDefault(require("../../../UIComponents/FormControlLabel"));
@@ -128,7 +128,7 @@ var ExportCreatorItemDialog = function ExportCreatorItemDialog(_ref) {
     onClick: function onClick() {
       return setShowEditor(true);
     }
-  }, /*#__PURE__*/_react["default"].createElement(_CloudDownload["default"], null))), /*#__PURE__*/_react["default"].createElement(_Dialog["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_Publish["default"], null))), /*#__PURE__*/_react["default"].createElement(_Dialog["default"], {
     title: title,
     actions: /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_FlatButton["default"], {
       label: (0, _i18n.t)('cancel'),

package/Screens/Item/Components/ImportItemDialog.js

@@ -11,7 +11,7 @@ var _Dialog = _interopRequireDefault(require("../../../UIComponents/Dialog"));
 var _FlatButton = _interopRequireDefault(require("../../../UIComponents/FlatButton"));
 var _IconButton = _interopRequireDefault(require("../../../UIComponents/IconButton"));
 var _Tooltip = _interopRequireDefault(require("../../../UIComponents/Tooltip"));
-var _CloudUpload = _interopRequireDefault(require("@material-ui/icons/CloudUpload"));
+var _GetApp = _interopRequireDefault(require("@material-ui/icons/GetApp"));
 var _Api = _interopRequireDefault(require("../../../App/Api"));
 var _hasCredentialFor = _interopRequireDefault(require("../../../App/Selectors/Credentials/hasCredentialFor"));
 var _Actions = require("../../../App/Reducers/Frame/Actions");
@@ -190,7 +190,7 @@ var ImportItemDialog = function ImportItemDialog(_ref) {
     onClick: function onClick() {
       return setOpen(true);
     }
-  }, /*#__PURE__*/_react["default"].createElement(_CloudUpload["default"], null))), /*#__PURE__*/_react["default"].createElement(_Dialog["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_GetApp["default"], null))), /*#__PURE__*/_react["default"].createElement(_Dialog["default"], {
     title: title,
     open: open,
     onClose: onClose,

package/Screens/Item/DataStructures/Prices/ActionHelpers.js

@@ -8,10 +8,24 @@ var _Actions = require("../../../../App/Reducers/Entity/Actions");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 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; }
+var hasPriceValue = function hasPriceValue(value) {
+  if (value === null || value === undefined) {
+    return false;
+  }
+  if (typeof value === 'string') {
+    var trimmedValue = value.trim();
+    return trimmedValue !== '' && Number(trimmedValue) !== 0;
+  }
+  if (typeof value === 'number') {
+    return value !== 0;
+  }
+  return !!value;
+};
 var filterInvalidPriceItem = function filterInvalidPriceItem(_ref) {
   var price = _ref.price,
-    priceNet = _ref.priceNet;
-  return price || priceNet;
+    priceNet = _ref.priceNet,
+    price_net = _ref.price_net;
+  return hasPriceValue(price) || hasPriceValue(priceNet) || hasPriceValue(price_net);
 };
 var removeInvalidPriceEntriesRecursive = function removeInvalidPriceEntriesRecursive(arr) {
   if (arr instanceof Array) {

package/Screens/PriceTypes/Reducers/Reducer.js

@@ -7,6 +7,7 @@ exports.designerGlobalCalculationTypes = exports["default"] = void 0;
 var _Actions = require("./Actions");
 var _Reducer = require("../../../App/Reducers/Entity/Reducer");
 var _FeatureReducers = require("../../../App/FeatureReducers");
+var _ActionHelpers = require("../../Item/DataStructures/Prices/ActionHelpers");
 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; }
@@ -77,6 +78,7 @@ var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)({
 var designerGlobalCalculationTypes = exports.designerGlobalCalculationTypes = (0, _FeatureReducers.createFeatureReducer)(_Actions.REDUCER_NAME, function () {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
   var action = arguments.length > 1 ? arguments[1] : undefined;
+  (0, _ActionHelpers.removeInvalidPriceEntries)(state, action);
   return (0, _Reducer.defaultEntityReducer)(state, action, initialState);
 });
 var _default = exports["default"] = designerGlobalCalculationTypes;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.56.4",
+  "version": "1.57.1",
   "license": "UNLICENSED",
   "private": false,
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.56.4",
+    "@configuratorware/scripts": "1.57.1",
     "@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.56.4",
+    "redhotmagma-visualization": "1.57.1",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",