From 19128fb08e35631e3d3fb8cbe0e0cc25fa466f2a Mon Sep 17 00:00:00 2001 From: Hariom Balhara Date: Wed, 11 May 2022 16:05:43 +0530 Subject: [PATCH] Hotfix : Fix Infinite loading of Bookings (#2729) * Add more embed events * Add more embed events * Fix nextCursor calculation logic Co-authored-by: Peer Richelsen --- apps/web/server/routers/viewer.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/web/server/routers/viewer.tsx b/apps/web/server/routers/viewer.tsx index b5d84e025c..2153fb87d6 100644 --- a/apps/web/server/routers/viewer.tsx +++ b/apps/web/server/routers/viewer.tsx @@ -371,7 +371,6 @@ const loggedInViewerRouter = createProtectedRouter() }; const passedBookingsFilter = bookingListingFilters[bookingListingByStatus]; const orderBy = bookingListingOrderby[bookingListingByStatus]; - const bookingsQuery = await prisma.booking.findMany({ where: { OR: [ @@ -440,7 +439,7 @@ const loggedInViewerRouter = createProtectedRouter() endTime: booking.endTime.toISOString(), }; }); - + const bookingsFetched = bookings.length; const seenBookings: Record = {}; // Remove duplicate recurring bookings for upcoming status. @@ -461,7 +460,8 @@ const loggedInViewerRouter = createProtectedRouter() } let nextCursor: typeof skip | null = skip; - if (bookings.length > take) { + + if (bookingsFetched > take) { bookings.shift(); nextCursor += bookings.length; } else {