fixes issues with date of recurring events on booking detail page (#2872)

* fixes date not showing for confirmed recurring event

* only show all events on upcoming bookings

Co-authored-by: CarinaWolli <wollencarina@gmail.com>
This commit is contained in:
Carina Wollendorfer
2022-05-25 11:24:01 +02:00
committed by GitHub
co-authored by CarinaWolli
parent dc934ed8ca
commit 07aa2e88a1
2 changed files with 8 additions and 4 deletions
@@ -230,6 +230,7 @@ function BookingListItem(booking: BookingItemProps) {
bookingId: booking.id,
recur: booking.recurringEventId,
reschedule: booking.confirmed,
status: booking.listingStatus,
},
})
}>
+7 -4
View File
@@ -148,7 +148,7 @@ type SuccessProps = inferSSRProps<typeof getServerSideProps>;
export default function Success(props: SuccessProps) {
const { t } = useLocale();
const router = useRouter();
const { location: _location, name, reschedule } = router.query;
const { location: _location, name, reschedule, status } = router.query;
const location = Array.isArray(_location) ? _location[0] : _location;
const [is24h, setIs24h] = useState(isBrowserLocale24h());
const { data: session } = useSession();
@@ -333,6 +333,7 @@ export default function Success(props: SuccessProps) {
isReschedule={reschedule === "true"}
eventType={props.eventType}
recurringBookings={props.recurringBookings}
status={(status as string) || "upcoming"}
date={date}
is24h={is24h}
/>
@@ -590,6 +591,7 @@ type RecurringBookingsProps = {
recurringBookings: SuccessProps["recurringBookings"];
date: dayjs.Dayjs;
is24h: boolean;
status: string;
};
function RecurringBookings({
@@ -597,10 +599,11 @@ function RecurringBookings({
eventType,
recurringBookings,
date,
status,
}: RecurringBookingsProps) {
const [moreEventsVisible, setMoreEventsVisible] = useState(false);
const { t } = useLocale();
return !isReschedule && recurringBookings ? (
return !isReschedule && recurringBookings && status === "upcoming" ? (
<>
{eventType.recurringEvent?.count &&
recurringBookings.slice(0, 4).map((dateStr, idx) => (
@@ -636,7 +639,7 @@ function RecurringBookings({
</Collapsible>
)}
</>
) : !eventType.recurringEvent.freq ? (
) : (
<>
{date.format("MMMM DD, YYYY")}
<br />
@@ -645,7 +648,7 @@ function RecurringBookings({
({localStorage.getItem("timeOption.preferredTimeZone") || dayjs.tz.guess()})
</span>
</>
) : null;
);
}
const getEventTypesFromDB = async (id: number) => {