Skip to content

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

Move plan, frame-paint, and export-format helpers out of common (#80049)

Romeo Van Snicka5e4adb11a61
diff --git a/enterprise/frontend/src/metabase-enterprise/auth/utils.ts b/enterprise/frontend/src/metabase-enterprise/auth/utils.ts
index 4bfb2902469..04f04c2c756 100644
--- a/enterprise/frontend/src/metabase-enterprise/auth/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/auth/utils.ts
@@ -1,7 +1,6 @@
import { t } from "ttag";
-import { hasAnySsoFeature } from "metabase/common/utils/plan";
-import { useGetSettingsQuery } from "metabase/settings";
+import { hasAnySsoFeature, useGetSettingsQuery } from "metabase/settings";
export const getSSOUrl = (siteUrl: string, redirectUrl?: string): string => {
if (redirectUrl) {
diff --git a/enterprise/frontend/src/metabase-enterprise/embedding/selectors.ts b/enterprise/frontend/src/metabase-enterprise/embedding/selectors.ts
index a5b989de100..70a4fbef800 100644
--- a/enterprise/frontend/src/metabase-enterprise/embedding/selectors.ts
+++ b/enterprise/frontend/src/metabase-enterprise/embedding/selectors.ts
@@ -1,6 +1,5 @@
-import { getPlan } from "metabase/common/utils/plan";
import type { State } from "metabase/redux/store";
-import { getSetting } from "metabase/settings";
+import { getPlan, getSetting } from "metabase/settings";
export const isInteractiveEmbeddingEnabled = (state: State) => {
const plan = getPlan(getSetting(state, "token-features"));
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.tsx
index e989f1fa109..2067d0e3b60 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.tsx
@@ -6,8 +6,7 @@ import {
} from "metabase/api";
import { Banner } from "metabase/common/components/Banner";
import { Link } from "metabase/common/components/Link";
-import { getPlan } from "metabase/common/utils/plan";
-import { useSetting } from "metabase/settings";
+import { getPlan, useSetting } from "metabase/settings";
import { Anchor, Text } from "metabase/ui";
import { isAffected } from "../../utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPromoCard/SecurityCenterPromoCard.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPromoCard/SecurityCenterPromoCard.tsx
index edb1215d50c..5935922a228 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPromoCard/SecurityCenterPromoCard.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPromoCard/SecurityCenterPromoCard.tsx
@@ -6,11 +6,10 @@ import {
useGetChannelInfoQuery,
useListSecurityAdvisoriesQuery,
} from "metabase/api";
-import { getPlan } from "metabase/common/utils/plan";
import { getUserIsAdmin } from "metabase/current-user";
import { NavbarPromoCard } from "metabase/nav/components/NavbarPromoCard";
import { useSelector } from "metabase/redux";
-import { useSetting } from "metabase/settings";
+import { getPlan, useSetting } from "metabase/settings";
import { Icon } from "metabase/ui";
import { isAffected } from "../../utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx b/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx
index ca183f81387..5eb6f109519 100644
--- a/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx
@@ -6,10 +6,14 @@ import { SettingHeader } from "metabase/admin/settings/components/SettingHeader"
import { BasicAdminSettingInput } from "metabase/admin/settings/components/widgets/AdminSettingInput";
import { UpsellSemanticSearchPill } from "metabase/admin/upsells/UpsellSemanticSearch";
import { getErrorMessage } from "metabase/api/utils";
-import { getPlan, isProPlan } from "metabase/common/utils/plan";
import type { SearchSettingsWidgetProps } from "metabase/plugins";
import { useSelector } from "metabase/redux";
-import { getSetting, useAdminSetting } from "metabase/settings";
+import {
+ getPlan,
+ getSetting,
+ isProPlan,
+ useAdminSetting,
+} from "metabase/settings";
import { Box, Progress, Stack, Text, Tooltip } from "metabase/ui";
import { useGetSemanticSearchStatusQuery } from "metabase-enterprise/api/search";
diff --git a/frontend/src/metabase/common/types/export.ts b/frontend/src/metabase-types/api/export-format.ts
similarity index 100%
rename from frontend/src/metabase/common/types/export.ts
rename to frontend/src/metabase-types/api/export-format.ts
diff --git a/frontend/src/metabase-types/api/index.ts b/frontend/src/metabase-types/api/index.ts
index af0f00a70c3..d367ce804e9 100644
--- a/frontend/src/metabase-types/api/index.ts
+++ b/frontend/src/metabase-types/api/index.ts
@@ -28,6 +28,7 @@ export * from "./embedding-theme";
export * from "./entity-id";
export * from "./erd";
export * from "./exploration";
+export * from "./export-format";
export * from "./field";
export * from "./fonts";
export * from "./formatting";
diff --git a/frontend/src/metabase-types/api/user.ts b/frontend/src/metabase-types/api/user.ts
index 7037a48e019..638f582449c 100644
--- a/frontend/src/metabase-types/api/user.ts
+++ b/frontend/src/metabase-types/api/user.ts
@@ -2,6 +2,7 @@ import type { CollectionId } from "./collection";
import type { DashboardId } from "./dashboard";
import type { DatabaseId } from "./database";
import type { DependencyDiagnosticsUserParams } from "./dependencies";
+import type { ExportFormat, TableExportFormat } from "./export-format";
import type { PaginationRequest, PaginationResponse } from "./pagination";
import type { ConcreteTableId, SchemaName } from "./table";
@@ -188,8 +189,8 @@ export type UserKeyValue =
namespace: "last_download_format";
key: string;
value: {
- last_download_format: "csv" | "xlsx" | "json" | "png";
- last_table_download_format: "csv" | "xlsx" | "json";
+ last_download_format: ExportFormat;
+ last_table_download_format: TableExportFormat;
};
}
| {
diff --git a/frontend/src/metabase/admin/people/selectors.ts b/frontend/src/metabase/admin/people/selectors.ts
index a52cbccfc32..7f1a63d4ea7 100644
--- a/frontend/src/metabase/admin/people/selectors.ts
+++ b/frontend/src/metabase/admin/people/selectors.ts
@@ -1,10 +1,9 @@
import { createSelector } from "@reduxjs/toolkit";
import { ACTIVE_USERS_NUDGE_THRESHOLD } from "metabase/admin/people/constants";
-import { hasAnySsoFeature } from "metabase/common/utils/plan";
import { getUserIsAdmin } from "metabase/current-user";
import type { State } from "metabase/redux/store";
-import { getSetting } from "metabase/settings";
+import { getSetting, hasAnySsoFeature } from "metabase/settings";
export const getUserTemporaryPassword = (
state: State,
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx
index 4a34cc75671..ae501c43e32 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx
@@ -8,7 +8,6 @@ import {
getSpecialGroupType,
isDefaultGroup,
} from "metabase/common/utils/groups";
-import { getPlan } from "metabase/common/utils/plan";
import {
PLUGIN_AUDIT,
PLUGIN_FEATURE_LEVEL_PERMISSIONS,
@@ -16,7 +15,7 @@ import {
} from "metabase/plugins";
import type { State } from "metabase/redux/store";
import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";
-import { getSetting, getTokenFeature } from "metabase/settings";
+import { getPlan, getSetting, getTokenFeature } from "metabase/settings";
import { getResponseErrorMessage } from "metabase/utils/errors";
import type Schema from "metabase-lib/v1/metadata/Schema";
import type {
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx
index f1670cbcb30..a94acc21c42 100644
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx
@@ -2,9 +2,9 @@ import { useEffect, useState } from "react";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useStoreUrl } from "metabase/common/hooks";
-import { type Plan, getPlan } from "metabase/common/utils/plan";
import { useSelector } from "metabase/redux";
import { getSetting, useLazyGetSettingsQuery } from "metabase/settings";
+import { type Plan, getPlan } from "metabase/settings";
import { Box } from "metabase/ui";
import type { CloudMigration } from "metabase-types/api/cloud-migration";
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.unit.spec.tsx
index c6b39edeb4d..addda7c40b4 100644
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.unit.spec.tsx
@@ -6,9 +6,8 @@ import {
setupPropertiesEndpoints,
} from "__support__/server-mocks";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import { getPlan } from "metabase/common/utils/plan";
import { createMockState } from "metabase/redux/store/mocks";
-import { getSettings } from "metabase/settings";
+import { getPlan, getSettings } from "metabase/settings";
import type { CloudMigration } from "metabase-types/api/cloud-migration";
import { createMockSettings, createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx
index 2c56245eb2f..d9c557e07d2 100644
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx
@@ -3,9 +3,9 @@ import { t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useToggle } from "metabase/common/hooks/use-toggle";
-import type { Plan } from "metabase/common/utils/plan";
import { useDispatch } from "metabase/redux";
import { addUndo } from "metabase/redux/undo";
+import type { Plan } from "metabase/settings";
import { useSetting } from "metabase/settings";
import {
Box,
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationSuccess.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationSuccess.tsx
index f6446023574..e9120384a3a 100644
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationSuccess.tsx
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationSuccess.tsx
@@ -1,7 +1,7 @@
import { t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
-import type { Plan } from "metabase/common/utils/plan";
+import type { Plan } from "metabase/settings";
import { Box, Button, Flex, Icon, Text } from "metabase/ui";
import { color } from "metabase/ui/colors";
import type { CloudMigration } from "metabase-types/api/cloud-migration";
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/utils.ts b/frontend/src/metabase/admin/settings/components/CloudPanel/utils.ts
index 6678fb6e231..948e6939f6b 100644
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/utils.ts
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/utils.ts
@@ -1,5 +1,5 @@
-import type { Plan } from "metabase/common/utils/plan";
import { dayjs } from "metabase/dayjs";
+import type { Plan } from "metabase/settings";
import type {
CloudMigration,
CloudMigrationState,
diff --git a/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx b/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx
index a91ab30c2c2..1bb4c9a63f5 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx
@@ -3,7 +3,6 @@ import { t } from "ttag";
import { AdminNavWrapper } from "metabase/admin/components/AdminNav";
import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";
import { useHasTokenFeature } from "metabase/common/hooks";
-import { getPlan, isProPlan } from "metabase/common/utils/plan";
import { getUserIsAdmin } from "metabase/current-user";
import {
PLUGIN_DATA_APPS,
@@ -11,7 +10,7 @@ import {
PLUGIN_SECURITY_CENTER,
} from "metabase/plugins";
import { useSelector } from "metabase/redux";
-import { useSetting } from "metabase/settings";
+import { getPlan, isProPlan, useSetting } from "metabase/settings";
import { Box, Divider, Flex } from "metabase/ui";
import { CustomVisualizationsNav } from "./CustomVisualizationsNav";
diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/AuthenticationSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/AuthenticationSettingsPage.tsx
index b069f8c7f76..cb200dee302 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsPages/AuthenticationSettingsPage.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/AuthenticationSettingsPage.tsx
@@ -2,13 +2,12 @@ import { t } from "ttag";
import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";
import { UpsellSSO } from "metabase/admin/upsells";
-import { hasAnySsoFeature } from "metabase/common/utils/plan";
import {
type AuthSettingsPageTab,
PLUGIN_AUTH_PROVIDERS,
PLUGIN_MULTI_FACTOR_AUTH,
} from "metabase/plugins";
-import { useGetSettingsQuery } from "metabase/settings";
+import { hasAnySsoFeature, useGetSettingsQuery } from "metabase/settings";
import { Box, Flex, Stack } from "metabase/ui";
import { ApiKeysAuthCard } from "../../auth/components/ApiKeysAuthCard";
diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/RemoteSyncSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/RemoteSyncSettingsPage.tsx
index a81822192ab..cb347ba5eab 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsPages/RemoteSyncSettingsPage.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/RemoteSyncSettingsPage.tsx
@@ -1,8 +1,7 @@
import { UpsellRemoteSync } from "metabase/admin/upsells";
import { useHasTokenFeature } from "metabase/common/hooks";
-import { getPlan, isProPlan } from "metabase/common/utils/plan";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
-import { useSetting } from "metabase/settings";
+import { getPlan, isProPlan, useSetting } from "metabase/settings";
export function RemoteSyncSettingsPage() {
const hasRemoteSync = useHasTokenFeature("remote_sync");
diff --git a/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx b/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx
index 802f36f5b17..8921f31f429 100644
--- a/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx
+++ b/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx
@@ -2,10 +2,9 @@ import { c, t } from "ttag";
import { UpsellBanner } from "metabase/common/components/upsells/components";
import { UPGRADE_URL } from "metabase/common/components/upsells/constants";
-import { getPlan } from "metabase/common/utils/plan";
import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";
import { useSelector } from "metabase/redux";
-import { getSetting } from "metabase/settings";
+import { getPlan, getSetting } from "metabase/settings";
import { Text } from "metabase/ui";
export const UpsellBetterSupport = ({ location }: { location: string }) => {
diff --git a/frontend/src/metabase/admin/upsells/UpsellHosting.tsx b/frontend/src/metabase/admin/upsells/UpsellHosting.tsx
index c0f6fb69b0a..11031ec3ad0 100644
--- a/frontend/src/metabase/admin/upsells/UpsellHosting.tsx
+++ b/frontend/src/metabase/admin/upsells/UpsellHosting.tsx
@@ -1,8 +1,7 @@
import { jt, t } from "ttag";
import { UpsellBanner } from "metabase/common/components/upsells/components";
-import { getPlan, isProPlan } from "metabase/common/utils/plan";
-import { useSetting } from "metabase/settings";
+import { getPlan, isProPlan, useSetting } from "metabase/settings";
export const UpsellHostingBanner = ({ location }: { location: string }) => {
const isHosted = useSetting("is-hosted?");
diff --git a/frontend/src/metabase/admin/upsells/UpsellRemoteSync.tsx b/frontend/src/metabase/admin/upsells/UpsellRemoteSync.tsx
index 03e7d5a2fb4..8d126d8c5a9 100644
--- a/frontend/src/metabase/admin/upsells/UpsellRemoteSync.tsx
+++ b/frontend/src/metabase/admin/upsells/UpsellRemoteSync.tsx
@@ -5,11 +5,10 @@ import { UpsellBigCard } from "metabase/common/components/upsells/components";
import S from "metabase/common/components/upsells/components/Upsells.module.css";
import { UPGRADE_URL } from "metabase/common/components/upsells/constants";
import { useHasTokenFeature } from "metabase/common/hooks";
-import { getPlan, isProPlan } from "metabase/common/utils/plan";
import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
-import { useSetting } from "metabase/settings";
+import { getPlan, isProPlan, useSetting } from "metabase/settings";
export const UpsellRemoteSync = ({ source }: { source: string }) => {
const hasRemoteSync = useHasTokenFeature("remote_sync");
diff --git a/frontend/src/metabase/admin/upsells/UpsellSSO.tsx b/frontend/src/metabase/admin/upsells/UpsellSSO.tsx
index ef2900554a4..0c7d24867df 100644
--- a/frontend/src/metabase/admin/upsells/UpsellSSO.tsx
+++ b/frontend/src/metabase/admin/upsells/UpsellSSO.tsx
@@ -2,10 +2,9 @@ import { t } from "ttag";
import { UpsellCard } from "metabase/common/components/upsells/UpsellCard";
import { UPGRADE_URL } from "metabase/common/components/upsells/constants";
-import { hasAnySsoFeature } from "metabase/common/utils/plan";
import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";
import { useSelector } from "metabase/redux";
-import { getSetting } from "metabase/settings";
+import { getSetting, hasAnySsoFeature } from "metabase/settings";
import { Box, List } from "metabase/ui";
export const UpsellSSO = ({ location }: { location: string }) => {
diff --git a/frontend/src/metabase/admin/upsells/UpsellUploads.tsx b/frontend/src/metabase/admin/upsells/UpsellUploads.tsx
index 7444e9929ef..5468d5475fe 100644
--- a/frontend/src/metabase/admin/upsells/UpsellUploads.tsx
+++ b/frontend/src/metabase/admin/upsells/UpsellUploads.tsx
@@ -2,10 +2,9 @@ import { c, t } from "ttag";
import { UpsellCard } from "metabase/common/components/upsells/UpsellCard";
import { UPGRADE_URL } from "metabase/common/components/upsells/constants";
-import { getPlan } from "metabase/common/utils/plan";
import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";
import { useSelector } from "metabase/redux";
-import { getSetting } from "metabase/settings";
+import { getPlan, getSetting } from "metabase/settings";
export const UpsellUploads = ({ location }: { location: string }) => {
const campaign = "manage-uploads";
diff --git a/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx b/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx
index e93a785e880..3039d6bac14 100644
--- a/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx
+++ b/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx
@@ -1,12 +1,12 @@
import { match } from "ts-pattern";
import { c, t } from "ttag";
-import type { ExportFormat } from "metabase/common/types/export";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import { useSelector } from "metabase/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { useSetting } from "metabase/settings";
import { Checkbox, SegmentedControl, Stack } from "metabase/ui";
+import type { ExportFormat } from "metabase-types/api";
interface ExportSettingsWidgetProps {
formats: ExportFormat[];
diff --git a/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx b/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx
index 62307fad502..0340d9a60d8 100644
--- a/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx
+++ b/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx
@@ -4,11 +4,6 @@ import { t } from "ttag";
import { ExportSettingsWidget } from "metabase/common/components/ExportSettingsWidget";
import { Link } from "metabase/common/components/Link";
import { useDocsUrl } from "metabase/common/hooks";
-import type {
- ExportFormat,
- TableExportFormat,
-} from "metabase/common/types/export";
-import { exportFormatPng, exportFormats } from "metabase/common/types/export";
import CS from "metabase/css/core/index.css";
import { useUserKeyValue } from "metabase/current-user";
import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
@@ -26,7 +21,12 @@ import {
} from "metabase/ui";
import { canSavePng } from "metabase/visualizations";
import type Question from "metabase-lib/v1/Question";
-import type { Dataset } from "metabase-types/api";
+import type {
+ Dataset,
+ ExportFormat,
+ TableExportFormat,
+} from "metabase-types/api";
+import { exportFormatPng, exportFormats } from "metabase-types/api";
export type FormatPreference = {
last_download_format: ExportFormat;
diff --git a/frontend/src/metabase/common/utils/wait-until-next-frame-paints.ts b/frontend/src/metabase/common/utils/wait-until-next-frame-paints.ts
deleted file mode 100644
index a662db26477..00000000000
--- a/frontend/src/metabase/common/utils/wait-until-next-frame-paints.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Double rAF is needed here to ensure we actually paint the next frame.
-// First rAF will be called on the next frame BEFORE painting,
-// and the second rAF is scheduled to run AFTER the first frame is painted, but BEFORE the next frame is painted.
-export function waitUntilNextFramePainted() {
- return new Promise<void>((resolve) => {
- requestAnimationFrame(async () => {
- requestAnimationFrame(async () => {
- resolve();
- });
- });
- });
-}
diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/EmailAttachmentPicker.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/EmailAttachmentPicker.tsx
index 7f68081a94d..b3a872553e2 100644
--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/EmailAttachmentPicker.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/EmailAttachmentPicker.tsx
@@ -11,11 +11,13 @@ import { t } from "ttag";
import _ from "underscore";
import { ExportSettingsWidget } from "metabase/common/components/ExportSettingsWidget";
-import type { ExportFormat } from "metabase/common/types/export";
import CS from "metabase/css/core/index.css";
import type { DraftDashboardSubscription } from "metabase/redux/store";
import { Box, Checkbox, Group, Icon, Switch, Text, Tooltip } from "metabase/ui";
-import type { SubscriptionSupportingCard } from "metabase-types/api";
+import type {
+ ExportFormat,
+ SubscriptionSupportingCard,
+} from "metabase-types/api";
import S from "./EmailAttachmentPicker.module.css";
diff --git a/frontend/src/metabase/documents/components/DocumentHeader.tsx b/frontend/src/metabase/documents/components/DocumentHeader.tsx
index 2e55a5da739..77c2a386c18 100644
--- a/frontend/src/metabase/documents/components/DocumentHeader.tsx
+++ b/frontend/src/metabase/documents/components/DocumentHeader.tsx
@@ -8,7 +8,6 @@ import {
getFormattedTime,
} from "metabase/common/components/DateTime";
import { Link } from "metabase/common/components/Link";
-import { waitUntilNextFramePainted } from "metabase/common/utils/wait-until-next-frame-paints";
import CS from "metabase/css/core/index.css";
import { getUserIsAdmin } from "metabase/current-user";
import { usePrintContext } from "metabase/documents/contexts/PrintContext";
@@ -28,6 +27,7 @@ import {
Transition,
type TransitionProps,
} from "metabase/ui";
+import { waitUntilNextFramePainted } from "metabase/utils/dom";
import { isWithinIframe } from "metabase/utils/iframe";
import type { Document } from "metabase-types/api";
diff --git a/frontend/src/metabase/documents/hooks/use-print-context-value.ts b/frontend/src/metabase/documents/hooks/use-print-context-value.ts
index e7c6e1bf1a9..0907486bb2a 100644
--- a/frontend/src/metabase/documents/hooks/use-print-context-value.ts
+++ b/frontend/src/metabase/documents/hooks/use-print-context-value.ts
@@ -1,8 +1,8 @@
import { useWindowEvent } from "@mantine/hooks";
import { useCallback, useMemo, useState } from "react";
-import { waitUntilNextFramePainted } from "metabase/common/utils/wait-until-next-frame-paints";
import type { PrintContextValue } from "metabase/documents/contexts/PrintContext";
+import { waitUntilNextFramePainted } from "metabase/utils/dom";
import { delay } from "metabase/utils/promise";
const READINESS_TIMEOUT_MS = 15_000;
diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkCopyPanel.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkCopyPanel.tsx
index 66dfbf40d63..51f25e61870 100644
--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkCopyPanel.tsx
+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkCopyPanel.tsx
@@ -2,8 +2,8 @@ import type { MouseEventHandler } from "react";
import { t } from "ttag";
import { CopyTextInput } from "metabase/common/components/CopyTextInput";
-import type { ExportFormat } from "metabase/common/types/export";
import { Anchor, Box, Group, Stack, Text, Tooltip } from "metabase/ui";
+import type { ExportFormat } from "metabase-types/api";
export const PublicLinkCopyPanel = ({
loading = false,
diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx
index 4d4ae4b9326..4fea46ddfb7 100644
--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx
+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx
@@ -1,10 +1,10 @@
import { useAsync } from "react-use";
import { t } from "ttag";
-import type { ExportFormat } from "metabase/common/types/export";
import { getUserIsAdmin } from "metabase/current-user";
import { useSelector } from "metabase/redux";
import { Box, Popover, Text, Title } from "metabase/ui";
+import type { ExportFormat } from "metabase-types/api";
import { PublicLinkCopyPanel } from "./PublicLinkCopyPanel";
diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.unit.spec.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.unit.spec.tsx
index 9db706d7864..4ae066fc945 100644
--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.unit.spec.tsx
+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.unit.spec.tsx
@@ -2,8 +2,8 @@ import userEvent from "@testing-library/user-event";
import { useState } from "react";
import { renderWithProviders, screen } from "__support__/ui";
-import type { ExportFormat } from "metabase/common/types/export";
import { createMockState } from "metabase/redux/store/mocks";
+import type { ExportFormat } from "metabase-types/api";
import { createMockUser } from "metabase-types/api/mocks";
import type { PublicLinkPopoverProps } from "./PublicLinkPopover";
diff --git a/frontend/src/metabase/embedding/lib/analytics.ts b/frontend/src/metabase/embedding/lib/analytics.ts
index 47d495f18ba..3f693b1f7ad 100644
--- a/frontend/src/metabase/embedding/lib/analytics.ts
+++ b/frontend/src/metabase/embedding/lib/analytics.ts
@@ -1,8 +1,8 @@
import { trackSchemaEvent } from "metabase/analytics";
-import type { ExportFormat } from "metabase/common/types/export";
import type {
EmbedResourceDownloadOptions,
EmbeddingParameterVisibility,
+ ExportFormat,
} from "metabase-types/api";
import type {
diff --git a/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx b/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx
index e3d91dfe1da..233797f4ed2 100644
--- a/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx
+++ b/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx
@@ -2,12 +2,11 @@ import { useState } from "react";
import { t } from "ttag";
import { useHasTokenFeature } from "metabase/common/hooks";
-import { getPlan } from "metabase/common/utils/plan";
import { PLUGIN_IS_EE_BUILD } from "metabase/plugins";
import { useDispatch, useSelector } from "metabase/redux";
import { addUndo } from "metabase/redux/undo";
import { getDocsUrl } from "metabase/selectors/settings";
-import { getSetting, useSetting } from "metabase/settings";
+import { getPlan, getSetting, useSetting } from "metabase/settings";
import type { EmbeddingHomepageDismissReason } from "metabase-types/api";
import { useSendProductFeedbackMutation } from "../../api/product-feedback";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.tsx
index cf8c6c799c0..18f02093364 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.tsx
@@ -4,7 +4,6 @@ import {
useCreateCardPublicLinkMutation,
useDeleteCardPublicLinkMutation,
} from "metabase/api";
-import { type ExportFormat, exportFormats } from "metabase/common/types/export";
import { PublicLinkPopover } from "metabase/embedding/components/PublicLinkPopover/PublicLinkPopover";
import {
trackPublicLinkCopied,
@@ -12,6 +11,7 @@ import {
} from "metabase/embedding/lib/analytics";
import { publicQuestion as getPublicQuestionUrl } from "metabase/urls";
import type Question from "metabase-lib/v1/Question";
+import { type ExportFormat, exportFormats } from "metabase-types/api";
export const QuestionPublicLinkPopover = ({
question,
diff --git a/frontend/src/metabase/redux/downloads.ts b/frontend/src/metabase/redux/downloads.ts
index 5cb9485e62c..dd6ad795291 100644
--- a/frontend/src/metabase/redux/downloads.ts
+++ b/frontend/src/metabase/redux/downloads.ts
@@ -9,15 +9,13 @@ import { t } from "ttag";
import _ from "underscore";
import { datasetApi } from "metabase/api/dataset";
-import { exportFormatPng } from "metabase/common/types/export";
-import { waitUntilNextFramePainted } from "metabase/common/utils/wait-until-next-frame-paints";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import type { DownloadsState, State } from "metabase/redux/store";
import { createAsyncThunk } from "metabase/redux/utils";
import { getTokenFeature } from "metabase/settings";
import * as Urls from "metabase/urls";
import { getBasename } from "metabase/utils/basename";
-import { openSaveDialog } from "metabase/utils/dom";
+import { openSaveDialog, waitUntilNextFramePainted } from "metabase/utils/dom";
import { isWithinIframe } from "metabase/utils/iframe";
import { isJWT } from "metabase/utils/jwt";
import { checkNotNull } from "metabase/utils/types";
@@ -37,6 +35,7 @@ import type {
Dataset,
VisualizationSettings,
} from "metabase-types/api";
+import { exportFormatPng } from "metabase-types/api";
import type { EntityToken, EntityUuid } from "metabase-types/api/entity";
import { trackDownloadResults, trackExportDashboardToPDF } from "./analytics";
diff --git a/frontend/src/metabase/selectors/settings.ts b/frontend/src/metabase/selectors/settings.ts
index 9648cb6a5ae..b7ac8f87cc3 100644
--- a/frontend/src/metabase/selectors/settings.ts
+++ b/frontend/src/metabase/selectors/settings.ts
@@ -1,8 +1,7 @@
import { createSelector } from "@reduxjs/toolkit";
-import { getPlan } from "metabase/common/utils/plan";
import type { State } from "metabase/redux/store";
-import { getSetting } from "metabase/settings";
+import { getPlan, getSetting } from "metabase/settings";
import type { TokenStatus, Version } from "metabase-types/api";
export const isSsoEnabled = (state: State) =>
diff --git a/frontend/src/metabase/settings/index.ts b/frontend/src/metabase/settings/index.ts
index bf0857ea6d9..9a63aff41ff 100644
--- a/frontend/src/metabase/settings/index.ts
+++ b/frontend/src/metabase/settings/index.ts
@@ -20,3 +20,10 @@ export {
} from "./selectors";
export { useAdminSetting, useAdminSettings } from "./use-admin-setting";
export { useSetting, useUserSetting } from "./use-setting";
+export {
+ getPlan,
+ hasAnySsoFeature,
+ isProPlan,
+ type Plan,
+ type ProPlan,
+} from "./plan";
diff --git a/frontend/src/metabase/common/utils/plan.ts b/frontend/src/metabase/settings/plan.ts
similarity index 100%
rename from frontend/src/metabase/common/utils/plan.ts
rename to frontend/src/metabase/settings/plan.ts
diff --git a/frontend/src/metabase/common/utils/plan.unit.spec.ts b/frontend/src/metabase/settings/plan.unit.spec.ts
similarity index 95%
rename from frontend/src/metabase/common/utils/plan.unit.spec.ts
rename to frontend/src/metabase/settings/plan.unit.spec.ts
index a08e9ec5191..57ffc160ab2 100644
--- a/frontend/src/metabase/common/utils/plan.unit.spec.ts
+++ b/frontend/src/metabase/settings/plan.unit.spec.ts
@@ -1,7 +1,8 @@
-import { getPlan } from "metabase/common/utils/plan";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
-describe("common/utils/columns", () => {
+import { getPlan } from "./plan";
+
+describe("metabase/settings/plan", () => {
describe("getPlan", () => {
it("returns `oss` if the token features object is undefined or null or does not have any features", () => {
expect(getPlan()).toBe("oss");
diff --git a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard.tsx b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard.tsx
index 0c81538d2ce..df3e257249e 100644
--- a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard.tsx
+++ b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard.tsx
@@ -2,9 +2,8 @@ import { jt, t } from "ttag";
import { useListDatabasesQuery } from "metabase/api/database";
import { Link } from "metabase/common/components/Link";
-import { getPlan, isProPlan } from "metabase/common/utils/plan";
import { useSelector } from "metabase/redux";
-import { getSetting } from "metabase/settings";
+import { getPlan, getSetting, isProPlan } from "metabase/settings";
import { doesDatabaseSupportTransforms } from "metabase/transforms/utils";
import {
Alert,
diff --git a/frontend/src/metabase/transforms/selectors.ts b/frontend/src/metabase/transforms/selectors.ts
index 6d90cd07543..c6329308d5b 100644
--- a/frontend/src/metabase/transforms/selectors.ts
+++ b/frontend/src/metabase/transforms/selectors.ts
@@ -1,9 +1,8 @@
import { createSelector } from "@reduxjs/toolkit";
-import { getPlan } from "metabase/common/utils/plan";
import { getUser, getUserIsAdmin } from "metabase/current-user";
import type { State } from "metabase/redux/store";
-import { getSetting, getTokenFeature } from "metabase/settings";
+import { getPlan, getSetting, getTokenFeature } from "metabase/settings";
export const canAccessTransforms = (state: State): boolean => {
if (getUserIsAdmin(state)) {
diff --git a/frontend/src/metabase/utils/dom.ts b/frontend/src/metabase/utils/dom.ts
index 8b6c10eb47d..3eb966c470f 100644
--- a/frontend/src/metabase/utils/dom.ts
+++ b/frontend/src/metabase/utils/dom.ts
@@ -278,3 +278,16 @@ export function openSaveDialog(fileName: string, fileContent: Blob): void {
URL.revokeObjectURL(url);
link.remove();
}
+
+// Double rAF is needed here to ensure we actually paint the next frame.
+// First rAF will be called on the next frame BEFORE painting,
+// and the second rAF is scheduled to run AFTER the first frame is painted, but BEFORE the next frame is painted.
+export function waitUntilNextFramePainted() {
+ return new Promise<void>((resolve) => {
+ requestAnimationFrame(async () => {
+ requestAnimationFrame(async () => {
+ resolve();
+ });
+ });
+ });
+}