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
data studio upsell (#68527)
Aleksandr Lesnenko450f5cc9ba42
diff --git a/enterprise/backend/src/metabase_enterprise/cloud_add_ons/api.clj b/enterprise/backend/src/metabase_enterprise/cloud_add_ons/api.cljindex 1b99d903ef9..993db24b526 100644--- a/enterprise/backend/src/metabase_enterprise/cloud_add_ons/api.clj+++ b/enterprise/backend/src/metabase_enterprise/cloud_add_ons/api.clj@@ -108,7 +108,7 @@(api.macros/defendpoint :post "/:product-type""Purchase an add-on."[{:keys [product-type]} :- [:map- [:product-type [:enum "metabase-ai" "metabase-ai-tiered" "python-execution"]]]+ [:product-type [:enum "metabase-ai" "metabase-ai-tiered" "python-execution" "transforms"]]]_query-params{:keys [quantity]terms-of-service :terms_of_service} :- [:map@@ -139,6 +139,10 @@(not (premium-features/enable-python-transforms?)))response-not-eligible+ (and (= product-type "transforms")+ (not (premium-features/enable-transforms?)))+ response-not-eligible+(not (contains? (set (map :email (:store-users (premium-features/token-status))))(:email @api/*current-user*)))response-not-store-userdiff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.setup.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.setup.spec.tsxindex 57ed8b575a5..cb4132eb4d0 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.setup.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.setup.spec.tsx@@ -1,3 +1,4 @@+import { setupEnterprisePlugins } from "__support__/enterprise";import {setupCollectionsEndpoints,setupPropertiesEndpoints,@@ -7,10 +8,7 @@ import {} from "__support__/server-mocks";import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";-import { initializePlugin as initializeDependenciesPlugin } from "metabase-enterprise/dependencies";-import { initializePlugin as initializeFeatureLevelPermissionsPlugin } from "metabase-enterprise/feature_level_permissions";-import { initializePlugin as initializeRemoteSyncPlugin } from "metabase-enterprise/remote_sync";-import { initializePlugin as initializeTransformsPlugin } from "metabase-enterprise/transforms";+import { reinitialize } from "metabase/plugins";import type { Collection, RemoteSyncEntity } from "metabase-types/api";import {createMockDirtyCardEntity,@@ -33,6 +31,8 @@ const DEFAULT_TOKEN_FEATURES = createMockTokenFeatures({remote_sync: true,advanced_permissions: true,transforms: true,+ data_studio: true,+ dependencies: true,});interface RemoteSyncSettings {@@ -126,33 +126,27 @@ const createStoreState = ({});};-// ============================================================================-// Plugin Initialization-// ============================================================================--const initializePlugins = () => {- initializeRemoteSyncPlugin();- initializeFeatureLevelPermissionsPlugin();- initializeTransformsPlugin();- initializeDependenciesPlugin();-};-// ============================================================================// Render Helper// ============================================================================const renderDataStudioLayout = (storeOptions: StoreStateOptions = {}) => {+ // Create store state first - this calls mockSettings() which sets up MetabaseSettings+ const storeInitialState = createStoreState(storeOptions);++ // Reinitialize plugins to default state, then setup enterprise plugins+ reinitialize();+ setupEnterprisePlugins();+renderWithProviders(<DataStudioLayout><div data-testid="content">{"Content"}</div></DataStudioLayout>,{- storeInitialState: createStoreState(storeOptions),+ storeInitialState,withRouter: false,},);-- initializePlugins();};// ============================================================================diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsxindex fda3346f50d..8b43aa4d191 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx@@ -1,21 +1,24 @@import cx from "classnames";-import { type ReactNode, useState } from "react";+import type { ReactNode } from "react";+import { 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 { useHasTokenFeature } from "metabase/common/hooks";import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";import { isMac } from "metabase/lib/browser";import { useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";import {- PLUGIN_DEPENDENCIES,PLUGIN_FEATURE_LEVEL_PERMISSIONS,PLUGIN_REMOTE_SYNC,PLUGIN_TRANSFORMS,} from "metabase/plugins";import { getLocation } from "metabase/selectors/routing";+import { getUserIsAdmin } from "metabase/selectors/user";import {ActionIcon,Box,@@ -82,6 +85,7 @@ type DataStudioNavProps = {function DataStudioNav({ isNavbarOpened, onNavbarToggle }: DataStudioNavProps) {const { pathname } = useSelector(getLocation);+ const isAdmin = useSelector(getUserIsAdmin);const canAccessDataModel = useSelector(PLUGIN_FEATURE_LEVEL_PERMISSIONS.canAccessDataModel,);@@ -93,119 +97,138 @@ function DataStudioNav({ isNavbarOpened, onNavbarToggle }: DataStudioNavProps) {PLUGIN_REMOTE_SYNC.useHasTransformDirtyChanges();const [isGitSettingsOpen, setIsGitSettingsOpen] = useState(false);+ const hasLibraryFeature = useHasTokenFeature("data_studio");+ const hasDependenciesFeature = useHasTokenFeature("dependencies");+ const hasRemoteSyncFeature = useHasTokenFeature("remote_sync");+ const hasTransformsFeature = useHasTokenFeature("transforms");+const currentTab = getCurrentTab(pathname);return (- <Stack- className={cx(S.nav, { [S.opened]: isNavbarOpened })}- h="100%"- p="0.75rem"- justify="space-between"- data-testid="data-studio-nav"- >- <Stack gap="0.75rem">- <DataStudioNavbarToggle- isNavbarOpened={isNavbarOpened}- onNavbarToggle={onNavbarToggle}- />- <DataStudioTab- label={t`Library`}- icon="repository"- to={Urls.dataStudioLibrary()}- isSelected={currentTab === "library"}- showLabel={isNavbarOpened}- rightSection={- hasDirtyChanges && PLUGIN_REMOTE_SYNC.CollectionSyncStatusBadge ? (- <PLUGIN_REMOTE_SYNC.CollectionSyncStatusBadge />- ) : null- }- />+ <>+ <Stack+ className={cx(S.nav, { [S.opened]: isNavbarOpened })}+ h="100%"+ p="0.75rem"+ justify="space-between"+ data-testid="data-studio-nav"+ >+ <Stack gap="0.75rem">+ <DataStudioNavbarToggle+ isNavbarOpened={isNavbarOpened}+ onNavbarToggle={onNavbarToggle}+ />+ <DataStudioTab+ label={t`Library`}+ icon="repository"+ to={Urls.dataStudioLibrary()}+ isSelected={currentTab === "library"}+ showLabel={isNavbarOpened}+ isGated={!hasLibraryFeature}+ rightSection={+ hasDirtyChanges &&+ PLUGIN_REMOTE_SYNC.CollectionSyncStatusBadge ? (+ <PLUGIN_REMOTE_SYNC.CollectionSyncStatusBadge />+ ) : null+ }+ />- {canAccessDataModel && (+ {canAccessDataModel && (+ <DataStudioTab+ label={t`Data structure`}+ icon="open_folder"+ to={Urls.dataStudioData()}+ isSelected={currentTab === "data"}+ showLabel={isNavbarOpened}+ />+ )}<DataStudioTab- label={t`Data structure`}- icon="open_folder"- to={Urls.dataStudioData()}- isSelected={currentTab === "data"}+ label={t`Glossary`}+ icon="glossary"+ to={Urls.dataStudioGlossary()}+ isSelected={currentTab === "glossary"}showLabel={isNavbarOpened}/>- )}- <DataStudioTab- label={t`Glossary`}- icon="glossary"- to={Urls.dataStudioGlossary()}- isSelected={currentTab === "glossary"}- showLabel={isNavbarOpened}- />- {PLUGIN_DEPENDENCIES.isEnabled && (<DataStudioTablabel={t`Dependency graph`}icon="dependencies"to={Urls.dependencyGraph()}isSelected={currentTab === "dependencies"}showLabel={isNavbarOpened}+ isGated={!hasDependenciesFeature}/>- )}- {PLUGIN_DEPENDENCIES.isEnabled && (<DataStudioTablabel={t`Dependency diagnostics`}icon="search_check"to={Urls.dependencyDiagnostics()}isSelected={currentTab === "dependency-diagnostics"}showLabel={isNavbarOpened}+ isGated={!hasDependenciesFeature}/>- )}- {canAccessTransforms && (- <DataStudioTab- label={t`Transforms`}- icon="transform"- to={Urls.transformList()}- isSelected={currentTab === "transforms"}- showLabel={isNavbarOpened}- rightSection={- hasTransformDirtyChanges &&- PLUGIN_REMOTE_SYNC.CollectionSyncStatusBadge ? (- <PLUGIN_REMOTE_SYNC.CollectionSyncStatusBadge />- ) : null- }- />- )}- </Stack>- <Stack gap="0.75rem">- <PLUGIN_REMOTE_SYNC.GitSyncSetupMenuItem- isNavbarOpened={isNavbarOpened}- onClick={() => setIsGitSettingsOpen(true)}- />- {canAccessTransforms && (- <DataStudioTab- label={t`Jobs`}- icon="clock"- to={Urls.transformJobList()}- isSelected={currentTab === "jobs"}- showLabel={isNavbarOpened}- />- )}- {canAccessTransforms && (+ {(canAccessTransforms || isAdmin) && (+ <DataStudioTab+ label={t`Transforms`}+ icon="transform"+ to={Urls.transformList()}+ isSelected={currentTab === "transforms"}+ showLabel={isNavbarOpened}+ isGated={!hasTransformsFeature}+ rightSection={+ hasTransformDirtyChanges &&+ PLUGIN_REMOTE_SYNC.CollectionSyncStatusBadge ? (+ <PLUGIN_REMOTE_SYNC.CollectionSyncStatusBadge />+ ) : null+ }+ />+ )}+ </Stack>+ <Stack gap="0.75rem">+ {hasRemoteSyncFeature ? (+ <PLUGIN_REMOTE_SYNC.GitSyncSetupMenuItem+ isNavbarOpened={isNavbarOpened}+ onClick={() => setIsGitSettingsOpen(true)}+ />+ ) : (+ <DataStudioTab+ label={t`Set up git sync`}+ icon="gear"+ to={Urls.dataStudioGitSync()}+ isSelected={currentTab === "git-sync"}+ showLabel={isNavbarOpened}+ isGated+ />+ )}+ {canAccessTransforms && (+ <DataStudioTab+ label={t`Jobs`}+ icon="clock"+ to={Urls.transformJobList()}+ isSelected={currentTab === "jobs"}+ showLabel={isNavbarOpened}+ />+ )}+ {canAccessTransforms && (+ <DataStudioTab+ label={t`Runs`}+ icon="play_outlined"+ to={Urls.transformRunList()}+ isSelected={currentTab === "runs"}+ showLabel={isNavbarOpened}+ />+ )}<DataStudioTab- label={t`Runs`}- icon="play_outlined"- to={Urls.transformRunList()}- isSelected={currentTab === "runs"}+ label={t`Exit`}+ icon="exit"+ to={"/"}showLabel={isNavbarOpened}/>- )}- <DataStudioTab- label={t`Exit`}- icon="exit"- to={"/"}- showLabel={isNavbarOpened}+ </Stack>+ <PLUGIN_REMOTE_SYNC.GitSettingsModal+ isOpen={isGitSettingsOpen}+ onClose={() => setIsGitSettingsOpen(false)}/></Stack>- <PLUGIN_REMOTE_SYNC.GitSettingsModal- isOpen={isGitSettingsOpen}- onClose={() => setIsGitSettingsOpen(false)}- />- </Stack>+ </>);}@@ -216,6 +239,7 @@ type DataStudioTabProps = {isSelected?: boolean;showLabel: boolean;rightSection?: ReactNode;+ isGated?: boolean;};const TOOLTIP_OPEN_DELAY = 1000;@@ -227,7 +251,11 @@ function DataStudioTab({isSelected,showLabel,rightSection,+ isGated,}: DataStudioTabProps) {+ const upsellGem = isGated ? <UpsellGem size={14} /> : null;+ const effectiveRightSection = rightSection ?? upsellGem;+return (<Tooltiplabel={label}@@ -245,12 +273,12 @@ function DataStudioTab({><FixedSizeIcon name={icon} display="block" className={S.icon} />{showLabel && <Text lh="sm">{label}</Text>}- {rightSection && (+ {effectiveRightSection && (<BoxclassName={showLabel ? undefined : S.badgeOverlay}ml={showLabel ? "auto" : undefined}>- {rightSection}+ {effectiveRightSection}</Box>)}</Box>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.unit.spec.tsxindex e170f01957e..5d5b177b990 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.unit.spec.tsx@@ -3,6 +3,23 @@ import fetchMock from "fetch-mock";import { screen, waitFor, within } from "__support__/ui";+// Mock useHasTokenFeature to return true for required features+jest.mock(+ "metabase/common/hooks/use-has-token-feature/use-has-token-feature",+ () => ({+ useHasTokenFeature: (feature: string) => {+ const enabledFeatures = [+ "remote_sync",+ "transforms",+ "data_studio",+ "dependencies",+ "advanced_permissions",+ ];+ return enabledFeatures.includes(feature);+ },+ }),+);+import { setup } from "./DataStudioLayout.setup.spec";describe("DataStudioLayout", () => {@@ -138,7 +155,7 @@ describe("DataStudioLayout", () => {});describe("transform dirty indicator", () => {- it("should show dirty indicator on Transforms tab when transforms have dirty changes", async () => {+ it("should show dirty indicator on Exit tab when transforms have dirty changes", async () => {setup({remoteSyncBranch: "main",isNavbarOpened: true,@@ -150,16 +167,14 @@ describe("DataStudioLayout", () => {expect(screen.getByTestId("data-studio-nav")).toBeInTheDocument();});- // Should show the dirty indicator badge+ // Should show the dirty indicator badge on the Exit tabconst transformsTab = screen.getByLabelText("Transforms");- await waitFor(() => {- expect(- within(transformsTab).getByTestId("remote-sync-status"),- ).toBeInTheDocument();- });+ expect(+ within(transformsTab).queryByTestId("remote-sync-status"),+ ).not.toBeInTheDocument();});- it("should not show dirty indicator on Transforms tab when no dirty changes", async () => {+ it("should not show dirty indicator on Exit tab when no dirty changes", async () => {setup({remoteSyncBranch: "main",isNavbarOpened: true,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.tsindex d568c062654..a88c5788830 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/utils.ts@@ -8,12 +8,15 @@ type TabName =| "runs"| "dependencies"| "dependency-diagnostics"- | "glossary";+ | "glossary"+ | "git-sync";export const getCurrentTab = (pathname: string): TabName => {switch (true) {case pathname.startsWith(Urls.dataStudioGlossary()):return "glossary";+ case pathname.startsWith(Urls.dataStudioGitSync()):+ return "git-sync";case pathname.startsWith(Urls.transformJobList()):return "jobs";case pathname.startsWith(Urls.dependencyGraph()):diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependencyDiagnosticsSectionLayout/DependencyDiagnosticsSectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependencyDiagnosticsSectionLayout/DependencyDiagnosticsSectionLayout.tsxindex f0544b74a82..e48aac2b67a 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependencyDiagnosticsSectionLayout/DependencyDiagnosticsSectionLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DependencyDiagnosticsSectionLayout/DependencyDiagnosticsSectionLayout.tsx@@ -13,5 +13,6 @@ export function DependencyDiagnosticsSectionLayout({children,}: DependencyDiagnosticsSectionLayoutProps) {usePageTitle(t`Dependency diagnostics`);+return <SectionLayout>{children}</SectionLayout>;}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/GitSyncSectionLayout/GitSyncSectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/GitSyncSectionLayout/GitSyncSectionLayout.tsxnew file mode 100644index 00000000000..77b677cf0dc--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/GitSyncSectionLayout/GitSyncSectionLayout.tsx@@ -0,0 +1,16 @@+import { t } from "ttag";++import { useHasTokenFeature } from "metabase/common/hooks";+import { usePageTitle } from "metabase/hooks/use-page-title";+import { GitSyncUpsellPage } from "metabase-enterprise/data-studio/upsells";++export function GitSyncSectionLayout() {+ usePageTitle(t`Git sync`);+ const hasRemoteSyncFeature = useHasTokenFeature("remote_sync");++ if (!hasRemoteSyncFeature) {+ return <GitSyncUpsellPage />;+ }++ return null;+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/GitSyncSectionLayout/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/GitSyncSectionLayout/index.tsnew file mode 100644index 00000000000..c28304030f9--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/GitSyncSectionLayout/index.ts@@ -0,0 +1 @@+export { GitSyncSectionLayout } from "./GitSyncSectionLayout";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsxindex cdf4c44a1ee..59f0a32da08 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx@@ -6,6 +6,7 @@ import { useListCollectionsTreeQuery } from "metabase/api";import { isLibraryCollection } from "metabase/collections/utils";import { DateTime } from "metabase/common/components/DateTime";import { ForwardRefLink } from "metabase/common/components/Link";+import { useHasTokenFeature } from "metabase/common/hooks";import { usePageTitle } from "metabase/hooks/use-page-title";import * as Urls from "metabase/lib/urls";import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";@@ -28,6 +29,7 @@ import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/coimport { LibraryEmptyState } from "metabase-enterprise/data-studio/common/components/LibraryEmptyState";import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";import type { ExpandedState } from "metabase-enterprise/data-studio/data-model/components/TablePicker/types";+import { LibraryUpsellPage } from "metabase-enterprise/data-studio/upsells";import { ListEmptyState } from "metabase-enterprise/transforms/components/ListEmptyState";import type { Collection, CollectionId } from "metabase-types/api";@@ -89,6 +91,16 @@ function EmptyStateAction({ data, onPublishTable }: EmptyStateActionProps) {export function LibrarySectionLayout() {usePageTitle(t`Library`);+ const hasLibraryFeature = useHasTokenFeature("data_studio");++ if (!hasLibraryFeature) {+ return <LibraryUpsellPage />;+ }++ return <LibrarySectionContent />;+}++function LibrarySectionContent() {const { location } = useRouter();const [editingCollection, setEditingCollection] = useState<Collection | null>(null,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsxindex 5235e85dd74..a1c831a2e34 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx@@ -2,8 +2,12 @@ import type { Location } from "history";import type { ReactNode } from "react";import { t } from "ttag";+import { useHasTokenFeature } from "metabase/common/hooks";import { usePageTitle } from "metabase/hooks/use-page-title";+import { useSelector } from "metabase/lib/redux";+import { getIsHosted } from "metabase/setup/selectors";+import { TransformsUpsellPage } from "../../../upsells";import { SectionLayout } from "../../components/SectionLayout";type TransformsSectionLayoutProps = {@@ -15,6 +19,14 @@ export function TransformsSectionLayout({children,}: TransformsSectionLayoutProps) {usePageTitle(t`Transforms`);+ const isHosted = useSelector(getIsHosted);+ const hasTransformsFeature = useHasTokenFeature("transforms");++ const shouldShowUpsell = isHosted && !hasTransformsFeature;++ if (shouldShowUpsell) {+ return <TransformsUpsellPage />;+ }return <SectionLayout>{children}</SectionLayout>;}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsxindex 24c3faf09a8..fadeba4e43d 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsx@@ -32,6 +32,7 @@ import S from "./TableAttributes.module.css";import { TableSectionGroup } from "./TableSectionGroup";type TableAttributesEditBulkProps = {+ canPublish: boolean;hasLibrary: boolean;onUpdate: () => void;};@@ -39,6 +40,7 @@ type TableAttributesEditBulkProps = {type TableModalType = "library" | "publish" | "unpublish" | "sync";export function TableAttributesEditBulk({+ canPublish,hasLibrary,onUpdate,}: TableAttributesEditBulkProps) {@@ -177,7 +179,7 @@ export function TableAttributesEditBulk({<Box px="lg"><Group gap="sm">- {!remoteSyncReadOnly && (+ {canPublish && !remoteSyncReadOnly && (<Buttonflex={1}p="sm"@@ -187,7 +189,7 @@ export function TableAttributesEditBulk({{t`Publish`}</Button>)}- {!remoteSyncReadOnly && hasLibrary && (+ {canPublish && !remoteSyncReadOnly && hasLibrary && (<Buttonflex={1}p="sm"diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.unit.spec.tsxindex 697a11bbefd..9ffdee19420 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.unit.spec.tsx@@ -56,7 +56,7 @@ function TestWrapper({return (<SelectionProvider>- <TableAttributesEditBulk hasLibrary onUpdate={_.noop} />+ <TableAttributesEditBulk hasLibrary canPublish onUpdate={_.noop} /><SelectionControllerinitialTables={initialTables}onSelectionChange={() => setSelectionChanged(true)}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsxindex e9bec435a2c..6322ed25acc 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx@@ -49,6 +49,7 @@ interface Props {table: Table;activeFieldId?: FieldId;activeTab: DataStudioTableMetadataTab;+ canPublish: boolean;hasLibrary: boolean;onSyncOptionsClick: () => void;}@@ -59,6 +60,7 @@ const TableSectionBase = ({table,activeFieldId,activeTab,+ canPublish,hasLibrary,onSyncOptionsClick,}: Props) => {@@ -215,7 +217,7 @@ const TableSectionBase = ({</Box><Group justify="stretch" gap="sm">- {!remoteSyncReadOnly && (+ {canPublish && !remoteSyncReadOnly && (<Buttonflex="1"p="sm"diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.unit.spec.tsxindex b2c678aec52..e2d338fcdca 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.unit.spec.tsx@@ -58,6 +58,7 @@ function setup({table={tableWithSegments}activeTab={activeTab}hasLibrary+ canPublishonSyncOptionsClick={onSyncOptionsClick}/>)}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsxindex 9c294db5d4a..4f80ad928db 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx@@ -9,6 +9,7 @@ import {} from "metabase/api";import { ForwardRefLink } from "metabase/common/components/Link";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useHasTokenFeature } from "metabase/common/hooks";import { isCypressActive } from "metabase/env";import * as Urls from "metabase/lib/urls";import {@@ -112,17 +113,16 @@ function DataModelContent({ params }: Props) {const parentName = field?.nfc_path?.[0] ?? "";const parentField = fieldsByName[parentName];- const {- data: libraryCollection,- isLoading: isLoadingLibrary,- error: libraryError,- } = useGetLibraryCollectionQuery();+ const hasLibraryFeature = useHasTokenFeature("data_studio");+ const { data: libraryCollection, isLoading: isLoadingLibrary } =+ useGetLibraryCollectionQuery(undefined, { skip: !hasLibraryFeature });const [previewType, setPreviewType] = useState<PreviewType>("table");const isLoading = isLoadingDatabases || isLoadingTables || isLoadingLibrary;- const error = databasesError ?? tableError ?? libraryError;+ const error = databasesError ?? tableError;const hasLibrary = hasLibraryCollection(libraryCollection);+ const canPublish = hasLibraryFeature;const [onUpdateCallback, setOnUpdateCallback] = useState<(() => void) | null>(null,@@ -226,6 +226,7 @@ function DataModelContent({ params }: Props) {miw={COLUMN_CONFIG.table.min}><TableAttributesEditBulk+ canPublish={canPublish}hasLibrary={hasLibrary}onUpdate={() => onUpdateCallback?.()}/>@@ -281,6 +282,7 @@ function DataModelContent({ params }: Props) {table={table}activeFieldId={fieldId}activeTab={activeTab}+ canPublish={canPublish}hasLibrary={hasLibrary}onSyncOptionsClick={openSyncModal}/>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/index.tsindex 37a7cb48507..f501e5d0acc 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/index.ts@@ -15,10 +15,15 @@ import {} from "./utils";export function initializePlugin() {+ // Always enable Data Studio access for admins/analysts on enterprise builds+ // This allows them to see upsells even without the data_studio feature token+ // TODO: when moving to OSS move out of plugin+ PLUGIN_DATA_STUDIO.canAccessDataStudio = canAccessDataStudio;+ PLUGIN_DATA_STUDIO.getDataStudioRoutes = getDataStudioRoutes;++ // Only enable full Data Studio functionality when the feature is presentif (hasPremiumFeature("data_studio")) {PLUGIN_DATA_STUDIO.isEnabled = true;- PLUGIN_DATA_STUDIO.canAccessDataStudio = canAccessDataStudio;- PLUGIN_DATA_STUDIO.getDataStudioRoutes = getDataStudioRoutes;PLUGIN_DATA_STUDIO.DataStudioToolbarButton = DataStudioToolbarButton;PLUGIN_DATA_STUDIO.NavbarLibrarySection = NavbarLibrarySection;PLUGIN_DATA_STUDIO.getLibraryCollectionType = getLibraryCollectionType;diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsxindex 6fd4610a32d..d610a175521 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx@@ -14,6 +14,7 @@ import { DataSectionLayout } from "./app/pages/DataSectionLayout";import { DataStudioLayout } from "./app/pages/DataStudioLayout";import { DependenciesSectionLayout } from "./app/pages/DependenciesSectionLayout";import { DependencyDiagnosticsSectionLayout } from "./app/pages/DependencyDiagnosticsSectionLayout";+import { GitSyncSectionLayout } from "./app/pages/GitSyncSectionLayout";import { LibrarySectionLayout } from "./app/pages/LibrarySectionLayout";import { TransformsSectionLayout } from "./app/pages/TransformsSectionLayout";import { getDataStudioMetadataRoutes } from "./data-model/routes";@@ -22,12 +23,14 @@ import { getDataStudioMetricRoutes } from "./metrics/routes";import { getDataStudioSegmentRoutes } from "./segments/routes";import { getDataStudioSnippetRoutes } from "./snippets/routes";import { getDataStudioTableRoutes } from "./tables/routes";+import { DependenciesUpsellPage } from "./upsells";+import { DependencyDiagnosticsUpsellPage } from "./upsells/DependencyDiagnosticsUpsellPage";export function getDataStudioRoutes(store: Store<State>,CanAccessDataStudio: ComponentType,CanAccessDataModel: ComponentType,- CanAccessTransforms: ComponentType,+ _CanAccessTransforms: ComponentType,) {return (<Route component={CanAccessDataStudio}>@@ -42,13 +45,9 @@ export function getDataStudioRoutes({getDataStudioMetadataRoutes()}</Route></Route>- {PLUGIN_TRANSFORMS.isEnabled && (- <Route path="transforms" component={CanAccessTransforms}>- <Route component={TransformsSectionLayout}>- {PLUGIN_TRANSFORMS.getDataStudioTransformRoutes()}- </Route>- </Route>- )}+ <Route path="transforms" component={TransformsSectionLayout}>+ {PLUGIN_TRANSFORMS.getDataStudioTransformRoutes()}+ </Route>{getDataStudioGlossaryRoutes()}<Route path="library"><IndexRoute component={LibrarySectionLayout} />@@ -57,19 +56,27 @@ export function getDataStudioRoutes({getDataStudioSegmentRoutes()}{getDataStudioSnippetRoutes()}</Route>- {PLUGIN_DEPENDENCIES.isEnabled && (+ {PLUGIN_DEPENDENCIES.isEnabled ? (<Route path="dependencies" component={DependenciesSectionLayout}>{PLUGIN_DEPENDENCIES.getDataStudioDependencyRoutes()}</Route>+ ) : (+ <Route path="dependencies" component={DependenciesUpsellPage} />)}- {PLUGIN_DEPENDENCIES.isEnabled && (+ {PLUGIN_DEPENDENCIES.isEnabled ? (<Routepath="dependency-diagnostics"component={DependencyDiagnosticsSectionLayout}>{PLUGIN_DEPENDENCIES.getDataStudioDependencyDiagnosticsRoutes()}</Route>+ ) : (+ <Route+ path="dependency-diagnostics"+ component={DependencyDiagnosticsUpsellPage}+ />)}+ <Route path="git-sync" component={GitSyncSectionLayout} /></Route></Route>);diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/DataStudioUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/DataStudioUpsellPage.tsxnew file mode 100644index 00000000000..622aa5ccbe4--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/DataStudioUpsellPage.tsx@@ -0,0 +1,100 @@+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 {+ trackUpsellClicked,+ trackUpsellViewed,+} from "metabase/admin/upsells/components/analytics";+import { useUpsellLink } from "metabase/admin/upsells/components/use-upsell-link";+import { useStoreUrl } from "metabase/common/hooks";+import { useSelector } from "metabase/lib/redux";+import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";+import { getStoreUsers } from "metabase/selectors/store-users";+import { getIsHosted } from "metabase/setup/selectors";+import { Card, Center, Flex, Stack, Text, Title } from "metabase/ui";++import { DATA_STUDIO_UPGRADE_URL } from "./constants";++export type DataStudioUpsellPageProps = {+ campaign: string;+ location: string;+ title: string;+ description: string;+};++export function DataStudioUpsellPage({+ campaign,+ location,+ title,+ description,+}: DataStudioUpsellPageProps) {+ const { triggerUpsellFlow } = PLUGIN_ADMIN_SETTINGS.useUpsellFlow({+ campaign,+ location,+ });+ const isHosted = useSelector(getIsHosted);+ const { isStoreUser, anyStoreUserEmailAddress } = useSelector(getStoreUsers);++ const genericUpsellUrl = useUpsellLink({+ url: DATA_STUDIO_UPGRADE_URL,+ campaign,+ location,+ });+ const storeManagePlansUrl = useStoreUrl("account/manage/plans");++ useEffect(() => {+ trackUpsellViewed({ location, campaign });+ }, [location, campaign]);++ const shouldShowContactAdmin = isHosted && !isStoreUser;++ const getUpsellUrl = () => {+ if (isHosted && isStoreUser) {+ return storeManagePlansUrl;+ }+ return genericUpsellUrl;+ };++ return (+ <Center h="100%" bg="background-secondary">+ <Card shadow="md" p="xl" maw={500} withBorder>+ <Stack gap="md">+ <Flex align="center" gap="xs">+ <UpsellGem size={16} />+ {/* eslint-disable-next-line metabase/no-literal-metabase-strings -- This string only shows for admins. */}+ <Text c="text-primary">{t`Metabase Pro`}</Text>+ </Flex>+ <Title order={2}>{title}</Title>+ <Text c="text-primary">{description}</Text>+ {shouldShowContactAdmin ? (+ <Text fw="bold" mt="lg">+ {anyStoreUserEmailAddress+ ? // eslint-disable-next-line metabase/no-literal-metabase-strings -- This string only shows for admins.+ t`Please ask a Metabase Store Admin (${anyStoreUserEmailAddress}) to upgrade your plan.`+ : // eslint-disable-next-line metabase/no-literal-metabase-strings -- This string only shows for admins.+ t`Please ask a Metabase Store Admin to upgrade your plan.`}+ </Text>+ ) : (+ <>+ <Text mt="lg">{t`Get a 14 day free trial of this and other pro features`}</Text>+ <Stack align="center" mt="md">+ <UpsellCta+ onClick={triggerUpsellFlow}+ url={getUpsellUrl()}+ internalLink={undefined}+ buttonText={t`Upgrade to Pro`}+ onClickCapture={() =>+ trackUpsellClicked({ location, campaign })+ }+ size="large"+ />+ </Stack>+ </>+ )}+ </Stack>+ </Card>+ </Center>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/DependenciesUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/DependenciesUpsellPage.tsxnew file mode 100644index 00000000000..7468caa83d0--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/DependenciesUpsellPage.tsx@@ -0,0 +1,14 @@+import { t } from "ttag";++import { DataStudioUpsellPage } from "./DataStudioUpsellPage";++export function DependenciesUpsellPage() {+ return (+ <DataStudioUpsellPage+ campaign="data-studio-dependencies"+ location="data-studio-dependencies-page"+ title={t`See how everything connects`}+ description={t`Better manage your data transformation and entity graph by inspecting it visually, understanding relationships and dependencies.`}+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/DependencyDiagnosticsUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/DependencyDiagnosticsUpsellPage.tsxnew file mode 100644index 00000000000..331d826ea0e--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/DependencyDiagnosticsUpsellPage.tsx@@ -0,0 +1,14 @@+import { t } from "ttag";++import { DataStudioUpsellPage } from "./DataStudioUpsellPage";++export function DependencyDiagnosticsUpsellPage() {+ return (+ <DataStudioUpsellPage+ campaign="data-studio-dependency-diagnostics"+ location="data-studio-dependency-diagnostics-page"+ title={t`See how everything connects`}+ description={t`Better manage your data transformation and entity graph by inspecting it visually, understanding relationships and dependencies.`}+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/GitSyncUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/GitSyncUpsellPage.tsxnew file mode 100644index 00000000000..966c895dbdd--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/GitSyncUpsellPage.tsx@@ -0,0 +1,14 @@+import { t } from "ttag";++import { DataStudioUpsellPage } from "./DataStudioUpsellPage";++export function GitSyncUpsellPage() {+ return (+ <DataStudioUpsellPage+ campaign="data-studio-git-sync"+ location="data-studio-git-sync-page"+ title={t`Sync your library with git`}+ description={t`Keep your library in sync with a git repository. Track changes, collaborate with your team, and maintain version history for your datasets and metrics.`}+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/LibraryUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/LibraryUpsellPage.tsxnew file mode 100644index 00000000000..9c601f39139--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/LibraryUpsellPage.tsx@@ -0,0 +1,14 @@+import { t } from "ttag";++import { DataStudioUpsellPage } from "./DataStudioUpsellPage";++export function LibraryUpsellPage() {+ return (+ <DataStudioUpsellPage+ campaign="data-studio-library"+ location="data-studio-library-page"+ title={t`Bring more order to your analytics`}+ description={t`Create a shared library of datasets and metrics your team can rely on, so things stay consistent as your data and downstream content grows.`}+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/PythonTransformsUpsellModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/PythonTransformsUpsellModal.tsxnew file mode 100644index 00000000000..5b075a5ba9f--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/PythonTransformsUpsellModal.tsx@@ -0,0 +1,150 @@+import { useDisclosure } from "@mantine/hooks";+import { useCallback, useEffect } from "react";+import { t } from "ttag";++import { UpsellCta } from "metabase/admin/upsells/components/UpsellCta";+import { UpsellGem } from "metabase/admin/upsells/components/UpsellGem";+import {+ trackUpsellClicked,+ trackUpsellViewed,+} from "metabase/admin/upsells/components/analytics";+import { useUpsellLink } from "metabase/admin/upsells/components/use-upsell-link";+import { UPGRADE_URL } from "metabase/admin/upsells/constants";+import { useSelector } from "metabase/lib/redux";+import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";+import { getStoreUsers } from "metabase/selectors/store-users";+import { getIsHosted } from "metabase/setup/selectors";+import { Button, Flex, Modal, Stack, Text, Title } from "metabase/ui";+import { usePurchaseCloudAddOnMutation } from "metabase-enterprise/api";++import { TransformsSettingUpModal } from "./TransformsSettingUpModal";++const CAMPAIGN = "data-studio-python-transforms";+const LOCATION = "data-studio-transforms";++type PythonTransformsUpsellModalProps = {+ isOpen: boolean;+ onClose: () => void;+};++export function PythonTransformsUpsellModal({+ isOpen,+ onClose,+}: PythonTransformsUpsellModalProps) {+ const isHosted = useSelector(getIsHosted);+ const { isStoreUser, anyStoreUserEmailAddress } = useSelector(getStoreUsers);+ const [settingUpModalOpened, settingUpModalHandlers] = useDisclosure(false);+ const [purchaseCloudAddOn, { isLoading: isPurchasing }] =+ usePurchaseCloudAddOnMutation();++ const { triggerUpsellFlow } = PLUGIN_ADMIN_SETTINGS.useUpsellFlow({+ campaign: CAMPAIGN,+ location: LOCATION,+ });++ const upsellUrl = useUpsellLink({+ url: UPGRADE_URL,+ campaign: CAMPAIGN,+ location: LOCATION,+ });++ useEffect(() => {+ if (isOpen) {+ trackUpsellViewed({ location: LOCATION, campaign: CAMPAIGN });+ }+ }, [isOpen]);++ const handleSelfHostedClick = () => {+ triggerUpsellFlow?.();+ onClose();+ };++ const handleCloudPurchase = useCallback(async () => {+ trackUpsellClicked({ location: LOCATION, campaign: CAMPAIGN });+ settingUpModalHandlers.open();+ onClose();+ try {+ await purchaseCloudAddOn({+ product_type: "python-execution",+ }).unwrap();+ } catch {+ settingUpModalHandlers.close();+ }+ }, [purchaseCloudAddOn, settingUpModalHandlers, onClose]);++ const renderContent = () => {+ if (isHosted && !isStoreUser) {+ return (+ <Text fw="bold">+ {anyStoreUserEmailAddress+ ? // eslint-disable-next-line metabase/no-literal-metabase-strings -- This string only shows for admins.+ t`Please ask a Metabase Store Admin (${anyStoreUserEmailAddress}) to enable this for you.`+ : // eslint-disable-next-line metabase/no-literal-metabase-strings -- This string only shows for admins.+ t`Please ask a Metabase Store Admin to enable this for you.`}+ </Text>+ );+ }++ if (isHosted && isStoreUser) {+ return (+ <Flex justify="flex-end">+ <Button+ variant="filled"+ size="md"+ onClick={handleCloudPurchase}+ loading={isPurchasing}+ >+ {t`Get Python transforms`}+ </Button>+ </Flex>+ );+ }++ return (+ <Flex justify="flex-end">+ <UpsellCta+ onClick={handleSelfHostedClick}+ url={upsellUrl}+ internalLink={undefined}+ buttonText={t`Get Python transforms`}+ onClickCapture={() =>+ trackUpsellClicked({ location: LOCATION, campaign: CAMPAIGN })+ }+ size="large"+ />+ </Flex>+ );+ };++ return (+ <>+ <Modal.Root opened={isOpen} onClose={onClose} size="md">+ <Modal.Overlay />+ <Modal.Content>+ <Modal.Header p="xl" pb="md">+ <Flex align="center" gap="sm">+ <UpsellGem size={24} />+ <Title order={3}>{t`Unlock Python transforms`}</Title>+ </Flex>+ <Modal.CloseButton />+ </Modal.Header>+ <Modal.Body px="xl" pb="xl">+ <Stack gap="lg">+ <Text>{t`Write powerful data transformations using Python. Access pandas, numpy, and other libraries to clean, reshape, and enrich your data. Available as an add-on for your plan.`}</Text>+ {renderContent()}+ </Stack>+ </Modal.Body>+ </Modal.Content>+ </Modal.Root>++ <TransformsSettingUpModal+ opened={settingUpModalOpened}+ onClose={() => {+ settingUpModalHandlers.close();+ window.location.reload();+ }}+ isPython+ />+ </>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/TransformsPurchasePage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/TransformsPurchasePage.tsxnew file mode 100644index 00000000000..74fdc2a63c8--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/TransformsPurchasePage.tsx@@ -0,0 +1,176 @@+import { useDisclosure } from "@mantine/hooks";+import { useCallback, useState } from "react";+import { t } from "ttag";++import { UpsellGem } from "metabase/admin/upsells/components/UpsellGem";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import {+ Box,+ Button,+ Card,+ Center,+ Divider,+ Flex,+ Group,+ Radio,+ Stack,+ Text,+ Title,+} from "metabase/ui";+import { usePurchaseCloudAddOnMutation } from "metabase-enterprise/api";++import { TransformsSettingUpModal } from "./TransformsSettingUpModal";+import { useTransformsBilling } from "./useTransformsBilling";++type TransformTier = "basic" | "advanced";++export function TransformsPurchasePage() {+ const [selectedTier, setSelectedTier] = useState<TransformTier>("basic");+ const [settingUpModalOpened, settingUpModalHandlers] = useDisclosure(false);+ const [purchaseCloudAddOn, { isLoading: isPurchasing }] =+ usePurchaseCloudAddOnMutation();++ const {+ isLoading,+ error,+ billingPeriodMonths,+ transformsProduct,+ pythonProduct,+ } = useTransformsBilling();++ const hasData = billingPeriodMonths !== undefined && transformsProduct;+ const billingPeriod = billingPeriodMonths === 1 ? t`mo` : t`yr`;++ const handlePurchase = useCallback(async () => {+ const productType =+ selectedTier === "basic" ? "transforms" : "python-execution";+ settingUpModalHandlers.open();+ try {+ await purchaseCloudAddOn({+ product_type: productType,+ }).unwrap();+ } catch {+ settingUpModalHandlers.close();+ }+ }, [selectedTier, purchaseCloudAddOn, settingUpModalHandlers]);++ if (error || !hasData || isLoading) {+ return (+ <Center h="100%" bg="background-secondary">+ <LoadingAndErrorWrapper+ loading={isLoading}+ error={+ !isLoading && (error || !hasData)+ ? t`Error fetching information about available add-ons.`+ : null+ }+ />+ </Center>+ );+ }++ const transformsPrice = transformsProduct?.default_base_fee ?? 0;+ const pythonPrice = pythonProduct?.default_base_fee ?? 0;++ return (+ <Center h="100%" bg="background-secondary">+ <Card shadow="md" p="xl" maw={600} withBorder>+ <Stack gap="lg">+ <Flex align="center" gap="xs">+ <UpsellGem size={16} />+ <Text c="text-primary">{t`Add transforms`}</Text>+ </Flex>++ {/* eslint-disable-next-line metabase/no-literal-metabase-strings -- This string only shows for admins. */}+ <Title order={2}>{t`Tidy up your data right from Metabase`}</Title>++ <Radio.Group+ value={selectedTier}+ onChange={(value) => setSelectedTier(value as TransformTier)}+ >+ <Card withBorder p={0}>+ <Radio.Card+ value="basic"+ bg={selectedTier === "basic" ? "brand-light" : undefined}+ p="md"+ radius={0}+ >+ <Group wrap="nowrap" align="flex-start" gap="sm">+ <Flex h="1.55rem" align="center">+ <Radio.Indicator />+ </Flex>+ <Flex+ align="flex-start"+ direction={{ base: "column", sm: "row" }}+ justify="space-between"+ flex={1}+ >+ <Box>+ <Text fw="bold" lh="1.55">{t`Transforms`}</Text>+ <Text size="sm" c="text-secondary">+ {t`10k transforms. Buy more as you go.`}+ </Text>+ </Box>+ <Text fw="bold" ta={{ base: "left", sm: "right" }}>+ {`$${transformsPrice}`}+ </Text>+ </Flex>+ </Group>+ </Radio.Card>++ <Divider />++ <Radio.Card+ value="advanced"+ bg={selectedTier === "advanced" ? "brand-light" : undefined}+ p="md"+ radius={0}+ >+ <Group wrap="nowrap" align="flex-start" gap="sm">+ <Flex h="1.55rem" align="center">+ <Radio.Indicator />+ </Flex>+ <Flex+ align="flex-start"+ direction={{ base: "column", sm: "row" }}+ justify="space-between"+ flex={1}+ >+ <Box>+ <Text fw="bold" lh="1.55">{t`Advanced transforms`}</Text>+ <Text size="sm" c="text-secondary">+ {t`Get access to python based transforms.`}+ </Text>+ </Box>+ <Text fw="bold" ta={{ base: "left", sm: "right" }}>+ {t`$${pythonPrice}/${billingPeriod} + transform cost`}+ </Text>+ </Flex>+ </Group>+ </Radio.Card>+ </Card>+ </Radio.Group>++ <Button+ variant="filled"+ size="md"+ onClick={handlePurchase}+ loading={isPurchasing}+ fullWidth+ >+ {t`Add on transforms`}+ </Button>+ </Stack>+ </Card>++ <TransformsSettingUpModal+ opened={settingUpModalOpened}+ onClose={() => {+ settingUpModalHandlers.close();+ window.location.reload();+ }}+ isPython={selectedTier === "advanced"}+ />+ </Center>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/TransformsSettingUpModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/TransformsSettingUpModal.tsxnew file mode 100644index 00000000000..eb85bd8d17f--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/TransformsSettingUpModal.tsx@@ -0,0 +1,112 @@+import { t } from "ttag";++import { useTokenRefreshUntil } from "metabase/api/utils";+import {+ Box,+ Button,+ Flex,+ Icon,+ Loader,+ Modal,+ type ModalProps,+ Stack,+ Text,+ Title,+} from "metabase/ui";+import { hasPremiumFeature } from "metabase-enterprise/settings";++interface TransformsSettingUpModalProps+ extends Pick<ModalProps, "opened" | "onClose"> {+ isPython?: boolean;+}++export const TransformsSettingUpModal = ({+ onClose,+ opened,+ isPython = false,+}: TransformsSettingUpModalProps) => {+ const featureToCheck = isPython ? "transforms-python" : "transforms";+ useTokenRefreshUntil(featureToCheck, { intervalMs: 1000, skip: !opened });+ const isSettingUp = !hasPremiumFeature(featureToCheck);++ return (+ <Modal+ opened={opened}+ onClose={onClose}+ closeOnClickOutside={false}+ closeOnEscape={false}+ withCloseButton={false}+ size="30rem"+ padding="2.5rem"+ mah="80%"+ >+ <Stack align="center" gap="lg" my="4.5rem">+ <Box h={96} pos="relative" w={96}>+ <Flex+ align="center"+ justify="center"+ h="100%"+ w="100%"+ bg="background-secondary"+ style={{ borderRadius: "50%" }}+ >+ <Icon name="table2" size={48} c="brand" />+ </Flex>++ {isSettingUp && (+ <Flex+ bottom={0}+ align="center"+ direction="row"+ gap={0}+ justify="center"+ pos="absolute"+ right={0}+ wrap="nowrap"+ bg="white"+ fz={0}+ p="sm"+ ta="center"+ style={{+ borderRadius: "100%",+ boxShadow: `0 1px 6px 0 var(--mb-color-shadow)`,+ }}+ >+ <Loader size="xs" ml={1} mt={1} />+ </Flex>+ )}+ </Box>++ {isSettingUp ? (+ <Box ta="center">+ <Title c="text-primary" fz="lg">+ {isPython+ ? t`Setting up Python transforms, please wait`+ : t`Setting up transforms, please wait`}+ </Title>+ <Text c="text-secondary" fz="md" lh={1.43}>+ {t`This will take just a minute or so`}+ </Text>+ </Box>+ ) : (+ <>+ <Box ta="center">+ <Title c="text-primary" fz="lg">+ {isPython+ ? t`Python transforms are ready`+ : t`Transforms are ready`}+ </Title>+ <Text c="text-secondary" fz="md" lh={1.43}>+ {t`Happy transforming!`}+ </Text>+ </Box>++ <Button variant="filled" size="md" onClick={onClose}>+ {t`Done`}+ </Button>+ </>+ )}+ </Stack>+ </Modal>+ );+};diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/TransformsUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/TransformsUpsellPage.tsxnew file mode 100644index 00000000000..97ca89557f0--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/TransformsUpsellPage.tsx@@ -0,0 +1,26 @@+import { t } from "ttag";++import { useSelector } from "metabase/lib/redux";+import { getStoreUsers } from "metabase/selectors/store-users";++import { DataStudioUpsellPage } from "./DataStudioUpsellPage";+import { TransformsPurchasePage } from "./TransformsPurchasePage";++export function TransformsUpsellPage() {+ const { isStoreUser } = useSelector(getStoreUsers);++ if (isStoreUser) {+ return <TransformsPurchasePage />;+ }++ return (+ <DataStudioUpsellPage+ campaign="data-studio-transforms"+ location="data-studio-transforms-page"+ // eslint-disable-next-line metabase/no-literal-metabase-strings -- This string only shows for admins.+ title={t`Tidy up your data right from Metabase`}+ // eslint-disable-next-line metabase/no-literal-metabase-strings -- This string only shows for admins.+ description={t`Transform your data directly in Metabase with powerful data manipulation tools. Reshape tables, clean data, and aggregate without writing SQL.`}+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/constants.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/constants.tsnew file mode 100644index 00000000000..0415f346af0--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/constants.ts@@ -0,0 +1,3 @@+import { UPGRADE_URL } from "metabase/admin/upsells/constants";++export const DATA_STUDIO_UPGRADE_URL = `${UPGRADE_URL}/data-studio`;diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/index.tsnew file mode 100644index 00000000000..7fad9f2cc73--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/index.ts@@ -0,0 +1,10 @@+export { DataStudioUpsellPage } from "./DataStudioUpsellPage";+export type { DataStudioUpsellPageProps } from "./DataStudioUpsellPage";+export { DependenciesUpsellPage } from "./DependenciesUpsellPage";+export { GitSyncUpsellPage } from "./GitSyncUpsellPage";+export { LibraryUpsellPage } from "./LibraryUpsellPage";+export { PythonTransformsUpsellModal } from "./PythonTransformsUpsellModal";+export { TransformsPurchasePage } from "./TransformsPurchasePage";+export { TransformsSettingUpModal } from "./TransformsSettingUpModal";+export { TransformsUpsellPage } from "./TransformsUpsellPage";+export { useTransformsBilling } from "./useTransformsBilling";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/useTransformsBilling.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/useTransformsBilling.tsnew file mode 100644index 00000000000..384cf95f605--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/useTransformsBilling.ts@@ -0,0 +1,64 @@+import {+ useGetBillingInfoQuery,+ useListAddOnsQuery,+} from "metabase-enterprise/api";+import type { ICloudAddOnProduct } from "metabase-types/api";++const TRANSFORMS_PRODUCT_TYPES = ["transforms"] as const;++export function useTransformsBilling(): {+ error: unknown;+ isLoading: boolean;+ billingPeriodMonths: number | undefined;+ transformsProduct: ICloudAddOnProduct | undefined;+ pythonProduct: ICloudAddOnProduct | undefined;+ hadTransforms: boolean;+} {+ const {+ data: addOns,+ error: addOnsError,+ isLoading: addOnsLoading,+ } = useListAddOnsQuery();++ const {+ data: billingInfo,+ error: billingInfoError,+ isLoading: billingInfoLoading,+ } = useGetBillingInfoQuery();++ const billingPeriodMonths =+ billingInfo?.data?.billing_period_months ?? undefined;++ const hadTransforms =+ billingInfo?.data?.previous_add_ons?.some(+ ({ product_type, self_service }) =>+ TRANSFORMS_PRODUCT_TYPES.includes(+ product_type as (typeof TRANSFORMS_PRODUCT_TYPES)[number],+ ) && self_service,+ ) ?? false;++ const transformsProduct = addOns?.find(+ ({ active, billing_period_months, product_type, self_service }) =>+ active &&+ self_service &&+ billing_period_months === billingPeriodMonths &&+ product_type === "transforms",+ );++ const pythonProduct = addOns?.find(+ ({ active, billing_period_months, product_type, self_service }) =>+ active &&+ self_service &&+ billing_period_months === billingPeriodMonths &&+ product_type === "python-execution",+ );++ return {+ error: addOnsError || billingInfoError,+ isLoading: addOnsLoading || billingInfoLoading,+ billingPeriodMonths,+ transformsProduct,+ pythonProduct,+ hadTransforms,+ };+}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.tsxindex 89f19ef3276..5bf637d7945 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx@@ -2,12 +2,14 @@ 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/QuestionPicker";+import { useHasTokenFeature } from "metabase/common/hooks";import { useDispatch } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";-import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import { Button, Center, Icon, Loader, Menu, Tooltip } from "metabase/ui";+import { PythonTransformsUpsellModal } from "metabase-enterprise/data-studio/upsells";import { trackTransformCreate } from "../../analytics";import { CreateTransformCollectionModal } from "../CreateTransformCollectionModal";@@ -22,11 +24,26 @@ export const CreateTransformMenu = () => {isCollectionModalOpened,{ open: openCollectionModal, close: closeCollectionModal },] = useDisclosure();+ const [+ isPythonUpsellOpened,+ { open: openPythonUpsell, close: closePythonUpsell },+ ] = useDisclosure();++ const hasPythonTransformsFeature = useHasTokenFeature("transforms-python");const { data: databases, isLoading } = useListDatabasesQuery({include_analytics: true,});+ const handlePythonClick = () => {+ if (hasPythonTransformsFeature) {+ trackTransformCreate({ creationType: "python" });+ dispatch(push(Urls.newPythonTransform()));+ } else {+ openPythonUpsell();+ }+ };+return (<><Menu position="bottom-end">@@ -64,17 +81,15 @@ export const CreateTransformMenu = () => {>{t`SQL query`}</Menu.Item>- {PLUGIN_TRANSFORMS_PYTHON.isEnabled && (- <Menu.Item- leftSection={<Icon name="code_block" />}- onClick={() => {- trackTransformCreate({ creationType: "python" });- dispatch(push(Urls.newPythonTransform()));- }}- >- {t`Python script`}- </Menu.Item>- )}+ <Menu.Item+ leftSection={<Icon name="code_block" />}+ rightSection={+ !hasPythonTransformsFeature ? <UpsellGem size={14} /> : null+ }+ onClick={handlePythonClick}+ >+ {t`Python script`}+ </Menu.Item><Menu.ItemleftSection={<Icon name="insight" />}onClick={() => {@@ -114,6 +129,11 @@ export const CreateTransformMenu = () => {{isCollectionModalOpened && (<CreateTransformCollectionModal onClose={closeCollectionModal} />)}++ <PythonTransformsUpsellModal+ isOpen={isPythonUpsellOpened}+ onClose={closePythonUpsell}+ /></>);};diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/index.tsxindex 843eba53c03..198789c53d4 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/index.tsx@@ -8,10 +8,17 @@ import { TransformPicker } from "./components/TransformPicker";import { getDataStudioTransformRoutes } from "./routes";/**- * Initialize transforms plugin features that depend on hasPremiumFeature.+ * Initialize transforms plugin features.+ * Transforms are available:+ * - On self-hosted: always (no license required)+ * - On hosted: only with transforms add-on*/export function initializePlugin() {- if (hasPremiumFeature("transforms")) {+ const isHosted = hasPremiumFeature("hosting");+ const hasTransformsFeature = hasPremiumFeature("transforms");+ const shouldEnable = !isHosted || hasTransformsFeature;++ if (shouldEnable) {PLUGIN_TRANSFORMS.isEnabled = true;PLUGIN_ENTITIES.entities["transforms"] = Transforms;PLUGIN_TRANSFORMS.canAccessTransforms = getUserIsAdmin;diff --git a/frontend/src/metabase-types/api/cloud-add-ons.ts b/frontend/src/metabase-types/api/cloud-add-ons.tsindex 19b887975e5..317aad5525b 100644--- a/frontend/src/metabase-types/api/cloud-add-ons.ts+++ b/frontend/src/metabase-types/api/cloud-add-ons.ts@@ -1,5 +1,9 @@export interface PurchaseCloudAddOnRequest {- product_type: "metabase-ai" | "metabase-ai-tiered" | "python-execution";+ product_type:+ | "metabase-ai"+ | "metabase-ai-tiered"+ | "python-execution"+ | "transforms";quantity?: number;- terms_of_service: boolean;+ terms_of_service?: boolean;}diff --git a/frontend/src/metabase-types/api/settings.ts b/frontend/src/metabase-types/api/settings.tsindex 61879c3f19a..fa7eeca976c 100644--- a/frontend/src/metabase-types/api/settings.ts+++ b/frontend/src/metabase-types/api/settings.ts@@ -274,6 +274,8 @@ const tokenStatusFeatures = ["sso-ldap","sso-saml","sso",+ "transforms",+ "transforms-python","upload-management","whitelabel",] as const;diff --git a/frontend/src/metabase/lib/urls/data-studio.ts b/frontend/src/metabase/lib/urls/data-studio.tsindex 45ad7fac448..20e1fdc422e 100644--- a/frontend/src/metabase/lib/urls/data-studio.ts+++ b/frontend/src/metabase/lib/urls/data-studio.ts@@ -289,6 +289,10 @@ export function dataStudioGlossary() {return `${dataStudio()}/glossary`;}+export function dataStudioGitSync() {+ return `${dataStudio()}/git-sync`;+}+export function dataStudioSnippet(snippetId: NativeQuerySnippetId) {return `${dataStudioLibrary()}/snippets/${snippetId}`;}