fix: Creating teams for organizations in wizard by leog · Pull Request #9632 · calcom/cal.diy

leog · 2023-06-19T13:55:01Z

What does this PR do?

When added the possibility to register an org checking if billing was enabled, we introduced a ramification where requestedSlug metadata property was not set but we relied on it to let the user create new teams. Expanding that check to cover the other scenario as well.

Type of change

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

How should this be tested?

Go to the org wizard and create teams, it should let you do it in a non-team-billing environment scenario.

Mandatory Tasks

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

vercel · 2023-06-19T13:55:08Z

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	Jun 19, 2023 3:00pm
cal	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jun 19, 2023 3:00pm
ui	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jun 19, 2023 3:00pm
web-staging	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jun 19, 2023 3:00pm

leog · 2023-06-19T13:55:26Z

  "my_profile": "My Profile",
  "my_settings": "My Settings",
  "sender_id_info": "Name or number shown as the sender of an SMS (some countries do not allow alphanumeric sender IDs)",
+  "no_organization_slug": "There was an error creating teams for this organization. Missing URL slug.",


Adding a proper message for the error to not show coded to the end user

leog · 2023-06-19T13:55:41Z

    },
    onError: (error) => {
-      showToast(error.message, "error");
+      showToast(t(error.message), "error");


Show the translated message to the end user, not the code

leog · 2023-06-19T13:56:06Z

            ...(!IS_TEAM_BILLING_ENABLED && { slug }),
            metadata: {
-              requestedSlug: slug,
+              ...(IS_TEAM_BILLING_ENABLED && { requestedSlug: slug }),


Adding the check to not have the metadata if we are not in a team-billing environment

leog · 2023-06-19T13:56:24Z

-  const organization = await prisma.team.findFirst({ where: { id: orgId }, select: { metadata: true } });
+  const organization = await prisma.team.findFirst({
+    where: { id: orgId },
+    select: { slug: true, metadata: true },


Be sure to also get slug from the newly created org to check for it too

leog · 2023-06-19T13:56:58Z

  const metadata = teamMetadataSchema.parse(organization?.metadata);

-  if (!metadata?.requestedSlug) throw new TRPCError({ code: "BAD_REQUEST", message: "no_organization" });
+  if (!metadata?.requestedSlug || !organization?.slug)


Not only rely on requestedSlug to show an error, when no team-billing is enabled, org slug is the one defined.

I am still getting the error, should that be && maybe?

Sharp eyes :)

leog · 2023-06-19T13:57:12Z


-  if (!metadata?.requestedSlug) throw new TRPCError({ code: "BAD_REQUEST", message: "no_organization" });
+  if (!metadata?.requestedSlug || !organization?.slug)
+    throw new TRPCError({ code: "BAD_REQUEST", message: "no_organization_slug" });


Making the error code more specific.

github-actions · 2023-06-19T14:02:31Z

📦 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-06-19T14:04:13Z

Current Playwright Test Results Summary

✅ 108 Passing - ⚠️ 3 Flaky

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

(Last updated on 06/19/2023 02:36:54pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 0c313bc

Started: 06/19/2023 02:34:15pm UTC

⚠️ Flakes

📄 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 disable 2FA Retry 2 • Retry 1 • Initial Attempt	3.41% (10) 10 / 293 runs failed over last 7 days	26.96% (79) 79 / 293 runs flaked over last 7 days

📄 apps/web/playwright/event-types.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Event Types tests user -- old-booker can add multiple organizer address Retry 1 • Initial Attempt	1.38% (4) 4 / 290 runs failed over last 7 days	29.31% (85) 85 / 290 runs flaked over last 7 days

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

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
FORM_SUBMITTED can submit a form and get a submission event Retry 1 • Initial Attempt	4.15% (9) 9 / 217 runs failed over last 7 days	15.67% (34) 34 / 217 runs flaked over last 7 days

View Detailed Build Results

emrysal

minor unrelated nit - looks good

emrysal · 2023-06-19T14:03:29Z

+    throw new TRPCError({ code: "BAD_REQUEST", message: "no_organization_slug" });

  const userMembership = await prisma.membership.findFirst({
    where: {


Not directly related to this PR, but this needs a check to confirm the membership isn't pending

Suggested change

where: {

where: {

accepted: true,

CarinaWolli

Works now :)

Expanding org slug check and adding proper error msg

37cf34d

leog requested a review from a team June 19, 2023 13:55

leog commented Jun 19, 2023

View reviewed changes

vercel Bot deployed to Preview – ui June 19, 2023 13:57 View deployment

leog commented Jun 19, 2023

View reviewed changes

vercel Bot deployed to Preview – api June 19, 2023 13:58 View deployment

vercel Bot deployed to Preview – cal June 19, 2023 14:00 View deployment

vercel Bot deployed to Preview – web-staging June 19, 2023 14:02 View deployment

emrysal approved these changes Jun 19, 2023

View reviewed changes

leog added 2 commits June 19, 2023 11:23

Duh &&

2c582fb

Merge branch 'main' into fix/create-teams-org

0c313bc

leog enabled auto-merge (squash) June 19, 2023 14:26

CarinaWolli approved these changes Jun 19, 2023

View reviewed changes

vercel Bot deployed to Preview – ui June 19, 2023 14:34 View deployment

vercel Bot deployed to Preview – cal June 19, 2023 14:34 View deployment

vercel Bot deployed to Preview – api June 19, 2023 14:37 View deployment

leog merged commit ccff528 into main Jun 19, 2023

leog deleted the fix/create-teams-org branch June 19, 2023 14:37

vercel Bot deployed to Preview – web-staging June 19, 2023 15:00 View deployment

Conversation

leog commented Jun 19, 2023

What does this PR do?

Type of change

How should this be tested?

Mandatory Tasks

Uh oh!

vercel Bot commented Jun 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Jun 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📦 Next.js Bundle Analysis for @calcom/web

Uh oh!

deploysentinel Bot commented Jun 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

Test Case Results

Test Case Results

Uh oh!

emrysal left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

CarinaWolli left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

vercel Bot commented Jun 19, 2023 •

edited

Loading

github-actions Bot commented Jun 19, 2023 •

edited

Loading

deploysentinel Bot commented Jun 19, 2023 •

edited

Loading