@crystaldesign/diva-seller 26.8.0-beta.9 → 26.9.0-beta.1

package/build/esm/index.js

@@ -108,8 +108,8 @@ import Settings from '@mui/icons-material/Settings';
     globalThis.process = { env:env };
 })();
 
-function ownKeys$I(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$I(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$I(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$I(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$J(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$J(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$J(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$J(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function useApiLogin(_ref) {
   var jwt = _ref.jwt,
     userRole = _ref.userRole,
@@ -128,7 +128,7 @@ function useApiLogin(_ref) {
   useEffect(function () {
     getSessionGuid(userRole, loginMode).then(function (sessionGuid) {
       return setState({
-        sessionGuids: _objectSpread$I(_objectSpread$I({}, state.sessionGuids), {}, _defineProperty({}, organizationId, sessionGuid)),
+        sessionGuids: _objectSpread$J(_objectSpread$J({}, state.sessionGuids), {}, _defineProperty({}, organizationId, sessionGuid)),
         isLoading: false
       });
     });
@@ -206,8 +206,8 @@ var SellerContext = /*#__PURE__*/createContext({
 });
 
 var _excluded$d = ["internal"];
-function ownKeys$H(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$H(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$H(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$H(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$I(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$I(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$I(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$I(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var GROUP_ID = 'SELLER';
 function useBreadcrumbs(_ref) {
   var updateBreadcrumbs = _ref.updateBreadcrumbs,
@@ -392,18 +392,20 @@ function breadcrumbPlanner(_ref6) {
       });
     }
     if (state.currentCatalogCodex && (_state$catalogData = state.catalogData) !== null && _state$catalogData !== void 0 && _state$catalogData[0].hasPlanner) {
-      var _state$collections, _state$currentAccount3;
+      var _state$collections, _coll$enricherSeries, _state$currentAccount3;
       var coll = (_state$collections = state.collections) === null || _state$collections === void 0 ? void 0 : _state$collections.find(function (c) {
         return c.id == state.currentCollectionId;
       });
-      var isIDMData = (coll === null || coll === void 0 ? void 0 : coll.type) == 'ENRICHER_PACKAGE';
+      var isIDMData = !!(coll !== null && coll !== void 0 && (_coll$enricherSeries = coll.enricherSeries) !== null && _coll$enricherSeries !== void 0 && _coll$enricherSeries.some(function (s) {
+        return s.serieNo === state.currentCatalogCodex;
+      }));
       return {
         groupId: GROUP_ID,
         level: 3,
         name: 'navigation.planning',
         component: {
           type: 'DIVA_WEBPLANNER',
-          parameters: _objectSpread$H(_objectSpread$H(_objectSpread$H({
+          parameters: _objectSpread$I(_objectSpread$I(_objectSpread$I({
             catalogCodex: state.currentCatalogCodex,
             accountGuid: (_state$currentAccount3 = state.currentAccountId) !== null && _state$currentAccount3 !== void 0 ? _state$currentAccount3 : ''
           }, state.currentDivaNr ? {
@@ -479,11 +481,11 @@ function breadcrumbCollection() {
   };
 }
 
-function ownKeys$G(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$G(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$G(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$G(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$H(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$H(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$H(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$H(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var reducer$1 = function reducer(state, action) {
   if (action.type == 'update') {
-    var newState = _objectSpread$G({}, state);
+    var newState = _objectSpread$H({}, state);
     action.payload.forEach(function (p) {
       if (p.field == 'basketState') {
         if (p.value) {
@@ -517,8 +519,11 @@ function updateBasketState(state, _ref) {
   };
 }
 
-function ownKeys$F(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$F(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$F(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$F(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$G(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$G(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$G(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$G(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _createForOfIteratorHelper$5(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$5(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray$5(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$5(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$5(r, a) : void 0; } }
+function _arrayLikeToArray$5(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var LOG$b = getLogger('Seller', 'ApiHandler');
 function apiLoadAnalyticScore(_x) {
   return _apiLoadAnalyticScore.apply(this, arguments);
@@ -570,6 +575,11 @@ function _apiLoadAnalyticScore() {
 function apiLoadCollections(_x2) {
   return _apiLoadCollections.apply(this, arguments);
 }
+
+// Merge enricher collections into the API2 list by (normalized) name: a matching name combines both
+// sources into a single collection (API2 identity kept, enricher series attached), so its catalog
+// list later shows the legacy and the new catalogs together. Non-matching enricher collections are
+// appended as their own entries.
 function _apiLoadCollections() {
   _apiLoadCollections = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref2) {
     var serverUrl, enricherUrl, sessionGuid, settings, jwt, organizationId, language, newCollectionArray, _response$Accounts$ma, _response$Accounts, fullUrl, response, enricherCollections;
@@ -623,7 +633,7 @@ function _apiLoadCollections() {
           return apiLoadCollectionsEnricher(enricherUrl, jwt, organizationId, language);
         case 17:
           enricherCollections = _context2.sent;
-          if (enricherCollections) newCollectionArray = [].concat(_toConsumableArray(newCollectionArray), _toConsumableArray(enricherCollections));
+          if (enricherCollections) newCollectionArray = mergeCollectionsByName(newCollectionArray, enricherCollections);
         case 19:
           return _context2.abrupt("return", newCollectionArray);
         case 20:
@@ -634,6 +644,36 @@ function _apiLoadCollections() {
   }));
   return _apiLoadCollections.apply(this, arguments);
 }
+function mergeCollectionsByName(api2Collections, enricherCollections) {
+  var normalize = function normalize(name) {
+    return (name !== null && name !== void 0 ? name : '').trim().toLocaleLowerCase();
+  };
+  var merged = _toConsumableArray(api2Collections);
+  var byName = new Map(merged.map(function (c) {
+    return [normalize(c.accountName), c];
+  }));
+  var _iterator = _createForOfIteratorHelper$5(enricherCollections),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var enricher = _step.value;
+      var key = normalize(enricher.accountName);
+      var existing = byName.get(key);
+      if (existing) {
+        var _existing$enricherSer, _enricher$enricherSer;
+        existing.enricherSeries = [].concat(_toConsumableArray((_existing$enricherSer = existing.enricherSeries) !== null && _existing$enricherSer !== void 0 ? _existing$enricherSer : []), _toConsumableArray((_enricher$enricherSer = enricher.enricherSeries) !== null && _enricher$enricherSer !== void 0 ? _enricher$enricherSer : []));
+      } else {
+        merged.push(enricher);
+        byName.set(key, enricher);
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return merged;
+}
 function apiLoadCollectionsEnricher(_x3, _x4, _x5, _x6) {
   return _apiLoadCollectionsEnricher.apply(this, arguments);
 }
@@ -686,7 +726,7 @@ function _apiLoadCollectionsEnricher() {
                 }
               }
             }
-            return _objectSpread$F(_objectSpread$F({}, data), {}, {
+            return _objectSpread$G(_objectSpread$G({}, data), {}, {
               id: data._id,
               accountLogo: (_data$image = data.image) === null || _data$image === void 0 ? void 0 : _data$image.url,
               type: 'ENRICHER_PACKAGE',
@@ -1560,8 +1600,8 @@ var _excluded$c = ["collectionId"],
 function _createForOfIteratorHelper$3(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$3(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$3(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$3(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$3(r, a) : void 0; } }
 function _arrayLikeToArray$3(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function ownKeys$E(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$E(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$E(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$E(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$F(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$F(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$F(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$F(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$a = getLogger('Seller', 'SellerStateData');
 function useSellerStateData(_ref) {
   var sessionGuid = _ref.sessionGuid,
@@ -1700,7 +1740,7 @@ function useSellerStateData(_ref) {
               }]
             });
           case 7:
-            return _context.abrupt("return", processData(_objectSpread$E(_objectSpread$E({}, props), {}, {
+            return _context.abrupt("return", processData(_objectSpread$F(_objectSpread$F({}, props), {}, {
               data: collections
             })));
           case 10:
@@ -1720,13 +1760,13 @@ function useSellerStateData(_ref) {
   }();
   var loadCatalogs = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref3) {
-      var collectionId, props, _collections, _relevantCollections$, _state$collections, catalogs, collections, relevantCollections, _relevantCollections$2, series, newCatalogCodex;
+      var collectionId, props, _collections, _state$collections, catalogs, collections, showAllCollections, relevantCollections, enricherCatalogs, api2Catalogs, _yield$apiLoadCatalog, newCatalogCodex;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             collectionId = _ref3.collectionId, props = _objectWithoutProperties(_ref3, _excluded$c);
             if (!state.firstLoginApiUrl) {
-              _context2.next = 28;
+              _context2.next = 34;
               break;
             }
             catalogs = state.catalogs;
@@ -1740,22 +1780,20 @@ function useSellerStateData(_ref) {
           case 7:
             collections = _context2.sent.data;
           case 8:
-            relevantCollections = collections.filter(function (c) {
-              return c.id == collectionId || organization.parentType === 'SUPPLIER';
+            // "Show all" (no collection filter) and the SUPPLIER context (whose model overview opens
+            // directly, without an API2 collection list) treat every collection as relevant.
+            showAllCollections = !collectionId || organization.parentType === 'SUPPLIER';
+            relevantCollections = showAllCollections ? collections : collections.filter(function (c) {
+              return c.id == collectionId;
             });
-            if (!(((_relevantCollections$ = relevantCollections[0]) === null || _relevantCollections$ === void 0 ? void 0 : _relevantCollections$.type) === 'ENRICHER_PACKAGE')) {
-              _context2.next = 17;
-              break;
-            }
-            if ((_relevantCollections$2 = relevantCollections[0].enricherSeries) !== null && _relevantCollections$2 !== void 0 && _relevantCollections$2.length) {
-              _context2.next = 12;
+            if (!(!catalogs || collectionId != state.currentCollectionId)) {
+              _context2.next = 30;
               break;
             }
-            throw new Error('collection ' + relevantCollections[0].accountName + ' has no series ' + relevantCollections[0].id + '');
-          case 12:
-            series = relevantCollections.flatMap(function (c) {
+            // Enricher series -> catalogs (already loaded in-memory with the collections)
+            enricherCatalogs = relevantCollections.flatMap(function (c) {
               var _c$enricherSeries;
-              return (_c$enricherSeries = c.enricherSeries) === null || _c$enricherSeries === void 0 ? void 0 : _c$enricherSeries.map(function (data) {
+              return ((_c$enricherSeries = c.enricherSeries) !== null && _c$enricherSeries !== void 0 ? _c$enricherSeries : []).map(function (data) {
                 return {
                   id: data.catalogId,
                   codex: data.serieNo,
@@ -1763,52 +1801,60 @@ function useSellerStateData(_ref) {
                   name: data.name,
                   catalogLogo: data.url,
                   supplierGuid: data.catalogId,
-                  collectionName: data.enricherPackageName,
+                  collectionName: c.accountName,
+                  collectionLogo: c.accountLogo,
+                  // enricher-only collections group under BRAND, like in the collection overview
+                  collectionType: c.type === 'ENRICHER_PACKAGE' ? 'BRAND' : c.type,
                   collectionId: c.id
-                  //description: data.ShortDesc ? data.ShortDesc : undefined,
-                  //collectionLogo: ,
-                  //mainCategory: data.RetailMainCategory ? data.RetailMainCategory : data.MainCategory ? data.MainCategory : undefined,
-                  //subCategory: data.RetailSubCategory ? data.RetailSubCategory : data.SubCategory ? data.SubCategory : undefined,
-                  //retailArticleNr: data.RetailArticleNr ? data.RetailArticleNr : undefined,
-                  //nArticles: 0,
-                  // brandLogo: data.BrandLogo ? data.BrandLogo : undefined,
-                  //supplierGuid: data.SupplierGUID ? data.SupplierGUID : undefined,
-                  //supplierILN: data.SupplierILN ? data.SupplierILN : undefined,
-                  //supplierLogo: data.SupplierLogo ? data.SupplierLogo : undefined,
-                  //supplierName: data.SupplierName ? data.SupplierName : undefined,
-                  //lastUpdate: data. ? DivaUtils.getDate(data.LastUpdate) : undefined,
-                  //validFrom: data.ValidFrom ? DivaUtils.getDate(data.ValidFrom) : undefined,
-                  //validTo: data.ValidTo ? DivaUtils.getDate(data.ValidTo) : undefined,
-                  //has3D: data.Planer == 3 ? true : false,
                 };
               });
-            });
-            dispatch({
-              type: 'update',
-              payload: [{
-                field: 'currentCollectionId',
-                value: collectionId
-              }, {
-                field: 'catalogs',
-                value: series
-              }]
-            });
-            return _context2.abrupt("return", processData(_objectSpread$E(_objectSpread$E({}, props), {}, {
-              data: series || []
-            })));
-          case 17:
-            if (!(sessionGuid && (!catalogs || collectionId != state.currentCollectionId))) {
-              _context2.next = 24;
+            }); // API2 catalogs -> fetched when a relevant collection actually has an API2 source, and always
+            // when showing all collections (API2 then returns its full catalog list itself)
+            api2Catalogs = [];
+            if (!(sessionGuid && (showAllCollections || relevantCollections.some(function (c) {
+              return c.type !== 'ENRICHER_PACKAGE';
+            })))) {
+              _context2.next = 26;
               break;
             }
-            _context2.next = 20;
+            _context2.next = 16;
             return apiLoadCatalogs({
               serverUrl: state.firstLoginApiUrl,
               sessionGuid: sessionGuid,
               collectionGuid: collectionId
             });
+          case 16:
+            _context2.t1 = _yield$apiLoadCatalog = _context2.sent;
+            _context2.t0 = _context2.t1 !== null;
+            if (!_context2.t0) {
+              _context2.next = 20;
+              break;
+            }
+            _context2.t0 = _yield$apiLoadCatalog !== void 0;
           case 20:
-            catalogs = _context2.sent;
+            if (!_context2.t0) {
+              _context2.next = 24;
+              break;
+            }
+            _context2.t2 = _yield$apiLoadCatalog;
+            _context2.next = 25;
+            break;
+          case 24:
+            _context2.t2 = [];
+          case 25:
+            api2Catalogs = _context2.t2;
+          case 26:
+            // combine legacy and new catalogs for the (possibly merged) collection; API2 catalogs take
+            // their display type from the owning collection (matched via accountId == collection id)
+            catalogs = [].concat(_toConsumableArray(api2Catalogs.map(function (cat) {
+              var _collections$find$typ, _collections$find;
+              return _objectSpread$F(_objectSpread$F({}, cat), {}, {
+                collectionType: (_collections$find$typ = (_collections$find = collections.find(function (col) {
+                  return col.id == cat.accountId;
+                })) === null || _collections$find === void 0 ? void 0 : _collections$find.type) !== null && _collections$find$typ !== void 0 ? _collections$find$typ : 'BRAND'
+              });
+            })), _toConsumableArray(enricherCatalogs));
+
             // reset catalogCodex only if a different collection is loaded, not if "all" catalogs are shown
             newCatalogCodex = state.currentCatalogCodex;
             if (collectionId) {
@@ -1827,19 +1873,19 @@ function useSellerStateData(_ref) {
                 value: catalogs
               }]
             });
-          case 24:
+          case 30:
             updateAcountLogo((_state$collections = state.collections) === null || _state$collections === void 0 || (_state$collections = _state$collections.find(function (c) {
               return c.id == collectionId;
             })) === null || _state$collections === void 0 ? void 0 : _state$collections.accountLogo);
-            return _context2.abrupt("return", processData(_objectSpread$E(_objectSpread$E({}, props), {}, {
+            return _context2.abrupt("return", processData(_objectSpread$F(_objectSpread$F({}, props), {}, {
               data: catalogs || []
             })));
-          case 28:
+          case 34:
             return _context2.abrupt("return", {
               data: [],
               total: 0
             });
-          case 29:
+          case 35:
           case "end":
             return _context2.stop();
         }
@@ -1942,10 +1988,11 @@ function useSellerStateData(_ref) {
                       return s.serieNo === c.catalogCodex;
                     });
                     if (!isIDMData) {
-                      _context4.next = 11;
+                      _context4.next = 19;
                       break;
                     }
-                    _context4.next = 5;
+                    _context4.prev = 3;
+                    _context4.next = 6;
                     return apiLoadCatalogInfoEnricher({
                       enricherId: isIDMData.accountId,
                       organizationId: organization === null || organization === void 0 ? void 0 : organization._id,
@@ -1954,7 +2001,7 @@ function useSellerStateData(_ref) {
                       language: c.language,
                       serieNo: isIDMData.serieNo
                     });
-                  case 5:
+                  case 6:
                     cData = _context4.sent;
                     catalogData.push(cData);
                     dispatch({
@@ -1983,37 +2030,56 @@ function useSellerStateData(_ref) {
                       }]
                     });
                     updateAcountLogo(catalogData[0].accountLogo);
-                    _context4.next = 42;
+                    _context4.next = 17;
+                    break;
+                  case 12:
+                    _context4.prev = 12;
+                    _context4.t0 = _context4["catch"](3);
+                    // the enricher data is inconsistent -> inform the user and return undefined so the caller
+                    // clears the loading state and navigates back to the default (collections) view
+                    LOG$a.error(new DivaError$1('Error on loading enricher CatalogData', {
+                      code: 'SELLER_0001',
+                      cause: _context4.t0
+                    }));
+                    openModal({
+                      title: t('modals.error_accured') + ': ' + (_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message),
+                      accept: true
+                    });
+                    return _context4.abrupt("return", {
+                      v: void 0
+                    });
+                  case 17:
+                    _context4.next = 50;
                     break;
-                  case 11:
+                  case 19:
                     if (!((_c$accountSessionId = c.accountSessionId) !== null && _c$accountSessionId !== void 0)) {
-                      _context4.next = 15;
+                      _context4.next = 23;
                       break;
                     }
-                    _context4.t0 = _c$accountSessionId;
-                    _context4.next = 23;
+                    _context4.t1 = _c$accountSessionId;
+                    _context4.next = 31;
                     break;
-                  case 15:
+                  case 23:
                     if (!c.accountId) {
-                      _context4.next = 21;
+                      _context4.next = 29;
                       break;
                     }
-                    _context4.next = 18;
+                    _context4.next = 26;
                     return checkAccountLogin({
                       accountId: c.accountId
                     });
-                  case 18:
-                    _context4.t1 = _context4.sent;
-                    _context4.next = 22;
+                  case 26:
+                    _context4.t2 = _context4.sent;
+                    _context4.next = 30;
                     break;
-                  case 21:
-                    _context4.t1 = sessionGuid;
-                  case 22:
-                    _context4.t0 = _context4.t1;
-                  case 23:
-                    currentAccountSessionId = _context4.t0;
+                  case 29:
+                    _context4.t2 = sessionGuid;
+                  case 30:
+                    _context4.t1 = _context4.t2;
+                  case 31:
+                    currentAccountSessionId = _context4.t1;
                     if (currentAccountSessionId) {
-                      _context4.next = 27;
+                      _context4.next = 35;
                       break;
                     }
                     LOG$a.error(new DivaError$1('AccountSessionId is undefined', {
@@ -2022,16 +2088,16 @@ function useSellerStateData(_ref) {
                     return _context4.abrupt("return", {
                       v: void 0
                     });
-                  case 27:
-                    _context4.prev = 27;
-                    _context4.next = 30;
+                  case 35:
+                    _context4.prev = 35;
+                    _context4.next = 38;
                     return apiLoadCatalogInfo({
                       serverUrlAPI: state.firstLoginApiUrl,
                       catalogCodex: c.catalogCodex,
                       accountSessionId: currentAccountSessionId,
                       language: c.language
                     });
-                  case 30:
+                  case 38:
                     _cData = _context4.sent;
                     catalogData.push(_cData);
                     dispatch({
@@ -2057,32 +2123,32 @@ function useSellerStateData(_ref) {
                       }]
                     });
                     updateAcountLogo(catalogData[0].accountLogo);
-                    _context4.next = 42;
+                    _context4.next = 50;
                     break;
-                  case 36:
-                    _context4.prev = 36;
-                    _context4.t2 = _context4["catch"](27);
-                    if (!((_context4.t2 === null || _context4.t2 === void 0 ? void 0 : _context4.t2.message) == 'Es trat ein technischer Fehler auf, probieren Sie es später erneut nochmal und melden Sie sich neu an.')) {
-                      _context4.next = 41;
+                  case 44:
+                    _context4.prev = 44;
+                    _context4.t3 = _context4["catch"](35);
+                    if (!((_context4.t3 === null || _context4.t3 === void 0 ? void 0 : _context4.t3.message) == 'Es trat ein technischer Fehler auf, probieren Sie es später erneut nochmal und melden Sie sich neu an.')) {
+                      _context4.next = 49;
                       break;
                     }
                     LOG$a.error(new DivaError$1('Error on Loading CatalogData', {
                       code: 'SELLER_0001',
-                      cause: _context4.t2
+                      cause: _context4.t3
                     }));
                     return _context4.abrupt("return", {
                       v: void 0
                     });
-                  case 41:
+                  case 49:
                     openModal({
-                      title: t('modals.error_accured') + ': ' + (_context4.t2 === null || _context4.t2 === void 0 ? void 0 : _context4.t2.message),
+                      title: t('modals.error_accured') + ': ' + (_context4.t3 === null || _context4.t3 === void 0 ? void 0 : _context4.t3.message),
                       accept: true
                     });
-                  case 42:
+                  case 50:
                   case "end":
                     return _context4.stop();
                 }
-              }, _loop, null, [[27, 36]]);
+              }, _loop, null, [[3, 12], [35, 44]]);
             });
             _iterator.s();
           case 15:
@@ -2305,8 +2371,8 @@ function useSellerStateData(_ref) {
             _context8.next = 22;
             return apiLoadBasket({
               divaNr: divaNr,
-              apiConfig: _objectSpread$E(_objectSpread$E({}, apiConfig), {}, {
-                api2: _objectSpread$E(_objectSpread$E({}, apiConfig.api2), {}, {
+              apiConfig: _objectSpread$F(_objectSpread$F({}, apiConfig), {}, {
+                api2: _objectSpread$F(_objectSpread$F({}, apiConfig.api2), {}, {
                   "default": state.firstLoginApiUrl
                 })
               }),
@@ -2575,7 +2641,7 @@ function useSellerStateData(_ref) {
   };
   var loadArticles = /*#__PURE__*/function () {
     var _ref17 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(_ref16) {
-      var catalogCodex, accountId, collectionId, props, _state$catalogData2, _collection$enricherS2, articles, catalogs, collections, collection, accountSessionId, isIDMData, _catalogs, _catalog, catalog, _yield$loadCatalogInf, _state$currentCollect4;
+      var catalogCodex, accountId, collectionId, props, _collection$enricherS2, _state$catalogData2, articles, catalogs, collections, collection, isIDMData, accountSessionId, _catalogs, _catalog, catalog, _yield$loadCatalogInf, _state$currentCollect4;
       return _regeneratorRuntime.wrap(function _callee9$(_context10) {
         while (1) switch (_context10.prev = _context10.next) {
           case 0:
@@ -2600,49 +2666,49 @@ function useSellerStateData(_ref) {
               var _ref18, _state$currentCollect3;
               return c.id == ((_ref18 = (_state$currentCollect3 = state.currentCollectionId) !== null && _state$currentCollect3 !== void 0 ? _state$currentCollect3 : collectionId) !== null && _ref18 !== void 0 ? _ref18 : accountId);
             });
-            if (!(!state.currentAccountLoginId && (collection === null || collection === void 0 ? void 0 : collection.type) !== 'ENRICHER_PACKAGE')) {
-              _context10.next = 21;
+            isIDMData = collection === null || collection === void 0 || (_collection$enricherS2 = collection.enricherSeries) === null || _collection$enricherS2 === void 0 ? void 0 : _collection$enricherS2.find(function (s) {
+              return s.serieNo === catalogCodex;
+            });
+            if (!(!state.currentAccountLoginId && !isIDMData)) {
+              _context10.next = 22;
               break;
             }
             if (!accountId) {
-              _context10.next = 17;
+              _context10.next = 18;
               break;
             }
-            _context10.next = 14;
+            _context10.next = 15;
             return checkAccountLogin({
               accountId: accountId
             });
-          case 14:
+          case 15:
             _context10.t1 = _context10.sent;
-            _context10.next = 18;
+            _context10.next = 19;
             break;
-          case 17:
-            _context10.t1 = sessionGuid;
           case 18:
+            _context10.t1 = sessionGuid;
+          case 19:
             _context10.t0 = _context10.t1;
-            _context10.next = 22;
+            _context10.next = 23;
             break;
-          case 21:
-            _context10.t0 = state.currentAccountLoginId;
           case 22:
+            _context10.t0 = state.currentAccountLoginId;
+          case 23:
             accountSessionId = _context10.t0;
             if (!(!state.catalogs || !((_state$catalogData2 = state.catalogData) !== null && _state$catalogData2 !== void 0 && _state$catalogData2.length))) {
-              _context10.next = 27;
+              _context10.next = 28;
               break;
             }
-            _context10.next = 26;
+            _context10.next = 27;
             return loadCatalogInfo({
               catalogCodex: catalogCodex,
               accountId: accountId,
               accountSessionId: accountSessionId,
               language: 'en'
             });
-          case 26:
-            catalogs = _context10.sent;
           case 27:
-            isIDMData = collection === null || collection === void 0 || (_collection$enricherS2 = collection.enricherSeries) === null || _collection$enricherS2 === void 0 ? void 0 : _collection$enricherS2.find(function (s) {
-              return s.serieNo === catalogCodex;
-            });
+            catalogs = _context10.sent;
+          case 28:
             if (!isIDMData) {
               _context10.next = 50;
               break;
@@ -2707,13 +2773,13 @@ function useSellerStateData(_ref) {
                 value: accountSessionId
               }, {
                 field: 'currentCollectionId',
-                value: collectionId
+                value: collectionId !== null && collectionId !== void 0 ? collectionId : state.currentCollectionId
               }, {
                 field: 'currentAccountId',
                 value: accountId
               }]
             });
-            return _context10.abrupt("return", processData(_objectSpread$E(_objectSpread$E({}, props), {}, {
+            return _context10.abrupt("return", processData(_objectSpread$F(_objectSpread$F({}, props), {}, {
               data: articles || []
             })));
           case 50:
@@ -2747,7 +2813,7 @@ function useSellerStateData(_ref) {
               }]
             });
           case 55:
-            return _context10.abrupt("return", processData(_objectSpread$E(_objectSpread$E({}, props), {}, {
+            return _context10.abrupt("return", processData(_objectSpread$F(_objectSpread$F({}, props), {}, {
               data: articles || []
             })));
           case 58:
@@ -2902,8 +2968,8 @@ function useSellerStateData(_ref) {
 }
 
 var _excluded$b = ["state", "setFirstLoginApiUrl", "updateBasketState", "setPlannerParams", "setReturnTo", "setOriginProductId", "setProductCategories", "setManualCustomDataFields", "setCloseOnSave", "resetState", "resetForCache"];
-function ownKeys$D(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$D(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$D(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$D(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$E(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$E(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$E(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$E(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$9 = getLogger('Seller', 'SellerStateProvider');
 var SellerStateProvider = function SellerStateProvider(_ref) {
   var children = _ref.children,
@@ -3296,22 +3362,38 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
   }();
   var openPlanner = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref5) {
-      var _state$collections;
-      var catalogCodex, articleCodexes, forceReload, accountSessionGuid, accountId, retailArticleNr, setId, divaNr, productId, basketData, returnTo, productName, coll, isIDMData, params, internal, _state$basketState4, _params2, _internal2, orderSet, _params3, _basketData$OrderSets, _basketData$OrderSets2;
+      var _state$collections, _coll$enricherSeries;
+      var catalogCodex, articleCodexes, forceReload, accountSessionGuid, accountId, collectionId, retailArticleNr, setId, divaNr, productId, basketData, returnTo, productName, configuratorSessionId, collections, coll, isIDMData, params, internal, _state$basketState4, _params2, _internal2, orderSet, _params3, _internal3, _basketData$OrderSets, _basketData$OrderSets2;
       return _regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            catalogCodex = _ref5.catalogCodex, articleCodexes = _ref5.articleCodexes, forceReload = _ref5.forceReload, accountSessionGuid = _ref5.accountSessionGuid, accountId = _ref5.accountId, retailArticleNr = _ref5.retailArticleNr, setId = _ref5.setId, divaNr = _ref5.divaNr, productId = _ref5.productId, basketData = _ref5.basketData, returnTo = _ref5.returnTo, productName = _ref5.productName;
-            coll = (_state$collections = state.collections) === null || _state$collections === void 0 ? void 0 : _state$collections.find(function (c) {
-              var _state$currentCollect;
-              return c.id == ((_state$currentCollect = state.currentCollectionId) !== null && _state$currentCollect !== void 0 ? _state$currentCollect : accountId);
+            catalogCodex = _ref5.catalogCodex, articleCodexes = _ref5.articleCodexes, forceReload = _ref5.forceReload, accountSessionGuid = _ref5.accountSessionGuid, accountId = _ref5.accountId, collectionId = _ref5.collectionId, retailArticleNr = _ref5.retailArticleNr, setId = _ref5.setId, divaNr = _ref5.divaNr, productId = _ref5.productId, basketData = _ref5.basketData, returnTo = _ref5.returnTo, productName = _ref5.productName, configuratorSessionId = _ref5.configuratorSessionId;
+            if (!((_state$collections = state.collections) !== null && _state$collections !== void 0)) {
+              _context5.next = 5;
+              break;
+            }
+            _context5.t0 = _state$collections;
+            _context5.next = 8;
+            break;
+          case 5:
+            _context5.next = 7;
+            return stateFunctions.loadCollections({});
+          case 7:
+            _context5.t0 = _context5.sent.data;
+          case 8:
+            collections = _context5.t0;
+            coll = collections.find(function (c) {
+              var _ref7;
+              return c.id == ((_ref7 = collectionId !== null && collectionId !== void 0 ? collectionId : state.currentCollectionId) !== null && _ref7 !== void 0 ? _ref7 : accountId);
             });
-            isIDMData = (coll === null || coll === void 0 ? void 0 : coll.type) == 'ENRICHER_PACKAGE';
+            isIDMData = !!(coll !== null && coll !== void 0 && (_coll$enricherSeries = coll.enricherSeries) !== null && _coll$enricherSeries !== void 0 && _coll$enricherSeries.some(function (s) {
+              return s.serieNo === catalogCodex;
+            }));
             if (!(catalogCodex !== undefined && (accountSessionGuid && accountId || isIDMData || organization.parentType === 'SUPPLIER') && returnTo === 'SETPLANNER_OPEN_SELLER_BASKET' && basketData)) {
-              _context5.next = 10;
+              _context5.next = 18;
               break;
             }
-            params = _objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D({
+            params = _objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E({
               catalogCodex: catalogCodex
             }, accountId ? {
               accountId: accountId
@@ -3328,13 +3410,13 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
             } : {}), retailArticleNr ? {
               retailArticleNr: retailArticleNr
             } : {});
-            internal = _objectSpread$D(_objectSpread$D({}, forceReload ? {
+            internal = _objectSpread$E(_objectSpread$E({}, forceReload ? {
               forceReload: forceReload
             } : {}), {}, {
               accountSessionGuid: accountSessionGuid,
               basketData: basketData
             });
-            setPlannerParams(_objectSpread$D(_objectSpread$D({}, params), {}, {
+            setPlannerParams(_objectSpread$E(_objectSpread$E({}, params), {}, {
               internal: internal
             }));
             openComponent({
@@ -3342,11 +3424,11 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
               parameters: params,
               internal: internal
             });
-            _context5.next = 25;
+            _context5.next = 34;
             break;
-          case 10:
+          case 18:
             if (!(catalogCodex !== undefined && (accountSessionGuid && accountId || isIDMData || organization.parentType === 'SUPPLIER') && returnTo || productId)) {
-              _context5.next = 14;
+              _context5.next = 22;
               break;
             }
             if ((_state$basketState4 = state.basketState) !== null && _state$basketState4 !== void 0 && _state$basketState4.basket && state.currentDivaNr) {
@@ -3366,7 +3448,7 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
                       updateBasketState({
                         concat: true
                       });
-                      var _params = _objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D({}, catalogCodex !== undefined ? {
+                      var _params = _objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E({}, catalogCodex !== undefined ? {
                         catalogCodex: catalogCodex
                       } : {}), accountId ? {
                         accountId: accountId
@@ -3385,12 +3467,12 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
                       } : {}), productId ? {
                         productId: productId
                       } : {});
-                      var _internal = _objectSpread$D(_objectSpread$D({}, forceReload ? {
+                      var _internal = _objectSpread$E(_objectSpread$E({}, forceReload ? {
                         forceReload: forceReload
                       } : {}), {}, {
                         accountSessionGuid: accountSessionGuid
                       });
-                      setPlannerParams(_objectSpread$D(_objectSpread$D({}, _params), {}, {
+                      setPlannerParams(_objectSpread$E(_objectSpread$E({}, _params), {}, {
                         internal: _internal
                       }));
                       openComponent({
@@ -3424,7 +3506,7 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
                 });
               }
             } else {
-              _params2 = _objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D({}, catalogCodex !== undefined ? {
+              _params2 = _objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E({}, catalogCodex !== undefined ? {
                 catalogCodex: catalogCodex
               } : {}), accountId ? {
                 accountId: accountId
@@ -3441,12 +3523,12 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
               } : {}), retailArticleNr ? {
                 retailArticleNr: retailArticleNr
               } : {});
-              _internal2 = _objectSpread$D(_objectSpread$D({}, forceReload ? {
+              _internal2 = _objectSpread$E(_objectSpread$E({}, forceReload ? {
                 forceReload: forceReload
               } : {}), {}, {
                 accountSessionGuid: accountSessionGuid
               });
-              setPlannerParams(_objectSpread$D(_objectSpread$D({}, _params2), {}, {
+              setPlannerParams(_objectSpread$E(_objectSpread$E({}, _params2), {}, {
                 internal: _internal2
               }));
               openComponent({
@@ -3455,54 +3537,55 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
                 internal: _internal2
               });
             }
-            _context5.next = 25;
+            _context5.next = 34;
             break;
-          case 14:
+          case 22:
             if (!(divaNr && basketData && returnTo)) {
-              _context5.next = 24;
+              _context5.next = 33;
               break;
             }
             orderSet = basketData.OrderSets.find(function (s) {
               return s.SetID == setId;
             });
             if (!(orderSet && orderSet.CatalogCodex != state.currentCatalogCodex)) {
-              _context5.next = 19;
+              _context5.next = 27;
               break;
             }
-            _context5.next = 19;
+            _context5.next = 27;
             return stateFunctions.loadCatalogInfo({
               catalogCodex: orderSet.CatalogCodex,
               accountId: orderSet.AccountGUID,
               accountSessionId: accountSessionGuid,
               language: 'de'
             });
-          case 19:
+          case 27:
             _params3 = {
               setId: setId,
               divaNr: divaNr,
               returnTo: returnTo
             };
-            setPlannerParams(_objectSpread$D(_objectSpread$D({}, _params3), {}, {
-              internal: {
-                basketData: basketData,
-                forceReload: forceReload
-              }
+            _internal3 = _objectSpread$E(_objectSpread$E({
+              basketData: basketData
+            }, forceReload ? {
+              forceReload: forceReload
+            } : {}), configuratorSessionId ? {
+              configuratorSessionId: configuratorSessionId
+            } : {});
+            setPlannerParams(_objectSpread$E(_objectSpread$E({}, _params3), {}, {
+              internal: _internal3
             }));
             openComponent({
               type: 'DIVA_WEBPLANNER',
               parameters: _params3,
-              internal: {
-                basketData: basketData,
-                forceReload: forceReload
-              }
+              internal: _internal3
             });
-            _context5.next = 25;
+            _context5.next = 34;
             break;
-          case 24:
+          case 33:
             LOG$9.error(new DivaError$1('openPlanner got called with non all required params', {
               code: 'SELLER_0001'
             }));
-          case 25:
+          case 34:
             if (DivaUtils$1.bridge) {
               DivaUtils$1.bridge.sendMessage({
                 type: 'ABN',
@@ -3512,7 +3595,7 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
                 catalogName: (_basketData$OrderSets2 = basketData === null || basketData === void 0 ? void 0 : basketData.OrderSets[0].CatalogName) !== null && _basketData$OrderSets2 !== void 0 ? _basketData$OrderSets2 : undefined
               });
             }
-          case 26:
+          case 35:
           case "end":
             return _context5.stop();
         }
@@ -3530,7 +3613,7 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
       step: null,
       assignNewDivaNr: false
     });
-    var params = _objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D({}, catalogCodex !== undefined ? {
+    var params = _objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E({}, catalogCodex !== undefined ? {
       catalogCodex: catalogCodex
     } : {}), accountId ? {
       accountId: accountId
@@ -3547,12 +3630,12 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
     } : {}), retailArticleNr ? {
       retailArticleNr: retailArticleNr
     } : {});
-    var internal = _objectSpread$D(_objectSpread$D({}, forceReload ? {
+    var internal = _objectSpread$E(_objectSpread$E({}, forceReload ? {
       forceReload: forceReload
     } : {}), {}, {
       accountSessionGuid: accountSessionGuid
     });
-    setPlannerParams(_objectSpread$D(_objectSpread$D({}, params), {}, {
+    setPlannerParams(_objectSpread$E(_objectSpread$E({}, params), {}, {
       internal: internal
     }));
     openComponent({
@@ -3601,7 +3684,7 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
               case 'toPlanner':
                 {
                   if (plannerParams) {
-                    var params = _objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D(_objectSpread$D({}, plannerParams.catalogCodex !== undefined ? {
+                    var params = _objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E(_objectSpread$E({}, plannerParams.catalogCodex !== undefined ? {
                       catalogCodex: plannerParams.catalogCodex
                     } : {}), plannerParams.accountId ? {
                       accountId: plannerParams.accountId
@@ -3616,12 +3699,12 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
                     } : {}), plannerParams.retailArticleNr ? {
                       retailArticleNr: plannerParams.retailArticleNr
                     } : {});
-                    var internal = _objectSpread$D(_objectSpread$D({}, plannerParams.forceReload ? {
+                    var internal = _objectSpread$E(_objectSpread$E({}, plannerParams.forceReload ? {
                       forceReload: plannerParams.forceReload
                     } : {}), {}, {
                       accountSessionGuid: plannerParams.accountSessionGuid
                     });
-                    setPlannerParams(_objectSpread$D(_objectSpread$D({}, params), {}, {
+                    setPlannerParams(_objectSpread$E(_objectSpread$E({}, params), {}, {
                       internal: internal
                     }));
                     openComponent({
@@ -3640,7 +3723,7 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
     });
   };
   var fetchBasket = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6(divaNr) {
+    var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6(divaNr) {
       var response;
       return _regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -3648,8 +3731,8 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
             _context6.next = 2;
             return apiLoadBasket({
               divaNr: divaNr,
-              apiConfig: _objectSpread$D(_objectSpread$D({}, apiConfig), {}, {
-                api2: _objectSpread$D(_objectSpread$D({}, apiConfig.api2), {}, {
+              apiConfig: _objectSpread$E(_objectSpread$E({}, apiConfig), {}, {
+                api2: _objectSpread$E(_objectSpread$E({}, apiConfig.api2), {}, {
                   "default": state.firstLoginApiUrl
                 })
               }),
@@ -3669,11 +3752,11 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
       }, _callee6);
     }));
     return function fetchBasket(_x13) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   var loadUniqueDivaNr = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
+    var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
       return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -3688,11 +3771,11 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
       }, _callee7);
     }));
     return function loadUniqueDivaNr() {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
   var loadManualCustomDataFields = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+    var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
       var data;
       return _regeneratorRuntime.wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
@@ -3711,7 +3794,7 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
       }, _callee8);
     }));
     return function loadManualCustomDataFields() {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
   var contextData = {
@@ -3743,7 +3826,7 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
       manualCustomDataFields: state.manualCustomDataFields,
       closeOnSave: state.closeOnSave
     },
-    actions: _objectSpread$D(_objectSpread$D({}, stateFunctions), {}, {
+    actions: _objectSpread$E(_objectSpread$E({}, stateFunctions), {}, {
       openComponent: openComponent,
       openModal: openModal,
       openPlanner: openPlanner,
@@ -3786,8 +3869,8 @@ var Root = styled('span')({
   border: '1px solid black'
 });
 
-function ownKeys$C(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$C(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$C(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$C(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$D(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$D(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$D(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$D(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function Title(_ref) {
   var text = _ref.text,
     children = _ref.children,
@@ -3799,7 +3882,7 @@ function Title(_ref) {
       style: {
         flexGrow: 1
       },
-      children: [text, help && /*#__PURE__*/jsx(HelpButton, _objectSpread$C({}, help))]
+      children: [text, help && /*#__PURE__*/jsx(HelpButton, _objectSpread$D({}, help))]
     }), children]
   });
 }
@@ -3816,8 +3899,8 @@ function getImageOrFallbackUrl(url) {
   return url || 'https://cdn.diva-portal.com/static/images/image_placeholder-landscape-short.png';
 }
 
-function ownKeys$B(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$B(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$B(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$B(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$C(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$C(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$C(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$C(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$8 = getLogger('SellerCatalogs', 'Catalogs');
 function Catalogs(_ref) {
   var _configurationData$an, _configurationData$ca5, _configurationData$an3, _configurationData$an4;
@@ -3947,7 +4030,7 @@ function Catalogs(_ref) {
             if (configurationData !== null && configurationData !== void 0 && (_configurationData$ca = configurationData.catalogs) !== null && _configurationData$ca !== void 0 && _configurationData$ca.onOpen) {
               action = configurationData === null || configurationData === void 0 || (_configurationData$ca2 = configurationData.catalogs) === null || _configurationData$ca2 === void 0 ? void 0 : _configurationData$ca2.onOpen;
               if (!action.url) {
-                action = _objectSpread$B({}, action);
+                action = _objectSpread$C({}, action);
                 parameters = {};
                 Object.entries(action.parameters || {}).forEach(function (_ref4) {
                   var _ref5 = _slicedToArray(_ref4, 2),
@@ -3963,7 +4046,7 @@ function Catalogs(_ref) {
             } else {
               openComponent({
                 type: 'SELLER',
-                parameters: _objectSpread$B(_objectSpread$B({
+                parameters: _objectSpread$C(_objectSpread$C({
                   module: 'Info',
                   catalogCodex: item.codex
                 }, item.accountId ? {
@@ -4070,6 +4153,29 @@ function Catalogs(_ref) {
     });
   };
   var renderGroup = function renderGroup(row) {
+    // top grouping level: collection type header, like in the collection overview
+    if ((row === null || row === void 0 ? void 0 : row.groupByID) === 'collectionType') {
+      return /*#__PURE__*/jsx(Card, {
+        elevation: 0,
+        style: {
+          margin: 10,
+          display: 'flex',
+          alignItems: 'stretch'
+        },
+        children: /*#__PURE__*/jsx(CardActionArea, {
+          children: /*#__PURE__*/jsxs(Typography$1, {
+            style: {
+              textAlign: 'center'
+            },
+            variant: "subtitle1",
+            color: "textSecondary",
+            children: [t("data.".concat(row.values['collectionType']), {
+              defaultValue: row.values['collectionType']
+            }), " (", row.subRows.length, ")"]
+          })
+        })
+      });
+    }
     return /*#__PURE__*/jsx(Card, {
       style: {
         height: 160,
@@ -4173,7 +4279,20 @@ function Catalogs(_ref) {
         id: 'name'
       }];
       if (organization.parentType !== 'SUPPLIER') {
-        newOptions.groupBy = ['collectionName'];
+        // mirror the collection overview: group by collection type first, then by collection
+        newOptions.columns.unshift({
+          label: t('collections.header.type'),
+          accessor: 'collectionType',
+          format: 'data.'
+        });
+        newOptions.groupBy = ['collectionType', 'collectionName'];
+        newOptions.sortBy = [{
+          id: 'collectionType'
+        }, {
+          id: 'collectionName'
+        }, {
+          id: 'name'
+        }];
         newOptions.expanded = true;
       }
     }
@@ -4225,6 +4344,8 @@ function Catalogs(_ref) {
   });
 }
 
+function ownKeys$B(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$B(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$B(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$B(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$7 = getLogger('SellerCollections', 'Collections');
 function Collections() {
   var _configurationData$an, _configurationData$an2, _configurationData$an3;
@@ -4403,6 +4524,16 @@ function Collections() {
       })
     });
   };
+
+  // Show enricher-only collections within the legacy "Kollektionen" (BRAND) group; the stored type
+  // stays ENRICHER_PACKAGE so catalog loading still discriminates the source correctly.
+  var groupedData = useMemo(function () {
+    return data.map(function (c) {
+      return c.type === 'ENRICHER_PACKAGE' ? _objectSpread$B(_objectSpread$B({}, c), {}, {
+        type: 'BRAND'
+      }) : c;
+    });
+  }, [data]);
   var options = useMemo(function () {
     return {
       columns: [{
@@ -4431,10 +4562,10 @@ function Collections() {
       defaultView: 'Gallery',
       apiInterface: {
         loading: isLoading,
-        data: data
+        data: groupedData
       }
     };
-  }, [t, data, isLoading]);
+  }, [t, groupedData, isLoading]);
   return /*#__PURE__*/jsx(Grid, {
     customElement: /*#__PURE__*/jsx(Title, {
       text: t('collections.title')
@@ -4561,6 +4692,7 @@ function Articles(_ref) {
       forceReload: '1',
       accountSessionGuid: currentAccountLoginId,
       accountId: accountId,
+      collectionId: collectionId,
       retailArticleNr: item.retailArticleNr,
       returnTo: ['toProductsGallery', 'toAssortmentManager'].includes(returnTo !== null && returnTo !== void 0 ? returnTo : '') ? 'OPEN_SELLER_PRODUCTCREATOR' : returnTo || (configurationData === null || configurationData === void 0 ? void 0 : configurationData.defaultWebPlannerReturnTo) || 'OPEN_SELLER_BASKET'
     });
@@ -5145,7 +5277,10 @@ function SetTable(_ref) {
         // 3. Have a valid VKPrice.Price
         // These order lines are filtered so that only meaningful positions are displayed in the order overview.
         // It is not necessary to display an articles with his partlistarticles
+        // Order lines with PosInvisibility (1 = gar nicht sichtbar; 2 = nur in EDI-Bestellung sichtbar) are hidden here as well.
         orderLines.filter(function (ol) {
+          return !ol.PosInvisibility;
+        }).filter(function (ol) {
           var _ol$VKPrice;
           return !ol.HasPartlistArticle || !ol.IsPartlistArticle && !ol.RelatedToBasketID || !!((_ol$VKPrice = ol.VKPrice) !== null && _ol$VKPrice !== void 0 && _ol$VKPrice.Price);
         }).map(function (orderline) {
@@ -7931,6 +8066,7 @@ function Basket(_ref) {
   useEffect(function () {
     // Wait for the seller session to be established before loading the basket.
     if (!sessionGuid) return;
+    if (checkBasket === '1') DivaUtils$1.businessMetrics.setConfiguratorSessionId();
     openBasket(statusRef, divaNr, checkBasket, basket, assignNewDivaNr).then(function () {
       var _getBasketStatusArr;
       LOG$5.successTransaction('ON_OPEN_MODULE_BASKET', {
@@ -8034,7 +8170,8 @@ function Basket(_ref) {
       //if its a basket with a setplanner then dont load specific set but open all of them
       divaNr: currentBasket.DivaNr,
       returnTo: returnToParam,
-      basketData: currentBasket
+      basketData: currentBasket,
+      configuratorSessionId: DivaUtils$1.businessMetrics.getConfiguratorSessionId()
     });
   };
   var deletePlanning = function deletePlanning(setId) {
@@ -8119,7 +8256,7 @@ function Basket(_ref) {
             return _context.abrupt("continue", 27);
           case 22:
             // hqr exists === 3d catalog
-            d3dp = JSON.parse(atob(currentBasket.Diva3DProject));
+            d3dp = JSON.parse(DivaUtils$1.decodeBase64(currentBasket.Diva3DProject));
             d3dp = _objectSpread$s(_objectSpread$s({}, d3dp), {}, {
               SCE: _objectSpread$s(_objectSpread$s({}, d3dp.SCE), {}, {
                 ROO: [_objectSpread$s(_objectSpread$s({}, d3dp.SCE.ROO), {}, {