@configuratorware/configurator-frontendgui 1.44.2 → 1.44.3

package/App/Services/ConfiguratorService.js

@@ -402,7 +402,6 @@ var ConfiguratorService = exports["default"] = /*#__PURE__*/function (_AbstractC
           defaultDesignAreaIdentifier,
           areasWithDesign,
           screenshotAreaIdentifier,
-          screenshotArea,
           usedAreas,
           firstDesignViewIdentifier,
           usedViews,
@@ -436,12 +435,9 @@ var ConfiguratorService = exports["default"] = /*#__PURE__*/function (_AbstractC
                 return (0, _get["default"])(designData[designAreaIdentifier], 'canvasData.objects.length');
               }); // use the default design area, or the first that contains a design
               screenshotAreaIdentifier = areasWithDesign && (areasWithDesign.indexOf(defaultDesignAreaIdentifier) !== -1 ? defaultDesignAreaIdentifier : areasWithDesign[0]) || defaultDesignAreaIdentifier;
-              screenshotArea = (0, _find["default"])(designAreas, {
-                identifier: screenshotAreaIdentifier
-              });
-              usedAreas = screenshotAreaIdentifier && [screenshotAreaIdentifier];
-              firstDesignViewIdentifier = (0, _get["default"])(_ServiceLocator.Services.store.state.designView, 'designViews[0].identifier');
-              usedViews = [screenshotArea ? screenshotArea.designView.identifier : firstDesignViewIdentifier];
+              usedAreas = screenshotAreaIdentifier ? [screenshotAreaIdentifier] : [];
+              firstDesignViewIdentifier = (0, _Selectors2.getCameraViewListForDesignAreaList)(designAreas, usedAreas).pop();
+              usedViews = [firstDesignViewIdentifier];
               variants = (0, _Selectors.getChildren)(this.state).map(function (_ref3) {
                 var identifier = _ref3.identifier;
                 return identifier;
@@ -449,42 +445,42 @@ var ConfiguratorService = exports["default"] = /*#__PURE__*/function (_AbstractC
               if (!variants[0]) {
                 variants = [(0, _Selectors.getItem)(this.state).identifier];
               }
-              _context5.prev = 20;
-              _context5.next = 23;
+              _context5.prev = 19;
+              _context5.next = 22;
               return _ServiceLocator.Services.visualization.getScreenshots({
                 areaList: usedAreas,
                 viewList: usedViews,
                 variantList: variants,
                 size: size
               });
-            case 23:
+            case 22:
               screenshots = _context5.sent;
               if (screenshots) {
-                _context5.next = 26;
+                _context5.next = 25;
                 break;
               }
               return _context5.abrupt("return", {});
-            case 26:
+            case 25:
               images = {};
               Object.keys(screenshots).forEach(function (identifier) {
                 images[variants.length === 1 ? variants[0] : identifier] = (0, _getFirstDataURLFromScreenshotsObj.getFirstDataURLFromScreenshotsObj)(screenshots[identifier]);
               });
               cached.setValue(images);
               return _context5.abrupt("return", images);
-            case 32:
-              _context5.prev = 32;
-              _context5.t0 = _context5["catch"](20);
+            case 31:
+              _context5.prev = 31;
+              _context5.t0 = _context5["catch"](19);
               // eslint-disable-next-line no-console
               console.error('Error occurred while generating preview images:', _context5.t0);
-            case 35:
-              _context5.prev = 35;
+            case 34:
+              _context5.prev = 34;
               memo.restore();
-              return _context5.finish(35);
-            case 38:
+              return _context5.finish(34);
+            case 37:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[20, 32, 35, 38]]);
+        }, _callee5, this, [[19, 31, 34, 37]]);
       }));
       function getPreviewImagesForVariants() {
         return _getPreviewImagesForVariants.apply(this, arguments);

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@configuratorware/configurator-frontendgui",
-  "version": "1.44.2",
+  "version": "1.44.3",
   "license": "UNLICENSED",
   "private": false,
   "main": "./index.js",
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.44.2",
+    "@configuratorware/scripts": "1.44.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.44.2",
-    "redhotmagma-visualization": "1.44.2",
+    "redhotmagma-graphics-editor": "1.44.3",
+    "redhotmagma-visualization": "1.44.3",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/src/App/Services/ConfiguratorService.js

@@ -307,12 +307,11 @@ export default class ConfiguratorService extends AbstractConfiguratorService {
                     ? defaultDesignAreaIdentifier
                     : areasWithDesign[0])) ||
             defaultDesignAreaIdentifier;
-        const screenshotArea = find(designAreas, { identifier: screenshotAreaIdentifier });
 
-        const usedAreas = screenshotAreaIdentifier && [screenshotAreaIdentifier];
+        const usedAreas = screenshotAreaIdentifier ? [screenshotAreaIdentifier] : [];
 
-        const firstDesignViewIdentifier = get(Services.store.state.designView, 'designViews[0].identifier');
-        const usedViews = [screenshotArea ? screenshotArea.designView.identifier : firstDesignViewIdentifier];
+        const firstDesignViewIdentifier = getCameraViewListForDesignAreaList(designAreas, usedAreas).pop();
+        const usedViews = [firstDesignViewIdentifier];
 
         let variants = getChildren(this.state).map(({ identifier }) => identifier);
         if (!variants[0]) {

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

@@ -506,6 +506,9 @@ describe('Services/ConfiguratorService', () => {
                                     designView: {
                                         identifier: 'view1',
                                     },
+                                    customData: {
+                                        selectedCameraView: 'view1',
+                                    },
                                 },
                             ],
                         },
@@ -644,7 +647,7 @@ describe('Services/ConfiguratorService', () => {
             const screenshots = await configuratorSrv.getPreviewImagesForVariants();
             expect(visualizationSrvc.getScreenshots).toHaveBeenCalledWith({
                 areaList: ['area1'],
-                viewList: ['view1'],
+                viewList: ['default'],
                 variantList: ['rootItem'],
                 size: { width: 100, height: 100 },
             });
@@ -714,8 +717,8 @@ describe('Services/ConfiguratorService', () => {
                     size: { width: 200, height: 200 },
                 });
                 expect(visualizationSrvc.getScreenshots).toHaveBeenCalledWith({
-                    areaList: null,
-                    viewList: ['view1'],
+                    areaList: [],
+                    viewList: ['default'],
                     variantList: ['rootItem'],
                     size: { width: 200, height: 200 },
                 });