Skip to content

fix: Preserve domains during organization merge#815

Merged
bokelley merged 1 commit into
mainfrom
bokelley/fix-merge-domains
Jan 20, 2026
Merged

fix: Preserve domains during organization merge#815
bokelley merged 1 commit into
mainfrom
bokelley/fix-merge-domains

Conversation

@bokelley

Copy link
Copy Markdown
Contributor

Summary

  • Fixed organization merge losing linked domains. The merge logic used INSERT with ON CONFLICT DO NOTHING, which silently skipped domains (since they already existed for the secondary org), then deleted them
  • Fixed collapsible "Linked Domains" section not expanding in admin account detail page

Test plan

  • Build passes
  • All tests pass
  • Verify merged organizations retain their domains after merge
  • Verify Linked Domains section expands/collapses correctly

🤖 Generated with Claude Code

The domain merge logic used INSERT with ON CONFLICT DO NOTHING, which
silently skipped domains that already existed (for the secondary org
being merged). The subsequent DELETE then removed those domains entirely,
causing them to be lost.

Changed to UPDATE which directly transfers domain ownership to the
primary organization.

Also fixed the collapsible "Linked Domains" section in admin account
detail page - the h2 was wrapped in a flex container that broke the
sibling relationship required by toggleSection().

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
@bokelley bokelley merged commit f750b7e into main Jan 20, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant