@configuratorware/configurator-frontendgui 1.57.8 → 1.57.10

package/App/Reducers/Configurator/Actions.js

@@ -39,6 +39,10 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -243,18 +247,35 @@ var applyVariantAmountPreSelection = exports.applyVariantAmountPreSelection = fu
   var designerPreSelection = (0, _configuration.getConf)('designerPreSelection', {});
   var itemAmounts = designerPreSelection.itemAmounts;
   if (itemAmounts) {
-    var children = (0, _Selectors.getChildren)(configurator).map(function (variant) {
-      return variant.identifier;
+    var children = (0, _flatten["default"])((0, _Selectors.getChildren)(configurator).map(function (variant) {
+      return Object.values((0, _Selectors.getDeepestChildIdentifiers)(variant));
+    }));
+    var applicableAmounts = Object.keys(itemAmounts).filter(function (identifier) {
+      return children.indexOf(identifier) !== -1 && +itemAmounts[identifier] > 0;
+    }).map(function (identifier) {
+      return [identifier, +itemAmounts[identifier]];
     });
-    for (var preSelectionVariant in itemAmounts) {
-      if (!itemAmounts.hasOwnProperty(preSelectionVariant)) {
-        continue;
-      }
-      var amount = +itemAmounts[preSelectionVariant];
-      if (children.indexOf(preSelectionVariant) !== -1 && amount > 0) {
-        _ServiceLocator.Services.configurator.setSelectedAmount(preSelectionVariant, amount);
-      }
+
+    // designerPreSelection is parsed once from the URL and stays in conf for the whole session, so
+    // without consuming it here it would re-apply (and re-clear existing amounts) on every later
+    // configuration load, e.g. switching the configuration variant or loading a saved configuration
+    (0, _configuration.setConf)('designerPreSelection.itemAmounts', undefined);
+    if (applicableAmounts.length === 0) {
+      return;
     }
+
+    // only the explicitly passed amounts should apply, so clear whatever the item already had - by
+    // the keys actually selected, since a selected amount can be stored at any item level, not just
+    // on the deepest children
+    Object.keys((0, _Selectors.getSelectedAmounts)(configurator) || {}).forEach(function (identifier) {
+      return _ServiceLocator.Services.configurator.setSelectedAmount(identifier, 0);
+    });
+    applicableAmounts.forEach(function (_ref4) {
+      var _ref5 = _slicedToArray(_ref4, 2),
+        identifier = _ref5[0],
+        amount = _ref5[1];
+      return _ServiceLocator.Services.configurator.setSelectedAmount(identifier, amount);
+    });
   }
 };
 var selectOptionclassification = exports.selectOptionclassification = function selectOptionclassification(optionclassification) {
@@ -413,7 +434,7 @@ var receiveCodesnippets = exports.receiveCodesnippets = function receiveCodesnip
 };
 var fetchConfigurationForDesignerProductPreview = exports.fetchConfigurationForDesignerProductPreview = function fetchConfigurationForDesignerProductPreview() {
   return /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(dispatch, getState) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(dispatch, getState) {
       var itemIdentifier, _getAvailableConfigur2, designerEnabled, initialDesignData;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -448,7 +469,7 @@ var fetchConfigurationForDesignerProductPreview = exports.fetchConfigurationForD
       }, _callee3);
     }));
     return function (_x4, _x5) {
-      return _ref4.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 };
@@ -866,10 +887,10 @@ var getSwitchOptionData = function getSwitchOptionData(optionsList) {
   try {
     for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
       var component = _step4.value;
-      switchOptionData[component.identifier] = component.selectedoptions.map(function (_ref5) {
-        var identifier = _ref5.identifier,
-          amount = _ref5.amount,
-          inputText = _ref5.inputText;
+      switchOptionData[component.identifier] = component.selectedoptions.map(function (_ref7) {
+        var identifier = _ref7.identifier,
+          amount = _ref7.amount,
+          inputText = _ref7.inputText;
         return {
           identifier: identifier,
           inputText: inputText,
@@ -902,7 +923,7 @@ var viewOptionDetails = exports.viewOptionDetails = function viewOptionDetails(o
 };
 var loadConfiguration = exports.loadConfiguration = function loadConfiguration() {
   return /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(dispatch, getState) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(dispatch, getState) {
       var loadCode, action;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -939,7 +960,7 @@ var loadConfiguration = exports.loadConfiguration = function loadConfiguration()
       }, _callee4, null, [[5, 13, 17, 20]]);
     }));
     return function (_x6, _x7) {
-      return _ref6.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 };
@@ -952,7 +973,7 @@ var receiveDesignerData = exports.receiveDesignerData = function receiveDesigner
 };
 var loadDesignerData = exports.loadDesignerData = function loadDesignerData(configuration) {
   return /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(dispatch) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(dispatch) {
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -986,7 +1007,7 @@ var loadDesignerData = exports.loadDesignerData = function loadDesignerData(conf
       }, _callee5, null, [[4, 10, 13, 16]]);
     }));
     return function (_x8) {
-      return _ref7.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
 };

package/package.json

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

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

@@ -9,7 +9,7 @@ import uniq from 'lodash/uniq';
 import { t } from 'Framework/i18n';
 import Api from 'Framework/Api';
 import { createActionWithGlobalState } from 'Utils/Redux/createActionWithGlobalState';
-import { getConf } from '../../configuration';
+import { getConf, setConf } from '../../configuration';
 import { Services } from '../../ServiceLocator';
 import {
     dismissError,
@@ -200,19 +200,33 @@ export const applyVariantAmountPreSelection = configurator => {
     const itemAmounts = designerPreSelection.itemAmounts;
 
     if (itemAmounts) {
-        const children = getChildren(configurator).map(variant => variant.identifier);
+        const children = flatten(
+            getChildren(configurator).map(variant => Object.values(getDeepestChildIdentifiers(variant)))
+        );
 
-        for (const preSelectionVariant in itemAmounts) {
-            if (!itemAmounts.hasOwnProperty(preSelectionVariant)) {
-                continue;
-            }
+        const applicableAmounts = Object.keys(itemAmounts)
+            .filter(identifier => children.indexOf(identifier) !== -1 && +itemAmounts[identifier] > 0)
+            .map(identifier => [identifier, +itemAmounts[identifier]]);
 
-            const amount = +itemAmounts[preSelectionVariant];
+        // designerPreSelection is parsed once from the URL and stays in conf for the whole session, so
+        // without consuming it here it would re-apply (and re-clear existing amounts) on every later
+        // configuration load, e.g. switching the configuration variant or loading a saved configuration
+        setConf('designerPreSelection.itemAmounts', undefined);
 
-            if (children.indexOf(preSelectionVariant) !== -1 && amount > 0) {
-                Services.configurator.setSelectedAmount(preSelectionVariant, amount);
-            }
+        if (applicableAmounts.length === 0) {
+            return;
         }
+
+        // only the explicitly passed amounts should apply, so clear whatever the item already had - by
+        // the keys actually selected, since a selected amount can be stored at any item level, not just
+        // on the deepest children
+        Object.keys(getSelectedAmounts(configurator) || {}).forEach(identifier =>
+            Services.configurator.setSelectedAmount(identifier, 0)
+        );
+
+        applicableAmounts.forEach(([identifier, amount]) =>
+            Services.configurator.setSelectedAmount(identifier, amount)
+        );
     }
 };
 

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

@@ -84,6 +84,170 @@ describe('Reducers/Configurator/Actions', () => {
         expect(configuratorService.setSelectedAmount).toBeCalledWith('hoodie2', 5);
     });
 
+    test('applyVariantAmountPreSelection sets the amount for a non-representative size of a color', () => {
+        const mockConfigurator = {
+            configuration: {
+                item: {
+                    itemGroup: {
+                        children: [
+                            {
+                                identifier: 'hoodie_red_m',
+                                itemGroup: {
+                                    children: [
+                                        { identifier: 'hoodie_red_s', itemgroupentryIdentifier: 's' },
+                                        { identifier: 'hoodie_red_m', itemgroupentryIdentifier: 'm' },
+                                    ],
+                                },
+                            },
+                            {
+                                identifier: 'hoodie_blue_m',
+                                itemGroup: {
+                                    children: [
+                                        { identifier: 'hoodie_blue_m', itemgroupentryIdentifier: 'm' },
+                                        { identifier: 'hoodie_blue_l', itemgroupentryIdentifier: 'l' },
+                                    ],
+                                },
+                            },
+                        ],
+                    },
+                },
+            },
+        };
+
+        const mockPreSelection = {
+            itemAmounts: {
+                hoodie_red_s: 2,
+            },
+        };
+
+        setConf('designerPreSelection', mockPreSelection);
+
+        applyVariantAmountPreSelection(mockConfigurator);
+
+        expect(configuratorService.setSelectedAmount).toBeCalledWith('hoodie_red_s', 2);
+    });
+
+    test('applyVariantAmountPreSelection clears the item default amount before applying the preselection', () => {
+        const mockConfigurator = {
+            configuration: {
+                item: {
+                    itemGroup: {
+                        children: [{ identifier: 'hoodie_white_default' }, { identifier: 'hoodie_black' }],
+                    },
+                },
+                customdata: {
+                    selectedAmounts: { hoodie_white_default: 1 },
+                },
+            },
+        };
+
+        const mockPreSelection = {
+            itemAmounts: {
+                hoodie_black: 50,
+            },
+        };
+
+        setConf('designerPreSelection', mockPreSelection);
+
+        applyVariantAmountPreSelection(mockConfigurator);
+
+        expect(configuratorService.setSelectedAmount).toBeCalledWith('hoodie_white_default', 0);
+        expect(configuratorService.setSelectedAmount).toBeCalledWith('hoodie_black', 50);
+    });
+
+    test('applyVariantAmountPreSelection clears a default amount stored at a non-leaf identifier', () => {
+        const mockConfigurator = {
+            configuration: {
+                item: {
+                    itemGroup: {
+                        children: [
+                            {
+                                identifier: 'hoodie_red',
+                                itemGroup: {
+                                    children: [
+                                        { identifier: 'hoodie_red_s', itemgroupentryIdentifier: 's' },
+                                        { identifier: 'hoodie_red_m', itemgroupentryIdentifier: 'm' },
+                                    ],
+                                },
+                            },
+                        ],
+                    },
+                },
+                customdata: {
+                    // the default amount is stored on the colour-level identifier, not a deepest child
+                    selectedAmounts: { hoodie_red: 1 },
+                },
+            },
+        };
+
+        const mockPreSelection = {
+            itemAmounts: {
+                hoodie_red_s: 50,
+            },
+        };
+
+        setConf('designerPreSelection', mockPreSelection);
+
+        applyVariantAmountPreSelection(mockConfigurator);
+
+        expect(configuratorService.setSelectedAmount).toBeCalledWith('hoodie_red', 0);
+        expect(configuratorService.setSelectedAmount).toBeCalledWith('hoodie_red_s', 50);
+    });
+
+    test('applyVariantAmountPreSelection leaves existing amounts untouched when nothing in the preselection applies', () => {
+        const mockConfigurator = {
+            configuration: {
+                item: {
+                    itemGroup: {
+                        children: [{ identifier: 'hoodie_untouched' }],
+                    },
+                },
+                customdata: {
+                    selectedAmounts: { hoodie_untouched: 1 },
+                },
+            },
+        };
+
+        const mockPreSelection = {
+            itemAmounts: {
+                unknown_identifier: 50,
+            },
+        };
+
+        setConf('designerPreSelection', mockPreSelection);
+
+        const callsBefore = configuratorService.setSelectedAmount.mock.calls.length;
+
+        applyVariantAmountPreSelection(mockConfigurator);
+
+        expect(configuratorService.setSelectedAmount.mock.calls.length).toBe(callsBefore);
+    });
+
+    test('applyVariantAmountPreSelection only applies the preselection once', () => {
+        const mockConfigurator = {
+            configuration: {
+                item: {
+                    itemGroup: {
+                        children: [{ identifier: 'hoodie_once' }],
+                    },
+                },
+            },
+        };
+
+        setConf('designerPreSelection', { itemAmounts: { hoodie_once: 7 } });
+
+        applyVariantAmountPreSelection(mockConfigurator);
+        expect(configuratorService.setSelectedAmount).toBeCalledWith('hoodie_once', 7);
+
+        const callsAfterFirstApply = configuratorService.setSelectedAmount.mock.calls.length;
+
+        // simulates a later configuration load (e.g. switching variant, loading a saved configuration) -
+        // designerPreSelection is still in conf, but its itemAmounts must have been consumed by now
+        applyVariantAmountPreSelection(mockConfigurator);
+
+        expect(configuratorService.setSelectedAmount.mock.calls.length).toBe(callsAfterFirstApply);
+    });
+
     describe('receiveConfiguration', () => {
         const configurator = {
             configuration: {