The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Move admin and single-consumer endpoints out of api (#79354)
Fraserb249fe1b3dcb
diff --git a/frontend/src/metabase/api/moderation.ts b/enterprise/frontend/src/metabase-enterprise/moderation/api/moderation.tssimilarity index 74%rename from frontend/src/metabase/api/moderation.tsrename to enterprise/frontend/src/metabase-enterprise/moderation/api/moderation.tsindex 477de519f6a..a0669f9860a 100644--- a/frontend/src/metabase/api/moderation.ts+++ b/enterprise/frontend/src/metabase-enterprise/moderation/api/moderation.ts@@ -1,9 +1,8 @@+import { invalidateTags, provideModeratedItemTags } from "metabase/api/tags";+import { EnterpriseApi } from "metabase-enterprise/api/api";import type { VerifyItemRequest } from "metabase-types/api";-import { Api } from "./api";-import { invalidateTags, provideModeratedItemTags } from "./tags";--export const contentVerificationApi = Api.injectEndpoints({+export const contentVerificationApi = EnterpriseApi.injectEndpoints({endpoints: (builder) => ({editItemVerification: builder.mutation<void, VerifyItemRequest>({query: (req) => ({diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsxindex b79d9bdcfe1..d38e3a6cafb 100644--- a/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsx+++ b/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsx@@ -1,11 +1,11 @@import { t } from "ttag";-import { useEditItemVerificationMutation } from "metabase/api";import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { Icon, Menu } from "metabase/ui";import type { Card, Dashboard, ModerationReview } from "metabase-types/api";+import { useEditItemVerificationMutation } from "../api/moderation";import {MODERATION_STATUS,getLatestModerationReview,diff --git a/frontend/src/metabase/api/login-history.ts b/frontend/src/metabase/account/api/login-history.tssimilarity index 91%rename from frontend/src/metabase/api/login-history.tsrename to frontend/src/metabase/account/api/login-history.tsindex b6f973d8a0b..1056286c594 100644--- a/frontend/src/metabase/api/login-history.ts+++ b/frontend/src/metabase/account/api/login-history.ts@@ -1,7 +1,6 @@+import { Api } from "metabase/api";import type { UserLoginHistory } from "metabase-types/api";-import { Api } from "./api";-export const loginHistoryApi = Api.injectEndpoints({endpoints: (builder) => ({getLoginHistory: builder.query<UserLoginHistory, void>({diff --git a/frontend/src/metabase/account/login-history/containers/LoginHistoryApp/LoginHistoryApp.tsx b/frontend/src/metabase/account/login-history/containers/LoginHistoryApp/LoginHistoryApp.tsxindex cce582df512..6b40d2dfe30 100644--- a/frontend/src/metabase/account/login-history/containers/LoginHistoryApp/LoginHistoryApp.tsx+++ b/frontend/src/metabase/account/login-history/containers/LoginHistoryApp/LoginHistoryApp.tsx@@ -1,6 +1,6 @@-import { useGetLoginHistoryQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useGetLoginHistoryQuery } from "../../../api/login-history";import LoginHistoryList from "../../components/LoginHistory";// eslint-disable-next-line import/no-default-export -- deprecated usagediff --git a/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx b/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsxindex 7b160c48073..432ca7c9dd9 100644--- a/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx+++ b/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx@@ -6,11 +6,7 @@ import * as Yup from "yup";import { SettingsSection } from "metabase/admin/components/SettingsSection";import { BasicAdminSettingInput } from "metabase/admin/settings/components/widgets/AdminSettingInput";-import { useUpdateMetabotSlackSettingsMutation } from "metabase/api/metabot";-import {- useGetSlackAppInfoQuery,- useGetSlackManifestQuery,-} from "metabase/api/slack";+import { useUpdateMetabotSlackSettingsMutation } from "metabase/api";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useDocsUrl } from "metabase/common/hooks";@@ -30,6 +26,11 @@ import { Accordion, Button, Flex, Stack, Text } from "metabase/ui";import * as Errors from "metabase/utils/errors";import type { SlackAppInfo } from "metabase-types/api/slack";+import {+ useGetSlackAppInfoQuery,+ useGetSlackManifestQuery,+} from "../settings/api/slack";+import {EncryptionRequiredAlert,MetabotSetupRequiredAlert,diff --git a/frontend/src/metabase/admin/ai/OAuthAuthorizationsPage.tsx b/frontend/src/metabase/admin/ai/OAuthAuthorizationsPage.tsxindex f347abd4fc0..ccd1b501b60 100644--- a/frontend/src/metabase/admin/ai/OAuthAuthorizationsPage.tsx+++ b/frontend/src/metabase/admin/ai/OAuthAuthorizationsPage.tsx@@ -3,7 +3,6 @@ import { t } from "ttag";import NoResults from "assets/img/no_results.svg";import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";-import { useListOAuthAuthorizationsQuery } from "metabase/api";import { DateTime } from "metabase/common/components/DateTime";import { EmptyState } from "metabase/common/components/EmptyState";import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";@@ -33,6 +32,8 @@ import type {OAuthClientEventType,} from "metabase-types/api";+import { useListOAuthAuthorizationsQuery } from "../settings/api/oauth";+import S from "./OAuthAuthorizationsPage.module.css";import {OAUTH_EVENT_TYPES,diff --git a/frontend/src/metabase/admin/people/components/GroupsListing.tsx b/frontend/src/metabase/admin/people/components/GroupsListing.tsxindex e88f3db86a2..3fb4ee93102 100644--- a/frontend/src/metabase/admin/people/components/GroupsListing.tsx+++ b/frontend/src/metabase/admin/people/components/GroupsListing.tsx@@ -5,7 +5,6 @@ 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 { ConfirmModal } from "metabase/common/components/ConfirmModal";import { Link } from "metabase/common/components/Link";@@ -30,6 +29,7 @@ import {import { KEYCODE_ENTER } from "metabase/utils/keyboard";import type { ApiKey, GroupInfo } from "metabase-types/api";+import { useListApiKeysQuery } from "../../settings/api/api-key";import { groupIdToColor } from "../colors";import { AddRow } from "./AddRow";diff --git a/frontend/src/metabase/api/api-key.ts b/frontend/src/metabase/admin/settings/api/api-key.tssimilarity index 93%rename from frontend/src/metabase/api/api-key.tsrename to frontend/src/metabase/admin/settings/api/api-key.tsindex 6b6f42215a5..26d97cc5c56 100644--- a/frontend/src/metabase/api/api-key.ts+++ b/frontend/src/metabase/admin/settings/api/api-key.ts@@ -1,3 +1,10 @@+import { Api } from "metabase/api";+import {+ idTag,+ invalidateTags,+ listTag,+ provideApiKeyListTags,+} from "metabase/api/tags";import type {ApiKey,ApiKeyId,@@ -8,9 +15,6 @@ import type {UpdateApiKeyResponse,} from "metabase-types/api/admin";-import { Api } from "./api";-import { idTag, invalidateTags, listTag, provideApiKeyListTags } from "./tags";-export const apiKeyApi = Api.injectEndpoints({endpoints: (builder) => ({listApiKeys: builder.query<ApiKey[], void>({diff --git a/frontend/src/metabase/api/cloud-migration.ts b/frontend/src/metabase/admin/settings/api/cloud-migration.tssimilarity index 93%rename from frontend/src/metabase/api/cloud-migration.tsrename to frontend/src/metabase/admin/settings/api/cloud-migration.tsindex fd87e6cbc1c..5337f6f1160 100644--- a/frontend/src/metabase/api/cloud-migration.ts+++ b/frontend/src/metabase/admin/settings/api/cloud-migration.ts@@ -1,8 +1,7 @@+import { Api } from "metabase/api";+import { listTag, tag } from "metabase/api/tags";import type { CloudMigration } from "metabase-types/api/cloud-migration";-import { Api } from "./api";-import { listTag, tag } from "./tags";-export const clouldMigrationApi = Api.injectEndpoints({endpoints: (builder) => ({getCloudMigration: builder.query<CloudMigration, void>({diff --git a/frontend/src/metabase/api/email.ts b/frontend/src/metabase/admin/settings/api/email.tssimilarity index 90%rename from frontend/src/metabase/api/email.tsrename to frontend/src/metabase/admin/settings/api/email.tsindex 236d241084b..357d46eace8 100644--- a/frontend/src/metabase/api/email.ts+++ b/frontend/src/metabase/admin/settings/api/email.ts@@ -1,13 +1,12 @@-import type { EmailSMTPSettings } from "metabase-types/api";--import { Api } from "./api";+import { Api } from "metabase/api";import {invalidateTags,provideSubscriptionChannelListTags,tag,-} from "./tags";+} from "metabase/api/tags";+import type { EmailSMTPSettings } from "metabase-types/api";-export const settingsApi = Api.injectEndpoints({+export const emailApi = Api.injectEndpoints({endpoints: (builder) => ({sendTestEmail: builder.mutation<void, void>({query: () => ({@@ -45,4 +44,4 @@ export const {useDeleteEmailSMTPSettingsMutation,useSendTestEmailMutation,useUpdateEmailSMTPSettingsMutation,-} = settingsApi;+} = emailApi;diff --git a/frontend/src/metabase/api/google.ts b/frontend/src/metabase/admin/settings/api/google.tssimilarity index 87%rename from frontend/src/metabase/api/google.tsrename to frontend/src/metabase/admin/settings/api/google.tsindex ce4149238d4..68e584e2fea 100644--- a/frontend/src/metabase/api/google.ts+++ b/frontend/src/metabase/admin/settings/api/google.ts@@ -1,8 +1,7 @@+import { Api } from "metabase/api";+import { invalidateTags, tag } from "metabase/api/tags";import type { EnterpriseSettings } from "metabase-types/api";-import { Api } from "./api";-import { invalidateTags, tag } from "./tags";-type GoogleAuthSettings = Pick<EnterpriseSettings,| "google-auth-enabled"diff --git a/frontend/src/metabase/api/ldap.ts b/frontend/src/metabase/admin/settings/api/ldap.tssimilarity index 90%rename from frontend/src/metabase/api/ldap.tsrename to frontend/src/metabase/admin/settings/api/ldap.tsindex 2b0a583bcf4..56a67c388c9 100644--- a/frontend/src/metabase/api/ldap.ts+++ b/frontend/src/metabase/admin/settings/api/ldap.ts@@ -1,8 +1,7 @@+import { Api } from "metabase/api";+import { invalidateTags, tag } from "metabase/api/tags";import type { EnterpriseSettings } from "metabase-types/api";-import { Api } from "./api";-import { invalidateTags, tag } from "./tags";-type LdapSettings = Pick<EnterpriseSettings,| "ldap-enabled"diff --git a/frontend/src/metabase/api/oauth.ts b/frontend/src/metabase/admin/settings/api/oauth.tssimilarity index 85%rename from frontend/src/metabase/api/oauth.tsrename to frontend/src/metabase/admin/settings/api/oauth.tsindex 6b988d188b7..b08cdf3ed6e 100644--- a/frontend/src/metabase/api/oauth.ts+++ b/frontend/src/metabase/admin/settings/api/oauth.ts@@ -1,11 +1,10 @@+import { Api } from "metabase/api";+import { provideOAuthAuthorizationListTags } from "metabase/api/tags";import type {ListOAuthAuthorizationsRequest,ListOAuthAuthorizationsResponse,} from "metabase-types/api";-import { Api } from "./api";-import { provideOAuthAuthorizationListTags } from "./tags";-export const oauthApi = Api.injectEndpoints({endpoints: (builder) => ({listOAuthAuthorizations: builder.query<diff --git a/frontend/src/metabase/api/slack.ts b/frontend/src/metabase/admin/settings/api/slack.tssimilarity index 92%rename from frontend/src/metabase/api/slack.tsrename to frontend/src/metabase/admin/settings/api/slack.tsindex 24081d92643..1b07b783b46 100644--- a/frontend/src/metabase/api/slack.ts+++ b/frontend/src/metabase/admin/settings/api/slack.ts@@ -1,8 +1,7 @@+import { Api } from "metabase/api";+import { listTag } from "metabase/api/tags";import type { SlackAppInfo, SlackSettings } from "metabase-types/api";-import { Api } from "./api";-import { listTag } from "./tags";-export const slackApi = Api.injectEndpoints({endpoints: (builder) => ({getSlackManifest: builder.query<Record<string, unknown>, void>({diff --git a/frontend/src/metabase/admin/settings/auth/components/ApiKeysAuthCard.tsx b/frontend/src/metabase/admin/settings/auth/components/ApiKeysAuthCard.tsxindex e66c7bc253d..445316090d5 100644--- a/frontend/src/metabase/admin/settings/auth/components/ApiKeysAuthCard.tsx+++ b/frontend/src/metabase/admin/settings/auth/components/ApiKeysAuthCard.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import { useCountApiKeysQuery } from "metabase/api";+import { useCountApiKeysQuery } from "../../api/api-key";import { AuthCardBody } from "./AuthCard/AuthCard";diff --git a/frontend/src/metabase/admin/settings/auth/components/GoogleAuthForm/GoogleAuthForm.tsx b/frontend/src/metabase/admin/settings/auth/components/GoogleAuthForm/GoogleAuthForm.tsxindex 361c80a0ed5..fda047667e0 100644--- a/frontend/src/metabase/admin/settings/auth/components/GoogleAuthForm/GoogleAuthForm.tsx+++ b/frontend/src/metabase/admin/settings/auth/components/GoogleAuthForm/GoogleAuthForm.tsx@@ -5,7 +5,6 @@ import {SettingsPageWrapper,SettingsSection,} from "metabase/admin/components/SettingsSection";-import { useUpdateGoogleAuthMutation } from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useDocsUrl, useHasTokenFeature } from "metabase/common/hooks";import {@@ -23,6 +22,7 @@ import {import { Flex, Stack, Text, Title } from "metabase/ui";import type { SettingDefinition, Settings } from "metabase-types/api";+import { useUpdateGoogleAuthMutation } from "../../../api/google";import { GOOGLE_SCHEMA } from "../../constants";const ENABLED_KEY = "google-auth-enabled";diff --git a/frontend/src/metabase/admin/settings/components/ApiKeys/CreateApiKeyModal.tsx b/frontend/src/metabase/admin/settings/components/ApiKeys/CreateApiKeyModal.tsxindex dba7bb9b83b..6474ae8a8c2 100644--- a/frontend/src/metabase/admin/settings/components/ApiKeys/CreateApiKeyModal.tsx+++ b/frontend/src/metabase/admin/settings/components/ApiKeys/CreateApiKeyModal.tsx@@ -1,7 +1,6 @@import { useCallback } from "react";import { t } from "ttag";-import { useCreateApiKeyMutation } from "metabase/api";import {Form,FormErrorMessage,@@ -13,6 +12,8 @@ import {import { Button, Group, Modal, Paper, Stack, Text } from "metabase/ui";import type { CreateApiKeyRequest } from "metabase-types/api";+import { useCreateApiKeyMutation } from "../../api/api-key";+import S from "./CreateApiKeyModal.module.css";import { SecretKeyModal } from "./SecretKeyModal";import { API_KEY_VALIDATION_SCHEMA } from "./utils";diff --git a/frontend/src/metabase/admin/settings/components/ApiKeys/DeleteApiKeyModal.tsx b/frontend/src/metabase/admin/settings/components/ApiKeys/DeleteApiKeyModal.tsxindex c3aaaf6cbe7..d8a3caf5bf8 100644--- a/frontend/src/metabase/admin/settings/components/ApiKeys/DeleteApiKeyModal.tsx+++ b/frontend/src/metabase/admin/settings/components/ApiKeys/DeleteApiKeyModal.tsx@@ -1,7 +1,6 @@import { useCallback } from "react";import { t } from "ttag";-import { useDeleteApiKeyMutation } from "metabase/api";import {Form,FormErrorMessage,@@ -11,6 +10,8 @@ import {import { Button, Group, Modal, Stack, Text } from "metabase/ui";import type { ApiKey } from "metabase-types/api";+import { useDeleteApiKeyMutation } from "../../api/api-key";+export const DeleteApiKeyModal = ({onClose,apiKey,diff --git a/frontend/src/metabase/admin/settings/components/ApiKeys/EditApiKeyModal.tsx b/frontend/src/metabase/admin/settings/components/ApiKeys/EditApiKeyModal.tsxindex 331ca217cf6..93945f2664c 100644--- a/frontend/src/metabase/admin/settings/components/ApiKeys/EditApiKeyModal.tsx+++ b/frontend/src/metabase/admin/settings/components/ApiKeys/EditApiKeyModal.tsx@@ -1,10 +1,6 @@import { useCallback, useState } from "react";import { t } from "ttag";-import {- useRegenerateApiKeyMutation,- useUpdateApiKeyMutation,-} from "metabase/api";import {Form,FormErrorMessage,@@ -17,6 +13,11 @@ import { Button, Group, Modal, Paper, Stack, Text } from "metabase/ui";import { getThemeOverrides } from "metabase/ui/theme";import type { ApiKey, UpdateApiKeyRequest } from "metabase-types/api";+import {+ useRegenerateApiKeyMutation,+ useUpdateApiKeyMutation,+} from "../../api/api-key";+import S from "./EditApiKeyModal.module.css";import { SecretKeyModal } from "./SecretKeyModal";import { API_KEY_VALIDATION_SCHEMA } from "./utils";diff --git a/frontend/src/metabase/admin/settings/components/ApiKeys/ManageApiKeys.tsx b/frontend/src/metabase/admin/settings/components/ApiKeys/ManageApiKeys.tsxindex ba0612c1f8e..147ff3a8b69 100644--- a/frontend/src/metabase/admin/settings/components/ApiKeys/ManageApiKeys.tsx+++ b/frontend/src/metabase/admin/settings/components/ApiKeys/ManageApiKeys.tsx@@ -4,7 +4,6 @@ import { t } from "ttag";import ApiKeysEmptyIllustration from "assets/img/api-keys-empty.svg?component";import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";-import { useListApiKeysQuery } from "metabase/api";import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";import {ActionIcon,@@ -27,6 +26,8 @@ import { getThemeOverrides } from "metabase/ui/theme";import { formatDateTimeWithUnit } from "metabase/value-formatting";import type { ApiKey } from "metabase-types/api";+import { useListApiKeysQuery } from "../../api/api-key";+import { CreateApiKeyModal } from "./CreateApiKeyModal";import { DeleteApiKeyModal } from "./DeleteApiKeyModal";import { EditApiKeyModal } from "./EditApiKeyModal";diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsxindex 20d3de447d9..f1670cbcb30 100644--- a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx@@ -1,9 +1,5 @@import { useEffect, useState } from "react";-import {- useCreateCloudMigrationMutation,- useGetCloudMigrationQuery,-} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useStoreUrl } from "metabase/common/hooks";import { type Plan, getPlan } from "metabase/common/utils/plan";@@ -12,6 +8,11 @@ import { getSetting, useLazyGetSettingsQuery } from "metabase/settings";import { Box } from "metabase/ui";import type { CloudMigration } from "metabase-types/api/cloud-migration";+import {+ useCreateCloudMigrationMutation,+ useGetCloudMigrationQuery,+} from "../../api/cloud-migration";+import { MigrationCreationError } from "./MigrationCreationError";import { MigrationError } from "./MigrationError";import { MigrationInProgress } from "./MigrationInProgress";diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsxindex 93fdd2ed9e1..2c56245eb2f 100644--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx@@ -1,7 +1,6 @@/* eslint-disable ttag/no-module-declaration -- see metabase#55045 */import { t } from "ttag";-import { useCancelCloudMigrationMutation } from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useToggle } from "metabase/common/hooks/use-toggle";import type { Plan } from "metabase/common/utils/plan";@@ -19,6 +18,8 @@ import {Text,} from "metabase/ui";+import { useCancelCloudMigrationMutation } from "../../api/cloud-migration";+import { MigrationCard } from "./CloudPanel.styled";import type { InProgressCloudMigration, InProgressStates } from "./utils";import { getMigrationUrl } from "./utils";diff --git a/frontend/src/metabase/admin/settings/components/Email/SelfHostedSMTPConnectionForm.tsx b/frontend/src/metabase/admin/settings/components/Email/SelfHostedSMTPConnectionForm.tsxindex 20b4aa93544..a04e3a57a0e 100644--- a/frontend/src/metabase/admin/settings/components/Email/SelfHostedSMTPConnectionForm.tsx+++ b/frontend/src/metabase/admin/settings/components/Email/SelfHostedSMTPConnectionForm.tsx@@ -3,7 +3,7 @@ import { useCallback } from "react";import {useDeleteEmailSMTPSettingsMutation,useUpdateEmailSMTPSettingsMutation,-} from "metabase/api/email";+} from "../../api/email";import { BaseSMTPConnectionForm } from "./BaseSMTPConnectionForm";import { trackSMTPSetupSuccess } from "./analytics";diff --git a/frontend/src/metabase/admin/settings/components/SettingsLdapForm.tsx b/frontend/src/metabase/admin/settings/components/SettingsLdapForm.tsxindex 883c7cd438e..84cdd4b03e5 100644--- a/frontend/src/metabase/admin/settings/components/SettingsLdapForm.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsLdapForm.tsx@@ -10,7 +10,6 @@ import {} from "metabase/admin/components/SettingsSection";import { GroupMappingsWidget } from "metabase/admin/settings/components/widgets/GroupMappingsWidget";import { getExtraFormFieldProps } from "metabase/admin/settings/utils";-import { useUpdateLdapMutation } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import {Form,@@ -29,6 +28,8 @@ import {import { Box, Divider, Flex, Group, Radio, Stack } from "metabase/ui";import type { EnterpriseSettings, Settings } from "metabase-types/api";+import { useUpdateLdapMutation } from "../api/ldap";+const testParentheses: TestConfig<string | null | undefined> = {name: "test-parentheses",message: "Check your parentheses",diff --git a/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.tsxindex cd26f65309f..bc17a4f9bdd 100644--- a/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.tsx@@ -1,11 +1,12 @@import { t } from "ttag";-import { useSendTestEmailMutation } from "metabase/api/email";import { getErrorMessage } from "metabase/api/utils";import { useToast } from "metabase/common/hooks";import { useSetting } from "metabase/settings";import { Button, Text } from "metabase/ui";+import { useSendTestEmailMutation } from "../../api/email";+export function SendTestEmailWidget() {const [sendTestEmail, sendTestEmailResult] = useSendTestEmailMutation();const [sendToast] = useToast();diff --git a/frontend/src/metabase/admin/settings/slack/SlackBugReportChannelInput.tsx b/frontend/src/metabase/admin/settings/slack/SlackBugReportChannelInput.tsxindex d6fea0d5c25..cb90d14d23d 100644--- a/frontend/src/metabase/admin/settings/slack/SlackBugReportChannelInput.tsx+++ b/frontend/src/metabase/admin/settings/slack/SlackBugReportChannelInput.tsx@@ -1,11 +1,11 @@import { useEffect, useState } from "react";import { t } from "ttag";-import { useUpdateSlackSettingsMutation } from "metabase/api";import { useToast } from "metabase/common/hooks";import { useSetting } from "metabase/settings";import { Box, Text, TextInput } from "metabase/ui";+import { useUpdateSlackSettingsMutation } from "../api/slack";import { SettingHeader } from "../components/SettingHeader";const getSlackError = (err: unknown): string =>diff --git a/frontend/src/metabase/admin/settings/slack/SlackConfiguration.tsx b/frontend/src/metabase/admin/settings/slack/SlackConfiguration.tsxindex 413d73d9cf8..a7be8f12ec3 100644--- a/frontend/src/metabase/admin/settings/slack/SlackConfiguration.tsx+++ b/frontend/src/metabase/admin/settings/slack/SlackConfiguration.tsx@@ -1,10 +1,11 @@import { t } from "ttag";-import { useGetSlackAppInfoQuery } from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useSetting } from "metabase/settings";import { Box, Button, Flex, Stack, Text } from "metabase/ui";+import { useGetSlackAppInfoQuery } from "../api/slack";+import { SlackBugReportChannelInput } from "./SlackBugReportChannelInput";export const SlackConfiguration = () => {diff --git a/frontend/src/metabase/admin/settings/slack/SlackSetup.tsx b/frontend/src/metabase/admin/settings/slack/SlackSetup.tsxindex 3c9db376bdc..61ff1c84ef6 100644--- a/frontend/src/metabase/admin/settings/slack/SlackSetup.tsx+++ b/frontend/src/metabase/admin/settings/slack/SlackSetup.tsx@@ -3,10 +3,6 @@ import { useMemo } from "react";import { jt, t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";-import {- useGetSlackManifestQuery,- useUpdateSlackSettingsMutation,-} from "metabase/api";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import {ButtonLink,@@ -27,6 +23,11 @@ import {Text,} from "metabase/ui";+import {+ useGetSlackManifestQuery,+ useUpdateSlackSettingsMutation,+} from "../api/slack";+import { SlackConfiguration } from "./SlackConfiguration";import { SlackSetupForm } from "./SlackSetupForm";diff --git a/frontend/src/metabase/admin/settings/slack/SlackSetupForm.tsx b/frontend/src/metabase/admin/settings/slack/SlackSetupForm.tsxindex 7587a8a7155..afd63811fdb 100644--- a/frontend/src/metabase/admin/settings/slack/SlackSetupForm.tsx+++ b/frontend/src/metabase/admin/settings/slack/SlackSetupForm.tsx@@ -1,7 +1,6 @@import { t } from "ttag";import * as Yup from "yup";-import { useUpdateSlackSettingsMutation } from "metabase/api";import {Form,FormErrorMessage,@@ -12,6 +11,8 @@ import {import { Flex, Stack } from "metabase/ui";import * as Errors from "metabase/utils/errors";+import { useUpdateSlackSettingsMutation } from "../api/slack";+type FormValues = { "slack-app-token": string };const SLACK_SCHEMA = Yup.object({diff --git a/frontend/src/metabase/api/index.ts b/frontend/src/metabase/api/index.tsindex b85dc3c0ef5..1cf824e18ac 100644--- a/frontend/src/metabase/api/index.ts+++ b/frontend/src/metabase/api/index.ts@@ -3,14 +3,12 @@ export * from "./activity";export * from "./ai-entity-analysis";export * from "./analytics";export * from "./api";-export * from "./api-key";export * from "./automagic-dashboards";export * from "./bookmark";export * from "./bug-report";export * from "./cache-config";export * from "./card";export * from "./channel";-export * from "./cloud-migration";export * from "./collection";export * from "./comment";export * from "./dashboard";@@ -23,19 +21,13 @@ export * from "./exploration";export * from "./field";export * from "./frontend-errors";export * from "./glossary";-export * from "./google";export * from "./group-table-access-policy";export * from "./index-manager";-export * from "./ldap";export * from "./llm";-export * from "./login-history";export * from "./measure";export * from "./metabot";export * from "./metric";-export * from "./model-index";-export * from "./moderation";export * from "./notification";-export * from "./oauth";export * from "./parameters";export * from "./permission";export * from "./persist";@@ -49,7 +41,6 @@ export * from "./security-center";export * from "./segment";export * from "./session";export * from "./setup";-export * from "./slack";export * from "./snippet";export * from "./subscription";export * from "./table";diff --git a/frontend/src/metabase/api/embedding-hub.ts b/frontend/src/metabase/embedding/embedding-hub/api/embedding-hub.tssimilarity index 96%rename from frontend/src/metabase/api/embedding-hub.tsrename to frontend/src/metabase/embedding/embedding-hub/api/embedding-hub.tsindex 16ec51db170..6d5b0b2e643 100644--- a/frontend/src/metabase/api/embedding-hub.ts+++ b/frontend/src/metabase/embedding/embedding-hub/api/embedding-hub.ts@@ -1,8 +1,7 @@import { Api } from "metabase/api";+import { listTag } from "metabase/api/tags";import type { DataSegregationStrategy } from "metabase-types/api";-import { listTag } from "./tags";-type CheckListApiStep =| "create-dashboard"| "add-data"diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/SetupPermissionsAndTenantsPage.tsx b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/SetupPermissionsAndTenantsPage.tsxindex 3d7b1595456..2914c818070 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/SetupPermissionsAndTenantsPage.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/SetupPermissionsAndTenantsPage.tsx@@ -2,7 +2,6 @@ import { useMemo, useRef, useState } from "react";import { match } from "ts-pattern";import { t } from "ttag";-import { useGetEmbeddingHubChecklistQuery } from "metabase/api/embedding-hub";import { Link } from "metabase/common/components/Link";import { OnboardingStepper } from "metabase/embedding/embedding-hub/components/OnboardingStepper";import type { OnboardingStepperHandle } from "metabase/embedding/embedding-hub/components/OnboardingStepper/types";@@ -13,6 +12,8 @@ import {import { Group, Icon, Stack, Text, Title } from "metabase/ui";import type { DataSegregationStrategy } from "metabase-types/api";+import { useGetEmbeddingHubChecklistQuery } from "../../api/embedding-hub";+import { ConnectionImpersonationStepContent } from "./ConnectionImpersonationStepContent";import { DataSegregationStrategyPicker } from "./DataSegregationStrategyPicker";import { DatabaseRoutingStepContent } from "./DatabaseRoutingStepContent";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.tsx b/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.tsxindex 6daa46b3855..28ec37992bc 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.tsx@@ -1,12 +1,13 @@import { useMemo, useRef, useState } from "react";import { t } from "ttag";-import { useGetEmbeddingHubChecklistQuery } from "metabase/api/embedding-hub";import { Link } from "metabase/common/components/Link";import { OnboardingStepper } from "metabase/embedding/embedding-hub/components/OnboardingStepper";import type { OnboardingStepperHandle } from "metabase/embedding/embedding-hub/components/OnboardingStepper/types";import { Group, Icon, Stack, Text, Title } from "metabase/ui";+import { useGetEmbeddingHubChecklistQuery } from "../../api/embedding-hub";+import { AddEndpointStep } from "./AddEndpointStep";import { SetupJwtStep } from "./SetupJwtStep";import S from "./SetupSsoPage.module.css";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.unit.spec.tsx b/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.unit.spec.tsxindex 3d0b241a7e3..9b1f74a6296 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.unit.spec.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.unit.spec.tsx@@ -7,7 +7,6 @@ import {setupUpdateSettingsEndpoint,} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";-import type { EmbeddingHubChecklist } from "metabase/api/embedding-hub";import {createMockSettingsState,createMockState,@@ -15,6 +14,8 @@ import {import { Route } from "metabase/router";import { createMockSettings } from "metabase-types/api/mocks";+import type { EmbeddingHubChecklist } from "../../api/embedding-hub";+import { SetupSsoPage } from "./SetupSsoPage";const defaultChecklist: EmbeddingHubChecklist = {diff --git a/frontend/src/metabase/embedding/embedding-hub/hooks/use-completed-embedding-hub-steps.ts b/frontend/src/metabase/embedding/embedding-hub/hooks/use-completed-embedding-hub-steps.tsindex 99d5d879326..fe3791be179 100644--- a/frontend/src/metabase/embedding/embedding-hub/hooks/use-completed-embedding-hub-steps.ts+++ b/frontend/src/metabase/embedding/embedding-hub/hooks/use-completed-embedding-hub-steps.ts@@ -1,7 +1,6 @@import { useMemo } from "react";-import { useGetEmbeddingHubChecklistQuery } from "metabase/api/embedding-hub";-+import { useGetEmbeddingHubChecklistQuery } from "../api/embedding-hub";import type { EmbeddingHubStepId } from "../types";/**diff --git a/frontend/src/metabase/api/product-feedback.ts b/frontend/src/metabase/home/api/product-feedback.tssimilarity index 94%rename from frontend/src/metabase/api/product-feedback.tsrename to frontend/src/metabase/home/api/product-feedback.tsindex 829678da600..bc96e349c6b 100644--- a/frontend/src/metabase/api/product-feedback.ts+++ b/frontend/src/metabase/home/api/product-feedback.ts@@ -1,4 +1,4 @@-import { Api } from "./api";+import { Api } from "metabase/api";const productFeedbackApi = Api.injectEndpoints({endpoints: (builder) => ({diff --git a/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx b/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsxindex 36693f47699..e3d91dfe1da 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx+++ b/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx@@ -1,7 +1,6 @@import { useState } from "react";import { t } from "ttag";-import { useSendProductFeedbackMutation } from "metabase/api/product-feedback";import { useHasTokenFeature } from "metabase/common/hooks";import { getPlan } from "metabase/common/utils/plan";import { PLUGIN_IS_EE_BUILD } from "metabase/plugins";@@ -11,6 +10,8 @@ import { getDocsUrl } from "metabase/selectors/settings";import { getSetting, useSetting } from "metabase/settings";import type { EmbeddingHomepageDismissReason } from "metabase-types/api";+import { useSendProductFeedbackMutation } from "../../api/product-feedback";+import { EmbedHomepageView } from "./EmbedHomepageView";import { FeedbackModal } from "./FeedbackModal";import { dismissEmbeddingHomepage } from "./actions";diff --git a/frontend/src/metabase/api/model-index.ts b/frontend/src/metabase/query_builder/api/model-index.tssimilarity index 90%rename from frontend/src/metabase/api/model-index.tsrename to frontend/src/metabase/query_builder/api/model-index.tsindex e0203aa5454..61c37dc24bb 100644--- a/frontend/src/metabase/api/model-index.ts+++ b/frontend/src/metabase/query_builder/api/model-index.ts@@ -1,3 +1,9 @@+import { Api } from "metabase/api";+import {+ invalidateTags,+ listTag,+ provideModelIndexListTags,+} from "metabase/api/tags";import type {ModelIndex,ModelIndexCreateQuery,@@ -5,9 +11,6 @@ import type {ModelIndexesListQuery,} from "metabase-types/api";-import { Api } from "./api";-import { invalidateTags, listTag, provideModelIndexListTags } from "./tags";-export const modelIndexApi = Api.injectEndpoints({endpoints: (builder) => ({listModelIndexes: builder.query<ModelIndex[], ModelIndexesListQuery>({diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsxindex fa72636ff4a..d68804cb797 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx@@ -12,7 +12,6 @@ import {import { useMount, usePrevious } from "react-use";import { t } from "ttag";-import { useListModelIndexesQuery } from "metabase/api";import {ActionButton,type ActionButtonHandle,@@ -75,6 +74,8 @@ import type {} from "metabase-types/api";import type { ModelIndex } from "metabase-types/api/modelIndexes";+import { useListModelIndexesQuery } from "../../api/model-index";+import DatasetEditorS from "./DatasetEditor.module.css";import {DatasetEditorSettingsSidebar,diff --git a/frontend/src/metabase/query_builder/model-indexes/actions.ts b/frontend/src/metabase/query_builder/model-indexes/actions.tsindex 7efa2328d00..9af47141096 100644--- a/frontend/src/metabase/query_builder/model-indexes/actions.ts+++ b/frontend/src/metabase/query_builder/model-indexes/actions.ts@@ -1,16 +1,17 @@import { dissocIn } from "icepick";import _ from "underscore";-import {- createModelIndex,- deleteModelIndex,- listModelIndexes,-} from "metabase/api";import type { Dispatch } from "metabase/redux/store";import type Question from "metabase-lib/v1/Question";import type { DatasetColumn, Field, FieldReference } from "metabase-types/api";import type { ModelIndex } from "metabase-types/api/modelIndexes";+import {+ createModelIndex,+ deleteModelIndex,+ listModelIndexes,+} from "../api/model-index";+import { getPkRef } from "./utils";export type FieldWithMaybeIndex = Field & {