Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

fix: move mcp and agent api to their own settings page (#73838)

Maksym Yakubych7437cf370353
diff --git a/e2e/test/scenarios/metabot/mcp-apps-settings.cy.spec.ts b/e2e/test/scenarios/metabot/mcp-apps-settings.cy.spec.ts
index 1cccc612f6a..0d0f2c64c1d 100644
--- a/e2e/test/scenarios/metabot/mcp-apps-settings.cy.spec.ts
+++ b/e2e/test/scenarios/metabot/mcp-apps-settings.cy.spec.ts
@@ -7,7 +7,7 @@ describe("admin > MCP apps settings > Cursor install link", () => {
});
it("shows 'Install in Cursor' link only when the Cursor and VS Code switch is enabled", () => {
- cy.visit("/admin/metabot");
+ cy.visit("/admin/metabot/mcp");
H.main().within(() => {
cy.findByText("Supported MCP clients").scrollIntoView();
diff --git a/frontend/src/metabase/admin/ai/AISettingsPage.tsx b/frontend/src/metabase/admin/ai/AISettingsPage.tsx
index 61b2a00a306..70a0005075b 100644
--- a/frontend/src/metabase/admin/ai/AISettingsPage.tsx
+++ b/frontend/src/metabase/admin/ai/AISettingsPage.tsx
@@ -51,15 +51,6 @@ export function AISettingsPage() {
} = useAdminSetting("ai-features-enabled?");
const areAiFeaturesEnabled = aiFeaturesEnabledValue !== false;
- const {
- value: agentApiEnabledValue,
- updateSetting: updateAgentApiSetting,
- isLoading: isUpdatingAgentApi,
- } = useAdminSetting("agent-api-enabled?");
- const isAgentApiEnabled = agentApiEnabledValue !== false;
-
- const { url: agentApiDocsUrl } = useDocsUrl("ai/agent-api");
-
const selectedTab = getSelectedMetabotTab(params.metabotId, pathname, {
hasEmbedding,
});
@@ -71,17 +62,10 @@ export function AISettingsPage() {
});
};
- const handleAgentApiChange = async (checked: boolean) => {
- await updateAgentApiSetting({
- key: "agent-api-enabled?",
- value: checked,
- });
- };
-
return (
<SettingsPageWrapper
title={t`AI features`}
- description={t`Manage AI integrations and Metabot.`}
+ description={t`Manage your AI provider connection and Metabot.`}
>
{areAiFeaturesEnabled && (
<>
@@ -94,24 +78,6 @@ export function AISettingsPage() {
/>
</DisabledSection>
<Divider />
- <Stack gap="lg">
- <McpAppsSettings id={MCP_SECTION_ID} />
-
- <ToggleSettingsSection
- checked={isAgentApiEnabled}
- description={jt`Enable external access to the Agent API. ${(
- <ExternalLink key="docs" href={agentApiDocsUrl}>
- {t`Learn more`}
- </ExternalLink>
- )}`}
- disabled={isUpdatingAgentApi}
- id={AGENT_API_SECTION_ID}
- onChange={handleAgentApiChange}
- title={t`Agent API`}
- />
- </Stack>
-
- <Divider />
</>
)}
@@ -127,6 +93,59 @@ export function AISettingsPage() {
);
}
+export function McpSettingsPage() {
+ const { value: aiFeaturesEnabledValue } = useAdminSetting(
+ "ai-features-enabled?",
+ );
+ const areAiFeaturesEnabled = aiFeaturesEnabledValue !== false;
+
+ return (
+ <SettingsPageWrapper
+ title={t`MCP`}
+ description={t`Manage MCP server and Agent API access.`}
+ >
+ <DisabledSection disabled={!areAiFeaturesEnabled}>
+ <McpAppsSettings id={MCP_SECTION_ID} />
+
+ <AgentApiSettingsSection disabled={!areAiFeaturesEnabled} />
+ </DisabledSection>
+ </SettingsPageWrapper>
+ );
+}
+
+function AgentApiSettingsSection({ disabled }: { disabled: boolean }) {
+ const {
+ value: agentApiEnabledValue,
+ updateSetting: updateAgentApiSetting,
+ isLoading: isUpdatingAgentApi,
+ } = useAdminSetting("agent-api-enabled?");
+ const isAgentApiEnabled = agentApiEnabledValue !== false;
+
+ const { url: agentApiDocsUrl } = useDocsUrl("ai/agent-api");
+
+ const handleAgentApiChange = async (checked: boolean) => {
+ await updateAgentApiSetting({
+ key: "agent-api-enabled?",
+ value: checked,
+ });
+ };
+
+ return (
+ <ToggleSettingsSection
+ checked={isAgentApiEnabled}
+ description={jt`Enable external access to the Agent API. ${(
+ <ExternalLink key="docs" href={agentApiDocsUrl}>
+ {t`Learn more`}
+ </ExternalLink>
+ )}`}
+ disabled={disabled || isUpdatingAgentApi}
+ id={AGENT_API_SECTION_ID}
+ onChange={handleAgentApiChange}
+ title={t`Agent API`}
+ />
+ );
+}
+
function MetabotSettingsSection({
hasEmbedding,
id,
diff --git a/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx
index ae91e5c1b89..ca879fc1fc1 100644
--- a/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx
@@ -29,20 +29,41 @@ import {
createMockTokenFeatures,
} from "metabase-types/api/mocks";
-import { AISettingsPage } from "./AISettingsPage";
+import { AISettingsPage, McpSettingsPage } from "./AISettingsPage";
const defaultSeedCollections = [
createMockCollection({ id: "root", name: "Our Analytics" }),
];
+type Page = "ai-features" | "mcp";
+
+function getPageRoute(page: Page) {
+ switch (page) {
+ case "mcp":
+ return <Route path="/admin/metabot/mcp" component={McpSettingsPage} />;
+ case "ai-features":
+ return <Route path="/admin/metabot*" component={AISettingsPage} />;
+ }
+}
+
+function getInitialRoute(page: Page) {
+ switch (page) {
+ case "mcp":
+ return "/admin/metabot/mcp";
+ case "ai-features":
+ return "/admin/metabot";
+ }
+}
+
const setup = async ({
aiFeaturesEnabled = true,
enableEmbedding = false,
contentVerification = false,
- initialRoute = "/admin/metabot",
+ initialRoute,
isConfigured = true,
metabots = buildDefaultMetabots(),
collections = defaultSeedCollections,
+ page = "ai-features",
}: {
aiFeaturesEnabled?: boolean;
enableEmbedding?: boolean;
@@ -53,6 +74,7 @@ const setup = async ({
collections?: Parameters<
typeof setupCollectionByIdEndpoint
>[0]["collections"];
+ page?: Page;
} = {}) => {
const tokenFeatures = createMockTokenFeatures({
embedding_sdk: enableEmbedding,
@@ -111,18 +133,19 @@ const setup = async ({
}),
);
- const view = renderWithProviders(
- <Route path="/admin/metabot*" component={AISettingsPage} />,
- {
- withRouter: true,
- initialRoute,
- storeInitialState: {
- settings: createMockSettingsState(settings),
- },
+ const view = renderWithProviders(getPageRoute(page), {
+ withRouter: true,
+ initialRoute: initialRoute ?? getInitialRoute(page),
+ storeInitialState: {
+ settings: createMockSettingsState(settings),
},
- );
+ });
- await screen.findByText("Disable all AI features");
+ if (page === "mcp") {
+ await screen.findByRole("switch", { name: "MCP server" });
+ } else {
+ await screen.findByText("Disable all AI features");
+ }
return view;
};
@@ -133,34 +156,24 @@ describe("AISettingsPage", () => {
jest.restoreAllMocks();
});
- it("shows all sections on one page and disables non-connection sections until configured", async () => {
+ it("shows AI setup and metabot settings and disables metabot until configured", async () => {
await setup({ isConfigured: false, enableEmbedding: true });
expect(screen.getByText("Connect to an AI provider")).toBeInTheDocument();
expect(screen.getByText("Metabot settings")).toBeInTheDocument();
expect(screen.getByText("Enable Metabot")).toBeInTheDocument();
- expect(screen.getByText("MCP server")).toBeInTheDocument();
- expect(screen.getByText("Agent API")).toBeInTheDocument();
+ expect(screen.queryByText("MCP server")).not.toBeInTheDocument();
+ expect(screen.queryByText("Agent API")).not.toBeInTheDocument();
expect(
screen.getByText("Enable Metabot", {
selector: '[aria-disabled="true"] *',
}),
).toBeInTheDocument();
- expect(
- screen.queryByText("MCP server", {
- selector: '[aria-disabled="true"] *',
- }),
- ).not.toBeInTheDocument();
- expect(
- screen.queryByText("Agent API", {
- selector: '[aria-disabled="true"] *',
- }),
- ).not.toBeInTheDocument();
});
- it("shows docs links for MCP and Agent API", async () => {
- await setup();
+ it("shows docs links on the MCP page", async () => {
+ await setup({ page: "mcp" });
expect(
screen
@@ -181,11 +194,27 @@ describe("AISettingsPage", () => {
screen.queryByText("Connect to an AI provider"),
).not.toBeInTheDocument();
expect(screen.queryByText("Metabot settings")).not.toBeInTheDocument();
- expect(screen.queryByText("MCP server")).not.toBeInTheDocument();
- expect(screen.queryByText("Agent API")).not.toBeInTheDocument();
expect(screen.getByText("Disable all AI features")).toBeInTheDocument();
});
+ it("keeps MCP settings enabled when Metabot is not configured", async () => {
+ await setup({ page: "mcp", isConfigured: false });
+
+ expect(screen.getByRole("switch", { name: "MCP server" })).toBeEnabled();
+ expect(screen.getByRole("switch", { name: "Agent API" })).toBeEnabled();
+ });
+
+ it("disables MCP settings when all AI features are disabled", async () => {
+ await setup({ page: "mcp", aiFeaturesEnabled: false });
+
+ expect(
+ screen.getByText("MCP server", {
+ selector: '[aria-disabled="true"] *',
+ }),
+ ).toBeInTheDocument();
+ expect(screen.getByRole("switch", { name: "Agent API" })).toBeDisabled();
+ });
+
it("keeps the embedded deep link working by selecting the embedded tab", async () => {
await setup({
enableEmbedding: true,
diff --git a/frontend/src/metabase/admin/ai/MetabotNavPane.tsx b/frontend/src/metabase/admin/ai/MetabotNavPane.tsx
index 391e70250fe..f817ba8c7f6 100644
--- a/frontend/src/metabase/admin/ai/MetabotNavPane.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotNavPane.tsx
@@ -4,16 +4,14 @@ import {
AdminNavItem,
AdminNavWrapper,
} from "metabase/admin/components/AdminNav";
+import { useSetting } from "metabase/common/hooks";
import { PLUGIN_AI_CONTROLS, PLUGIN_AUDIT } from "metabase/plugins";
import { Flex } from "metabase/ui";
export function MetabotNavPane() {
const AiControlsNavItems = PLUGIN_AI_CONTROLS.getAiControlsNavItems();
const AiAnalyticsNavItems = PLUGIN_AUDIT.getMetabotAnalyticsNavItems();
-
- if (!AiControlsNavItems && !AiAnalyticsNavItems) {
- return null;
- }
+ const areAiFeaturesEnabled = useSetting("ai-features-enabled?") !== false;
return (
<Flex direction="column" flex="0 0 auto">
@@ -21,7 +19,13 @@ export function MetabotNavPane() {
<AdminNavItem
icon="gear"
label={t`AI Settings`}
- path="/admin/metabot/"
+ path="/admin/metabot"
+ />
+ <AdminNavItem
+ disabled={!areAiFeaturesEnabled}
+ icon="mcp"
+ label={t`MCP`}
+ path="/admin/metabot/mcp"
/>
{AiControlsNavItems}
{AiAnalyticsNavItems}
diff --git a/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx
index 07b1272181e..3cada326efa 100644
--- a/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx
@@ -50,7 +50,7 @@ describe("MetabotNavPane", () => {
reinitialize();
});
- it("hides the ai controls items when all AI features are disabled", () => {
+ it("hides the ai controls items and disables MCP when all AI features are disabled", () => {
setup({
aiControlsEnabled: true,
aiFeaturesEnabled: false,
@@ -58,6 +58,9 @@ describe("MetabotNavPane", () => {
});
expect(screen.getByText("AI Settings")).toBeInTheDocument();
+ expect(
+ screen.getByText("MCP", { selector: '[data-disabled="true"] *' }),
+ ).toBeInTheDocument();
expect(screen.queryByText("Usage controls")).not.toBeInTheDocument();
expect(screen.queryByText("Customization")).not.toBeInTheDocument();
expect(screen.queryByText("System prompts")).not.toBeInTheDocument();
@@ -67,15 +70,24 @@ describe("MetabotNavPane", () => {
setup({ aiControlsEnabled: true, isConfigured: false });
expect(await screen.findByText("AI Settings")).toBeInTheDocument();
+ expect(
+ screen.queryByText("MCP", { selector: '[data-disabled="true"] *' }),
+ ).not.toBeInTheDocument();
expect(
- screen.getByText("Usage controls").closest('[data-disabled="true"]'),
+ screen.getByText("Usage controls", {
+ selector: '[data-disabled="true"] *',
+ }),
).toBeInTheDocument();
expect(
- screen.getByText("Customization").closest('[data-disabled="true"]'),
+ screen.getByText("Customization", {
+ selector: '[data-disabled="true"] *',
+ }),
).toBeInTheDocument();
expect(
- screen.getByText("System prompts").closest('[data-disabled="true"]'),
+ screen.getByText("System prompts", {
+ selector: '[data-disabled="true"] *',
+ }),
).toBeInTheDocument();
});
@@ -83,6 +95,10 @@ describe("MetabotNavPane", () => {
setup({ aiControlsEnabled: false, aiFeaturesEnabled: true });
expect(await screen.findByText("AI Settings")).toBeInTheDocument();
+ expect(screen.getByRole("link", { name: /MCP/ })).toHaveAttribute(
+ "href",
+ "/admin/metabot/mcp",
+ );
expect(
screen.getByRole("link", { name: /Usage controls/ }),
diff --git a/frontend/src/metabase/admin/routes.tsx b/frontend/src/metabase/admin/routes.tsx
index afd9e3612ff..8d04833199b 100644
--- a/frontend/src/metabase/admin/routes.tsx
+++ b/frontend/src/metabase/admin/routes.tsx
@@ -66,7 +66,7 @@ import {
import type { State } from "metabase/redux/store";
import { getTokenFeature } from "metabase/setup";
-import { AISettingsPage } from "./ai/AISettingsPage";
+import { AISettingsPage, McpSettingsPage } from "./ai/AISettingsPage";
import { MetabotAdminLayout } from "./ai/MetabotAdminLayout";
import { ModelPersistenceConfiguration } from "./performance/components/ModelPersistenceConfiguration";
import { StrategyEditorForDatabases } from "./performance/components/StrategyEditorForDatabases";
@@ -271,6 +271,7 @@ export const getRoutes = (
{PLUGIN_AUDIT.getAiAnalyticsRoutes()}
<Route key="index-layout" component={MetabotAdminLayout}>
<IndexRoute key="index" component={AISettingsPage} />
+ <Route key="mcp" path="mcp" component={McpSettingsPage} />
<Route key="metabot" path=":metabotId" component={AISettingsPage} />
</Route>
<Route
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts b/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
index c2d7308b2fa..59a5769035a 100644
--- a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
@@ -316,6 +316,8 @@ import mail_component from "./mail.svg?component";
import mail_source from "./mail.svg?source";
import mail_filled_component from "./mail_filled.svg?component";
import mail_filled_source from "./mail_filled.svg?source";
+import mcp_component from "./mcp.svg?component";
+import mcp_source from "./mcp.svg?source";
import medallion_component from "./medallion.svg?component";
import medallion_source from "./medallion.svg?source";
import message_circle_component from "./message_circle.svg?component";
@@ -1185,6 +1187,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: mail_filled_component,
source: mail_filled_source,
},
+ mcp: {
+ component: mcp_component,
+ source: mcp_source,
+ },
medallion: {
component: medallion_component,
source: medallion_source,
@@ -1888,6 +1894,7 @@ export type IconName =
| "lock_filled"
| "mail"
| "mail_filled"
+ | "mcp"
| "medallion"
| "message_circle"
| "metabot"
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/mcp.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/mcp.svg
new file mode 100644
index 00000000000..2755c2093e4
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/mcp.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" fill="currentcolor" fill-rule="evenodd" xmlns="http://www.w3.org/2000/svg"><path d="M15.688 2.343a2.588 2.588 0 00-3.61 0l-9.626 9.44a.863.863 0 01-1.203 0 .823.823 0 010-1.18l9.626-9.44a4.313 4.313 0 016.016 0 4.116 4.116 0 011.204 3.54 4.3 4.3 0 013.609 1.18l.05.05a4.115 4.115 0 010 5.9l-8.706 8.537a.274.274 0 000 .393l1.788 1.754a.823.823 0 010 1.18.863.863 0 01-1.203 0l-1.788-1.753a1.92 1.92 0 010-2.754l8.706-8.538a2.47 2.47 0 000-3.54l-.05-.049a2.588 2.588 0 00-3.607-.003l-7.172 7.034-.002.002-.098.097a.863.863 0 01-1.204 0 .823.823 0 010-1.18l7.273-7.133a2.47 2.47 0 00-.003-3.537z"></path><path d="M14.485 4.703a.823.823 0 000-1.18.863.863 0 00-1.204 0l-7.119 6.982a4.115 4.115 0 000 5.9 4.314 4.314 0 006.016 0l7.12-6.982a.823.823 0 000-1.18.863.863 0 00-1.204 0l-7.119 6.982a2.588 2.588 0 01-3.61 0 2.47 2.47 0 010-3.54l7.12-6.982z"></path></svg>