@crystaldesign/web-planner-logic 26.12.0-beta.9 → 26.13.0-beta.1

package/build/cjs/{SeriousBasketHandler-63bda08b.js → SeriousBasketHandler-a5c22844.js}

@@ -3,7 +3,7 @@
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var index = require('./index-de644684.js');
+var index = require('./index-70f9ba19.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
@@ -11,6 +11,7 @@ require('@babel/runtime/regenerator');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');
 require('axios');
+require('@crystaldesign/planner-2d-core');
 require('@crystaldesign/basket-model');
 require('@babel/runtime/helpers/typeof');
 require('fast-xml-parser');
@@ -20,7 +21,6 @@ require('@babel/runtime/helpers/inherits');
 require('@babel/runtime/helpers/wrapNativeSuper');
 require('@crystaldesign/basket-handler');
 require('socket.io-client');
-require('@crystaldesign/planner-2d-core');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -79,7 +79,7 @@ var StandardWWSHandler = /*#__PURE__*/function () {
       var posNr = 1;
       for (var iKey in articles) {
         var article = articles[iKey];
-        var partlistArticles = this.getPartlistComponents(article);
+        var partlistArticles = index.summaryHandlerInstance.getPartlistComponents(article);
         var partlistArticlesWithTabGroup = [];
         groupedPartlistArticles.push({
           article: article,
@@ -172,7 +172,7 @@ var StandardWWSHandler = /*#__PURE__*/function () {
             var _item$FormattedOption, _item$FormattedOption2, _this$getFormattedOpt;
             return item.Name == partListArticle.name && item.ArticleNr == partListArticle.configArticleCodex && ((_item$FormattedOption = item.FormattedOptions) === null || _item$FormattedOption === void 0 ? void 0 : _item$FormattedOption[0]) && ((_item$FormattedOption2 = item.FormattedOptions) === null || _item$FormattedOption2 === void 0 ? void 0 : _item$FormattedOption2[0].Title) == ((_this$getFormattedOpt = _this.getFormattedOptions(partListArticle, optionArticle, [], '', usedOptionCodexes)) === null || _this$getFormattedOpt === void 0 ? void 0 : _this$getFormattedOpt[0].Title);
           });
-          var unitPrice = _this.unitPrice(partListArticle);
+          var unitPrice = index.summaryHandlerInstance.getPartlistUnitPrice(partListArticle);
           if (fountEntry) {
             fountEntry.Quantity = fountEntry.Quantity + partListArticle.quantity;
             fountEntry.FormattedPrice = DivaUtils__default["default"].formatPrice(unitPrice * fountEntry.Quantity);
@@ -260,26 +260,6 @@ var StandardWWSHandler = /*#__PURE__*/function () {
       };
     }
 
-    /**
-     * Components at any partlist depth. Articles that only bundle further components without a price of their own (IDM
-     * "Hülsen") are left out, also when the current configuration loads none of their components (e.g. no mattress chosen):
-     * an empty Hülse is not a part. A partlist parent with a price of its own stays a part, so its price is not lost.
-     */
-  }, {
-    key: "getPartlistComponents",
-    value: function getPartlistComponents(article) {
-      return Object.values(article.getRecursivePartlistArticles()).filter(function (partlistArticle) {
-        return !partlistArticle.hasPartlistArticle || partlistArticle.mainPrice > 0;
-      });
-    }
-
-    /** Unit price of a part: a partlist parent contributes only its own price, its components are listed themselves. */
-  }, {
-    key: "unitPrice",
-    value: function unitPrice(partListArticle) {
-      return partListArticle.hasPartlistArticle ? partListArticle.mainPrice : partListArticle.price;
-    }
-
     /**
      * The first emitted option flagged with IS_MAIN_COLOR is the main color of the part list; without one, the first emitted
      * OPTBE_BOX option (API2 fallback) is. Decided after all lines exist, so only options that really appear can be chosen.
@@ -372,11 +352,13 @@ var StandardWWSHandler = /*#__PURE__*/function () {
               colorCodices.push(coloCodex);
               //IDM has no group name on the value itself: there the Bezugsgruppe is its own feature, merged into this one only for the view
               var groupName = (_optionState$val$grou = (_optionState$val = optionState.val) === null || _optionState$val === void 0 ? void 0 : _optionState$val.groupName) !== null && _optionState$val$grou !== void 0 ? _optionState$val$grou : (_article$getMergesToO = article.getMergesToOPGParentOps(optionState.optionCodex)) === null || _article$getMergesToO === void 0 ? void 0 : _article$getMergesToO.valName;
+              // API2 carries the fabric number as VCodex; IDM values have none, there the option key is the fabric number ("0_227_1" → "0-227-1")
+              var codex = optionState.vCodex && optionState.vCodex !== optionState.valName ? optionState.vCodex : article.CatalogData.isIDMFormat ? index.summaryHandlerInstance.getDisplayCodex(optionState) : '';
               var formattedOption = {
                 PosNr: finalPosNr,
                 Text: (groupName ? groupName + ' ' : '') + optionState.valName,
                 Title: optionState.optionOrigName,
-                Codex: optionState.vCodex && optionState.vCodex !== optionState.valName ? optionState.vCodex : '',
+                Codex: codex,
                 IsMainColor: false
               };
               formattedOptions.push(formattedOption);

package/build/cjs/{ShelfPlanner-364467bf.js → ShelfPlanner-b30f8c39.js}

@@ -6,11 +6,12 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-de644684.js');
+var index = require('./index-70f9ba19.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('axios');
+require('@crystaldesign/planner-2d-core');
 require('@crystaldesign/basket-model');
 require('@babel/runtime/helpers/typeof');
 require('fast-xml-parser');
@@ -20,7 +21,6 @@ require('@babel/runtime/helpers/inherits');
 require('@babel/runtime/helpers/wrapNativeSuper');
 require('@crystaldesign/basket-handler');
 require('socket.io-client');
-require('@crystaldesign/planner-2d-core');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -65,9 +65,6 @@ var ShelfPlanner = /*#__PURE__*/function () {
     //true until the shelfaccessoires saved in the basket were restored into the cells (see restoreShelfAccessoires in the DivaSetHandler).
     //until then no initAcc may be placed, they would occupy the cells of the saved accessoires
     _defineProperty__default["default"](this, "restorePending", void 0);
-    //accessoires of grids that were switched off by a grid rule, per gridIndex. They get placed again when the grid
-    //becomes active again - eg a shelf that is configured from 100cm to 50cm and back keeps its accessoires
-    _defineProperty__default["default"](this, "stashedAccessoires", {});
     /**
      * Debug trail of shelf-planner mutations (the shelf equivalent of the box
      * planner's constructionDebugStack): one entry per visibility flip, grid
@@ -77,6 +74,10 @@ var ShelfPlanner = /*#__PURE__*/function () {
      */
     _defineProperty__default["default"](this, "shelfDebugStack", []);
     _defineProperty__default["default"](this, "shelfDebugSeq", 0);
+    //accessoires of grids that were cleared by a grid rule, per gridIndex and the HeightGridCellCountOnRule entry the grid
+    //ran as. They get placed again when the grid becomes active again under the same entry - eg a shelf that is configured
+    //from 100cm to 50cm and back keeps its accessoires. A grid that comes back under another entry starts with that entry's initAcc
+    _defineProperty__default["default"](this, "stashedAccessoires", {});
     this.article = article;
     this.restorePending = !!article.shelfPlanData;
     this.disableCellsByElement = data.DisableCells;
@@ -201,27 +202,30 @@ var ShelfPlanner = /*#__PURE__*/function () {
     key: "onConfigChanged",
     value: (function () {
       var _onConfigChanged = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(variantValues) {
-        var newHeightSet, gridsTodos, i, _i, grid, _i2, _i3, _grid, grids, _i4, _grid2$DisableCellsBy, _grid2;
+        var newHeightSet, gridsTodos, ruleIndexesBefore, i, _i, grid, _i2, _i3, _grid, grids, _i4, _grid2$DisableCellsBy, _grid2;
         return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               newHeightSet = false;
-              gridsTodos = [];
+              gridsTodos = []; //onConfigChanged moves a grid to its new rule entry, the stash needs the entry the accessoires were planned under
+              ruleIndexesBefore = this.grids.map(function (grid) {
+                return grid.CurrentLoadedRuleIndex;
+              });
               for (i = 0; i < this.grids.length; i++) {
                 gridsTodos.push(this.grids[i].onConfigChanged());
               }
               _i = 0;
-            case 4:
+            case 5:
               if (!(_i < gridsTodos.length)) {
-                _context2.next = 13;
+                _context2.next = 14;
                 break;
               }
               if (gridsTodos[_i].length) {
-                _context2.next = 7;
+                _context2.next = 8;
                 break;
               }
-              return _context2.abrupt("continue", 10);
-            case 7:
+              return _context2.abrupt("continue", 11);
+            case 8:
               grid = this.grids[_i];
               if (gridsTodos[_i].includes('disableGridRule')) this.logShelfDebug({
                 phase: 'configChanged',
@@ -235,44 +239,44 @@ var ShelfPlanner = /*#__PURE__*/function () {
                 gridIndex: grid.ShelfIndex,
                 detail: 'HeightGridCellCountOnRule match changed — grid rebuilt (cell count / placeable accessories can change), its accessories are deleted'
               });
-            case 10:
+            case 11:
               _i++;
-              _context2.next = 4;
+              _context2.next = 5;
               break;
-            case 13:
-              _i2 = 0;
             case 14:
+              _i2 = 0;
+            case 15:
               if (!(_i2 < gridsTodos.length)) {
-                _context2.next = 23;
+                _context2.next = 24;
                 break;
               }
               if (gridsTodos[_i2].length) {
-                _context2.next = 17;
+                _context2.next = 18;
                 break;
               }
-              return _context2.abrupt("continue", 20);
-            case 17:
+              return _context2.abrupt("continue", 21);
+            case 18:
               //remember the accessoires before they get deleted, so they can be placed again when the grid becomes active again
-              this.stashAccessoiresOfGrid(_i2);
-              _context2.next = 20;
+              this.stashAccessoiresOfGrid(_i2, ruleIndexesBefore[_i2]);
+              _context2.next = 21;
               return this.grids[_i2].deleteAllAccOfGrid();
-            case 20:
+            case 21:
               _i2++;
-              _context2.next = 14;
+              _context2.next = 15;
               break;
-            case 23:
-              _i3 = 0;
             case 24:
+              _i3 = 0;
+            case 25:
               if (!(_i3 < gridsTodos.length)) {
-                _context2.next = 40;
+                _context2.next = 41;
                 break;
               }
               if (gridsTodos[_i3].length) {
-                _context2.next = 27;
+                _context2.next = 28;
                 break;
               }
-              return _context2.abrupt("continue", 37);
-            case 27:
+              return _context2.abrupt("continue", 38);
+            case 28:
               if (gridsTodos[_i3].includes('heightGridRule')) {
                 this.creatNewGrid(_i3);
                 newHeightSet = true;
@@ -280,58 +284,58 @@ var ShelfPlanner = /*#__PURE__*/function () {
               //read the grid after a possible recreate, the replaced one is not the grid that gets filled
               _grid = this.grids[_i3];
               if (!((gridsTodos[_i3].includes('heightGridRule') || gridsTodos[_i3].includes('disableGridRule')) && !_grid.DisabledByRule)) {
-                _context2.next = 37;
+                _context2.next = 38;
                 break;
               }
               if (!this.restorePending) {
-                _context2.next = 32;
+                _context2.next = 33;
                 break;
               }
-              return _context2.abrupt("continue", 37);
-            case 32:
-              _context2.next = 34;
+              return _context2.abrupt("continue", 38);
+            case 33:
+              _context2.next = 35;
               return this.placeStashedAccessoiresOfGrid(_i3);
-            case 34:
+            case 35:
               if (_context2.sent) {
-                _context2.next = 37;
+                _context2.next = 38;
                 break;
               }
-              _context2.next = 37;
+              _context2.next = 38;
               return this.initAccList(_i3);
-            case 37:
+            case 38:
               _i3++;
-              _context2.next = 24;
+              _context2.next = 25;
               break;
-            case 40:
+            case 41:
               if (!(!newHeightSet && Object.keys(variantValues).length)) {
-                _context2.next = 51;
+                _context2.next = 52;
                 break;
               }
               grids = this.activeGrids;
               _i4 = 0;
-            case 43:
+            case 44:
               if (!(_i4 < grids.length)) {
-                _context2.next = 51;
+                _context2.next = 52;
                 break;
               }
               _grid2 = grids[_i4];
               if (!((_grid2$DisableCellsBy = _grid2.DisableCellsByMeasures) !== null && _grid2$DisableCellsBy !== void 0 && _grid2$DisableCellsBy.options.find(function (o) {
                 return Object.keys(variantValues).includes('OPT' + o.opt);
               }) || !!_grid2.disableCellsByRules)) {
-                _context2.next = 48;
+                _context2.next = 49;
                 break;
               }
               newHeightSet = true;
-              return _context2.abrupt("break", 51);
-            case 48:
+              return _context2.abrupt("break", 52);
+            case 49:
               _i4++;
-              _context2.next = 43;
+              _context2.next = 44;
               break;
-            case 51:
+            case 52:
               if (newHeightSet) {
                 this.updateDisabledCells();
               }
-            case 52:
+            case 53:
             case "end":
               return _context2.stop();
           }
@@ -350,16 +354,24 @@ var ShelfPlanner = /*#__PURE__*/function () {
     }
 
     /**
-     * Remembers the accessoires of a grid that is about to be cleared because a grid rule switched it off.
+     * Remembers the accessoires of a grid that is about to be cleared because a grid rule switched it off or rebuilt it.
      * An empty grid never overwrites an existing memory, so the accessoires survive further configuration changes.
      * @param gridIndex grid that gets cleared
+     * @param ruleIndex HeightGridCellCountOnRule entry the grid ran as while the accessoires were planned
      */
   }, {
     key: "stashAccessoiresOfGrid",
-    value: function stashAccessoiresOfGrid(gridIndex) {
+    value: function stashAccessoiresOfGrid(gridIndex, ruleIndex) {
       var stashedAccessoires = this.collectAccessoiresToStash(this.grids[gridIndex]);
       if (!stashedAccessoires.length) return;
-      this.stashedAccessoires[gridIndex] = stashedAccessoires;
+      this.stashedAccessoires[this.stashKey(gridIndex, ruleIndex)] = stashedAccessoires;
+    }
+
+    /** The memory is per grid and per HeightGridCellCountOnRule entry, false when the grid runs without a matching entry. */
+  }, {
+    key: "stashKey",
+    value: function stashKey(gridIndex, ruleIndex) {
+      return gridIndex + '#' + ruleIndex;
     }
 
     /**
@@ -382,7 +394,12 @@ var ShelfPlanner = /*#__PURE__*/function () {
           var _accessoireShelfPlann;
           var accessoireGrid = accessoireShelfPlanner.grids[j];
           var accessoiresOfGrid = accessoireShelfPlanner.collectAccessoiresToStash(accessoireGrid);
-          if (accessoiresOfGrid.length) accessoires[accessoireGrid.ShelfIndex] = accessoiresOfGrid;
+          if (accessoiresOfGrid.length) {
+            accessoires[accessoireGrid.ShelfIndex] = {
+              ruleIndex: accessoireGrid.CurrentLoadedRuleIndex,
+              accessoires: accessoiresOfGrid
+            };
+          }
         }
         stashedAccessoires.push({
           articleCodex: accessoire.articleCodex,
@@ -398,7 +415,7 @@ var ShelfPlanner = /*#__PURE__*/function () {
     }
 
     /**
-     * Places the remembered accessoires of a grid back into their cells.
+     * Places the accessoires remembered for the rule entry the grid runs now back into their cells.
      * @param gridIndex grid that became active again
      * @returns how many accessoires were placed - 0 means the grid is still empty and needs its initAcc
      */
@@ -406,24 +423,26 @@ var ShelfPlanner = /*#__PURE__*/function () {
     key: "placeStashedAccessoiresOfGrid",
     value: (function () {
       var _placeStashedAccessoiresOfGrid = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(gridIndex) {
-        var stashedAccessoires;
+        var stashKey, stashedAccessoires;
         return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              stashedAccessoires = this.stashedAccessoires[gridIndex];
+              //a recreated grid already runs its new rule entry, only accessoires planned under that entry belong into it
+              stashKey = this.stashKey(gridIndex, this.grids[gridIndex].CurrentLoadedRuleIndex);
+              stashedAccessoires = this.stashedAccessoires[stashKey];
               if (stashedAccessoires !== null && stashedAccessoires !== void 0 && stashedAccessoires.length) {
-                _context3.next = 3;
+                _context3.next = 4;
                 break;
               }
               return _context3.abrupt("return", 0);
-            case 3:
+            case 4:
               //remove it first, a reconfiguration triggered by placing them must not place them a second time
-              delete this.stashedAccessoires[gridIndex];
-              _context3.next = 6;
+              delete this.stashedAccessoires[stashKey];
+              _context3.next = 7;
               return this.placeStashedAccessoiresInGrid(gridIndex, stashedAccessoires);
-            case 6:
-              return _context3.abrupt("return", _context3.sent);
             case 7:
+              return _context3.abrupt("return", _context3.sent);
+            case 8:
             case "end":
               return _context3.stop();
           }
@@ -438,7 +457,7 @@ var ShelfPlanner = /*#__PURE__*/function () {
     key: "placeStashedAccessoiresByGrid",
     value: (function () {
       var _placeStashedAccessoiresByGrid = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4(stashedAccessoires) {
-        var gridIndexes, i, _this$getGridByIndex, gridIndex;
+        var gridIndexes, i, gridIndex, grid, stashed;
         return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -446,27 +465,36 @@ var ShelfPlanner = /*#__PURE__*/function () {
               i = 0;
             case 2:
               if (!(i < gridIndexes.length)) {
-                _context4.next = 14;
+                _context4.next = 18;
                 break;
               }
-              gridIndex = Number(gridIndexes[i]); //the accessoire was created new, so its initAcc are already placed in the cells the remembered accessoires need
-              _context4.next = 6;
-              return (_this$getGridByIndex = this.getGridByIndex(gridIndex)) === null || _this$getGridByIndex === void 0 ? void 0 : _this$getGridByIndex.deleteAllAccOfGrid();
-            case 6:
-              _context4.next = 8;
-              return this.placeStashedAccessoiresInGrid(gridIndex, stashedAccessoires[gridIndex]);
+              gridIndex = Number(gridIndexes[i]);
+              grid = this.getGridByIndex(gridIndex);
+              stashed = stashedAccessoires[gridIndex]; //the accessoire was created new, its grids run their own rule entry with that entry's initAcc in place. A grid that
+              //runs another entry than the remembered accessoires were planned under keeps them
+              if (!(!grid || grid.CurrentLoadedRuleIndex !== stashed.ruleIndex)) {
+                _context4.next = 8;
+                break;
+              }
+              return _context4.abrupt("continue", 15);
             case 8:
+              _context4.next = 10;
+              return grid.deleteAllAccOfGrid();
+            case 10:
+              _context4.next = 12;
+              return this.placeStashedAccessoiresInGrid(gridIndex, stashed.accessoires);
+            case 12:
               if (_context4.sent) {
-                _context4.next = 11;
+                _context4.next = 15;
                 break;
               }
-              _context4.next = 11;
+              _context4.next = 15;
               return this.initAccList(gridIndex);
-            case 11:
+            case 15:
               i++;
               _context4.next = 2;
               break;
-            case 14:
+            case 18:
             case "end":
               return _context4.stop();
           }
@@ -1528,8 +1556,8 @@ var ShelfPlanner = /*#__PURE__*/function () {
   }, {
     key: "getCellIndexOfBasketId",
     value: function getCellIndexOfBasketId(gridIndex, basketId) {
-      var _this$getGridByIndex2;
-      return (_this$getGridByIndex2 = this.getGridByIndex(gridIndex)) === null || _this$getGridByIndex2 === void 0 ? void 0 : _this$getGridByIndex2.getIndexOfBasketId(basketId);
+      var _this$getGridByIndex;
+      return (_this$getGridByIndex = this.getGridByIndex(gridIndex)) === null || _this$getGridByIndex === void 0 ? void 0 : _this$getGridByIndex.getIndexOfBasketId(basketId);
     }
   }, {
     key: "allGrids",

package/build/cjs/{StandardWWSHandler-42a1b294.js → StandardWWSHandler-40c2a2e8.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-de644684.js');
+require('./index-70f9ba19.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');
@@ -11,6 +11,7 @@ require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');
 require('axios');
 require('@crystaldesign/diva-utils');
+require('@crystaldesign/planner-2d-core');
 require('@crystaldesign/basket-model');
 require('@babel/runtime/helpers/typeof');
 require('fast-xml-parser');
@@ -20,7 +21,6 @@ require('@babel/runtime/helpers/inherits');
 require('@babel/runtime/helpers/wrapNativeSuper');
 require('@crystaldesign/basket-handler');
 require('socket.io-client');
-require('@crystaldesign/planner-2d-core');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }