fix: Across Org Scenarios - Wrong links for event and team #12358

hariombalhara · 2023-11-14T06:43:20Z

What does this PR do?

This PR makes it more reliable to do partial migration of users or teams to an org so that during the migration there is no disruption of services even if the migration is really gradual.

Fixes #12002

Wrong Avatar in Managed Event Type Assignment if the user isn't part of org - Started using non org link for avatar with orgId as param here also.
Wrong Avatar in Create EventType, Workflow, RoutingForm dropdowns - Similar to the fix for the previous point.
Booking a non-org team event that has an org member as the organizer was sending the wrong link in email for reschedule and cancel - Started using event to identify the domain instead of using the organizer.
- [Test] Added bookingScenario test for this.
Team Profile in dashboard was showing wrong URL for a team that was part of Org but the user seeing the page wasn't part of the org - Started using the team's parent to determine the domain instead of the logged In user.
- [Test] Added an e2e for this.
On /event-types, a non-org member(part of a team in an org) was seeing wrong link to the team events Fixes [CAL-2692] A non-migrated(to Org) user is seeing wrong link for team events that he is part of. #12317
- [Test] Added an e2e for this
Other team members page was showing wrong avatar and links. Fixed that

Type of change

Bug fix (non-breaking change which fixes an issue)

Test Results

https://github.com/calcom/cal.com/actions/runs/7258635346

How should this be tested?

See this loom

Mandatory Tasks

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

vercel · 2023-11-14T06:43:21Z

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 8:14am
cal-demo	🔄 Building (Inspect)	Visit Preview	💬 Add feedback	Dec 19, 2023 8:14am
dev	🛑 Canceled (Inspect)			Dec 19, 2023 8:14am

4 Ignored Deployments

Name	Status	Preview	Updated (UTC)
ai	⬜️ Ignored (Inspect)	Visit Preview	Dec 19, 2023 8:14am
cal	⬜️ Ignored (Inspect)	Visit Preview	Dec 19, 2023 8:14am
qa	⬜️ Ignored (Inspect)	Visit Preview	Dec 19, 2023 8:14am
ui	⬜️ Ignored (Inspect)	Visit Preview	Dec 19, 2023 8:14am

hariombalhara · 2023-11-14T06:43:31Z

Current dependencies on/for this PR:

main
- PR fix: Across Org Scenarios - Wrong links for event and team #12358 👈
  - PR feat: More admin options for organizations #12424

This stack of pull requests is managed by Graphite.

github-actions · 2023-11-14T06:43:33Z

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

github-actions · 2023-11-14T06:51:06Z

📦 Next.js Bundle Analysis for @calcom/web

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

One Page Changed Size

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

Page	Size (compressed)	First Load	% of Budget (`350 KB`)
`/settings/teams/new`	`188.6 KB`	351.67 KB	100.48% (🟡 +2.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.

deploysentinel · 2023-11-14T06:52:47Z

Current Playwright Test Results Summary

✅ 309 Passing - ⚠️ 11 Flaky

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

(Last updated on 12/19/2023 07:56:41am UTC)

Run Details

Running Workflow Pre-release checks on Github Actions

Commit: 5c45b9d

Started: 12/19/2023 07:47:47am UTC

⚠️ Flakes

📄 apps/web/playwright/organization/organization-invitation.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
Organization Email not matching orgAutoAcceptEmail Org Invitation Retry 1 • Initial Attempt	-100% (-32) -32 / 32 runs failed over last 7 days	112.50% (36) 36 / 32 runs flaked over last 7 days
Organization Email not matching orgAutoAcceptEmail Team invitation Retry 1 • Initial Attempt	-85.71% (-24) -24 / 28 runs failed over last 7 days	110.71% (31) 31 / 28 runs flaked over last 7 days
Organization Email matching orgAutoAcceptEmail and a Verified Organization Org Invitation Retry 1 • Initial Attempt	-38.10% (-8) -8 / 21 runs failed over last 7 days	85.71% (18) 18 / 21 runs flaked over last 7 days
Organization Email matching orgAutoAcceptEmail and a Verified Organization Team Invitation Retry 1 • Initial Attempt	-100% (-11) -11 / 11 runs failed over last 7 days	136.36% (15) 15 / 11 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	15.30% (41) 41 / 268 runs failed over last 7 days	47.39% (127) 127 / 268 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 / 263 runs failed over last 7 days	21.67% (57) 57 / 263 runs flaked over last 7 days

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

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
user1NotMemberOfOrg1 is part of team1MemberOfOrg1 EventTypes listing should show correct link for user events and team1MemberOfOrg1's events Retry 1 • Initial Attempt	0% (0) 0 / 2 runs failed over last 7 days	50% (1) 1 / 2 run flaked over last 7 days

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

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
2FA Tests should allow a user to enable 2FA and login using 2FA Retry 1 • Initial Attempt	0.77% (2) 2 / 261 runs failed over last 7 days	32.18% (84) 84 / 261 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 1 • Initial Attempt	4.26% (11) 11 / 258 runs failed over last 7 days	93.02% (240) 240 / 258 runs flaked over last 7 days
Team Invitation (verified) Retry 1 • Initial Attempt	0% (0) 0 / 258 runs failed over last 7 days	94.96% (245) 245 / 258 runs flaked over last 7 days

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

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Popup Tests should be able to reschedule Retry 1 • Initial Attempt	15.47% (41) 41 / 265 runs failed over last 7 days	78.11% (207) 207 / 265 runs flaked over last 7 days

View Detailed Build Results

hariombalhara · 2023-11-15T07:12:00Z

packages/trpc/server/routers/viewer/eventTypes/getByViewer.handler.ts

@@ -291,7 +303,6 @@ export const getByViewerHandler = async ({ ctx, input }: GetByViewerOptions) =>
      ...group.metadata,
      teamId: group.teamId,
      membershipRole: group.membershipRole,
-      image: `${bookerUrl}/${group.profile.slug}/avatar.png`,


No need to set it here, we are already setting it in the above code

…_for_event_and_team

…and_team' into 11-14-fix_Wrong_links_for_event_and_team

sean-brydon

Tested locally and can confirm all links for eventTypes and avatars for users in a team not in an org appears to be correct.

Great work this must not have been easy to get your head around. Code looks great. Amazing coverage with the tests too!

packages/lib/getBookerUrl/client.ts

Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>

…_for_event_and_team

…and_team' into 11-14-fix_Wrong_links_for_event_and_team

…_for_event_and_team

zomars added the core area: core, team members only label Nov 14, 2023

vercel bot deployed to Preview – ai November 14, 2023 06:47 View deployment

vercel bot deployed to Preview – api November 14, 2023 06:47 View deployment

vercel bot deployed to Preview – dev November 14, 2023 06:53 View deployment

hariombalhara changed the base branch from main to 11-02-Fix_team_with_same_name_as_slug_not_loading November 14, 2023 10:29

hariombalhara force-pushed the 11-14-fix_Wrong_links_for_event_and_team branch from 6f733b0 to 5284906 Compare November 14, 2023 10:29

hariombalhara mentioned this pull request Nov 14, 2023

fix: team booking page having same slug as the org #12213

Merged

2 tasks

vercel bot deployed to Preview – dev November 14, 2023 10:37 View deployment

vercel bot deployed to Preview – ai November 14, 2023 10:38 View deployment

vercel bot had a problem deploying to Preview – api November 14, 2023 10:40 Failure

hariombalhara force-pushed the 11-14-fix_Wrong_links_for_event_and_team branch from 5284906 to a2865aa Compare November 14, 2023 11:38

vercel bot had a problem deploying to Preview – api November 14, 2023 11:41 Failure

vercel bot deployed to Preview – ai November 14, 2023 11:42 View deployment

vercel bot deployed to Preview – dev November 14, 2023 11:45 View deployment

Base automatically changed from 11-02-Fix_team_with_same_name_as_slug_not_loading to main November 14, 2023 12:55

hariombalhara force-pushed the 11-14-fix_Wrong_links_for_event_and_team branch from a2865aa to 7477970 Compare November 14, 2023 13:03

vercel bot had a problem deploying to Preview – api November 14, 2023 13:06 Failure

vercel bot deployed to Preview – ai November 14, 2023 13:09 View deployment

vercel bot deployed to Preview – dev November 14, 2023 13:10 View deployment

hariombalhara force-pushed the 11-14-fix_Wrong_links_for_event_and_team branch from 7477970 to 3471842 Compare November 15, 2023 07:05

vercel bot had a problem deploying to Preview – api November 15, 2023 07:08 Failure

vercel bot deployed to Preview – ai November 15, 2023 07:09 View deployment

hariombalhara commented Nov 15, 2023

View reviewed changes

hariombalhara force-pushed the 11-14-fix_Wrong_links_for_event_and_team branch from 3471842 to a22c319 Compare November 15, 2023 07:12

vercel bot had a problem deploying to Preview – api November 15, 2023 07:15 Failure

vercel bot deployed to Preview – ai December 5, 2023 11:52 View deployment

vercel bot deployed to Preview – api December 5, 2023 11:54 View deployment

vercel bot had a problem deploying to Preview – dev December 5, 2023 12:33 Failure

hariombalhara added 4 commits December 5, 2023 23:37

Fix wrong links for event and team and add tests

a017f83

Fix yarn.lock

682e9dc

Merge remote-tracking branch 'origin/main' into 11-14-fix_Wrong_links…

960b775

…_for_event_and_team

Merge remote-tracking branch 'origin/11-14-fix_Wrong_links_for_event_…

cd3ba70

…and_team' into 11-14-fix_Wrong_links_for_event_and_team

vercel bot deployed to Preview – ai December 12, 2023 13:45 View deployment

vercel bot deployed to Preview – api December 12, 2023 13:46 View deployment

vercel bot had a problem deploying to Preview – dev December 12, 2023 13:51 Failure

sean-brydon previously approved these changes Dec 19, 2023

View reviewed changes

packages/lib/getBookerUrl/client.ts Outdated Show resolved Hide resolved

Update packages/lib/getBookerUrl/client.ts

3da7996

Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>

hariombalhara dismissed sean-brydon’s stale review via 3da7996 December 19, 2023 07:17

Merge remote-tracking branch 'origin/main' into 11-14-fix_Wrong_links…

ef03cc6

…_for_event_and_team

hariombalhara enabled auto-merge (squash) December 19, 2023 07:20

Merge branch 'main' into 11-14-fix_Wrong_links_for_event_and_team

7854862

sean-brydon previously approved these changes Dec 19, 2023

View reviewed changes

vercel bot deployed to Preview – ai December 19, 2023 07:26 View deployment

vercel bot deployed to Preview – api December 19, 2023 07:28 View deployment

hariombalhara added 2 commits December 19, 2023 12:59

Fix type-error observed due to recent API change in main

f45d8a7

Merge remote-tracking branch 'origin/11-14-fix_Wrong_links_for_event_…

9fc67a4

…and_team' into 11-14-fix_Wrong_links_for_event_and_team

hariombalhara dismissed sean-brydon’s stale review via 8f01f47 December 19, 2023 07:36

Merge remote-tracking branch 'origin/main' into 11-14-fix_Wrong_links…

5c45b9d

…_for_event_and_team

hariombalhara force-pushed the 11-14-fix_Wrong_links_for_event_and_team branch from 8f01f47 to 5c45b9d Compare December 19, 2023 07:39

hariombalhara added the automerge label Dec 19, 2023

vercel bot deployed to Preview – api December 19, 2023 07:46 View deployment

vercel bot deployed to Preview – dev December 19, 2023 08:14 View deployment

sean-brydon approved these changes Dec 19, 2023

View reviewed changes

hariombalhara merged commit e5e0fa9 into main Dec 19, 2023
44 of 46 checks passed

hariombalhara deleted the 11-14-fix_Wrong_links_for_event_and_team branch December 19, 2023 09:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Across Org Scenarios - Wrong links for event and team #12358

fix: Across Org Scenarios - Wrong links for event and team #12358

hariombalhara commented Nov 14, 2023 •

edited

vercel bot commented Nov 14, 2023 •

edited

hariombalhara commented Nov 14, 2023 •

edited

github-actions bot commented Nov 14, 2023 •

edited

github-actions bot commented Nov 14, 2023 •

edited

deploysentinel bot commented Nov 14, 2023 •

edited

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

hariombalhara Nov 15, 2023

sean-brydon left a comment

fix: Across Org Scenarios - Wrong links for event and team #12358

fix: Across Org Scenarios - Wrong links for event and team #12358

Conversation

hariombalhara commented Nov 14, 2023 • edited

What does this PR do?

Type of change

Test Results

How should this be tested?

Mandatory Tasks

vercel bot commented Nov 14, 2023 • edited

hariombalhara commented Nov 14, 2023 • edited

github-actions bot commented Nov 14, 2023 • edited

github-actions bot commented Nov 14, 2023 • edited

📦 Next.js Bundle Analysis for @calcom/web

One Page Changed Size

deploysentinel bot commented Nov 14, 2023 • edited

Current Playwright Test Results Summary

⚠️ Flakes

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

hariombalhara Nov 15, 2023

Choose a reason for hiding this comment

sean-brydon left a comment

Choose a reason for hiding this comment

hariombalhara commented Nov 14, 2023 •

edited

vercel bot commented Nov 14, 2023 •

edited

hariombalhara commented Nov 14, 2023 •

edited

github-actions bot commented Nov 14, 2023 •

edited

github-actions bot commented Nov 14, 2023 •

edited

deploysentinel bot commented Nov 14, 2023 •

edited