fix: Allow org creation with conflicting slug and renaming team slug during migration#13065
Merged
hariombalhara merged 1 commit intomainfrom Jan 7, 2024
Conversation
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
3 Ignored Deployments
|
Member
Author
|
Current dependencies on/for this PR:
This stack of pull requests is managed by Graphite. |
Contributor
|
Thank you for following the naming conventions! 🙏 Feel free to join our discord and post your PR link. |
hariombalhara
changed the title
hariombalhara
commented
Jan 6, 2024
Comment on lines
-695
to
-700
| if (team.parentId !== targetOrgId) { | ||
| log.warn(`Team ${teamId} is not part of org ${targetOrgId}. Not updating`); | ||
| return { | ||
| slug: team.slug, | ||
| }; | ||
| } |
Member
Author
There was a problem hiding this comment.
No need to unnecessarily stop the revert as it can possibly allow fixing things by running revert again. Goal is to keep the functions idempotent
Contributor
📦 Next.js Bundle Analysis for @calcom/webThis analysis was generated by the Next.js Bundle Analysis action. 🤖 This PR introduced no changes to the JavaScript bundle! 🙌 |
… during migration
hariombalhara
force-pushed
the
feat-rename-team-slug-and-allow-org-creation-with-conflicting-slug-with-team
branch
from
293c7cb to
a1afd1c
Compare
hariombalhara
commented
Jan 6, 2024
| async function expectTeamToBeAPartOfOrg({ | ||
| teamId, | ||
| orgId, | ||
| teamSlugInOrg, |
Member
Author
There was a problem hiding this comment.
Verify the new teamSlug is there
hariombalhara
commented
Jan 6, 2024
| await addTeamRedirect(movedTeam.slug, targetOrganization.slug || orgMetadata.requestedSlug || null); | ||
| await setOrgSlugIfNotSet({ slug: targetOrganization.slug }, orgMetadata, targetOrgId); | ||
| await addTeamRedirect({ | ||
| oldTeamSlug, |
Member
Author
There was a problem hiding this comment.
Verify that the redirect is from oldTeamSlug to new URL
sean-brydon
reviewed
Jan 6, 2024
Comment on lines
+279
to
+282
| migratedToOrgFrom: { | ||
| teamSlug: team.slug, | ||
| lastMigrationTime: new Date().toISOString(), | ||
| }, |
Member
There was a problem hiding this comment.
Just saw this - how should we store this info in the new organization settings PR?
PeerRich
approved these changes
Jan 6, 2024
hariombalhara
deleted the
feat-rename-team-slug-and-allow-org-creation-with-conflicting-slug-with-team
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
requestedSlugsame as a team's slug. It allows then moving that team to the organization itself. It is a common scenario when a team upgrades to be come an organizationType of change
How should this be tested?
Mandatory Tasks
Checklist