@crystaldesign/basket-handler 26.7.0-beta.9 → 26.8.0-beta.1

package/build/cjs/index.js

@@ -34,6 +34,9 @@ var DivaUtils__default = /*#__PURE__*/_interopDefaultLegacy(DivaUtils);
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var BASKET_SAVE_ERROR = /*#__PURE__*/function (BASKET_SAVE_ERROR) {
   BASKET_SAVE_ERROR["ERROR_NO_BASKET_SAVED"] = "ERROR_NO_BASKET_SAVED";
   BASKET_SAVE_ERROR["ERROR_BASKET_AFTER_SAVE"] = "ERROR_BASKET_AFTER_SAVE";
@@ -60,87 +63,418 @@ var BasketHandler = /*#__PURE__*/function () {
       return this._api2Url;
     }
   }, {
-    key: "saveBasket",
+    key: "getAuthHeader",
+    value: function getAuthHeader(jwt, apiKey) {
+      if (jwt) return {
+        Authorization: 'Bearer ' + jwt
+      };
+      if (apiKey) return {
+        'X-API-KEY': apiKey
+      };
+      return undefined;
+    }
+  }, {
+    key: "getUploadTupleKey",
+    value: function getUploadTupleKey(upload) {
+      var _upload$setImagesId, _upload$variantId;
+      return "".concat(upload.slot, "|").concat(upload.setId, "|").concat((_upload$setImagesId = upload.setImagesId) !== null && _upload$setImagesId !== void 0 ? _upload$setImagesId : '', "|").concat((_upload$variantId = upload.variantId) !== null && _upload$variantId !== void 0 ? _upload$variantId : '');
+    }
+
+    /**
+     * Mirror the CDN URLs the backend wrote into the saved basket back onto the
+     * in-memory basket the UI still holds. Without this, after save the local
+     * Set2DImage / SetImages[].URL stay empty (they were sent empty) and the
+     * transient preview URLs get cleared, so 2D/AI images disappear from the
+     * checkout. Mirrors the backend resolveUploadTarget routing, incl. variants.
+     */
+  }, {
+    key: "syncUploadedUrlsToLocalBasket",
+    value: function syncUploadedUrlsToLocalBasket(localBasket, savedBasketJson, uploadRefs) {
+      var _savedBasketJson$Orde;
+      if (!(savedBasketJson !== null && savedBasketJson !== void 0 && (_savedBasketJson$Orde = savedBasketJson.OrderSets) !== null && _savedBasketJson$Orde !== void 0 && _savedBasketJson$Orde.length) || !uploadRefs.length) return;
+      var _iterator = _createForOfIteratorHelper(uploadRefs),
+        _step;
+      try {
+        var _loop = function _loop() {
+            var _localBasket$OrderSet, _savedBasketJson$Orde2, _localSet$SetImages, _savedSet$SetImages;
+            var uploadRef = _step.value;
+            var localSet = (_localBasket$OrderSet = localBasket.OrderSets) === null || _localBasket$OrderSet === void 0 ? void 0 : _localBasket$OrderSet.find(function (orderSet) {
+              return orderSet.SetID === uploadRef.setId;
+            });
+            var savedSet = (_savedBasketJson$Orde2 = savedBasketJson.OrderSets) === null || _savedBasketJson$Orde2 === void 0 ? void 0 : _savedBasketJson$Orde2.find(function (orderSet) {
+              return orderSet.SetID === uploadRef.setId;
+            });
+            if (!localSet || !savedSet) return 0; // continue
+            if (uploadRef.slot === 'planning2D') {
+              if (uploadRef.variantId !== undefined) {
+                var _localSet$ConfigVaria, _savedSet$ConfigVaria;
+                var localVariant = (_localSet$ConfigVaria = localSet.ConfigVariants) === null || _localSet$ConfigVaria === void 0 ? void 0 : _localSet$ConfigVaria.find(function (variant) {
+                  return variant.VariantID === uploadRef.variantId;
+                });
+                var savedVariant = (_savedSet$ConfigVaria = savedSet.ConfigVariants) === null || _savedSet$ConfigVaria === void 0 ? void 0 : _savedSet$ConfigVaria.find(function (variant) {
+                  return variant.VariantID === uploadRef.variantId;
+                });
+                if (localVariant && savedVariant !== null && savedVariant !== void 0 && savedVariant.Set2DImage) {
+                  localVariant.Set2DImage = savedVariant.Set2DImage;
+                }
+                return 0; // continue
+              }
+              if (savedSet.Set2DImage) {
+                localSet.Set2DImage = savedSet.Set2DImage;
+              }
+              return 0; // continue
+            }
+            var localImage = (_localSet$SetImages = localSet.SetImages) === null || _localSet$SetImages === void 0 ? void 0 : _localSet$SetImages.find(function (setImage) {
+              return setImage.Id === uploadRef.setImagesId;
+            });
+            var savedImage = (_savedSet$SetImages = savedSet.SetImages) === null || _savedSet$SetImages === void 0 ? void 0 : _savedSet$SetImages.find(function (setImage) {
+              return setImage.Id === uploadRef.setImagesId;
+            });
+            if (localImage && savedImage !== null && savedImage !== void 0 && savedImage.URL) {
+              localImage.URL = savedImage.URL;
+            }
+          },
+          _ret;
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          _ret = _loop();
+          if (_ret === 0) continue;
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    }
+  }, {
+    key: "validateAndFilterPendingUploads",
+    value: function validateAndFilterPendingUploads(basket) {
+      var _basket$OrderSets, _basket$OrderSets2;
+      var pendingUploads = basket.listPendingUploads();
+      var knownSetIds = new Set(((_basket$OrderSets = basket.OrderSets) !== null && _basket$OrderSets !== void 0 ? _basket$OrderSets : []).map(function (orderSet) {
+        return orderSet.SetID;
+      }));
+      var validSetImagesIdsBySet = new Map();
+      var validVariantIdsBySet = new Map();
+      var _iterator2 = _createForOfIteratorHelper((_basket$OrderSets2 = basket.OrderSets) !== null && _basket$OrderSets2 !== void 0 ? _basket$OrderSets2 : []),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var _orderSet$SetImages, _orderSet$ConfigVaria;
+          var orderSet = _step2.value;
+          validSetImagesIdsBySet.set(orderSet.SetID, new Set(((_orderSet$SetImages = orderSet.SetImages) !== null && _orderSet$SetImages !== void 0 ? _orderSet$SetImages : []).map(function (setImage) {
+            return setImage === null || setImage === void 0 ? void 0 : setImage.Id;
+          }).filter(function (id) {
+            return !!id;
+          })));
+          validVariantIdsBySet.set(orderSet.SetID, new Set(((_orderSet$ConfigVaria = orderSet.ConfigVariants) !== null && _orderSet$ConfigVaria !== void 0 ? _orderSet$ConfigVaria : []).map(function (variant) {
+            return variant === null || variant === void 0 ? void 0 : variant.VariantID;
+          }).filter(function (id) {
+            return id !== undefined && id !== null;
+          })));
+        }
+
+        // planning2D is unique per (setId, variantId): the main configuration and
+        // each ConfigVariant of a set may carry its own 2D image.
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+      var planning2DTargets = new Set();
+      var seenTuples = new Set();
+      var filteredUploads = [];
+      var _iterator3 = _createForOfIteratorHelper(pendingUploads),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var pendingUpload = _step3.value;
+          if (pendingUpload.slot === 'planning2D') {
+            var _validVariantIdsBySet, _pendingUpload$varian;
+            if (!knownSetIds.has(pendingUpload.setId)) {
+              throw new Error('planning2D pending upload setId does not exist in basket OrderSets');
+            }
+            if (pendingUpload.variantId !== undefined && !((_validVariantIdsBySet = validVariantIdsBySet.get(pendingUpload.setId)) !== null && _validVariantIdsBySet !== void 0 && _validVariantIdsBySet.has(pendingUpload.variantId))) {
+              throw new Error('planning2D pending upload variantId does not exist in matching OrderSet.ConfigVariants');
+            }
+            var planning2DTargetKey = "".concat(pendingUpload.setId, "|").concat((_pendingUpload$varian = pendingUpload.variantId) !== null && _pendingUpload$varian !== void 0 ? _pendingUpload$varian : '');
+            if (planning2DTargets.has(planning2DTargetKey)) {
+              throw new Error('Only one planning2D pending upload is allowed per setId/variantId');
+            }
+            planning2DTargets.add(planning2DTargetKey);
+          }
+          if (pendingUpload.slot === 'aiImage') {
+            if (!pendingUpload.setImagesId) {
+              var _this$LOG;
+              (_this$LOG = this.LOG) === null || _this$LOG === void 0 || _this$LOG.warn('Skipping aiImage pending upload without setImagesId');
+              continue;
+            }
+            var setImagesIds = validSetImagesIdsBySet.get(pendingUpload.setId);
+            if (!(setImagesIds !== null && setImagesIds !== void 0 && setImagesIds.has(pendingUpload.setImagesId))) {
+              throw new Error('aiImage pending upload setImagesId does not exist in matching OrderSet.SetImages');
+            }
+          }
+          var tupleKey = this.getUploadTupleKey(pendingUpload);
+          if (seenTuples.has(tupleKey)) {
+            throw new Error('Duplicate pending upload tuple detected');
+          }
+          seenTuples.add(tupleKey);
+          filteredUploads.push(pendingUpload);
+        }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
+      }
+      return filteredUploads;
+    }
+  }, {
+    key: "initUploads",
     value: function () {
-      var _saveBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(_ref) {
-        var jwt, basket, awaitPDF, utmCampaign, saveToApi2, sessionGuid, apiKey, _this$LOG, fullUrl, response, _DivaUtils$Configurat, _api2Result, authHeader, resultBasket, api2Result, _e$response, _e$response2, _this$LOG4, _this$LOG2, _this$LOG3;
+      var _initUploads = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(_ref) {
+        var _DivaUtils$Configurat, _initResponse$data$ti, _initResponse$data;
+        var jwt, apiKey, basket, pendingUploads, authHeader, initUrl, initItems, initResponse;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              jwt = _ref.jwt, basket = _ref.basket, awaitPDF = _ref.awaitPDF, utmCampaign = _ref.utmCampaign, saveToApi2 = _ref.saveToApi2, sessionGuid = _ref.sessionGuid, apiKey = _ref.apiKey;
+              jwt = _ref.jwt, apiKey = _ref.apiKey, basket = _ref.basket, pendingUploads = _ref.pendingUploads;
+              authHeader = this.getAuthHeader(jwt, apiKey);
+              initUrl = this.basketService + '/v1/baskets/save/uploads/init';
+              initItems = pendingUploads.map(function (pendingUpload) {
+                return {
+                  slot: pendingUpload.slot,
+                  setId: pendingUpload.setId,
+                  setImagesId: pendingUpload.setImagesId,
+                  variantId: pendingUpload.variantId,
+                  fileName: pendingUpload.fileName,
+                  mimeType: pendingUpload.mimeType,
+                  size: pendingUpload.size
+                };
+              });
+              _context.next = 6;
+              return axios__default["default"].post(initUrl, JSON.stringify({
+                organizationId: basket.OrganizationId,
+                uploads: initItems
+              }), {
+                headers: _objectSpread(_objectSpread({}, authHeader), {}, {
+                  'Content-Type': 'application/json',
+                  'X-Session-Id': DivaUtils__default["default"].SessionId,
+                  'X-Configurator-Id': (_DivaUtils$Configurat = DivaUtils__default["default"].ConfigurationId) !== null && _DivaUtils$Configurat !== void 0 ? _DivaUtils$Configurat : ''
+                })
+              });
+            case 6:
+              initResponse = _context.sent;
+              return _context.abrupt("return", (_initResponse$data$ti = (_initResponse$data = initResponse.data) === null || _initResponse$data === void 0 ? void 0 : _initResponse$data.tickets) !== null && _initResponse$data$ti !== void 0 ? _initResponse$data$ti : []);
+            case 8:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function initUploads(_x) {
+        return _initUploads.apply(this, arguments);
+      }
+      return initUploads;
+    }()
+  }, {
+    key: "uploadPendingFiles",
+    value: function () {
+      var _uploadPendingFiles = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(pendingUploads, tickets) {
+        var uploadTicketsByTuple, _iterator4, _step4, ticket, uploadRefs, _iterator5, _step5, _ticket$simpleUpload, _ticket$simpleUpload2, _ticket$simpleUpload$, pendingUpload, _ticket, uploadResponse;
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              uploadTicketsByTuple = new Map();
+              _iterator4 = _createForOfIteratorHelper(tickets);
+              try {
+                for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                  ticket = _step4.value;
+                  uploadTicketsByTuple.set(this.getUploadTupleKey(ticket), ticket);
+                }
+              } catch (err) {
+                _iterator4.e(err);
+              } finally {
+                _iterator4.f();
+              }
+              uploadRefs = [];
+              _iterator5 = _createForOfIteratorHelper(pendingUploads);
+              _context2.prev = 5;
+              _iterator5.s();
+            case 7:
+              if ((_step5 = _iterator5.n()).done) {
+                _context2.next = 20;
+                break;
+              }
+              pendingUpload = _step5.value;
+              _ticket = uploadTicketsByTuple.get(this.getUploadTupleKey(pendingUpload));
+              if (!(!(_ticket !== null && _ticket !== void 0 && _ticket.uploadId) || !((_ticket$simpleUpload = _ticket.simpleUpload) !== null && _ticket$simpleUpload !== void 0 && _ticket$simpleUpload.url) || !((_ticket$simpleUpload2 = _ticket.simpleUpload) !== null && _ticket$simpleUpload2 !== void 0 && _ticket$simpleUpload2.method))) {
+                _context2.next = 12;
+                break;
+              }
+              throw new Error('Missing upload ticket for pending basket upload');
+            case 12:
+              _context2.next = 14;
+              return fetch(_ticket.simpleUpload.url, {
+                method: _ticket.simpleUpload.method,
+                headers: (_ticket$simpleUpload$ = _ticket.simpleUpload.headers) !== null && _ticket$simpleUpload$ !== void 0 ? _ticket$simpleUpload$ : {},
+                body: pendingUpload.blob
+              });
+            case 14:
+              uploadResponse = _context2.sent;
+              if (uploadResponse.ok) {
+                _context2.next = 17;
+                break;
+              }
+              throw new Error('Direct storage upload failed');
+            case 17:
+              uploadRefs.push({
+                slot: pendingUpload.slot,
+                setId: pendingUpload.setId,
+                setImagesId: pendingUpload.setImagesId,
+                variantId: pendingUpload.variantId,
+                fileName: pendingUpload.fileName,
+                uploadId: _ticket.uploadId
+              });
+            case 18:
+              _context2.next = 7;
+              break;
+            case 20:
+              _context2.next = 25;
+              break;
+            case 22:
+              _context2.prev = 22;
+              _context2.t0 = _context2["catch"](5);
+              _iterator5.e(_context2.t0);
+            case 25:
+              _context2.prev = 25;
+              _iterator5.f();
+              return _context2.finish(25);
+            case 28:
+              return _context2.abrupt("return", uploadRefs);
+            case 29:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this, [[5, 22, 25, 28]]);
+      }));
+      function uploadPendingFiles(_x2, _x3) {
+        return _uploadPendingFiles.apply(this, arguments);
+      }
+      return uploadPendingFiles;
+    }()
+  }, {
+    key: "saveBasket",
+    value: function () {
+      var _saveBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(_ref2) {
+        var jwt, basket, awaitPDF, utmCampaign, saveToApi2, sessionGuid, apiKey, _this$LOG2, fullUrl, response, _DivaUtils$Configurat2, authHeader, pendingUploads, uploadRefs, uploadTickets, saveRequestBody, resultBasket, api2Result, _e$response, _e$response2, _this$LOG5, _this$LOG3, _this$LOG4;
+        return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              jwt = _ref2.jwt, basket = _ref2.basket, awaitPDF = _ref2.awaitPDF, utmCampaign = _ref2.utmCampaign, saveToApi2 = _ref2.saveToApi2, sessionGuid = _ref2.sessionGuid, apiKey = _ref2.apiKey;
               if (basket.DivaNr) {
-                _context.next = 4;
+                _context3.next = 4;
                 break;
               }
-              (_this$LOG = this.LOG) === null || _this$LOG === void 0 || _this$LOG.error('Saving Basket Failed. Error: DivaNr is empty', 'SELLER_0003');
-              return _context.abrupt("return", BASKET_SAVE_ERROR.ERROR_NO_BASKET_SAVED);
+              (_this$LOG2 = this.LOG) === null || _this$LOG2 === void 0 || _this$LOG2.error('Saving Basket Failed. Error: DivaNr is empty', 'SELLER_0003');
+              return _context3.abrupt("return", BASKET_SAVE_ERROR.ERROR_NO_BASKET_SAVED);
             case 4:
-              fullUrl = new URL(this.basketService + '/baskets');
+              fullUrl = new URL(this.basketService + '/v1/baskets/save');
               if (awaitPDF != undefined) fullUrl.searchParams.append('awaitPDF', awaitPDF.toString());
               if (utmCampaign) fullUrl.searchParams.append('utmCampaign', utmCampaign);
-              _context.prev = 7;
-              if (jwt) authHeader = {
-                Authorization: 'Bearer ' + jwt
-              };else if (apiKey) authHeader = {
-                'X-API-KEY': apiKey
+              _context3.prev = 7;
+              authHeader = this.getAuthHeader(jwt, apiKey);
+              pendingUploads = this.validateAndFilterPendingUploads(basket);
+              uploadRefs = [];
+              if (!(pendingUploads.length > 0)) {
+                _context3.next = 18;
+                break;
+              }
+              _context3.next = 14;
+              return this.initUploads({
+                jwt: jwt,
+                apiKey: apiKey,
+                basket: basket,
+                pendingUploads: pendingUploads
+              });
+            case 14:
+              uploadTickets = _context3.sent;
+              _context3.next = 17;
+              return this.uploadPendingFiles(pendingUploads, uploadTickets);
+            case 17:
+              uploadRefs = _context3.sent;
+            case 18:
+              saveRequestBody = {
+                basket: basket.getAsJson()
               };
-              _context.next = 11;
-              return axios__default["default"].post(fullUrl.toString(), JSON.stringify(basket.getAsJson()), {
+              if (uploadRefs.length > 0) {
+                saveRequestBody.uploads = uploadRefs;
+              }
+              _context3.next = 22;
+              return axios__default["default"].post(fullUrl.toString(), JSON.stringify(saveRequestBody), {
                 headers: _objectSpread(_objectSpread({}, authHeader), {}, {
                   'Content-Type': 'application/json',
                   'X-Session-Id': DivaUtils__default["default"].SessionId,
-                  'X-Configurator-Id': (_DivaUtils$Configurat = DivaUtils__default["default"].ConfigurationId) !== null && _DivaUtils$Configurat !== void 0 ? _DivaUtils$Configurat : ''
+                  'X-Configurator-Id': (_DivaUtils$Configurat2 = DivaUtils__default["default"].ConfigurationId) !== null && _DivaUtils$Configurat2 !== void 0 ? _DivaUtils$Configurat2 : ''
                 })
               });
-            case 11:
-              response = _context.sent;
-              _context.next = 14;
+            case 22:
+              response = _context3.sent;
+              _context3.next = 25;
               return response.data;
-            case 14:
-              resultBasket = _context.sent;
+            case 25:
+              resultBasket = _context3.sent;
+              if (uploadRefs.length > 0) {
+                this.syncUploadedUrlsToLocalBasket(basket, resultBasket, uploadRefs);
+              }
               if (!saveToApi2) {
-                _context.next = 19;
+                _context3.next = 34;
                 break;
               }
-              _context.next = 18;
+              _context3.next = 30;
               return this.api2SaveBasket({
-                basket: basket,
+                basket: resultBasket,
                 sessionGuid: sessionGuid,
                 awaitPDF: awaitPDF,
                 jwt: jwt,
                 saveToApi2: saveToApi2,
                 _id: resultBasket._id
               });
-            case 18:
-              api2Result = _context.sent;
-            case 19:
-              return _context.abrupt("return", (_api2Result = api2Result) !== null && _api2Result !== void 0 ? _api2Result : resultBasket);
-            case 22:
-              _context.prev = 22;
-              _context.t0 = _context["catch"](7);
-              if (!(((_e$response = _context.t0.response) === null || _e$response === void 0 ? void 0 : _e$response.status) === 409)) {
-                _context.next = 29;
+            case 30:
+              api2Result = _context3.sent;
+              if (!api2Result) {
+                _context3.next = 34;
                 break;
               }
-              (_this$LOG2 = this.LOG) === null || _this$LOG2 === void 0 || _this$LOG2.error('Saving Basket failed - Entity already exists.');
-              return _context.abrupt("return", BASKET_SAVE_ERROR.ERROR_NO_BASKET_SAVED_ENTITY_EXISTS);
-            case 29:
-              if (!(((_e$response2 = _context.t0.response) === null || _e$response2 === void 0 ? void 0 : _e$response2.status) !== 201)) {
-                _context.next = 32;
+              basket.clearPendingUploads();
+              return _context3.abrupt("return", api2Result);
+            case 34:
+              basket.clearPendingUploads();
+              return _context3.abrupt("return", resultBasket);
+            case 38:
+              _context3.prev = 38;
+              _context3.t0 = _context3["catch"](7);
+              if (!(((_e$response = _context3.t0.response) === null || _e$response === void 0 ? void 0 : _e$response.status) === 409)) {
+                _context3.next = 45;
                 break;
               }
-              (_this$LOG3 = this.LOG) === null || _this$LOG3 === void 0 || _this$LOG3.error('Saving Basket failed.');
-              return _context.abrupt("return", BASKET_SAVE_ERROR.ERROR_NO_BASKET_SAVED);
-            case 32:
-              (_this$LOG4 = this.LOG) === null || _this$LOG4 === void 0 || _this$LOG4.error('Saving Basket Failed. serverError ' + _context.t0.message, 'SELLER_0003');
-              return _context.abrupt("return", BASKET_SAVE_ERROR.ERROR_NO_BASKET_SAVED);
-            case 34:
+              (_this$LOG3 = this.LOG) === null || _this$LOG3 === void 0 || _this$LOG3.error('Saving Basket failed - Entity already exists.');
+              return _context3.abrupt("return", BASKET_SAVE_ERROR.ERROR_NO_BASKET_SAVED_ENTITY_EXISTS);
+            case 45:
+              if (!(((_e$response2 = _context3.t0.response) === null || _e$response2 === void 0 ? void 0 : _e$response2.status) !== 201)) {
+                _context3.next = 48;
+                break;
+              }
+              (_this$LOG4 = this.LOG) === null || _this$LOG4 === void 0 || _this$LOG4.error('Saving Basket failed.');
+              return _context3.abrupt("return", BASKET_SAVE_ERROR.ERROR_NO_BASKET_SAVED);
+            case 48:
+              (_this$LOG5 = this.LOG) === null || _this$LOG5 === void 0 || _this$LOG5.error('Saving Basket Failed. serverError ' + _context3.t0.message, 'SELLER_0003');
+              return _context3.abrupt("return", BASKET_SAVE_ERROR.ERROR_NO_BASKET_SAVED);
+            case 50:
             case "end":
-              return _context.stop();
+              return _context3.stop();
           }
-        }, _callee, this, [[7, 22]]);
+        }, _callee3, this, [[7, 38]]);
       }));
-      function saveBasket(_x) {
+      function saveBasket(_x4) {
         return _saveBasket.apply(this, arguments);
       }
       return saveBasket;
@@ -148,29 +482,29 @@ var BasketHandler = /*#__PURE__*/function () {
   }, {
     key: "api2SaveBasket",
     value: function () {
-      var _api2SaveBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(_ref2) {
-        var basket, sessionGuid, awaitPDF, _id, _this$LOG5, _this$LOG6, fullUrl, response, _DivaUtils$Configurat2, _response$Result, _this$LOG7, _this$LOG8;
-        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      var _api2SaveBasket = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4(_ref3) {
+        var basket, sessionGuid, awaitPDF, _id, _this$LOG6, _this$LOG7, fullUrl, response, _DivaUtils$Configurat3, _response$Result, _this$LOG8, _this$LOG9;
+        return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              basket = _ref2.basket, sessionGuid = _ref2.sessionGuid, awaitPDF = _ref2.awaitPDF, _id = _ref2._id;
+              basket = _ref3.basket, sessionGuid = _ref3.sessionGuid, awaitPDF = _ref3.awaitPDF, _id = _ref3._id;
               if (basket.getAsJson().DivaNr) {
-                _context2.next = 4;
+                _context4.next = 4;
                 break;
               }
-              (_this$LOG5 = this.LOG) === null || _this$LOG5 === void 0 || _this$LOG5.error('Saving Basket Failed. Error: DivaNr is empty', 'SELLER_0003');
-              return _context2.abrupt("return", BASKET_SAVE_ERROR.ERROR_BASKET_AFTER_SAVE);
+              (_this$LOG6 = this.LOG) === null || _this$LOG6 === void 0 || _this$LOG6.error('Saving Basket Failed. Error: DivaNr is empty', 'SELLER_0003');
+              return _context4.abrupt("return", BASKET_SAVE_ERROR.ERROR_BASKET_AFTER_SAVE);
             case 4:
               if (sessionGuid) {
-                _context2.next = 7;
+                _context4.next = 7;
                 break;
               }
-              (_this$LOG6 = this.LOG) === null || _this$LOG6 === void 0 || _this$LOG6.error('Cant create api2 Basket without sessionguid');
-              return _context2.abrupt("return", BASKET_SAVE_ERROR.ERROR_BASKET_AFTER_SAVE);
+              (_this$LOG7 = this.LOG) === null || _this$LOG7 === void 0 || _this$LOG7.error('Cant create api2 Basket without sessionguid');
+              return _context4.abrupt("return", BASKET_SAVE_ERROR.ERROR_BASKET_AFTER_SAVE);
             case 7:
               fullUrl = this.api2Url + '?function=SetJsonBasketData3' + '&callHeadlessBrowserAsync=' + (!awaitPDF ? '1' : '0');
-              _context2.prev = 8;
-              _context2.next = 11;
+              _context4.prev = 8;
+              _context4.next = 11;
               return axios__default["default"].post(fullUrl, JSON.stringify(_objectSpread(_objectSpread({}, basket), {}, {
                 _id: _id
               })), {
@@ -178,7 +512,7 @@ var BasketHandler = /*#__PURE__*/function () {
                   sessionGuid: sessionGuid,
                   'Content-Type': 'application/json',
                   'X-Session-Id': DivaUtils__default["default"].SessionId,
-                  'X-Configurator-Id': (_DivaUtils$Configurat2 = DivaUtils__default["default"].ConfigurationId) !== null && _DivaUtils$Configurat2 !== void 0 ? _DivaUtils$Configurat2 : ''
+                  'X-Configurator-Id': (_DivaUtils$Configurat3 = DivaUtils__default["default"].ConfigurationId) !== null && _DivaUtils$Configurat3 !== void 0 ? _DivaUtils$Configurat3 : ''
                 }
               }).then(function (res) {
                 if (res.status !== 200) {
@@ -187,30 +521,30 @@ var BasketHandler = /*#__PURE__*/function () {
                 return res.data;
               });
             case 11:
-              response = _context2.sent;
+              response = _context4.sent;
               if (!(response.Error || (_response$Result = response.Result) !== null && _response$Result !== void 0 && _response$Result.startsWith('Error'))) {
-                _context2.next = 15;
+                _context4.next = 15;
                 break;
               }
-              (_this$LOG7 = this.LOG) === null || _this$LOG7 === void 0 || _this$LOG7.error('Saving Basket Failed. serverError: ' + response.Error, 'SELLER_0003');
-              return _context2.abrupt("return", BASKET_SAVE_ERROR.ERROR_BASKET_AFTER_SAVE);
+              (_this$LOG8 = this.LOG) === null || _this$LOG8 === void 0 || _this$LOG8.error('Saving Basket Failed. serverError: ' + response.Error, 'SELLER_0003');
+              return _context4.abrupt("return", BASKET_SAVE_ERROR.ERROR_BASKET_AFTER_SAVE);
             case 15:
-              _context2.next = 21;
+              _context4.next = 21;
               break;
             case 17:
-              _context2.prev = 17;
-              _context2.t0 = _context2["catch"](8);
-              (_this$LOG8 = this.LOG) === null || _this$LOG8 === void 0 || _this$LOG8.error('Saving Basket Failed. serverError ' + _context2.t0.message, 'SELLER_0003');
-              return _context2.abrupt("return", BASKET_SAVE_ERROR.ERROR_BASKET_AFTER_SAVE);
+              _context4.prev = 17;
+              _context4.t0 = _context4["catch"](8);
+              (_this$LOG9 = this.LOG) === null || _this$LOG9 === void 0 || _this$LOG9.error('Saving Basket Failed. serverError ' + _context4.t0.message, 'SELLER_0003');
+              return _context4.abrupt("return", BASKET_SAVE_ERROR.ERROR_BASKET_AFTER_SAVE);
             case 21:
-              return _context2.abrupt("return", undefined);
+              return _context4.abrupt("return", undefined);
             case 22:
             case "end":
-              return _context2.stop();
+              return _context4.stop();
           }
-        }, _callee2, this, [[8, 17]]);
+        }, _callee4, this, [[8, 17]]);
       }));
-      function api2SaveBasket(_x2) {
+      function api2SaveBasket(_x5) {
         return _api2SaveBasket.apply(this, arguments);
       }
       return api2SaveBasket;
@@ -218,18 +552,18 @@ var BasketHandler = /*#__PURE__*/function () {
   }, {
     key: "setOrdered",
     value: function () {
-      var _setOrdered = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(_ref3) {
-        var serviceUrl, organizationId, jwt, divaNr, documentVersion, body, _this$LOG9;
-        return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+      var _setOrdered = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(_ref4) {
+        var serviceUrl, organizationId, jwt, divaNr, documentVersion, body, _this$LOG10;
+        return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              serviceUrl = _ref3.serviceUrl, organizationId = _ref3.organizationId, jwt = _ref3.jwt, divaNr = _ref3.divaNr, documentVersion = _ref3.documentVersion;
-              _context3.prev = 1;
+              serviceUrl = _ref4.serviceUrl, organizationId = _ref4.organizationId, jwt = _ref4.jwt, divaNr = _ref4.divaNr, documentVersion = _ref4.documentVersion;
+              _context5.prev = 1;
               body = {
                 divaNr: divaNr,
                 version: documentVersion
               };
-              _context3.next = 5;
+              _context5.next = 5;
               return fetch("".concat(serviceUrl, "/orders?organizationId=").concat(organizationId), {
                 method: 'POST',
                 headers: {
@@ -241,20 +575,20 @@ var BasketHandler = /*#__PURE__*/function () {
                 return r.json();
               });
             case 5:
-              _context3.next = 11;
+              _context5.next = 11;
               break;
             case 7:
-              _context3.prev = 7;
-              _context3.t0 = _context3["catch"](1);
-              (_this$LOG9 = this.LOG) === null || _this$LOG9 === void 0 || _this$LOG9.error('Could not set OrderStatus: ' + _context3.t0.message);
+              _context5.prev = 7;
+              _context5.t0 = _context5["catch"](1);
+              (_this$LOG10 = this.LOG) === null || _this$LOG10 === void 0 || _this$LOG10.error('Could not set OrderStatus: ' + _context5.t0.message);
               throw new Error('DivaNr not found');
             case 11:
             case "end":
-              return _context3.stop();
+              return _context5.stop();
           }
-        }, _callee3, this, [[1, 7]]);
+        }, _callee5, this, [[1, 7]]);
       }));
-      function setOrdered(_x3) {
+      function setOrdered(_x6) {
         return _setOrdered.apply(this, arguments);
       }
       return setOrdered;