From 181379ee1cfb71985bfc633e516b24b1af3e8055 Mon Sep 17 00:00:00 2001 From: lucia <51058748+lucia-gomez@users.noreply.github.com> Date: Tue, 17 Sep 2024 16:30:34 -0400 Subject: [PATCH] Update fetchCalendarEvents.tsx --- .../booking/hooks/fetchCalendarEvents.tsx | 47 +++++++------------ 1 file changed, 18 insertions(+), 29 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 83c8964b..71d91a4f 100644 --- a/booking-app/components/src/client/routes/booking/hooks/fetchCalendarEvents.tsx +++ b/booking-app/components/src/client/routes/booking/hooks/fetchCalendarEvents.tsx @@ -1,40 +1,29 @@ -import { Booking, CalendarEvent, RoomSetting } from "../../../../types"; -import { CALENDAR_HIDE_STATUS, STORAGE_KEY_BOOKING } from "../../../../policy"; -import { useCallback, useEffect, useMemo, useState } from "react"; +import { CalendarEvent, RoomSetting } from "../../../../types"; +import { useCallback, useEffect, useState } from "react"; +import { CALENDAR_HIDE_STATUS } from "../../../../policy"; import axios from "axios"; -import getBookingStatus from "../../hooks/getBookingStatus"; export default function fetchCalendarEvents(allRooms: RoomSetting[]) { const [events, setEvents] = useState([]); const loadEvents = useCallback(() => { - Promise.all(allRooms.map(fetchRoomCalendarEvents)).then( - (results) => { - const flatResults = results.flat(); - console.log("FETCHED CALENDAR RESULTS:", flatResults.length); - const filtered = flatResults.filter( - (event) => - !CALENDAR_HIDE_STATUS.some((hideStatus) => - event.title?.includes(hideStatus) - ) - ); - if (filtered.length === 0 && events.length > 0) { - console.log("!!! RE-FETCHING CALENDAR EVENTS WAS EMPTY !!!"); - } else { - setEvents(filtered); - } + Promise.all(allRooms.map(fetchRoomCalendarEvents)).then((results) => { + const flatResults = results.flat(); + console.log("FETCHED CALENDAR RESULTS:", flatResults.length); + const filtered = flatResults.filter( + (event) => + !CALENDAR_HIDE_STATUS.some((hideStatus) => + event.title?.includes(hideStatus) + ) + ); + if (filtered.length === 0 && events.length > 0) { + console.log("!!! RE-FETCHING CALENDAR EVENTS WAS EMPTY !!!"); + } else { + setEvents(filtered); } - // setEvents( - // [...results.flat()].filter( - // (event) => - // !CALENDAR_HIDE_STATUS.some((status) => - // event?.title?.includes(status) - // ) - // ) - // ) - ); - }, [allRooms]); + }); + }, [allRooms, events]); useEffect(() => { loadEvents();