@crystaldesign/web-planner-logic 26.5.0-beta.47 → 26.5.0-beta.49

package/build/cjs/{index-c30cb6cd.js → index-9145fe80.js}

@@ -23243,6 +23243,7 @@ var DivaEngine = /*#__PURE__*/function () {
     _classCallCheck__default["default"](this, DivaEngine);
     _defineProperty__default["default"](this, "article", void 0);
     _defineProperty__default["default"](this, "decisionDebugStack", []);
+    _defineProperty__default["default"](this, "catalogDecisionsByNumber", void 0);
     this.article = article;
   }
   return _createClass__default["default"](DivaEngine, [{
@@ -23726,11 +23727,13 @@ var DivaEngine = /*#__PURE__*/function () {
     key: "evalAllDecisions",
     value: function evalAllDecisions() {
       var myDecisions = this.article.catalogArticle.articleReferencedDecisions;
-      for (var i = myDecisions.length - 1; i >= 0; i--) {
-        if (myDecisions[i].addedViaDisableEnableRef) {
-          myDecisions.splice(i, 1);
+      var writeIdx = 0;
+      for (var i = 0; i < myDecisions.length; i++) {
+        if (!myDecisions[i].addedViaDisableEnableRef) {
+          myDecisions[writeIdx++] = myDecisions[i];
         }
       }
+      myDecisions.length = writeIdx;
       //add the partlist spesific decisions to the normal decisions
       if (this.article.initDecisions) {
         var sortedInitDecisions = _toConsumableArray__default["default"](this.article.initDecisions).sort(function (a, b) {
@@ -23758,6 +23761,9 @@ var DivaEngine = /*#__PURE__*/function () {
       } finally {
         _iterator7.f();
       }
+      this.catalogDecisionsByNumber = new Map(this.article.catalogArticle.articleDecisions.map(function (d) {
+        return [d.Number, d];
+      }));
       this.decisionDebugStack = [];
       var beforeSnapshot = this.article.set.logDecisions ? this.article.snapshot : undefined;
       for (var m = 0; m < myDecisions.length; m++) {
@@ -23970,10 +23976,10 @@ var DivaEngine = /*#__PURE__*/function () {
                 case 'SET_FEATURE_DEFAULT_NULL':
                   break;
                 case 'DISABLE_DECISION':
-                  this.disableDecision(myDecision, myDoc, myDecisions);
+                  this.disableDecision(myDecision, myDA.DecisionNr, myDecisions);
                   break;
                 case 'ENABLE_DECISION':
-                  this.enableDecision(myDecision, myDoc, myDecisions);
+                  this.enableDecision(myDecision, myDA.DecisionNr, myDecisions);
                   break;
                 default:
                   LOG$g.error(new DivaUtils.DivaError('Action type not supported in DecisionOptionCombination', {
@@ -24033,114 +24039,63 @@ var DivaEngine = /*#__PURE__*/function () {
     }
   }, {
     key: "disableDecision",
-    value: function disableDecision(myDecision, myDoc, myDecisions) {
-      var _this2 = this;
-      if (myDecision.activeCombination == -1) return;
-      var SearchDecNumber = [];
-      if (myDoc.DA) for (var m = 0; m < myDoc.DA.length; m++) {
-        var decisionAction = myDoc.DA[m];
-        if (decisionAction.Type == 'DISABLE_DECISION') {
-          SearchDecNumber.push(Number(decisionAction.DecisionNr));
-        }
-      }
-      SearchDecNumber.map(function (d) {
-        return myDecisions.find(function (de) {
-          return de.Number == d.toString();
-        });
-      }).map(function (d, index) {
-        var _d$disableHistory;
-        var decisionNumber = SearchDecNumber[index];
-        if (!d) {
-          var decision = _this2.article.catalogArticle.articleDecisions.find(function (d) {
-            return d.Number == decisionNumber.toString();
-          });
-          if (!decision) {
-            LOG$g.warn('Decision ' + decisionNumber + ' that is referenced in disable decision ' + myDecision.Number + ' not found.');
-            return;
-          }
-          var insertIndex = 0;
-          var prios = myDecisions.map(function (d) {
-            return d.Prio;
-          });
-          if (decision.Prio <= myDecision.Prio) LOG$g.warn('Decision ' + decisionNumber + ' that is referenced in enable decision ' + myDecision.Number + ' has a lower prio than the enable decision.');
-          for (var i = 0; i < prios.length; i++) {
-            if (Number(prios[i]) >= Number(decision.Prio)) {
-              insertIndex = i;
-              break;
-            }
-          }
-          myDecisions.splice(insertIndex, 0, _objectSpread$h(_objectSpread$h({}, decision), {}, {
-            enabled: false,
-            disableHistory: ['referenced and disabled By ' + myDecision.Number],
-            addedViaDisableEnableRef: true
-          }));
-          return;
-        }
-        d.enabled = false;
-        (_d$disableHistory = d.disableHistory) === null || _d$disableHistory === void 0 || _d$disableHistory.push('disabled By ' + myDecision.Number);
-      });
+    value: function disableDecision(myDecision, targetDecisionNr, myDecisions) {
+      this.toggleDecisionEnabled(myDecision, targetDecisionNr, myDecisions, false);
     }
   }, {
     key: "enableDecision",
-    value: function enableDecision(myDecision, myDoc, myDecisions) {
-      var _this3 = this;
+    value: function enableDecision(myDecision, targetDecisionNr, myDecisions) {
+      this.toggleDecisionEnabled(myDecision, targetDecisionNr, myDecisions, true);
+    }
+  }, {
+    key: "toggleDecisionEnabled",
+    value: function toggleDecisionEnabled(myDecision, targetDecisionNr, myDecisions, enabled) {
+      var _this$catalogDecision, _this$catalogDecision2;
       if (myDecision.activeCombination == -1) return;
-      var SearchDecNumber = [];
-      if (myDoc.DA) {
-        for (var m = 0; m < myDoc.DA.length; m++) {
-          var decisionAction = myDoc.DA[m];
-          if (decisionAction.Type == 'ENABLE_DECISION') {
-            SearchDecNumber.push(Number(decisionAction.DecisionNr));
-          }
-        }
+      var verb = enabled ? 'enabled' : 'disabled';
+      var existing = myDecisions.find(function (d) {
+        return d.Number == targetDecisionNr;
+      });
+      if (existing) {
+        var _existing$disableHist;
+        existing.enabled = enabled;
+        (_existing$disableHist = existing.disableHistory) === null || _existing$disableHist === void 0 || _existing$disableHist.push("".concat(verb, " By ").concat(myDecision.Number));
+        return;
       }
-      SearchDecNumber.map(function (d) {
-        return myDecisions.find(function (de) {
-          return de.Number == d.toString();
-        });
-      }).map(function (d, index) {
-        var _d$disableHistory2;
-        var decisionNumber = SearchDecNumber[index];
-        if (!d) {
-          var decision = _this3.article.catalogArticle.articleDecisions.find(function (d) {
-            return d.Number == decisionNumber.toString();
-          });
-          if (!decision) {
-            LOG$g.warn('Decision ' + decisionNumber + ' that is referenced in enable decision ' + myDecision.Number + ' not found.');
-            return;
-          }
-          var insertIndex = 0;
-          var prios = myDecisions.map(function (d) {
-            return d.Prio;
-          });
-          if (decision.Prio <= myDecision.Prio) LOG$g.warn('Decision ' + decisionNumber + ' that is referenced in enable decision ' + myDecision.Number + ' has a lower prio than the enable decision.');
-          for (var i = 0; i < prios.length; i++) {
-            if (Number(prios[i]) >= Number(decision.Prio)) {
-              insertIndex = i;
-              break;
-            }
-          }
-          myDecisions.splice(insertIndex, 0, _objectSpread$h(_objectSpread$h({}, decision), {}, {
-            enabled: true,
-            disableHistory: ['referenced and enabled By ' + myDecision.Number],
-            addedViaDisableEnableRef: true
-          }));
-          return;
-        }
-        d.enabled = true;
-        (_d$disableHistory2 = d.disableHistory) === null || _d$disableHistory2 === void 0 || _d$disableHistory2.push('enabled By ' + myDecision.Number);
+      var decision = (_this$catalogDecision = (_this$catalogDecision2 = this.catalogDecisionsByNumber) === null || _this$catalogDecision2 === void 0 ? void 0 : _this$catalogDecision2.get(targetDecisionNr)) !== null && _this$catalogDecision !== void 0 ? _this$catalogDecision : this.article.catalogArticle.articleDecisions.find(function (d) {
+        return d.Number == targetDecisionNr;
       });
+      if (!decision) {
+        LOG$g.warn("Decision ".concat(targetDecisionNr, " that is referenced in ").concat(verb.replace('d', ''), " decision ").concat(myDecision.Number, " not found."));
+        return;
+      }
+      var decisionPrio = Number(decision.Prio);
+      if (decisionPrio <= Number(myDecision.Prio)) {
+        LOG$g.warn("Decision ".concat(targetDecisionNr, " that is referenced in enable decision ").concat(myDecision.Number, " has a lower prio than the enable decision."));
+      }
+      var insertIndex = 0;
+      for (var i = 0; i < myDecisions.length; i++) {
+        if (Number(myDecisions[i].Prio) >= decisionPrio) {
+          insertIndex = i;
+          break;
+        }
+      }
+      myDecisions.splice(insertIndex, 0, _objectSpread$h(_objectSpread$h({}, decision), {}, {
+        enabled: enabled,
+        disableHistory: ["referenced and ".concat(verb, " By ").concat(myDecision.Number)],
+        addedViaDisableEnableRef: true
+      }));
     }
   }, {
     key: "evalType1Decision",
     value: function evalType1Decision(myDecision) {
-      var _this4 = this;
+      var _this2 = this;
       var validOPVs = {};
       var doAlsoCheckOPTs = [];
       if (myDecision.Options && myDecision.DOC) {
         var _loop2 = function _loop2() {
           var OPT = myDecision.Options[p];
-          var ops = _this4.article.getArticleOptionStateFlat(OPT);
+          var ops = _this2.article.getArticleOptionStateFlat(OPT);
           if (!ops) return 1; // break
           if (!validOPVs[OPT]) validOPVs[OPT] = new Map();
           var possibleOPVs = new Map(ops.visibleOptionValues);
@@ -24151,7 +24106,7 @@ var DivaEngine = /*#__PURE__*/function () {
             //wenn diese Row mehrere Optionen hat, dann müssen die bisher gesetzten schon übereinstimmen
 
             var myDoc = myDecision.DOC[j];
-            var doUseDoc = _this4.checkIfDocIsValid(myDoc, doAlsoCheckOPTs);
+            var doUseDoc = _this2.checkIfDocIsValid(myDoc, doAlsoCheckOPTs);
             if (doUseDoc) {
               var _myDoc$Row;
               myDecision.activeCombination = j;
@@ -24229,10 +24184,10 @@ var DivaEngine = /*#__PURE__*/function () {
           ops.updateVisibleOptionValues(new Map(schnittmenge));
           var valCodex = ops.valCodex;
           if ((!valCodex || !schnittmenge.get(valCodex)) && ops.visibleOPVKeys.length > 0) {
-            if (_this4.article.CatalogData.useDiomexConfigLogic) {
-              _this4.clearOP(OPT, true);
+            if (_this2.article.CatalogData.useDiomexConfigLogic) {
+              _this2.clearOP(OPT, true);
             } else {
-              _this4.updateArtOPV(_this4.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
+              _this2.updateArtOPV(_this2.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
             }
           }
           doAlsoCheckOPTs.push(OPT);
@@ -24269,13 +24224,13 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "evalType0Decision",
     value: function evalType0Decision(myDecision) {
-      var _this5 = this;
+      var _this3 = this;
       var invalidOPVs = {},
         doAlsoCheckOPTs = [];
       if (myDecision.Options && myDecision.Options.length > 1 && myDecision.DOC) {
         var _loop3 = function _loop3() {
           var OPT = myDecision.Options[p];
-          var ops = _this5.article.getArticleOptionStateFlat(OPT);
+          var ops = _this3.article.getArticleOptionStateFlat(OPT);
           if (!ops) return 1; // break
           if (!invalidOPVs[OPT]) invalidOPVs[OPT] = new Map();
           var possibleOPVs = ops.visibleOptionValues;
@@ -24292,7 +24247,7 @@ var DivaEngine = /*#__PURE__*/function () {
                 for (var f = 0; f < doAlsoCheckOPTs.length; f++) {
                   var _myDoc$Row3;
                   var checkOptX = doAlsoCheckOPTs[f];
-                  var _ops3 = _this5.article.getArticleOptionState(checkOptX);
+                  var _ops3 = _this3.article.getArticleOptionState(checkOptX);
                   if (_ops3 && (_myDoc$Row3 = myDoc.Row) !== null && _myDoc$Row3 !== void 0 && _myDoc$Row3[checkOptX] && _ops3.valCodex && !myDoc.Row[checkOptX].includes(_ops3.valCodex)) {
                     doUseDoc = false;
                     break;
@@ -24320,10 +24275,10 @@ var DivaEngine = /*#__PURE__*/function () {
             ops.updateVisibleOptionValues(schnittmenge);
             var valCodex = ops.valCodex;
             if ((!valCodex || !schnittmenge.get(valCodex)) && ops.visibleOPVKeys.length > 0) {
-              if (_this5.article.CatalogData.useDiomexConfigLogic) {
-                _this5.clearOP(OPT, true);
+              if (_this3.article.CatalogData.useDiomexConfigLogic) {
+                _this3.clearOP(OPT, true);
               } else {
-                _this5.updateArtOPV(_this5.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
+                _this3.updateArtOPV(_this3.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
               }
             }
           } else if (p < myDecision.Options.length - 1) {
@@ -24651,7 +24606,7 @@ var DivaEngine = /*#__PURE__*/function () {
     key: "addPartilstToPartlistArticlesToLoad",
     value: function addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues, myDecisionVal, groupDecisionVal, decisionNumber, partlistGroupPrefix, loadReason) {
       var _myPartListPos$Option,
-        _this6 = this;
+        _this4 = this;
       var allDecisions = this.article.catalogArticle.articleDecisions;
       var decisions = myPartListPos.PartListPosDecisionsAndPosCounts;
       var optionsForPrint = (_myPartListPos$Option = myPartListPos.OptionsForPrint) === null || _myPartListPos$Option === void 0 ? void 0 : _myPartListPos$Option.split(';');
@@ -24662,9 +24617,9 @@ var DivaEngine = /*#__PURE__*/function () {
         var articleCodex = myPartListPos.ItemRefArticles[d].ArticleCodex;
         var catalogCodex = myPartListPos.ItemRefArticles[d].CatalogCodex;
         var retailArticleNr = myPartListPos.RetailArticleNr && myPartListPos.RetailArticleNr != '' ? myPartListPos.RetailArticleNr : undefined;
-        if (myDecisionVal && (myDecisionVal.Rule && myDecisionVal.Rule != '' && _this6.article.CatalogData.doUseRuleDescForPartListArticles() || myPartListPos.RetailArticleNr == 'CUST')) {
-          myRuleDesc = DivaUtils__default["default"].getRuleDescription(myDecisionVal.Rule, _this6.article.articleOptionStates, _this6.article.set.api.ruleDescSeperator());
-          myRuleDesc_locales = DivaUtils__default["default"].getRuleDescription_locales(myDecisionVal.Rule, _this6.article.articleOptionStates, _this6.article.set.api.ruleDescSeperator());
+        if (myDecisionVal && (myDecisionVal.Rule && myDecisionVal.Rule != '' && _this4.article.CatalogData.doUseRuleDescForPartListArticles() || myPartListPos.RetailArticleNr == 'CUST')) {
+          myRuleDesc = DivaUtils__default["default"].getRuleDescription(myDecisionVal.Rule, _this4.article.articleOptionStates, _this4.article.set.api.ruleDescSeperator());
+          myRuleDesc_locales = DivaUtils__default["default"].getRuleDescription_locales(myDecisionVal.Rule, _this4.article.articleOptionStates, _this4.article.set.api.ruleDescSeperator());
         }
         var initDecisions = decisions.filter(function (decision) {
           return decision.RelationType !== 'PosCount';
@@ -24674,7 +24629,7 @@ var DivaEngine = /*#__PURE__*/function () {
           });
         });
         var quanitity = 1;
-        if (_this6.article.CatalogData.useDecisionPosCountValue) {
+        if (_this4.article.CatalogData.useDecisionPosCountValue) {
           var _decision$DOC;
           // get SetPosCountValue from decsion action if defined and else use myPartListPos.PosCountValue;
           var decision = decisionNumber ? allDecisions.find(function (d) {
@@ -24689,12 +24644,12 @@ var DivaEngine = /*#__PURE__*/function () {
             return a.SetPosCountValue !== undefined;
           })) === null || _decision$DOC === void 0 ? void 0 : _decision$DOC.SetPosCountValue;
           quanitity = setPosCountValue !== undefined ? setPosCountValue : myPartListPos.PosCountValue;
-        } else if (_this6.article.CatalogData.usePosCountValue) {
+        } else if (_this4.article.CatalogData.usePosCountValue) {
           quanitity = myPartListPos.PosCountValue;
         }
-        quanitity = quanitity * _this6.article.quantity;
-        var previousPartlistArticle = _this6.article.getPreviousPartlistArticle(articleCodex);
-        if (_this6.article.set.logDecisions) {
+        quanitity = quanitity * _this4.article.quantity;
+        var previousPartlistArticle = _this4.article.getPreviousPartlistArticle(articleCodex);
+        if (_this4.article.set.logDecisions) {
           var base = {
             articleCodex: articleCodex,
             catalogCodex: catalogCodex,
@@ -24702,7 +24657,7 @@ var DivaEngine = /*#__PURE__*/function () {
             sequenceNo: myPartListPos.SequenceNo
           };
           if (quanitity < 1) {
-            _this6.pushPartlistDebugEntry(base, {
+            _this4.pushPartlistDebugEntry(base, {
               loaded: false,
               reason: 'Quantity < 1',
               quantity: quanitity,
@@ -24710,7 +24665,7 @@ var DivaEngine = /*#__PURE__*/function () {
             });
             return 1; // continue
           }
-          _this6.pushPartlistDebugEntry(base, {
+          _this4.pushPartlistDebugEntry(base, {
             loaded: true,
             reason: loadReason !== null && loadReason !== void 0 ? loadReason : 'Loaded',
             decisionNo: decisionNumber,
@@ -24733,13 +24688,13 @@ var DivaEngine = /*#__PURE__*/function () {
         if (quanitity >= 1) {
           var _myDecisionVal$Rule;
           partlistArticlesToLoad.push({
-            CatalogCodex: catalogCodex !== null && catalogCodex !== void 0 ? catalogCodex : _this6.article.catalogCodex,
+            CatalogCodex: catalogCodex !== null && catalogCodex !== void 0 ? catalogCodex : _this4.article.catalogCodex,
             BasketID: previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.basketId,
             ArticleCodex: articleCodex,
             RetailArticleNr: retailArticleNr,
             RetailPrefix: myPartListPos.RetailPrefix,
             Quantity: quanitity,
-            PartlistRule: (groupDecisionVal ? groupDecisionVal.Rule + ' && ' : '') + myDecisionVal ? DivaUtils__default["default"].getOptionValuePairsByRule((_myDecisionVal$Rule = myDecisionVal === null || myDecisionVal === void 0 ? void 0 : myDecisionVal.Rule) !== null && _myDecisionVal$Rule !== void 0 ? _myDecisionVal$Rule : '', _this6.article.VariantValues) : undefined,
+            PartlistRule: (groupDecisionVal ? groupDecisionVal.Rule + ' && ' : '') + myDecisionVal ? DivaUtils__default["default"].getOptionValuePairsByRule((_myDecisionVal$Rule = myDecisionVal === null || myDecisionVal === void 0 ? void 0 : myDecisionVal.Rule) !== null && _myDecisionVal$Rule !== void 0 ? _myDecisionVal$Rule : '', _this4.article.VariantValues) : undefined,
             partlistDecisionNo: decisionNumber,
             SupplierOrderCodex: myPartListPos.SupplierOrderCodex,
             initDecisions: initDecisionsFiltered,
@@ -24748,7 +24703,7 @@ var DivaEngine = /*#__PURE__*/function () {
             RuleDesc_locales: myRuleDesc_locales,
             PosInvisibility: myPartListPos.PosInvisibility,
             ConfigurationMode: myPartListPos.ConfigurationMode,
-            VariantValues: _this6.article.variantValuesForPla(myPartListPos.ConfigurationMode, previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues, newConfigValues),
+            VariantValues: _this4.article.variantValuesForPla(myPartListPos.ConfigurationMode, previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues, newConfigValues),
             VariantItemData: previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantItemData,
             optionImgForPrint: optionImgForPrint,
             optionsForPrint: optionsForPrint,
@@ -24797,7 +24752,7 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "calcConfigPrice",
     value: function calcConfigPrice(maxPriceOfGroupCodex, digits) {
-      var _this7 = this,
+      var _this5 = this,
         _this$article$catalog5;
       //Wenn im Planer für dieses Shape mehere Rules gibt, müssen wir diese jetzt prüfen, ob jetzt ein anderes shape gültig ist.
       //wenn ja, hier neues shape übergeben
@@ -24931,7 +24886,7 @@ var DivaEngine = /*#__PURE__*/function () {
           if (!targetPPGPrefixes) continue;
           var _loop7 = function _loop7() {
             var targetPrefix = targetPPGPrefixes[_i8];
-            var priceRef = _this7.article.priceRefs.find(function (item) {
+            var priceRef = _this5.article.priceRefs.find(function (item) {
               var _item$PPG;
               return ((_item$PPG = item.PPG) === null || _item$PPG === void 0 ? void 0 : _item$PPG.split('_')[0]) == targetPrefix;
             });
@@ -24956,11 +24911,11 @@ var DivaEngine = /*#__PURE__*/function () {
         var _loop6 = function _loop6() {
           var targetPrefix = basePriceRef.TargetPPGPrefixes[_j];
           var myArtOpv;
-          var priceRef = _this7.article.priceRefs.find(function (item) {
+          var priceRef = _this5.article.priceRefs.find(function (item) {
             return item.PPG && item.PPG.split('_')[0] == targetPrefix;
           });
           if (!priceRef) {
-            var _iterator13 = _createForOfIteratorHelper$a(_this7.article.articleOptionStates.values()),
+            var _iterator13 = _createForOfIteratorHelper$a(_this5.article.articleOptionStates.values()),
               _step13;
             try {
               for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
@@ -25204,7 +25159,7 @@ var DivaEngine = /*#__PURE__*/function () {
     value: function updateConfigDependentMedia() {
       var _this$article$catalog6,
         _this$article$catalog7,
-        _this8 = this;
+        _this6 = this;
       var catalogData = this.article.CatalogData;
       //articlebild berechnung
 
@@ -25331,7 +25286,7 @@ var DivaEngine = /*#__PURE__*/function () {
           var _plannerCatArt$topSvg;
           var custom = {
             formulas: (_plannerCatArt$topSvg = plannerCatArt.topSvgsWithFormula) === null || _plannerCatArt$topSvg === void 0 ? void 0 : _plannerCatArt$topSvg.map(function (item) {
-              return DivaUtils__default["default"].getRuleByFormula(item.JsFormula, _this8.article.catalogCodex, catalogData.multiselectOptions);
+              return DivaUtils__default["default"].getRuleByFormula(item.JsFormula, _this6.article.catalogCodex, catalogData.multiselectOptions);
             }),
             catalogName: catalogData.catalogName,
             catalogCodex: this.article.catalogCodex,
@@ -29523,7 +29478,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-c53230d3.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-c4449795.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -33156,10 +33111,10 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
     value: function getNewConfigStepKeyByBasketId(curConfigStepKey, basketId) {
       var steps = this.getAllByKey(curConfigStepKey);
       if (steps) {
-        var _Object$values$find;
-        return (_Object$values$find = Object.values(steps.optionStep.configSteps).find(function (step) {
+        var _Array$from$find;
+        return (_Array$from$find = Array.from(steps.optionStep.configSteps.values()).find(function (step) {
           return step.targetArticles.includes(basketId);
-        })) === null || _Object$values$find === void 0 ? void 0 : _Object$values$find.key;
+        })) === null || _Array$from$find === void 0 ? void 0 : _Array$from$find.key;
       }
       return undefined;
     }
@@ -37462,7 +37417,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-062bb372.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-d9d820b2.js'); });
             case 3:
               _yield$import = _context5.sent;
               DoorPlanner = _yield$import["default"];
@@ -41494,6 +41449,7 @@ 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) {
@@ -41505,7 +41461,9 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               this.assignNewDivaNr = true;
               _context2.next = 6;
               return this.initBasket(api, result.divaNr, {
-                basket: result.configuration
+                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
+                })
               }, false, productId);
             case 6:
               successful = _context2.sent;
@@ -41723,7 +41681,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               _context5.next = 36;
               break;
             case 44:
-              this.baskets[newDivaNr] = new basketModel.BasketData(basket);
+              this.baskets[newDivaNr] = new basketModel.BasketData(_objectSpread$9({}, basket));
               this.baskets[newDivaNr].clearRenderData();
               if (!keepOldDivaNr) this.divaNr = newDivaNr;
               if (this.assignNewDivaNr) {
@@ -41866,7 +41824,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;
+        var variantData, _this$plannerConfig$c5;
         return _regeneratorRuntime__default["default"].wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -41896,7 +41854,11 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               if (variantData.productGroup) {
                 this.analyticsRelevantData.productGroup = variantData.productGroup;
               }
-              return _context8.abrupt("return", this.initBasket(api, variantData.basket.DivaNr, variantData, undefined, productId));
+              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));
             case 12:
               _context8.next = 18;
               break;
@@ -42023,7 +41985,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$c4, _this$_basketHandler, _api$getJwt, _URLSearchParams$get;
+        var _this$plannerConfig$s10, _this$plannerConfig$c6, _this$_basketHandler, _api$getJwt, _URLSearchParams$get;
         var response;
         return _regeneratorRuntime__default["default"].wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
@@ -42038,12 +42000,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$c4 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c4 === void 0 ? void 0 : _this$plannerConfig$c4.logoUrl;
+              actBasket.PrintRetailLogo = (_this$plannerConfig$c6 = this.plannerConfig.currentOrganization) === null || _this$plannerConfig$c6 === void 0 ? void 0 : _this$plannerConfig$c6.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: true,
+                awaitPDF: returnTo == 'SAVE_BASKET_ASYNC' ? false : 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()
@@ -42226,7 +42188,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-e129a977.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-bf4b2af0.js'); });
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -42234,7 +42196,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-c8131605.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-1b4c240f.js'); });
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -42242,7 +42204,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-1e030846.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-e4e0835e.js'); });
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -42250,7 +42212,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-cfe94d8b.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-7d3feb60.js'); });
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -43674,7 +43636,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-96aeeba6.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-7a424c6f.js'); });
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -45427,7 +45389,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context4.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-f6aa5074.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-6839d35f.js'); });
             case 10:
               _yield$import = _context4.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -45438,7 +45400,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context4.abrupt("break", 21);
             case 15:
               _context4.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-176808cf.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-a83ddf2d.js'); });
             case 17:
               _yield$import2 = _context4.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -47288,7 +47250,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               this.api.setState(this.state);
               this.ReturnTo = this.plannerConfig.returnTo;
               LOG$1.startTransaction({
-                event: 'onInitializeConfigurator',
+                event: cache !== undefined ? 'onReinitializeConfigurator' : 'onInitializeConfigurator',
                 message: 'Loading Basket',
                 eventId: 'LOADING_BASKET',
                 warningTime: 2000,
@@ -47303,11 +47265,13 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               return this.divaBasketHandler.initializeBasket(this.api);
             case 12:
               loadSuccessful = _context14.sent;
-              if (this.plannerConfig.configuratorSessionId === undefined && (!this.divaBasketHandler.hasConfiguratorSessionIdGetter || DivaUtils__default["default"].businessMetrics.getConfiguratorSessionId() === undefined)) {
-                DivaUtils__default["default"].businessMetrics.setConfiguratorSessionId();
-              } else if (this.plannerConfig.configuratorSessionId) {
+              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;
@@ -48550,7 +48514,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 : 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 : _context28.t3 === 'SAVE_BASKET_ASYNC' ? 32 : 52;
               break;
             case 27:
               (_this$actions34 = this.actions) === null || _this$actions34 === void 0 || _this$actions34.openComponent({
@@ -48909,8 +48873,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "doAllowSetPlanner",
     value: function doAllowSetPlanner() {
-      var _this$returnTo, _this$divaBasketHandl3;
-      return this.api.doAllowSetPlanner() || ((_this$returnTo = this.returnTo) === null || _this$returnTo === void 0 ? void 0 : _this$returnTo.startsWith('SETPLANNER')) || !!((_this$divaBasketHandl3 = this.divaBasketHandler) !== null && _this$divaBasketHandl3 !== void 0 && (_this$divaBasketHandl3 = _this$divaBasketHandl3.actBasket) !== null && _this$divaBasketHandl3 !== void 0 && _this$divaBasketHandl3.SetPlannerInfos);
+      var _this$api, _this$returnTo, _this$divaBasketHandl3;
+      return ((_this$api = this.api) === null || _this$api === void 0 ? void 0 : _this$api.doAllowSetPlanner()) || ((_this$returnTo = this.returnTo) === null || _this$returnTo === void 0 ? void 0 : _this$returnTo.startsWith('SETPLANNER')) || !!((_this$divaBasketHandl3 = this.divaBasketHandler) !== null && _this$divaBasketHandl3 !== void 0 && (_this$divaBasketHandl3 = _this$divaBasketHandl3.actBasket) !== null && _this$divaBasketHandl3 !== void 0 && _this$divaBasketHandl3.SetPlannerInfos);
     }
   }, {
     key: "doShow3DDimensionLines",
@@ -49252,8 +49216,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
   }, {
     key: "clearCache",
     value: function clearCache() {
-      var _this$api;
-      (_this$api = this.api) === null || _this$api === void 0 || _this$api.clearCache();
+      var _this$api2;
+      (_this$api2 = this.api) === null || _this$api2 === void 0 || _this$api2.clearCache();
       this.divaCatalogs = {};
     }
   }, {

package/build/cjs/index.js

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