fix: Dynamic Group Booking link for organization #12825

hariombalhara · 2023-12-16T06:20:34Z

What does this PR do?

Fix broken dynamic group booking links for organisations - Regression from fix: Allow lowercase/uppercase/mixedcase access with org team event booking page #12721
Added Checkly test under organization as well as e2e tests for the same

Type of change

Bug fix (non-breaking change which fixes an issue)
Tests (Unit/Integration/E2E or any other test)

How should this be tested?

Simply create 2 users in an organization(org1)
Got to org1.cal.local:3000/user1+user2
You should be able to book through that.

Mandatory Tasks

Make sure you have self-reviewed the code. A decent size PR without self-review might be rejected.

vercel · 2023-12-16T06:20:36Z

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

Name	Status	Preview	Comments	Updated (UTC)
api	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Dec 19, 2023 5:45pm
dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Dec 19, 2023 5:45pm
qa	🔄 Building (Inspect)	Visit Preview	💬 Add feedback	Dec 19, 2023 5:45pm
ui	🔄 Building (Inspect)	Visit Preview	💬 Add feedback	Dec 19, 2023 5:45pm

3 Ignored Deployments

Name	Status	Preview	Updated (UTC)
ai	⬜️ Ignored (Inspect)	Visit Preview	Dec 19, 2023 5:45pm
cal	⬜️ Ignored (Inspect)	Visit Preview	Dec 19, 2023 5:45pm
cal-demo	⬜️ Ignored (Inspect)	Visit Preview	Dec 19, 2023 5:45pm

hariombalhara · 2023-12-16T06:20:46Z

Current dependencies on/for this PR:

main
- PR fix: Dynamic Group Booking link for organization #12825 👈

This stack of pull requests is managed by Graphite.

github-actions · 2023-12-16T06:20:48Z

Thank you for following the naming conventions! 🙏 Feel free to join our discord and post your PR link.

github-actions · 2023-12-16T06:28:19Z

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

deploysentinel · 2023-12-16T06:28:53Z

Current Playwright Test Results Summary

✅ 333 Passing - ⚠️ 23 Flaky

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

(Last updated on 12/16/2023 07:05:29am UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 302cc6e

Started: 12/16/2023 06:58:34am UTC

⚠️ Flakes

📄 apps/web/playwright/locale.e2e.ts • 13 Flakes

Top 1 Common Error Messages

`null`	13 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
unauthorized user sees correct translations (de) should use correct translations and html attributes Retry 1 • Initial Attempt	-13.28% (-34) -34 / 256 runs failed over last 7 days	13.28% (34) 34 / 256 runs flaked over last 7 days
unauthorized user sees correct translations (ar) should use correct translations and html attributes Retry 1 • Initial Attempt	-13.28% (-34) -34 / 256 runs failed over last 7 days	13.28% (34) 34 / 256 runs flaked over last 7 days
unauthorized user sees correct translations (zh) should use correct translations and html attributes Retry 1 • Initial Attempt	-13.28% (-34) -34 / 256 runs failed over last 7 days	13.28% (34) 34 / 256 runs flaked over last 7 days
unauthorized user sees correct translations (zh-CN) should use correct translations and html attributes Retry 1 • Initial Attempt	-13.28% (-34) -34 / 256 runs failed over last 7 days	13.28% (34) 34 / 256 runs flaked over last 7 days
unauthorized user sees correct translations (zh-TW) should use correct translations and html attributes Retry 1 • Initial Attempt	-13.28% (-34) -34 / 256 runs failed over last 7 days	13.28% (34) 34 / 256 runs flaked over last 7 days
unauthorized user sees correct translations (pt) should use correct translations and html attributes Retry 1 • Initial Attempt	-13.28% (-34) -34 / 256 runs failed over last 7 days	13.28% (34) 34 / 256 runs flaked over last 7 days
unauthorized user sees correct translations (pt-br) should use correct translations and html attributes Retry 1 • Initial Attempt	-13.28% (-34) -34 / 256 runs failed over last 7 days	13.28% (34) 34 / 256 runs flaked over last 7 days
unauthorized user sees correct translations (es-419) should use correct translations and html attributes Retry 1 • Initial Attempt	-13.28% (-34) -34 / 256 runs failed over last 7 days	13.28% (34) 34 / 256 runs flaked over last 7 days
authorized user sees correct translations (de) should return correct translations and html attributes Retry 1 • Initial Attempt	-13.28% (-34) -34 / 256 runs failed over last 7 days	13.28% (34) 34 / 256 runs flaked over last 7 days
authorized user sees correct translations (pt-br) should return correct translations and html attributes Retry 1 • Initial Attempt	-13.28% (-34) -34 / 256 runs failed over last 7 days	13.28% (34) 34 / 256 runs flaked over last 7 days
authorized user sees correct translations (ar) should return correct translations and html attributes Retry 1 • Initial Attempt	-13.28% (-34) -34 / 256 runs failed over last 7 days	13.28% (34) 34 / 256 runs flaked over last 7 days
authorized user sees changed translations (de->ar) should return correct translations and html attributes Retry 1 • Initial Attempt	-3.13% (-8) -8 / 256 runs failed over last 7 days	11.72% (30) 30 / 256 runs flaked over last 7 days
authorized user sees changed translations (de->pt-BR) [locale1] should return correct translations and html attributes Retry 1 • Initial Attempt	-8.55% (-20) -20 / 234 runs failed over last 7 days	11.97% (28) 28 / 234 runs flaked over last 7 days

📄 packages/embeds/embed-core/playwright/tests/preview.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Preview Preview - embed-core should load Retry 1 • Initial Attempt	0% (0) 0 / 254 runs failed over last 7 days	21.65% (55) 55 / 254 runs flaked over last 7 days

📄 apps/web/playwright/login.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
user can login & logout succesfully login flow user & logout using dashboard Retry 1 • Initial Attempt	0.39% (1) 1 / 255 run failed over last 7 days	24.31% (62) 62 / 255 runs flaked over last 7 days

📄 packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 4 Flakes

Top 1 Common Error Messages

`null`	4 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Popup Tests should open embed iframe on click - Configured with light theme Retry 2 • Retry 1 • Initial Attempt	1.16% (3) 3 / 259 runs failed over last 7 days	59.46% (154) 154 / 259 runs flaked over last 7 days
Popup Tests Floating Button Popup Pro User - Configured in App with default setting of system theme should open embed iframe according to system theme when no theme is configured through Embed API Retry 1 • Initial Attempt	0.39% (1) 1 / 258 run failed over last 7 days	81.78% (211) 211 / 258 runs flaked over last 7 days
Popup Tests should open Routing Forms embed on click Retry 1 • Initial Attempt	0.39% (1) 1 / 258 run failed over last 7 days	48.06% (124) 124 / 258 runs flaked over last 7 days
Popup Tests should be able to reschedule Retry 1 • Initial Attempt	11.20% (29) 29 / 259 runs failed over last 7 days	84.17% (218) 218 / 259 runs flaked over last 7 days

📄 packages/embeds/embed-core/playwright/tests/inline.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Inline Iframe Inline Iframe - Configured with Dark Theme Retry 1 • Initial Attempt	0.39% (1) 1 / 255 run failed over last 7 days	43.53% (111) 111 / 255 runs flaked over last 7 days

📄 apps/web/playwright/organization/organization-creation.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Organization should be able to create an organization and complete onboarding Retry 1 • Initial Attempt	18.85% (49) 49 / 260 runs failed over last 7 days	47.69% (124) 124 / 260 runs flaked over last 7 days

📄 apps/web/playwright/team/team-invitation.e2e.ts • 2 Flakes

Top 1 Common Error Messages

`null`	2 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Team Invitation (non verified) Retry 2 • Retry 1 • Initial Attempt	3.92% (10) 10 / 255 runs failed over last 7 days	92.94% (237) 237 / 255 runs flaked over last 7 days
Team Invitation (verified) Retry 1 • Initial Attempt	0.39% (1) 1 / 255 run failed over last 7 days	94.12% (240) 240 / 255 runs flaked over last 7 days

View Detailed Build Results

hariombalhara · 2023-12-16T06:36:09Z

apps/web/pages/org/[orgSlug]/[user]/[type].tsx

@@ -47,7 +47,7 @@ export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {
      },
    });
  }
-  const params = { user: teamOrUserSlug, type };
+  const params = { user: teamOrUserSlugOrDynamicGroup, type };


Don't send slugified value as that would slugify + as well and then further dynamic group booking logic would break

hariombalhara · 2023-12-16T06:47:48Z

apps/web/playwright/lib/testUtils.ts

  // --- fill form
  await page.fill('[name="name"]', opts?.name ?? testName);
  await page.fill('[name="email"]', opts?.email ?? testEmail);
+  if (opts?.title) {


Support filling dynamic group booking title.

hariombalhara · 2023-12-16T06:48:36Z

packages/features/ee/organizations/lib/orgDomains.ts

-export function userOrgQuery(hostname: string, fallback?: string | string[]) {
-  const { currentOrgDomain, isValidOrgDomain } = getOrgDomainConfigFromHostname({ hostname, fallback });
+export function userOrgQuery(req: IncomingMessage | undefined, fallback?: string | string[]) {
+  const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(req, fallback);


Support running tests with custom org slug. orgDomainConfig has the support

…anization

packages/features/bookings/lib/handleNewBooking.ts

Co-authored-by: Erik <erik@erosemberg.com>

zomars

zomars added the core area: core, team members only label Dec 16, 2023

vercel bot deployed to Preview – ai December 16, 2023 06:24 View deployment

vercel bot deployed to Preview – api December 16, 2023 06:25 View deployment

vercel bot deployed to Preview – dev December 16, 2023 06:31 View deployment

hariombalhara force-pushed the 12-16-fix_Dynamic_Group_Booking_link_for_organization branch from 040ae04 to e8d6344 Compare December 16, 2023 06:35

hariombalhara commented Dec 16, 2023

View reviewed changes

vercel bot deployed to Preview – ai December 16, 2023 06:40 View deployment

vercel bot deployed to Preview – api December 16, 2023 06:40 View deployment

vercel bot deployed to Preview – dev December 16, 2023 06:43 View deployment

hariombalhara commented Dec 16, 2023

View reviewed changes

fix: Dynamic Group Booking link for organization

302cc6e

hariombalhara requested a review from zomars December 16, 2023 06:51

hariombalhara force-pushed the 12-16-fix_Dynamic_Group_Booking_link_for_organization branch from e8d6344 to 302cc6e Compare December 16, 2023 06:51

hariombalhara marked this pull request as ready for review December 16, 2023 06:51

hariombalhara requested review from a team December 16, 2023 06:52

vercel bot deployed to Preview – ai December 16, 2023 06:55 View deployment

vercel bot deployed to Preview – api December 16, 2023 06:56 View deployment

vercel bot deployed to Preview – dev December 16, 2023 06:59 View deployment

Merge branch 'main' into 12-16-fix_Dynamic_Group_Booking_link_for_org…

08f0f30

…anization

vercel bot had a problem deploying to Preview – dev December 19, 2023 14:25 Failure

vercel bot deployed to Preview – api December 19, 2023 14:26 View deployment

vercel bot deployed to Preview – ai December 19, 2023 14:30 View deployment

exception previously approved these changes Dec 19, 2023

View reviewed changes

packages/features/bookings/lib/handleNewBooking.ts Outdated Show resolved Hide resolved

Update packages/features/bookings/lib/handleNewBooking.ts

00eb218

Co-authored-by: Erik <erik@erosemberg.com>

zomars dismissed exception’s stale review via 00eb218 December 19, 2023 17:36

zomars approved these changes Dec 19, 2023

View reviewed changes

zomars added the High priority Created by Linear-GitHub Sync label Dec 19, 2023

zomars enabled auto-merge (squash) December 19, 2023 17:37

vercel bot deployed to Preview – api December 19, 2023 17:41 View deployment

zomars merged commit a8975f5 into main Dec 19, 2023
22 of 23 checks passed

zomars deleted the 12-16-fix_Dynamic_Group_Booking_link_for_organization branch December 19, 2023 17:42

vercel bot deployed to Preview – dev December 19, 2023 17:45 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Dynamic Group Booking link for organization #12825

fix: Dynamic Group Booking link for organization #12825

hariombalhara commented Dec 16, 2023 •

edited

vercel bot commented Dec 16, 2023 •

edited

hariombalhara commented Dec 16, 2023

github-actions bot commented Dec 16, 2023 •

edited

github-actions bot commented Dec 16, 2023 •

edited

deploysentinel bot commented Dec 16, 2023 •

edited

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

hariombalhara Dec 16, 2023 •

edited

hariombalhara Dec 16, 2023

hariombalhara Dec 16, 2023

zomars left a comment

fix: Dynamic Group Booking link for organization #12825

fix: Dynamic Group Booking link for organization #12825

Conversation

hariombalhara commented Dec 16, 2023 • edited

What does this PR do?

Type of change

How should this be tested?

Mandatory Tasks

vercel bot commented Dec 16, 2023 • edited

hariombalhara commented Dec 16, 2023

github-actions bot commented Dec 16, 2023 • edited

github-actions bot commented Dec 16, 2023 • edited

📦 Next.js Bundle Analysis for @calcom/web

deploysentinel bot commented Dec 16, 2023 • edited

Current Playwright Test Results Summary

⚠️ Flakes

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

hariombalhara Dec 16, 2023 • edited

Choose a reason for hiding this comment

hariombalhara Dec 16, 2023

Choose a reason for hiding this comment

hariombalhara Dec 16, 2023

Choose a reason for hiding this comment

zomars left a comment

Choose a reason for hiding this comment

hariombalhara commented Dec 16, 2023 •

edited

vercel bot commented Dec 16, 2023 •

edited

github-actions bot commented Dec 16, 2023 •

edited

github-actions bot commented Dec 16, 2023 •

edited

deploysentinel bot commented Dec 16, 2023 •

edited

hariombalhara Dec 16, 2023 •

edited