feat(site): add organization picker to MCP server settings pages - #28150
feat(site): add organization picker to MCP server settings pages#28150ibetitsmike wants to merge 4 commits into
Conversation
Multi-org deployments could only manage the default organization's MCP servers through the UI. The list and add pages now carry an organization picker (shown only when more than one organization is visible) persisted in an org search param, and the update page loads servers by ID so servers from any organization can be edited. Single-organization deployments see no change.
|
@codex review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 4c22bcf1ec
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
The form header's back link hardcoded the bare list route, silently resetting the list to the default organization after a cancel via the header. Thread the organization-aware list path through the form so the header link and footer cancel land on the same organization.
|
@codex review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 1ec9ca4540
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
A transient failure loading a server left the detail query dataless, so the page silently redirected to the default organization's list. Render the error with a retryable alert and reserve the redirect for a confirmed 404.
|
@codex review |
|
Codex Review: Didn't find any major issues. Breezy! Reviewed commit: ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
|
@codex review |
|
Codex Review: Didn't find any major issues. Keep it up! Reviewed commit: ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
Adds an organization picker to the MCP server settings pages so multi-org deployments can manage every organization's MCP servers through the UI, not just the default organization's. Closes CODAGT-714 (scoped to MCP servers only; model configs stay deployment-wide until CODAGT-709 lands).
Stack Context
Top of the CODAGT-711/717/712/806 stack: MCP server configs are org-scoped with RBAC, audit logging, per-config ACLs, and owner-scoped user tokens. This layer makes the admin UI org-aware, resolving the "default org only" limitation documented in the bottom PR.
Summary
orgsearch param (falling back to the default org), and render an organization picker built on the existingOrganizationAutocomplete. The picker only appears when more than one organization is visible, so single-org deployments see no change.GET /api/experimental/mcp-servers/{id}frontend binding) instead of listing the default org and searching client-side, so servers from any organization can be edited. Post-save navigation returns to the owning organization's list via the server'sorganization_id.getDefaultOrganizationIdhelper.Testing
Storybook interaction stories cover: picker hidden with one org, switching orgs refetches and swaps list contents, add posting to the URL-selected org, add posting after an in-form org switch (asserting typed form state survives the switch), and update loading by ID. Red-green verified by breaking the search-param resolution and observing the new stories fail.