@crystaldesign/web-planner-logic 26.12.0-beta.3 → 26.12.0-beta.31

package/build/esm/{ShelfPlanner-1406888d.js → ShelfPlanner-62c2844a.js}

@@ -4,11 +4,12 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { G as Grid, a as articleHandlerInstance, b as setHandlerInstance } from './index-16a1a540.js';
+import { G as Grid, a as articleHandlerInstance, b as setHandlerInstance } from './index-ead00f31.js';
 import DivaUtils, { DivaError } from '@crystaldesign/diva-utils';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/objectWithoutProperties';
 import 'axios';
+import '@crystaldesign/planner-2d-core';
 import '@crystaldesign/basket-model';
 import '@babel/runtime/helpers/typeof';
 import 'fast-xml-parser';
@@ -18,7 +19,6 @@ import '@babel/runtime/helpers/inherits';
 import '@babel/runtime/helpers/wrapNativeSuper';
 import '@crystaldesign/basket-handler';
 import 'socket.io-client';
-import '@crystaldesign/planner-2d-core';
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -50,6 +50,9 @@ var ShelfPlanner = /*#__PURE__*/function () {
     //rule so the shelfplanner cells get disabled when the neighbour (AVL or AVR) is smaller. eg: Ben sulvag
     _defineProperty(this, "disableCellsByElement", void 0);
     _defineProperty(this, "montageOptions", []);
+    //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(this, "restorePending", void 0);
     /**
      * Debug trail of shelf-planner mutations (the shelf equivalent of the box
      * planner's constructionDebugStack): one entry per visibility flip, grid
@@ -59,11 +62,9 @@ var ShelfPlanner = /*#__PURE__*/function () {
      */
     _defineProperty(this, "shelfDebugStack", []);
     _defineProperty(this, "shelfDebugSeq", 0);
-    //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(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
+    //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(this, "stashedAccessoires", {});
     this.article = article;
     this.restorePending = !!article.shelfPlanData;
@@ -189,27 +190,30 @@ var ShelfPlanner = /*#__PURE__*/function () {
     key: "onConfigChanged",
     value: (function () {
       var _onConfigChanged = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.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.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',
@@ -223,44 +227,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;
@@ -268,58 +272,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();
           }
@@ -338,16 +342,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;
     }
 
     /**
@@ -370,7 +382,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,
@@ -386,7 +403,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
      */
@@ -394,24 +411,26 @@ var ShelfPlanner = /*#__PURE__*/function () {
     key: "placeStashedAccessoiresOfGrid",
     value: (function () {
       var _placeStashedAccessoiresOfGrid = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(gridIndex) {
-        var stashedAccessoires;
+        var stashKey, stashedAccessoires;
         return _regeneratorRuntime.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();
           }
@@ -426,7 +445,7 @@ var ShelfPlanner = /*#__PURE__*/function () {
     key: "placeStashedAccessoiresByGrid",
     value: (function () {
       var _placeStashedAccessoiresByGrid = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(stashedAccessoires) {
-        var gridIndexes, i, _this$getGridByIndex, gridIndex;
+        var gridIndexes, i, gridIndex, grid, stashed;
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -434,27 +453,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();
           }
@@ -1516,8 +1544,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/esm/{StandardWWSHandler-a8045129.js → StandardWWSHandler-f031a067.js}

@@ -1,6 +1,6 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
-import './index-16a1a540.js';
+import './index-ead00f31.js';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/asyncToGenerator';
 import '@babel/runtime/helpers/defineProperty';
@@ -9,6 +9,7 @@ import '@babel/runtime/helpers/objectWithoutProperties';
 import '@babel/runtime/helpers/toConsumableArray';
 import 'axios';
 import '@crystaldesign/diva-utils';
+import '@crystaldesign/planner-2d-core';
 import '@crystaldesign/basket-model';
 import '@babel/runtime/helpers/typeof';
 import 'fast-xml-parser';
@@ -18,7 +19,6 @@ import '@babel/runtime/helpers/inherits';
 import '@babel/runtime/helpers/wrapNativeSuper';
 import '@crystaldesign/basket-handler';
 import 'socket.io-client';
-import '@crystaldesign/planner-2d-core';
 
 //Der in einem Set gemergte Optionsbaum
 var StandardWWSHandler = /*#__PURE__*/function () {