Improvement: Do immediate redirect for "Redirect on Booking" #7947

hariombalhara · 2023-03-27T10:48:48Z

What does this PR do?

Do immediate redirect for the success page now for all existing as well as new Event Types.
Loom Demo
Also adds a helper text below "Redirect on Booking" option

Motivation:

Most users don't like the waited redirect and they wanted it to be low or either removed.

TODO:

Confirm if the helper text in orange looks good. @PeerRich
It's going to affect existing event-types for which users might not have configured the custom success page to show a confirmation message. An email has been sent to users.
Wait for a week after the email. Waiting for 3rd April

Environment: Production

Type of change

New feature (non-breaking change which adds functionality)

How should this be tested?

Test that if "Redirect on Booking" is enabled, redirection happens instantly now(without showing the Cal.com success page)
Test that cancel page and the booking details page accessible from bookings/upcoming (which is actually booking success page) doesn't do redirect

Checklist

I haven't added tests that prove my fix is effective or that my feature works

vercel · 2023-03-27T10:48:55Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
cal	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Apr 4, 2023 5:42am
dhe	❌ Failed (Inspect)			Apr 4, 2023 5:42am
inkblot	❌ Failed (Inspect)			Apr 4, 2023 5:42am
ui	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Apr 4, 2023 5:42am
web	❌ Failed (Inspect)			Apr 4, 2023 5:42am

github-actions · 2023-03-27T11:02:20Z

📦 Next.js Bundle Analysis

This analysis was generated by the next.js bundle analysis action 🤖

🎉 Global Bundle Size Decreased

Page	Size (compressed)
`global`	`233.33 KB` (🟢 -37 B)

Details

The global bundle is the javascript bundle that loads alongside every page. It is in its own category because its impact is much higher - an increase to its size means that every page on your website loads slower, and a decrease means every page loads faster.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

If you want further insight into what is behind the changes, give @next/bundle-analyzer a try!

Two Pages Changed Size

The following pages changed size from the code in this PR compared to its base branch:

Page	Size (compressed)	First Load	% of Budget (`350 KB`)
`/booking/[uid]`	`123.19 KB`	356.52 KB	101.86% (🟢 -0.16%)
`/event-types/[type]`	`381.74 KB`	615.07 KB	175.73% (🟢 -0.01%)

Details

Only the gzipped size is provided here based on an expert tip.

First Load is the size of the global bundle plus the bundle for the individual page. If a user were to show up to your website and land on a given page, the first load size represents the amount of javascript that user would need to download. If next/link is used, subsequent page loads would only need to download that page's bundle (the number in the "Size" column), since the global bundle has already been downloaded.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

The "Budget %" column shows what percentage of your performance budget the First Load total takes up. For example, if your budget was 100kb, and a given page's first load size was 10kb, it would be 10% of your budget. You can also see how much this has increased or decreased compared to the base branch of your PR. If this percentage has increased by 20% or more, there will be a red status indicator applied, indicating that special attention should be given to this. If you see "+/- <0.01%" it means that there was a change in bundle size, but it is a trivial enough amount that it can be ignored.

hariombalhara · 2023-03-27T11:05:17Z

apps/web/components/eventtype/EventAdvancedTab.tsx

-              {/* Textfield has some margin by default we remove that so we can keep consitant aligment */}
-              <div className="lg:-ml-2">
+              {/* Textfield has some margin by default we remove that so we can keep consistent alignment */}
+              <div className="lg:-ml-2 lg:-mb-2">


It fixes unnecessary bottom margin because of Input

hariombalhara · 2023-03-27T11:05:40Z

apps/web/pages/booking/[uid].tsx

- * Redirects to external URL with query params from current URL.
- * Query Params and Hash Fragment if present in external URL are kept intact.
- */
-function RedirectionToast({ url }: { url: string }) {


We don't do a waited redirect and thus toast isn't required.

hariombalhara · 2023-03-27T11:08:51Z

apps/web/pages/booking/[uid].tsx

@@ -985,13 +875,6 @@ const getEventTypesFromDB = async (id: number) => {
  };
 };

-const schema = z.object({


Removes schema.We use querySchema at both client side and server side now.

hariombalhara · 2023-03-27T11:09:34Z

apps/web/pages/booking/[uid].tsx

@@ -176,13 +68,14 @@ const stringToBoolean = z

 const querySchema = z.object({
  uid: z.string(),
-  allRemainingBookings: stringToBoolean,
+  email: z.string().optional(),
+  eventTypeSlug: z.string().optional(),


Add missing eventTypeSlug that wasn't needed at client but was needed at server. It comes from schema variable that has been removed.

deploysentinel · 2023-03-27T11:11:18Z

Current Playwright Test Results Summary

✅ 66 Passing - ⚠️ 1 Flaky

Run may still be in progress, this comment will be updated as current testing workflow or job completes...

(Last updated on 04/04/2023 05:52:51am UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 6aad8ec

Started: 04/04/2023 05:47:41am UTC

⚠️ Flakes

📄 packages/app-store/routing-forms/playwright/tests/basic.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Routing Forms Seeded Routing Form Routing Link - Reporting and CSV Download Retry 1 • Initial Attempt	9.03% (13) 13 / 144 runs failed over last 7 days	26.39% (38) 38 / 144 runs flaked over last 7 days

View Detailed Build Results

hariombalhara · 2023-03-27T11:13:59Z

apps/web/pages/booking/[uid].tsx

@@ -1121,7 +1004,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
    customInputs: customInputSchema.array().parse(eventTypeRaw.customInputs),
  };

-  if (eventType.metadata?.disableSuccessPage && eventType.successRedirectUrl && !cancel) {
+  if (eventType.successRedirectUrl && isSuccessBookingPage && !cancel) {


This fixes a bug where if "Disable success Page" was enabled, the user can't see the booking details from bookings/upcoming. The page always redirects to custom success page.

isSuccessBookingPage is true when a booking is done otherwise it's not set.

emrysal · 2023-03-28T08:54:07Z

Reviewed and looks good, waiting until TODO items are addressed and @PeerRich shares his view on the "info" message, my early feedback is that it should probably read "A custom redirect will disable the built-in success page. Make sure to mention "Booking Confirmed" on your custom success page." and that it should style like an info rather than warning.

emrysal

Requesting changes as it's not ready to merge as is.

Reviewed by Peer

Do immediate redirect

b947ab3

hariombalhara requested a review from a team March 27, 2023 10:48

vercel bot deployed to Preview – ui March 27, 2023 10:49 View deployment

vercel bot deployed to Preview – cal March 27, 2023 10:54 View deployment

hariombalhara commented Mar 27, 2023

View reviewed changes

hariombalhara changed the title ~~Do immediate redirect~~ Do immediate redirect for "Redirect on Booking" Mar 27, 2023

hariombalhara changed the title ~~Do immediate redirect for "Redirect on Booking"~~ Improvement: Do immediate redirect for "Redirect on Booking" Mar 27, 2023

hariombalhara commented Mar 27, 2023

View reviewed changes

hariombalhara requested a review from PeerRich March 27, 2023 11:29

Merge branch 'main' into fix/immediate-redirect

606c480

vercel bot had a problem deploying to Preview – dhe March 27, 2023 18:54 Failure

vercel bot deployed to Preview – ui March 27, 2023 18:59 View deployment

vercel bot deployed to Preview – cal March 27, 2023 19:04 View deployment

emrysal previously requested changes Mar 28, 2023

View reviewed changes

hariombalhara requested a review from emrysal April 4, 2023 05:29

Merge branch 'main' into fix/immediate-redirect

6aad8ec

vercel bot had a problem deploying to Preview – web April 4, 2023 05:30 Failure

vercel bot deployed to Preview – ui April 4, 2023 05:34 View deployment

vercel bot deployed to Preview – cal April 4, 2023 05:42 View deployment

PeerRich approved these changes Apr 4, 2023

View reviewed changes

hariombalhara merged commit 1758288 into main Apr 4, 2023

hariombalhara deleted the fix/immediate-redirect branch April 4, 2023 08:52

hariombalhara mentioned this pull request Apr 10, 2023

Bugfix: Booking Success Redirect should be in parent frame in case of embed. #8164

Merged

3 tasks

PeerRich added the core area: core, team members only label Jul 24, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improvement: Do immediate redirect for "Redirect on Booking" #7947

Improvement: Do immediate redirect for "Redirect on Booking" #7947

hariombalhara commented Mar 27, 2023 •

edited

Loading

vercel bot commented Mar 27, 2023 •

edited

Loading

github-actions bot commented Mar 27, 2023 •

edited

Loading

hariombalhara Mar 27, 2023

hariombalhara Mar 27, 2023

hariombalhara Mar 27, 2023

hariombalhara Mar 27, 2023 •

edited

Loading

deploysentinel bot commented Mar 27, 2023 •

edited

Loading

Test Case Results

hariombalhara Mar 27, 2023 •

edited

Loading

emrysal commented Mar 28, 2023

emrysal left a comment

Improvement: Do immediate redirect for "Redirect on Booking" #7947

Improvement: Do immediate redirect for "Redirect on Booking" #7947

Conversation

hariombalhara commented Mar 27, 2023 • edited Loading

What does this PR do?

TODO:

Type of change

How should this be tested?

Checklist

vercel bot commented Mar 27, 2023 • edited Loading

github-actions bot commented Mar 27, 2023 • edited Loading

📦 Next.js Bundle Analysis

🎉 Global Bundle Size Decreased

Two Pages Changed Size

hariombalhara Mar 27, 2023

Choose a reason for hiding this comment

hariombalhara Mar 27, 2023

Choose a reason for hiding this comment

hariombalhara Mar 27, 2023

Choose a reason for hiding this comment

hariombalhara Mar 27, 2023 • edited Loading

Choose a reason for hiding this comment

deploysentinel bot commented Mar 27, 2023 • edited Loading

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

hariombalhara Mar 27, 2023 • edited Loading

Choose a reason for hiding this comment

emrysal commented Mar 28, 2023

emrysal left a comment

Choose a reason for hiding this comment

hariombalhara commented Mar 27, 2023 •

edited

Loading

vercel bot commented Mar 27, 2023 •

edited

Loading

github-actions bot commented Mar 27, 2023 •

edited

Loading

hariombalhara Mar 27, 2023 •

edited

Loading

deploysentinel bot commented Mar 27, 2023 •

edited

Loading

hariombalhara Mar 27, 2023 •

edited

Loading