From 9412856b30b2916cc043408dd5b77ba4571f27a2 Mon Sep 17 00:00:00 2001 From: lucia <51058748+lucia-gomez@users.noreply.github.com> Date: Tue, 17 Sep 2024 13:31:08 -0400 Subject: [PATCH] add calendar event loading logs --- .../booking/hooks/fetchCalendarEvents.tsx | 64 +++++++++++-------- .../src/client/routes/components/Provider.tsx | 2 +- 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/booking-app/components/src/client/routes/booking/hooks/fetchCalendarEvents.tsx b/booking-app/components/src/client/routes/booking/hooks/fetchCalendarEvents.tsx index 1a321c48..aaa5bd8f 100644 --- a/booking-app/components/src/client/routes/booking/hooks/fetchCalendarEvents.tsx +++ b/booking-app/components/src/client/routes/booking/hooks/fetchCalendarEvents.tsx @@ -9,22 +9,36 @@ export default function fetchCalendarEvents(allRooms: RoomSetting[]) { const [events, setEvents] = useState([]); const loadEvents = useCallback(() => { - //TODO: Fix this after getting title from prodcalendars - Promise.all(allRooms.map(fetchRoomCalendarEvents)).then((results) => - setEvents( - [...results.flat()].filter( + Promise.all(allRooms.map(fetchRoomCalendarEvents)).then( + (results) => { + const flatResults = results.flat(); + console.log( + "FETCHED CALENDAR RESULTS FOR EACH ROOM (flat)", + flatResults + ); + const filtered = flatResults.filter( (event) => - !CALENDAR_HIDE_STATUS.some((status) => - event?.title?.includes(status) + !CALENDAR_HIDE_STATUS.some((hideStatus) => + event.title?.includes(hideStatus) ) - ) - ) + ); + console.log("FILTERED", filtered); + setEvents(filtered); + } + // setEvents( + // [...results.flat()].filter( + // (event) => + // !CALENDAR_HIDE_STATUS.some((status) => + // event?.title?.includes(status) + // ) + // ) + // ) ); }, [allRooms]); useEffect(() => { loadEvents(); - }, [loadEvents]); + }, [allRooms]); const fetchRoomCalendarEvents = async (room: RoomSetting) => { const calendarId = room.calendarId; @@ -48,22 +62,22 @@ export default function fetchCalendarEvents(allRooms: RoomSetting[]) { }; // TODO add this back or delete it - const getFakeEvents: () => CalendarEvent[] = () => { - const existingFakeData = localStorage.getItem(STORAGE_KEY_BOOKING); - if (existingFakeData != null && process.env.BRANCH_NAME === "development") { - const json = JSON.parse(existingFakeData); - return json.bookingRows.map((booking: Booking) => ({ - title: `[${getBookingStatus(booking, json.bookingStatusRows)}] ${ - booking.title - }`, - start: booking.startDate, - end: booking.endDate, - id: booking.roomId, - resourceId: booking.roomId, - })); - } - return []; - }; + // const getFakeEvents: () => CalendarEvent[] = () => { + // const existingFakeData = localStorage.getItem(STORAGE_KEY_BOOKING); + // if (existingFakeData != null && process.env.BRANCH_NAME === "development") { + // const json = JSON.parse(existingFakeData); + // return json.bookingRows.map((booking: Booking) => ({ + // title: `[${getBookingStatus(booking, json.bookingStatusRows)}] ${ + // booking.title + // }`, + // start: booking.startDate, + // end: booking.endDate, + // id: booking.roomId, + // resourceId: booking.roomId, + // })); + // } + // return []; + // }; return { existingCalendarEvents: events, diff --git a/booking-app/components/src/client/routes/components/Provider.tsx b/booking-app/components/src/client/routes/components/Provider.tsx index 32df7957..1e10808c 100644 --- a/booking-app/components/src/client/routes/components/Provider.tsx +++ b/booking-app/components/src/client/routes/components/Provider.tsx @@ -120,7 +120,6 @@ export const DatabaseProvider = ({ fetchBannedUsers(); fetchLiaisonUsers(); fetchDepartmentNames(); - fetchRoomSettings(); fetchSettings(); } else { fetchBookings(); @@ -132,6 +131,7 @@ export const DatabaseProvider = ({ fetchActiveUserEmail(); fetchAdminUsers(); fetchPaUsers(); + fetchRoomSettings(); }, [user]); const fetchActiveUserEmail = () => {