chore: app router - /bookings status page #18183

hbjORbj · 2024-12-14T18:09:30Z

What does this PR do?

Fixes CAL-4894

Tested

Screen.Recording.2024-12-20.at.15.37.04.mov

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
N/A - I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Please use the latest Vercel preview and test please 🙏

linear · 2024-12-14T18:09:33Z

CAL-4894 Remove Pages Router / Render App Router `/bookings` single page

graphite-app · 2024-12-14T18:10:11Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (12/14/24)

1 reviewer was added to this PR based on Keith Williams's automation.

github-actions · 2024-12-14T19:11:12Z

E2E results are ready!

Workflow #42136.1 latest results

vercel · 2024-12-18T18:15:57Z

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

2 Skipped Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Dec 21, 2024 4:28pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Dec 21, 2024 4:28pm

eunjae-lee · 2024-12-20T09:33:18Z

e2e broken

…uter

hbjORbj · 2024-12-20T19:29:33Z

@eunjae-lee addressed!

hbjORbj · 2024-12-20T20:35:13Z

apps/web/app/bookings/[status]/page.tsx

+const Page = async ({ params, searchParams }: PageProps) => {
+  const parsed = querySchema.safeParse({ ...params, ...searchParams });
+  if (!parsed.success) {
+    redirect("/bookings/upcoming");


In Production, we currently take user to 404 if they go to URL like /bookings/123 because 123 is not a valid status (upcoming, cancelled, etc).

With this change, we redirect user to /bookings/upcoming instead

To achieve this, we should remove export const dynamic = "force-static"; from this route. So I removed it.

Now that we don't have dynamic = "force-static", does this mean this page is server rendered every time? Or Next.js still builds it statically because of generateStaticParams? I'd appreciate your explaination as I'm not familiar enough with these to understand the behavior 👀

Or Next.js still builds it statically because of generateStaticParams?

This is absolutely correct. With dynamic = "force-static", user will get routed to 404 if status is not one of those returned by generateStaticParams before we have chance to redirect them to /bookings/upcoming.

eunjae-lee

The code change is much cleaner ✨

eunjae-lee · 2024-12-23T09:11:08Z

apps/web/app/bookings/[status]/page.tsx

+const Page = async ({ params, searchParams }: PageProps) => {
+  const parsed = querySchema.safeParse({ ...params, ...searchParams });
+  if (!parsed.success) {
+    redirect("/bookings/upcoming");


Now that we don't have dynamic = "force-static", does this mean this page is server rendered every time? Or Next.js still builds it statically because of generateStaticParams? I'd appreciate your explaination as I'm not familiar enough with these to understand the behavior 👀

* chore: app router - /bookings page * remove env vars * fix * Update middleware.ts * revert unneeded change * refactor for the better * fix

* plain custom desin * No display on card * dynamic plain chat component and hmac hash * re-route users to plain.com chat instead of intercom chat when going to /support * provider errors * yarn lock fix * plain chat removed unneeded hmac * fix ts error * error handling improved * remove intercome provider from app-dir * Create getting-started.mdx (#18342) * Delete help directory (#18343) * chore: moved docs/help to /help (#18345) * chore: Delete unused guides directory (#18346) * feat: booking filters (#18303) Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> * chore: Remove `HeadSeo` components where no longer needed + improve app router metadata logic (#18348) * remove HeadSeo for already migrated pages and refactor prepareMetadata * create _generateMetadataWithoutImage and refactor _generateMetadata * chore: app router - /bookings status page (#18183) * chore: app router - /bookings page * remove env vars * fix * Update middleware.ts * revert unneeded change * refactor for the better * fix * cache i18n instances (#18309) * feat: virtual queues tab in insights (#18260) Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: sean-brydon <sean@cal.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Omar López <zomars@me.com> * feat: update translations via @replexica (#18361) Co-authored-by: Replexica <support@replexica.com> * update OOO e2e tests to remove flakiness (#18367) * fix: metadata is overwritten for child managed eventType when updating parent (#18059) * fix: metadata is overwirten * Update * type error * Update * fix test * fix type error * chore: added routing support link (#18369) * Added routing form support link * small change * Type fix --------- Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com> * chore: refactor handling logic for embeds in app router (#18362) * refactor handling logic for embeds in app router * fix type checks * add test for withEmbedSsrAppDir * fix * review changes * yarn lock --------- Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Calcom Bot <109866826+calcom-bot@users.noreply.github.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Co-authored-by: Benny Joo <sldisek783@gmail.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: sean-brydon <sean@cal.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Omar López <zomars@me.com> Co-authored-by: Replexica <support@replexica.com> Co-authored-by: Vijay <vijayraghav22@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com> Co-authored-by: Alex van Andel <me@alexvanandel.com>

hbjORbj added 2 commits December 14, 2024 13:07

chore: app router - /bookings page

42a6115

remove env vars

8c117bb

graphite-app bot requested a review from a team December 14, 2024 18:09

github-actions bot added the ❗️ .env changes contains changes to env variables label Dec 14, 2024

dosubot bot added the bookings area: bookings, availability, timezones, double booking label Dec 14, 2024

keithwillcode added consumer core area: core, team members only labels Dec 14, 2024

vercel bot deployed to Preview – api December 14, 2024 18:16 View deployment

hbjORbj marked this pull request as draft December 14, 2024 18:20

vercel bot deployed to Preview – dev December 14, 2024 18:24 View deployment

hbjORbj added the ready-for-e2e label Dec 14, 2024

hbjORbj marked this pull request as ready for review December 17, 2024 16:54

Merge branch 'main' into chore/bookings-app-router

1fe5d4d

vercel bot deployed to Preview – api December 18, 2024 18:24 View deployment

hbjORbj enabled auto-merge (squash) December 18, 2024 18:25

vercel bot deployed to Preview – dev December 18, 2024 18:32 View deployment

hbjORbj added 2 commits December 18, 2024 14:11

fix

87f2100

Merge branch 'main' into chore/bookings-app-router

e65a75c

vercel bot deployed to Preview – api December 18, 2024 19:26 View deployment

Update middleware.ts

8ad1adf

vercel bot deployed to Preview – api December 18, 2024 21:25 View deployment

Merge branch 'main' into chore/bookings-app-router

5475638

vercel bot deployed to Preview – api December 19, 2024 18:27 View deployment

hbjORbj marked this pull request as draft December 20, 2024 17:24

auto-merge was automatically disabled December 20, 2024 17:24
Pull request was converted to draft

hbjORbj added 2 commits December 20, 2024 13:53

Merge remote-tracking branch 'origin/main' into chore/bookings-app-ro…

88a6b4f

…uter

revert unneeded change

adc4a3f

vercel bot deployed to Preview – api December 20, 2024 19:09 View deployment

hbjORbj marked this pull request as ready for review December 20, 2024 19:29

hbjORbj added 2 commits December 20, 2024 15:31

refactor for the better

ff51b5b

fix

df50e4a

hbjORbj commented Dec 20, 2024

View reviewed changes

hbjORbj enabled auto-merge (squash) December 20, 2024 20:42

vercel bot deployed to Preview – api December 20, 2024 20:45 View deployment

add generateStaticParams

91b1416

vercel bot deployed to Preview – api December 21, 2024 16:34 View deployment

eunjae-lee approved these changes Dec 23, 2024

View reviewed changes

hbjORbj merged commit 542799e into main Dec 23, 2024
38 checks passed

hbjORbj deleted the chore/bookings-app-router branch December 23, 2024 09:12

nizzyabi pushed a commit that referenced this pull request Dec 26, 2024

chore: app router - /bookings status page (#18183)

6581aca

* chore: app router - /bookings page * remove env vars * fix * Update middleware.ts * revert unneeded change * refactor for the better * fix

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: app router - /bookings status page #18183

chore: app router - /bookings status page #18183

hbjORbj commented Dec 14, 2024 •

edited

Loading

linear bot commented Dec 14, 2024

graphite-app bot commented Dec 14, 2024

github-actions bot commented Dec 14, 2024 •

edited

Loading

vercel bot commented Dec 18, 2024 •

edited

Loading

eunjae-lee commented Dec 20, 2024

hbjORbj commented Dec 20, 2024

hbjORbj Dec 20, 2024 •

edited

Loading

eunjae-lee Dec 23, 2024

hbjORbj Dec 23, 2024

eunjae-lee left a comment

eunjae-lee Dec 23, 2024

chore: app router - /bookings status page #18183

chore: app router - /bookings status page #18183

Conversation

hbjORbj commented Dec 14, 2024 • edited Loading

What does this PR do?

Tested

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

linear bot commented Dec 14, 2024

graphite-app bot commented Dec 14, 2024

Graphite Automations

github-actions bot commented Dec 14, 2024 • edited Loading

E2E results are ready!

vercel bot commented Dec 18, 2024 • edited Loading

eunjae-lee commented Dec 20, 2024

hbjORbj commented Dec 20, 2024

hbjORbj Dec 20, 2024 • edited Loading

Choose a reason for hiding this comment

eunjae-lee Dec 23, 2024

Choose a reason for hiding this comment

hbjORbj Dec 23, 2024

Choose a reason for hiding this comment

eunjae-lee left a comment

Choose a reason for hiding this comment

eunjae-lee Dec 23, 2024

Choose a reason for hiding this comment

hbjORbj commented Dec 14, 2024 •

edited

Loading

github-actions bot commented Dec 14, 2024 •

edited

Loading

vercel bot commented Dec 18, 2024 •

edited

Loading

hbjORbj Dec 20, 2024 •

edited

Loading