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
Extract shared upsell components into common (#70619)
Fraserb40d76f5b43b
diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsxindex fb0aa7f3e2f..e78ca580229 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx@@ -3,8 +3,8 @@ import type { PropsWithChildren } from "react";import { match } from "ts-pattern";import { t } from "ttag";-import { UpsellStorage } from "metabase/admin/upsells";import { skipToken } from "metabase/api";+import { UpsellStorage } from "metabase/common/components/upsells/UpsellStorage";import { useHasTokenFeature, useStoreUrl } from "metabase/common/hooks";import { useSelector } from "metabase/lib/redux";import { getSubpathSafeUrl } from "metabase/lib/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.tsindex 833f7c8c76c..3c8cc7a2385 100644--- a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts+++ b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts@@ -1,7 +1,7 @@import { useEffect, useRef } from "react";import { t } from "ttag";-import { useUpsellLink } from "metabase/admin/upsells/components/use-upsell-link";+import { useUpsellLink } from "metabase/common/components/upsells/components/use-upsell-link";import { useSetting, useStoreUrl, useToast } from "metabase/common/hooks";import { useSelector } from "metabase/lib/redux";import { getUser } from "metabase/selectors/user";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/CloudPurchaseContent.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/CloudPurchaseContent.tsxindex 550c5932faa..a4cfb973c2c 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/CloudPurchaseContent.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/CloudPurchaseContent.tsx@@ -2,7 +2,7 @@ import { useDisclosure } from "@mantine/hooks";import { useCallback } from "react";import { t } from "ttag";-import { trackUpsellClicked } from "metabase/admin/upsells/components/analytics";+import { trackUpsellClicked } from "metabase/common/components/upsells/components/analytics";import type { BillingPeriod } from "metabase/data-studio/upsells/types";import * as Urls from "metabase/lib/urls";import { useMetadataToasts } from "metabase/metadata/hooks";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsxindex a4ef506959a..f05107b9775 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx@@ -1,8 +1,8 @@import { useEffect } from "react";import { t } from "ttag";-import { trackUpsellViewed } from "metabase/admin/upsells/components/analytics";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { trackUpsellViewed } from "metabase/common/components/upsells/components/analytics";import { useStoreUrl } from "metabase/common/hooks";import { useSelector } from "metabase/lib/redux";import { getStoreUsers } from "metabase/selectors/store-users";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/constants.ts b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/constants.tsindex e4b31819b34..81d9ea2488a 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/constants.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/constants.ts@@ -1,4 +1,4 @@-export { UPGRADE_URL } from "metabase/admin/upsells/constants";+export { UPGRADE_URL } from "metabase/common/components/upsells/constants";export const CAMPAIGN = "data-studio-python-transforms";export const LOCATION = "data-studio-transforms";diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsxindex 45336cc679c..bcdb480135a 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";import { EmbeddingSettingsCard } from "metabase/admin/settings/components/EmbeddingSettings";import { NewEmbedButton } from "metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton";-import { UpsellBanner } from "metabase/admin/upsells/components";+import { UpsellBanner } from "metabase/common/components/upsells/components";import { useSetting } from "metabase/common/hooks";import { useSelector } from "metabase/lib/redux";import {diff --git a/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx b/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsxindex 759d8ec334d..78ae57b9f5e 100644--- a/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx@@ -7,7 +7,7 @@ import {type AdminNavItemProps,AdminNavWrapper,} from "metabase/admin/components/AdminNav";-import { UpsellGem } from "metabase/admin/upsells/components/UpsellGem";+import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";import { useHasTokenFeature, useSetting } from "metabase/common/hooks";import { useSelector } from "metabase/lib/redux";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";diff --git a/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx b/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsxindex 1b44be4e1d8..75e6c2cb512 100644--- a/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx@@ -1,14 +1,13 @@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 { useSelector } from "metabase/lib/redux";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";import { getSetting } from "metabase/selectors/settings";import { Text } from "metabase/ui";-import { UpsellBanner } from "./components";-import { UPGRADE_URL } from "./constants";-export const UpsellBetterSupport = ({ location }: { location: string }) => {const campaign = "better-hosting";const { triggerUpsellFlow } = PLUGIN_ADMIN_SETTINGS.useUpsellFlow({diff --git a/frontend/src/metabase/admin/upsells/UpsellCacheConfig.tsx b/frontend/src/metabase/admin/upsells/UpsellCacheConfig.tsxindex 3839cf48e85..b99295c0d76 100644--- a/frontend/src/metabase/admin/upsells/UpsellCacheConfig.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellCacheConfig.tsx@@ -1,12 +1,11 @@import { jt, t } from "ttag";-import { UpsellCard } from "metabase/common/components/UpsellCard";+import { UpsellCard } from "metabase/common/components/upsells/UpsellCard";+import { UPGRADE_URL } from "metabase/common/components/upsells/constants";import { useHasTokenFeature } from "metabase/common/hooks/use-has-token-feature";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";import { Box } from "metabase/ui";-import { UPGRADE_URL } from "./constants";-export const UpsellCacheConfig = ({ location }: { location: string }) => {const campaign = "cache-granular-controls";const { triggerUpsellFlow } = PLUGIN_ADMIN_SETTINGS.useUpsellFlow({diff --git a/frontend/src/metabase/admin/upsells/UpsellCloud.tsx b/frontend/src/metabase/admin/upsells/UpsellCloud.tsxindex b3932946d02..eb9bf04f412 100644--- a/frontend/src/metabase/admin/upsells/UpsellCloud.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellCloud.tsx@@ -1,11 +1,10 @@import { c, t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";+import { UpsellBigCard } from "metabase/common/components/upsells/components";+import S from "metabase/common/components/upsells/components/Upsells.module.css";import { useHasTokenFeature } from "metabase/common/hooks";-import { UpsellBigCard } from "./components";-import S from "./components/Upsells.module.css";-export const UpsellCloud = ({source,onOpenModal,diff --git a/frontend/src/metabase/admin/upsells/UpsellDevInstances.tsx b/frontend/src/metabase/admin/upsells/UpsellDevInstances.tsxindex 4ce2d2bdc73..b6d8e8f505b 100644--- a/frontend/src/metabase/admin/upsells/UpsellDevInstances.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellDevInstances.tsx@@ -1,10 +1,9 @@import { t } from "ttag";+import { UpsellBanner } from "metabase/common/components/upsells/components";import { useSetting, useStoreUrl } from "metabase/common/hooks";import { Text } from "metabase/ui";-import { UpsellBanner } from "./components";-type LOCATION = "embedding-page" | "settings-general";export function UpsellDevInstances({ location }: { location: LOCATION }) {diff --git a/frontend/src/metabase/admin/upsells/UpsellEmailWhitelabel.tsx b/frontend/src/metabase/admin/upsells/UpsellEmailWhitelabel.tsxindex 421dd4edfe6..a553d9364f6 100644--- a/frontend/src/metabase/admin/upsells/UpsellEmailWhitelabel.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellEmailWhitelabel.tsx@@ -1,12 +1,11 @@import { t } from "ttag";+import { UpsellPill } from "metabase/common/components/upsells/components";+import { UPGRADE_URL } from "metabase/common/components/upsells/constants";import { useHasTokenFeature } from "metabase/common/hooks";import { useSelector } from "metabase/lib/redux";import { getIsHosted } from "metabase/setup/selectors";-import { UpsellPill } from "./components";-import { UPGRADE_URL } from "./constants";-export const UpsellEmailWhitelabelPill = ({ source }: { source: string }) => {const isHosted = useSelector(getIsHosted);const hasCloudSMTPFeature = useHasTokenFeature("cloud_custom_smtp");diff --git a/frontend/src/metabase/admin/upsells/UpsellHosting.tsx b/frontend/src/metabase/admin/upsells/UpsellHosting.tsxindex 8c4dbf77fc8..569791e21dc 100644--- a/frontend/src/metabase/admin/upsells/UpsellHosting.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellHosting.tsx@@ -1,12 +1,11 @@import { jt, t } from "ttag";+import { UpsellBanner } from "metabase/common/components/upsells/components";import { useSetting } from "metabase/common/hooks";import { getPlan, isProPlan } from "metabase/common/utils/plan";import { useSelector } from "metabase/lib/redux";import { getIsHosted } from "metabase/setup/selectors";-import { UpsellBanner } from "./components";-export const UpsellHostingBanner = ({ location }: { location: string }) => {const isHosted = useSelector(getIsHosted);const features = useSetting("token-features");diff --git a/frontend/src/metabase/admin/upsells/UpsellPerformanceTools.tsx b/frontend/src/metabase/admin/upsells/UpsellPerformanceTools.tsxindex f6ccfcef375..069f6c62408 100644--- a/frontend/src/metabase/admin/upsells/UpsellPerformanceTools.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellPerformanceTools.tsx@@ -1,11 +1,10 @@import { t } from "ttag";+import { UpsellBigCard } from "metabase/common/components/upsells/components";+import { UPGRADE_URL } from "metabase/common/components/upsells/constants";import { useHasTokenFeature } from "metabase/common/hooks";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";-import { UpsellBigCard } from "./components";-import { UPGRADE_URL } from "./constants";-export const UpsellPerformanceTools = ({ source }: { source: string }) => {const hasAuditEnabled = useHasTokenFeature("audit_app");const campaign = "audit-tools";diff --git a/frontend/src/metabase/admin/upsells/UpsellPermissions.tsx b/frontend/src/metabase/admin/upsells/UpsellPermissions.tsxindex 8df31b5e2f1..6721ea92d96 100644--- a/frontend/src/metabase/admin/upsells/UpsellPermissions.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellPermissions.tsx@@ -1,11 +1,10 @@import { t } from "ttag";+import { UpsellBanner } from "metabase/common/components/upsells/components";+import { UPGRADE_URL } from "metabase/common/components/upsells/constants";import { useHasTokenFeature } from "metabase/common/hooks";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";-import { UpsellBanner } from "./components";-import { UPGRADE_URL } from "./constants";-export const UpsellPermissions = ({ location }: { location: string }) => {const campaign = "advanced-permissions";const { triggerUpsellFlow } = PLUGIN_ADMIN_SETTINGS.useUpsellFlow({diff --git a/frontend/src/metabase/admin/upsells/UpsellSSO.tsx b/frontend/src/metabase/admin/upsells/UpsellSSO.tsxindex c48cd9f697d..6e56ec1f500 100644--- a/frontend/src/metabase/admin/upsells/UpsellSSO.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellSSO.tsx@@ -1,14 +1,13 @@import { t } from "ttag";-import { UpsellCard } from "metabase/common/components/UpsellCard";+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 { useSelector } from "metabase/lib/redux";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";import { getSetting } from "metabase/selectors/settings";import { Box, List } from "metabase/ui";-import { UPGRADE_URL } from "./constants";-export const UpsellSSO = ({ location }: { location: string }) => {const campaign = "sso";const { triggerUpsellFlow } = PLUGIN_ADMIN_SETTINGS.useUpsellFlow({diff --git a/frontend/src/metabase/admin/upsells/UpsellSemanticSearch.tsx b/frontend/src/metabase/admin/upsells/UpsellSemanticSearch.tsxindex 6c0406950f1..b1affcf313f 100644--- a/frontend/src/metabase/admin/upsells/UpsellSemanticSearch.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellSemanticSearch.tsx@@ -1,7 +1,7 @@import { t } from "ttag";-import { UpsellPill } from "./components";-import { UPGRADE_URL } from "./constants";+import { UpsellPill } from "metabase/common/components/upsells/components";+import { UPGRADE_URL } from "metabase/common/components/upsells/constants";export const UpsellSemanticSearchPill = ({ source }: { source: string }) => {return (diff --git a/frontend/src/metabase/admin/upsells/UpsellUploads.tsx b/frontend/src/metabase/admin/upsells/UpsellUploads.tsxindex 6b58a810c43..15a23fef0bf 100644--- a/frontend/src/metabase/admin/upsells/UpsellUploads.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellUploads.tsx@@ -1,13 +1,12 @@import { c, t } from "ttag";-import { UpsellCard } from "metabase/common/components/UpsellCard";+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 { useSelector } from "metabase/lib/redux";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";import { getSetting } from "metabase/selectors/settings";-import { UPGRADE_URL } from "./constants";-export const UpsellUploads = ({ location }: { location: string }) => {const campaign = "manage-uploads";const { triggerUpsellFlow } = PLUGIN_ADMIN_SETTINGS.useUpsellFlow({diff --git a/frontend/src/metabase/admin/upsells/UpsellWhitelabel.tsx b/frontend/src/metabase/admin/upsells/UpsellWhitelabel.tsxindex 81d23257167..ac711bb5537 100644--- a/frontend/src/metabase/admin/upsells/UpsellWhitelabel.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellWhitelabel.tsx@@ -1,16 +1,15 @@import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";+import { UpsellBigCard } from "metabase/common/components/upsells/components";+import S from "metabase/common/components/upsells/components/Upsells.module.css";+import { useUpsellLink } from "metabase/common/components/upsells/components/use-upsell-link";+import { UPGRADE_URL } from "metabase/common/components/upsells/constants";import { useHasTokenFeature } from "metabase/common/hooks";import { useSelector } from "metabase/lib/redux";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";import { getDocsUrl } from "metabase/selectors/settings";-import { UpsellBigCard } from "./components";-import S from "./components/Upsells.module.css";-import { useUpsellLink } from "./components/use-upsell-link";-import { UPGRADE_URL } from "./constants";-export const UpsellWhitelabel = ({ source }: { source: string }) => {const isWhitelabeled = useHasTokenFeature("whitelabel");const campaign = "whitelabel";diff --git a/frontend/src/metabase/admin/upsells/index.ts b/frontend/src/metabase/admin/upsells/index.tsindex bcf7fa82362..a35c000422c 100644--- a/frontend/src/metabase/admin/upsells/index.ts+++ b/frontend/src/metabase/admin/upsells/index.ts@@ -1,15 +1,11 @@-export * from "./UpsellEmbedHomepage";export * from "./UpsellBetterSupport";export * from "./UpsellCacheConfig";export * from "./UpsellCloud";export * from "./UpsellEmailWhitelabel";export * from "./UpsellHosting";-export * from "./UpsellMetabaseBanner";export * from "./UpsellPerformanceTools";export * from "./UpsellPermissions";export * from "./UpsellSSO";-export * from "./UpsellStorage";export * from "./UpsellUploads";-export * from "./UpsellUsageAnalytics";export * from "./UpsellWhitelabel";export { UpsellDevInstances } from "./UpsellDevInstances";diff --git a/frontend/src/metabase/common/components/Sidesheet/components/InsightsTab/InsightsTab.tsx b/frontend/src/metabase/common/components/Sidesheet/components/InsightsTab/InsightsTab.tsxindex ae30e79e750..301fc9cb002 100644--- a/frontend/src/metabase/common/components/Sidesheet/components/InsightsTab/InsightsTab.tsx+++ b/frontend/src/metabase/common/components/Sidesheet/components/InsightsTab/InsightsTab.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import { UpsellWrapper } from "metabase/admin/upsells/components/UpsellWrapper";+import { UpsellWrapper } from "metabase/common/components/upsells/components/UpsellWrapper";import { Tabs } from "metabase/ui";/** This tab just shows the Insights upsell */diff --git a/frontend/src/metabase/common/components/UpsellCard/index.ts b/frontend/src/metabase/common/components/UpsellCard/index.tsdeleted file mode 100644index c58ccdcf18b..00000000000--- a/frontend/src/metabase/common/components/UpsellCard/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./UpsellCard";diff --git a/frontend/src/metabase/common/components/UpsellCard/UpsellCard.mdx b/frontend/src/metabase/common/components/upsells/UpsellCard.mdxsimilarity index 100%rename from frontend/src/metabase/common/components/UpsellCard/UpsellCard.mdxrename to frontend/src/metabase/common/components/upsells/UpsellCard.mdxdiff --git a/frontend/src/metabase/common/components/UpsellCard/UpsellCard.module.css b/frontend/src/metabase/common/components/upsells/UpsellCard.module.csssimilarity index 100%rename from frontend/src/metabase/common/components/UpsellCard/UpsellCard.module.cssrename to frontend/src/metabase/common/components/upsells/UpsellCard.module.cssdiff --git a/frontend/src/metabase/common/components/UpsellCard/UpsellCard.stories.tsx b/frontend/src/metabase/common/components/upsells/UpsellCard.stories.tsxsimilarity index 100%rename from frontend/src/metabase/common/components/UpsellCard/UpsellCard.stories.tsxrename to frontend/src/metabase/common/components/upsells/UpsellCard.stories.tsxdiff --git a/frontend/src/metabase/common/components/UpsellCard/UpsellCard.tsx b/frontend/src/metabase/common/components/upsells/UpsellCard.tsxsimilarity index 84%rename from frontend/src/metabase/common/components/UpsellCard/UpsellCard.tsxrename to frontend/src/metabase/common/components/upsells/UpsellCard.tsxindex 9286a2a4941..fb095842614 100644--- a/frontend/src/metabase/common/components/UpsellCard/UpsellCard.tsx+++ b/frontend/src/metabase/common/components/upsells/UpsellCard.tsx@@ -1,17 +1,16 @@import cx from "classnames";import { useMount } from "react-use";-import { Box, Flex, Image, Stack, Text, Title } from "metabase/ui";--import { useUpgradeAction } from "../../../admin/upsells/components/UpgradeModal";-import { UpsellCta } from "../../../admin/upsells/components/UpsellCta";-import { UpsellGem } from "../../../admin/upsells/components/UpsellGem";-import { UpsellWrapper } from "../../../admin/upsells/components/UpsellWrapper";+import { useUpgradeAction } from "metabase/common/components/upsells/components/UpgradeModal";+import { UpsellCta } from "metabase/common/components/upsells/components/UpsellCta";+import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";+import { UpsellWrapper } from "metabase/common/components/upsells/components/UpsellWrapper";import {trackUpsellClicked,trackUpsellViewed,-} from "../../../admin/upsells/components/analytics";-import { UPGRADE_URL } from "../../../admin/upsells/constants";+} from "metabase/common/components/upsells/components/analytics";+import { UPGRADE_URL } from "metabase/common/components/upsells/constants";+import { Box, Flex, Image, Stack, Text, Title } from "metabase/ui";import S from "./UpsellCard.module.css";diff --git a/frontend/src/metabase/admin/upsells/UpsellEmbedHomepage.tsx b/frontend/src/metabase/common/components/upsells/UpsellEmbedHomepage.tsxsimilarity index 71%rename from frontend/src/metabase/admin/upsells/UpsellEmbedHomepage.tsxrename to frontend/src/metabase/common/components/upsells/UpsellEmbedHomepage.tsxindex fd12429d945..b37c835f075 100644--- a/frontend/src/metabase/admin/upsells/UpsellEmbedHomepage.tsx+++ b/frontend/src/metabase/common/components/upsells/UpsellEmbedHomepage.tsx@@ -1,8 +1,8 @@import { t } from "ttag";-import { UpsellCard } from "metabase/common/components/UpsellCard";import { Text } from "metabase/ui";+import { UpsellCard } from "./UpsellCard";import { UPGRADE_URL } from "./constants";const campaign = "advanced-embeds";@@ -12,6 +12,7 @@ export const UpsellEmbedHomepage = ({ location }: { location: string }) => {<UpsellCardtitle={t`More advanced embeds`}campaign={campaign}+ // eslint-disable-next-line metabase/no-literal-metabase-strings -- Upsell for Metabase Pro, only visible to adminsbuttonText={t`Try Metabase Pro`}buttonLink={UPGRADE_URL}location={location}@@ -21,6 +22,7 @@ export const UpsellEmbedHomepage = ({ location }: { location: string }) => {}}><Text size="sm" lh="md" ta="center">+ {/* eslint-disable-next-line metabase/no-literal-metabase-strings -- Upsell for Metabase Pro, only visible to admins */}{t`Give your customers the full power of Metabase in your own app, with SSO, advanced permissions, customization, and more.`}</Text></UpsellCard>diff --git a/frontend/src/metabase/admin/upsells/UpsellMetabaseBanner.tsx b/frontend/src/metabase/common/components/upsells/UpsellMetabaseBanner.tsxsimilarity index 81%rename from frontend/src/metabase/admin/upsells/UpsellMetabaseBanner.tsxrename to frontend/src/metabase/common/components/upsells/UpsellMetabaseBanner.tsxindex 1767b24fa51..06d20692622 100644--- a/frontend/src/metabase/admin/upsells/UpsellMetabaseBanner.tsx+++ b/frontend/src/metabase/common/components/upsells/UpsellMetabaseBanner.tsx@@ -1,8 +1,8 @@import { t } from "ttag";-import { UpsellCard } from "metabase/common/components/UpsellCard";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";+import { UpsellCard } from "./UpsellCard";import { UPGRADE_URL } from "./constants";export function UpsellMetabaseBanner() {@@ -22,6 +22,7 @@ export function UpsellMetabaseBanner() {fullWidthonClick={triggerUpsellFlow}>+ {/* eslint-disable-next-line metabase/no-literal-metabase-strings -- Upsell referencing the Metabase brand, only visible to admins */}{t`The “Powered by Metabase” banner appears on all guest embeds created with your current version. Upgrade to remove it (and customize a lot more)`}</UpsellCard>);diff --git a/frontend/src/metabase/admin/upsells/UpsellStorage.tsx b/frontend/src/metabase/common/components/upsells/UpsellStorage.tsxsimilarity index 82%rename from frontend/src/metabase/admin/upsells/UpsellStorage.tsxrename to frontend/src/metabase/common/components/upsells/UpsellStorage.tsxindex 64153c72716..25fa081cecc 100644--- a/frontend/src/metabase/admin/upsells/UpsellStorage.tsx+++ b/frontend/src/metabase/common/components/upsells/UpsellStorage.tsx@@ -29,6 +29,7 @@ export const UpsellStorage = ({ location }: { location: string }) => {buttonText={t`Add`}buttonLink={storeUrl}location={location}+ // eslint-disable-next-line metabase/no-literal-metabase-strings -- Upsell for Metabase Storage, only visible to adminstitle={t`Add Metabase Storage`}large>@@ -38,6 +39,7 @@ export const UpsellStorage = ({ location }: { location: string }) => {size="sm"styles={{ root: { paddingInlineStart: "var(--mantine-spacing-sm)" } }}>+ {/* eslint-disable-next-line metabase/no-literal-metabase-strings -- Upsell for Metabase Storage, only visible to admins */}<List.Item>{t`Secure, fully managed by Metabase`}</List.Item><List.Item>{t`Upload CSV files`}</List.Item><List.Item>{t`Sync with Google Sheets`}</List.Item>diff --git a/frontend/src/metabase/admin/upsells/UpsellUsageAnalytics.tsx b/frontend/src/metabase/common/components/upsells/UpsellUsageAnalytics.tsxsimilarity index 84%rename from frontend/src/metabase/admin/upsells/UpsellUsageAnalytics.tsxrename to frontend/src/metabase/common/components/upsells/UpsellUsageAnalytics.tsxindex 943273d5e68..c04ab0b2031 100644--- a/frontend/src/metabase/admin/upsells/UpsellUsageAnalytics.tsx+++ b/frontend/src/metabase/common/components/upsells/UpsellUsageAnalytics.tsx@@ -1,15 +1,12 @@import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";-import {- UpsellCard,- type UpsellCardProps,-} from "metabase/common/components/UpsellCard";import { useSelector } from "metabase/lib/redux";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";import { getDocsUrl } from "metabase/selectors/settings";import { Box, type BoxProps, Text } from "metabase/ui";+import { UpsellCard, type UpsellCardProps } from "./UpsellCard";import { UPGRADE_URL } from "./constants";const usageAnalyticsIllustrationSource = "app/assets/img/usage-analytics.png";@@ -28,6 +25,7 @@ export const UpsellUsageAnalytics = (location,});const usageAnalyticsUrl = useSelector((state) =>+ // eslint-disable-next-line metabase/no-unconditional-metabase-links-render -- Upsell component only visible to adminsgetDocsUrl(state, {page: "usage-and-performance-tools/usage-analytics",}),@@ -51,6 +49,7 @@ export const UpsellUsageAnalytics = ({...props}><Text lh="1.5rem" style={{ paddingInlineStart: "2rem" }}>+ {/* eslint-disable-next-line metabase/no-literal-metabase-strings -- Upsell for Metabase Pro, only visible to admins */}{t`Get detailed reports for tracking Metabase content usage, performance, and configuration changes.`}{" "}<ExternalLink href={usageAnalyticsUrl}>{t`Learn more`}</ExternalLink></Text>diff --git a/frontend/src/metabase/admin/upsells/components/UpgradeModal/UpgradeModal.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModal.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpgradeModal/UpgradeModal.tsxrename to frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModal.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpgradeModal/UpgradeModal.unit.spec.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModal.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpgradeModal/UpgradeModal.unit.spec.tsxrename to frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModal.unit.spec.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpgradeModal/UpgradeModalError.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalError.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpgradeModal/UpgradeModalError.tsxrename to frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalError.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpgradeModal/UpgradeModalInitial.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalInitial.tsxsimilarity index 93%rename from frontend/src/metabase/admin/upsells/components/UpgradeModal/UpgradeModalInitial.tsxrename to frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalInitial.tsxindex 9f8b002849a..2539fccb920 100644--- a/frontend/src/metabase/admin/upsells/components/UpgradeModal/UpgradeModalInitial.tsx+++ b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalInitial.tsx@@ -50,7 +50,8 @@ export function UpgradeModalInitial({const isTrial = flow === "trial";const title = isTrial? t`Start your 14-day trial of Pro`- : t`Upgrade to Metabase Pro`;+ : // eslint-disable-next-line metabase/no-literal-metabase-strings -- Upsell for Metabase Pro, only visible to admins+ t`Upgrade to Metabase Pro`;const buttonText = isTrial ? t`Start your free trial` : t`Upgrade to Pro`;const proFeatures = [t`Whitelabeling`,@@ -72,6 +73,7 @@ export function UpgradeModalInitial({><Stack gap="md"><Flex justify="space-between" align="center">+ {/* eslint-disable-next-line metabase/no-literal-metabase-strings -- Upsell for Metabase Pro, only visible to admins */}<Title order={4}>{t`Metabase Pro`}</Title><ExternalLink href="https://www.metabase.com/pricing"><Anchor component="span">{t`See all features`}</Anchor>diff --git a/frontend/src/metabase/admin/upsells/components/UpgradeModal/UpgradeModalLoading.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalLoading.tsxsimilarity index 87%rename from frontend/src/metabase/admin/upsells/components/UpgradeModal/UpgradeModalLoading.tsxrename to frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalLoading.tsxindex e7d78a30ea3..64beb9c3523 100644--- a/frontend/src/metabase/admin/upsells/components/UpgradeModal/UpgradeModalLoading.tsx+++ b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalLoading.tsx@@ -27,7 +27,8 @@ export function UpgradeModalLoading({if (isSettingUp) {const title = isTrial? t`Setting up your free trial, please wait`- : t`Setting up Metabase Pro, please wait`;+ : // eslint-disable-next-line metabase/no-literal-metabase-strings -- Upsell for Metabase Pro, only visible to admins+ t`Setting up Metabase Pro, please wait`;return (<Stack align="center" gap="lg" py="xl">@@ -54,7 +55,8 @@ export function UpgradeModalLoading({// Success state - feature has arrivedconst successTitle = isTrial? t`Your free trial is ready`- : t`Metabase Pro is ready to use`;+ : // eslint-disable-next-line metabase/no-literal-metabase-strings -- Upsell for Metabase Pro, only visible to admins+ t`Metabase Pro is ready to use`;return (<Stack align="center" gap="lg" py="xl">diff --git a/frontend/src/metabase/admin/upsells/components/UpgradeModal/index.ts b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/index.tssimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpgradeModal/index.tsrename to frontend/src/metabase/common/components/upsells/components/UpgradeModal/index.tsdiff --git a/frontend/src/metabase/admin/upsells/components/UpgradeModal/types.ts b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/types.tssimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpgradeModal/types.tsrename to frontend/src/metabase/common/components/upsells/components/UpgradeModal/types.tsdiff --git a/frontend/src/metabase/admin/upsells/components/UpgradeModal/use-upgrade-action.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpgradeModal/use-upgrade-action.tsxrename to frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpgradeModal/use-upgrade-action.unit.spec.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.unit.spec.tsxsimilarity index 97%rename from frontend/src/metabase/admin/upsells/components/UpgradeModal/use-upgrade-action.unit.spec.tsxrename to frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.unit.spec.tsxindex 369b07d4c59..f71c946a896 100644--- a/frontend/src/metabase/admin/upsells/components/UpgradeModal/use-upgrade-action.unit.spec.tsx+++ b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.unit.spec.tsx@@ -2,7 +2,7 @@ import { renderHookWithProviders } from "__support__/ui";import {DATA_STUDIO_UPGRADE_URL,UPGRADE_URL,-} from "metabase/admin/upsells/constants";+} from "metabase/common/components/upsells/constants";import {createMockSettingsState,createMockState,diff --git a/frontend/src/metabase/admin/upsells/components/UpsellBanner.mdx b/frontend/src/metabase/common/components/upsells/components/UpsellBanner.mdxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellBanner.mdxrename to frontend/src/metabase/common/components/upsells/components/UpsellBanner.mdxdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellBanner.module.css b/frontend/src/metabase/common/components/upsells/components/UpsellBanner.module.csssimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellBanner.module.cssrename to frontend/src/metabase/common/components/upsells/components/UpsellBanner.module.cssdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellBanner.stories.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellBanner.stories.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellBanner.stories.tsxrename to frontend/src/metabase/common/components/upsells/components/UpsellBanner.stories.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellBanner.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellBanner.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellBanner.tsxrename to frontend/src/metabase/common/components/upsells/components/UpsellBanner.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellBanner.unit.spec.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellBanner.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellBanner.unit.spec.tsxrename to frontend/src/metabase/common/components/upsells/components/UpsellBanner.unit.spec.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellBannerDismissible.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellBannerDismissible.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellBannerDismissible.tsxrename to frontend/src/metabase/common/components/upsells/components/UpsellBannerDismissible.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellBigCard.mdx b/frontend/src/metabase/common/components/upsells/components/UpsellBigCard.mdxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellBigCard.mdxrename to frontend/src/metabase/common/components/upsells/components/UpsellBigCard.mdxdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellBigCard.module.css b/frontend/src/metabase/common/components/upsells/components/UpsellBigCard.module.csssimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellBigCard.module.cssrename to frontend/src/metabase/common/components/upsells/components/UpsellBigCard.module.cssdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellBigCard.stories.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellBigCard.stories.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellBigCard.stories.tsxrename to frontend/src/metabase/common/components/upsells/components/UpsellBigCard.stories.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellBigCard.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellBigCard.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellBigCard.tsxrename to frontend/src/metabase/common/components/upsells/components/UpsellBigCard.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellCta.module.css b/frontend/src/metabase/common/components/upsells/components/UpsellCta.module.csssimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellCta.module.cssrename to frontend/src/metabase/common/components/upsells/components/UpsellCta.module.cssdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellCta.stories.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellCta.stories.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellCta.stories.tsxrename to frontend/src/metabase/common/components/upsells/components/UpsellCta.stories.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellCta.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellCta.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellCta.tsxrename to frontend/src/metabase/common/components/upsells/components/UpsellCta.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellCta.unit.spec.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellCta.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellCta.unit.spec.tsxrename to frontend/src/metabase/common/components/upsells/components/UpsellCta.unit.spec.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellGem.module.css b/frontend/src/metabase/common/components/upsells/components/UpsellGem.module.csssimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellGem.module.cssrename to frontend/src/metabase/common/components/upsells/components/UpsellGem.module.cssdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellGem.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellGem.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellGem.tsxrename to frontend/src/metabase/common/components/upsells/components/UpsellGem.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellPill.mdx b/frontend/src/metabase/common/components/upsells/components/UpsellPill.mdxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellPill.mdxrename to frontend/src/metabase/common/components/upsells/components/UpsellPill.mdxdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellPill.module.css b/frontend/src/metabase/common/components/upsells/components/UpsellPill.module.csssimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellPill.module.cssrename to frontend/src/metabase/common/components/upsells/components/UpsellPill.module.cssdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellPill.stories.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellPill.stories.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellPill.stories.tsxrename to frontend/src/metabase/common/components/upsells/components/UpsellPill.stories.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellPill.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellPill.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellPill.tsxrename to frontend/src/metabase/common/components/upsells/components/UpsellPill.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellWrapper.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellWrapper.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellWrapper.tsxrename to frontend/src/metabase/common/components/upsells/components/UpsellWrapper.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/UpsellWrapper.unit.spec.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellWrapper.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/UpsellWrapper.unit.spec.tsxrename to frontend/src/metabase/common/components/upsells/components/UpsellWrapper.unit.spec.tsxdiff --git a/frontend/src/metabase/admin/upsells/components/Upsells.module.css b/frontend/src/metabase/common/components/upsells/components/Upsells.module.csssimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/Upsells.module.cssrename to frontend/src/metabase/common/components/upsells/components/Upsells.module.cssdiff --git a/frontend/src/metabase/admin/upsells/components/analytics.ts b/frontend/src/metabase/common/components/upsells/components/analytics.tssimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/analytics.tsrename to frontend/src/metabase/common/components/upsells/components/analytics.tsdiff --git a/frontend/src/metabase/admin/upsells/components/index.ts b/frontend/src/metabase/common/components/upsells/components/index.tssimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/index.tsrename to frontend/src/metabase/common/components/upsells/components/index.tsdiff --git a/frontend/src/metabase/admin/upsells/components/use-upsell-link.ts b/frontend/src/metabase/common/components/upsells/components/use-upsell-link.tssimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/use-upsell-link.tsrename to frontend/src/metabase/common/components/upsells/components/use-upsell-link.tsdiff --git a/frontend/src/metabase/admin/upsells/components/use-upsell-link.unit.spec.tsx b/frontend/src/metabase/common/components/upsells/components/use-upsell-link.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/admin/upsells/components/use-upsell-link.unit.spec.tsxrename to frontend/src/metabase/common/components/upsells/components/use-upsell-link.unit.spec.tsxdiff --git a/frontend/src/metabase/admin/upsells/constants.ts b/frontend/src/metabase/common/components/upsells/constants.tssimilarity index 100%rename from frontend/src/metabase/admin/upsells/constants.tsrename to frontend/src/metabase/common/components/upsells/constants.tsdiff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/components/InsightsUpsellTab.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/components/InsightsUpsellTab.tsxindex 5b88a66d529..e889fbee2f7 100644--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/components/InsightsUpsellTab.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/components/InsightsUpsellTab.tsx@@ -1,4 +1,4 @@-import { UpsellUsageAnalytics } from "metabase/admin/upsells";+import { UpsellUsageAnalytics } from "metabase/common/components/upsells/UpsellUsageAnalytics";import { Flex } from "metabase/ui";import type { CardType } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsxindex 061a8357565..ff8104d7d87 100644--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx@@ -3,8 +3,8 @@ import { type ReactNode, useState } from "react";import { t } from "ttag";import DataStudioLogo from "assets/img/data-studio-logo.svg";-import { UpsellGem } from "metabase/admin/upsells/components/UpsellGem";import { ForwardRefLink } from "metabase/common/components/Link";+import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";import { useHasTokenFeature } from "metabase/common/hooks";import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";import { isMac } from "metabase/lib/browser";diff --git a/frontend/src/metabase/data-studio/upsells/components/UpsellCardContent.tsx b/frontend/src/metabase/data-studio/upsells/components/UpsellCardContent.tsxindex 04c33235988..97a3e6474c0 100644--- a/frontend/src/metabase/data-studio/upsells/components/UpsellCardContent.tsx+++ b/frontend/src/metabase/data-studio/upsells/components/UpsellCardContent.tsx@@ -1,13 +1,13 @@import { useEffect } from "react";import { t } from "ttag";-import { UpsellCta } from "metabase/admin/upsells/components/UpsellCta";-import { UpsellGem } from "metabase/admin/upsells/components/UpsellGem";+import { useCheckTrialAvailableQuery } from "metabase/api/cloud-proxy";+import { UpsellCta } from "metabase/common/components/upsells/components/UpsellCta";+import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";import {trackUpsellClicked,trackUpsellViewed,-} from "metabase/admin/upsells/components/analytics";-import { useCheckTrialAvailableQuery } from "metabase/api/cloud-proxy";+} from "metabase/common/components/upsells/components/analytics";import { useSelector } from "metabase/lib/redux";import { getStoreUsers } from "metabase/selectors/store-users";import { getIsHosted } from "metabase/setup/selectors";diff --git a/frontend/src/metabase/data-studio/upsells/pages/BaseUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/pages/BaseUpsellPage.tsxindex 11b892dc0ef..a33c2c501f9 100644--- a/frontend/src/metabase/data-studio/upsells/pages/BaseUpsellPage.tsx+++ b/frontend/src/metabase/data-studio/upsells/pages/BaseUpsellPage.tsx@@ -1,5 +1,5 @@-import { useUpgradeAction } from "metabase/admin/upsells/components/UpgradeModal";-import { DATA_STUDIO_UPGRADE_URL } from "metabase/admin/upsells/constants";+import { useUpgradeAction } from "metabase/common/components/upsells/components/UpgradeModal";+import { DATA_STUDIO_UPGRADE_URL } from "metabase/common/components/upsells/constants";import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";import { UpsellCardContent } from "metabase/data-studio/upsells/components/UpsellCardContent";diff --git a/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsxindex 1d7741484ce..9e1e700ab43 100644--- a/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx+++ b/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx@@ -1,7 +1,7 @@import { t } from "ttag";-import { useUpgradeAction } from "metabase/admin/upsells/components/UpgradeModal";-import { DATA_STUDIO_UPGRADE_URL } from "metabase/admin/upsells/constants";+import { useUpgradeAction } from "metabase/common/components/upsells/components/UpgradeModal";+import { DATA_STUDIO_UPGRADE_URL } from "metabase/common/components/upsells/constants";import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";import { UpsellCardContent } from "metabase/data-studio/upsells/components/UpsellCardContent";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/EmbeddingUpsell.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/EmbeddingUpsell.tsxindex fbf75ac5c2c..6878cf5d843 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/EmbeddingUpsell.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/EmbeddingUpsell.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import { UpsellCard } from "metabase/common/components/UpsellCard";+import { UpsellCard } from "metabase/common/components/upsells/UpsellCard";import { UTM_LOCATION } from "metabase/embedding/embedding-iframe-sdk-setup/analytics";import { useSdkIframeEmbedSetupContext } from "metabase/embedding/embedding-iframe-sdk-setup/context";import { useSelector } from "metabase/lib/redux";diff --git a/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepageView.tsx b/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepageView.tsxindex 6f4a01090c4..b7e0398c699 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepageView.tsx+++ b/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepageView.tsx@@ -1,7 +1,7 @@import { match } from "ts-pattern";import { t } from "ttag";-import { UpsellEmbedHomepage } from "metabase/admin/upsells";+import { UpsellEmbedHomepage } from "metabase/common/components/upsells/UpsellEmbedHomepage";import { Box, Card, Flex, Stack, Text, Title } from "metabase/ui";import type { EmbeddingHomepageDismissReason } from "metabase-types/api";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVPanel.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVPanel.tsxindex 7ceee2defef..fc479c2dce2 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVPanel.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVPanel.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import { UpsellStorage } from "metabase/admin/upsells";+import { UpsellStorage } from "metabase/common/components/upsells/UpsellStorage";import * as Urls from "metabase/lib/urls";import { CSVPanelEmptyState } from "./AddDataModalEmptyStates";diff --git a/frontend/src/metabase/new/components/NewModals/NewModals.tsx b/frontend/src/metabase/new/components/NewModals/NewModals.tsxindex f6e127a71f7..526137859f4 100644--- a/frontend/src/metabase/new/components/NewModals/NewModals.tsx+++ b/frontend/src/metabase/new/components/NewModals/NewModals.tsx@@ -5,9 +5,9 @@ import { push } from "react-router-redux";import { useLocation } from "react-use";import ActionCreator from "metabase/actions/containers/ActionCreator";-import { UpgradeModal } from "metabase/admin/upsells/components/UpgradeModal";import CreateCollectionModal from "metabase/collections/containers/CreateCollectionModal";import { Modal } from "metabase/common/components/Modal";+import { UpgradeModal } from "metabase/common/components/upsells/components/UpgradeModal";import { CreateDashboardModal } from "metabase/dashboard/containers/CreateDashboardModal";import { STATIC_LEGACY_EMBEDDING_TYPE } from "metabase/embedding/constants";import {diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsx b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsxindex aead7039a6c..6922ae02f8f 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsx+++ b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsx@@ -1,8 +1,8 @@import { match } from "ts-pattern";import { jt, t } from "ttag";-import { UpsellMetabaseBanner } from "metabase/admin/upsells";import { ExternalLink } from "metabase/common/components/ExternalLink";+import { UpsellMetabaseBanner } from "metabase/common/components/upsells/UpsellMetabaseBanner";import { useDocsUrl } from "metabase/common/hooks";import { useSelector } from "metabase/lib/redux";import type {diff --git a/frontend/src/metabase/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx b/frontend/src/metabase/transforms/components/CreateTransformMenu/CreateTransformMenu.tsxindex e696a77ed59..ca4424be872 100644--- a/frontend/src/metabase/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx+++ b/frontend/src/metabase/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx@@ -2,9 +2,9 @@ import { useDisclosure } from "@mantine/hooks";import { push } from "react-router-redux";import { t } from "ttag";-import { UpsellGem } from "metabase/admin/upsells/components/UpsellGem";import { useListDatabasesQuery } from "metabase/api";import { QuestionPickerModal } from "metabase/common/components/Pickers";+import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";import { useHasTokenFeature } from "metabase/common/hooks";import { useDispatch, useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsxindex 1f62edfbfed..bec3eba95da 100644--- a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx@@ -11,7 +11,6 @@ import {import type { WithRouterProps } from "react-router";import { t } from "ttag";-import { UpsellGem } from "metabase/admin/upsells/components/UpsellGem";import {skipToken,useGetCollectionQuery,@@ -21,6 +20,7 @@ import {import { DateTime } from "metabase/common/components/DateTime";import { Ellipsified } from "metabase/common/components/Ellipsified";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";import { useHasTokenFeature } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";