Skip to content

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

Move api utils into api (#73706)

Fraserb72e8e9dddcf
diff --git a/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts b/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts
index e47ead8843f..524cb472032 100644
--- a/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts
+++ b/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts
@@ -28,6 +28,7 @@ import { getBuildInfo } from "embedding-sdk-shared/lib/get-build-info";
import { getWindow } from "embedding-sdk-shared/lib/get-window";
import type { SdkAuthState } from "embedding-sdk-shared/types/auth-state";
import { SDK_AUTH_STATE_KEY } from "embedding-sdk-shared/types/auth-state";
+import api from "metabase/api/legacy-client";
import { requestSessionTokenFromEmbedJs } from "metabase/embedding/embedding-iframe-sdk/utils";
import {
EMBEDDING_SDK_IFRAME_EMBEDDING_CONFIG,
@@ -39,7 +40,6 @@ import { PLUGIN_EMBEDDING_SDK } from "metabase/plugins";
import { loadSettings, refreshSiteSettings } from "metabase/redux/settings";
import { refreshCurrentUser } from "metabase/redux/user";
import { createAsyncThunk } from "metabase/redux/utils";
-import api from "metabase/utils/api";
import MetabaseSettings from "metabase/utils/settings";
import type { Settings } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/services.ts b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/services.ts
index 6a66a1c7a73..263b278682b 100644
--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/services.ts
+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/services.ts
@@ -1,4 +1,4 @@
-import { GET } from "metabase/utils/api";
+import { GET } from "metabase/api/legacy-client";
export const ImpersonationApi = {
get: GET("/api/ee/advanced-permissions/impersonation"),
diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/api.ts b/enterprise/frontend/src/metabase-enterprise/application_permissions/api.ts
index a36bf921012..d9191f6ad93 100644
--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/api.ts
+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/api.ts
@@ -1,4 +1,4 @@
-import { GET, PUT } from "metabase/utils/api";
+import { GET, PUT } from "metabase/api/legacy-client";
export const ApplicationPermissionsApi = {
graph: GET("/api/ee/advanced-permissions/application/graph"),
diff --git a/enterprise/frontend/src/metabase-enterprise/services.ts b/enterprise/frontend/src/metabase-enterprise/services.ts
index 1c7de0b1555..9a461f5bba9 100644
--- a/enterprise/frontend/src/metabase-enterprise/services.ts
+++ b/enterprise/frontend/src/metabase-enterprise/services.ts
@@ -1,4 +1,4 @@
-import { DELETE, GET } from "metabase/utils/api";
+import { DELETE, GET } from "metabase/api/legacy-client";
export const AuditApi = {
unsubscribe_user: DELETE("/api/ee/audit-app/user/:id/subscriptions"),
diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-init-data/use-init-data-internal.ts b/frontend/src/embedding-sdk-bundle/hooks/private/use-init-data/use-init-data-internal.ts
index 5ee481c2648..93ed221c9c5 100644
--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-init-data/use-init-data-internal.ts
+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-init-data/use-init-data-internal.ts
@@ -16,13 +16,13 @@ import { useLazySelector } from "embedding-sdk-shared/hooks/use-lazy-selector";
import { useMetabaseProviderPropsStore } from "embedding-sdk-shared/hooks/use-metabase-provider-props-store";
import { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensure-metabase-provider-props-store";
import { getBuildInfo } from "embedding-sdk-shared/lib/get-build-info";
+import api from "metabase/api/legacy-client";
import registerDashboardVisualizations from "metabase/dashboard/visualizations/register";
import {
EMBEDDING_SDK_CONFIG,
isEmbeddingEajs,
} from "metabase/embedding-sdk/config";
import type { OnBeforeRequestHandlerConfig } from "metabase/plugins/oss/api";
-import api from "metabase/utils/api";
import registerVisualizations from "metabase/visualizations/register";
const reactSdkEmbedReferrerHandler = async (
diff --git a/frontend/src/metabase/AppThemeProvider.tsx b/frontend/src/metabase/AppThemeProvider.tsx
index 1e89b3e58fb..50458d7b61d 100644
--- a/frontend/src/metabase/AppThemeProvider.tsx
+++ b/frontend/src/metabase/AppThemeProvider.tsx
@@ -1,5 +1,6 @@
import { type ReactNode, useCallback, useEffect, useState } from "react";
+import { PUT } from "metabase/api/legacy-client";
import {
isPublicEmbedding,
isStaticEmbedding,
@@ -9,7 +10,6 @@ import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import type { MantineThemeOverride } from "metabase/ui";
import { mutateColors } from "metabase/ui/colors/colors";
import { ThemeProvider } from "metabase/ui/components/theme/ThemeProvider";
-import { PUT } from "metabase/utils/api";
import { parseHashOptions } from "metabase/utils/browser";
import type {
ColorScheme,
diff --git a/frontend/src/metabase/api/ai-streaming/requests.ts b/frontend/src/metabase/api/ai-streaming/requests.ts
index e32ffce4b3e..2bed10e0bd0 100644
--- a/frontend/src/metabase/api/ai-streaming/requests.ts
+++ b/frontend/src/metabase/api/ai-streaming/requests.ts
@@ -1,6 +1,6 @@
import { nanoid } from "@reduxjs/toolkit";
-import api from "metabase/utils/api";
+import api from "metabase/api/legacy-client";
import type { JSONValue } from "metabase-types/api";
import { type AIStreamingConfig, processChatResponse } from "./process-stream";
diff --git a/frontend/src/metabase/api/ai-streaming/requests.unit.spec.ts b/frontend/src/metabase/api/ai-streaming/requests.unit.spec.ts
index 66b04cef451..3bc91ad24e4 100644
--- a/frontend/src/metabase/api/ai-streaming/requests.unit.spec.ts
+++ b/frontend/src/metabase/api/ai-streaming/requests.unit.spec.ts
@@ -1,6 +1,6 @@
import fetchMock from "fetch-mock";
-import api from "metabase/utils/api";
+import api from "metabase/api/legacy-client";
import {
aiStreamingQuery,
diff --git a/frontend/src/metabase/utils/internal-analytics.ts b/frontend/src/metabase/api/internal-analytics.ts
similarity index 87%
rename from frontend/src/metabase/utils/internal-analytics.ts
rename to frontend/src/metabase/api/internal-analytics.ts
index fb5ad895276..ab37ddd9dff 100644
--- a/frontend/src/metabase/utils/internal-analytics.ts
+++ b/frontend/src/metabase/api/internal-analytics.ts
@@ -1,4 +1,4 @@
-import { POST } from "metabase/utils/api";
+import { POST } from "metabase/api/legacy-client";
type InternalAnalyticsEvent = {
op: "inc" | "dec" | "set" | "observe" | "clear";
diff --git a/frontend/src/metabase/utils/api.ts b/frontend/src/metabase/api/legacy-client.ts
similarity index 99%
rename from frontend/src/metabase/utils/api.ts
rename to frontend/src/metabase/api/legacy-client.ts
index 94d9fb385cf..53b6069497d 100644
--- a/frontend/src/metabase/utils/api.ts
+++ b/frontend/src/metabase/api/legacy-client.ts
@@ -88,7 +88,7 @@ type ResponseErrorInfo = {
metabaseVersion: string | null;
};
-export class Api extends EventEmitter {
+export class LegacyApi extends EventEmitter {
basename = "";
apiKey = "";
sessionToken: string | undefined;
@@ -570,7 +570,7 @@ export class Api extends EventEmitter {
}
}
-const instance = new Api();
+const instance = new LegacyApi();
// eslint-disable-next-line import/no-default-export -- deprecated usage
export default instance;
diff --git a/frontend/src/metabase/utils/api.unit.spec.ts b/frontend/src/metabase/api/legacy-client.unit.spec.ts
similarity index 98%
rename from frontend/src/metabase/utils/api.unit.spec.ts
rename to frontend/src/metabase/api/legacy-client.unit.spec.ts
index ea9576e3d75..054c68e9aa0 100644
--- a/frontend/src/metabase/utils/api.unit.spec.ts
+++ b/frontend/src/metabase/api/legacy-client.unit.spec.ts
@@ -1,4 +1,4 @@
-import { Api } from "./api";
+import { LegacyApi } from "./legacy-client";
type OnBeforeRequestHandlerData = {
method: "GET" | "POST" | "PUT" | "DELETE";
@@ -11,10 +11,10 @@ type OnBeforeRequestHandlerData = {
describe("api", () => {
describe("apiRequestManipulationMiddleware", () => {
- let apiInstance: Api;
+ let apiInstance: LegacyApi;
beforeEach(() => {
- apiInstance = new Api();
+ apiInstance = new LegacyApi();
});
it("should return the original data when there are no handlers", async () => {
diff --git a/frontend/src/metabase/api/localization.ts b/frontend/src/metabase/api/localization.ts
new file mode 100644
index 00000000000..fbe4af46e57
--- /dev/null
+++ b/frontend/src/metabase/api/localization.ts
@@ -0,0 +1,37 @@
+import api from "metabase/api/legacy-client";
+import {
+ type LocaleDataWithLanguage,
+ setLocalization,
+} from "metabase/utils/i18n";
+
+// note this won't refresh strings that are evaluated at load time
+export async function loadLocalization(
+ locale: string,
+): Promise<LocaleDataWithLanguage> {
+ // we need to be sure to set the initial localization before loading any files
+ // so load metabase/services only when we need it
+ // load and parse the locale
+ const translationsObject: LocaleDataWithLanguage =
+ locale !== "en"
+ ? // We don't use I18NApi.locale/the GET helper because those helpers adds custom headers,
+ // which will make the browser do the pre-flight request on the SDK.
+ // The backend doesn't seem to support pre-flight request on the static assets, but even
+ // if it supported them it's more performant to skip the pre-flight request
+ await fetch(`${api.basename}/app/locales/${locale}.json`).then(
+ (response) => response.json(),
+ )
+ : // We don't serve en.json. Instead, use this object to fall back to the literals.
+ {
+ headers: {
+ language: "en",
+ "plural-forms": "nplurals=2; plural=(n != 1);",
+ },
+ translations: {
+ // eslint-disable-next-line metabase/no-literal-metabase-strings -- Not a user facing string
+ "": { Metabase: { msgid: "Metabase", msgstr: ["Metabase"] } },
+ },
+ };
+ setLocalization(translationsObject);
+
+ return translationsObject;
+}
diff --git a/frontend/src/metabase/api/query.ts b/frontend/src/metabase/api/query.ts
index 0db665b9bc7..e415d126505 100644
--- a/frontend/src/metabase/api/query.ts
+++ b/frontend/src/metabase/api/query.ts
@@ -1,6 +1,6 @@
import type { BaseQueryFn } from "@reduxjs/toolkit/query/react";
-import api from "metabase/utils/api";
+import api from "metabase/api/legacy-client";
type AllowedHTTPMethods = "GET" | "POST" | "PUT" | "DELETE";
const allowedHTTPMethods = new Set<AllowedHTTPMethods>([
diff --git a/frontend/src/metabase/app-main.js b/frontend/src/metabase/app-main.js
index f12b1a981ff..ceec757bcf2 100644
--- a/frontend/src/metabase/app-main.js
+++ b/frontend/src/metabase/app-main.js
@@ -5,12 +5,12 @@ import "metabase-dev";
import { push } from "react-router-redux";
import _ from "underscore";
+import api from "metabase/api/legacy-client";
import { init } from "metabase/app";
import { mainReducers } from "metabase/reducers-main";
import { setErrorPage } from "metabase/redux/app";
import { clearCurrentUser } from "metabase/redux/user";
import { getRoutes } from "metabase/routes";
-import api from "metabase/utils/api";
import { IFRAMED_IN_SELF, isWithinIframe } from "metabase/utils/iframe";
// If any of these receives a 403, we should display the "not authorized" page.
diff --git a/frontend/src/metabase/app.js b/frontend/src/metabase/app.js
index e8e1c1f02c5..05d49379e6c 100644
--- a/frontend/src/metabase/app.js
+++ b/frontend/src/metabase/app.js
@@ -32,6 +32,7 @@ import { syncHistoryWithStore } from "react-router-redux";
import { initializePlugins } from "ee-plugins";
import { AppThemeProvider } from "metabase/AppThemeProvider";
import { createSnowplowTracker } from "metabase/analytics";
+import api from "metabase/api/legacy-client";
import { ModifiedBackend } from "metabase/common/components/dnd/ModifiedBackend";
import registerDashboardVisualizations from "metabase/dashboard/visualizations/register";
import { initializeInteractiveEmbedding } from "metabase/embedding/interactive-embedding";
@@ -42,7 +43,6 @@ import { refreshSiteSettings } from "metabase/redux/settings";
import { getUserId } from "metabase/selectors/user";
import { GlobalStyles } from "metabase/styled-components/containers/GlobalStyles";
import { EmotionCacheProvider } from "metabase/ui/components/theme/EmotionCacheProvider";
-import api from "metabase/utils/api";
import { captureConsoleErrors } from "metabase/utils/errors";
import { initTracing, rotateTraceId } from "metabase/utils/otel";
import MetabaseSettings from "metabase/utils/settings";
diff --git a/frontend/src/metabase/auth/actions.ts b/frontend/src/metabase/auth/actions.ts
index d5f45b6747e..72f24e7179e 100644
--- a/frontend/src/metabase/auth/actions.ts
+++ b/frontend/src/metabase/auth/actions.ts
@@ -2,6 +2,7 @@ import { type UnknownAction, createAction } from "@reduxjs/toolkit";
import { getIn } from "icepick";
import { push } from "react-router-redux";
+import { loadLocalization } from "metabase/api/localization";
import { openNavbar } from "metabase/redux/app";
import { refreshSiteSettings } from "metabase/redux/settings";
import { clearCurrentUser, refreshCurrentUser } from "metabase/redux/user";
@@ -12,7 +13,6 @@ import { SessionApi, UtilApi } from "metabase/services";
import * as Urls from "metabase/urls";
import { isSmallScreen, reload } from "metabase/utils/dom";
import { isResourceNotFoundError } from "metabase/utils/errors";
-import { loadLocalization } from "metabase/utils/i18n";
import { passwordComplexityDescription } from "metabase/utils/password";
import type { LoginData } from "./types";
diff --git a/frontend/src/metabase/embedding/LocaleProvider.tsx b/frontend/src/metabase/embedding/LocaleProvider.tsx
index 2f3a8088793..9e49eb99204 100644
--- a/frontend/src/metabase/embedding/LocaleProvider.tsx
+++ b/frontend/src/metabase/embedding/LocaleProvider.tsx
@@ -6,14 +6,12 @@ import {
useState,
} from "react";
+import { setLocaleHeader } from "metabase/api/legacy-client";
+import { loadLocalization } from "metabase/api/localization";
import { useSetting } from "metabase/common/hooks";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import { DatesProvider } from "metabase/ui/components/theme/DatesProvider/DatesProvider";
-import { setLocaleHeader } from "metabase/utils/api";
-import {
- type LocaleDataWithLanguage,
- loadLocalization,
-} from "metabase/utils/i18n";
+import type { LocaleDataWithLanguage } from "metabase/utils/i18n";
interface LocaleProviderProps {
locale?: string | null;
diff --git a/frontend/src/metabase/embedding/config.ts b/frontend/src/metabase/embedding/config.ts
index 19e06bd94aa..4fbfd487e4c 100644
--- a/frontend/src/metabase/embedding/config.ts
+++ b/frontend/src/metabase/embedding/config.ts
@@ -1,5 +1,5 @@
+import api from "metabase/api/legacy-client";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import api from "metabase/utils/api";
import { IFRAMED_IN_SELF, isWithinIframe } from "metabase/utils/iframe";
type InternalEmbeddingConfig = {
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx
index 274ea124d58..a87390777bf 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx
@@ -20,6 +20,7 @@ import type { SdkDashboardEntityPublicProps } from "embedding-sdk-bundle/types/d
import type { SdkQuestionEntityPublicProps } from "embedding-sdk-bundle/types/question";
import { applyThemePreset } from "embedding-sdk-shared/lib/apply-theme-preset";
import { createSnowplowTracker } from "metabase/analytics";
+import api from "metabase/api/legacy-client";
import { EmbeddingFooter } from "metabase/embedding/components/EmbeddingFooter/EmbeddingFooter";
import { EMBEDDING_SDK_IFRAME_EMBEDDING_CONFIG } from "metabase/embedding-sdk/config";
import { PLUGIN_EMBEDDING_IFRAME_SDK } from "metabase/plugins";
@@ -28,7 +29,6 @@ import { useSelector } from "metabase/redux";
import { getSetting } from "metabase/selectors/settings";
import { getUserId } from "metabase/selectors/user";
import { Stack } from "metabase/ui";
-import api from "metabase/utils/api";
import { useParamRerenderKey } from "../hooks/use-param-rerender-key";
import { useSdkIframeEmbedEventBus } from "../hooks/use-sdk-iframe-embed-event-bus";
diff --git a/frontend/src/metabase/entities/containers/EntityListLoader.unit.spec.js b/frontend/src/metabase/entities/containers/EntityListLoader.unit.spec.js
index d7a363a8546..80e350c9969 100644
--- a/frontend/src/metabase/entities/containers/EntityListLoader.unit.spec.js
+++ b/frontend/src/metabase/entities/containers/EntityListLoader.unit.spec.js
@@ -3,21 +3,21 @@ import "mutationobserver-shim";
import { waitFor } from "@testing-library/react";
import { renderWithProviders } from "__support__/ui";
+import { LegacyApi } from "metabase/api/legacy-client";
import { EntityListLoader } from "metabase/entities/containers/rtk-query";
-import { Api } from "metabase/utils/api";
describe("EntityListLoader", () => {
let _makeRequest;
beforeEach(() => {
- _makeRequest = Api.prototype._makeRequest;
- Api.prototype._makeRequest = jest
+ _makeRequest = LegacyApi.prototype._makeRequest;
+ LegacyApi.prototype._makeRequest = jest
.fn()
.mockReturnValue(Promise.resolve({ data: [] }));
});
afterEach(() => {
- Api.prototype._makeRequest = _makeRequest;
+ LegacyApi.prototype._makeRequest = _makeRequest;
});
describe("with entityType of search", () => {
@@ -32,10 +32,10 @@ describe("EntityListLoader", () => {
/>,
);
await waitFor(() => {
- expect(Api.prototype._makeRequest).toHaveBeenCalled();
+ expect(LegacyApi.prototype._makeRequest).toHaveBeenCalled();
});
expect(
- Api.prototype._makeRequest.mock.calls.map((c) => c.slice(0, 2)),
+ LegacyApi.prototype._makeRequest.mock.calls.map((c) => c.slice(0, 2)),
).toEqual([["GET", "/api/collection/foo/items"]]);
});
@@ -49,10 +49,10 @@ describe("EntityListLoader", () => {
/>,
);
await waitFor(() => {
- expect(Api.prototype._makeRequest).toHaveBeenCalled();
+ expect(LegacyApi.prototype._makeRequest).toHaveBeenCalled();
});
expect(
- Api.prototype._makeRequest.mock.calls.map((c) => c.slice(0, 2)),
+ LegacyApi.prototype._makeRequest.mock.calls.map((c) => c.slice(0, 2)),
).toEqual([["GET", "/api/collection/foo/items"]]);
});
});
diff --git a/frontend/src/metabase/entities/utils.ts b/frontend/src/metabase/entities/utils.ts
index 797e855cc47..93a92f59707 100644
--- a/frontend/src/metabase/entities/utils.ts
+++ b/frontend/src/metabase/entities/utils.ts
@@ -7,6 +7,7 @@ import createCachedSelector from "re-reselect";
import type React from "react";
import _ from "underscore";
+import { DELETE, GET, POST, PUT } from "metabase/api/legacy-client";
import { PLUGIN_ENTITIES } from "metabase/plugins";
import { combineReducers, compose, withAction } from "metabase/redux";
import {
@@ -20,7 +21,6 @@ import {
} from "metabase/redux/requests";
import type { Dispatch, EntitiesState, State } from "metabase/redux/store";
import { addUndo } from "metabase/redux/undo";
-import { DELETE, GET, POST, PUT } from "metabase/utils/api";
import { delay } from "metabase/utils/promise";
// backend returns model = "card" instead of "question"
diff --git a/frontend/src/metabase/redux/downloads.ts b/frontend/src/metabase/redux/downloads.ts
index 9790cf15277..eef1f5e56be 100644
--- a/frontend/src/metabase/redux/downloads.ts
+++ b/frontend/src/metabase/redux/downloads.ts
@@ -8,6 +8,7 @@ import {
import { t } from "ttag";
import _ from "underscore";
+import api, { GET, POST } from "metabase/api/legacy-client";
import { exportFormatPng } from "metabase/common/types/export";
import { waitUntilNextFramePainted } from "metabase/common/utils/wait-until-next-frame-paints";
import { trackExportDashboardToPDF } from "metabase/dashboard/analytics";
@@ -20,7 +21,6 @@ import type { DownloadsState, State } from "metabase/redux/store";
import { createAsyncThunk } from "metabase/redux/utils";
import { getTokenFeature } from "metabase/setup/selectors";
import * as Urls from "metabase/urls";
-import api, { GET, POST } from "metabase/utils/api";
import { openSaveDialog } from "metabase/utils/dom";
import { isWithinIframe } from "metabase/utils/iframe";
import { isJWT } from "metabase/utils/jwt";
diff --git a/frontend/src/metabase/redux/downloads.unit.spec.ts b/frontend/src/metabase/redux/downloads.unit.spec.ts
index a6876c88366..2d11178c378 100644
--- a/frontend/src/metabase/redux/downloads.unit.spec.ts
+++ b/frontend/src/metabase/redux/downloads.unit.spec.ts
@@ -1,5 +1,5 @@
+import api from "metabase/api/legacy-client";
import { mockIsEmbeddingSdk } from "metabase/embedding-sdk/mocks/config-mock";
-import api from "metabase/utils/api";
import Question from "metabase-lib/v1/Question";
import type { EntityToken } from "metabase-types/api/entity";
import { createMockCard, createMockDataset } from "metabase-types/api/mocks";
@@ -32,7 +32,7 @@ describe("getDatasetResponse", () => {
describe("subpath deployment", () => {
/**
* We will assert that the result is a relative path without subpath.
- * Because this URL will be pass to `frontend/src/metabase/utils/api.js`
+ * Because this URL will be pass to `frontend/src/metabase/api/legacy-client.ts`
* which already takes care of the subpath (api.basename)
*/
const origin = "http://localhost";
diff --git a/frontend/src/metabase/services.js b/frontend/src/metabase/services.js
index 0de776daa77..d64681b5e99 100644
--- a/frontend/src/metabase/services.js
+++ b/frontend/src/metabase/services.js
@@ -1,6 +1,6 @@
+import api, { DELETE, GET, POST, PUT } from "metabase/api/legacy-client";
import { isNative } from "metabase/common/utils/card";
import { isEmbedPreview } from "metabase/embedding/config";
-import api, { DELETE, GET, POST, PUT } from "metabase/utils/api";
import Question from "metabase-lib/v1/Question";
import { normalizeParameters } from "metabase-lib/v1/parameters/utils/parameter-values";
import { getPivotOptions } from "metabase-lib/v1/queries/utils/pivot";
diff --git a/frontend/src/metabase/setup/actions.ts b/frontend/src/metabase/setup/actions.ts
index 7f7038b2dda..c369af561c9 100644
--- a/frontend/src/metabase/setup/actions.ts
+++ b/frontend/src/metabase/setup/actions.ts
@@ -2,6 +2,7 @@ import { createAction } from "@reduxjs/toolkit";
import { t } from "ttag";
import { userApi } from "metabase/api";
+import { loadLocalization } from "metabase/api/localization";
import { createDatabase } from "metabase/redux/databases";
import {
initializeSettings,
@@ -12,7 +13,6 @@ import type { InviteInfo, Locale, State, UserInfo } from "metabase/redux/store";
import { createAsyncThunk } from "metabase/redux/utils";
import { getSetting } from "metabase/selectors/settings";
import { SetupApi } from "metabase/services";
-import { loadLocalization } from "metabase/utils/i18n";
import MetabaseSettings from "metabase/utils/settings";
import type { DatabaseData, Settings, UsageReason } from "metabase-types/api";
diff --git a/frontend/src/metabase/urls/utils.ts b/frontend/src/metabase/urls/utils.ts
index 8b554169d81..24186eefffa 100644
--- a/frontend/src/metabase/urls/utils.ts
+++ b/frontend/src/metabase/urls/utils.ts
@@ -1,4 +1,4 @@
-import api from "metabase/utils/api";
+import api from "metabase/api/legacy-client";
export function appendSlug(path: string | number, slug?: string) {
return slug ? `${path}-${slug}` : String(path);
diff --git a/frontend/src/metabase/urls/utils.unit.spec.ts b/frontend/src/metabase/urls/utils.unit.spec.ts
index 0b632d0b36b..44cc24bd137 100644
--- a/frontend/src/metabase/urls/utils.unit.spec.ts
+++ b/frontend/src/metabase/urls/utils.unit.spec.ts
@@ -1,4 +1,4 @@
-import api from "metabase/utils/api";
+import api from "metabase/api/legacy-client";
import {
getSubpathSafeUrl,
diff --git a/frontend/src/metabase/utils/i18n.ts b/frontend/src/metabase/utils/i18n.ts
index a9b73809cb5..60a802321b2 100644
--- a/frontend/src/metabase/utils/i18n.ts
+++ b/frontend/src/metabase/utils/i18n.ts
@@ -2,7 +2,6 @@ import dayjs from "dayjs";
import type { LocaleData } from "ttag";
import { addLocale, useLocale } from "ttag";
-import api from "metabase/utils/api";
import { DAY_OF_WEEK_OPTIONS } from "metabase/utils/date-time";
import MetabaseSettings from "metabase/utils/settings";
import type { DayOfWeekId } from "metabase-types/api";
@@ -11,38 +10,6 @@ export type LocaleDataWithLanguage = LocaleData & {
headers: { language: string };
};
-// note this won't refresh strings that are evaluated at load time
-export async function loadLocalization(
- locale: string,
-): Promise<LocaleDataWithLanguage> {
- // we need to be sure to set the initial localization before loading any files
- // so load metabase/services only when we need it
- // load and parse the locale
- const translationsObject: LocaleDataWithLanguage =
- locale !== "en"
- ? // We don't use I18NApi.locale/the GET helper because those helpers adds custom headers,
- // which will make the browser do the pre-flight request on the SDK.
- // The backend doesn't seem to support pre-flight request on the static assets, but even
- // if it supported them it's more performant to skip the pre-flight request
- await fetch(`${api.basename}/app/locales/${locale}.json`).then(
- (response) => response.json(),
- )
- : // We don't serve en.json. Instead, use this object to fall back to the literals.
- {
- headers: {
- language: "en",
- "plural-forms": "nplurals=2; plural=(n != 1);",
- },
- translations: {
- // eslint-disable-next-line metabase/no-literal-metabase-strings -- Not a user facing string
- "": { Metabase: { msgid: "Metabase", msgstr: ["Metabase"] } },
- },
- };
- setLocalization(translationsObject);
-
- return translationsObject;
-}
-
// Tell dayjs to use the value of the start-of-week Setting for its current locale
// range Sunday (0) - Saturday (6)
export function updateStartOfWeek(
diff --git a/frontend/src/metabase/visualizations/components/LeafletTilePinMap.tsx b/frontend/src/metabase/visualizations/components/LeafletTilePinMap.tsx
index bc57b752f4c..4bc91ca6a5b 100644
--- a/frontend/src/metabase/visualizations/components/LeafletTilePinMap.tsx
+++ b/frontend/src/metabase/visualizations/components/LeafletTilePinMap.tsx
@@ -1,9 +1,9 @@
import L from "leaflet";
import type { ContextType } from "react";
+import { GET } from "metabase/api/legacy-client";
import { EmbeddingEntityContext } from "metabase/embedding/context";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { GET } from "metabase/utils/api";
import { isWithinIframe } from "metabase/utils/iframe";
import type { DashboardId } from "metabase-types/api";
diff --git a/frontend/test/__support__/ui.tsx b/frontend/test/__support__/ui.tsx
index 03f34b0c574..b0965c9a7b6 100644
--- a/frontend/test/__support__/ui.tsx
+++ b/frontend/test/__support__/ui.tsx
@@ -20,6 +20,7 @@ import _ from "underscore";
import { AppColorSchemeProvider } from "metabase/AppColorSchemeProvider";
import { AppKBarProvider } from "metabase/AppKBarProvider";
import { Api } from "metabase/api";
+import { PUT } from "metabase/api/legacy-client";
import { UndoListing } from "metabase/common/components/UndoListing";
import { baseStyle } from "metabase/css/core/base.styled";
import { HistoryProvider } from "metabase/history";
@@ -34,7 +35,6 @@ import type { MantineThemeOverride } from "metabase/ui";
import { ThemeProvider, useMantineTheme } from "metabase/ui";
import { mutateColors } from "metabase/ui/colors/colors";
import { ThemeProviderContext } from "metabase/ui/components/theme/ThemeProvider/context";
-import { PUT } from "metabase/utils/api";
import MetabaseSettings from "metabase/utils/settings";
import { getStore } from "./entities-store";
diff --git a/src/metabase/analytics/impl.cljs b/src/metabase/analytics/impl.cljs
index 2f21a069764..2e48a992b20 100644
--- a/src/metabase/analytics/impl.cljs
+++ b/src/metabase/analytics/impl.cljs
@@ -38,7 +38,7 @@
(defn- post-events!
"Side-effecting POST of a batch of events to the backend."
[events]
- (let [post-fn (.-postInternalAnalytics (js/require "metabase/utils/internal-analytics"))]
+ (let [post-fn (.-postInternalAnalytics (js/require "metabase/api/internal-analytics"))]
(post-fn (clj->js events))))
(defn- flush-buffer!