@crystaldesign/web-planner-logic 26.13.0-beta.3 → 26.13.0-beta.30

package/build/cjs/{ShelfPlanner-fa17b8ac.js → ShelfPlanner-173ee746.js}

@@ -6,14 +6,15 @@ 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-0075f2cf.js');
+var index = require('./index-76d3a1ec.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('axios');
+require('@babel/runtime/helpers/typeof');
+require('@babel/runtime/helpers/toArray');
 require('@crystaldesign/planner-2d-core');
 require('@crystaldesign/basket-model');
-require('@babel/runtime/helpers/typeof');
 require('fast-xml-parser');
 require('@babel/runtime/helpers/possibleConstructorReturn');
 require('@babel/runtime/helpers/getPrototypeOf');
@@ -32,9 +33,14 @@ var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_definePropert
 var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
 var DivaUtils__default = /*#__PURE__*/_interopDefaultLegacy(DivaUtils);
 
+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; }
 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__default["default"](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; }
 var LOG = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
+
+/** Values the parents pass on to their accessoires with their global options, per basketId of the accessoire. */
 var ShelfPlanner = /*#__PURE__*/function () {
   function ShelfPlanner(data, article) {
     _classCallCheck__default["default"](this, ShelfPlanner);
@@ -127,6 +133,16 @@ var ShelfPlanner = /*#__PURE__*/function () {
         }
       }
     }
+
+    /**
+     * True when an accessoire with this codex can be planned for free on this shelf (an initAcc with noPrice, eg the first
+     * Kleiderstange of a Jutzler element).
+     */
+  }, {
+    key: "canBeFree",
+    value: function canBeFree(articleCodex) {
+      return this.freeArticlesPossible[articleCodex] !== undefined;
+    }
   }, {
     key: "IsVisible",
     get: function get() {
@@ -362,7 +378,7 @@ var ShelfPlanner = /*#__PURE__*/function () {
   }, {
     key: "stashAccessoiresOfGrid",
     value: function stashAccessoiresOfGrid(gridIndex, ruleIndex) {
-      var stashedAccessoires = this.collectAccessoiresToStash(this.grids[gridIndex]);
+      var stashedAccessoires = this.collectAccessoiresToStash(this.grids[gridIndex], this.valuesPassedOnByParents());
       if (!stashedAccessoires.length) return;
       this.stashedAccessoires[this.stashKey(gridIndex, ruleIndex)] = stashedAccessoires;
     }
@@ -377,12 +393,15 @@ var ShelfPlanner = /*#__PURE__*/function () {
     /**
      * Collects an accessoire of every cell it starts in, including the accessoires of the accessoire itself
      * (eg the drawers of an EINBAU), because those get deleted with their parent as well.
+     * @param parentInheritedValues values the parents of the article pass on to the accessoires, per basketId
      */
   }, {
     key: "collectAccessoiresToStash",
-    value: function collectAccessoiresToStash(grid) {
+    value: function collectAccessoiresToStash(grid, parentInheritedValues) {
       var stashedAccessoires = [];
+      var inheritedValues = ShelfPlanner.addValuesPassedOnBy(this.article, parentInheritedValues);
       for (var i = 0; i < grid.Cells.length; i++) {
+        var _inheritedValues$acce;
         var cell = grid.Cells[i];
         var accessoire = cell.Article;
         if (cell.InUse !== i || !accessoire) continue;
@@ -393,7 +412,7 @@ var ShelfPlanner = /*#__PURE__*/function () {
         for (var j = 0; j < ((_accessoireShelfPlann = accessoireShelfPlanner === null || accessoireShelfPlanner === void 0 ? void 0 : accessoireShelfPlanner.grids.length) !== null && _accessoireShelfPlann !== void 0 ? _accessoireShelfPlann : 0); j++) {
           var _accessoireShelfPlann;
           var accessoireGrid = accessoireShelfPlanner.grids[j];
-          var accessoiresOfGrid = accessoireShelfPlanner.collectAccessoiresToStash(accessoireGrid);
+          var accessoiresOfGrid = accessoireShelfPlanner.collectAccessoiresToStash(accessoireGrid, inheritedValues);
           if (accessoiresOfGrid.length) {
             accessoires[accessoireGrid.ShelfIndex] = {
               ruleIndex: accessoireGrid.CurrentLoadedRuleIndex,
@@ -401,27 +420,59 @@ var ShelfPlanner = /*#__PURE__*/function () {
             };
           }
         }
+
+        //a value the accessoire only took over from the parent is not remembered: placed again, the accessoire takes over the
+        //parent's value of that time, the parent may have changed it in between
+        var variantValues = accessoire.VariantValues;
+        var inherited = (_inheritedValues$acce = inheritedValues[accessoire.basketId]) !== null && _inheritedValues$acce !== void 0 ? _inheritedValues$acce : {};
+        for (var _i5 = 0, _Object$keys = Object.keys(inherited); _i5 < _Object$keys.length; _i5++) {
+          var codex = _Object$keys[_i5];
+          if (variantValues[codex] === inherited[codex]) delete variantValues[codex];
+        }
         stashedAccessoires.push({
           articleCodex: accessoire.articleCodex,
           cellIndex: i,
           noMove: cell.NoMove,
           noDelete: cell.NoDelete,
           quantity: accessoire.quantity,
-          variantValues: accessoire.VariantValues,
+          variantValues: variantValues,
+          inheritedValues: inherited,
           accessoires: accessoires
         });
       }
       return stashedAccessoires;
     }
 
+    /**
+     * The values the parents of the article pass on to their accessoires right now, per basketId. A stash can start at an
+     * accessoire that is a shelf itself (eg an EINBAU whose own grid gets rebuilt), its accessoires inherit the values of
+     * all its parents as well (eg the cabinet colour).
+     */
+  }, {
+    key: "valuesPassedOnByParents",
+    value: function valuesPassedOnByParents() {
+      var parents = [];
+      for (var parent = this.article.accessoireParentArticle; parent; parent = parent.accessoireParentArticle) parents.unshift(parent);
+      return parents.reduce(function (inheritedValues, parent) {
+        return ShelfPlanner.addValuesPassedOnBy(parent, inheritedValues);
+      }, {});
+    }
+
+    /**
+     * Adds the values the article passes on to its accessoires with its global options right now (eg the gardenhouse colour of
+     * the door) on top of the ones its parents pass on (eg the cabinet colour of the drawers in an EINBAU).
+     * @param parentInheritedValues values the parents of the article pass on, per basketId
+     * @returns the values passed on per basketId, a new object
+     */
+  }, {
+    key: "placeStashedAccessoiresOfGrid",
+    value: (
     /**
      * 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
      */
-  }, {
-    key: "placeStashedAccessoiresOfGrid",
-    value: (function () {
+    function () {
       var _placeStashedAccessoiresOfGrid = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(gridIndex) {
         var stashKey, stashedAccessoires;
         return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
@@ -509,7 +560,7 @@ var ShelfPlanner = /*#__PURE__*/function () {
     key: "placeStashedAccessoiresInGrid",
     value: (function () {
       var _placeStashedAccessoiresInGrid = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(gridIndex, stashedAccessoires) {
-        var placedAccessoires, grid, i, stashed, result, fitResult, accessoire;
+        var placedAccessoires, grid, i, stashed, result, fitResult, accessoire, variantValues;
         return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -524,7 +575,7 @@ var ShelfPlanner = /*#__PURE__*/function () {
               i = 0;
             case 5:
               if (!(i < stashedAccessoires.length)) {
-                _context5.next = 28;
+                _context5.next = 29;
                 break;
               }
               stashed = stashedAccessoires[i];
@@ -555,30 +606,31 @@ var ShelfPlanner = /*#__PURE__*/function () {
                   parentBasketId: this.article.basketId
                 }
               }));
-              return _context5.abrupt("continue", 25);
+              return _context5.abrupt("continue", 26);
             case 17:
               accessoire.quantity = stashed.quantity;
               placedAccessoires++;
-              if (!Object.keys(stashed.variantValues).length) {
-                _context5.next = 22;
+              variantValues = this.valuesToPlaceAgain(stashed, accessoire);
+              if (!Object.keys(variantValues).length) {
+                _context5.next = 23;
                 break;
               }
-              _context5.next = 22;
-              return index.articleHandlerInstance.updateCfgValues(accessoire, stashed.variantValues, {});
-            case 22:
+              _context5.next = 23;
+              return index.articleHandlerInstance.updateCfgValues(accessoire, variantValues, {});
+            case 23:
               if (!accessoire.shelfPlanner) {
-                _context5.next = 25;
+                _context5.next = 26;
                 break;
               }
-              _context5.next = 25;
+              _context5.next = 26;
               return accessoire.shelfPlanner.placeStashedAccessoiresByGrid(stashed.accessoires);
-            case 25:
+            case 26:
               i++;
               _context5.next = 5;
               break;
-            case 28:
-              return _context5.abrupt("return", placedAccessoires);
             case 29:
+              return _context5.abrupt("return", placedAccessoires);
+            case 30:
             case "end":
               return _context5.stop();
           }
@@ -589,11 +641,42 @@ var ShelfPlanner = /*#__PURE__*/function () {
       }
       return placeStashedAccessoiresInGrid;
     }()
+    /**
+     * The remembered values of a stashed accessoire to set on the accessoire that was placed for it. A value of its own (eg an
+     * anthracite door) does not come back when the parent passes on another value than at stash time (eg the gardenhouse turned
+     * dark grey): an accessoire that stays in place takes over the parent's new value as well (updateAccessoriesFromGlobalOption).
+     * @param accessoire the accessoire placed for the stashed one, the values the parents pass on to it now are looked up by its basketId
+     */
+    )
+  }, {
+    key: "valuesToPlaceAgain",
+    value: function valuesToPlaceAgain(stashed, accessoire) {
+      var _ShelfPlanner$addValu;
+      var variantValues = _objectSpread({}, stashed.variantValues);
+      var ownInheritableCodices = Object.keys(stashed.inheritedValues).filter(function (codex) {
+        return codex in variantValues;
+      });
+      if (!ownInheritableCodices.length) return variantValues;
+      var inheritedNow = (_ShelfPlanner$addValu = ShelfPlanner.addValuesPassedOnBy(this.article, this.valuesPassedOnByParents())[accessoire.basketId]) !== null && _ShelfPlanner$addValu !== void 0 ? _ShelfPlanner$addValu : {};
+      var _iterator = _createForOfIteratorHelper(ownInheritableCodices),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var codex = _step.value;
+          if (inheritedNow[codex] !== undefined && inheritedNow[codex] !== stashed.inheritedValues[codex]) delete variantValues[codex];
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return variantValues;
+    }
+
     /**
      * runs through the InitAccArr and initialized all the accessoires eg: Kleiderstange gets placed
      * if the replaceFromParent == true it removed the same article from the parent shelfplanner if one is found  eg: Kleiderstange gets removed from schrank when the T-Sück gets initialized
      */
-    )
   }, {
     key: "initAccList",
     value: (function () {
@@ -723,7 +806,7 @@ var ShelfPlanner = /*#__PURE__*/function () {
     key: "triggerVisibility",
     value: function () {
       var _triggerVisibility = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7(gridGroup) {
-        var toCleanOptions, toUpdateOptions, i, grid, _i5, option, visitOptionState;
+        var toCleanOptions, toUpdateOptions, i, grid, _i6, option, visitOptionState;
         return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -759,13 +842,13 @@ var ShelfPlanner = /*#__PURE__*/function () {
               _context7.next = 3;
               break;
             case 13:
-              _i5 = 0;
+              _i6 = 0;
             case 14:
-              if (!(_i5 < [].concat(toUpdateOptions, toCleanOptions).length)) {
+              if (!(_i6 < [].concat(toUpdateOptions, toCleanOptions).length)) {
                 _context7.next = 23;
                 break;
               }
-              option = [].concat(toUpdateOptions, toCleanOptions)[_i5];
+              option = [].concat(toUpdateOptions, toCleanOptions)[_i6];
               visitOptionState = this.article.getArticleOptionState((!this.article.CatalogData.isIDMFormat ? 'OPT' : '') + option);
               if (!visitOptionState) {
                 _context7.next = 20;
@@ -774,7 +857,7 @@ var ShelfPlanner = /*#__PURE__*/function () {
               _context7.next = 20;
               return index.articleHandlerInstance.updateOption(this.article, visitOptionState.optionCodex, toUpdateOptions.includes(option) ? 'OPVMIT' : 'OPVOHNE');
             case 20:
-              _i5++;
+              _i6++;
               _context7.next = 14;
               break;
             case 23:
@@ -998,7 +1081,7 @@ var ShelfPlanner = /*#__PURE__*/function () {
     key: "handleDeleteTakePlaceOnOtherGrids",
     value: (function () {
       var _handleDeleteTakePlaceOnOtherGrids = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee10(gridIndex, cellIndex, accessoire) {
-        var i, _cell$Article, cell, _i6, _cell$Article2, _cell, _i7;
+        var i, _cell$Article, cell, _i7, _cell$Article2, _cell, _i8;
         return _regeneratorRuntime__default["default"].wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -1017,8 +1100,8 @@ var ShelfPlanner = /*#__PURE__*/function () {
                 }
               }
               if (accessoire.shelfHeightBelow) {
-                for (_i6 = 0; _i6 < accessoire.shelfHeightBelow; _i6++) {
-                  _cell = this.grids[gridIndex].Cells[cellIndex - (_i6 + 1)];
+                for (_i7 = 0; _i7 < accessoire.shelfHeightBelow; _i7++) {
+                  _cell = this.grids[gridIndex].Cells[cellIndex - (_i7 + 1)];
                   if ((_cell === null || _cell === void 0 || (_cell$Article2 = _cell.Article) === null || _cell$Article2 === void 0 ? void 0 : _cell$Article2.basketId) === accessoire.basketId) {
                     _cell.ClearInUse();
                   }
@@ -1028,22 +1111,22 @@ var ShelfPlanner = /*#__PURE__*/function () {
                 _context10.next = 14;
                 break;
               }
-              _i7 = 0;
+              _i8 = 0;
             case 6:
-              if (!(_i7 < this.grids.length)) {
+              if (!(_i8 < this.grids.length)) {
                 _context10.next = 14;
                 break;
               }
-              if (!(_i7 === gridIndex)) {
+              if (!(_i8 === gridIndex)) {
                 _context10.next = 9;
                 break;
               }
               return _context10.abrupt("continue", 11);
             case 9:
               _context10.next = 11;
-              return this.grids[_i7].deleteAccessoireInCells(cellIndex);
+              return this.grids[_i8].deleteAccessoireInCells(cellIndex);
             case 11:
-              _i7++;
+              _i8++;
               _context10.next = 6;
               break;
             case 14:
@@ -1588,6 +1671,24 @@ var ShelfPlanner = /*#__PURE__*/function () {
       }
       return undefined;
     }
+  }], [{
+    key: "addValuesPassedOnBy",
+    value: function addValuesPassedOnBy(article, parentInheritedValues) {
+      var globalValues = {};
+      for (var _i9 = 0, _Object$keys2 = Object.keys(article.getGlobalOptions()); _i9 < _Object$keys2.length; _i9++) {
+        var _article$getArticleOp;
+        var opt = _Object$keys2[_i9];
+        var valCodex = (_article$getArticleOp = article.getArticleOptionState(opt)) === null || _article$getArticleOp === void 0 ? void 0 : _article$getArticleOp.valCodex;
+        if (valCodex) globalValues[opt] = valCodex;
+      }
+      var inheritedValues = _objectSpread({}, parentInheritedValues);
+      var ownInheritedValues = article.getAccessoriesToChangeFromGlobalOption(globalValues);
+      for (var _i10 = 0, _Object$keys3 = Object.keys(ownInheritedValues); _i10 < _Object$keys3.length; _i10++) {
+        var _basketId = _Object$keys3[_i10];
+        inheritedValues[_basketId] = _objectSpread(_objectSpread({}, inheritedValues[_basketId]), ownInheritedValues[_basketId].variantValues);
+      }
+      return inheritedValues;
+    }
   }]);
 }();
 

package/build/cjs/{StandardWWSHandler-84ff60ba.js → StandardWWSHandler-e31f5446.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-0075f2cf.js');
+require('./index-76d3a1ec.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');
@@ -11,9 +11,10 @@ require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');
 require('axios');
 require('@crystaldesign/diva-utils');
+require('@babel/runtime/helpers/typeof');
+require('@babel/runtime/helpers/toArray');
 require('@crystaldesign/planner-2d-core');
 require('@crystaldesign/basket-model');
-require('@babel/runtime/helpers/typeof');
 require('fast-xml-parser');
 require('@babel/runtime/helpers/possibleConstructorReturn');
 require('@babel/runtime/helpers/getPrototypeOf');