Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: removed the confirm step in creating bookings #18380

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
+23 −9
Draft

feat: removed the confirm step in creating bookings #18380

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
53cef29
added functionality to remove the confirm step in creating bookings
theVedanta Dec 27, 2024
872aad3
changed the max-length update state exceeding error
theVedanta Dec 27, 2024
b5dd4a0
Revert yarn.lock to its state before unintended changes
theVedanta Dec 27, 2024
e0ad39e
Revert packages/prisma/.env
theVedanta Dec 27, 2024
0f18bff
Revert schema.prisma to its state before unintended changes
theVedanta Dec 28, 2024
f7a3345
Merge branch 'main' into remove-confirm-before-booking
hbjORbj Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions packages/features/bookings/Booker/Booker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,25 @@ const BookerComponent = ({
};

useEffect(() => {
if (event.isPending) return setBookerState("loading");
if (!selectedDate) return setBookerState("selecting_date");
if (!selectedTimeslot) return setBookerState("selecting_time");
return setBookerState("booking");
}, [event, selectedDate, selectedTimeslot, setBookerState]);
if (event.isPending) {
setBookerState("loading");
return;
}
if (!selectedDate) {
setBookerState("selecting_date");
return;
}
if (!selectedTimeslot) {
setBookerState("selecting_time");
return;
}

// Only call handleBookEvent if we're not already booking
if (bookerState !== "booking") {
setBookerState("booking");
handleBookEvent();
}
}, [event, selectedDate, selectedTimeslot, setBookerState, handleBookEvent, bookerState]);

const slot = getQueryParam("slot");
useEffect(() => {
Expand Down Expand Up @@ -266,7 +280,6 @@ const BookerComponent = ({
return (
<>
{event.data && !isPlatform ? <BookingPageTagManager eventType={event.data} /> : <></>}

<div
className={classNames(
// In a popup embed, if someone clicks outside the main(having main class or main tag), it closes the embed
Expand Down Expand Up @@ -474,7 +487,6 @@ const BookerComponent = ({
</m.span>
)}
</div>

<BookFormAsModal
onCancel={() => setSelectedTimeslot(null)}
visible={bookerState === "booking" && shouldShowFormInDialog}>
Expand Down
5 changes: 4 additions & 1 deletion packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,10 @@ export const BookEventForm = ({
// still change the timeslot, and comes back to the form, all their values
// still exist. This gets cleared when the form is submitted.
const values = bookingForm.getValues();
setFormValues(values);

if (JSON.stringify(values) !== JSON.stringify(bookingData)) {
Copy link
Member

@hariombalhara hariombalhara Jan 1, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does it do? Doesn't seem like the correct approach.

The comparison is sensitive to irrelevant changes like property order or case, leading to unexpected form behavior

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh ok I will correct this then.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this addressed?

setFormValues(values);
}
}}
form={bookingForm}
handleSubmit={onSubmit}
Expand Down
Loading