Skip to content

fix(web): keep General Settings forms with their organization - #3447

Open
vedanth-jadhav wants to merge 1 commit into
CapSoftware:mainfrom
vedanth-jadhav:fix/web-organization-settings-ownership
Open

vedanth-jadhav wants to merge 1 commit into
CapSoftware:mainfrom
vedanth-jadhav:fix/web-organization-settings-ownership

Conversation

@vedanth-jadhav

@vedanth-jadhav vedanth-jadhav commented Oct 27, 2026 •

Copy link
Copy Markdown

Switching organizations on General Settings retains the previous name draft, domain verification indicator, and open domain setup/removal dialogs. The name can then be saved against the new organization, and a removal started earlier can later clear the new organization's verification indicator.

Key the shared settings card by organization ID so its child forms and mutation observers belong to that organization. One boundary resets the name, domain, icon and access-domain controls together. Ordinary rerenders within the same organization retain unsaved edits, and old mutation completions affect their original, unmounted form.

Validation: all 26 focused tests pass: seven new mounted settings cases, 14 Signed BAA cases and five billing-page cases. Six new regressions fail before the fix; the same-organization edit/save control passes. Tests exercise the real name/domain components and TanStack mutation hooks with controlled actions and dialog shells. Scoped Biome, CI YAML parsing and diff checks pass; the new suite is added to web CI.

Reproduce: cd apps/web && bun run test __tests__/unit/organization-settings-ownership.test.ts __tests__/unit/signed-baa-card.test.ts __tests__/unit/billing-page.test.ts.

No deployed browser replay or full web typecheck/build was run. No server APIs or dependencies change. Related #3446 fixes the separate seat-management form on Billing; this change covers General Settings and does not touch that component.

RetriggerView in GreptileConfidence Score: 5/5

The PR appears safe to merge; no actionable issues were found.

Summary

Keys the General Settings card by organization ID so drafts, dialogs, and local verification state reset when users switch organizations.

  • General Settings forms and dialogs follow the active organization.

Reviews (1) · Last reviewed commit: "fix(web): reset organization settings wh..." · Reviewed by Greptile

@vercel

vercel Bot commented Oct 27, 2026

Copy link
Copy Markdown
Contributor

Someone is attempting to deploy a commit to the Cap Software Inc Team on Vercel.

A member of the Team first needs to authorize it.

This branch has not been deployed

No deployments
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