fix(admin): Improve org merge completion message clarity#937
Merged
Conversation
The merge UI previously showed "0 records moved" which was misleading when all records were duplicates. Now shows duplicates skipped count and confirms secondary organization deletion. Fixes #933 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
The domain-users endpoint only fetched the first page of WorkOS memberships (default 10), causing users beyond page 1 to incorrectly appear as "Potential Members" even when already members. Now paginates through all memberships with limit=100 per page. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
The merge was only deleting from local DB, causing orgs to reappear when syncFromWorkOS ran on server restart. Now also deletes the secondary organization from WorkOS after the local merge completes. If WorkOS deletion fails, the local merge still succeeds but a warning is included in the response. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Previously all personal workspace merges were blocked. Now: - Allow: personal INTO company (user joins company) - Allow: personal INTO personal (consolidate duplicates) - Block: company INTO personal (would lose company identity) This fixes scenarios like Pia's Workspace → Celtra. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
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
1 participant
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.
Summary
Problem
The merge UI showed "0 records moved" which was misleading when all records were duplicates but the merge still accomplished its goal (deleting the secondary org).
Before: "0 records moved"
After: "6 duplicates skipped, secondary organization deleted"
Test plan
npm run build)npm test)Fixes #933
🤖 Generated with Claude Code