@crystaldesign/web-planner-logic 26.8.0-beta.4 → 26.8.0-beta.41

package/build/esm/{index-2d218fcd.js → index-e386b6fa.js}

@@ -75,6 +75,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
     _defineProperty(this, "actions", void 0);
     _defineProperty(this, "state", void 0);
     _defineProperty(this, "i18n", void 0);
+    _defineProperty(this, "enricherErrorModalShown", false);
     _defineProperty(this, "getSessionGuid", void 0);
     _defineProperty(this, "useEkPrices", false);
     _defineProperty(this, "smSupplierNr", undefined);
@@ -215,10 +216,12 @@ var DivaApiHandler = /*#__PURE__*/function () {
             case 38:
               _context.prev = 38;
               _context.t5 = _context["catch"](5);
+              // Check if this is a rate limiting error (429)
+              this.notifyEnricherError(url, dontLogError);
               throw Error('fetch failed! ' + url + ' Error: ' + _context.t5, {
                 cause: _context.t5 === null || _context.t5 === void 0 || (_e$response = _context.t5.response) === null || _e$response === void 0 || (_e$response = _e$response.data) === null || _e$response === void 0 ? void 0 : _e$response.error
               });
-            case 41:
+            case 42:
             case "end":
               return _context.stop();
           }
@@ -229,11 +232,57 @@ var DivaApiHandler = /*#__PURE__*/function () {
       }
       return fetchData;
     }()
+    /**
+     * Surface critical failures to the user. A hard failure of any enricher call (catalog / serie /
+     * items / decisions / features ...) leaves the planner unable to load, so give the user actionable
+     * feedback instead of a silently broken UI. Optional enricher calls (e.g. the catalog mask) pass
+     * `dontLogError` and are skipped. Only one modal is shown at a time to avoid stacking on parallel failures.
+     */
+  }, {
+    key: "notifyEnricherError",
+    value: function notifyEnricherError(url, dontLogError) {
+      var _this$apiConfig,
+        _this$apiConfig2,
+        _this$apiConfig3,
+        _this$apiConfig4,
+        _this$apiConfig5,
+        _this$actions,
+        _this$i18n,
+        _translate$t,
+        _translate$t2,
+        _translate$t3,
+        _this = this;
+      if (dontLogError || this.enricherErrorModalShown) return;
+      var services = [(_this$apiConfig = this.apiConfig) === null || _this$apiConfig === void 0 ? void 0 : _this$apiConfig.enricherService, (_this$apiConfig2 = this.apiConfig) === null || _this$apiConfig2 === void 0 ? void 0 : _this$apiConfig2.idmService, (_this$apiConfig3 = this.apiConfig) === null || _this$apiConfig3 === void 0 ? void 0 : _this$apiConfig3.api2["default"], (_this$apiConfig4 = this.apiConfig) === null || _this$apiConfig4 === void 0 ? void 0 : _this$apiConfig4.api2.web, (_this$apiConfig5 = this.apiConfig) === null || _this$apiConfig5 === void 0 ? void 0 : _this$apiConfig5.api2.ek];
+      if (!services.some(function (service) {
+        return service && url.startsWith(service);
+      })) return;
+      if (!((_this$actions = this.actions) !== null && _this$actions !== void 0 && _this$actions.openModal)) return;
+      this.enricherErrorModalShown = true;
+      var translate = (_this$i18n = this.i18n) === null || _this$i18n === void 0 ? void 0 : _this$i18n.call(this);
+      this.actions.openModal({
+        title: (_translate$t = translate === null || translate === void 0 ? void 0 : translate.t('modals.error_accured')) !== null && _translate$t !== void 0 ? _translate$t : 'An error occured. Please try again later.',
+        accept: (_translate$t2 = translate === null || translate === void 0 ? void 0 : translate.t('modals.reload_page')) !== null && _translate$t2 !== void 0 ? _translate$t2 : 'Reload',
+        reject: (_translate$t3 = translate === null || translate === void 0 ? void 0 : translate.t('modals.close')) !== null && _translate$t3 !== void 0 ? _translate$t3 : 'Close',
+        callback: function callback(accepted) {
+          _this.enricherErrorModalShown = false;
+          if (accepted === true) {
+            if (_this.getApplicationEnvironment() === 'WEB' && typeof window !== 'undefined') window.location.reload();
+          } else if (accepted === false) {
+            var _this$actions2, _this$actions3;
+            (_this$actions2 = _this.actions) === null || _this$actions2 === void 0 || _this$actions2.onEvent({
+              type: 'onWebPlanerClose'
+            });
+            (_this$actions3 = _this.actions) === null || _this$actions3 === void 0 || _this$actions3.closeComponentInFullscreen();
+          }
+        }
+      });
+    }
   }, {
     key: "getDataWithoutCache",
     value: function () {
       var _getDataWithoutCache = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(queryString, init, useWebServiceApi) {
-        var _this$apiConfig, _this$apiConfig2, api2Url;
+        var _this$apiConfig6, _this$apiConfig7, api2Url;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -275,8 +324,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
               _context2.next = 24;
               break;
             case 14:
-              api2Url = (_this$apiConfig = this.apiConfig) === null || _this$apiConfig === void 0 ? void 0 : _this$apiConfig.api2["default"];
-              if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig2 = this.apiConfig) !== null && _this$apiConfig2 !== void 0 && _this$apiConfig2.api2.web) {
+              api2Url = (_this$apiConfig6 = this.apiConfig) === null || _this$apiConfig6 === void 0 ? void 0 : _this$apiConfig6.api2["default"];
+              if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig7 = this.apiConfig) !== null && _this$apiConfig7 !== void 0 && _this$apiConfig7.api2.web) {
                 api2Url = this.apiConfig.api2.web;
               }
               _context2.t0 = _objectSpread$q;
@@ -311,7 +360,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
     value: function () {
       var _getDataCache = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(queryString, cacheMD5, accountSessionGuid, useWebServiceApi, method, data, dontLogError) {
         var _this$divaWebConfigDa, _this$divaWebConfigDa2;
-        var myQS, url, init, addSession, cacheHit, _this$apiConfig3, _this$apiConfig4, api2Url, resolvedSessionGuid, result, _this$divaWebConfigDa3;
+        var myQS, url, init, addSession, cacheHit, _this$apiConfig8, _this$apiConfig9, api2Url, resolvedSessionGuid, result, _this$divaWebConfigDa3;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -379,8 +428,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
               _context3.next = 35;
               break;
             case 25:
-              api2Url = (_this$apiConfig3 = this.apiConfig) === null || _this$apiConfig3 === void 0 ? void 0 : _this$apiConfig3.api2["default"];
-              if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig4 = this.apiConfig) !== null && _this$apiConfig4 !== void 0 && _this$apiConfig4.api2.web) {
+              api2Url = (_this$apiConfig8 = this.apiConfig) === null || _this$apiConfig8 === void 0 ? void 0 : _this$apiConfig8.api2["default"];
+              if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig9 = this.apiConfig) !== null && _this$apiConfig9 !== void 0 && _this$apiConfig9.api2.web) {
                 api2Url = this.apiConfig.api2.web;
               }
               this.apiCallCount += 1;
@@ -466,6 +515,10 @@ var DivaApiHandler = /*#__PURE__*/function () {
       }
       return saveAsProduct;
     }()
+    /**
+     * to run service on localhost
+     * diva3dRenderGroup :MYCCMEDIA
+     */
   }, {
     key: "initalizeWebConfigData",
     value: function initalizeWebConfigData(plannerConfig) {
@@ -540,38 +593,38 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getReportServiceUrl",
     value: function getReportServiceUrl() {
-      var _this$apiConfig$repor, _this$apiConfig5;
-      return (_this$apiConfig$repor = (_this$apiConfig5 = this.apiConfig) === null || _this$apiConfig5 === void 0 ? void 0 : _this$apiConfig5.reportService) !== null && _this$apiConfig$repor !== void 0 ? _this$apiConfig$repor : '';
+      var _this$apiConfig$repor, _this$apiConfig10;
+      return (_this$apiConfig$repor = (_this$apiConfig10 = this.apiConfig) === null || _this$apiConfig10 === void 0 ? void 0 : _this$apiConfig10.reportService) !== null && _this$apiConfig$repor !== void 0 ? _this$apiConfig$repor : '';
     }
   }, {
     key: "getDivaSupportServiceUrl",
     value: function getDivaSupportServiceUrl() {
-      var _this$apiConfig$suppo, _this$apiConfig6;
-      return (_this$apiConfig$suppo = (_this$apiConfig6 = this.apiConfig) === null || _this$apiConfig6 === void 0 ? void 0 : _this$apiConfig6.supportService) !== null && _this$apiConfig$suppo !== void 0 ? _this$apiConfig$suppo : '';
+      var _this$apiConfig$suppo, _this$apiConfig11;
+      return (_this$apiConfig$suppo = (_this$apiConfig11 = this.apiConfig) === null || _this$apiConfig11 === void 0 ? void 0 : _this$apiConfig11.supportService) !== null && _this$apiConfig$suppo !== void 0 ? _this$apiConfig$suppo : '';
     }
   }, {
     key: "getDivaMediaServiceUrl",
     value: function getDivaMediaServiceUrl() {
-      var _this$apiConfig$media, _this$apiConfig7;
-      return (_this$apiConfig$media = (_this$apiConfig7 = this.apiConfig) === null || _this$apiConfig7 === void 0 ? void 0 : _this$apiConfig7.mediaService) !== null && _this$apiConfig$media !== void 0 ? _this$apiConfig$media : '';
+      var _this$apiConfig$media, _this$apiConfig12;
+      return (_this$apiConfig$media = (_this$apiConfig12 = this.apiConfig) === null || _this$apiConfig12 === void 0 ? void 0 : _this$apiConfig12.mediaService) !== null && _this$apiConfig$media !== void 0 ? _this$apiConfig$media : '';
     }
   }, {
     key: "getDivaAiServiceUrl",
     value: function getDivaAiServiceUrl() {
-      var _this$apiConfig$aiSer, _this$apiConfig8;
-      return (_this$apiConfig$aiSer = (_this$apiConfig8 = this.apiConfig) === null || _this$apiConfig8 === void 0 ? void 0 : _this$apiConfig8.aiService) !== null && _this$apiConfig$aiSer !== void 0 ? _this$apiConfig$aiSer : '';
+      var _this$apiConfig$aiSer, _this$apiConfig13;
+      return (_this$apiConfig$aiSer = (_this$apiConfig13 = this.apiConfig) === null || _this$apiConfig13 === void 0 ? void 0 : _this$apiConfig13.aiService) !== null && _this$apiConfig$aiSer !== void 0 ? _this$apiConfig$aiSer : '';
     }
   }, {
     key: "getConstructorServiceUrl",
     value: function getConstructorServiceUrl() {
-      var _this$apiConfig$const, _this$apiConfig9;
-      return (_this$apiConfig$const = (_this$apiConfig9 = this.apiConfig) === null || _this$apiConfig9 === void 0 ? void 0 : _this$apiConfig9.constructorService) !== null && _this$apiConfig$const !== void 0 ? _this$apiConfig$const : '';
+      var _this$apiConfig$const, _this$apiConfig14;
+      return (_this$apiConfig$const = (_this$apiConfig14 = this.apiConfig) === null || _this$apiConfig14 === void 0 ? void 0 : _this$apiConfig14.constructorService) !== null && _this$apiConfig$const !== void 0 ? _this$apiConfig$const : '';
     }
   }, {
     key: "getDivaBasketServiceUrl",
     value: function getDivaBasketServiceUrl() {
-      var _this$apiConfig$baske, _this$apiConfig10;
-      return (_this$apiConfig$baske = (_this$apiConfig10 = this.apiConfig) === null || _this$apiConfig10 === void 0 ? void 0 : _this$apiConfig10.basketService) !== null && _this$apiConfig$baske !== void 0 ? _this$apiConfig$baske : '';
+      var _this$apiConfig$baske, _this$apiConfig15;
+      return (_this$apiConfig$baske = (_this$apiConfig15 = this.apiConfig) === null || _this$apiConfig15 === void 0 ? void 0 : _this$apiConfig15.basketService) !== null && _this$apiConfig$baske !== void 0 ? _this$apiConfig$baske : '';
     }
   }, {
     key: "getLoadProductBasketParams",
@@ -582,8 +635,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "get3DServerUrl",
     value: function get3DServerUrl() {
-      var _this$apiConfig$host, _this$apiConfig11;
-      return (_this$apiConfig$host = (_this$apiConfig11 = this.apiConfig) === null || _this$apiConfig11 === void 0 ? void 0 : _this$apiConfig11.host3d) !== null && _this$apiConfig$host !== void 0 ? _this$apiConfig$host : '';
+      var _this$apiConfig$host, _this$apiConfig16;
+      return (_this$apiConfig$host = (_this$apiConfig16 = this.apiConfig) === null || _this$apiConfig16 === void 0 ? void 0 : _this$apiConfig16.host3d) !== null && _this$apiConfig$host !== void 0 ? _this$apiConfig$host : '';
     }
   }, {
     key: "doCheckForProductsPrice",
@@ -652,9 +705,9 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getBaseUrl",
     value: function getBaseUrl() {
-      var _this$apiConfig12, _this$apiConfig13;
-      var url = (_this$apiConfig12 = this.apiConfig) === null || _this$apiConfig12 === void 0 ? void 0 : _this$apiConfig12.api2["default"];
-      if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig13 = this.apiConfig) !== null && _this$apiConfig13 !== void 0 && _this$apiConfig13.api2.web) {
+      var _this$apiConfig17, _this$apiConfig18;
+      var url = (_this$apiConfig17 = this.apiConfig) === null || _this$apiConfig17 === void 0 ? void 0 : _this$apiConfig17.api2["default"];
+      if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig18 = this.apiConfig) !== null && _this$apiConfig18 !== void 0 && _this$apiConfig18.api2.web) {
         url = this.apiConfig.api2.web;
       }
       if (!url) throw new Error('No API2 defined');
@@ -770,14 +823,14 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "getI18n",
     value: function getI18n() {
-      var _this$i18n;
-      return (_this$i18n = this.i18n) === null || _this$i18n === void 0 ? void 0 : _this$i18n.call(this);
+      var _this$i18n2;
+      return (_this$i18n2 = this.i18n) === null || _this$i18n2 === void 0 ? void 0 : _this$i18n2.call(this);
     }
   }, {
     key: "setAccountSessionGuid",
     value: function () {
       var _setAccountSessionGuid = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref) {
-        var os, accountGuid, catalogGuid, response, _this$actions, _this$state$navigatio, _this$state;
+        var os, accountGuid, catalogGuid, response, _this$actions4, _this$state$navigatio, _this$state;
         return _regeneratorRuntime.wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -816,7 +869,7 @@ var DivaApiHandler = /*#__PURE__*/function () {
               break;
             case 16:
               if (this.applicationEnvironment == 'SELLER') {
-                (_this$actions = this.actions) === null || _this$actions === void 0 || _this$actions.openComponent((_this$state$navigatio = (_this$state = this.state) === null || _this$state === void 0 || (_this$state = _this$state.navigationConfiguration) === null || _this$state === void 0 ? void 0 : _this$state.logoAction) !== null && _this$state$navigatio !== void 0 ? _this$state$navigatio : {
+                (_this$actions4 = this.actions) === null || _this$actions4 === void 0 || _this$actions4.openComponent((_this$state$navigatio = (_this$state = this.state) === null || _this$state === void 0 || (_this$state = _this$state.navigationConfiguration) === null || _this$state === void 0 ? void 0 : _this$state.logoAction) !== null && _this$state$navigatio !== void 0 ? _this$state$navigatio : {
                   type: 'SELLER',
                   parameters: {
                     module: 'Collections'
@@ -915,39 +968,39 @@ var DivaApiHandler = /*#__PURE__*/function () {
   }, {
     key: "apiUrl",
     value: function apiUrl(queryString, useWebServiceApi) {
-      var _this$apiConfig24, _this$apiConfig25, _this$apiConfig26;
+      var _this$apiConfig29, _this$apiConfig30, _this$apiConfig31;
       if (useWebServiceApi == 'catalog') {
-        var _this$apiConfig14, _this$apiConfig15;
-        if (!((_this$apiConfig14 = this.apiConfig) !== null && _this$apiConfig14 !== void 0 && _this$apiConfig14.catalogService)) throw new Error('No catalog Service defined');
-        return ((_this$apiConfig15 = this.apiConfig) === null || _this$apiConfig15 === void 0 ? void 0 : _this$apiConfig15.catalogService) + queryString;
+        var _this$apiConfig19, _this$apiConfig20;
+        if (!((_this$apiConfig19 = this.apiConfig) !== null && _this$apiConfig19 !== void 0 && _this$apiConfig19.catalogService)) throw new Error('No catalog Service defined');
+        return ((_this$apiConfig20 = this.apiConfig) === null || _this$apiConfig20 === void 0 ? void 0 : _this$apiConfig20.catalogService) + queryString;
       }
       if (useWebServiceApi == 'basket') {
-        var _this$apiConfig16, _this$apiConfig17;
-        if (!((_this$apiConfig16 = this.apiConfig) !== null && _this$apiConfig16 !== void 0 && _this$apiConfig16.basketService)) throw new Error('No basket Service defined');
-        return ((_this$apiConfig17 = this.apiConfig) === null || _this$apiConfig17 === void 0 ? void 0 : _this$apiConfig17.basketService) + queryString;
+        var _this$apiConfig21, _this$apiConfig22;
+        if (!((_this$apiConfig21 = this.apiConfig) !== null && _this$apiConfig21 !== void 0 && _this$apiConfig21.basketService)) throw new Error('No basket Service defined');
+        return ((_this$apiConfig22 = this.apiConfig) === null || _this$apiConfig22 === void 0 ? void 0 : _this$apiConfig22.basketService) + queryString;
       }
       if (useWebServiceApi == 'report') {
-        var _this$apiConfig18, _this$apiConfig19;
-        if (!((_this$apiConfig18 = this.apiConfig) !== null && _this$apiConfig18 !== void 0 && _this$apiConfig18.reportService)) throw new Error('No report Service defined');
-        return ((_this$apiConfig19 = this.apiConfig) === null || _this$apiConfig19 === void 0 ? void 0 : _this$apiConfig19.reportService) + queryString;
+        var _this$apiConfig23, _this$apiConfig24;
+        if (!((_this$apiConfig23 = this.apiConfig) !== null && _this$apiConfig23 !== void 0 && _this$apiConfig23.reportService)) throw new Error('No report Service defined');
+        return ((_this$apiConfig24 = this.apiConfig) === null || _this$apiConfig24 === void 0 ? void 0 : _this$apiConfig24.reportService) + queryString;
       }
       if (useWebServiceApi == 'enricher') {
-        var _this$apiConfig22, _this$apiConfig23;
+        var _this$apiConfig27, _this$apiConfig28;
         if (this.useIDMService) {
-          var _this$apiConfig20, _this$apiConfig21;
-          if (!((_this$apiConfig20 = this.apiConfig) !== null && _this$apiConfig20 !== void 0 && _this$apiConfig20.idmService)) throw new Error('No report Service defined');
-          return ((_this$apiConfig21 = this.apiConfig) === null || _this$apiConfig21 === void 0 ? void 0 : _this$apiConfig21.idmService) + queryString;
+          var _this$apiConfig25, _this$apiConfig26;
+          if (!((_this$apiConfig25 = this.apiConfig) !== null && _this$apiConfig25 !== void 0 && _this$apiConfig25.idmService)) throw new Error('No report Service defined');
+          return ((_this$apiConfig26 = this.apiConfig) === null || _this$apiConfig26 === void 0 ? void 0 : _this$apiConfig26.idmService) + queryString;
         }
-        if (!((_this$apiConfig22 = this.apiConfig) !== null && _this$apiConfig22 !== void 0 && _this$apiConfig22.enricherService)) throw new Error('No report Service defined');
-        return ((_this$apiConfig23 = this.apiConfig) === null || _this$apiConfig23 === void 0 ? void 0 : _this$apiConfig23.enricherService) + queryString;
+        if (!((_this$apiConfig27 = this.apiConfig) !== null && _this$apiConfig27 !== void 0 && _this$apiConfig27.enricherService)) throw new Error('No report Service defined');
+        return ((_this$apiConfig28 = this.apiConfig) === null || _this$apiConfig28 === void 0 ? void 0 : _this$apiConfig28.enricherService) + queryString;
       }
-      var url = (_this$apiConfig24 = this.apiConfig) === null || _this$apiConfig24 === void 0 ? void 0 : _this$apiConfig24.api2["default"];
-      if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig25 = this.apiConfig) !== null && _this$apiConfig25 !== void 0 && _this$apiConfig25.api2.web) {
+      var url = (_this$apiConfig29 = this.apiConfig) === null || _this$apiConfig29 === void 0 ? void 0 : _this$apiConfig29.api2["default"];
+      if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig30 = this.apiConfig) !== null && _this$apiConfig30 !== void 0 && _this$apiConfig30.api2.web) {
         url = this.apiConfig.api2.web;
       }
-      if (this.useEkPrices && (_this$apiConfig26 = this.apiConfig) !== null && _this$apiConfig26 !== void 0 && _this$apiConfig26.api2.ek) {
-        var _this$apiConfig27;
-        url = (_this$apiConfig27 = this.apiConfig) === null || _this$apiConfig27 === void 0 ? void 0 : _this$apiConfig27.api2.ek;
+      if (this.useEkPrices && (_this$apiConfig31 = this.apiConfig) !== null && _this$apiConfig31 !== void 0 && _this$apiConfig31.api2.ek) {
+        var _this$apiConfig32;
+        url = (_this$apiConfig32 = this.apiConfig) === null || _this$apiConfig32 === void 0 ? void 0 : _this$apiConfig32.api2.ek;
       }
       if (!url) throw new Error('No API2 defined');
       return url + '?' + queryString;
@@ -1153,6 +1206,11 @@ var DivaApiHandler = /*#__PURE__*/function () {
     value: function getIDMDecisions(packageId, decisions) {
       return this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/decisions' + '?decisionNos=' + decisions.join(';') + (this.smSupplierNr ? '&supplierNo=' + this.smSupplierNr : '');
     }
+  }, {
+    key: "getIDMDecisionsQueryUrl",
+    value: function getIDMDecisionsQueryUrl(packageId) {
+      return this.idmPrefix + (this.isSeller ? '/packages/' : '/catalogs/') + packageId + '/decisions/query' + (this.smSupplierNr ? '?supplierNo=' + this.smSupplierNr : '');
+    }
   }, {
     key: "getIDMDetailInfos",
     value: function getIDMDetailInfos(packageId, detailinfos) {
@@ -1494,12 +1552,12 @@ var DivaApiHandler = /*#__PURE__*/function () {
     key: "getDimensionbyId",
     value: function () {
       var _getDimensionbyId = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee15(id, iln, catalogCodex, plannedOptions) {
-        var _this$apiConfig28;
+        var _this$apiConfig33;
         var fullUrl, res, headers;
         return _regeneratorRuntime.wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              fullUrl = this.getConstructorServiceUrl() + '/dimension/' + id + '?iln=' + iln + '&catalogCodex=' + catalogCodex + '&debug=' + ((_this$apiConfig28 = this.apiConfig) === null || _this$apiConfig28 === void 0 ? void 0 : _this$apiConfig28.useDebugUrl);
+              fullUrl = this.getConstructorServiceUrl() + '/dimension/' + id + '?iln=' + iln + '&catalogCodex=' + catalogCodex + '&debug=' + ((_this$apiConfig33 = this.apiConfig) === null || _this$apiConfig33 === void 0 ? void 0 : _this$apiConfig33.useDebugUrl);
               headers = {};
               if (this.jwt) headers = {
                 Authorization: 'Bearer ' + this.jwt
@@ -16871,6 +16929,9 @@ var CatalogArticleData = /*#__PURE__*/function () {
         case 'ACCESSOIRE_POS_PRIO':
           this._catalogArticle.accPosPrio = Number(prop.Value);
           break;
+        case 'ADD_AS_ZKAT':
+          this._catalogArticle.addAsZKAT = prop.Value === 'true' || prop.Value === '1';
+          break;
         case 'HEIGHTGRIDUSED':
           this._catalogArticle.heightGridUsed = Number(prop.Value);
           break;
@@ -17332,6 +17393,11 @@ var CatalogArticleData = /*#__PURE__*/function () {
     get: function get() {
       return this._catalogArticle.accPosPrio;
     }
+  }, {
+    key: "addAsZKAT",
+    get: function get() {
+      return this._catalogArticle.addAsZKAT;
+    }
   }, {
     key: "overwriteParentWidth",
     get: function get() {
@@ -17979,18 +18045,18 @@ function getCatalogOptionValueDataType(codex, jsonOPV, catalogData) {
 }
 function initCatalogPlannerArticleView$1(catalogData, catPlanArticle, catalogProps, plannerPaletteViewInfo) {
   //Hier muss es dann reingespeichert werden catalogPlannerArticlesView;
-  var getFilterType = function getFilterType(hasArticleRelation, AVLFilter, AVRFilter, catalogProps) {
+  var getFilterType = function getFilterType(hasArticleRelation, hasAVL, hasAVR, catalogProps) {
     var ret;
     if (hasArticleRelation) {
       if (!catalogProps.showAllItemsInPlanner && !catalogProps.showAccOnDpOnly) plannerPaletteViewInfo.filterType['Accessoire'] = true;
       ret = 'Accessoire';
-    } else if (AVLFilter.length > 0 && AVRFilter.length > 0) {
+    } else if (hasAVL && hasAVR) {
       if (!catalogProps.showAllItemsInPlanner) plannerPaletteViewInfo.filterType['DockLR'] = true;
       ret = 'DockLR';
-    } else if (AVLFilter.length > 0) {
+    } else if (hasAVL) {
       if (!catalogProps.showAllItemsInPlanner) plannerPaletteViewInfo.filterType['DockR'] = true;
       ret = 'DockR';
-    } else if (AVRFilter.length > 0) {
+    } else if (hasAVR) {
       if (!catalogProps.showAllItemsInPlanner) plannerPaletteViewInfo.filterType['DockL'] = true;
       ret = 'DockL';
     } else {
@@ -18084,12 +18150,9 @@ function initCatalogPlannerArticleView$1(catalogData, catPlanArticle, catalogPro
         if (catalogProps.diva3dPlanerShowArticleAsSvg && topSvg.SVG) {
           image = getSVGUrl(topSvg.SVG, mediaUrl);
         }
-        if (topSvg.HasAVL && catPlanArticle.avlFilter.length == 0) {
-          catPlanArticle.avlFilter = ['ALWAYS_DOCKABLE'];
-        }
-        if (topSvg.HasAVR && catPlanArticle.avrFilter.length == 0) {
-          catPlanArticle.avrFilter = ['ALWAYS_DOCKABLE'];
-        }
+
+        // An empty AVL/AVR filter means "no connector restriction" and is treated as a match by the
+        // docking/palette comparison (see checkDPFilterDoMatch / checkDPAV*FilterDoMatch). No sentinel needed.
 
         //Wäre für Rofl Benz gedacht um die Information zu speichern welche Artikel in welcher Ausrichtung ausmultipliziert werden
         if (topSvg.JsFormula.includes('202_LI')) {
@@ -18097,7 +18160,7 @@ function initCatalogPlannerArticleView$1(catalogData, catPlanArticle, catalogPro
         } else if (topSvg.JsFormula.includes('202_RE')) {
           elementName = elementName + ' (Rechts)';
         }
-        var filterType = getFilterType(catPlanArticle.isArticleRelation, topSvg.HasAVL ? catPlanArticle.avlFilter : [], topSvg.HasAVR ? catPlanArticle.avrFilter : [], catalogProps);
+        var filterType = getFilterType(catPlanArticle.isArticleRelation, !!topSvg.HasAVL, !!topSvg.HasAVR, catalogProps);
         catPlanArticle.filterType = filterType;
         //ausmultiplizierte Elemente (über meherere SVGs)
         var catPlanArtView = {
@@ -18150,7 +18213,7 @@ function initCatalogPlannerArticleView$1(catalogData, catPlanArticle, catalogPro
   }
   if (!catPlanArticle.hasTopSvgsWithFormula || catPlanArticle.topSvgsWithFormula.length == 1) {
     var _catalogArticle$artic2;
-    var _filterType = getFilterType(catPlanArticle.isArticleRelation, catPlanArticle.topHasAVL ? catPlanArticle.avlFilter : [], catPlanArticle.topHasAVR ? catPlanArticle.avrFilter : [], catalogProps);
+    var _filterType = getFilterType(catPlanArticle.isArticleRelation, !!catPlanArticle.topHasAVL, !!catPlanArticle.topHasAVR, catalogProps);
     catPlanArticle.filterType = _filterType;
     //Artikelbild ist abh�ngig von DIVA3DPlanerShowArticleAsSvg das SVG des Elements
     if (catalogProps.diva3dPlanerShowArticleAsSvg && (catPlanArticle.hasTopSvg || catPlanArticle.hasTopSvgsWithFormula)) {
@@ -19693,7 +19756,15 @@ function _loadMoreFromIDMArticles() {
           }).map(function (a) {
             return a.featureClassRefNo;
           })));
-          promises = [set.api.getDataCache(set.api.getIDMFeatureClass(set.CatalogData.accountGuid, toLoadFeatureClassRefNo), undefined, undefined, 'enricher'), toLoadPFGroups.length ? set.api.getDataCache(set.api.getIDMPriceFeatureGroups(set.CatalogData.accountGuid, toLoadPFGroups), undefined, undefined, 'enricher') : undefined, toLoadDecisionIds.length ? set.api.getDataCache(set.api.getIDMDecisions(set.CatalogData.accountGuid, toLoadDecisionIds), undefined, undefined, 'enricher') : undefined];
+          promises = [set.api.getDataCache(set.api.getIDMFeatureClass(set.CatalogData.accountGuid, toLoadFeatureClassRefNo), undefined, undefined, 'enricher'), toLoadPFGroups.length ? set.api.getDataCache(set.api.getIDMPriceFeatureGroups(set.CatalogData.accountGuid, toLoadPFGroups), undefined, undefined, 'enricher') : undefined, toLoadDecisionIds.length ? function () {
+            var getUrl = set.api.getIDMDecisions(set.CatalogData.accountGuid, toLoadDecisionIds);
+            if (getUrl.length > 2000) {
+              return set.api.getDataCache(set.api.getIDMDecisionsQueryUrl(set.CatalogData.accountGuid), undefined, undefined, 'enricher', 'POST', {
+                decisionNos: toLoadDecisionIds.join(';')
+              });
+            }
+            return set.api.getDataCache(getUrl, undefined, undefined, 'enricher');
+          }() : undefined];
           _context5.next = 16;
           return Promise.all(promises);
         case 16:
@@ -20322,9 +20393,12 @@ function initIDMArticles(jsonItems, catalogData) {
   }
 }
 function getCatalogArticle(article, catalogData) {
-  var _catalogData$catalogM, _article$typeKey, _article$salesNumber, _ref, _articleMask$name, _article$fullText, _article$fullText2, _article$fullText3, _articleMask$properti, _article$depthBasicSh, _article$depthBasicSh2, _article$depthBasicSh3, _article$widthBasicSh, _article$widthBasicSh2, _article$widthBasicSh3, _article$heightBasicS, _article$heightBasicS2, _article$heightBasicS3, _article$weightNetto, _article$detailInfos, _article$detailInfos2, _article$detailInfos3, _articleMask$groupnam, _articleMask$groupnam2;
+  var _catalogData$catalogM, _article$typeKey, _article$salesNumber, _articleMask$name, _articleMask$properti, _article$depthBasicSh, _article$depthBasicSh2, _article$depthBasicSh3, _article$widthBasicSh, _article$widthBasicSh2, _article$widthBasicSh3, _article$heightBasicS, _article$heightBasicS2, _article$heightBasicS3, _article$weightNetto, _article$detailInfos, _article$detailInfos2, _article$detailInfos3, _articleMask$groupnam, _articleMask$groupnam2;
   var articleMask = (_catalogData$catalogM = catalogData.catalogMask) === null || _catalogData$catalogM === void 0 || (_catalogData$catalogM = _catalogData$catalogM.articles) === null || _catalogData$catalogM === void 0 ? void 0 : _catalogData$catalogM[article.typeNo];
   var lang = catalogData.api.getLanguageLowercase();
+  // empty locale objects ({} or only empty strings) are truthy, so ?? alone doesn't fall back
+  var fullText = hasLocaleText(article.fullText) ? article.fullText : article.shortText;
+  var shortText = hasLocaleText(article.shortText) ? article.shortText : article.fullText;
   var featureProperties = convertProperties(article.properties, lang, 'featureNos');
   var optionProperties = convertProperties(article.properties, lang, 'optionKeys');
   return {
@@ -20347,14 +20421,14 @@ function getCatalogArticle(article, catalogData) {
     hasArticleRelations: false,
     hasPartlistArticle: !!article.partListRef,
     hasType1Dependencies: false,
-    name: DivaUtils.getLocals((_ref = (_articleMask$name = articleMask === null || articleMask === void 0 ? void 0 : articleMask.name) !== null && _articleMask$name !== void 0 ? _articleMask$name : article.fullText) !== null && _ref !== void 0 ? _ref : article.shortText, lang),
-    longDescription: DivaUtils.getLocals((_article$fullText = article.fullText) !== null && _article$fullText !== void 0 ? _article$fullText : article.shortText, lang),
-    longDescription_locales: (_article$fullText2 = article.fullText) !== null && _article$fullText2 !== void 0 ? _article$fullText2 : article.shortText,
+    name: DivaUtils.getLocals((_articleMask$name = articleMask === null || articleMask === void 0 ? void 0 : articleMask.name) !== null && _articleMask$name !== void 0 ? _articleMask$name : fullText, lang),
+    longDescription: DivaUtils.getLocals(fullText, lang),
+    longDescription_locales: fullText,
     isHidden: !!(articleMask !== null && articleMask !== void 0 && articleMask.hidden),
-    origName: DivaUtils.getLocals((_article$fullText3 = article.fullText) !== null && _article$fullText3 !== void 0 ? _article$fullText3 : article.shortText, lang),
-    shortName: DivaUtils.getLocals(article.shortText, lang),
-    origShortName: DivaUtils.getLocals(article.shortText, lang),
-    shortName_locales: article.shortText,
+    origName: DivaUtils.getLocals(fullText, lang),
+    shortName: DivaUtils.getLocals(shortText, lang),
+    origShortName: DivaUtils.getLocals(shortText, lang),
+    shortName_locales: shortText,
     properties: [].concat(_toConsumableArray(convertProperties(article.properties, lang)), _toConsumableArray((_articleMask$properti = articleMask === null || articleMask === void 0 ? void 0 : articleMask.properties) !== null && _articleMask$properti !== void 0 ? _articleMask$properti : [])),
     optionProperties: optionProperties,
     featureProperties: featureProperties,
@@ -20414,6 +20488,11 @@ function getCatalogArticle(article, catalogData) {
     modelName3D: jsonArticle.ModelName3D && jsonArticle.ModelName3D != '' ? jsonArticle.ModelName3D : undefined,
 */
 
+function hasLocaleText(locales) {
+  return !!locales && Object.values(locales).some(function (v) {
+    return !!(v !== null && v !== void 0 && v.trim());
+  });
+}
 function getLowResUrl(url) {
   return url === null || url === void 0 ? void 0 : url.replace('.jpg', '_low.jpg').replace('.jpeg', '_low.jpeg').replace('.png', '_low.png');
 }
@@ -20654,6 +20733,8 @@ var DivaCatalogData = /*#__PURE__*/function () {
       //
       ignoreLayerAVNAVS: false,
       //
+      ignoreDockingNumber: false,
+      //                                  ignoriert die Nummern-Regel beim Andocken (z.B. AVU1 darf an AVO2). Die Nummer dient dann nur der Identifikation, nicht als Zuordnungsschlüssel.
       checkCollisionForDifferentLayers: [],
       //
 
@@ -21199,6 +21280,24 @@ var DivaCatalogData = /*#__PURE__*/function () {
         return _ret;
       }
     }
+
+    /**
+     * Default dock filter applied when nothing is selected (e.g. after a deselect or when adding a new element).
+     * When completeness warnings are hidden, any element may start a planning, so every dock type the catalog
+     * actually has is shown. Otherwise the catalog's configured start filter (startFilterParams / available
+     * start types) is used.
+     */
+  }, {
+    key: "defaultDockFilter",
+    get: function get() {
+      if (this.doHideCompletenessWarning) {
+        var filterType = this.plannerPaletteViewInfo.filterType;
+        return Object.keys(filterType).filter(function (key) {
+          return filterType[key];
+        });
+      }
+      return this.getStartFilter;
+    }
   }, {
     key: "dontHideOption",
     get: function get() {
@@ -21688,6 +21787,7 @@ var DivaCatalogData = /*#__PURE__*/function () {
         ignoreLayerAVC: this.catalogProps.ignoreLayerAVC,
         ignoreLayerAVOAVU: this.catalogProps.ignoreLayerAVOAVU,
         ignoreLayerAVNAVS: this.catalogProps.ignoreLayerAVNAVS,
+        ignoreDockingNumber: this.catalogProps.ignoreDockingNumber,
         showAccOnDpOnly: this.catalogProps.showAccOnDpOnly,
         dockAccOnAvoOnly: this.catalogProps.dockAccOnAvoOnly,
         hideAccessoriesInPlanner: this.catalogProps.accessorieStepAsPlanner,
@@ -21847,6 +21947,9 @@ var DivaCatalogData = /*#__PURE__*/function () {
           case 'IGNORELAYERAVNAVS':
             _this4.catalogProps.ignoreLayerAVNAVS = item.Value == '1';
             break;
+          case 'IGNOREDOCKINGNUMBER':
+            _this4.catalogProps.ignoreDockingNumber = item.Value == '1';
+            break;
           case 'CHECK_COLLISION_DIFFERENT_LAYERS':
             _this4.catalogProps.checkCollisionForDifferentLayers = item.Value.split(';').map(function (t) {
               return parseInt(t);
@@ -22303,11 +22406,12 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
     key: "loadDivaCatalog",
     value: function () {
       var _loadDivaCatalog = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(state, catalogCodex, orderSet) {
+        var _orderSet$OrderLines;
         var promises, _yield$Promise$all, _yield$Promise$all2, catalogApiData, catalogArticleListData, catalogArticlePlannerListData, additionalModelInfos, mask, _state$catalogMask, catalogData;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              promises = [state.api.getDataCache(state.api.getCatalogDataQS(catalogCodex), state.api.getCatalogDataCacheKey(catalogCodex), orderSet.AccountSessionGUID), state.api.getDataCache(state.api.getJsonArticleListQS(catalogCodex), state.api.getJsonArticleListCacheKey(catalogCodex), orderSet.AccountSessionGUID), state.api.getDataCache(state.api.getJsonPlannerElementsQS(catalogCodex), state.api.getJsonPlannerElementsCacheKey(catalogCodex), orderSet.AccountSessionGUID)].concat([this.loadAdditionalModelInfos(state, orderSet.AccountGUID, orderSet.CatalogGUID)], _toConsumableArray(state.onlyRunLogic ? [] : _toConsumableArray(new Map(orderSet.OrderLines.filter(function (ol) {
+              promises = [state.api.getDataCache(state.api.getCatalogDataQS(catalogCodex), state.api.getCatalogDataCacheKey(catalogCodex), orderSet.AccountSessionGUID), state.api.getDataCache(state.api.getJsonArticleListQS(catalogCodex), state.api.getJsonArticleListCacheKey(catalogCodex), orderSet.AccountSessionGUID), state.api.getDataCache(state.api.getJsonPlannerElementsQS(catalogCodex), state.api.getJsonPlannerElementsCacheKey(catalogCodex), orderSet.AccountSessionGUID)].concat([this.loadAdditionalModelInfos(state, orderSet.AccountGUID, orderSet.CatalogGUID)], _toConsumableArray(state.onlyRunLogic ? [] : _toConsumableArray(new Map(((_orderSet$OrderLines = orderSet.OrderLines) !== null && _orderSet$OrderLines !== void 0 ? _orderSet$OrderLines : []).filter(function (ol) {
                 var _ol$VariantBasketData;
                 return ((_ol$VariantBasketData = ol.VariantBasketDatas) === null || _ol$VariantBasketData === void 0 ? void 0 : _ol$VariantBasketData.length) && ol.ArticleType === 'OPTIONTREE';
               }).map(function (os) {
@@ -22338,7 +22442,8 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
                 break;
               }
               _context2.next = 16;
-              return state.api.getDataCache(state.api.getCatalogMaskQS(catalogApiData.GUID, state.api.OrganizationId), undefined, undefined, 'enricher');
+              return state.api.getDataCache(state.api.getCatalogMaskQS(catalogApiData.GUID, state.api.OrganizationId), undefined, undefined, 'enricher', undefined, undefined, true // optional call - failure is swallowed below, so don't surface the enricher error modal
+              );
             case 16:
               mask = _context2.sent;
             case 17:
@@ -23513,45 +23618,19 @@ var DivaEngine = /*#__PURE__*/function () {
     value: function updateIDMSpecificFeature(ops) {
       var _ops$option$idmVarian, _ops$option$idmVarian2, _ops$option$idmVarian3, _ops$option$idmVarian4, _ops$option$idmVarian5;
       if (!this.article.parentHasSameOption(ops.optionCodex)) return;
+      // The OPV codex embeds the option codex as a prefix: "OPV<body>_<connector>" (e.g. "OPV1090_CT500"),
+      // while ops.optionCodex is "OPT<body>". Strip that prefix so the filter holds the bare connector codex.
+      var toConnectorCodex = function toConnectorCodex(value) {
+        var prefix = 'OPV' + ops.optionCodex.substring(3) + '_';
+        return value.codex.startsWith(prefix) ? value.codex.substring(prefix.length) : value.codex;
+      };
       if ([90, 1090].includes((_ops$option$idmVarian = ops.option.idmVariantenArt) !== null && _ops$option$idmVarian !== void 0 ? _ops$option$idmVarian : 0)) {
         //R (Anschlusstyp R) - AVR
-        var newAVRFilter = [],
-          visibleOPVs = ops.visibleOptionValues;
-        var _iterator5 = _createForOfIteratorHelper$c(visibleOPVs),
-          _step5;
-        try {
-          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-            var _step5$value = _slicedToArray(_step5.value, 2),
-              key = _step5$value[0],
-              value = _step5$value[1];
-            newAVRFilter.push(value.codex.substring(3));
-          }
-        } catch (err) {
-          _iterator5.e(err);
-        } finally {
-          _iterator5.f();
-        }
-        this.article.newPossibleAVRFilters = newAVRFilter;
+        this.article.newPossibleAVRFilters = Array.from(ops.visibleOptionValues.values()).map(toConnectorCodex);
       }
       if ([89, 1089].includes((_ops$option$idmVarian2 = ops.option.idmVariantenArt) !== null && _ops$option$idmVarian2 !== void 0 ? _ops$option$idmVarian2 : 0)) {
         //L (Anschlusstyp L) - AVL
-        var newAVLFilter = [],
-          _visibleOPVs = ops.visibleOptionValues;
-        var _iterator6 = _createForOfIteratorHelper$c(_visibleOPVs),
-          _step6;
-        try {
-          for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-            var _step6$value = _slicedToArray(_step6.value, 2),
-              _key = _step6$value[0],
-              _value = _step6$value[1];
-            newAVLFilter.push(_value.codex.substring(3));
-          }
-        } catch (err) {
-          _iterator6.e(err);
-        } finally {
-          _iterator6.f();
-        }
-        this.article.newPossibleAVLFilters = newAVLFilter;
+        this.article.newPossibleAVLFilters = Array.from(ops.visibleOptionValues.values()).map(toConnectorCodex);
       }
       //beim article abspeichern. Das Planungselement kann es sich per Funktion von dort dann holen
       if ([97, 1097].includes((_ops$option$idmVarian3 = ops.option.idmVariantenArt) !== null && _ops$option$idmVarian3 !== void 0 ? _ops$option$idmVarian3 : 0)) {
@@ -23780,18 +23859,18 @@ var DivaEngine = /*#__PURE__*/function () {
         myDecisions[_i].disableHistory = [];
         myDecisions[_i].activeCombination = undefined;
       }
-      var _iterator7 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-        _step7;
+      var _iterator5 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+        _step5;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var ops = _step7.value;
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var ops = _step5.value;
           ops.updateVisibleOptionValues(ops.option.articleOptionValues);
           ops.definedBySetFeatureFixed = false;
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator7.f();
+        _iterator5.f();
       }
       this.catalogDecisionsByNumber = new Map(this.article.catalogArticle.articleDecisions.map(function (d) {
         return [d.Number, d];
@@ -23922,11 +24001,11 @@ var DivaEngine = /*#__PURE__*/function () {
     key: "updateIDMSpecificFeatures",
     value: function updateIDMSpecificFeatures() {
       //updaten idm planner specific options
-      var _iterator8 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-        _step8;
+      var _iterator6 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+        _step6;
       try {
-        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          var ops = _step8.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var ops = _step6.value;
           //when an option has no decisions the first visible optionValue has to be selected per default
           if (ops.val === undefined && ops.visibleCount && !this.article.CatalogData.useDiomexConfigLogic) {
             this.assignOptionValue(ops.optionCodex, ops.visibleOPVKeys[0]);
@@ -23947,9 +24026,9 @@ var DivaEngine = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator8.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator8.f();
+        _iterator6.f();
       }
     }
   }, {
@@ -24183,21 +24262,21 @@ var DivaEngine = /*#__PURE__*/function () {
                     var negatedValues = new Set(myDoc.Row[OPT].map(function (v) {
                       return v.slice(1);
                     })); // remove the '!' from the value
-                    var _iterator9 = _createForOfIteratorHelper$c(ops.visibleOptionValues),
-                      _step9;
+                    var _iterator7 = _createForOfIteratorHelper$c(ops.visibleOptionValues),
+                      _step7;
                     try {
-                      for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-                        var _step9$value = _slicedToArray(_step9.value, 2),
-                          opvKey = _step9$value[0],
-                          _opv = _step9$value[1];
+                      for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+                        var _step7$value = _slicedToArray(_step7.value, 2),
+                          opvKey = _step7$value[0],
+                          _opv = _step7$value[1];
                         if (!negatedValues.has(opvKey)) {
                           validOPVs[OPT].set(opvKey, _opv);
                         }
                       }
                     } catch (err) {
-                      _iterator9.e(err);
+                      _iterator7.e(err);
                     } finally {
-                      _iterator9.f();
+                      _iterator7.f();
                     }
                   } else {
                     validOPVs[OPT] = new Map(ops.visibleOptionValues);
@@ -24325,11 +24404,11 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "evalShowOnlyWhenHasPrice",
     value: function evalShowOnlyWhenHasPrice() {
-      var _iterator10 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-        _step10;
+      var _iterator8 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+        _step8;
       try {
-        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-          var ops = _step10.value;
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var ops = _step8.value;
           for (var jKey in ops.visibleOptionValues) {
             var opv = ops.visibleOptionValues.get(jKey);
             if (opv.showOnlyWhenHasPrice && opv.price == 0) {
@@ -24341,9 +24420,9 @@ var DivaEngine = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator10.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator10.f();
+        _iterator8.f();
       }
     }
 
@@ -24817,12 +24896,12 @@ var DivaEngine = /*#__PURE__*/function () {
       }
 
       //mengen und größenabhängige Preisberechungn.
-      var _iterator11 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-        _step11;
+      var _iterator9 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+        _step9;
       try {
-        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
           var _ops$addToMeasure;
-          var ops = _step11.value;
+          var ops = _step9.value;
           var OP = ops.optionCodex;
           var mUnit = ops.measureUnit;
           var pUnit = ops.priceUnit;
@@ -24905,15 +24984,15 @@ var DivaEngine = /*#__PURE__*/function () {
         }
         //jetzt nochmal prozentuelle Preise mit TargetOption berechnen
       } catch (err) {
-        _iterator11.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator11.f();
+        _iterator9.f();
       }
-      var _iterator12 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-        _step12;
+      var _iterator10 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+        _step10;
       try {
-        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-          var _ops4 = _step12.value;
+        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+          var _ops4 = _step10.value;
           var targetPPGPrefixes = _ops4.targetPPGPrefixes;
           if (!targetPPGPrefixes) continue;
           var _loop7 = function _loop7() {
@@ -24933,9 +25012,9 @@ var DivaEngine = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator12.e(err);
+        _iterator10.e(err);
       } finally {
-        _iterator12.f();
+        _iterator10.f();
       }
       for (var _i5 = 0; _i5 < this.article.priceRefs.length; _i5++) {
         var basePriceRef = this.article.priceRefs[_i5];
@@ -24947,19 +25026,19 @@ var DivaEngine = /*#__PURE__*/function () {
             return item.PPG && item.PPG.split('_')[0] == targetPrefix;
           });
           if (!priceRef) {
-            var _iterator13 = _createForOfIteratorHelper$c(_this5.article.articleOptionStates.values()),
-              _step13;
+            var _iterator11 = _createForOfIteratorHelper$c(_this5.article.articleOptionStates.values()),
+              _step11;
             try {
-              for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-                var ops = _step13.value;
+              for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+                var ops = _step11.value;
                 if (ops.ppg && ops.ppg.split('_')[0] == targetPrefix) {
                   myArtOpv = ops;
                 }
               }
             } catch (err) {
-              _iterator13.e(err);
+              _iterator11.e(err);
             } finally {
-              _iterator13.f();
+              _iterator11.f();
             }
           }
 
@@ -24985,36 +25064,36 @@ var DivaEngine = /*#__PURE__*/function () {
         myArticleBasePrice += priceRef.Price ? DivaUtils.decimalAdjust('round', (_priceRef$calcPrice = priceRef.calcPrice) !== null && _priceRef$calcPrice !== void 0 ? _priceRef$calcPrice : priceRef.Price, digits) : 0.0;
       }
       var articleUsedCalcPrice = myArticleBasePrice;
-      var _iterator14 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-        _step14;
+      var _iterator12 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+        _step12;
       try {
-        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-          var tmpOps = _step14.value;
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var tmpOps = _step12.value;
           articleUsedCalcPrice = this.getOptionPrice(articleUsedCalcPrice, tmpOps.option, digits);
         }
 
         //jetzt nochmal prozentuelle Preise mit GLOBAL tarbetoption berechnen
         /* TODO ABklären mit Franz - ops hat nie die Optionen - targetPPGPrefixes - ich glaube hier sollte article.priceRefs durchlaufen werden. */
       } catch (err) {
-        _iterator14.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator14.f();
+        _iterator12.f();
       }
-      var _iterator15 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-        _step15;
+      var _iterator13 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+        _step13;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
           var _ops5$targetPPGPrefix, _ops5$targetPPGPrefix2;
-          var _ops5 = _step15.value;
+          var _ops5 = _step13.value;
           var targetOption = (_ops5$targetPPGPrefix = (_ops5$targetPPGPrefix2 = _ops5.targetPPGPrefixes) === null || _ops5$targetPPGPrefix2 === void 0 ? void 0 : _ops5$targetPPGPrefix2[0]) !== null && _ops5$targetPPGPrefix !== void 0 ? _ops5$targetPPGPrefix : _ops5.targetOption;
           if (_ops5.isPercentage && targetOption == 'GLOBAL') {
             articleUsedCalcPrice = articleUsedCalcPrice * (1 + _ops5.calcPrice);
           }
         }
       } catch (err) {
-        _iterator15.e(err);
+        _iterator13.e(err);
       } finally {
-        _iterator15.f();
+        _iterator13.f();
       }
       for (var _i7 = 0; _i7 < this.article.priceRefs.length; _i7++) {
         var _priceRef = this.article.priceRefs[_i7];
@@ -25156,11 +25235,11 @@ var DivaEngine = /*#__PURE__*/function () {
               if (a[i].trim() != '') {
                 var searchOpt = 'OPT' + a[i].trim();
                 //Optionsbaum des Artikels durchsuchen
-                var _iterator16 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-                  _step16;
+                var _iterator14 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+                  _step14;
                 try {
-                  for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-                    var _ops6 = _step16.value;
+                  for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+                    var _ops6 = _step14.value;
                     if (_ops6.ocd == searchOpt || _ops6.optionCodex == searchOpt) {
                       if (_ops6 && _ops6.price > 0) {
                         myPercBasePrice += _ops6.price * _ops6.quantity;
@@ -25169,9 +25248,9 @@ var DivaEngine = /*#__PURE__*/function () {
                     }
                   }
                 } catch (err) {
-                  _iterator16.e(err);
+                  _iterator14.e(err);
                 } finally {
-                  _iterator16.f();
+                  _iterator14.f();
                 }
               }
             }
@@ -25217,18 +25296,18 @@ var DivaEngine = /*#__PURE__*/function () {
       }
 
       // this functions updates the images of OPVs that depend on rules
-      var _iterator17 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
-        _step17;
+      var _iterator15 = _createForOfIteratorHelper$c(this.article.articleOptionStates.values()),
+        _step15;
       try {
-        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-          var ops = _step17.value;
-          var _iterator18 = _createForOfIteratorHelper$c(ops.visibleOptionValues),
-            _step18;
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+          var ops = _step15.value;
+          var _iterator16 = _createForOfIteratorHelper$c(ops.visibleOptionValues),
+            _step16;
           try {
-            for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-              var _step18$value = _slicedToArray(_step18.value, 2),
-                jKey = _step18$value[0],
-                opv = _step18$value[1];
+            for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+              var _step16$value = _slicedToArray(_step16.value, 2),
+                jKey = _step16$value[0],
+                opv = _step16$value[1];
               if (opv.images) {
                 var imageFound = false;
                 for (var _i10 = 0; _i10 < opv.images.length; _i10++) {
@@ -25247,18 +25326,18 @@ var DivaEngine = /*#__PURE__*/function () {
               }
             }
           } catch (err) {
-            _iterator18.e(err);
+            _iterator16.e(err);
           } finally {
-            _iterator18.f();
+            _iterator16.f();
           }
         }
 
         // this function calculates an Svg to the current configuration if neccessary (SVG Tausch)
         // if the Article has no SVG Tausch nothing is done
       } catch (err) {
-        _iterator17.e(err);
+        _iterator15.e(err);
       } finally {
-        _iterator17.f();
+        _iterator15.f();
       }
       var newSVGFile = null;
       var svgChangedViaSvgTausch = false;
@@ -25889,7 +25968,7 @@ var IDMEngine = /*#__PURE__*/function () {
             } else if (!_ops4.valCodex) {
               LOG$g.warn('evalSetFeature(featureRef) decision ' + decision.decisionNo + ': referenced source feature ' + action.featureRef.featureNo + ' has no selected value (valCodex undefined) - target feature ' + action.featureNo + ' will NOT be set (price relevant)');
             } else if (!targetHasSourceValue) {
-              LOG$g.warn('evalSetFeature(featureRef) decision ' + decision.decisionNo + ': target feature ' + action.featureNo + " does not have source feature " + action.featureRef.featureNo + "'s value '" + _ops4.valCodex + "' among its visible option values - assignOptionValue will be a no-op (price relevant). Target visible values: " + (targetOps ? Array.from(targetOps.visibleOptionValues.keys()).join(', ') : '<no target>'));
+              LOG$g.warn('evalSetFeature(featureRef) decision ' + decision.decisionNo + ': target feature ' + action.featureNo + ' does not have source feature ' + action.featureRef.featureNo + "'s value '" + _ops4.valCodex + "' among its visible option values - assignOptionValue will be a no-op (price relevant). Target visible values: " + (targetOps ? Array.from(targetOps.visibleOptionValues.keys()).join(', ') : '<no target>'));
             }
             if (_ops4 !== null && _ops4 !== void 0 && _ops4.valCodex) this.assignOptionValue(action.featureNo.toString(), _ops4.valCodex, isFixed ? 'fix' : 'set');
           } else if (action.optionRef) {
@@ -26485,13 +26564,18 @@ var IDMEngine = /*#__PURE__*/function () {
     value: function updateIDMSpecificFeature(myArtOPS) {
       var _myArtOPS$option$idmV, _myArtOPS$option$idmV2, _myArtOPS$option$idmV3, _myArtOPS$option$idmV4, _myArtOPS$option$idmV5;
       if (!this.article.parentHasSameOption(myArtOPS.optionCodex)) return;
+      // The OPV key embeds the option codex as a prefix: "<optionCodex>_<connector>" (e.g. "1089_CT20").
+      // Strip the codex AND the separator so the filter holds the bare connector codex ("CT20").
+      var toConnectorCodex = function toConnectorCodex(key) {
+        return key.startsWith(myArtOPS.optionCodex + '_') ? key.substring(myArtOPS.optionCodex.length + 1) : key;
+      };
       if ([90, 1090].includes((_myArtOPS$option$idmV = myArtOPS.option.idmVariantenArt) !== null && _myArtOPS$option$idmV !== void 0 ? _myArtOPS$option$idmV : 0)) {
         //R (Anschlusstyp R) - AVR
-        this.article.newPossibleAVRFilters = myArtOPS.visibleOPVKeys;
+        this.article.newPossibleAVRFilters = myArtOPS.visibleOPVKeys.map(toConnectorCodex);
       }
       if ([89, 1089].includes((_myArtOPS$option$idmV2 = myArtOPS.option.idmVariantenArt) !== null && _myArtOPS$option$idmV2 !== void 0 ? _myArtOPS$option$idmV2 : 0)) {
         //L (Anschlusstyp L) - AVL
-        this.article.newPossibleAVLFilters = myArtOPS.visibleOPVKeys;
+        this.article.newPossibleAVLFilters = myArtOPS.visibleOPVKeys.map(toConnectorCodex);
       }
       if ([97, 1097].includes((_myArtOPS$option$idmV3 = myArtOPS.option.idmVariantenArt) !== null && _myArtOPS$option$idmV3 !== void 0 ? _myArtOPS$option$idmV3 : 0)) {
         try {
@@ -27930,6 +28014,11 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       return this.catalogArticle.bundleRules;
     }
+  }, {
+    key: "addAsZKAT",
+    get: function get() {
+      return this.catalogArticle.addAsZKAT;
+    }
   }, {
     key: "hasPartlistArticleVisibleInTree",
     get: function get() {
@@ -29534,7 +29623,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return import('./ShelfPlanner-f50e9483.js');
+              return import('./ShelfPlanner-305ae4a8.js');
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -33268,7 +33357,7 @@ var SummaryHandler = /*#__PURE__*/function () {
     }
   }, {
     key: "getSummaryItemsofArticle",
-    value: function getSummaryItemsofArticle(article, set, summaryTabItems, baseArticlesCount, summaryForBasket) {
+    value: function getSummaryItemsofArticle(article, set, summaryTabItems, baseArticlesCount, summaryForBasket, parentArticle) {
       var _iterator2 = _createForOfIteratorHelper$7(article.articleOptionStates.values()),
         _step2;
       try {
@@ -33276,6 +33365,12 @@ var SummaryHandler = /*#__PURE__*/function () {
           var ops = _step2.value;
           if (ops.visibleInSummary(article, summaryForBasket)) {
             var _set$configTree$getCo, _set$hiddenConfigTree;
+            //for accessoires only render an option if it differs from the parent article's selection
+            if (parentArticle) {
+              var _parentOps$val, _ops$val;
+              var parentOps = parentArticle.getArticleOptionState(ops.optionCodex);
+              if (parentOps && ((_parentOps$val = parentOps.val) === null || _parentOps$val === void 0 ? void 0 : _parentOps$val.codex) === ((_ops$val = ops.val) === null || _ops$val === void 0 ? void 0 : _ops$val.codex)) continue;
+            }
             var tabGroupCodex = void 0;
             var tabGroupTitel = void 0;
             if (ops.optionTabGroup) {
@@ -33292,9 +33387,9 @@ var SummaryHandler = /*#__PURE__*/function () {
             var itemsInTabGroup = summaryTabItems[tabGroupCodex].summaryItems;
             var itemImage = ops.val.image ? set.CatalogData.getCatImageURL(ops.val.image, '') : undefined;
             if (configStep && itemsInTabGroup) {
-              var _ops$val, _this$getAdditionalPr;
+              var _ops$val2, _this$getAdditionalPr;
               var sameOPVAndOPTDoAlreadyExist = false;
-              var configStepKeyToUse = configStep.key + ((_ops$val = ops.val) === null || _ops$val === void 0 ? void 0 : _ops$val.codex);
+              var configStepKeyToUse = configStep.key + ((_ops$val2 = ops.val) === null || _ops$val2 === void 0 ? void 0 : _ops$val2.codex);
               var posNr = configStep === null || configStep === void 0 ? void 0 : configStep.posNr;
               if (configStep !== null && configStep !== void 0 && configStep.accessoireArticleCodex && article.relatedToBasketId) {
                 var _set$configTree$getCo2, _set$configTree$getCo3, _set$hiddenConfigTree2;
@@ -33315,7 +33410,7 @@ var SummaryHandler = /*#__PURE__*/function () {
               var rabatt = set.getCurrentDisountPercentage();
               var price = rabatt ? DivaUtils.roundPrice(bruttoPrice * ((100 - rabatt) / 100), 1, 2) : bruttoPrice;
               if (!sameOPVAndOPTDoAlreadyExist) {
-                var _ops$val$contentItemI, _ops$val2, _ops$val3;
+                var _ops$val$contentItemI, _ops$val3, _ops$val4;
                 itemsInTabGroup[configStepKeyToUse] = {
                   title: ops.optionName,
                   title_locales: ops.optionName_locales,
@@ -33329,7 +33424,7 @@ var SummaryHandler = /*#__PURE__*/function () {
                   image: itemImage,
                   isDefined: ops.isDefined,
                   setId: set.getSetId(),
-                  contentItemId: (_ops$val$contentItemI = (_ops$val2 = ops.val) === null || _ops$val2 === void 0 ? void 0 : _ops$val2.contentItemId) !== null && _ops$val$contentItemI !== void 0 ? _ops$val$contentItemI : (_ops$val3 = ops.val) === null || _ops$val3 === void 0 ? void 0 : _ops$val3.groupContentItemId,
+                  contentItemId: (_ops$val$contentItemI = (_ops$val3 = ops.val) === null || _ops$val3 === void 0 ? void 0 : _ops$val3.contentItemId) !== null && _ops$val$contentItemI !== void 0 ? _ops$val$contentItemI : (_ops$val4 = ops.val) === null || _ops$val4 === void 0 ? void 0 : _ops$val4.groupContentItemId,
                   optionContentItemId: ops.option.contentItemId,
                   includesAllPosNrs: baseArticlesCount <= 1
                 };
@@ -33383,7 +33478,7 @@ var SummaryHandler = /*#__PURE__*/function () {
               } else {
                 var _set$i18n$t2, _set$i18n2, _accessoire$catalogAr, _accessoire$catalogAr2, _accessoire$catalogAr3;
                 var summaryItems = {};
-                this.getSummaryItemsofArticle(accessoire, set, summaryItems, 0, summaryForBasket);
+                this.getSummaryItemsofArticle(accessoire, set, summaryItems, 0, summaryForBasket, article);
                 this.addAccessoires([accessoire], summaryItems, set, articlesPosNrs, baseArticlesCount, summaryForBasket);
                 tabGroup.summaryItems[entryKey] = {
                   title: accessoire.name,
@@ -33660,14 +33755,26 @@ var SummaryHandler = /*#__PURE__*/function () {
           counter++;
           SummaryInfo.push(new GroupsData(GroupDataInitParams));
           for (var jKey in mySummaryObejct.summaryItems) {
-            var _mySummaryItem$title_, _mySummaryItem$descri, _mySummaryItem$target;
-            var mySummaryItem = mySummaryObejct.summaryItems[jKey];
-            SummaryInfo[SummaryInfo.length - 1].Group.addItem(mySummaryItem.title, (_mySummaryItem$title_ = mySummaryItem.title_locales) !== null && _mySummaryItem$title_ !== void 0 ? _mySummaryItem$title_ : {}, DivaUtils.stripTags(mySummaryItem.description), DivaUtils.stripTagsFromDict((_mySummaryItem$descri = mySummaryItem.description_locales) !== null && _mySummaryItem$descri !== void 0 ? _mySummaryItem$descri : {}), (_mySummaryItem$target = mySummaryItem.targetArticlePosNrs) !== null && _mySummaryItem$target !== void 0 ? _mySummaryItem$target : [], SummaryInfo[SummaryInfo.length - 1].Group.GroupID, mySummaryItem.image);
+            this.addSummaryItemToGroup(SummaryInfo[SummaryInfo.length - 1].Group, mySummaryObejct.summaryItems[jKey]);
           }
         }
       }
       return SummaryInfo;
     }
+  }, {
+    key: "addSummaryItemToGroup",
+    value: function addSummaryItemToGroup(group, summaryItem) {
+      //tab-group shells only structure the nested config; skip them so they don't become empty property lines
+      if (!summaryItem.isTabGroup) {
+        var _summaryItem$title_lo, _summaryItem$descript, _summaryItem$targetAr4;
+        group.addItem(summaryItem.title, (_summaryItem$title_lo = summaryItem.title_locales) !== null && _summaryItem$title_lo !== void 0 ? _summaryItem$title_lo : {}, DivaUtils.stripTags(summaryItem.description), DivaUtils.stripTagsFromDict((_summaryItem$descript = summaryItem.description_locales) !== null && _summaryItem$descript !== void 0 ? _summaryItem$descript : {}), (_summaryItem$targetAr4 = summaryItem.targetArticlePosNrs) !== null && _summaryItem$targetAr4 !== void 0 ? _summaryItem$targetAr4 : [], group.GroupID, summaryItem.image);
+      }
+
+      //nested config (e.g. accessory option values like a custom color) is kept flat in the same group
+      for (var _key7 in summaryItem.summaryItems) {
+        this.addSummaryItemToGroup(group, summaryItem.summaryItems[_key7]);
+      }
+    }
   }, {
     key: "getSummaryType",
     value: function getSummaryType(set) {
@@ -33698,8 +33805,8 @@ var SummaryHandler = /*#__PURE__*/function () {
           }
         };
       }
-      for (var _key7 in elementGroups) {
-        var group = elementGroups[_key7];
+      for (var _key8 in elementGroups) {
+        var group = elementGroups[_key8];
         ret.push({
           items: this.buildSummaryItems(this.getArticlesPosNr(group.articles), set, summaryForBasket),
           price: this.getArticlesPrice(group.articles),
@@ -33716,10 +33823,10 @@ var SummaryHandler = /*#__PURE__*/function () {
       var groupedArticles = setHandlerInstance.getDockedGroupedArticles(set);
       var retGroups = {};
       var articlesCodexesOnIndex = {};
-      for (var _key8 in groupedArticles) {
-        var basketId = groupedArticles[_key8][Object.keys(groupedArticles[_key8])[0]].basketId;
+      for (var _key9 in groupedArticles) {
+        var basketId = groupedArticles[_key9][Object.keys(groupedArticles[_key9])[0]].basketId;
         retGroups[basketId] = {
-          articles: groupedArticles[_key8],
+          articles: groupedArticles[_key9],
           quantity: 1
         };
       }
@@ -33734,12 +33841,12 @@ var SummaryHandler = /*#__PURE__*/function () {
           articlesCodexesOnIndex[articleCodex].push(i);
         }
       }
-      for (var _key9 in articlesCodexesOnIndex) {
-        if (articlesCodexesOnIndex[_key9].length > 1) {
+      for (var _key10 in articlesCodexesOnIndex) {
+        if (articlesCodexesOnIndex[_key10].length > 1) {
           //group the single groups by the aricleCodex
           var articles = [];
-          for (var _i4 = 0; _i4 < articlesCodexesOnIndex[_key9].length; _i4++) {
-            var _group = groupedArticles[articlesCodexesOnIndex[_key9][_i4]];
+          for (var _i4 = 0; _i4 < articlesCodexesOnIndex[_key10].length; _i4++) {
+            var _group = groupedArticles[articlesCodexesOnIndex[_key10][_i4]];
             articles.push({
               article: _group[Object.keys(_group)[0]]
             });
@@ -33784,11 +33891,11 @@ var SummaryHandler = /*#__PURE__*/function () {
       var isIDM = article.CatalogData.isIDMFormat;
       var tabGroups = [];
       for (var basketId in article.partlistArticles) {
-        var _ops$val4;
+        var _ops$val5;
         var partlistArticle = article.partlistArticles[basketId];
         if (!partlistArticle.tabGroup) continue;
         var ops = article.getArticleOptionState((!isIDM ? 'OPT' : '') + partlistArticle.tabGroup);
-        if (ops && !ops.isInvisible && (ops.selectionmode != 0 || (ops.visibleCount > 1 || ops.isFreeText) && article.set.api.showSelectionModeZero()) && ops.isDoShow && !((_ops$val4 = ops.val) !== null && _ops$val4 !== void 0 && _ops$val4.isNotRelevant) && ops !== null && ops !== void 0 && ops.optionTabGroup) {
+        if (ops && !ops.isInvisible && (ops.selectionmode != 0 || (ops.visibleCount > 1 || ops.isFreeText) && article.set.api.showSelectionModeZero()) && ops.isDoShow && !((_ops$val5 = ops.val) !== null && _ops$val5 !== void 0 && _ops$val5.isNotRelevant) && ops !== null && ops !== void 0 && ops.optionTabGroup) {
           tabGroups.push({
             optionCodex: ops.optionCodex,
             tabGroup: ops.optionTabGroup
@@ -34024,8 +34131,8 @@ var SummaryHandler = /*#__PURE__*/function () {
     key: "getArticlesPrice",
     value: function getArticlesPrice(articles) {
       var price = 0;
-      for (var _key10 in articles) {
-        price = price + articles[_key10].price * articles[_key10].quantity;
+      for (var _key11 in articles) {
+        price = price + articles[_key11].price * articles[_key11].quantity;
       }
       return price;
     }
@@ -35177,8 +35284,9 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       }
       var configInAccessoire = set.configAccessoiresInAccessoireStep;
       var configInAccessoireAndTree = set.CatalogData.configAccessoires && !article.isShelfAccessoire;
+      var isRelatedAccessoire = !!article.relatedToBasketId && !(article.isPartListArticle && article.partlistArticleVisibleInTree);
       //give this step a unique key so it is not merged with any option of te main article
-      if (configInAccessoire && !!(article !== null && article !== void 0 && article.relatedToBasketId)) {
+      if (configInAccessoire && isRelatedAccessoire) {
         if (configInAccessoireAndTree) {
           //remember old configStepKey to push basketId to its targetArticles anyways
           mainConfigStepKey = configStepKey;
@@ -35187,7 +35295,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       }
       var plaBasketIds = Object.keys(articles[basketId].getRecursivePartlistArticles(true, true));
       var singleOPVOnly = ops.visibleCount == 1 && !ops.isFreeText && !set.CatalogData.dontHideOption.includes(ops.option.codex) && !((_set$ViewConfig4 = set.ViewConfig) !== null && _set$ViewConfig4 !== void 0 && _set$ViewConfig4.showSingleOPVOnly);
-      var isAccessoire = !!article.relatedToBasketId ? article.articleCodex : false;
+      var isAccessoire = isRelatedAccessoire ? article.articleCodex : false;
       if (!configTree.getTabGroupByCodex(tabGroupCodex)) {
         var newTabGroup = this.createTabGroup(tabGroupCodex, tabGroupTitel, 'OPTION', configTree);
         configTree.addTabGroup(tabGroupCodex, newTabGroup);
@@ -37538,7 +37646,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 3;
-              return import('./DoorPlanner-3ffef3a1.js');
+              return import('./DoorPlanner-4976af8c.js');
             case 3:
               _yield$import = _context5.sent;
               DoorPlanner = _yield$import["default"];
@@ -43012,7 +43120,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return import('./PfisterWWSHandler-97602df8.js');
+              return import('./PfisterWWSHandler-18a7f828.js');
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -43020,7 +43128,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return import('./LiviqueWWSHandler-7f997d91.js');
+              return import('./LiviqueWWSHandler-546997f8.js');
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -43028,7 +43136,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return import('./SeriousBasketHandler-b9638fda.js');
+              return import('./SeriousBasketHandler-3022bee6.js');
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -43036,7 +43144,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return import('./StandardWWSHandler-99a090bc.js');
+              return import('./StandardWWSHandler-e98bbbac.js');
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -44460,7 +44568,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.next = 2;
-              return import('./Host3DSignalR-2143e221.js');
+              return import('./Host3DSignalR-07217ea7.js');
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -46146,7 +46254,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context5.next = 10;
-              return import('./DivaStandardPlanner-de0d17ea.js');
+              return import('./DivaStandardPlanner-66d98f28.js');
             case 10:
               _yield$import = _context5.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -46157,7 +46265,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context5.abrupt("break", 21);
             case 15:
               _context5.next = 17;
-              return import('./DivaBoxPlanner-bbcd759e.js');
+              return import('./DivaBoxPlanner-7b04b981.js');
             case 17:
               _yield$import2 = _context5.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -48120,12 +48228,14 @@ var DivaWebPlanner = /*#__PURE__*/function () {
             case 12:
               loadSuccessful = _context14.sent;
               if (this.plannerConfig.configuratorSessionId) {
-                //force new configurator session id - Landingpage case
+                // ID forced from outside (Landingpage, PDP, Planung-ändern)
                 DivaUtils.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).
+              } else if (cache !== undefined) {
+                // Re-init with cache (Variant Select): keep existing session stable
                 DivaUtils.businessMetrics.setConfiguratorSessionId(undefined, true);
+              } else {
+                // Fresh start (new catalog, archive basket, etc.): always new UUID
+                DivaUtils.businessMetrics.setConfiguratorSessionId();
               }
               if (!loadSuccessful) {
                 _context14.next = 31;