@configuratorware/configurator-frontendgui 1.40.2 → 1.40.4

package/src/App/Services/DesignDataService.js

@@ -86,6 +86,8 @@ import {
     getVectorizeForDesignProductionMethods,
     getImagesByDesignArea,
     designProductionMethodHasEmbroideryVisualizationEffect,
+    getMandatoryVectorizationForDesignProductionMethods,
+    isVectorizedLogoMandatory,
 } from '../Reducers/DesignArea/Selectors';
 import {
     getUserImage,
@@ -1075,6 +1077,33 @@ export default class DesignDataService {
         }
     };
 
+    handleDesignProductionMethodChangeToMandatoryVectorization = async designProductionMethodIdentifier => {
+        const state = Services.store.state;
+
+        const {
+            currentVectorsMandatory,
+            newVectorsMandatory,
+        } = getMandatoryVectorizationForDesignProductionMethods(state, designProductionMethodIdentifier);
+
+        const designArea = getSelectedDesignArea(state);
+        const nonColorizedImages = getImagesByDesignArea(state, designArea.identifier).filter(
+            obj => !get(obj, 'imageData.gallery') && !get(obj, 'imageData.displayColorPreview')
+        );
+
+        if (
+            nonColorizedImages.length === 1 &&
+            ((!currentVectorsMandatory && newVectorsMandatory) ||
+                !isColorPreviewCompatible(
+                    state,
+                    nonColorizedImages[0].imageData,
+                    designProductionMethodIdentifier
+                ))
+        ) {
+            await Services.store.dispatch(showSwitchToProductionMethodWithVectorization());
+            return true;
+        }
+    };
+
     checkColorUsageForDesignProductionMethod = async designProductionMethodIdentifier => {
         const state = Services.store.state;
         const { maxColorAmount, designProductionMethod } = getSelectedDesignAreaProperties(state);
@@ -1086,9 +1115,9 @@ export default class DesignDataService {
         const currentVectorsRequired = !!get(designProductionMethod, 'options.vectorsRequired');
         const newVectorsRequired = !!get(newProductionMethod, 'options.vectorsRequired');
         const designArea = getSelectedDesignArea(state);
-        const colorPreviewRequired = designProductionMethodHasEmbroideryVisualizationEffect(
-            newProductionMethod
-        );
+        const colorPreviewRequired =
+            designProductionMethodHasEmbroideryVisualizationEffect(newProductionMethod) ||
+            isVectorizedLogoMandatory(newProductionMethod);
 
         if (
             (newMaxColorAmount !== 0 && newMaxColorAmount < maxColorAmount) ||
@@ -1116,6 +1145,8 @@ export default class DesignDataService {
                 images.forEach(object => {
                     object.remove();
                 });
+
+                await this.updateCanvasData(canvas);
             }
         }
 
@@ -1194,9 +1225,9 @@ export default class DesignDataService {
     };
 
     async vectorizeSingleImageAndShowEditDialog(identifier) {
-        const showImageEditDialog = await this.handleDesignProductionMethodChangeFromNonVectorizationToVectorization(
-            identifier
-        );
+        const showImageEditDialog =
+            (await this.handleDesignProductionMethodChangeFromNonVectorizationToVectorization(identifier)) ||
+            (await this.handleDesignProductionMethodChangeToMandatoryVectorization(identifier));
 
         if (showImageEditDialog) {
             Services.ui.show('globalLoader');
@@ -1204,16 +1235,22 @@ export default class DesignDataService {
             const state = Services.store.state;
             const designArea = getSelectedDesignArea(state);
             const canvas = this._getCanvas(designArea);
-            const firstNonVectorizedImage = getImagesByDesignArea(state, designArea.identifier).find(
-                obj => !get(obj, 'imageData.operations.vectorize')
+
+            const images = getImagesByDesignArea(state, designArea.identifier);
+            const firstNonVectorizedImage = images.find(
+                obj =>
+                    !get(obj, 'imageData.gallery') &&
+                    (!get(obj, 'imageData.operations.vectorize') ||
+                        !get(obj, 'imageData.displayColorPreview'))
             );
-            const operations = {
-                ...firstNonVectorizedImage.imageData.operations,
-                vectorize: true,
-            };
-            const imageData = firstNonVectorizedImage.imageData;
 
             try {
+                const operations = {
+                    ...firstNonVectorizedImage.imageData.operations,
+                    vectorize: true,
+                };
+                const imageData = firstNonVectorizedImage.imageData;
+
                 //returing if placeHolderImage, from executing edit operations
                 if (imageData.isPlaceHolderImage) {
                     return;
@@ -1855,13 +1892,16 @@ export default class DesignDataService {
         const compatibilityInfoHash = getDesignAreaImageCompatibilityInfo(designProductionMethod);
         const imageIsCompatible = areHashesCompatible(image.compatibilityInfoHash, compatibilityInfoHash);
         const operationsMatching = compareOperations(image.operations, operations);
-        const colorPreviewRequired = designProductionMethodHasEmbroideryVisualizationEffect(
-            designProductionMethod
-        );
+        const vectorizedLogoMandatory = isVectorizedLogoMandatory(designProductionMethod);
+
+        const colorPreviewRequired =
+            designProductionMethodHasEmbroideryVisualizationEffect(designProductionMethod) ||
+            vectorizedLogoMandatory;
 
         const imageDataPatch = {
             compatibilityInfoHash,
             colorPreviewRequired,
+            vectorizedLogoMandatory,
             ...(displayColorPreview !== undefined && { displayColorPreview }),
         };
 

package/src/App/configuration.js

@@ -13,7 +13,7 @@ const DEVELOPMENT_HOST_LOCAL = 'http://localhost:10030';
 
 const hostsByNodeEnv = {
     production: '',
-    development: DEVELOPMENT_HOST_INT,
+    development: DEVELOPMENT_HOST_LOCAL,
     test: '',
 };