iticket-seatingplan-dev 1.8.2 → 1.8.4

package/dist/components/SeatingPlan.js

@@ -68,6 +68,7 @@ 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);
@@ -84,18 +85,36 @@ 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 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;
-    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 seatIndex = seats.seats.findIndex(seat => seat.ssId === s.ssId);
+    updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
+      loading: 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) {
@@ -107,7 +126,9 @@ const SeatingPlan = _ref => {
           message: _utils.ERROR_MESSAGES.NO_ALLOCATION
         });
       }
-      setSeatLoading(false);
+      updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
+        loading: false
+      }));
       return;
     }
     (_mapRef$current = mapRef.current) === null || _mapRef$current === void 0 || (_mapRef$current = _mapRef$current.target) === null || _mapRef$current === void 0 || _mapRef$current.closePopup();
@@ -125,134 +146,118 @@ const SeatingPlan = _ref => {
           "basket-key": sessionId
         }
       });
-      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: response.status === 400 ? _utils.ERROR_MESSAGES.INCOMPATIBLE_TICKETS : _utils.ERROR_MESSAGES.SEAT_UNAVAILABLE
-        });
-      } else if ((response === null || response === void 0 ? void 0 : response.status) === 429) {
+      if ((response === null || response === void 0 ? void 0 : response.status) === 429) {
         if (retryCount < BOOKING_MAX_RETRIES) {
-          const delay = (0, _utils.getRetryDelay)(response, retryCount);
+          setRetrying(prev => [...prev, s.ssId]);
+          const delay = (0, _utils.getRetryDelay)(response);
           await new Promise(resolve => setTimeout(resolve, delay));
           return _addTicketToCart(s, priceage, retryCount + 1);
         }
-        setSeatLoading(false);
+        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;
+      }
+      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
+        }));
+        handleError({
+          code: 403,
           message: _utils.ERROR_MESSAGES.SEAT_TAKEN
         });
-      } else if (!response.ok) {
-        setSeatLoading(false);
+        return;
+      }
+      if (!(response !== null && response !== void 0 && response.ok)) {
+        updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
+          loading: false
+        }));
         handleError({
-          code: 500,
-          message: _utils.ERROR_MESSAGES.GENERIC_ERROR
+          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 {
-        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,
-          c: s.c,
+        updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
+          loading: false,
+          s: _utils.statuses.USER_PENDING,
+          bookedPrice: price
+        }));
+        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);
       }
     } catch (_unused) {
-      setSeatLoading(false);
+      updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
+        loading: false
+      }));
+      setRetrying(prev => prev.filter(id => id !== s.ssId));
       handleError({
         code: 500,
         message: _utils.ERROR_MESSAGES.GENERIC_ERROR
       });
     }
-    _initialFetch(true);
   };
-  const removeTicketFromCart = (s, e) => {
-    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(() => {
-      if (seatIndex !== -1) {
-        updatedSeats.seats[seatIndex] = _objectSpread(_objectSpread({}, s), {}, {
-          loading: false,
-          s: _utils.statuses.UNSOLD,
-          bookedPrice: null
-        });
-        setSeats(updatedSeats);
+  const removeTicketFromCart = async (s, e) => {
+    const seatIndex = seats.seats.findIndex(seat => seat.ssId === s.ssId);
+    updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
+      loading: true
+    }));
+    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));
       }
+      updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
+        loading: false,
+        s: _utils.statuses.UNSOLD,
+        bookedPrice: null
+      }));
       setBookedSeats(prev => prev.filter(bs => bs.ssId !== s.ssId));
       const event = {
         type: "cart-change-remove",
         details: bookedSeats.filter(bs => bs.ssId === s.ssId)
       };
       callbackFunction === null || callbackFunction === void 0 || callbackFunction(event);
-    }).catch(() => {
-      setSeatLoading(false);
-      e.target.setStyle({
-        fillColor: _utils.statusColors.booked
-      });
+    } catch (_unused2) {
+      updateSeat(seatIndex, _objectSpread(_objectSpread({}, s), {}, {
+        loading: false
+      }));
       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 => {
-      updatedSeats.seats.forEach(s => {
-        if (seatIds.includes(s.ssId)) {
-          s.loading = loading;
-        }
-      });
-      setSeats(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;
@@ -272,65 +277,73 @@ const SeatingPlan = _ref => {
         });
         if (res.status === 429) {
           if (retryCount < BOOKING_MAX_RETRIES) {
-            const delay = (0, _utils.getRetryDelay)(res, retryCount);
+            setRetrying(prev => [...prev, seatToBook.seat.ssId]);
+            const delay = (0, _utils.getRetryDelay)(res);
             await new Promise(resolve => setTimeout(resolve, delay));
             return _tryBook(seatToBook, retryCount + 1);
+          } else {
+            throw new Error("429");
           }
-          throw new Error("429");
-        }
-        if (!res.ok) {
+        } else if (!res.ok) {
           throw new Error("".concat(res.status));
         }
-        succeeded.push(seatToBook);
-      } catch (_unused2) {
+        succeeded.push(seatToBook.seat);
+      } catch (_unused3) {
         throw new Error("Booking failed for seat ".concat(seatToBook.seat.r, " ").concat(seatToBook.seat.c));
       }
     };
     try {
-      await Promise.all(seatsToBook.map(seatToBook => _tryBook(seatToBook)));
+      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(_ref2 => {
         let {
           seat,
           priceage
         } = _ref2;
-        return {
-          ssId: seat.ssId,
-          r: seat.r,
-          c: seat.c,
+        return _objectSpread(_objectSpread({}, seat), {}, {
           showingId: showingId,
           pId: priceage.paId,
           p: priceage.p,
           paName: priceage.paName
-        };
+        });
       })]);
-      updatedSeats.seats.forEach(s => {
-        if (seatIds.includes(s.ssId)) {
-          s.s = _utils.statuses.USER_PENDING;
-          s.bookedPrice = price;
-          s.loading = false;
-        }
+      setSeats(prev => {
+        const updatedSeats = _objectSpread({}, prev);
+        seatsToBook.forEach(_ref3 => {
+          let {
+            seat
+          } = _ref3;
+          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;
       });
-      setSeats(updatedSeats);
       const event = {
         type: "cart-change-add",
-        details: [...bookedSeats, ...seatsToBook.map(_ref3 => {
+        details: [...seatsToBook.map(_ref4 => {
           let {
             seat,
             priceage
-          } = _ref3;
-          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);
     } 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), {
@@ -340,27 +353,18 @@ const SeatingPlan = _ref => {
           }
         });
       }
-      setSeatsLoading(false);
+      setSeatsLoading(seatsToBook.map(seat => seat.seat), false);
       handleError({
         code: error === "429" ? 429 : 500,
-        message: error === "429" ? _utils.ERROR_MESSAGES.SEAT_TAKEN : _utils.ERROR_MESSAGES.GENERIC_ERROR
+        message: _utils.ERROR_MESSAGES.GENERIC_ERROR
       });
-    } finally {
-      _initialFetch(true);
     }
   };
   const batchRemoveTicketsFromCart = async seatsToRemove => {
     if (!canMultiSelect && !seats.preventOrphanedSeats || seatsToRemove.length === 0) {
       return;
     }
-    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);
+    setSeatsLoading(seatsToRemove, true);
     const succeededIds = [];
     try {
       for (const seat of seatsToRemove) {
@@ -379,23 +383,27 @@ 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
       });
     }
     setBookedSeats(prev => [...prev.filter(v => !succeededIds.includes(v.ssId))]);
-    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;
+    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
+          });
         }
-      }
+      });
+      return updatedSeats;
     });
-    setSeats(updatedSeats);
     setSeatsToRemove([]);
     if (succeededIds.length > 0) {
       const event = {
@@ -404,7 +412,6 @@ const SeatingPlan = _ref => {
       };
       callbackFunction === null || callbackFunction === void 0 || callbackFunction(event);
     }
-    _initialFetch(true);
   };
   const handleClickSeat = (e, s) => {
     setChosenSeat({
@@ -451,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);
@@ -538,7 +545,9 @@ const SeatingPlan = _ref => {
     pricing: seats.pricing,
     priceSectionIds: priceSectionIds,
     batchAddTicketsToCart: batchAddTicketsToCart
-  }) : /*#__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), 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, {
     quantity: desiredSeatQuantity,
     setQuantity: v => {
       setDesiredSeatQuantity(v);

package/dist/components/styles/index.css

@@ -1597,6 +1597,22 @@ 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,5 +42,6 @@ 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."
+  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."
 };

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.2",
+  "version": "1.8.4",
   "private": false,
   "keywords": [
     "iticket",