Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: new org onboarding wizard #13139

Merged
merged 55 commits into from
Apr 3, 2024

Conversation

PeerRich
Copy link
Member

@PeerRich PeerRich commented Jan 10, 2024

previously we required org members to create a new account. We are now making it work to upgrade an existing team to an organisation (subdomain.cal.com) without breaking previous links and redirecting back.


Sean Looms:


Hariom Looms
Demo Loom-1 https://www.loom.com/share/25f674ac80e14b7da869e4868bb57ef8
Demo Loom-2 https://www.loom.com/share/a5f83e6d206648e59cfd07b34b70361a
Demo that shows that in self serve Owner can pay for the org during onboarding itself.

this needs a migration path triggered by the team owner:


  • team owner sees a banner with more than 2 teams: "You have a lot of teams. Consider making an organisation to get a subdomain, unify links, billing and analytics"
  • if OrgPlan: <Button>Set up your Organization</Button>
  • if NotOrgPlan: <Button>Contact Sales</Button>
  • after clicking the Get Started button, a team owner can select all teams (check boxes) in step 1
  • IS_ADMIN or IS_IMPERSONATING: be able to create an Org on behalf of someone
    • be able to change amount of seats and price per seat

CleanShot 2024-01-18 at 20 21 42

  • and choose a new name for the team in step 2:
old. new
cal.com/team/acme-sales acme.cal.com/sales
  • we can pre-fill these inputs with a simple regex to remove "acme-" or "-acme" if subdomain = acme
  • we should mention that even tho links change, they will continue to work with a redirect
  • after clicking: "Done", every member gets an email:

Hey Peer.

Anna invited you to the Acme organisation. Your link has been changed from cal.com/peer-richelsen-acme to acme.cal.com/peer but dont worry, all previous links still work and redirect appropriately.

Dan has upgraded the previous cal.com account to unify usernames under one subdomain. Every team member link is now according to their email at Acme:

peer@acme.comacme.cal.com/peer

Please note: All of your personal event types have been moved into the Acme organisation, which may also include potential personal link.

Please log in and make sure you have no private events on your new organisational account.

For personal events we recommend creating a new cal.com account with a personal email address.

Enjoy your new clean link: acme.cal.com/peer

Yours,

Team Cal.com

CleanShot 2024-01-10 at 01 29 27@2x

CleanShot 2024-01-10 at 01 28 51@2x

@PeerRich PeerRich linked an issue Jan 10, 2024 that may be closed by this pull request
6 tasks
Copy link

linear bot commented Jan 10, 2024

Copy link

vercel bot commented Jan 10, 2024

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

Name Status Preview Comments Updated (UTC)
ai ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 3, 2024 1:37am
api ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 3, 2024 1:37am
dev ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 3, 2024 1:37am
5 Ignored Deployments
Name Status Preview Comments Updated (UTC)
cal ⬜️ Ignored (Inspect) Visit Preview Apr 3, 2024 1:37am
cal-demo ⬜️ Ignored (Inspect) Visit Preview Apr 3, 2024 1:37am
calcom-web-canary ⬜️ Ignored (Inspect) Visit Preview Apr 3, 2024 1:37am
qa ⬜️ Ignored (Inspect) Visit Preview Apr 3, 2024 1:37am
ui ⬜️ Ignored (Inspect) Visit Preview Apr 3, 2024 1:37am

Copy link
Contributor

github-actions bot commented Jan 10, 2024

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

@github-actions github-actions bot added enterprise area: enterprise, audit log, organisation, SAML, SSO High priority Created by Linear-GitHub Sync organizations area: organizations, orgs ✨ feature New feature or request labels Jan 10, 2024
@keithwillcode keithwillcode added the core area: core, team members only label Jan 10, 2024
Copy link

deploysentinel bot commented Jan 10, 2024

Current Playwright Test Results Summary

✅ 300 Passing - ⚠️ 12 Flaky

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

(Last updated on 04/03/2024 01:47:45am UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 631141b

Started: 04/03/2024 01:44:08am UTC

⚠️ Flakes

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

Top 1 Common Error Messages

null

8 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 1Initial Attempt
1.11% (2) 2 / 180 runs
failed over last 7 days
61.67% (111) 111 / 180 runs
flaked over last 7 days
Popup Tests should be able to reschedule
Retry 1Initial Attempt
-165.67% (-111) -111 / 67 runs
failed over last 7 days
165.67% (111) 111 / 67 runs
flaked over last 7 days
Popup Tests should open Routing Forms embed on click
Retry 1Initial Attempt
-167.69% (-109) -109 / 65 runs
failed over last 7 days
167.69% (109) 109 / 65 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 1Initial Attempt
-167.69% (-109) -109 / 65 runs
failed over last 7 days
167.69% (109) 109 / 65 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 configured with 'auto' theme using Embed API
Retry 1Initial Attempt
-167.69% (-109) -109 / 65 runs
failed over last 7 days
167.69% (109) 109 / 65 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(Event Booking Page) with dark theme when configured with dark theme using Embed API
Retry 1Initial Attempt
-167.69% (-109) -109 / 65 runs
failed over last 7 days
167.69% (109) 109 / 65 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(Booker Profile Page) with dark theme when configured with dark theme using Embed API
Retry 1Initial Attempt
-167.69% (-109) -109 / 65 runs
failed over last 7 days
167.69% (109) 109 / 65 runs
flaked over last 7 days
Popup Tests prendered embed should be loaded and apply the config given to it
Retry 1Initial Attempt
-167.69% (-109) -109 / 65 runs
failed over last 7 days
167.69% (109) 109 / 65 runs
flaked over last 7 days

📄   apps/web/playwright/integrations-stripe.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
Stripe integration Can book a paid booking
Retry 1Initial Attempt
6.81% (13) 13 / 191 runs
failed over last 7 days
35.60% (68) 68 / 191 runs
flaked over last 7 days
Stripe integration Paid booking should be able to be cancelled
Retry 1Initial Attempt
0.56% (1) 1 / 178 run
failed over last 7 days
2.81% (5) 5 / 178 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 on submitting team form, triggers team webhook
Retry 1Initial Attempt
2.75% (5) 5 / 182 runs
failed over last 7 days
18.68% (34) 34 / 182 runs
flaked over last 7 days

📄   apps/web/playwright/app-store.e2e.ts • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
App Store - Authed -- legacy should render /apps page
Retry 1Initial Attempt
0% (0) 0 / 182 runs
failed over last 7 days
0.55% (1) 1 / 182 run
flaked over last 7 days

View Detailed Build Results


Copy link
Contributor

github-actions bot commented Jan 16, 2024

📦 Next.js Bundle Analysis for @calcom/web

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

Seventy-two Pages Changed Size

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

Page Size (compressed) First Load % of Budget (350 KB)
/apps 283.51 KB 473.1 KB 135.17% (🟡 +0.20%)
/apps/[slug] 301.54 KB 491.13 KB 140.32% (🟡 +0.20%)
/apps/[slug]/[...pages] 591.23 KB 780.82 KB 223.09% (🟡 +0.20%)
/apps/categories 261.37 KB 450.96 KB 128.85% (🟡 +0.19%)
/apps/categories/[category] 265.68 KB 455.27 KB 130.08% (🟡 +0.19%)
/apps/installed/[category] 285.65 KB 475.24 KB 135.78% (🟡 +0.20%)
/availability 469.21 KB 658.81 KB 188.23% (🟡 +0.20%)
/availability/[schedule] 415.63 KB 605.22 KB 172.92% (🟡 +0.20%)
/bookings/[status] 329.63 KB 519.22 KB 148.35% (🟡 +0.20%)
/enterprise 261.73 KB 451.32 KB 128.95% (🟡 +0.15%)
/event-types 562.38 KB 751.97 KB 214.85% (🟡 +0.21%)
/event-types/[type] 440.79 KB 630.38 KB 180.11% (🟡 +0.20%)
/insights 480.5 KB 670.1 KB 191.46% (🟡 +0.19%)
/more 260.95 KB 450.54 KB 128.73% (🟡 +0.19%)
/settings/admin 267.93 KB 457.52 KB 130.72% (🟡 +0.20%)
/settings/admin/apps 281.78 KB 471.37 KB 134.68% (🟡 +0.19%)
/settings/admin/apps/[category] 281.76 KB 471.35 KB 134.67% (🟡 +0.20%)
/settings/admin/flags 271.74 KB 461.33 KB 131.81% (🟡 +0.20%)
/settings/admin/impersonation 268.22 KB 457.81 KB 130.80% (🟡 +0.20%)
/settings/admin/oAuth 279.98 KB 469.57 KB 134.16% (🟡 +0.20%)
/settings/admin/orgMigrations/_OrgMigrationLayout 256.54 KB 446.13 KB 127.47% (🟡 +0.19%)
/settings/admin/orgMigrations/moveTeamToOrg 305.83 KB 495.42 KB 141.55% (🟡 +0.20%)
/settings/admin/orgMigrations/moveUserToOrg 324.86 KB 514.45 KB 146.99% (🟡 +0.20%)
/settings/admin/orgMigrations/removeTeamFromOrg 305.6 KB 495.19 KB 141.48% (🟡 +0.21%)
/settings/admin/orgMigrations/removeUserFromOrg 305.61 KB 495.21 KB 141.49% (🟡 +0.20%)
/settings/admin/organizations 270 KB 459.59 KB 131.31% (🟡 +0.20%)
/settings/admin/organizations/[id]/edit 268.47 KB 458.07 KB 130.88% (🟡 +0.19%)
/settings/admin/users 270.82 KB 460.41 KB 131.55% (🟡 +0.19%)
/settings/admin/users/[id]/edit 398.59 KB 588.18 KB 168.05% (🟡 +0.20%)
/settings/admin/users/add 398.34 KB 587.93 KB 167.98% (🟡 +0.20%)
/settings/billing 268.13 KB 457.72 KB 130.78% (🟡 +0.20%)
/settings/developer/api-keys 272.61 KB 462.2 KB 132.06% (🟡 +0.19%)
/settings/developer/webhooks 272.66 KB 462.25 KB 132.07% (🟡 +0.20%)
/settings/developer/webhooks/[id] 273.62 KB 463.21 KB 132.35% (🟡 +0.19%)
/settings/developer/webhooks/new 273.66 KB 463.25 KB 132.36% (🟡 +0.20%)
/settings/my-account/appearance 320.4 KB 509.99 KB 145.71% (🟡 +0.20%)
/settings/my-account/calendars 279.41 KB 469 KB 134.00% (🟡 +0.20%)
/settings/my-account/conferencing 280.15 KB 469.74 KB 134.21% (🟡 +0.20%)
/settings/my-account/general 356.45 KB 546.04 KB 156.01% (🟡 +0.20%)
/settings/my-account/out-of-office 272.37 KB 461.96 KB 131.99% (🟡 +0.20%)
/settings/my-account/profile 411.21 KB 600.8 KB 171.66% (🟡 +0.19%)
/settings/organizations/[id]/about 156.3 KB 345.89 KB 98.83% (🟡 +0.97%)
/settings/organizations/[id]/add-teams 156.29 KB 345.88 KB 98.82% (🟡 +0.96%)
/settings/organizations/appearance 291.69 KB 481.28 KB 137.51% (🟡 +0.20%)
/settings/organizations/billing 268.17 KB 457.76 KB 130.79% (🟡 +0.20%)
/settings/organizations/dsync 338.04 KB 527.63 KB 150.75% (🟡 +0.20%)
/settings/organizations/general 356.02 KB 545.61 KB 155.89% (🟡 +0.20%)
/settings/organizations/members 437.23 KB 626.82 KB 179.09% (🟡 +0.20%)
/settings/organizations/new 156.31 KB 345.9 KB 98.83% (🟡 +0.97%)
/settings/organizations/platform/oauth-clients 269.95 KB 459.54 KB 131.30% (🟡 +0.19%)
/settings/organizations/platform/oauth-clients/create 269.33 KB 458.92 KB 131.12% (🟡 +0.20%)
/settings/organizations/privacy 273.53 KB 463.12 KB 132.32% (🟡 +0.20%)
/settings/organizations/profile 402.9 KB 592.49 KB 169.28% (🟡 +0.20%)
/settings/organizations/sso 278.83 KB 468.42 KB 133.84% (🟡 +0.19%)
/settings/organizations/teams/other 269 KB 458.6 KB 131.03% (🟡 +0.19%)
/settings/organizations/teams/other/[id]/appearance 280.73 KB 470.32 KB 134.38% (🟡 +0.19%)
/settings/organizations/teams/other/[id]/members 275.47 KB 465.06 KB 132.87% (🟡 +0.20%)
/settings/organizations/teams/other/[id]/profile 474.19 KB 663.78 KB 189.65% (🟡 +0.20%)
/settings/security/impersonation 273.33 KB 462.92 KB 132.26% (🟡 +0.20%)
/settings/security/password 310.65 KB 500.24 KB 142.93% (🟡 +0.20%)
/settings/security/sso 278.23 KB 467.82 KB 133.66% (🟡 +0.20%)
/settings/security/two-factor-auth 277.13 KB 466.72 KB 133.35% (🟡 +0.20%)
/settings/teams 267.67 KB 457.26 KB 130.65% (🟡 +0.19%)
/settings/teams/[id]/appearance 280.72 KB 470.31 KB 134.37% (🟡 +0.20%)
/settings/teams/[id]/billing 268.17 KB 457.76 KB 130.79% (🟡 +0.20%)
/settings/teams/[id]/members 387.61 KB 577.2 KB 164.91% (🟡 +0.20%)
/settings/teams/[id]/profile 475.02 KB 664.61 KB 189.89% (🟡 +0.20%)
/settings/teams/new 202.1 KB 391.69 KB 111.91% (🟡 +0.20%)
/teams 261.18 KB 450.77 KB 128.79% (🟡 +0.20%)
/upgrade 261.49 KB 451.08 KB 128.88% (🟡 +0.20%)
/workflows 293.03 KB 482.62 KB 137.89% (🟡 +0.20%)
/workflows/[workflow] 414.24 KB 603.83 KB 172.52% (🟡 +0.20%)
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.

@PeerRich PeerRich changed the title feat: move teams into org wizard feat: new org onboarding wizard Jan 17, 2024
hariombalhara
hariombalhara previously approved these changes Mar 30, 2024
sean-brydon
sean-brydon previously approved these changes Mar 30, 2024
@joeauyeung
Copy link
Contributor

@hariombalhara I noticed you're skipping some tests in this commit bd01671 (#13139). Just wanted to let you know I was helping @sean-brydon fix the tests in this PR. The big one I saw was the use of IS_STRIPE_ENABLED instead of IS_TEAM_BILLING_ENABLED. If you need help with those other tests in this PR or a follow up let me know.

@hariombalhara
Copy link
Member

We are disabling self serve based on env variable. So, I am skipping the related tests conditionally.So, we should be good

@zomars zomars dismissed stale reviews from sean-brydon and hariombalhara via 631141b April 3, 2024 01:34
@zomars
Copy link
Member

zomars commented Apr 3, 2024

Heads up the this function rename is causing API v1 builds to fail:

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core area: core, team members only enterprise area: enterprise, audit log, organisation, SAML, SSO ✨ feature New feature or request High priority Created by Linear-GitHub Sync organizations area: organizations, orgs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CAL-2888] New Org migration path
7 participants