@configuratorware/configurator-frontendgui 1.29.2 → 1.30.0

package/src/App/Services/DesignDataService.js

@@ -373,16 +373,18 @@ export const makeOperationsCompatible = (operations, compatibilityInfo, colorPal
 
 export const getSvgContent = (() => {
     const svgContentMap = new Map();
-    return async function getSvgContent(url, absolute = false, forceFetch = false) {
+    return function getSvgContent(url, absolute = false, forceFetch = false) {
         const absUrl = absolute ? url : `${getConf('network.host')}${url}`;
         if (!forceFetch && svgContentMap.has(absUrl)) {
             return svgContentMap.get(absUrl);
         }
         try {
-            const result = await axios.get(absUrl);
-            const svgContent = initDefaultColor(result.data);
-            svgContentMap.set(absUrl, svgContent);
-            return svgContent;
+            const promise = (async function() {
+                const result = await axios.get(absUrl);
+                return initDefaultColor(result.data);
+            })();
+            svgContentMap.set(absUrl, promise);
+            return promise;
         } catch (e) {
             return '';
         }
@@ -1042,12 +1044,18 @@ export default class DesignDataService {
         );
 
         const designArea = getSelectedDesignArea(state);
-        const images = getImagesByDesignArea(state, designArea.identifier);
+        const nonVectorizedImages = getImagesByDesignArea(state, designArea.identifier).filter(
+            obj => !get(obj, 'imageData.operations.vectorize')
+        );
 
         if (
-            images.length === 1 &&
+            nonVectorizedImages.length === 1 &&
             ((!currentVectorsRequired && newVectorsRequired) ||
-                !isColorPreviewCompatible(state, images[0].imageData, designProductionMethodIdentifier))
+                !isColorPreviewCompatible(
+                    state,
+                    nonVectorizedImages[0].imageData,
+                    designProductionMethodIdentifier
+                ))
         ) {
             await Services.store.dispatch(showSwitchToProductionMethodWithVectorization());
             return true;
@@ -1083,7 +1091,7 @@ export default class DesignDataService {
                       }
 
                       return (
-                          !isEditableVectorImage(obj.imageData.preview) ||
+                          !get(obj, 'imageData.operations.vectorize') ||
                           !isColorPreviewCompatible(state, obj.imageData, designProductionMethodIdentifier)
                       );
                   })
@@ -1183,12 +1191,14 @@ export default class DesignDataService {
             const state = Services.store.state;
             const designArea = getSelectedDesignArea(state);
             const canvas = this._getCanvas(designArea);
-            const images = getImagesByDesignArea(state, designArea.identifier);
+            const firstNonVectorizedImage = getImagesByDesignArea(state, designArea.identifier).find(
+                obj => !get(obj, 'imageData.operations.vectorize')
+            );
             const operations = {
-                ...images[0].imageData.operations,
+                ...firstNonVectorizedImage.imageData.operations,
                 vectorize: true,
             };
-            const imageData = images[0].imageData;
+            const imageData = firstNonVectorizedImage.imageData;
 
             try {
                 //returing if placeHolderImage, from executing edit operations
@@ -1202,10 +1212,14 @@ export default class DesignDataService {
                     .find(obj => obj._imageData.identifier === imageData.identifier);
                 imageToSelect.selected = true;
 
-                await Services.designer.openImageEditDialog(images[0].imageData.identifier, canvas, {
-                    placeholderImageUpdate: false,
-                    submitOnExitClick: true,
-                });
+                await Services.designer.openImageEditDialog(
+                    firstNonVectorizedImage.imageData.identifier,
+                    canvas,
+                    {
+                        placeholderImageUpdate: false,
+                        submitOnExitClick: true,
+                    }
+                );
             } finally {
                 Services.ui.hide('globalLoader');
             }
@@ -1875,8 +1889,8 @@ export default class DesignDataService {
 
                 const isBackendNeeded = createCopy || !isEqual(editData, currentEditData);
 
-                isBackendNeeded &&
-                    (await Services.store.dispatch(
+                if (isBackendNeeded) {
+                    await Services.store.dispatch(
                         editImage(
                             {
                                 ...editData,
@@ -1890,12 +1904,13 @@ export default class DesignDataService {
                             },
                             { immediateCommit }
                         )
-                    ));
-                const {
-                    imageGallery: { selectedImage },
-                } = Services.store.state;
-                preview = get(selectedImage, 'preview');
-                imageIdentifier = get(selectedImage, 'identifier');
+                    );
+                    const {
+                        imageGallery: { selectedImage },
+                    } = Services.store.state;
+                    preview = get(selectedImage, 'preview');
+                    imageIdentifier = get(selectedImage, 'identifier');
+                }
             }
         }
 

package/src/App/Services/__tests__/AnalyticsService.test.js

@@ -23,16 +23,33 @@ describe('Services/AnalyticsService', () => {
         dispatch = jest.fn();
     }
 
+    class ConfiguratorService {
+        static serviceName = 'ConfiguratorService';
+
+        state = {
+            loadIdentifier: 'softshell_creator_2d',
+        };
+    }
+
     // add the mock services
-    const storeSrvc = new StoreService();
-    ServiceLocator.provide(storeSrvc);
+    ServiceLocator.provide(new StoreService());
+    ServiceLocator.provide(new ConfiguratorService());
+
+    const mockDataLayer = {
+        push: jest.fn(),
+    };
 
-    test('Event load_request dispatches the correct action', () => {
+    test('Event load_request pushes the correct ga data to the dataLayer', () => {
         const analyticsSrvc = new AnalyticsService();
-        analyticsSrvc.triggerEvent(EventTypes.load_request, {});
-        expect(storeSrvc.dispatch).toBeCalledWith({
-            type: 'header_load_configuration_request',
-            data: {},
+        analyticsSrvc.setDataLayer(mockDataLayer);
+        analyticsSrvc.triggerEvent(EventTypes.load_request, 'softshell_designer_2d');
+        expect(mockDataLayer.push).toHaveBeenNthCalledWith(1, {
+            event: 'load_item',
+            item_identifier: 'softshell_creator_2d',
+        });
+        expect(mockDataLayer.push).toHaveBeenNthCalledWith(2, {
+            event: 'header_load_configuration_request',
+            configuration_code: 'softshell_designer_2d',
         });
     });
 
@@ -122,34 +139,4 @@ describe('Services/AnalyticsService', () => {
         };
         expect(result).toEqual(expected);
     });
-
-    test('createMiddleware should return next action', () => {
-        const store = {
-            getState: jest.fn(() => ({})),
-            dispatch: jest.fn(),
-        };
-        const analyticsSrvc = new AnalyticsService();
-        const next = jest.fn(v => v);
-        const action = { type: 'test_action' };
-        const dataLayer = [];
-
-        const result = analyticsSrvc.createMiddleware(dataLayer)(store)(next)(action);
-
-        expect(result).toEqual(action);
-    });
-
-    test('action should be pushed into DataLayer if it is in trackList ', () => {
-        const store = {
-            getState: jest.fn(() => ({})),
-            dispatch: jest.fn(),
-        };
-        const analyticsSrvc = new AnalyticsService();
-        const next = jest.fn(v => v);
-        const action = { type: 'preview_open' };
-        const dataLayer = [];
-
-        analyticsSrvc.createMiddleware(dataLayer)(store)(next)(action);
-
-        expect(dataLayer.length).toBe(1);
-    });
 });

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: '',
 };