@configuratorware/configurator-admingui 1.57.1 → 1.57.2

package/App/Reducers/Entity/Actions.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-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;
+exports.reportUnsavedEntity = exports.reportDeleteEntities = exports.releaseUnsavedEntityBypassed = 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");
@@ -55,6 +55,11 @@ var releaseUnsavedEntity = exports.releaseUnsavedEntity = function releaseUnsave
     });
   };
 };
+var releaseUnsavedEntityBypassed = exports.releaseUnsavedEntityBypassed = function releaseUnsavedEntityBypassed() {
+  return {
+    type: RELEASE_UNSAVED_ENTITY
+  };
+};
 var cancelUnsavedEntityDialog = exports.cancelUnsavedEntityDialog = function cancelUnsavedEntityDialog() {
   return {
     type: CANCEL_UNSAVED_ENTITY_DIALOG
@@ -358,8 +363,12 @@ var generateDefaultActions = exports.generateDefaultActions = function generateD
   };
   var detailsAction = function detailsAction(params) {
     return function (dispatch) {
+      var _keepMounted$params = _objectSpread({
+          keepMounted: false
+        }, params),
+        keepMounted = _keepMounted$params.keepMounted;
       return dispatch(triggerUnsavedEntity()).then(function () {
-        dispatch(unmountEntity());
+        !keepMounted && dispatch(unmountEntity());
         dispatch(initUnsavedEntity(reducerName));
         dispatch((0, _Helpers.invalidateSource)(dataKey));
         return dispatch(loadEntity(params));

package/Screens/Designer/SubScreens/DesignAreas/Reducers/Actions.js

@@ -76,11 +76,12 @@ var createEntity = function createEntity() {
   };
 };
 var postData = function postData() {
+  var hideDetails = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
   return function (dispatch, getState) {
     var _getState4 = getState(),
       designAreasData = _getState4.designAreasData;
     // to save uploaded images
-    return dispatch(DesignAreaActions.postData(true)).then(function (res) {
+    return dispatch(DesignAreaActions.postData(hideDetails)).then(function (res) {
       var designAreaId = res.data.id;
       var files = designAreasData.data.designProductionMethods.value.map(function (dp) {
         return {

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

@@ -69,7 +69,11 @@ var applyLinks = exports.applyLinks = function applyLinks(prevData, nextData) {
     _options$baseShapePad = options.baseShapePadding,
     baseShapePadding = _options$baseShapePad === void 0 ? _Constants.DEFAULT_BASE_SHAPE_PADDING : _options$baseShapePad,
     _options$recalculateP = options.recalculatePosition,
-    recalculatePosition = _options$recalculateP === void 0 ? true : _options$recalculateP;
+    recalculatePosition = _options$recalculateP === void 0 ? true : _options$recalculateP,
+    _options$heightRatio = options.heightRatio,
+    heightRatio = _options$heightRatio === void 0 ? 1 : _options$heightRatio,
+    _options$widthRatio = options.widthRatio,
+    widthRatio = _options$widthRatio === void 0 ? 1 : _options$widthRatio;
 
   // set min value for area size
   if ((0, _get["default"])(nextData, 'position.width') <= sizeMin) {
@@ -85,8 +89,12 @@ 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));
+  if (positionRatio > 0 && Math.abs(nextData.position.width / nextData.position.height - positionRatio) > 0.01) {
+    if (Math.abs(heightRatio - 1) > Math.abs(widthRatio - 1)) {
+      (0, _set["default"])(nextData, 'position.height', Math.ceil(nextData.position.width / positionRatio));
+    } else {
+      (0, _set["default"])(nextData, 'position.width', Math.ceil(nextData.position.height * positionRatio));
+    }
   }
   withRatio(prevData, nextData, 'baseShape.width', function (r) {
     calcPathValue(nextData, 'position.width', multiplyToPixel(r));

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

@@ -48,6 +48,7 @@ var _AreaEditorForm = _interopRequireDefault(require("../../Components/AreaEdito
 var _DesignAreaDimensionsEditor = _interopRequireDefault(require("../../Components/DesignAreaDimensionsEditor"));
 var _Actions2 = _interopRequireWildcard(require("../../../DesignAreas/Reducers/Actions"));
 var _TextField = _interopRequireDefault(require("@material-ui/core/TextField"));
+var _Actions3 = require("../../../../../../App/Reducers/Entity/Actions");
 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 _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
@@ -395,7 +396,9 @@ var VisualizationSettingsEdit = exports.VisualizationSettingsEdit = /*#__PURE__*
         height = _this$props$designAre.height;
       (0, _DataLinks.applyLinks)(previousData, nextData, {
         positionRatio: (width || 1) / (height || 1),
-        recalculatePosition: isKindOf2D(_this.props.mode)
+        recalculatePosition: isKindOf2D(_this.props.mode),
+        heightRatio: customData.heightRatio,
+        widthRatio: customData.widthRatio
       });
       data.updateValues(nextData);
       if (data.validate()) {
@@ -473,6 +476,20 @@ var VisualizationSettingsEdit = exports.VisualizationSettingsEdit = /*#__PURE__*
       if (this.state.advancedMode !== prevState.advancedMode && this.baseShapeEditor) {
         this.baseShapeEditor.setAdvancedMode(this.state.advancedMode);
       }
+      if (prevProps.designArea && this.props.designArea !== prevProps.designArea) {
+        var _prevProps$designArea = prevProps.designArea,
+          prevWidth = _prevProps$designArea.width,
+          prevHeight = _prevProps$designArea.height;
+        var _this$props$designAre2 = this.props.designArea,
+          width = _this$props$designAre2.width,
+          height = _this$props$designAre2.height;
+        if (width !== prevWidth || height !== prevHeight) {
+          this.updateData({
+            heightRatio: height / prevHeight,
+            widthRatio: width / prevWidth
+          });
+        }
+      }
     }
   }, {
     key: "updateVisualization",
@@ -1104,12 +1121,14 @@ var StyledVisualizationSettingsEdit = exports.StyledVisualizationSettingsEdit =
 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) {
+    dispatch((0, _Actions3.releaseUnsavedEntityBypassed)());
     return dispatch(_Actions2["default"].detailsAction({
-      id: designAreaId
+      id: designAreaId,
+      showDetailsWhenLoaded: false
     })).then(function () {
       dispatch(_Actions2["default"].setFieldData('width', width));
       dispatch(_Actions2["default"].setFieldData('height', height));
-      return dispatch(_Actions2["default"].postData(true));
+      return dispatch(_Actions2["default"].postData(false));
     }).then(function () {
       var savedDesignArea = (0, _get["default"])(getState(), "dataBySource.".concat(_Actions2.DATA_KEY, ".data"));
       if (!savedDesignArea) {
@@ -1133,8 +1152,10 @@ var _default = exports["default"] = (0, _reactRedux.connect)(function (state) {
         dispatch(function (dispatch, getState) {
           var designViewId = getState()[_Actions.REDUCER_NAME].data.id.value;
           dispatch(_Actions["default"].detailsAction({
-            id: designViewId
+            id: designViewId,
+            keepMounted: true
           }));
+          dispatch((0, _Actions3.releaseUnsavedEntityBypassed)());
         });
         return savedDesignArea;
       });

package/package.json

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