iticket-seatingplan-dev 1.8.3 → 1.8.4

package/dist/components/SeatingPlan.js

@@ -94,6 +94,20 @@ const SeatingPlan = _ref => {
       });
     }
   };
+  const setSeatsLoading = (seatsToUpdate, loading) => {
+    setSeats(prev => {
+      const updatedSeats = _objectSpread({}, prev);
+      seatsToUpdate.forEach(seat => {
+        const seatIndex = updatedSeats.seats.findIndex(s => s.ssId === seat.ssId);
+        if (seatIndex !== -1) {
+          updatedSeats.seats[seatIndex] = _objectSpread(_objectSpread({}, updatedSeats.seats[seatIndex]), {}, {
+            loading: loading
+          });
+        }
+      });
+      return updatedSeats;
+    });
+  };
   const _addTicketToCart = async function addTicketToCart(s, priceage) {
     var _mapRef$current;
     let retryCount = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
@@ -135,7 +149,7 @@ const SeatingPlan = _ref => {
       if ((response === null || response === void 0 ? void 0 : response.status) === 429) {
         if (retryCount < BOOKING_MAX_RETRIES) {
           setRetrying(prev => [...prev, s.ssId]);
-          const delay = (0, _utils.getRetryDelay)(response, retryCount);
+          const delay = (0, _utils.getRetryDelay)(response);
           await new Promise(resolve => setTimeout(resolve, delay));
           return _addTicketToCart(s, priceage, retryCount + 1);
         }
@@ -161,41 +175,34 @@ const SeatingPlan = _ref => {
         });
         return;
       }
-      updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
-        loading: false
-      }));
       if (!(response !== null && response !== void 0 && response.ok)) {
+        updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
+          loading: false
+        }));
         handleError({
           code: (response === null || response === void 0 ? void 0 : response.status) === 400 ? 400 : 500,
           message: (response === null || response === void 0 ? void 0 : response.status) === 400 ? _utils.ERROR_MESSAGES.INCOMPATIBLE_TICKETS : _utils.ERROR_MESSAGES.GENERIC_ERROR
         });
       } else {
-        setRetrying(prev => prev.filter(id => id !== s.ssId));
         updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
           loading: false,
           s: _utils.statuses.USER_PENDING,
           bookedPrice: price
         }));
-        setBookedSeats(prev => [...prev, {
-          ssId: s.ssId,
-          r: s.r,
-          c: s.c,
+        setBookedSeats(prev => [...prev, _objectSpread(_objectSpread({}, s), {}, {
           showingId: showingId,
           pId: priceage.paId,
           p: priceage.p,
           paName: priceage.paName
-        }]);
+        })]);
         const event = {
           type: "cart-change-add",
-          details: [...bookedSeats, {
-            ssId: s.ssId,
-            r: s.r,
-            c: s.c,
+          details: [_objectSpread(_objectSpread({}, s), {}, {
             showingId: showingId,
             pId: priceage.paId,
             p: priceage.p,
             paName: priceage.paName
-          }]
+          })]
         };
         callbackFunction === null || callbackFunction === void 0 || callbackFunction(event);
       }
@@ -210,17 +217,21 @@ const SeatingPlan = _ref => {
       });
     }
   };
-  const removeTicketFromCart = (s, e) => {
+  const removeTicketFromCart = async (s, e) => {
     const seatIndex = seats.seats.findIndex(seat => seat.ssId === s.ssId);
     updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
       loading: true
     }));
-    fetch("".concat(apiUrl, "/seat/").concat(s.ssId), {
-      method: "DELETE",
-      headers: {
-        "basket-key": sessionId
+    try {
+      const response = await fetch("".concat(apiUrl, "/seat/").concat(s.ssId), {
+        method: "DELETE",
+        headers: {
+          "basket-key": sessionId
+        }
+      });
+      if (!response.ok) {
+        throw new Error("".concat(response.status));
       }
-    }).then(() => {
       updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
         loading: false,
         s: _utils.statuses.UNSOLD,
@@ -232,7 +243,7 @@ const SeatingPlan = _ref => {
         details: bookedSeats.filter(bs => bs.ssId === s.ssId)
       };
       callbackFunction === null || callbackFunction === void 0 || callbackFunction(event);
-    }).catch(() => {
+    } catch (_unused2) {
       updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
         loading: false
       }));
@@ -240,30 +251,13 @@ const SeatingPlan = _ref => {
         code: 500,
         message: _utils.ERROR_MESSAGES.GENERIC_ERROR
       });
-    });
+    }
   };
   const batchAddTicketsToCart = async seatsToBook => {
     if (!canMultiSelect && !seats.preventOrphanedSeats || seatsToBook.length === 0) {
       return;
     }
-    const setSeatsLoading = loading => {
-      setSeats(prev => {
-        const updatedSeats = _objectSpread({}, prev);
-        seatsToBook.forEach(_ref2 => {
-          let {
-            seat
-          } = _ref2;
-          const seatIndex = updatedSeats.seats.findIndex(s => s.ssId === seat.ssId);
-          if (seatIndex !== -1) {
-            updatedSeats.seats[seatIndex] = _objectSpread(_objectSpread({}, updatedSeats.seats[seatIndex]), {}, {
-              loading: loading
-            });
-          }
-        });
-        return updatedSeats;
-      });
-    };
-    setSeatsLoading(true);
+    setSeatsLoading(seatsToBook.map(seat => seat.seat), true);
     const succeeded = [];
     const _tryBook = async function tryBook(seatToBook) {
       let retryCount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
@@ -284,7 +278,7 @@ const SeatingPlan = _ref => {
         if (res.status === 429) {
           if (retryCount < BOOKING_MAX_RETRIES) {
             setRetrying(prev => [...prev, seatToBook.seat.ssId]);
-            const delay = (0, _utils.getRetryDelay)(res, retryCount);
+            const delay = (0, _utils.getRetryDelay)(res);
             await new Promise(resolve => setTimeout(resolve, delay));
             return _tryBook(seatToBook, retryCount + 1);
           } else {
@@ -294,7 +288,7 @@ const SeatingPlan = _ref => {
           throw new Error("".concat(res.status));
         }
         succeeded.push(seatToBook.seat);
-      } catch (_unused2) {
+      } catch (_unused3) {
         throw new Error("Booking failed for seat ".concat(seatToBook.seat.r, " ").concat(seatToBook.seat.c));
       }
     };
@@ -303,27 +297,24 @@ const SeatingPlan = _ref => {
         await _tryBook(seatToBook);
       }
       setRetrying(prev => prev.filter(id => !seatsToBook.some(s => s.seat.ssId === id)));
-      setBookedSeats(prev => [...prev, ...seatsToBook.map(_ref3 => {
+      setBookedSeats(prev => [...prev, ...seatsToBook.map(_ref2 => {
         let {
           seat,
           priceage
-        } = _ref3;
-        return {
-          ssId: seat.ssId,
-          r: seat.r,
-          c: seat.c,
+        } = _ref2;
+        return _objectSpread(_objectSpread({}, seat), {}, {
           showingId: showingId,
           pId: priceage.paId,
           p: priceage.p,
           paName: priceage.paName
-        };
+        });
       })]);
       setSeats(prev => {
         const updatedSeats = _objectSpread({}, prev);
-        seatsToBook.forEach(_ref4 => {
+        seatsToBook.forEach(_ref3 => {
           let {
             seat
-          } = _ref4;
+          } = _ref3;
           const seatIndex = updatedSeats.seats.findIndex(s => s.ssId === seat.ssId);
           if (seatIndex !== -1) {
             updatedSeats.seats[seatIndex] = _objectSpread(_objectSpread({}, updatedSeats.seats[seatIndex]), {}, {
@@ -337,20 +328,17 @@ const SeatingPlan = _ref => {
       });
       const event = {
         type: "cart-change-add",
-        details: [...bookedSeats, ...seatsToBook.map(_ref5 => {
+        details: [...seatsToBook.map(_ref4 => {
           let {
             seat,
             priceage
-          } = _ref5;
-          return {
-            ssId: seat.ssId,
-            r: seat.r,
-            c: seat.c,
+          } = _ref4;
+          return _objectSpread(_objectSpread({}, seat), {}, {
             showingId: showingId,
             pId: priceage.paId,
             p: priceage.p,
             paName: priceage.paName
-          };
+          });
         })]
       };
       callbackFunction === null || callbackFunction === void 0 || callbackFunction(event);
@@ -365,7 +353,7 @@ const SeatingPlan = _ref => {
           }
         });
       }
-      setSeatsLoading(false);
+      setSeatsLoading(seatsToBook.map(seat => seat.seat), false);
       handleError({
         code: error === "429" ? 429 : 500,
         message: _utils.ERROR_MESSAGES.GENERIC_ERROR
@@ -376,18 +364,7 @@ const SeatingPlan = _ref => {
     if (!canMultiSelect && !seats.preventOrphanedSeats || seatsToRemove.length === 0) {
       return;
     }
-    setSeats(prev => {
-      const updatedSeats = _objectSpread({}, prev);
-      seatsToRemove.forEach(s => {
-        const seatIndex = updatedSeats.seats.findIndex(seat => seat.ssId === s.ssId);
-        if (seatIndex !== -1) {
-          updatedSeats.seats[seatIndex] = _objectSpread(_objectSpread({}, updatedSeats.seats[seatIndex]), {}, {
-            loading: true
-          });
-        }
-      });
-      return updatedSeats;
-    });
+    setSeatsLoading(seatsToRemove, true);
     const succeededIds = [];
     try {
       for (const seat of seatsToRemove) {
@@ -406,7 +383,7 @@ const SeatingPlan = _ref => {
           console.error("Failed to remove seat ".concat(seat, ":"), error);
         }
       }
-    } catch (_unused3) {
+    } catch (_unused4) {
       handleError({
         code: 500,
         message: _utils.ERROR_MESSAGES.GENERIC_ERROR
@@ -481,7 +458,7 @@ const SeatingPlan = _ref => {
         if (retryCount >= SEATINGPLAN_MAX_RETRIES) {
           throw new Error("We're experiencing high demand. Please try again later.");
         }
-        const delay = (0, _utils.getRetryDelay)(response, retryCount);
+        const delay = (0, _utils.getRetryDelay)(response);
         setInitialiseMessage("We're experiencing high demand. Please wait while we try again...");
         await new Promise(resolve => setTimeout(resolve, delay));
         return _initialFetch(isReload, retryCount + 1);

package/dist/utils/helpers.js

@@ -228,15 +228,13 @@ const getAdjacentBookedSeats = (seat, seatsMap) => {
   return adjacentBookedSeats;
 };
 exports.getAdjacentBookedSeats = getAdjacentBookedSeats;
-const getRetryDelay = (response, attempt) => {
+const getRetryDelay = response => {
   var _ref, _ref2, _response$headers$get;
   const retryAfter = (_ref = (_ref2 = (_response$headers$get = response.headers.get("Retry-After")) !== null && _response$headers$get !== void 0 ? _response$headers$get : response.headers.get("retry-after")) !== null && _ref2 !== void 0 ? _ref2 : response.headers.get("rl-twm")) !== null && _ref !== void 0 ? _ref : "5";
-  if (retryAfter) {
-    return response.headers.get("rl-twm") ? Math.round(parseInt(retryAfter) * 60 * 1000) : parseInt(retryAfter) * 1000;
-  }
+  const delay = response.headers.get("rl-twm") ? Math.round(parseInt(retryAfter) * 60 * 1000) : parseInt(retryAfter) * 1000;
 
   // adds jitter
-  return attempt + Math.random() * 1000;
+  return delay + Math.random() * 1000;
 };
 exports.getRetryDelay = getRetryDelay;
 const groupSeatsByPriceSection = (seats, pricing, priceSectionIds) => {

package/package.json

@@ -2,7 +2,7 @@
   "name": "iticket-seatingplan-dev",
   "description": "Seating plan with FLEXi pricing",
   "author": "gedwyne",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "private": false,
   "keywords": [
     "iticket",