iticket-seatingplan-dev 1.8.3 → 1.8.5

package/dist/components/Controls.js

@@ -33,7 +33,7 @@ function Controls(_ref) {
     isReloading,
     onReload
   } = _ref;
-  const [isLegendOpen, setIsLegendOpen] = (0, _react.useState)(false);
+  const [isLegendOpen, setIsLegendOpen] = (0, _react.useState)(true);
   const map = (0, _reactLeaflet.useMap)();
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, preventOrphanedSeats && /*#__PURE__*/_react.default.createElement(_reactLeafletCustomControl.default, {
     position: "topright"

package/dist/components/SeatingPlan.js

@@ -24,8 +24,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-const SEATINGPLAN_MAX_RETRIES = 5;
-const BOOKING_MAX_RETRIES = 2;
+const MAX_RETRIES = 5;
 const SeatingPlan = _ref => {
   var _document, _document2, _document3;
   let {
@@ -68,7 +67,6 @@ const SeatingPlan = _ref => {
   const [seatsToRemove, setSeatsToRemove] = (0, _react.useState)([]);
   const [removeMultipleSeatsPopupOpen, setRemoveMultipleSeatsPopupOpen] = (0, _react.useState)(false);
   const [invalidSeatsPopupOpen, setInvalidSeatsPopupOpen] = (0, _react.useState)(false);
-  const [retrying, setRetrying] = (0, _react.useState)([]);
   const mapRef = (0, _react.useRef)(null);
   const canMultiSelect = bookingMode === _utils.bookingModes.POS;
   const apiUrl = "".concat(baseUrl, "/legacy/").concat(countryCode, "/shop/events/").concat(eventId, "/").concat(eventVenueId, "/showings/").concat(showingId, "/tickets/allocated/").concat(areaId);
@@ -85,22 +83,17 @@ const SeatingPlan = _ref => {
     };
     callbackFunction === null || callbackFunction === void 0 || callbackFunction(event);
   };
-  const updateSeat = (seatIndex, newSeat) => {
-    if (seatIndex !== -1) {
-      setSeats(prev => {
-        const updatedSeats = _objectSpread({}, prev);
-        updatedSeats.seats[seatIndex] = newSeat;
-        return updatedSeats;
-      });
-    }
-  };
-  const _addTicketToCart = async function addTicketToCart(s, priceage) {
+  const addTicketToCart = (s, priceage) => {
     var _mapRef$current;
-    let retryCount = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-    const seatIndex = seats.seats.findIndex(seat => seat.ssId === s.ssId);
-    updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
-      loading: true
-    }));
+    const updatedSeats = _objectSpread({}, seats);
+    const seatIndex = updatedSeats.seats.findIndex(seat => seat.ssId === s.ssId);
+    const setSeatLoading = loading => {
+      if (seatIndex !== -1) {
+        updatedSeats.seats[seatIndex].loading = loading;
+        setSeats(updatedSeats);
+      }
+    };
+    setSeatLoading(true);
     const isSeatAvailable = (s.s === _utils.statuses.UNSOLD || s.s === _utils.statuses.USER_PENDING) && !(bookedSeats.length >= quantity && s.s === _utils.statuses.UNSOLD) && (priceage.q === null || priceage.q > 0);
     if (!isSeatAvailable) {
       if (bookedSeats.length >= quantity) {
@@ -112,70 +105,50 @@ const SeatingPlan = _ref => {
           message: _utils.ERROR_MESSAGES.NO_ALLOCATION
         });
       }
-      updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
-        loading: false
-      }));
+      setSeatLoading(false);
       return;
     }
     (_mapRef$current = mapRef.current) === null || _mapRef$current === void 0 || (_mapRef$current = _mapRef$current.target) === null || _mapRef$current === void 0 || _mapRef$current.closePopup();
-    try {
-      const response = await fetch(apiUrl, {
-        method: "POST",
-        body: JSON.stringify({
-          priceAgeId: priceage.paId,
-          seatId: s.ssId,
-          price: priceage.p,
-          connectedShowings: connectedShowings
-        }),
-        headers: {
-          "content-type": "application/json",
-          "basket-key": sessionId
-        }
-      });
-      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);
-          await new Promise(resolve => setTimeout(resolve, delay));
-          return _addTicketToCart(s, priceage, retryCount + 1);
-        }
-        updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
-          loading: false
-        }));
-        setRetrying(prev => prev.filter(id => id !== s.ssId));
-        handleError({
-          code: 429,
-          message: _utils.ERROR_MESSAGES.MAX_RETRIES
-        });
-        return;
+    fetch(apiUrl, {
+      method: "POST",
+      body: JSON.stringify({
+        priceAgeId: priceage.paId,
+        seatId: s.ssId,
+        price: priceage.p,
+        connectedShowings: connectedShowings
+      }),
+      headers: {
+        "content-type": "application/json",
+        "basket-key": sessionId
       }
-      setRetrying(prev => prev.filter(id => id !== s.ssId));
-      if ((response === null || response === void 0 ? void 0 : response.status) === 403) {
-        updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
-          loading: false,
-          s: _utils.statuses.SOLD
-        }));
+    }).then(response => {
+      if ((response === null || response === void 0 ? void 0 : response.status) === 403 || (response === null || response === void 0 ? void 0 : response.status) === 400) {
+        if (seatIndex !== -1) {
+          updatedSeats.seats[seatIndex] = _objectSpread(_objectSpread({}, s), {}, {
+            loading: false,
+            s: _utils.statuses.SOLD
+          });
+          setSeats(updatedSeats);
+        }
         handleError({
           code: 403,
-          message: _utils.ERROR_MESSAGES.SEAT_TAKEN
+          message: response.status === 400 ? _utils.ERROR_MESSAGES.INCOMPATIBLE_TICKETS : _utils.ERROR_MESSAGES.SEAT_UNAVAILABLE
         });
-        return;
-      }
-      updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
-        loading: false
-      }));
-      if (!(response !== null && response !== void 0 && response.ok)) {
+      } else if ((response === null || response === void 0 ? void 0 : response.status) === 429) {
+        setSeatLoading(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
+          code: 429,
+          message: _utils.ERROR_MESSAGES.SEAT_TAKEN
         });
       } else {
-        setRetrying(prev => prev.filter(id => id !== s.ssId));
-        updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
-          loading: false,
-          s: _utils.statuses.USER_PENDING,
-          bookedPrice: price
-        }));
+        if (seatIndex !== -1) {
+          updatedSeats.seats[seatIndex] = _objectSpread(_objectSpread({}, s), {}, {
+            s: _utils.statuses.USER_PENDING,
+            bookedPrice: price,
+            loading: false
+          });
+          setSeats(updatedSeats);
+        }
         setBookedSeats(prev => [...prev, {
           ssId: s.ssId,
           r: s.r,
@@ -199,33 +172,40 @@ const SeatingPlan = _ref => {
         };
         callbackFunction === null || callbackFunction === void 0 || callbackFunction(event);
       }
-    } catch (_unused) {
-      updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
-        loading: false
-      }));
-      setRetrying(prev => prev.filter(id => id !== s.ssId));
+    }).catch(() => {
+      setSeatLoading(false);
       handleError({
         code: 500,
         message: _utils.ERROR_MESSAGES.GENERIC_ERROR
       });
-    }
+    }).finally(() => {
+      _initialFetch(true);
+    });
   };
   const removeTicketFromCart = (s, e) => {
-    const seatIndex = seats.seats.findIndex(seat => seat.ssId === s.ssId);
-    updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
-      loading: true
-    }));
+    const updatedSeats = _objectSpread({}, seats);
+    const seatIndex = updatedSeats.seats.findIndex(seat => seat.ssId === s.ssId);
+    const setSeatLoading = loading => {
+      if (seatIndex !== -1) {
+        updatedSeats.seats[seatIndex].loading = loading;
+        setSeats(updatedSeats);
+      }
+    };
+    setSeatLoading(true);
     fetch("".concat(apiUrl, "/seat/").concat(s.ssId), {
       method: "DELETE",
       headers: {
         "basket-key": sessionId
       }
     }).then(() => {
-      updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
-        loading: false,
-        s: _utils.statuses.UNSOLD,
-        bookedPrice: null
-      }));
+      if (seatIndex !== -1) {
+        updatedSeats.seats[seatIndex] = _objectSpread(_objectSpread({}, s), {}, {
+          loading: false,
+          s: _utils.statuses.UNSOLD,
+          bookedPrice: null
+        });
+        setSeats(updatedSeats);
+      }
       setBookedSeats(prev => prev.filter(bs => bs.ssId !== s.ssId));
       const event = {
         type: "cart-change-remove",
@@ -233,81 +213,64 @@ const SeatingPlan = _ref => {
       };
       callbackFunction === null || callbackFunction === void 0 || callbackFunction(event);
     }).catch(() => {
-      updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
-        loading: false
-      }));
+      setSeatLoading(false);
+      e.target.setStyle({
+        fillColor: _utils.statusColors.booked
+      });
       handleError({
         code: 500,
         message: _utils.ERROR_MESSAGES.GENERIC_ERROR
       });
+    }).finally(() => {
+      _initialFetch(true);
     });
   };
   const batchAddTicketsToCart = async seatsToBook => {
     if (!canMultiSelect && !seats.preventOrphanedSeats || seatsToBook.length === 0) {
       return;
     }
+    const updatedSeats = _objectSpread({}, seats);
+    const seatIds = seatsToBook.map(s => s.seat.ssId);
     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;
+      updatedSeats.seats.forEach(s => {
+        if (seatIds.includes(s.ssId)) {
+          s.loading = loading;
+        }
       });
+      setSeats(updatedSeats);
     };
     setSeatsLoading(true);
     const succeeded = [];
-    const _tryBook = async function tryBook(seatToBook) {
-      let retryCount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-      try {
-        const res = await fetch(apiUrl, {
-          method: "POST",
-          body: JSON.stringify({
-            priceAgeId: seatToBook.priceage.paId,
-            seatId: seatToBook.seat.ssId,
-            price: seatToBook.priceage.p,
-            connectedShowings: connectedShowings
-          }),
-          headers: {
-            "content-type": "application/json",
-            "basket-key": sessionId
-          }
-        });
-        if (res.status === 429) {
-          if (retryCount < BOOKING_MAX_RETRIES) {
-            setRetrying(prev => [...prev, seatToBook.seat.ssId]);
-            const delay = (0, _utils.getRetryDelay)(res, retryCount);
-            await new Promise(resolve => setTimeout(resolve, delay));
-            return _tryBook(seatToBook, retryCount + 1);
-          } else {
-            throw new Error("429");
+    try {
+      for (const seat of seatsToBook) {
+        try {
+          const res = await fetch(apiUrl, {
+            method: "POST",
+            body: JSON.stringify({
+              priceAgeId: seat.priceage.paId,
+              seatId: seat.seat.ssId,
+              price: seat.priceage.p,
+              connectedShowings: connectedShowings
+            }),
+            headers: {
+              "content-type": "application/json",
+              "basket-key": sessionId
+            }
+          });
+          if (!res.ok) {
+            throw new Error("".concat(res.status));
           }
-        } else if (!res.ok) {
-          throw new Error("".concat(res.status));
+          succeeded.push(seat);
+        } catch (error) {
+          console.error("Failed to book seat ".concat(seat.seat.r, " ").concat(seat.seat.c, ":"), error);
+          throw new Error(error === "429" ? error : "Booking failed for seat ".concat(seat.seat.r, " ").concat(seat.seat.c));
         }
-        succeeded.push(seatToBook.seat);
-      } catch (_unused2) {
-        throw new Error("Booking failed for seat ".concat(seatToBook.seat.r, " ").concat(seatToBook.seat.c));
       }
-    };
-    try {
-      for (const seatToBook of seatsToBook) {
-        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;
+        } = _ref2;
         return {
           ssId: seat.ssId,
           r: seat.r,
@@ -318,30 +281,21 @@ const SeatingPlan = _ref => {
           paName: priceage.paName
         };
       })]);
-      setSeats(prev => {
-        const updatedSeats = _objectSpread({}, prev);
-        seatsToBook.forEach(_ref4 => {
-          let {
-            seat
-          } = _ref4;
-          const seatIndex = updatedSeats.seats.findIndex(s => s.ssId === seat.ssId);
-          if (seatIndex !== -1) {
-            updatedSeats.seats[seatIndex] = _objectSpread(_objectSpread({}, updatedSeats.seats[seatIndex]), {}, {
-              loading: false,
-              s: _utils.statuses.USER_PENDING,
-              bookedPrice: price
-            });
-          }
-        });
-        return updatedSeats;
+      updatedSeats.seats.forEach(s => {
+        if (seatIds.includes(s.ssId)) {
+          s.s = _utils.statuses.USER_PENDING;
+          s.bookedPrice = price;
+          s.loading = false;
+        }
       });
+      setSeats(updatedSeats);
       const event = {
         type: "cart-change-add",
-        details: [...bookedSeats, ...seatsToBook.map(_ref5 => {
+        details: [...bookedSeats, ...seatsToBook.map(_ref3 => {
           let {
             seat,
             priceage
-          } = _ref5;
+          } = _ref3;
           return {
             ssId: seat.ssId,
             r: seat.r,
@@ -355,7 +309,6 @@ const SeatingPlan = _ref => {
       };
       callbackFunction === null || callbackFunction === void 0 || callbackFunction(event);
     } catch (error) {
-      setRetrying(prev => prev.filter(id => !seatsToBook.some(s => s.seat.ssId === id)));
       console.error("Failed to book seats:", error);
       for (const seat of succeeded) {
         await fetch("".concat(apiUrl, "/seat/").concat(seat.ssId), {
@@ -368,26 +321,24 @@ const SeatingPlan = _ref => {
       setSeatsLoading(false);
       handleError({
         code: error === "429" ? 429 : 500,
-        message: _utils.ERROR_MESSAGES.GENERIC_ERROR
+        message: error === "429" ? _utils.ERROR_MESSAGES.SEAT_TAKEN : _utils.ERROR_MESSAGES.GENERIC_ERROR
       });
+    } finally {
+      _initialFetch(true);
     }
   };
   const batchRemoveTicketsFromCart = async seatsToRemove => {
     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;
+    const updatedSeats = _objectSpread({}, seats);
+    const seatIds = seatsToRemove.map(s => s.ssId);
+    updatedSeats.seats.forEach(s => {
+      if (seatIds.includes(s.ssId)) {
+        s.loading = true;
+      }
     });
+    setSeats(updatedSeats);
     const succeededIds = [];
     try {
       for (const seat of seatsToRemove) {
@@ -406,27 +357,23 @@ const SeatingPlan = _ref => {
           console.error("Failed to remove seat ".concat(seat, ":"), error);
         }
       }
-    } catch (_unused3) {
+    } catch (_unused) {
       handleError({
         code: 500,
         message: _utils.ERROR_MESSAGES.GENERIC_ERROR
       });
     }
     setBookedSeats(prev => [...prev.filter(v => !succeededIds.includes(v.ssId))]);
-    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: false,
-            s: succeededIds.includes(s.ssId) ? _utils.statuses.UNSOLD : s.s,
-            bookedPrice: null
-          });
+    updatedSeats.seats.forEach(s => {
+      if (seatIds.includes(s.ssId)) {
+        s.loading = false;
+        if (succeededIds.includes(s.ssId)) {
+          s.s = _utils.statuses.UNSOLD;
+          s.bookedPrice = null;
         }
-      });
-      return updatedSeats;
+      }
     });
+    setSeats(updatedSeats);
     setSeatsToRemove([]);
     if (succeededIds.length > 0) {
       const event = {
@@ -435,6 +382,7 @@ const SeatingPlan = _ref => {
       };
       callbackFunction === null || callbackFunction === void 0 || callbackFunction(event);
     }
+    _initialFetch(true);
   };
   const handleClickSeat = (e, s) => {
     setChosenSeat({
@@ -454,7 +402,7 @@ const SeatingPlan = _ref => {
       const availablePrices = ((_seats$pricing = seats.pricing) === null || _seats$pricing === void 0 ? void 0 : _seats$pricing.filter(price => (!priceSectionIds || priceSectionIds.includes(price.psId)) && s.psId === price.psId)) || [];
       const isSingleFlexi = availablePrices.length === 1 && !!availablePrices[0].pMax && !!availablePrices[0].pMin && availablePrices[0].pMax > availablePrices[0].pMin;
       if (availablePrices.length === 1 && !isSingleFlexi) {
-        _addTicketToCart(s, availablePrices[0]);
+        addTicketToCart(s, availablePrices[0]);
       }
     } else {
       removeTicketFromCart(s, e);
@@ -478,7 +426,7 @@ const SeatingPlan = _ref => {
         }
       });
       if (response.status === 429) {
-        if (retryCount >= SEATINGPLAN_MAX_RETRIES) {
+        if (retryCount >= MAX_RETRIES) {
           throw new Error("We're experiencing high demand. Please try again later.");
         }
         const delay = (0, _utils.getRetryDelay)(response, retryCount);
@@ -568,9 +516,7 @@ const SeatingPlan = _ref => {
     pricing: seats.pricing,
     priceSectionIds: priceSectionIds,
     batchAddTicketsToCart: batchAddTicketsToCart
-  }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), retrying.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
-    className: "retrying"
-  }, "Looks like things are busy right now. Please wait while we continue to confirm your selection...") : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), seats.preventOrphanedSeats && selectQuantityPopupOpen ? /*#__PURE__*/_react.default.createElement(_SelectQuantityPopup.default, {
+  }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), seats.preventOrphanedSeats && selectQuantityPopupOpen ? /*#__PURE__*/_react.default.createElement(_SelectQuantityPopup.default, {
     quantity: desiredSeatQuantity,
     setQuantity: v => {
       setDesiredSeatQuantity(v);
@@ -607,7 +553,7 @@ const SeatingPlan = _ref => {
     setTicketPopupOpen: setTicketPopupOpen,
     chosenSeat: chosenSeat,
     bookedSeats: bookedSeats,
-    addTicketToCart: _addTicketToCart,
+    addTicketToCart: addTicketToCart,
     batchRemoveTicketsFromCart: batchRemoveTicketsFromCart,
     isReloading: isReloading,
     initialFetch: _initialFetch,

package/dist/components/styles/index.css

@@ -1597,22 +1597,6 @@ svg.leaflet-image-layer.leaflet-interactive path {
   transform: translateX(-50%);
 }
 
-.retrying {
-  position: absolute;
-  top: 10px;
-  left: 50%;
-  transform: translateX(-50%);
-  background: white;
-  border-radius: 5px;
-  padding: 0.5rem;
-  font-size: 0.875rem;
-  color: #333;
-  box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-  z-index: 1005;
-  animation: fade-in 400ms;
-  max-width: 50%;
-}
-
 /* Printing */
 
 @media print {

package/dist/utils/enums.js

@@ -42,6 +42,5 @@ const ERROR_MESSAGES = exports.ERROR_MESSAGES = {
   SEAT_TAKEN: "Someone else selected this first. Please try again",
   GENERIC_ERROR: "Oops! Something went wrong. Please try again.",
   MAX_QUANTITY: "Maximum ticket booking quantity specified reached.",
-  NO_ALLOCATION: "Allocation exhausted, please try another area or price.",
-  MAX_RETRIES: "Looks like things are busy and we couldn't complete your request. Please try again."
+  NO_ALLOCATION: "Allocation exhausted, please try another area or price."
 };

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.5",
   "private": false,
   "keywords": [
     "iticket",