@configuratorware/configurator-frontendgui 1.54.2 → 1.54.3

package/App/Reducers/DesignArea/Selectors.js

@@ -1058,8 +1058,8 @@ var getVectorizeForDesignProductionMethods = exports.getVectorizeForDesignProduc
   var _getSelectedDesignAre3 = getSelectedDesignAreaProperties(state),
     designProductionMethod = _getSelectedDesignAre3.designProductionMethod;
   var newProductionMethod = getDesignProductionMethodByIdentifier(state, designProductionMethodIdentifier);
-  var currentVectorsRequired = !!(0, _get["default"])(designProductionMethod, 'options.vectorsRequired') && isVectorizedLogoMandatory(designProductionMethod);
-  var newVectorsRequired = !!(0, _get["default"])(newProductionMethod, 'options.vectorsRequired') && isVectorizedLogoMandatory(newProductionMethod);
+  var currentVectorsRequired = !!(0, _get["default"])(designProductionMethod, 'options.vectorsRequired');
+  var newVectorsRequired = !!(0, _get["default"])(newProductionMethod, 'options.vectorsRequired');
   return {
     currentVectorsRequired: currentVectorsRequired,
     newVectorsRequired: newVectorsRequired

package/App/Reducers/ImageGallery/Actions.js

@@ -4,7 +4,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.uploadImage = exports.updateUploadDelayed = exports.updateImage = exports.setSelectedImageData = exports.setSelectedImageByIdentifier = exports.setSelectedImage = exports.setModeToEdit = exports.setModeToAdd = exports.selectTags = exports.selectTag = exports.receiveGalleryTags = exports.getGalleryUrlForTags = exports.fetchTags = exports.fetchGallery = exports.editImage = exports.dismissError = exports.commitChanges = exports.addImagesFromDesignArea = exports.addGalleryImageToUserImages = exports.WN_UPLOAD_IMAGE = exports.WN_LOAD_TAGS = exports.WN_LOAD_IMAGES = exports.URL_UPLOAD = exports.URL_TAGS = exports.URL_GALLERY = exports.UPDATE_UPLOAD_DELAYED = exports.UPDATE_IMAGE = exports.SET_SELECTED_IMAGE = exports.SET_MODE = exports.SELECT_GALLERY_TAGS = exports.SELECT_GALLERY_TAG = exports.RECEIVE_IMAGE_UPLOAD_DATA = exports.RECEIVE_GALLERY_TAGS = exports.RECEIVE_GALLERY = exports.ImageGalleryModes = exports.DISMISS_ERROR = exports.COMMIT_CHANGES = exports.ADD_IMAGES_FROM_DESIGN_AREA = exports.ADD_GALLERY_IMAGE_TO_USER_IMAGES = void 0;
+exports.uploadImage = exports.updateUploadDelayed = exports.updateImage = exports.setSelectedImageData = exports.setSelectedImageByIdentifier = exports.setModeToEdit = exports.setModeToAdd = exports.selectTags = exports.selectTag = exports.receiveGalleryTags = exports.getGalleryUrlForTags = exports.fetchTags = exports.fetchGallery = exports.editImage = exports.dismissError = exports.commitChanges = exports.addImagesFromDesignArea = exports.addGalleryImageToUserImages = exports.WN_UPLOAD_IMAGE = exports.WN_LOAD_TAGS = exports.WN_LOAD_IMAGES = exports.URL_UPLOAD = exports.URL_TAGS = exports.URL_GALLERY = exports.UPDATE_UPLOAD_DELAYED = exports.UPDATE_IMAGE = exports.SET_SELECTED_IMAGE = exports.SET_MODE = exports.SELECT_GALLERY_TAGS = exports.SELECT_GALLERY_TAG = exports.RECEIVE_IMAGE_UPLOAD_DATA = exports.RECEIVE_GALLERY_TAGS = exports.RECEIVE_GALLERY = exports.ImageGalleryModes = exports.DISMISS_ERROR = exports.COMMIT_CHANGES = exports.ADD_IMAGES_FROM_DESIGN_AREA = exports.ADD_GALLERY_IMAGE_TO_USER_IMAGES = void 0;
 var _Actions = require("../Actions");
 var _Actions2 = require("../UI/Actions");
 var _Selectors = require("./Selectors");
@@ -81,12 +81,6 @@ var selectTags = exports.selectTags = function selectTags(tags) {
     return dispatch(fetchGallery(tags));
   };
 };
-var setSelectedImage = exports.setSelectedImage = function setSelectedImage(fileName) {
-  return {
-    type: SET_SELECTED_IMAGE,
-    fileName: fileName
-  };
-};
 var setSelectedImageByIdentifier = exports.setSelectedImageByIdentifier = function setSelectedImageByIdentifier(identifier) {
   return {
     type: SET_SELECTED_IMAGE,

package/App/Services/DesignerService.js

@@ -233,12 +233,15 @@ var DesignerService = exports["default"] = /*#__PURE__*/function () {
         return _regenerator().w(function (_context5) {
           while (1) switch (_context5.n) {
             case 0:
+              _context5.n = 1;
+              return _ServiceLocator.Services.store.dispatch((0, _Actions.setSelectedImageByIdentifier)(null));
+            case 1:
               timeout = setTimeout(function () {
                 _ServiceLocator.Services.store.dispatch((0, _Actions.updateUploadDelayed)(true));
               }, 10000);
-              _context5.n = 1;
+              _context5.n = 2;
               return _ServiceLocator.Services.store.dispatch((0, _Actions.uploadImage)(file));
-            case 1:
+            case 2:
               response = _context5.v;
               clearTimeout(timeout);
               url = (0, _get["default"])(response, 'data.preview.url');
@@ -247,11 +250,11 @@ var DesignerService = exports["default"] = /*#__PURE__*/function () {
                 _ServiceLocator.Services.ui.alertMessage((0, _i18n.t)(term));
               }
               if (url) {
-                _context5.n = 2;
+                _context5.n = 3;
                 break;
               }
               throw new Error('Preview image url is not specified!');
-            case 2:
+            case 3:
               _ServiceLocator.Services.store.dispatch((0, _Actions.updateUploadDelayed)(false));
               return _context5.a(2, url.startsWith('http') ? url : "".concat((0, _configuration.getConf)('network.host')).concat(url));
           }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@configuratorware/configurator-frontendgui",
-  "version": "1.54.2",
+  "version": "1.54.3",
   "license": "UNLICENSED",
   "private": false,
   "main": "./index.js",
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.54.2",
+    "@configuratorware/scripts": "1.54.3",
     "@material-ui/core": "^4.12.4",
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "^4.0.0-alpha.61",
@@ -36,8 +36,8 @@
     "react-router-dom": "^5.3.4",
     "react-swipeable": "^5.5.1",
     "react-zoom-pan-pinch": "^2.1.3",
-    "redhotmagma-graphics-editor": "1.54.2",
-    "redhotmagma-visualization": "1.54.2",
+    "redhotmagma-graphics-editor": "1.54.3",
+    "redhotmagma-visualization": "1.54.3",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/src/App/Reducers/DesignArea/Selectors.js

@@ -919,13 +919,8 @@ export const getVectorizeForDesignProductionMethods = (state, designProductionMe
         state,
         designProductionMethodIdentifier
     );
-    const currentVectorsRequired =
-        !!get(designProductionMethod, 'options.vectorsRequired') &&
-        isVectorizedLogoMandatory(designProductionMethod);
-    const newVectorsRequired =
-        !!get(newProductionMethod, 'options.vectorsRequired') &&
-        isVectorizedLogoMandatory(newProductionMethod);
-
+    const currentVectorsRequired = !!get(designProductionMethod, 'options.vectorsRequired');
+    const newVectorsRequired = !!get(newProductionMethod, 'options.vectorsRequired');
     return {
         currentVectorsRequired,
         newVectorsRequired,

package/src/App/Reducers/ImageGallery/Actions.js

@@ -72,11 +72,6 @@ export const selectTags = tags => dispatch => {
     return dispatch(fetchGallery(tags));
 };
 
-export const setSelectedImage = fileName => ({
-    type: SET_SELECTED_IMAGE,
-    fileName,
-});
-
 export const setSelectedImageByIdentifier = identifier => ({
     type: SET_SELECTED_IMAGE,
     identifier,

package/src/App/Reducers/ImageGallery/__tests__/Actions.test.js

@@ -11,7 +11,6 @@ import {
     uploadImage,
     addImagesFromDesignArea,
     addGalleryImageToUserImages,
-    setSelectedImage,
     setSelectedImageByIdentifier,
     SELECT_GALLERY_TAGS,
     URL_GALLERY,
@@ -301,15 +300,6 @@ describe('Reducers/ImageGallery/Actions', () => {
         });
     });
 
-    it('setSelectedImage creates the correct action', () => {
-        const correctAction = {
-            type: SET_SELECTED_IMAGE,
-            fileName: 'test_file_name.jpg',
-        };
-        const result = setSelectedImage('test_file_name.jpg');
-        expect(result).toEqual(correctAction);
-    });
-
     it('setSelectedImageByIdentifier creates the correct action', () => {
         const correctAction = {
             type: SET_SELECTED_IMAGE,

package/src/App/Reducers/ImageGallery/__tests__/Reducer.test.js

@@ -301,20 +301,6 @@ describe('Reducers/ImageGallery/Reducer', () => {
         expect(result).toEqual(expectedResult);
     });
 
-    it('SET_SELECTED_IMAGE with fileName selects the correct image', () => {
-        const stateWithUserImages = {
-            ...initialState,
-            userImages: [{ fileName: 'file_1.jpg' }, { fileName: 'file_2.jpg' }, { fileName: 'file_3.jpg' }],
-        };
-        const action = {
-            type: SET_SELECTED_IMAGE,
-            fileName: 'file_2.jpg',
-        };
-        expect(imageGalleryReducer(stateWithUserImages, action).selectedImage).toBe(
-            stateWithUserImages.userImages[1]
-        );
-    });
-
     it('SET_SELECTED_IMAGE with identifier selects the correct image', () => {
         const stateWithUserImages = {
             ...initialState,

package/src/App/Services/DesignerService.js

@@ -172,6 +172,7 @@ export default class DesignerService {
     }
 
     async uploadFile(file) {
+        await Services.store.dispatch(setSelectedImageByIdentifier(null));
         const timeout = setTimeout(() => {
             Services.store.dispatch(updateUploadDelayed(true));
         }, 10000);