feat: routing forms integration for booker atom by Ryukemeister · Pull Request #18726 · calcom/cal.diy

Ryukemeister · 2025-01-17T06:59:14Z

What does this PR do?

Adds URL query parameters and inputs needed for routing forms in the booker atom

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.
(N/A) I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

This can be tested in the examples app

connect to localhost:3000 using seeded credentials for org (owner1-acme@example.com / owner1-acme)
create routing forms for the seeded team
go to the example app
feed Router atoms with formId (id of the created form) and searchParams representing the answers to the questions created in the form fields, for example in the screenshot the only required field is "Territory"
if form is set to CustomMessage, displays a custom message
if form is set to eventTypeRedirect, display the booker atom embed
if form is set to externalRedirectUri, redirect to new page

vercel · 2025-01-17T07:01:04Z

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		Jan 29, 2025 9:24am
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Jan 29, 2025 9:24am

graphite-app · 2025-01-17T13:00:11Z

Graphite Automations

"Add platform team as reviewer" took an action on this PR • (01/17/25)

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

"Add foundation team as reviewer" took an action on this PR • (01/24/25)

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

"Add ready-for-e2e label" took an action on this PR • (01/29/25)

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

keithwillcode · 2025-01-17T13:02:53Z

      rest.teamId ?? false,
      rest.usernameList,
+      rest.routedTeamMemberIds,
+      rest.skipContactOwner,


we are missing shouldServeCache here, no?

ah yes, will fix this one

salesforce related query param is also missing.

I don't see the salesforce parameter in the schema of the trpc endpoint for slots here packages/trpc/server/routers/viewer/slots/types.ts is it used at all ?

Added some comments to explain why some parameters are left out here

…success-for-platform' into remove-redirect-on-success-for-platform

…g forms in v2

…-platform

socket-security · 2025-01-28T14:54:32Z

No dependency changes detected. Learn more about Socket for GitHub ↗︎

👍 No dependency changes detected in pull request

ThyMinimalDev · 2025-01-29T08:12:23Z

          "text-default flex min-h-full w-full flex-col items-center",
-          layout === BookerLayouts.MONTH_VIEW ? "overflow-visible" : "overflow-clip"
+          layout === BookerLayouts.MONTH_VIEW ? "overflow-visible" : "overflow-clip",
+          `${customClassNames?.bookerWrapper}`


new custom class for booker, can be used to enable dark mode by given dark as a class

ThyMinimalDev · 2025-01-29T08:13:02Z

            fields: serializableForm.fields,
-            searchParams: new URLSearchParams(stringify(paramsToBeForwardedAsIs)),
+            searchParams: new URLSearchParams(
+              stringify({ ...paramsToBeForwardedAsIs, "cal.action": "eventTypeRedirectUrl" })


new action param in order for Router atom to know what to do easily

ThyMinimalDev · 2025-01-29T08:13:53Z

-  );
+  // Use Routing Form Url To Display Correct Booker
+  const routingFormUrlProps = useGetRoutingFormUrlProps(props);
+  if (props?.routingFormUrl && routingFormUrlProps) {


if routing form prop is defined, ignore all other props and extract everything from the url

ThyMinimalDev · 2025-01-29T08:15:09Z

+              new URLSearchParams({
+                isBookingDryRun: "true",
+                Territory: "Europe",
+                action: "externalRedirectUrl",
+              })


responses to the routing form

github-actions · 2025-01-29T11:33:48Z

E2E results are ready!

Workflow #45788.2 latest results

* update booker atom for routing form * remove logs * hide routing form properties from docs * fixup * add comments to explain why certain fields are not defined for routing forms in v2 * chore: routing for handler return team and org id * bump libraries platform * fixup! bump libraries platform * chore: get routing form params to embed * logs to remove * fix import path * chore: handle routing form params in booker embed * wip need router api v2 endpoint * resolve merge conflicts * fixup * fixup! Merge branch 'main' into remove-redirect-on-success-for-platform * fixup! fixup! Merge branch 'main' into remove-redirect-on-success-for-platform * router atom * fix libraries version * cleanup * remove console logs * bump libraries --------- Co-authored-by: Morgan Vernay <morgan@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>

update booker atom for routing form

f6e054e

keithwillcode added core area: core, team members only platform Anything related to our platform plan labels Jan 17, 2025

Merge branch 'main' into remove-redirect-on-success-for-platform

d766618

remove logs

91e864e

Ryukemeister changed the title ~~feat: routing forms integration in booker atom~~ feat: routing forms integration for booker atom Jan 17, 2025

vercel Bot deployed to Preview – api January 17, 2025 07:11 View deployment

hide routing form properties from docs

8fb585d

vercel Bot deployed to Preview – api January 17, 2025 11:57 View deployment

Ryukemeister marked this pull request as ready for review January 17, 2025 12:55

Merge branch 'main' into remove-redirect-on-success-for-platform

acb57bb

graphite-app Bot requested a review from a team January 17, 2025 12:55

vercel Bot deployed to Preview – api January 17, 2025 13:01 View deployment

keithwillcode reviewed Jan 17, 2025

View reviewed changes

Ryukemeister added 2 commits January 17, 2025 18:36

fixup

1fc3b0a

Merge remote-tracking branch 'refs/remotes/origin/remove-redirect-on-…

c2049c8

…success-for-platform' into remove-redirect-on-success-for-platform

vercel Bot deployed to Preview – api January 17, 2025 13:13 View deployment

dosubot Bot added routing-forms area: routing forms, routing, forms ✨ feature New feature or request labels Jan 17, 2025

Ryukemeister and others added 2 commits January 20, 2025 11:45

Merge branch 'main' into remove-redirect-on-success-for-platform

b56d77d

add comments to explain why certain fields are not defined for routin…

54fe02b

…g forms in v2

vercel Bot deployed to Preview – api January 20, 2025 06:28 View deployment

ThyMinimalDev added 3 commits January 21, 2025 15:49

chore: routing for handler return team and org id

de6108c

bump libraries platform

9a84c85

fixup! bump libraries platform

a74036d

vercel Bot deployed to Preview – api January 21, 2025 14:02 View deployment

ThyMinimalDev added 2 commits January 22, 2025 21:08

chore: get routing form params to embed

7ca6755

logs to remove

4bd85f5

Ryukemeister and others added 3 commits January 28, 2025 11:24

resolve merge conflicts

d8fe0d5

fixup

34e0562

Merge branch 'main' into remove-redirect-on-success-for-platform

989e87d

vercel Bot deployed to Preview – api January 28, 2025 06:05 View deployment

fixup! Merge branch 'main' into remove-redirect-on-success-for-platform

23bfbd0

vercel Bot deployed to Preview – api January 28, 2025 08:12 View deployment

fixup! fixup! Merge branch 'main' into remove-redirect-on-success-for…

6d2d584

…-platform

vercel Bot had a problem deploying to Preview – api January 28, 2025 10:05 Failure

router atom

9d843f8

vercel Bot deployed to Preview – api January 28, 2025 14:59 View deployment

Ryukemeister commented Jan 28, 2025

View reviewed changes

Comment thread apps/api/v2/package.json Outdated

fix libraries version

62d4162

vercel Bot deployed to Preview – api January 29, 2025 07:04 View deployment

cleanup

d1d997d

vercel Bot deployed to Preview – api January 29, 2025 07:30 View deployment

ThyMinimalDev reviewed Jan 29, 2025

View reviewed changes

ThyMinimalDev marked this pull request as ready for review January 29, 2025 08:15

dosubot Bot added the bookings area: bookings, availability, timezones, double booking label Jan 29, 2025

ThyMinimalDev and others added 2 commits January 29, 2025 10:56

Merge branch 'main' into remove-redirect-on-success-for-platform

d76cf43

remove console logs

53af6a3

vercel Bot deployed to Preview – api January 29, 2025 09:03 View deployment

bump libraries

3fc58e8

vercel Bot deployed to Preview – api January 29, 2025 09:30 View deployment

ThyMinimalDev approved these changes Jan 29, 2025

View reviewed changes

graphite-app Bot added the ready-for-e2e label Jan 29, 2025

ThyMinimalDev merged commit 8615ccb into main Jan 29, 2025

ThyMinimalDev deleted the remove-redirect-on-success-for-platform branch January 29, 2025 11:52

Conversation

Ryukemeister commented Jan 17, 2025 • edited by ThyMinimalDev Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Uh oh!

vercel Bot commented Jan 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

graphite-app Bot commented Jan 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Graphite Automations

Uh oh!

keithwillcode Jan 17, 2025

Choose a reason for hiding this comment

Uh oh!

Ryukemeister Jan 17, 2025

Choose a reason for hiding this comment

Uh oh!

hariombalhara Jan 17, 2025

Choose a reason for hiding this comment

Uh oh!

ThyMinimalDev Jan 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Ryukemeister Jan 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

socket-security Bot commented Jan 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ThyMinimalDev Jan 29, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ThyMinimalDev Jan 29, 2025

Choose a reason for hiding this comment

Uh oh!

ThyMinimalDev Jan 29, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ThyMinimalDev Jan 29, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Jan 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

E2E results are ready!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Ryukemeister commented Jan 17, 2025 •

edited by ThyMinimalDev

Loading

vercel Bot commented Jan 17, 2025 •

edited

Loading

graphite-app Bot commented Jan 17, 2025 •

edited

Loading

ThyMinimalDev Jan 17, 2025 •

edited

Loading

Ryukemeister Jan 20, 2025 •

edited

Loading

socket-security Bot commented Jan 28, 2025 •

edited

Loading

github-actions Bot commented Jan 29, 2025 •

edited

Loading