feat: add Move Team to Organization admin migration page by hariombalhara · Pull Request #25067 · calcom/cal.com

hariombalhara · 2025-11-11T09:43:30Z

What does this PR do?

Adds an admin-only "Move Team to Organization" migration page under Settings → Admin → Migrations. This provides a UI for instance admins to move an existing standalone team into an organization.

Key changes:

Admin page at /settings/admin/migrations/move-team-to-org with a form to enter Team ID, new slug, and target Org ID
tRPC handler (moveTeamToOrg.handler.ts) that delegates to the existing createTeamsHandler by impersonating the org owner
Slug conflict handling — intercepts Prisma P2002 unique constraint errors via instanceof Prisma.PrismaClientKnownRequestError in moveTeam() and surfaces a user-friendly CONFLICT error using an i18n key
Test for the slug conflict scenario in createTeams.handler.test.ts
Settings sidebar updated with a new "Migrations" nav item under the Admin section
i18n strings added for all UI labels and messages
PII removal — log statements use only user/org IDs, no emails

Link to Devin run: https://app.devin.ai/sessions/d313feb45bcd45949d0e49914ed99419
Requested by: bot_apk (apk@cognition.ai)
Original author: @hariombalhara

Updates since last revision

i18n for slug conflict error: Changed the hardcoded English error message (Slug "xyz" is already in use within this organization) to an i18n key slug_already_in_use_in_org, addressing this review comment. Updated the unit test accordingly.
Narrowed P2002 catch scope: Separated the try-catch for prisma.team.update from creditService.moveCreditsFromTeamToOrg so that a P2002 from the credit service is not misattributed as a slug conflict. Each now has its own try-catch with appropriate error logging. Addresses this review comment.

Important Review Points

Human Review Checklist — please verify these:

Security-sensitive impersonation pattern: The handler constructs a context with { user: { id: orgOwner.id, organizationId: targetOrgId } } and passes it to createTeamsHandler. Is this the correct and safe way to perform admin actions on behalf of the org owner?
Org owner lookup: Uses org.members[0].user from organizationRepository.adminFindById to get the first OWNER-role member. Verify this reliably returns the actual org owner.
Prisma import in handler: createTeams.handler.ts changed import type { Prisma } to a runtime import { Prisma } from @calcom/prisma/client to support the instanceof check. This is a known deviation from the "no @calcom/prisma/client in handlers" guideline — confirm this tradeoff is acceptable.
Credit service error propagation: After separating the try-catch blocks, creditService.moveCreditsFromTeamToOrg errors are logged and re-thrown as raw errors (not wrapped in TRPCError). Verify this is acceptable — the team update will have already succeeded at this point.
Removed dbRemoveTeamFromOrg from playwright/lib/orgMigration.ts — verify nothing else depends on this function (hariombalhara confirmed it was unused).
Formatting changes in SettingsLayoutAppDirClient.tsx are auto-formatter output — review alongside the actual nav item addition to ensure no unintended changes.

How should this be tested?

Prerequisites:

Admin user account
Existing organization with an owner
Existing standalone team (not already in an org)

Happy path:

Log in as admin → navigate to /settings/admin/migrations/move-team-to-org
Enter Team ID, new slug, and Target Organization ID → click "Move Team to Org"
Verify: team's parentId is updated, members are invited to the org, redirect is created, success message is displayed

Slug conflict:

Try moving a team with a slug that already exists in the target organization
Expected: translated error message for slug_already_in_use_in_org

Edge cases:

Try moving a team that's already in an org → should get cannot_move_subteam_already_in_org error
Try with a non-existent team ID → should get team_not_found error
Try with a non-existent org ID → should get organization_not_found error

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
N/A — No documentation changes required (admin-only endpoint)
I confirm automated tests are in place that prove my fix is effective or that my feature works

- Add moveTeamToOrg and removeTeamFromOrg functions to orgMigration.ts - Restore API endpoint at /api/orgMigration/moveTeamToOrg - Restore admin UI page at /settings/admin/orgMigrations/moveTeamToOrg - Add helper functions for team redirect management - Support moving team members along with the team This endpoint allows admins to migrate teams to organizations after org creation, which is needed as a temporary solution until proper org admin permissions are implemented. Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com>

devin-ai-integration · 2025-11-11T09:43:33Z

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

Address comments on this PR that start with 'DevinAI' or '@devin'.
Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

Disable automatic comment and CI monitoring

- Move moveTeamToOrg and removeTeamFromOrg functions from playwright/lib to lib/orgMigration.ts - Update API endpoint to import from lib/orgMigration instead of playwright/lib - Fix redirect URL format: use / instead of /team/ - Fix import path: use ../playwright/lib/orgMigration instead of ./playwright/lib/orgMigration - Rename unused _dbRemoveTeamFromOrg in playwright file to satisfy linter - Remove duplicate functions from playwright/lib/orgMigration.ts This fixes the Vercel deployment failure caused by importing from test-only directories in production API routes, and corrects the redirect URL format to match the original implementation. Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com>

vercel · 2025-11-11T10:07:58Z

The latest updates on your projects. Learn more about Vercel for GitHub.

2 Skipped Deployments

Project	Deployment	Preview	Comments	Updated (UTC)
cal	Ignored			Nov 11, 2025 10:25am
cal-eu	Ignored			Nov 11, 2025 10:25am

- Remove custom orgMigration.ts implementation - Update API endpoint to call existing createTeamsHandler with org owner impersonation - Remove moveMembers option from UI (always moves members by design) - Fix Vercel deployment by removing playwright import from production code - Use OrganizationRepository.adminFindById to fetch org owner Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com>

github-actions · 2025-11-19T00:26:13Z

This PR has been marked as stale due to inactivity. If you're still working on it or need any help, please let us know or update the PR to keep it active.

github-actions · 2025-11-30T00:29:26Z

This PR has been marked as stale due to inactivity. If you're still working on it or need any help, please let us know or update the PR to keep it active.

github-actions · 2026-02-05T09:34:27Z

No Conflicts Detected

This PR does not have any merge conflicts with the base branch. The devin-conflict-resolution label has been removed.

If you believe this PR should have conflicts, please check the PR status and try again.

…ore-move-team-to-org-endpoint

- Move admin page from pages/settings/admin/orgMigrations to app/(use-page-wrapper)/settings/(admin-layout)/admin/orgMigrations - Convert API route from pages/api/orgMigration/moveTeamToOrg.ts to app/api/orgMigration/moveTeamToOrg/route.ts - Create client view component in modules/settings/admin/org-migrations/ - Remove old pages directory files and getServerSideProps Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com>

- Fix @calcom/lib/server to @calcom/lib/server/i18n for getTranslation - Fix @calcom/ui barrel import to specific component paths Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com>

Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com>

github-actions · 2026-02-06T05:14:24Z

Devin AI is addressing Cubic AI's review feedback

New feedback has been sent to the existing Devin session.

View Devin Session

✅ Pushed commit a20e566

Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com>

github-actions · 2026-02-06T05:48:06Z

E2E results are ready!

Workflow #106665.1 latest results

github-actions · 2026-02-26T17:52:31Z

Devin AI is resolving merge conflicts

This PR has merge conflicts with the main branch. A Devin session has been created to automatically resolve them.

View Devin Session

Devin will:

Merge the latest main into this branch
Resolve any conflicts intelligently
Run lint/type checks to ensure validity
Push the resolved changes

If you prefer to resolve conflicts manually, you can close the Devin session and handle it yourself.

…ore-move-team-to-org-endpoint Co-Authored-By: bot_apk <apk@cognition.ai>

github-actions · 2026-02-27T10:43:59Z

Devin AI is completing this stale PR

This PR by @hariombalhara has been marked as stale. A Devin session has been created to complete the remaining work.

View Devin Session

Devin will review the PR, address any feedback, and push updates to complete this PR.

…d English string Co-Authored-By: bot_apk <apk@cognition.ai>

Separates the try-catch for prisma.team.update (slug conflict) from creditService.moveCreditsFromTeamToOrg to avoid misattributing credit service P2002 errors as slug conflicts. Co-Authored-By: bot_apk <apk@cognition.ai>

Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com>

joeauyeung

Great work @hariombalhara. Reuses currently logic and endpoint is protected by the authedAdminProcedure. Tested manually and working as expected

…ore-move-team-to-org-endpoint Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com>

devin-ai-integration

Devin Review found 1 new potential issue.

View 13 additional findings in Devin Review.

packages/trpc/server/routers/viewer/admin/moveTeamToOrg.handler.ts

pull-request-size bot added the size/L label Nov 11, 2025

keithwillcode added core area: core, team members only enterprise area: enterprise, audit log, organisation, SAML, SSO labels Nov 11, 2025

vercel bot had a problem deploying to Preview – dev November 11, 2025 09:54 Failure

pull-request-size bot added size/XL and removed size/L labels Nov 11, 2025

vercel bot had a problem deploying to Preview – dev November 11, 2025 10:20 Failure

pull-request-size bot added size/L and removed size/XL labels Nov 11, 2025

vercel bot had a problem deploying to Preview – dev November 11, 2025 10:37 Failure

github-actions bot added the Stale label Nov 19, 2025

hariombalhara added the ready-for-e2e label Nov 21, 2025

github-actions bot removed the Stale label Nov 22, 2025

github-actions bot added the Stale label Nov 30, 2025

hariombalhara added devin-conflict-resolution and removed Stale labels Feb 5, 2026

github-actions bot removed the devin-conflict-resolution label Feb 5, 2026

hariombalhara and others added 2 commits February 5, 2026 15:59

Merge remote-tracking branch 'origin/main' into devin/1762853442-rest…

8436f17

…ore-move-team-to-org-endpoint

devin-ai-integration bot changed the title ~~feat: restore moveTeamToOrg admin endpoint for organization migration~~ refactor: migrate moveTeamToOrg admin endpoint to App Router Feb 5, 2026

devin-ai-integration bot and others added 2 commits February 5, 2026 10:49

fix: correct import paths for App Router compatibility

6bcb3d8

- Fix @calcom/lib/server to @calcom/lib/server/i18n for getTranslation - Fix @calcom/ui barrel import to specific component paths Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com>

fix: use TFunction type for getFormSchema parameter

6cc21c2

Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com>

fix: remove PII (emails) from admin log statement

bfdc81f

Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com>

This comment was marked as resolved.

Sign in to view

refactor: use instanceof pattern for Prisma error detection

a20e566

Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com>

This comment was marked as resolved.

Sign in to view

fixes

1b3df61

hariombalhara force-pushed the devin/1762853442-restore-move-team-to-org-endpoint branch from c34da01 to 1b3df61 Compare February 6, 2026 05:37

Udit-takkar added the devin-conflict-resolution label Feb 26, 2026

Merge remote-tracking branch 'origin/main' into devin/1762853442-rest…

d6aaf73

…ore-move-team-to-org-endpoint Co-Authored-By: bot_apk <apk@cognition.ai>

devin-ai-integration bot removed the devin-conflict-resolution label Feb 26, 2026

This comment was marked as resolved.

Sign in to view

hariombalhara added the devin-finish-pr label Feb 27, 2026

fix: use i18n key for slug conflict error message instead of hardcode…

52429f3

…d English string Co-Authored-By: bot_apk <apk@cognition.ai>

This comment was marked as resolved.

Sign in to view

devin-ai-integration bot and others added 2 commits February 27, 2026 11:03

fix: narrow P2002 catch scope to only prisma.team.update call

2f1239c

Separates the try-catch for prisma.team.update (slug conflict) from creditService.moveCreditsFromTeamToOrg to avoid misattributing credit service P2002 errors as slug conflicts. Co-Authored-By: bot_apk <apk@cognition.ai>

fix: resolve merge conflict in i18n common.json

e4e56c7

Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com>

vercel bot deployed to Preview March 6, 2026 08:22 View deployment

joeauyeung previously approved these changes Mar 18, 2026

View reviewed changes

hariombalhara enabled auto-merge (squash) March 19, 2026 02:11

Merge remote-tracking branch 'origin/main' into devin/1762853442-rest…

6f9ac7b

…ore-move-team-to-org-endpoint Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com>

devin-ai-integration bot dismissed joeauyeung’s stale review via 6f9ac7b March 19, 2026 02:14

devin-ai-integration bot reviewed Mar 19, 2026

View reviewed changes

packages/trpc/server/routers/viewer/admin/moveTeamToOrg.handler.ts Show resolved Hide resolved

calcom deleted a comment from devin-ai-integration bot Mar 19, 2026

joeauyeung approved these changes Mar 19, 2026

View reviewed changes

hariombalhara merged commit dc43eba into main Mar 19, 2026
78 of 80 checks passed

hariombalhara deleted the devin/1762853442-restore-move-team-to-org-endpoint branch March 19, 2026 04:25

Conversation

hariombalhara commented Nov 11, 2025 • edited by devin-ai-integration bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Updates since last revision

Important Review Points

How should this be tested?

Mandatory Tasks (DO NOT REMOVE)

Uh oh!

devin-ai-integration bot commented Nov 11, 2025

🤖 Devin AI Engineer

Uh oh!

vercel bot commented Nov 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Nov 19, 2025

Uh oh!

github-actions bot commented Nov 30, 2025

Uh oh!

github-actions bot commented Feb 5, 2026

No Conflicts Detected

Uh oh!

This comment was marked as resolved.

Uh oh!

github-actions bot commented Feb 6, 2026 • edited by devin-ai-integration bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Devin AI is addressing Cubic AI's review feedback

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

github-actions bot commented Feb 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

E2E results are ready!

Uh oh!

github-actions bot commented Feb 26, 2026

Devin AI is resolving merge conflicts

Uh oh!

This comment was marked as resolved.

Uh oh!

github-actions bot commented Feb 27, 2026

Devin AI is completing this stale PR

Uh oh!

This comment was marked as resolved.

Uh oh!

joeauyeung left a comment

Choose a reason for hiding this comment

Uh oh!

devin-ai-integration bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

hariombalhara commented Nov 11, 2025 •

edited by devin-ai-integration bot

Loading

vercel bot commented Nov 11, 2025 •

edited

Loading

github-actions bot commented Feb 6, 2026 •

edited by devin-ai-integration bot

Loading

github-actions bot commented Feb 6, 2026 •

edited

Loading