From 8fc9b9ae9dbc2cc23481873e46683e178beb6f5b Mon Sep 17 00:00:00 2001 From: Lauris Skraucis Date: Thu, 4 Apr 2024 12:28:35 +0200 Subject: [PATCH] chore: downgrade react query atoms (#14328) * refactor: downgrade atoms react-query to v4 * driveby: prettier format file * refactor: react-query isPending to isLoading * chore: bump atoms version * refactor: isPending -> isLoading * chore: bump version --- packages/features/bookings/Booker/Booker.tsx | 8 +- .../BookEventForm/BookEventForm.tsx | 4 +- .../bookings/Booker/components/DatePicker.tsx | 2 +- .../bookings/Booker/components/EventMeta.tsx | 2 +- .../features/bookings/Booker/utils/event.ts | 3 +- packages/features/embed/Embed.tsx | 2 +- .../availability/AvailabilitySettings.tsx | 11 +- .../PlatformAvailabilitySettingsWrapper.tsx | 44 ++++---- .../atoms/booker/BookerPlatformWrapper.tsx | 8 +- packages/platform/atoms/package.json | 4 +- yarn.lock | 103 +++--------------- 11 files changed, 51 insertions(+), 140 deletions(-) diff --git a/packages/features/bookings/Booker/Booker.tsx b/packages/features/bookings/Booker/Booker.tsx index b69f11f83e..eca7ba7dda 100644 --- a/packages/features/bookings/Booker/Booker.tsx +++ b/packages/features/bookings/Booker/Booker.tsx @@ -134,7 +134,7 @@ const BookerComponent = ({ } = calendars; useEffect(() => { - if (event.isPending) return setBookerState("loading"); + if (event.isLoading) return setBookerState("loading"); if (!selectedDate) return setBookerState("selecting_date"); if (!selectedTimeslot) return setBookerState("selecting_time"); return setBookerState("booking"); @@ -354,7 +354,7 @@ const BookerComponent = ({ /> )} - + {layout !== BookerLayouts.MONTH_VIEW && !(layout === "mobile" && bookerState === "booking") && (
@@ -392,7 +392,7 @@ const BookerComponent = ({ @@ -416,7 +416,7 @@ const BookerComponent = ({ extraDays={extraDays} limitHeight={layout === BookerLayouts.MONTH_VIEW} schedule={schedule?.data} - isLoading={schedule.isPending} + isLoading={schedule.isLoading} seatsPerTimeSlot={event.data?.seatsPerTimeSlot} showAvailableSeatsCount={event.data?.seatsShowAvailabilityCount} event={event} diff --git a/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx b/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx index 95c180cc2b..0e73b13fa7 100644 --- a/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx +++ b/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx @@ -7,7 +7,7 @@ import type { FieldError } from "react-hook-form"; import { IS_CALCOM, WEBSITE_URL } from "@calcom/lib/constants"; import getPaymentAppData from "@calcom/lib/getPaymentAppData"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { Alert, Button, EmptyScreen, Form, Icon } from "@calcom/ui"; +import { Alert, Button, EmptyScreen, Form } from "@calcom/ui"; import { useBookerStore } from "../../store"; import type { useEventReturnType } from "../../utils/event"; @@ -63,7 +63,7 @@ export const BookEventForm = ({ }, [eventType]); if (eventQuery.isError) return ; - if (eventQuery.isPending || !eventQuery.data) return ; + if (eventQuery.isLoading || !eventQuery.data) return ; if (!timeslot) return ( { setSelectedDate(date === null ? date : date.format("YYYY-MM-DD")); }} diff --git a/packages/features/bookings/Booker/components/EventMeta.tsx b/packages/features/bookings/Booker/components/EventMeta.tsx index 284ae0d66b..085f77f2fc 100644 --- a/packages/features/bookings/Booker/components/EventMeta.tsx +++ b/packages/features/bookings/Booker/components/EventMeta.tsx @@ -29,7 +29,7 @@ export const EventMeta = ({ isPlatform = true, }: { event: useEventReturnType["data"]; - isPending: useEventReturnType["isPending"]; + isPending: useEventReturnType["isLoading"]; isPlatform?: boolean; }) => { const { setTimezone, timeFormat, timezone } = useTimePreferences(); diff --git a/packages/features/bookings/Booker/utils/event.ts b/packages/features/bookings/Booker/utils/event.ts index 150166d407..9ae6577dac 100644 --- a/packages/features/bookings/Booker/utils/event.ts +++ b/packages/features/bookings/Booker/utils/event.ts @@ -33,7 +33,7 @@ export const useEvent = () => { data: event?.data, isSuccess: event?.isSuccess, isError: event?.isError, - isPending: event?.isPending, + isLoading: event?.isPending, }; }; @@ -104,7 +104,6 @@ export const useScheduleForEvent = ({ return { data: schedule?.data, - isPending: schedule?.isPending, isError: schedule?.isError, isSuccess: schedule?.isSuccess, isLoading: schedule?.isLoading, diff --git a/packages/features/embed/Embed.tsx b/packages/features/embed/Embed.tsx index 8134f4e1ad..a4ea9b320c 100644 --- a/packages/features/embed/Embed.tsx +++ b/packages/features/embed/Embed.tsx @@ -240,7 +240,7 @@ const EmailEmbed = ({
{t("select_date")}
{ setSelectedDate(date === null ? date : date.format("YYYY-MM-DD")); }} diff --git a/packages/platform/atoms/availability/AvailabilitySettings.tsx b/packages/platform/atoms/availability/AvailabilitySettings.tsx index 20f39f5626..cfdcaab105 100644 --- a/packages/platform/atoms/availability/AvailabilitySettings.tsx +++ b/packages/platform/atoms/availability/AvailabilitySettings.tsx @@ -178,10 +178,7 @@ const DateOverride = ({ onChange={(ranges) => ranges.forEach((range) => append({ ranges: [range] }))} userTimeFormat={userTimeFormat} Trigger={ - } @@ -324,11 +321,7 @@ export function AvailabilitySettings({ openSidebar ? "translate-x-0 opacity-100" : "translate-x-full opacity-0" )}>
-