@crystaldesign/web-planner-logic 26.4.4-rc.0 → 26.4.4

package/build/cjs/{DivaBoxPlanner-81b38167.js → DivaBoxPlanner-c26b6af8.js}

@@ -5,11 +5,11 @@ 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-6117bdcb.js');
+var index = require('./index-5c59e38f.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
-var PlannerHandler2D = require('./PlannerHandler2D-e4116910.js');
+var PlannerHandler2D = require('./PlannerHandler2D-840395ec.js');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('axios');
 require('@crystaldesign/basket-model');
@@ -2694,12 +2694,27 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
   }, {
     key: "correctFoot",
     value: function correctFoot(boxPlannerGrid, optionHandler) {
-      var _this3 = this;
+      var _bottomElements$map$f,
+        _this3 = this;
       var elements = boxPlannerGrid.getAllElementsInFrontGrid();
+      var bottomElements = boxPlannerGrid.getAllElementsInRow(0, false);
+      var selectedFootSystem = (_bottomElements$map$f = bottomElements.map(function (element) {
+        return _this3.getOptionVal(element.ElementId, 'OPTFUSS_SYS', optionHandler);
+      }).find(function (optionValue) {
+        return optionValue !== '' && optionValue !== 'OPVOHNE';
+      })) !== null && _bottomElements$map$f !== void 0 ? _bottomElements$map$f : bottomElements.map(function (element) {
+        return _this3.getOptionVal(element.ElementId, 'OPTFUSS_SYS', optionHandler);
+      }).find(function (optionValue) {
+        return optionValue !== '';
+      });
       elements.forEach(function (e) {
         if (boxPlannerGrid.getElementHasBottomElement(e.ElementId)) {
           _this3.setOptionValue(e.ElementId, 'OPTFUSS_SYS', 'OPVOHNE', optionHandler);
           _this3.setOptionValue(e.ElementId, 'OPTPOSSIBILITY_FUSS_OHNE', 'OPVTRUE', optionHandler);
+        } else {
+          if (selectedFootSystem) {
+            _this3.setOptionValue(e.ElementId, 'OPTFUSS_SYS', selectedFootSystem, optionHandler);
+          }
         }
       });
     }
@@ -3640,22 +3655,31 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
         if (curGrid[cell.index.x].length == 0) curGrid.splice(cell.index.x, 1);
       });
       var refreshedGrid = [];
+      var elementAreaById = new Map();
       curGrid.forEach(function (row, x) {
         refreshedGrid[x] = [];
         row.forEach(function (column, y) {
-          var area = column.plannedElement.area;
+          var plannedElement = column.plannedElement;
+          var elementId = plannedElement.elementId;
+          var areaSpanX = plannedElement.area.toX - plannedElement.area.fromX;
+          var areaSpanY = plannedElement.area.toY - plannedElement.area.fromY;
+          var refreshedArea = elementAreaById.get(elementId);
+          if (!refreshedArea) {
+            refreshedArea = {
+              fromX: x,
+              fromY: y,
+              toX: x + areaSpanX,
+              toY: y + areaSpanY
+            };
+            elementAreaById.set(elementId, refreshedArea);
+          }
           refreshedGrid[x][y] = {
             index: {
               x: x,
               y: y
             },
-            plannedElement: _objectSpread(_objectSpread({}, column.plannedElement), {}, {
-              area: {
-                fromX: x,
-                fromY: y,
-                toX: x + (area.toX - area.fromX),
-                toY: y + (area.toY - area.fromY)
-              }
+            plannedElement: _objectSpread(_objectSpread({}, plannedElement), {}, {
+              area: refreshedArea
             })
           };
         });
@@ -4192,7 +4216,10 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
       var endHeight = 0;
       for (var y = 0; y < currentRow.length;) {
         var cell = currentRow[y];
-        if (!cell || !cell.plannedElement) continue;
+        if (!cell || !cell.plannedElement) {
+          y += 1;
+          continue;
+        }
         if (cell.index.y < res.startRowIndex) startHeight = Math.round((startHeight + cell.plannedElement.size.height) * 1000) / 1000;
         if (cell.index.y < res.endRowIndex) endHeight = Math.round((endHeight + cell.plannedElement.size.height) * 1000) / 1000;
         y = cell.plannedElement.area.toY;
@@ -4204,12 +4231,15 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
           // only clean neighbours (for docking) add property if you also need clean ones
 
           for (var x = plannedElement.area.toX; x < curGrid.length;) {
-            var _neighbourRow$0$plann, _neighbourRow$0$plann2;
+            var _neighbourRow$0$plann, _neighbourRow$;
             var neighbourRow = curGrid[x];
             for (var _y = 0; _y < (neighbourRow === null || neighbourRow === void 0 ? void 0 : neighbourRow.length);) {
               var _cell5$plannedElement, _cell5$plannedElement2;
               var _cell5 = neighbourRow[_y];
-              if (!_cell5 || neighbours.includes(_cell5)) continue;
+              if (!_cell5 || neighbours.includes(_cell5)) {
+                _y += 1;
+                continue;
+              }
 
               // cubo has ladders that cause the first box to range all to the top, therefore the height computation won't work
               if (plannedElement.area.fromY == _y && this.gridSetupParams.forceSingleCellPerElement && plannedElement.area.toX == x) neighbours.push(_cell5);else if (clean && !this.gridSetupParams.forceSingleCellPerElement && neighbourSize == startHeight) neighbours.push(_cell5);else if (!clean && neighbourSize >= startHeight && neighbourSize <= endHeight) neighbours.push(_cell5);
@@ -4217,7 +4247,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
               _y = (_cell5$plannedElement = (_cell5$plannedElement2 = _cell5.plannedElement) === null || _cell5$plannedElement2 === void 0 ? void 0 : _cell5$plannedElement2.area.toY) !== null && _cell5$plannedElement !== void 0 ? _cell5$plannedElement : _y + 1;
             }
             neighbourSize = 0;
-            x = (_neighbourRow$0$plann = (_neighbourRow$0$plann2 = neighbourRow[0].plannedElement) === null || _neighbourRow$0$plann2 === void 0 ? void 0 : _neighbourRow$0$plann2.area.toX) !== null && _neighbourRow$0$plann !== void 0 ? _neighbourRow$0$plann : x + 1;
+            x = (_neighbourRow$0$plann = (_neighbourRow$ = neighbourRow[0]) === null || _neighbourRow$ === void 0 || (_neighbourRow$ = _neighbourRow$.plannedElement) === null || _neighbourRow$ === void 0 ? void 0 : _neighbourRow$.area.toX) !== null && _neighbourRow$0$plann !== void 0 ? _neighbourRow$0$plann : x + 1;
           }
           neighbours.forEach(function (n) {
             return !result.find(function (r) {
@@ -4227,17 +4257,21 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
           break;
         case 'LEFT':
           for (var _x2 = plannedElement.area.fromX - 1; _x2 >= 0;) {
+            var _neighbourRow$2;
             var _neighbourRow = curGrid[_x2];
             for (var _y2 = 0; _y2 < (_neighbourRow === null || _neighbourRow === void 0 ? void 0 : _neighbourRow.length);) {
               var _cell6$plannedElement, _cell6$plannedElement2;
               var _cell6 = _neighbourRow[_y2];
-              if (!_cell6 || neighbours.includes(_cell6)) continue;
+              if (!_cell6 || neighbours.includes(_cell6)) {
+                _y2 += 1;
+                continue;
+              }
               if (plannedElement.area.fromY == _y2 && this.gridSetupParams.forceSingleCellPerElement && plannedElement.area.fromX - 1 == _x2) neighbours.push(_cell6);else if (clean && !this.gridSetupParams.forceSingleCellPerElement && neighbourSize == startHeight) neighbours.push(_cell6);else if (!clean && neighbourSize >= startHeight && neighbourSize <= endHeight) neighbours.push(_cell6);
               neighbourSize = Math.round((neighbourSize + _cell6.plannedElement.size.height) * 1000) / 1000;
               _y2 = (_cell6$plannedElement = (_cell6$plannedElement2 = _cell6.plannedElement) === null || _cell6$plannedElement2 === void 0 ? void 0 : _cell6$plannedElement2.area.toY) !== null && _cell6$plannedElement !== void 0 ? _cell6$plannedElement : _y2 + 1;
             }
             neighbourSize = 0;
-            _x2 = _neighbourRow[0].plannedElement ? _neighbourRow[0].plannedElement.area.fromX - 1 : _x2 + 1;
+            _x2 = (_neighbourRow$2 = _neighbourRow[0]) !== null && _neighbourRow$2 !== void 0 && _neighbourRow$2.plannedElement ? _neighbourRow[0].plannedElement.area.fromX - 1 : _x2 + 1;
           }
           neighbours.forEach(function (n) {
             return !result.find(function (r) {
@@ -4442,7 +4476,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
       //columns and rows are swapped don't ask me why
       var element = curPos.cells[0].plannedElement;
       var index = {
-        x: dir == 'LEFT' ? curPos.startColIndex : curPos.endColIndex - 1,
+        x: dir == 'LEFT' ? curPos.startColIndex - 1 : curPos.endColIndex,
         y: curPos.startRowIndex
       };
       var curGrid = curPos.backside ? this.generalPlanningState.grids[1].matrix : this.generalPlanningState.grids[0].matrix;
@@ -4454,9 +4488,21 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
         fromX: element.area.fromX + d,
         toX: element.area.toX + d
       });
+
+      // Neighbor column left/right of the copy (where support width is checked). At the grid edge that column does not exist
+      // (LEFT: startColIndex === 0 → index.x === -1; RIGHT: endColIndex === curGrid.length → past last column).
+      // Then scan along an in-grid column of this element so we still collect the full vertical stack to copy.
+      var supportColX = index.x;
+      if (!curGrid[supportColX]) {
+        supportColX = dir === 'LEFT' ? curPos.startColIndex : curPos.endColIndex - 1;
+      }
       var _loop = function _loop(_y3) {
-          var _curGrid$index$x$_y, _Width, _Width2;
-          var supportElement = (_curGrid$index$x$_y = curGrid[index.x][_y3]) === null || _curGrid$index$x$_y === void 0 ? void 0 : _curGrid$index$x$_y.plannedElement;
+          var _curGrid$supportColX$, _Width, _Width2;
+          if (!curGrid[supportColX]) {
+            y = _y3;
+            return 0;
+          } // break
+          var supportElement = (_curGrid$supportColX$ = curGrid[supportColX][_y3]) === null || _curGrid$supportColX$ === void 0 ? void 0 : _curGrid$supportColX$.plannedElement;
           if (!supportElement) {
             y = _y3;
             return 0;
@@ -4696,27 +4742,22 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
       var curGrid = this.generalPlanningState.grids[0].matrix;
       var cells = undefined;
       if (absoluteIndex.x < 0 && absoluteIndex.y == 0) {
-        var dir = deletedCells.endColIndex >= absoluteIndex.x;
         if (deletedCells.startColIndex <= absoluteIndex.x) absoluteIndex.x -= deletedCells.endColIndex - deletedCells.startColIndex;
         if (absoluteIndex.x < 0) absoluteIndex.x = 0;
         cells = this.createNewCells(elementData, absoluteIndex.x, absoluteIndex.y, false);
         var movedGrid = [];
         var element = cells[0].plannedElement;
+        var shiftBy = element.area.toX - element.area.fromX;
         curGrid.forEach(function (_, x) {
           _.forEach(function (_, y) {
-            var newX = x;
-            var shiftX = 0;
-            if (y == absoluteIndex.y || absoluteIndex.y == 0) {
-              newX += dir ? element.area.toX - element.area.fromX : 0;
-              shiftX = dir ? element.area.toX - element.area.fromX : 0;
-            }
+            var newX = x + shiftBy;
             if (!movedGrid[newX]) movedGrid[newX] = [];
             var cellElem = curGrid[x][y].plannedElement;
             var newCell = {
               plannedElement: _objectSpread(_objectSpread({}, cellElem), {}, {
                 area: {
-                  fromX: newX,
-                  toX: cellElem.area.toX + shiftX,
+                  fromX: cellElem.area.fromX + shiftBy,
+                  toX: cellElem.area.toX + shiftBy,
                   fromY: cellElem.area.fromY,
                   toY: cellElem.area.toY
                 }

package/build/cjs/{DivaStandardPlanner-d25766e8.js → DivaStandardPlanner-45fc2811.js}

@@ -5,9 +5,9 @@ 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-6117bdcb.js');
+var index = require('./index-5c59e38f.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
-var PlannerHandler2D = require('./PlannerHandler2D-e4116910.js');
+var PlannerHandler2D = require('./PlannerHandler2D-840395ec.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');

package/build/cjs/{DoorPlanner-cfade061.js → DoorPlanner-c834365e.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');
-require('./index-6117bdcb.js');
+require('./index-5c59e38f.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{Host3DSignalR-ea1e0367.js → Host3DSignalR-9b1c799f.js}

@@ -5,7 +5,7 @@ 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-6117bdcb.js');
+var index = require('./index-5c59e38f.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var signalr = require('@microsoft/signalr');
 var io = require('socket.io-client');

package/build/cjs/{LiviqueWWSHandler-85bdb39f.js → LiviqueWWSHandler-16d85641.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-6117bdcb.js');
+require('./index-5c59e38f.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');

package/build/cjs/{PfisterWWSHandler-0c9a7bc9.js → PfisterWWSHandler-b96ff95f.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-var index = require('./index-6117bdcb.js');
+var index = require('./index-5c59e38f.js');
 var basketModel = require('@crystaldesign/basket-model');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');

package/build/cjs/{PlannerHandler2D-e4116910.js → PlannerHandler2D-840395ec.js}

@@ -5,7 +5,7 @@ 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-6117bdcb.js');
+var index = require('./index-5c59e38f.js');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var fabric = require('fabric');

package/build/cjs/{SeriousBasketHandler-be748102.js → SeriousBasketHandler-542935f8.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-6117bdcb.js');
+var index = require('./index-5c59e38f.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{ShelfPlanner-b7c0f561.js → ShelfPlanner-9cd1049a.js}

@@ -6,7 +6,7 @@ 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-6117bdcb.js');
+var index = require('./index-5c59e38f.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');

package/build/cjs/{StandardWWSHandler-eb3d2e0a.js → StandardWWSHandler-fe3133ba.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-6117bdcb.js');
+require('./index-5c59e38f.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');

package/build/cjs/{index-6117bdcb.js → index-5c59e38f.js}

@@ -29441,7 +29441,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-b7c0f561.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-9cd1049a.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -33072,10 +33072,10 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
     value: function getNewConfigStepKeyByBasketId(curConfigStepKey, basketId) {
       var steps = this.getAllByKey(curConfigStepKey);
       if (steps) {
-        var _Array$from$find;
-        return (_Array$from$find = Array.from(steps.optionStep.configSteps.values()).find(function (step) {
+        var _Object$values$find;
+        return (_Object$values$find = Object.values(steps.optionStep.configSteps).find(function (step) {
           return step.targetArticles.includes(basketId);
-        })) === null || _Array$from$find === void 0 ? void 0 : _Array$from$find.key;
+        })) === null || _Object$values$find === void 0 ? void 0 : _Object$values$find.key;
       }
       return undefined;
     }
@@ -37378,7 +37378,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-cfade061.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-c834365e.js'); });
             case 3:
               _yield$import = _context5.sent;
               DoorPlanner = _yield$import["default"];
@@ -41410,7 +41410,6 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     key: "initProductId",
     value: function () {
       var _initProductId = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(api, productId) {
-        var _this$plannerConfig$c4;
         var result, successful;
         return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -41422,9 +41421,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               this.assignNewDivaNr = true;
               _context2.next = 6;
               return this.initBasket(api, result.divaNr, {
-                basket: _objectSpread$9(_objectSpread$9({}, result.configuration), {}, {
-                  OrganizationId: (_this$plannerConfig$c4 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c4 === void 0 ? void 0 : _this$plannerConfig$c4._id
-                })
+                basket: result.configuration
               }, false, productId);
             case 6:
               successful = _context2.sent;
@@ -41642,7 +41639,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               _context5.next = 36;
               break;
             case 44:
-              this.baskets[newDivaNr] = new basketModel.BasketData(_objectSpread$9({}, basket));
+              this.baskets[newDivaNr] = new basketModel.BasketData(basket);
               this.baskets[newDivaNr].clearRenderData();
               if (!keepOldDivaNr) this.divaNr = newDivaNr;
               if (this.assignNewDivaNr) {
@@ -41785,7 +41782,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     key: "loadBasketByCustomProductId",
     value: function () {
       var _loadBasketByCustomProductId = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee8(api, key, productId, fields) {
-        var variantData, _this$plannerConfig$c5;
+        var variantData;
         return _regeneratorRuntime__default["default"].wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -41815,11 +41812,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               if (variantData.productGroup) {
                 this.analyticsRelevantData.productGroup = variantData.productGroup;
               }
-              return _context8.abrupt("return", this.initBasket(api, variantData.basket.DivaNr, {
-                basket: _objectSpread$9(_objectSpread$9({}, variantData.basket), {}, {
-                  OrganizationId: (_this$plannerConfig$c5 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c5 === void 0 ? void 0 : _this$plannerConfig$c5._id
-                })
-              }, undefined, productId));
+              return _context8.abrupt("return", this.initBasket(api, variantData.basket.DivaNr, variantData, undefined, productId));
             case 12:
               _context8.next = 18;
               break;
@@ -41946,7 +41939,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
     key: "saveToBasket",
     value: function () {
       var _saveToBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee11(api, actBasket, returnTo, arReady) {
-        var _this$plannerConfig$s10, _this$plannerConfig$c6, _this$_basketHandler, _api$getJwt, _URLSearchParams$get;
+        var _this$plannerConfig$s10, _this$plannerConfig$c4, _this$_basketHandler, _api$getJwt, _URLSearchParams$get;
         var response;
         return _regeneratorRuntime__default["default"].wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
@@ -41961,12 +41954,12 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return DivaUtils__default["default"].updateBasketOrgInfo(actBasket, this.plannerConfig.currentOrganization, this.plannerConfig.currentUser, (_this$plannerConfig$s10 = this.plannerConfig.settings) === null || _this$plannerConfig$s10 === void 0 ? void 0 : _this$plannerConfig$s10.keepSalesPersonDataInBasket);
             case 8:
               actBasket.UserLanguage = api.getLanguage();
-              actBasket.PrintRetailLogo = (_this$plannerConfig$c6 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c6 === void 0 ? void 0 : _this$plannerConfig$c6.logoUrl;
+              actBasket.PrintRetailLogo = (_this$plannerConfig$c4 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c4 === void 0 ? void 0 : _this$plannerConfig$c4.logoUrl;
               _context11.next = 12;
               return (_this$_basketHandler = this._basketHandler) === null || _this$_basketHandler === void 0 ? void 0 : _this$_basketHandler.saveBasket({
                 jwt: (_api$getJwt = api.getJwt()) !== null && _api$getJwt !== void 0 ? _api$getJwt : undefined,
                 basket: actBasket,
-                awaitPDF: returnTo == 'SAVE_BASKET_ASYNC' ? false : true,
+                awaitPDF: true,
                 utmCampaign: (_URLSearchParams$get = new URLSearchParams(window.location.search).get('utm_campaign')) !== null && _URLSearchParams$get !== void 0 ? _URLSearchParams$get : undefined,
                 saveToApi2: false,
                 apiKey: api.getApiKey()
@@ -42149,7 +42142,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-0c9a7bc9.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-b96ff95f.js'); });
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -42157,7 +42150,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-85bdb39f.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-16d85641.js'); });
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -42165,7 +42158,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-be748102.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-542935f8.js'); });
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -42173,7 +42166,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-eb3d2e0a.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-fe3133ba.js'); });
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -43597,7 +43590,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.next = 2;
-              return Promise.resolve().then(function () { return require('./Host3DSignalR-ea1e0367.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-9b1c799f.js'); });
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -45350,7 +45343,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context4.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-d25766e8.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-45fc2811.js'); });
             case 10:
               _yield$import = _context4.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -45361,7 +45354,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context4.abrupt("break", 21);
             case 15:
               _context4.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-81b38167.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-c26b6af8.js'); });
             case 17:
               _yield$import2 = _context4.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -47211,7 +47204,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               this.api.setState(this.state);
               this.ReturnTo = this.plannerConfig.returnTo;
               LOG$1.startTransaction({
-                event: cache !== undefined ? 'onReinitializeConfigurator' : 'onInitializeConfigurator',
+                event: 'onInitializeConfigurator',
                 message: 'Loading Basket',
                 eventId: 'LOADING_BASKET',
                 warningTime: 2000,
@@ -47226,13 +47219,11 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               return this.divaBasketHandler.initializeBasket(this.api);
             case 12:
               loadSuccessful = _context14.sent;
-              if (this.plannerConfig.configuratorSessionId) {
+              if (this.plannerConfig.configuratorSessionId === undefined && (!this.divaBasketHandler.hasConfiguratorSessionIdGetter || DivaUtils__default["default"].businessMetrics.getConfiguratorSessionId() === undefined)) {
+                DivaUtils__default["default"].businessMetrics.setConfiguratorSessionId();
+              } else if (this.plannerConfig.configuratorSessionId) {
                 //force new configurator session id - Landingpage case
                 DivaUtils__default["default"].businessMetrics.setConfiguratorSessionId(this.plannerConfig.configuratorSessionId);
-              } else {
-                // Only create a new configurator session if we don't already have one. This keeps the analytics
-                // session stable across re-inits (e.g. switching products inside the same catalog).
-                DivaUtils__default["default"].businessMetrics.setConfiguratorSessionId(undefined, true);
               }
               if (!loadSuccessful) {
                 _context14.next = 31;
@@ -48475,7 +48466,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
                 break;
               }
               _context28.t3 = returnTo;
-              _context28.next = _context28.t3 === 'OPEN_SELLER_PRODUCTCREATOR' ? 27 : _context28.t3 === 'OPEN_SELLER_BASKET' ? 29 : _context28.t3 === 'OPEN_PDF' ? 32 : _context28.t3 === 'SAVE_BASKET_WITH_MODAL' ? 32 : _context28.t3 === 'SAVE_BASKET' ? 32 : _context28.t3 === 'SAVE_BASKET_SYNC' ? 32 : _context28.t3 === 'SAVE_BASKET_ASYNC' ? 32 : 52;
+              _context28.next = _context28.t3 === 'OPEN_SELLER_PRODUCTCREATOR' ? 27 : _context28.t3 === 'OPEN_SELLER_BASKET' ? 29 : _context28.t3 === 'OPEN_PDF' ? 32 : _context28.t3 === 'SAVE_BASKET_WITH_MODAL' ? 32 : _context28.t3 === 'SAVE_BASKET' ? 32 : _context28.t3 === 'SAVE_BASKET_SYNC' ? 32 : 52;
               break;
             case 27:
               (_this$actions34 = this.actions) === null || _this$actions34 === void 0 || _this$actions34.openComponent({

package/build/cjs/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-6117bdcb.js');
+var index = require('./index-5c59e38f.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/classCallCheck');