Skip to content

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

Modularization: Metabot Admin Settings (#71871)

Ryan Laurie18fafbb31abf
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx
index 3977ff95910..1f5d548ed1d 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx
@@ -2,11 +2,11 @@ import { useMemo } from "react";
import type { WithRouterProps } from "react-router";
import { t } from "ttag";
+import { MetabotAdminLayout } from "metabase/admin/ai/MetabotAdminLayout";
import { skipToken, useGetAdhocQueryMetadataQuery } from "metabase/api";
import { CodeEditor } from "metabase/common/components/CodeEditor";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { MetabotAdminLayout } from "metabase/metabot/components/MetabotAdmin/MetabotAdminLayout";
import {
AgentMessage,
Messages,
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx
index d7cf0e86f4f..98a3ea375d9 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx
@@ -4,11 +4,11 @@ import type { WithRouterProps } from "react-router";
import { push } from "react-router-redux";
import { t } from "ttag";
+import { MetabotAdminLayout } from "metabase/admin/ai/MetabotAdminLayout";
import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";
import { getErrorMessage } from "metabase/api/utils";
import { useToast } from "metabase/common/hooks";
import { useUrlState } from "metabase/common/hooks/use-url-state";
-import { MetabotAdminLayout } from "metabase/metabot/components/MetabotAdmin/MetabotAdminLayout";
import { serializeDateParameterValue } from "metabase/querying/parameters/utils/parsing";
import { useDispatch } from "metabase/redux";
import { Button, Flex, SimpleGrid, Tabs, Title } from "metabase/ui";
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.tsx
index d20ab1865e5..d19027d69bc 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.tsx
@@ -2,10 +2,10 @@ import { useMemo } from "react";
import type { WithRouterProps } from "react-router";
import { t } from "ttag";
+import { MetabotAdminLayout } from "metabase/admin/ai/MetabotAdminLayout";
import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";
import { PaginationControls } from "metabase/common/components/PaginationControls";
import { useUrlState } from "metabase/common/hooks/use-url-state";
-import { MetabotAdminLayout } from "metabase/metabot/components/MetabotAdmin/MetabotAdminLayout";
import { Card, Flex, Title } from "metabase/ui";
import { useListMetabotConversationsQuery } from "../../api";
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx
index 7ea6ebae435..04091f6726e 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx
@@ -2,13 +2,13 @@ import { useCallback, useEffect, useState } from "react";
import { match } from "ts-pattern";
import { jt, t } from "ttag";
+import { useMetabotSetupContext } from "metabase/admin/ai/MetabotSetup";
import {
useRefreshTokenStatusMutation,
useUpdateMetabotSettingsMutation,
} from "metabase/api";
import { getErrorMessage } from "metabase/api/utils";
import { useSetting } from "metabase/common/hooks";
-import { useMetabotSetupContext } from "metabase/metabot/components/MetabotAdmin/MetabotSetup";
import { MetabotManagedProviderLimitActions } from "metabase/metabot/components/MetabotManagedProviderLimit";
import { useSelector } from "metabase/redux";
import { getStoreUsers } from "metabase/selectors/store-users";
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.tsx
index 0bf58854f37..9b2a307f521 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.tsx
@@ -2,8 +2,8 @@ import type { Location } from "history";
import { useCallback, useEffect, useRef, useState } from "react";
import { t } from "ttag";
+import { AdminSettingsLayout } from "metabase/admin/components/AdminLayout/AdminSettingsLayout";
import { useSyncSecurityAdvisoriesMutation } from "metabase/api";
-import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";
import { EmptyState } from "metabase/common/components/EmptyState";
import { useSetting, useToast } from "metabase/common/hooks";
import { useIsSmallScreen } from "metabase/common/hooks/use-is-small-screen";
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.unit.spec.tsx
index 2e0546b683e..a1a806fcbad 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.unit.spec.tsx
@@ -14,7 +14,7 @@ import * as advisoriesHook from "../../hooks/use-security-advisories";
import { SecurityCenterPage } from "./SecurityCenterPage";
-jest.mock("metabase/common/components/AdminLayout/AdminSettingsLayout", () => ({
+jest.mock("metabase/admin/components/AdminLayout/AdminSettingsLayout", () => ({
AdminSettingsLayout: ({ children }: { children: React.ReactNode }) => (
<div>{children}</div>
),
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx
index a6221519641..e4888a3ccde 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx
@@ -2,12 +2,12 @@ import { useMemo } from "react";
import { push } from "react-router-redux";
import { t } from "ttag";
+import { AdminContentTable } from "metabase/admin/components/AdminContentTable";
import { SearchFilter } from "metabase/admin/people/components/SearchFilter";
import {
ACTIVE_STATUS,
type ActiveStatus,
} from "metabase/admin/people/constants";
-import { AdminContentTable } from "metabase/common/components/AdminContentTable";
import { ForwardRefLink } from "metabase/common/components/Link";
import { UserAvatar } from "metabase/common/components/UserAvatar";
import CS from "metabase/css/core/index.css";
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/AISettingsPage.tsx b/frontend/src/metabase/admin/ai/AISettingsPage.tsx
similarity index 98%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/AISettingsPage.tsx
rename to frontend/src/metabase/admin/ai/AISettingsPage.tsx
index 9f1d2953423..61b2a00a306 100644
--- a/frontend/src/metabase/metabot/components/MetabotAdmin/AISettingsPage.tsx
+++ b/frontend/src/metabase/admin/ai/AISettingsPage.tsx
@@ -58,7 +58,6 @@ export function AISettingsPage() {
} = useAdminSetting("agent-api-enabled?");
const isAgentApiEnabled = agentApiEnabledValue !== false;
- // eslint-disable-next-line metabase/no-unconditional-metabase-links-render -- Admin settings
const { url: agentApiDocsUrl } = useDocsUrl("ai/agent-api");
const selectedTab = getSelectedMetabotTab(params.metabotId, pathname, {
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/AISettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/AISettingsPage.unit.spec.tsx
rename to frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/CursorInstallLink.tsx b/frontend/src/metabase/admin/ai/CursorInstallLink.tsx
similarity index 87%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/CursorInstallLink.tsx
rename to frontend/src/metabase/admin/ai/CursorInstallLink.tsx
index 28f26ccbcbd..dbfb45b5d1b 100644
--- a/frontend/src/metabase/metabot/components/MetabotAdmin/CursorInstallLink.tsx
+++ b/frontend/src/metabase/admin/ai/CursorInstallLink.tsx
@@ -6,7 +6,6 @@ import { useMCPServerURL } from "./utils";
const CURSOR_DEEPLINK = {
url: "cursor://anysphere.cursor-deeplink/mcp/install",
- // eslint-disable-next-line metabase/no-literal-metabase-strings -- Cursor MCP registration name, not user-facing
mcpName: "Metabase",
} as const;
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MCPServerUrlSection.module.css b/frontend/src/metabase/admin/ai/MCPServerUrlSection.module.css
similarity index 100%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/MCPServerUrlSection.module.css
rename to frontend/src/metabase/admin/ai/MCPServerUrlSection.module.css
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MCPServerUrlSection.tsx b/frontend/src/metabase/admin/ai/MCPServerUrlSection.tsx
similarity index 100%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/MCPServerUrlSection.tsx
rename to frontend/src/metabase/admin/ai/MCPServerUrlSection.tsx
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MCPServerUrlSection.unit.spec.tsx b/frontend/src/metabase/admin/ai/MCPServerUrlSection.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/MCPServerUrlSection.unit.spec.tsx
rename to frontend/src/metabase/admin/ai/MCPServerUrlSection.unit.spec.tsx
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/McpAppsSettings.tsx b/frontend/src/metabase/admin/ai/McpAppsSettings.tsx
similarity index 91%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/McpAppsSettings.tsx
rename to frontend/src/metabase/admin/ai/McpAppsSettings.tsx
index 3f246da1777..000d0d33df6 100644
--- a/frontend/src/metabase/metabot/components/MetabotAdmin/McpAppsSettings.tsx
+++ b/frontend/src/metabase/admin/ai/McpAppsSettings.tsx
@@ -39,7 +39,7 @@ export const McpAppsSettings = ({ id }: { id?: string }) => {
updateSetting,
isLoading,
} = useAdminSetting("mcp-enabled?");
- // eslint-disable-next-line metabase/no-unconditional-metabase-links-render -- Admin settings
+
const { url: mcpDocsUrl } = useDocsUrl("ai/mcp");
const isEnabled = mcpEnabled !== false;
@@ -65,14 +65,11 @@ export const McpAppsSettings = ({ id }: { id?: string }) => {
/>
</Flex>
}
- description={
- // eslint-disable-next-line metabase/no-literal-metabase-strings -- admin UI
- jt`Allow MCP clients to connect to your Metabase instance. ${(
- <ExternalLink key="docs" href={mcpDocsUrl}>
- {t`Learn more`}
- </ExternalLink>
- )}`
- }
+ description={jt`Allow MCP clients to connect to your Metabase instance. ${(
+ <ExternalLink key="docs" href={mcpDocsUrl}>
+ {t`Learn more`}
+ </ExternalLink>
+ )}`}
>
{isEnabled && (
<Stack gap="lg">
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/McpAppsSettings.unit.spec.tsx b/frontend/src/metabase/admin/ai/McpAppsSettings.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/McpAppsSettings.unit.spec.tsx
rename to frontend/src/metabase/admin/ai/McpAppsSettings.unit.spec.tsx
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminLayout.tsx b/frontend/src/metabase/admin/ai/MetabotAdminLayout.tsx
similarity index 85%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminLayout.tsx
rename to frontend/src/metabase/admin/ai/MetabotAdminLayout.tsx
index c1d36bf01e5..e34ad674ddd 100644
--- a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminLayout.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotAdminLayout.tsx
@@ -1,5 +1,5 @@
import ErrorBoundary from "metabase/ErrorBoundary";
-import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";
+import { AdminSettingsLayout } from "metabase/admin/components/AdminLayout/AdminSettingsLayout";
import { Box } from "metabase/ui";
import { MetabotNavPane } from "./MetabotNavPane";
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsx b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
similarity index 100%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsx
rename to frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.unit.spec.tsx
rename to frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsx
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotNavPane.tsx b/frontend/src/metabase/admin/ai/MetabotNavPane.tsx
similarity index 100%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/MetabotNavPane.tsx
rename to frontend/src/metabase/admin/ai/MetabotNavPane.tsx
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotNavPane.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/MetabotNavPane.unit.spec.tsx
rename to frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSettingsPanel.tsx b/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx
similarity index 98%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSettingsPanel.tsx
rename to frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx
index 6e6bb8cffa2..635ba940a56 100644
--- a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSettingsPanel.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx
@@ -98,7 +98,7 @@ function MetabotEnabledToggle({
description={
isEmbedMetabot
? undefined
- : t`Metabot is Metabase's AI assistant. When enabled, Metabot will be available to help users create queries, analyze data, and answer questions about your data.` // eslint-disable-line metabase/no-literal-metabase-strings -- admin UI
+ : t`Metabot is Metabase's AI assistant. When enabled, Metabot will be available to help users create queries, analyze data, and answer questions about your data.`
}
/>
<Flex align="center" gap="md" mt="md">
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSettingsPanel.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotSettingsPanel.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSettingsPanel.unit.spec.tsx
rename to frontend/src/metabase/admin/ai/MetabotSettingsPanel.unit.spec.tsx
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSetup.tsx b/frontend/src/metabase/admin/ai/MetabotSetup.tsx
similarity index 99%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSetup.tsx
rename to frontend/src/metabase/admin/ai/MetabotSetup.tsx
index a1feeac948d..20cdbe28380 100644
--- a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSetup.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotSetup.tsx
@@ -58,7 +58,6 @@ type MetabotModelOption = ComboboxItem & {
function getModelDescription(provider: MetabotProvider | undefined) {
if (provider === "metabase") {
- // eslint-disable-next-line metabase/no-literal-metabase-strings -- Metabase AI service
return t`Available models are provided by Metabase.`;
}
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSetup.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotSetup.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSetup.unit.spec.tsx
rename to frontend/src/metabase/admin/ai/MetabotSetup.unit.spec.tsx
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.module.css b/frontend/src/metabase/admin/ai/MetabotSlackSetup.module.css
similarity index 100%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.module.css
rename to frontend/src/metabase/admin/ai/MetabotSlackSetup.module.css
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.tsx b/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx
similarity index 98%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.tsx
rename to frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx
index 4577778cddd..299bb79979e 100644
--- a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx
@@ -167,7 +167,6 @@ export function MetabotSlackSetup() {
setShouldPollAppInfo(notification === "scopes");
}, [notification]);
- // eslint-disable-next-line metabase/no-unconditional-metabase-links-render -- admin only page
const { url: encryptionDocsUrl } = useDocsUrl(
"operations-guide/encrypting-database-details-at-rest",
);
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotSlackSetup.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.unit.spec.tsx
rename to frontend/src/metabase/admin/ai/MetabotSlackSetup.unit.spec.tsx
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetupAlerts.tsx b/frontend/src/metabase/admin/ai/MetabotSlackSetupAlerts.tsx
similarity index 100%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetupAlerts.tsx
rename to frontend/src/metabase/admin/ai/MetabotSlackSetupAlerts.tsx
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/test-utils.ts b/frontend/src/metabase/admin/ai/test-utils.ts
similarity index 100%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/test-utils.ts
rename to frontend/src/metabase/admin/ai/test-utils.ts
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/utils.ts b/frontend/src/metabase/admin/ai/utils.ts
similarity index 97%
rename from frontend/src/metabase/metabot/components/MetabotAdmin/utils.ts
rename to frontend/src/metabase/admin/ai/utils.ts
index 0dcab1fb90d..a48c1a24654 100644
--- a/frontend/src/metabase/metabot/components/MetabotAdmin/utils.ts
+++ b/frontend/src/metabase/admin/ai/utils.ts
@@ -36,7 +36,7 @@ export function getProviderOptions(
...(hasMetabaseProviderAccess && {
metabase: {
value: "metabase" as const,
- // eslint-disable-next-line metabase/no-literal-metabase-strings -- This is used in admin settings
+
label: "Metabase",
},
}),
diff --git a/frontend/src/metabase/common/components/AdminContentTable/AdminContentTable.tsx b/frontend/src/metabase/admin/components/AdminContentTable/AdminContentTable.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/AdminContentTable/AdminContentTable.tsx
rename to frontend/src/metabase/admin/components/AdminContentTable/AdminContentTable.tsx
diff --git a/frontend/src/metabase/common/components/AdminContentTable/index.tsx b/frontend/src/metabase/admin/components/AdminContentTable/index.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/AdminContentTable/index.tsx
rename to frontend/src/metabase/admin/components/AdminContentTable/index.tsx
diff --git a/frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.module.css b/frontend/src/metabase/admin/components/AdminLayout/AdminSettingsLayout.module.css
similarity index 100%
rename from frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.module.css
rename to frontend/src/metabase/admin/components/AdminLayout/AdminSettingsLayout.module.css
diff --git a/frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.tsx b/frontend/src/metabase/admin/components/AdminLayout/AdminSettingsLayout.tsx
similarity index 95%
rename from frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.tsx
rename to frontend/src/metabase/admin/components/AdminLayout/AdminSettingsLayout.tsx
index f350ff23be0..ebd4b8e671b 100644
--- a/frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.tsx
+++ b/frontend/src/metabase/admin/components/AdminLayout/AdminSettingsLayout.tsx
@@ -2,11 +2,10 @@ import type React from "react";
import { useEffect, useRef } from "react";
import ErrorBoundary from "metabase/ErrorBoundary";
+import { NotFound } from "metabase/common/components/ErrorPages";
import { useRouter } from "metabase/router/useRouter";
import { Box } from "metabase/ui";
-import { NotFound } from "../ErrorPages";
-
import S from "./AdminSettingsLayout.module.css";
export const AdminSettingsLayout = ({
diff --git a/frontend/src/metabase/common/components/AdminPaneLayout/AdminPaneLayout.tsx b/frontend/src/metabase/admin/components/AdminPaneLayout/AdminPaneLayout.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/AdminPaneLayout/AdminPaneLayout.tsx
rename to frontend/src/metabase/admin/components/AdminPaneLayout/AdminPaneLayout.tsx
diff --git a/frontend/src/metabase/common/components/AdminPaneLayout/index.tsx b/frontend/src/metabase/admin/components/AdminPaneLayout/index.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/AdminPaneLayout/index.tsx
rename to frontend/src/metabase/admin/components/AdminPaneLayout/index.tsx
diff --git a/frontend/src/metabase/admin/embedding/containers/AdminEmbeddingApp.tsx b/frontend/src/metabase/admin/embedding/containers/AdminEmbeddingApp.tsx
index 829f0540e68..0461f0040e5 100644
--- a/frontend/src/metabase/admin/embedding/containers/AdminEmbeddingApp.tsx
+++ b/frontend/src/metabase/admin/embedding/containers/AdminEmbeddingApp.tsx
@@ -1,6 +1,6 @@
import type { Location } from "history";
-import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";
+import { AdminSettingsLayout } from "metabase/admin/components/AdminLayout/AdminSettingsLayout";
import { EmbeddingNav } from "../components/EmbeddingNav";
import { useEnsureDefaultEmbeddingThemes } from "../hooks";
diff --git a/frontend/src/metabase/admin/people/components/GroupDetail.tsx b/frontend/src/metabase/admin/people/components/GroupDetail.tsx
index ef7ce4398fd..d96c379f880 100644
--- a/frontend/src/metabase/admin/people/components/GroupDetail.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupDetail.tsx
@@ -1,13 +1,13 @@
import { Fragment, useState } from "react";
import { msgid, ngettext, t } from "ttag";
+import { AdminPaneLayout } from "metabase/admin/components/AdminPaneLayout";
import { SettingsSection } from "metabase/admin/components/SettingsSection";
import {
useCreateMembershipMutation,
useDeleteMembershipMutation,
useUpdateMembershipMutation,
} from "metabase/api";
-import { AdminPaneLayout } from "metabase/common/components/AdminPaneLayout";
import { useConfirmation } from "metabase/common/hooks/use-confirmation";
import { useToast } from "metabase/common/hooks/use-toast";
import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";
diff --git a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx
index 484aee0c976..3f17c0f360d 100644
--- a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx
@@ -2,7 +2,7 @@ import { useMemo } from "react";
import { t } from "ttag";
import _ from "underscore";
-import { AdminContentTable } from "metabase/common/components/AdminContentTable";
+import { AdminContentTable } from "metabase/admin/components/AdminContentTable";
import { Link } from "metabase/common/components/Link";
import { PaginationControls } from "metabase/common/components/PaginationControls";
import { usePagination } from "metabase/common/hooks/use-pagination";
diff --git a/frontend/src/metabase/admin/people/components/GroupsListing.tsx b/frontend/src/metabase/admin/people/components/GroupsListing.tsx
index d7246df9c4c..f21b9d98f3e 100644
--- a/frontend/src/metabase/admin/people/components/GroupsListing.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupsListing.tsx
@@ -3,10 +3,10 @@ import { useState } from "react";
import { jt, t } from "ttag";
import _ from "underscore";
+import { AdminContentTable } from "metabase/admin/components/AdminContentTable";
+import { AdminPaneLayout } from "metabase/admin/components/AdminPaneLayout";
import { useListApiKeysQuery } from "metabase/api";
import { getErrorMessage } from "metabase/api/utils";
-import { AdminContentTable } from "metabase/common/components/AdminContentTable";
-import { AdminPaneLayout } from "metabase/common/components/AdminPaneLayout";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { Link } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
diff --git a/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.tsx b/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.tsx
index e4278a15927..762fd143154 100644
--- a/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.tsx
+++ b/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.tsx
@@ -1,4 +1,4 @@
-import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";
+import { AdminSettingsLayout } from "metabase/admin/components/AdminLayout/AdminSettingsLayout";
import { PeopleNav } from "../../components/PeopleNav";
diff --git a/frontend/src/metabase/admin/performance/components/PerformanceApp.tsx b/frontend/src/metabase/admin/performance/components/PerformanceApp.tsx
index a7906b783a4..c1ef5d1b2c1 100644
--- a/frontend/src/metabase/admin/performance/components/PerformanceApp.tsx
+++ b/frontend/src/metabase/admin/performance/components/PerformanceApp.tsx
@@ -1,8 +1,8 @@
+import { AdminSettingsLayout } from "metabase/admin/components/AdminLayout/AdminSettingsLayout";
import {
AdminNavItem,
AdminNavWrapper,
} from "metabase/admin/components/AdminNav";
-import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";
import { PLUGIN_CACHING } from "metabase/plugins";
import { PerformanceTabId } from "../types";
diff --git a/frontend/src/metabase/admin/routes.tsx b/frontend/src/metabase/admin/routes.tsx
index fe88c9e0cd4..ca7dafe8d9c 100644
--- a/frontend/src/metabase/admin/routes.tsx
+++ b/frontend/src/metabase/admin/routes.tsx
@@ -48,11 +48,12 @@ import {
SetupSsoPage,
} from "metabase/embedding/embedding-hub";
import { ModalRoute } from "metabase/hoc/ModalRoute";
-import { getMetabotAdminRoutes } from "metabase/metabot/components/MetabotAdmin/routes";
import { DataModelV1 } from "metabase/metadata/pages/DataModelV1";
import {
PLUGIN_ADMIN_TOOLS,
PLUGIN_ADMIN_USER_MENU_ROUTES,
+ PLUGIN_AI_CONTROLS,
+ PLUGIN_AUDIT,
PLUGIN_CACHING,
PLUGIN_DB_ROUTING,
PLUGIN_DEPENDENCIES,
@@ -64,6 +65,8 @@ import {
import type { State } from "metabase/redux/store";
import { getTokenFeature } from "metabase/setup";
+import { AISettingsPage } from "./ai/AISettingsPage";
+import { MetabotAdminLayout } from "./ai/MetabotAdminLayout";
import { ModelPersistenceConfiguration } from "./performance/components/ModelPersistenceConfiguration";
import { StrategyEditorForDatabases } from "./performance/components/StrategyEditorForDatabases";
import { PerformanceTabId } from "./performance/types";
@@ -264,7 +267,12 @@ export const getRoutes = (
{/* Metabot */}
<Route path="metabot" component={createAdminRouteGuard("metabot")}>
- {getMetabotAdminRoutes()}
+ {PLUGIN_AUDIT.getAiAnalyticsRoutes()}
+ <Route key="layout" component={MetabotAdminLayout}>
+ <IndexRoute key="index" component={AISettingsPage} />
+ <Route key="metabot" path=":metabotId" component={AISettingsPage} />
+ {PLUGIN_AI_CONTROLS.getAiControlsRoutes()}
+ </Route>
</Route>
{PLUGIN_SECURITY_CENTER.isEnabled && (
diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/SlackSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/SlackSettingsPage.tsx
index e66017a2807..259fedce880 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsPages/SlackSettingsPage.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/SlackSettingsPage.tsx
@@ -1,7 +1,7 @@
import { t } from "ttag";
+import { MetabotSlackSetup } from "metabase/admin/ai/MetabotSlackSetup";
import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";
-import { MetabotSlackSetup } from "metabase/metabot/components/MetabotAdmin/MetabotSlackSetup";
import { Icon } from "metabase/ui";
import { SlackSetup } from "../../slack/SlackSetup";
diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx
index d52f10506ae..2bf397c436d 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx
@@ -4,8 +4,8 @@ import { useState } from "react";
import { t } from "ttag";
import _ from "underscore";
+import { AdminContentTable } from "metabase/admin/components/AdminContentTable";
import { getErrorMessage } from "metabase/api/utils/errors";
-import { AdminContentTable } from "metabase/common/components/AdminContentTable";
import CS from "metabase/css/core/index.css";
import { FormSwitch } from "metabase/forms";
import { Icon, Tooltip } from "metabase/ui";
diff --git a/frontend/src/metabase/admin/settingsRoutes.tsx b/frontend/src/metabase/admin/settingsRoutes.tsx
index 96f9b832ce2..5e7fcb5127a 100644
--- a/frontend/src/metabase/admin/settingsRoutes.tsx
+++ b/frontend/src/metabase/admin/settingsRoutes.tsx
@@ -1,6 +1,6 @@
import { IndexRedirect, Route } from "react-router";
-import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";
+import { AdminSettingsLayout } from "metabase/admin/components/AdminLayout/AdminSettingsLayout";
import { NotFound } from "metabase/common/components/ErrorPages";
import {
PLUGIN_AUTH_PROVIDERS,
diff --git a/frontend/src/metabase/admin/tools/components/ToolsApp.tsx b/frontend/src/metabase/admin/tools/components/ToolsApp.tsx
index 6648a483b7b..39a3f1a116e 100644
--- a/frontend/src/metabase/admin/tools/components/ToolsApp.tsx
+++ b/frontend/src/metabase/admin/tools/components/ToolsApp.tsx
@@ -2,12 +2,12 @@ import type { Location } from "history";
import type { ReactNode } from "react";
import { t } from "ttag";
+import { AdminSettingsLayout } from "metabase/admin/components/AdminLayout/AdminSettingsLayout";
import {
AdminNavItem,
type AdminNavItemProps,
AdminNavWrapper,
} from "metabase/admin/components/AdminNav";
-import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";
import * as Urls from "metabase/urls";
type ToolsAppProps = {
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/routes.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/routes.tsx
deleted file mode 100644
index bea59df64b8..00000000000
--- a/frontend/src/metabase/metabot/components/MetabotAdmin/routes.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { IndexRoute, Route } from "react-router";
-
-import { PLUGIN_AI_CONTROLS, PLUGIN_AUDIT } from "metabase/plugins";
-
-import { AISettingsPage } from "./AISettingsPage";
-import { MetabotAdminLayout } from "./MetabotAdminLayout";
-
-export function getMetabotAdminRoutes() {
- return [
- PLUGIN_AUDIT.getAiAnalyticsRoutes(),
- <Route key="layout" component={MetabotAdminLayout}>
- <IndexRoute key="index" component={AISettingsPage} />
- <Route key="metabot" path=":metabotId" component={AISettingsPage} />
- {PLUGIN_AI_CONTROLS.getAiControlsRoutes()}
- </Route>,
- ];
-}
diff --git a/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.tsx b/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.tsx
index 10b60217fd7..3c0aed029a1 100644
--- a/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.tsx
@@ -2,6 +2,7 @@ import { useDisclosure } from "@mantine/hooks";
import { useCallback } from "react";
import { t } from "ttag";
+import { MetabotSetupInner } from "metabase/admin/ai/MetabotSetup";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useStoreUrl } from "metabase/common/hooks";
import { useDispatch } from "metabase/redux";
@@ -15,8 +16,6 @@ import {
Text,
} from "metabase/ui";
-import { MetabotSetupInner } from "./MetabotAdmin/MetabotSetup";
-
const METABOT_MANAGED_PROVIDER_LIMIT_TOAST_ID =
"metabot-managed-provider-limit";
diff --git a/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.unit.spec.tsx
index 495af606092..8700a99a12c 100644
--- a/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.unit.spec.tsx
@@ -1,8 +1,8 @@
import userEvent from "@testing-library/user-event";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
+import * as metabotSetupModule from "metabase/admin/ai/MetabotSetup";
-import * as metabotSetupModule from "./MetabotAdmin/MetabotSetup";
import { getMetabotManagedProviderLimitToastProps } from "./MetabotManagedProviderLimit";
describe("getMetabotManagedProviderLimitToastProps", () => {