@configuratorware/configurator-admingui 1.37.1 → 1.37.3

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

@@ -110,25 +110,31 @@ var postData = function postData() {
 
 
     return dispatch(DesignAreaActions.postData(true)).then(function (res) {
+      var designAreaId = res.data.id;
       var files = designAreasData.data.designProductionMethods.value.map(function (dp) {
-        return (0, _get["default"])(dp, 'mask.maskFile', null);
+        return {
+          file: (0, _get["default"])(dp, 'mask.maskFile', null),
+          dpId: dp.id
+        };
       }).filter(function (dp) {
-        return dp;
+        return dp.file;
       });
       var designAreaFile = designAreasData.data.mask.value.maskFile;
-      designAreaFile && files.push(designAreaFile);
-      files.map(function (file) {
+      designAreaFile && files.push({
+        file: designAreaFile
+      });
+      files.map(function (_ref) {
+        var file = _ref.file,
+            dpId = _ref.dpId;
         var data = new FormData();
         data.append('mask', file);
 
         try {
-          var result = _Api["default"].request({
+          return _Api["default"].request({
             method: 'POST',
-            url: "design_areas/".concat(res.data.id, "/upload_mask"),
+            url: dpId ? "design_areas/".concat(designAreaId, "/design_production_methods/").concat(dpId, "/upload_mask") : "design_areas/".concat(designAreaId, "/upload_mask"),
             data: data
           });
-
-          return result;
         } catch (e) {
           throw e;
         }

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

@@ -138,8 +138,8 @@ var DesignViewActions = (0, _Actions2.generateDefaultActions)(LIST_KEY, DATA_KEY
 var CREATOR_VIEW_URL = 'creator_views';
 var CreatorViewActions = (0, _Actions2.generateDefaultActions)(LIST_KEY, DATA_KEY, REDUCER_NAME, CREATOR_VIEW_URL);
 
-var isCreatorDesignerModeWith2DVisualization = function isCreatorDesignerModeWith2DVisualization(designerData) {
-  return (0, _get["default"])(designerData, 'data.visualizationMode.value.validForConfigurationModes', []).indexOf('creator+designer') !== -1 && (0, _get["default"])(designerData, 'data.visualizationMode.value.identifier', '').indexOf('2d') === 0;
+var isCreatorDesignerMode = function isCreatorDesignerMode(designerData) {
+  return (0, _get["default"])(designerData, 'data.visualizationMode.value.validForConfigurationModes', []).indexOf('creator+designer') !== -1;
 };
 
 var listAction = function listAction(params) {
@@ -155,7 +155,7 @@ var listAction = function listAction(params) {
       limit: 1000
     });
 
-    if (isCreatorDesignerModeWith2DVisualization(designerData)) {
+    if (isCreatorDesignerMode(designerData)) {
       dispatch(CreatorViewActions.listAction(_objectSpread(_objectSpread({}, paramsWithLimit), {}, {
         filters: _objectSpread(_objectSpread({}, filters), {}, {
           'creatorview.item.id': id
@@ -235,7 +235,7 @@ var postData = function postData() {
     var _getState4 = getState(),
         designerData = _getState4.designerData;
 
-    if (isCreatorDesignerModeWith2DVisualization(designerData)) {
+    if (isCreatorDesignerMode(designerData)) {
       return dispatch(CreatorViewActions.postData(true));
     } else {
       return dispatch(DesignViewActions.postData(true));
@@ -252,7 +252,7 @@ var detailsAction = function detailsAction() {
     var _getState5 = getState(),
         designerData = _getState5.designerData;
 
-    if (isCreatorDesignerModeWith2DVisualization(designerData)) {
+    if (isCreatorDesignerMode(designerData)) {
       return dispatch(CreatorViewActions.detailsAction.apply(CreatorViewActions, args));
     } else {
       return dispatch(DesignViewActions.detailsAction.apply(DesignViewActions, args));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.37.1",
+  "version": "1.37.3",
   "license": "UNLICENSED",
   "private": false,
   "dependencies": {
@@ -29,7 +29,7 @@
     "react-redux-i18n": "^1.9.3",
     "react-router": "^3.2.6",
     "react-sortable-hoc": "^1.11.0",
-    "redhotmagma-visualization": "1.37.1",
+    "redhotmagma-visualization": "1.37.3",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

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

@@ -17,8 +17,13 @@ const listAction = params => (dispatch, getState) => {
     const { designerData } = getState();
     const id = designerData.data.id.value;
     const filters = (params && params.filters) || {};
-    const paramsWithLimit = {...params, offset: 0, limit: 1000}
-    dispatch(DesignAreaActions.listAction({ ...paramsWithLimit, filters: { ...filters, 'designarea.item.id': id } }));
+    const paramsWithLimit = { ...params, offset: 0, limit: 1000 };
+    dispatch(
+        DesignAreaActions.listAction({
+            ...paramsWithLimit,
+            filters: { ...filters, 'designarea.item.id': id },
+        })
+    );
 };
 const invalidateList = () => (dispatch, getState) => {
     const { entity } = getState();
@@ -54,21 +59,23 @@ const postData = () => (dispatch, getState) => {
     const { designAreasData } = getState();
     // to save uploaded images
     return dispatch(DesignAreaActions.postData(true)).then(res => {
+        const designAreaId = res.data.id;
         const files = designAreasData.data.designProductionMethods.value
-            .map(dp => get(dp, 'mask.maskFile', null))
-            .filter(dp => dp);
+            .map(dp => ({ file: get(dp, 'mask.maskFile', null), dpId: dp.id }))
+            .filter(dp => dp.file);
         const designAreaFile = designAreasData.data.mask.value.maskFile;
-        designAreaFile && files.push(designAreaFile);
-        files.map(file => {
+        designAreaFile && files.push({ file: designAreaFile });
+        files.map(({ file, dpId }) => {
             const data = new FormData();
             data.append('mask', file);
             try {
-                const result = Api.request({
+                return Api.request({
                     method: 'POST',
-                    url: `design_areas/${res.data.id}/upload_mask`,
+                    url: dpId
+                        ? `design_areas/${designAreaId}/design_production_methods/${dpId}/upload_mask`
+                        : `design_areas/${designAreaId}/upload_mask`,
                     data,
                 });
-                return result;
             } catch (e) {
                 throw e;
             }

package/src/Screens/Designer/SubScreens/Designviews/Reducers/Actions.js

@@ -88,10 +88,10 @@ const CREATOR_VIEW_URL = 'creator_views';
 
 const CreatorViewActions = generateDefaultActions(LIST_KEY, DATA_KEY, REDUCER_NAME, CREATOR_VIEW_URL);
 
-const isCreatorDesignerModeWith2DVisualization = designerData =>
+const isCreatorDesignerMode = designerData =>
     get(designerData, 'data.visualizationMode.value.validForConfigurationModes', []).indexOf(
         'creator+designer'
-    ) !== -1 && get(designerData, 'data.visualizationMode.value.identifier', '').indexOf('2d') === 0;
+    ) !== -1;
 
 const listAction = params => (dispatch, getState) => {
     const { designerData } = getState();
@@ -99,7 +99,7 @@ const listAction = params => (dispatch, getState) => {
     const filters = (params && params.filters) || {};
     const paramsWithLimit = {...params, offset: 0, limit: 1000}
 
-    if (isCreatorDesignerModeWith2DVisualization(designerData)) {
+    if (isCreatorDesignerMode(designerData)) {
         dispatch(
             CreatorViewActions.listAction({ ...paramsWithLimit, filters: { ...filters, 'creatorview.item.id': id } })
         );
@@ -157,7 +157,7 @@ const removeDesignArea = identifier => (dispatch, getState) => {
 
 const postData = () => (dispatch, getState) => {
     const { designerData } = getState();
-    if (isCreatorDesignerModeWith2DVisualization(designerData)) {
+    if (isCreatorDesignerMode(designerData)) {
         return dispatch(CreatorViewActions.postData(true));
     } else {
         return dispatch(DesignViewActions.postData(true));
@@ -166,7 +166,7 @@ const postData = () => (dispatch, getState) => {
 
 const detailsAction = (...args) => (dispatch, getState) => {
     const { designerData } = getState();
-    if (isCreatorDesignerModeWith2DVisualization(designerData)) {
+    if (isCreatorDesignerMode(designerData)) {
         return dispatch(CreatorViewActions.detailsAction(...args));
     } else {
         return dispatch(DesignViewActions.detailsAction(...args));