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
GRO-281 Enable transforms screen (#71658)
Brad Andersonc0ee242e191b
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/CloudPurchaseContent.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.tsxsimilarity index 51%rename from enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/CloudPurchaseContent.tsxrename to enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.tsxindex 93f1b386d6e..672d5169a3a 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/CloudPurchaseContent.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.tsx@@ -3,30 +3,31 @@ import { useCallback } from "react";import { t } from "ttag";import { trackUpsellClicked } from "metabase/common/components/upsells/components/analytics";-import type { BillingPeriod } from "metabase/data-studio/upsells/types";import { useMetadataToasts } from "metabase/metadata/hooks";-import { Button, Card, Divider, Flex, Group, Stack, Text } from "metabase/ui";+import { Button, Stack, Text } from "metabase/ui";+import { formatNumber } from "metabase/utils/formatting";import * as Urls from "metabase/utils/urls";import { usePurchaseCloudAddOnMutation } from "metabase-enterprise/api";import { TransformsSettingUpModal } from "metabase-enterprise/transforms/upsells/components/TransformsSettingUpModal";+import type { ICloudAddOnProduct } from "metabase-types/api/store";-const CAMPAIGN = "data-studio-python-transforms";-const LOCATION = "data-studio-transforms";+import { CAMPAIGN, LOCATION } from "./constants";-type CloudPurchaseContentProps = {- billingPeriod: BillingPeriod;+type PurchaseAdvancedTransformsProps = {handleModalClose: VoidFunction;- isTrialFlow: boolean;- pythonPrice: number;+ addOn: ICloudAddOnProduct;+ freeUnitsIncluded: boolean;};-export const CloudPurchaseContent = (props: CloudPurchaseContentProps) => {- const { billingPeriod, handleModalClose, isTrialFlow, pythonPrice } = props;+export const PurchaseAdvancedTransforms = ({+ handleModalClose,+ addOn,+ freeUnitsIncluded,+}: PurchaseAdvancedTransformsProps) => {const [purchaseCloudAddOn, { isLoading: isPurchasing }] =usePurchaseCloudAddOnMutation();const [settingUpModalOpened, settingUpModalHandlers] = useDisclosure(false);const { sendErrorToast } = useMetadataToasts();- const dueToday = isTrialFlow ? 0 : pythonPrice;const handleCloudPurchase = useCallback(async () => {trackUpsellClicked({ location: LOCATION, campaign: CAMPAIGN });@@ -34,7 +35,7 @@ export const CloudPurchaseContent = (props: CloudPurchaseContentProps) => {settingUpModalHandlers.open();try {await purchaseCloudAddOn({- product_type: "transforms-advanced",+ product_type: "transforms-advanced-metered",}).unwrap();window.location.href = Urls.transformList(); // On success, do a full-page redirect to transforms list} catch {@@ -51,36 +52,45 @@ export const CloudPurchaseContent = (props: CloudPurchaseContentProps) => {sendErrorToast,settingUpModalHandlers,]);- const billingPeriodLabel = billingPeriod === "monthly" ? t`month` : t`year`;++ const freeUnitsStr =+ addOn.free_units != null &&+ freeUnitsIncluded &&+ formatNumber(addOn.free_units, {+ compact: true,+ maximumFractionDigits: addOn.free_units % 1000 ? undefined : 0,+ });+ const perRunStr =+ addOn.default_price_per_unit != null &&+ `${addOn.default_price_per_unit * 100}¢`;return (<><Stack gap="lg">- <Card withBorder p="md" radius="md">- <Flex direction="column" style={{ flex: 1 }}>- <Group justify="space-between" align="flex-start">- <Text fw="bold">{t`SQL + Python`}</Text>- <Text fw="bold">{`$${pythonPrice} / ${billingPeriodLabel}`}</Text>- </Group>- <Text size="sm" c="text-secondary" mt="sm">- {t`Run Python-based transforms alongside SQL to handle more complex logic and data workflows.`}+ {perRunStr &&+ (freeUnitsStr ? (+ <Text fw="bold" lh="sm">+ {t`${freeUnitsStr} advanced transforms included, then ${perRunStr} per transform run.`}+ </Text>+ ) : (+ <Text fw="bold" lh="sm">+ {t`You'll be charged ${perRunStr} per transform run.`}</Text>- </Flex>- </Card>- <Divider />- <Group justify="space-between" mb="sm">- <Text c="text-secondary">{t`Due today:`}</Text>- <Text fw="bold">{`$${dueToday}`}</Text>- </Group>- <Button- variant="filled"- size="md"- onClick={handleCloudPurchase}- loading={isPurchasing}- fullWidth- >- {isTrialFlow ? t`Add to trial` : t`Confirm purchase`}- </Button>+ ))}+ <div>+ <Button+ variant="filled"+ size="md"+ onClick={handleCloudPurchase}+ loading={isPurchasing}+ px="3rem"+ >+ {t`Upgrade`}+ </Button>+ </div>+ <Text fz="sm" c="text-secondary" lh="md">+ {t`By clicking upgrade, you agree to be charged in accordance with our terms of service.`}+ </Text></Stack><TransformsSettingUpModalopened={settingUpModalOpened}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/CloudPurchaseContent.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.unit.spec.tsxsimilarity index 60%rename from enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/CloudPurchaseContent.unit.spec.tsxrename to enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.unit.spec.tsxindex 919ec8343a5..5d3cda9be6c 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/CloudPurchaseContent.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.unit.spec.tsx@@ -11,16 +11,11 @@ import {createMockSettings,createMockTokenFeatures,} from "metabase-types/api/mocks";+import { mockAdvancedTransformsAddOn } from "metabase-types/api/mocks/add-ons";-import { CloudPurchaseContent } from "./CloudPurchaseContent";+import { PurchaseAdvancedTransforms } from "./PurchaseAdvancedTransforms";-const setup = ({- isTrialFlow,- pythonPrice = 250,-}: {- isTrialFlow: boolean;- pythonPrice?: number;-}) => {+const setup = () => {const handleModalClose = jest.fn();const settings = createMockSettings({@@ -39,11 +34,10 @@ const setup = ({setupPropertiesEndpoints(settings);renderWithProviders(- <CloudPurchaseContent- billingPeriod="yearly"+ <PurchaseAdvancedTransformshandleModalClose={handleModalClose}- isTrialFlow={isTrialFlow}- pythonPrice={pythonPrice}+ addOn={mockAdvancedTransformsAddOn}+ freeUnitsIncluded/>,{storeInitialState: state,@@ -53,24 +47,11 @@ const setup = ({return { handleModalClose };};-describe("CloudPurchaseContent", () => {+describe("PurchaseAdvancedTransforms", () => {afterEach(() => {jest.restoreAllMocks();});- it("shows due today as $0 in trial flow", () => {- setup({- isTrialFlow: true,- pythonPrice: 250,- });-- expect(screen.getByText("Due today:")).toBeInTheDocument();- expect(screen.getByText("$0")).toBeInTheDocument();- expect(- screen.getByRole("button", { name: "Add to trial" }),- ).toBeInTheDocument();- });-it("shows setting up modal while purchase is in progress", async () => {let resolveRequest!: (value: unknown) => void;const pendingResponse = new Promise((resolve) => {@@ -78,18 +59,13 @@ describe("CloudPurchaseContent", () => {});fetchMock.post(- "path:/api/ee/cloud-add-ons/transforms-advanced",+ "path:/api/ee/cloud-add-ons/transforms-advanced-metered",pendingResponse,);- setup({- isTrialFlow: false,- pythonPrice: 250,- });+ setup();- await userEvent.click(- screen.getByRole("button", { name: "Confirm purchase" }),- );+ await userEvent.click(screen.getByRole("button", { name: "Upgrade" }));// While the request is in-flight, the setting up modal should be visibleexpect(@@ -103,16 +79,14 @@ describe("CloudPurchaseContent", () => {});it("calls the API and closes parent modal on successful purchase", async () => {- fetchMock.post("path:/api/ee/cloud-add-ons/transforms-advanced", 200);+ fetchMock.post(+ "path:/api/ee/cloud-add-ons/transforms-advanced-metered",+ 200,+ );- const { handleModalClose } = setup({- isTrialFlow: false,- pythonPrice: 250,- });+ const { handleModalClose } = setup();- await userEvent.click(- screen.getByRole("button", { name: "Confirm purchase" }),- );+ await userEvent.click(screen.getByRole("button", { name: "Upgrade" }));await waitFor(() => {expect(@@ -120,8 +94,9 @@ describe("CloudPurchaseContent", () => {.calls().some((call) =>- call.url.endsWith("/api/ee/cloud-add-ons/transforms-advanced") &&- call.options.method === "POST",+ call.url.endsWith(+ "/api/ee/cloud-add-ons/transforms-advanced-metered",+ ) && call.options.method === "POST",),).toBe(true);});@@ -133,16 +108,14 @@ describe("CloudPurchaseContent", () => {});it("closes setting up modal and parent modal on error", async () => {- fetchMock.post("path:/api/ee/cloud-add-ons/transforms-advanced", 500);+ fetchMock.post(+ "path:/api/ee/cloud-add-ons/transforms-advanced-metered",+ 500,+ );- const { handleModalClose } = setup({- isTrialFlow: false,- pythonPrice: 250,- });+ const { handleModalClose } = setup();- await userEvent.click(- screen.getByRole("button", { name: "Confirm purchase" }),- );+ await userEvent.click(screen.getByRole("button", { name: "Upgrade" }));// After error, finally block closes the parent modalawait waitFor(() => {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 e038fb2eba4..d938f99c8fe 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@@ -10,7 +10,6 @@ import { getIsHosted } from "metabase/setup/selectors";import {Button,Center,- Divider,Flex,Icon,Modal,@@ -20,7 +19,7 @@ import {} from "metabase/ui";import { useTransformsBilling } from "metabase-enterprise/transforms/upsells/hooks";-import { CloudPurchaseContent } from "./CloudPurchaseContent";+import { PurchaseAdvancedTransforms } from "./PurchaseAdvancedTransforms";import { CAMPAIGN, LOCATION } from "./constants";type PythonTransformsUpsellModalProps = {@@ -32,7 +31,7 @@ export function PythonTransformsUpsellModal({}: PythonTransformsUpsellModalProps) {const bulletPoints = [t`Use Python to handle complex logic that's awkward or brittle in SQL`,- t`Reuse shared Python logic instead of copying SQL patterns`,+ t`Use the transform inspector to inspect the output of transforms to verify your logic`,t`Unblock advanced use cases without pushing work into another tool`,t`Put pandas to work for data analysis and manipulation`,];@@ -40,119 +39,111 @@ export function PythonTransformsUpsellModal({const isHosted = useSelector(getIsHosted);const { isStoreUser, anyStoreUserEmailAddress } = useSelector(getStoreUsers);- const {- isLoading,- error,- billingPeriodMonths,- advancedTransformsAddOn,- isOnTrial,- } = useTransformsBilling();+ const { isLoading, error, advancedTransformsAddOn, hadAdvancedTransforms } =+ useTransformsBilling();useEffect(() => {trackUpsellViewed({ location: LOCATION, campaign: CAMPAIGN });}, []);- const canUserPurchase =- isStoreUser && (!!advancedTransformsAddOn || !isHosted);- const shouldShowRightColumn = canUserPurchase && isHosted;+ const shouldShowLeftColumn = isStoreUser && isHosted;return (<Modal.RootonClose={onClose}opened- size={shouldShowRightColumn ? "xl" : "md"}+ size={shouldShowLeftColumn ? "xl" : "md"}><Modal.Overlay /><Modal.Content><Modal.Body p={0}>- <Flex>- {/* Left Column - Info */}- <Stack p="3rem" flex={1} gap="md">- <Title order={3}>- {t`Go beyond SQL with advanced transforms`}- </Title>- <Text c="text-secondary" lh="lg">- {t`Run Python-based transforms alongside SQL to handle more complex logic and data workflows.`}- </Text>- <Stack gap="md" pb="md" pt="sm">- {bulletPoints.map((point) => (- <Flex direction="row" gap="sm" key={point}>- <Center w={24} h={24} flex="0 0 auto">- <Icon name="check_filled" size={16} c="text-brand" />- </Center>- <Text c="text-secondary" lh="lg">- {point}- </Text>- </Flex>- ))}- </Stack>- {!canUserPurchase && (- <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>- )}- {canUserPurchase && !isHosted && <SelfHostedStorePurchaseLink />}- </Stack>- {shouldShowRightColumn && (- <>- <Divider orientation="vertical" />- <Stack bg="background-secondary" flex={1} gap="lg" p="xl">+ {isLoading || error ? (+ <Center py="xl">+ <LoadingAndErrorWrapper+ loading={isLoading}+ error={+ error+ ? t`Error fetching information about available add-ons.`+ : undefined+ }+ />+ </Center>+ ) : (+ <Flex>+ {shouldShowLeftColumn && (+ <Stack flex="0 0 56%" gap="lg" p="3rem"><Title order={3}>- {getRightColumnTitle(- isHosted && advancedTransformsAddOn?.trial_days- ? advancedTransformsAddOn?.trial_days- : 0,- )}+ {t`Go beyond SQL with advanced transforms`}</Title>- {error || isLoading ? (- <Center py="xl">- <LoadingAndErrorWrapper- loading={isLoading}- error={- error- ? t`Error fetching information about available add-ons.`- : undefined- }- />- </Center>+ <Text c="text-secondary" lh="lg">+ {t`Run Python-based transforms alongside SQL to handle more complex logic and data workflows.`}{" "}+ {t`Use the transform inspector to verify output output to verify it.`}+ </Text>+ {!advancedTransformsAddOn ? (+ <Text>+ {t`Error fetching information about available add-ons.`}+ </Text>) : (- <CloudPurchaseContent- billingPeriod={- billingPeriodMonths === 1 ? "monthly" : "yearly"- }+ <PurchaseAdvancedTransformshandleModalClose={onClose}- isTrialFlow={isOnTrial}- pythonPrice={- advancedTransformsAddOn?.default_base_fee ?? 0- }+ addOn={advancedTransformsAddOn}+ freeUnitsIncluded={!hadAdvancedTransforms}/>)}</Stack>- </>- )}- </Flex>+ )}+ {/* Right Column - Info */}+ <Stack+ p={shouldShowLeftColumn ? "3rem 1.5rem" : "3rem"}+ flex={1}+ gap="md"+ bg={shouldShowLeftColumn ? "background-secondary" : undefined}+ >+ {!shouldShowLeftColumn && (+ <>+ <Title order={3}>+ {t`Go beyond SQL with advanced transforms`}+ </Title>+ <Text c="text-secondary" lh="lg" mb="sm">+ {t`Run Python-based transforms alongside SQL to handle more complex logic and data workflows.`}+ </Text>+ </>+ )}+ <Stack gap="md" mb="sm">+ {bulletPoints.map((point) => (+ <Flex direction="row" gap="sm" key={point}>+ <Center w={24} h={24} flex="0 0 auto">+ <Icon name="check_filled" size={16} c="brand" />+ </Center>+ <Text c="text-secondary" lh="lg">+ {point}+ </Text>+ </Flex>+ ))}+ </Stack>+ {!isStoreUser && (+ <Text fw="bold" lh="md">+ {anyStoreUserEmailAddress+ ? t`Please ask a Store Admin (${anyStoreUserEmailAddress}) to enable this for you.`+ : t`Please ask a Store Admin to enable this for you.`}+ </Text>+ )}+ {isStoreUser && !isHosted && <SelfHostedStorePurchaseLink />}+ </Stack>+ </Flex>+ )}</Modal.Body></Modal.Content></Modal.Root>);}-function getRightColumnTitle(availableTrialDays: number) {- return availableTrialDays > 0- ? t`Start a free ${availableTrialDays}-day trial of Python transforms`- : t`Add advanced transforms to your plan`;-}-function SelfHostedStorePurchaseLink() {const storeUrl = useStoreUrl("account/transforms");return (<Button component="a" href={storeUrl} variant="primary">- {t`Go to your store account to purchase`}+ {t`Go to your store account to upgrade`}</Button>);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/tests/enterprise.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/tests/enterprise.unit.spec.tsxindex 18584535bd5..1f70caf235e 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/tests/enterprise.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/tests/enterprise.unit.spec.tsx@@ -1,10 +1,17 @@-import { screen } from "__support__/ui";+import { screen, waitFor } from "__support__/ui";import { setup } from "./setup";+async function waitForLoadingToFinish() {+ await waitFor(() => {+ expect(screen.queryByText("Loading...")).not.toBeInTheDocument();+ });+}+describe("PythonTransformsUpsellModal", () => {- it("renders single-column layout with admin message when hosted and user is not a store user", () => {+ it("renders single-column layout with admin message when hosted and user is not a store user", async () => {setup({ isHosted: true, isStoreUser: false, isEnterprise: true });+ await waitForLoadingToFinish();expect(screen.getByRole("heading", {@@ -13,31 +20,24 @@ describe("PythonTransformsUpsellModal", () => {).toBeInTheDocument();expect(- screen.getByText(- /Please ask a Metabase Store Admin to enable this for you/,- ),+ screen.getByText(/Please ask a Store Admin to enable this for you/),).toBeInTheDocument();expect(- screen.queryByRole("heading", {- name: /Add advanced transforms to your plan/,- }),+ screen.queryByRole("button", { name: /Upgrade/ }),).not.toBeInTheDocument();});it("shows cloud purchase content when hosted and user is store user", async () => {setup({ isHosted: true, isStoreUser: true, isEnterprise: true });+ await waitForLoadingToFinish();expect(- await screen.findByRole("heading", {- name: /Add advanced transforms to your plan/,- }),- ).toBeInTheDocument();-- expect(await screen.findByText(/SQL \+ Python/)).toBeInTheDocument();- expect(- await screen.findByRole("button", { name: /Confirm purchase/ }),+ screen.getByText(+ "1k advanced transforms included, then 2¢ per transform run.",+ ),).toBeInTheDocument();+ expect(screen.getByRole("button", { name: /Upgrade/ })).toBeInTheDocument();});it("shows upsell store link when instance is self-hosted", async () => {@@ -46,9 +46,10 @@ describe("PythonTransformsUpsellModal", () => {isStoreUser: true,isEnterprise: true,});+ await waitForLoadingToFinish();const link = await screen.findByRole("link", {- name: /Go to your store account to purchase/,+ name: /Go to your store account to upgrade/,});expect(link).toHaveAttribute("href",diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/tests/setup.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/tests/setup.tsxindex 012abbba8a1..c9c57eab975 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/tests/setup.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/tests/setup.tsx@@ -5,6 +5,7 @@ import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";import {setupBillingEndpoints,setupPropertiesEndpoints,+ setupStoreEECloudAddOnsEndpoint,} from "__support__/server-mocks";import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";@@ -33,7 +34,7 @@ export const setup = ({const storeUserEmail = "[email protected]";const currentUser = createMockUser(- isStoreUser ? { email: storeUserEmail } : undefined,+ isStoreUser ? { email: storeUserEmail, is_superuser: true } : undefined,);const settings = {@@ -59,6 +60,7 @@ export const setup = ({pluginTokens.forEach(setupEnterpriseOnlyPlugin);}+ setupStoreEECloudAddOnsEndpoint(billingPeriodMonths);setupBillingEndpoints({billingPeriodMonths,hasBasicTransformsAddOn: true,diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.tsindex d1dd892758f..33f8e12114e 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts@@ -1,25 +1,21 @@-import { useHasTokenFeature, useSetting } from "metabase/common/hooks";import { getIsHosted } from "metabase/databases/selectors";import { useSelector } from "metabase/redux";+import { getUserIsAdmin } from "metabase/selectors/user";import {useGetBillingInfoQuery,useListAddOnsQuery,} from "metabase-enterprise/api";-const TRANSFORMS_PRODUCT_TYPES = ["transforms-basic"] as const;-export function useTransformsBilling() {- const tokenStatus = useSetting("token-status");+ const isAdmin = useSelector(getUserIsAdmin);const isHosted = useSelector(getIsHosted);- const hasTransforms = useHasTokenFeature("transforms-basic");- const hasPythonTransforms = useHasTokenFeature("transforms-python");const {data: addOns,error: addOnsError,isLoading: addOnsLoading,} = useListAddOnsQuery(undefined, {- skip: !isHosted,+ skip: !isHosted || !isAdmin,});const {@@ -28,48 +24,34 @@ export function useTransformsBilling() {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,+ product_type === "transforms-basic-metered" && self_service,+ ) ?? false;++ const hadAdvancedTransforms =+ billingInfo?.data?.previous_add_ons?.some(+ ({ product_type, self_service }) =>+ product_type === "transforms-advanced-metered" && self_service,) ?? false;const basicTransformsAddOn = addOns?.find(- ({ active, billing_period_months, product_type, self_service }) =>- active &&- self_service &&- billing_period_months === billingPeriodMonths &&- product_type === "transforms-basic",+ ({ active, product_type, self_service }) =>+ active && self_service && product_type === "transforms-basic-metered",);const advancedTransformsAddOn = addOns?.find(- ({ active, billing_period_months, product_type, self_service }) =>- active &&- self_service &&- billing_period_months === billingPeriodMonths &&- product_type === "transforms-advanced",+ ({ active, product_type, self_service }) =>+ active && self_service && product_type === "transforms-advanced-metered",);- const isOnTrial = tokenStatus?.trial ?? false;- const trialEndDate = tokenStatus?.["valid-thru"];-- // Check if user already has basic transforms- const hasBasicTransforms = Boolean(hasTransforms && !hasPythonTransforms);-return {error: addOnsError || billingInfoError,isLoading: addOnsLoading || billingInfoLoading,- billingPeriodMonths,basicTransformsAddOn,advancedTransformsAddOn,hadTransforms,- isOnTrial,- trialEndDate,- hasBasicTransforms,+ hadAdvancedTransforms,};}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.unit.spec.tsindex 9153b403e55..9f69c3a3396 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.unit.spec.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.unit.spec.ts@@ -5,60 +5,42 @@ import {import { mockSettings } from "__support__/settings";import { renderHookWithProviders, waitFor } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";-import {- createMockSettings,- createMockTokenFeatures,-} from "metabase-types/api/mocks";+import { createMockSettings, createMockUser } from "metabase-types/api/mocks";+import type { AddOnProductType } from "metabase-types/api/store";import { useTransformsBilling } from "./useTransformsBilling";-const BASIC_PRICE = 101;-const ADVANCED_PRICE = 251;-type SetupOpts = {isHosted?: boolean;- hasBasicTransforms?: boolean;- hasPythonTransforms?: boolean;hasBasicTransformsAddOn?: boolean;hasAdvancedTransformsAddOn?: boolean;previousAddOns?: Array<{- product_type: string;+ product_type: AddOnProductType;self_service: boolean;}>;};function setup({isHosted = true,- hasBasicTransforms = false,- hasPythonTransforms = false,hasBasicTransformsAddOn = true,hasAdvancedTransformsAddOn = true,previousAddOns = [],}: SetupOpts = {}) {const settings = createMockSettings({"is-hosted?": isHosted,- "token-features": createMockTokenFeatures({- "transforms-basic": hasBasicTransforms,- "transforms-python": hasPythonTransforms,- }),});const storeInitialState = createMockState({settings: mockSettings({"is-hosted?": isHosted,- "token-features": createMockTokenFeatures({- "transforms-basic": hasBasicTransforms,- "transforms-python": hasPythonTransforms,- }),}),+ currentUser: createMockUser({ is_superuser: true }),});setupPropertiesEndpoints(settings);setupBillingEndpoints({hasBasicTransformsAddOn,hasAdvancedTransformsAddOn,- transformsBasicPrice: BASIC_PRICE,- transformsAdvancedPrice: ADVANCED_PRICE,previousAddOns,});@@ -78,11 +60,11 @@ describe("useTransformsBilling", () => {expect(result.current.basicTransformsAddOn).toBeDefined();expect(result.current.basicTransformsAddOn?.product_type).toBe(- "transforms-basic",+ "transforms-basic-metered",);expect(result.current.advancedTransformsAddOn).toBeDefined();expect(result.current.advancedTransformsAddOn?.product_type).toBe(- "transforms-advanced",+ "transforms-advanced-metered",);});@@ -98,47 +80,6 @@ describe("useTransformsBilling", () => {});});- describe("token features", () => {- it("should return hasBasicTransforms=false when no transforms feature", async () => {- const { result } = setup({- hasBasicTransforms: false,- hasPythonTransforms: false,- });-- await waitFor(() => {- expect(result.current.isLoading).toBe(false);- });-- expect(result.current.hasBasicTransforms).toBe(false);- });-- it("should return hasBasicTransforms=true when transforms is enabled but not python", async () => {- const { result } = setup({- hasBasicTransforms: true,- hasPythonTransforms: false,- });-- await waitFor(() => {- expect(result.current.isLoading).toBe(false);- });-- expect(result.current.hasBasicTransforms).toBe(true);- });-- it("should return hasBasicTransforms=false when both transforms and python are enabled", async () => {- const { result } = setup({- hasBasicTransforms: true,- hasPythonTransforms: true,- });-- await waitFor(() => {- expect(result.current.isLoading).toBe(false);- });-- expect(result.current.hasBasicTransforms).toBe(false);- });- });-describe("hadTransforms", () => {it("should return hadTransforms=false when there are no previous add-ons", async () => {const { result } = setup({ previousAddOns: [] });@@ -153,7 +94,7 @@ describe("useTransformsBilling", () => {it("should return hadTransforms=true when previous add-ons include a self-service transforms product", async () => {const { result } = setup({previousAddOns: [- { product_type: "transforms-basic", self_service: true },+ { product_type: "transforms-basic-metered", self_service: true },],});@@ -167,7 +108,7 @@ describe("useTransformsBilling", () => {it("should return hadTransforms=false when previous transforms add-on is not self-service", async () => {const { result } = setup({previousAddOns: [- { product_type: "transforms-basic", self_service: false },+ { product_type: "transforms-basic-metered", self_service: false },],});@@ -219,9 +160,6 @@ describe("useTransformsBilling", () => {});expect(result.current.basicTransformsAddOn).toBeDefined();- expect(result.current.basicTransformsAddOn?.default_base_fee).toBe(- BASIC_PRICE,- );expect(result.current.advancedTransformsAddOn).toBeUndefined();});@@ -238,9 +176,6 @@ describe("useTransformsBilling", () => {expect(result.current.basicTransformsAddOn).toBeUndefined();expect(result.current.advancedTransformsAddOn).toBeDefined();- expect(result.current.advancedTransformsAddOn?.default_base_fee).toBe(- ADVANCED_PRICE,- );});});});diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.module.cssdeleted file mode 100644index 12d15c254a0..00000000000--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.module.css+++ /dev/null@@ -1,28 +0,0 @@-.container {- display: flex;- flex-direction: row;- margin: 0 auto;- max-width: 900px;- padding: 0;-- &.singleColumn {- max-width: 500px;- }-}--.leftColumn {- flex: 1;-}--.rightColumn {- flex: 1;- background-color: var(--mb-color-background-secondary);- padding-left: 2.5rem;-}--@media (max-height: 600px) {- .UpsellPageContent {- height: 100%;- overflow-y: auto;- }-}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.setup.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.setup.spec.tsxindex f5078a5b8b4..ee111e41bdb 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.setup.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.setup.spec.tsx@@ -2,6 +2,8 @@ import { Route } from "react-router";import {setupBillingEndpoints,+ setupBugReportingDetailsEndpoint,+ setupDatabaseListEndpoint,setupPropertiesEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";@@ -9,55 +11,46 @@ import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";-import {- createMockSettings,- createMockTokenFeatures,- createMockUser,-} from "metabase-types/api/mocks";+import { createMockSettings, createMockUser } from "metabase-types/api/mocks";import { TransformsUpsellPage } from "./TransformsUpsellPage";type SetupOpts = {- hasBasicTransforms?: boolean;+ hadTransforms?: boolean;isHosted: boolean;isStoreUser: boolean;isOnTrial?: boolean;- trialDays?: number;};-export const transformsBasicPrice = 100;-export const transformsAdvancedPrice = 250;-export const setup = ({isHosted,isStoreUser,- hasBasicTransforms,+ hadTransforms = false,isOnTrial = false,- trialDays,}: SetupOpts) => {- const user = createMockUser();+ const currentUser = createMockUser({ is_superuser: isStoreUser });const settings = createMockSettings({"is-hosted?": isHosted,"token-status": {status: "valid",valid: true,- "store-users": isStoreUser ? [{ email: user.email }] : [],+ "store-users": isStoreUser ? [{ email: currentUser.email }] : [],trial: isOnTrial,},- "token-features": createMockTokenFeatures({- "transforms-basic": !!hasBasicTransforms,- }),});const state = createMockState({settings: createMockSettingsState(settings),- currentUser: createMockUser(),+ currentUser,});setupBillingEndpoints({- transformsAdvancedPrice,- transformsBasicPrice,- trialDays,+ hasBasicTransformsAddOn: true,+ previousAddOns: hadTransforms+ ? [{ product_type: "transforms-basic-metered", self_service: true }]+ : [],});setupPropertiesEndpoints(settings);+ setupDatabaseListEndpoint([]);+ setupBugReportingDetailsEndpoint();renderWithProviders(<Route@@ -72,32 +65,6 @@ export const setup = ({);};-export const assertLeftColumnContent = () => {- expect(- screen.getByRole("heading", {- name: /Start transforming your data in Metabase/,- }),- );- expect(- screen.getByText(/Schedule and run transforms as groups with jobs/),- ).toBeInTheDocument();- expect(- screen.getByText(- /Fast runs with incremental transforms that respond to data changes/,- ),- ).toBeInTheDocument();- expect(- screen.getByText(- /Predictable costs - 72,000 successful transform runs included every month/,- ),- ).toBeInTheDocument();- expect(- screen.getByText(- /If you go over your cap, transforms bill at 0.01 per transform run/,- ),- ).toBeInTheDocument();-};-export const waitForLoadingToFinish = async () => {await waitFor(() => {expect(screen.queryByText(/Loading\.{3}/)).not.toBeInTheDocument();diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsxindex acf09d012ec..a5a2053a455 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx@@ -1,74 +1,61 @@-import cx from "classnames";-import { useState } from "react";-import { t } from "ttag";+import { useDisclosure } from "@mantine/hooks";+import { useCallback, useState } from "react";+import { jt, t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";import { DottedBackground } from "metabase/data-studio/upsells/components/DottedBackground";import { LineDecorator } from "metabase/data-studio/upsells/components/LineDecorator";-import type { BillingPeriod } from "metabase/data-studio/upsells/types";+import { useMetadataToasts } from "metabase/metadata/hooks/useMetadataToasts";import { useSelector } from "metabase/redux";import { getStoreUsers } from "metabase/selectors/store-users";-import {- Card,- Center,- Divider,- Flex,- Icon,- Stack,- Text,- Title,-} from "metabase/ui";+import { EnableTransformsCard } from "metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard";+import { Button, Center, Flex, Text, Title } from "metabase/ui";+import { reload } from "metabase/utils/dom";+import { usePurchaseCloudAddOnMutation } from "metabase-enterprise/api/cloud-add-ons";+import { TransformsSettingUpModal } from "../../components/TransformsSettingUpModal";import { useTransformsBilling } from "../../hooks/useTransformsBilling";-import S from "./TransformsUpsellPage.module.css";-import { PricingSummary } from "./components/PricingSummary";-import { TierSelection, type TransformTier } from "./components/TierSelection";+const NOTIFICATION_THRESHOLD = 0.8;/**- * Expected scenarios:- * - Trial user with no transforms: show both tiers with radio selection, $0 due today, CTA as "Add to trial"- * - EE user with no transforms, no trial: show both tiers with radio selection, $X due today, CTA as "Add to plan"- * - When trial is available for this add-on, show $0 due today, CTA as "Start trial"- *- * Note: this upsell page should only be displayed to cloud customers since OSS and Self-hosted have- * transforms enabled by default.+ * Note: this upsell page should only be displayed to cloud customers since OSS and Self-hosted+ * do not need to pay extra for basic transforms.*/export function TransformsUpsellPage() {- const bulletPoints = [- t`Schedule and run transforms as groups with jobs`,- t`Fast runs with incremental transforms that respond to data changes`,- t`Predictable costs - 72,000 successful transform runs included every month`,- t`If you go over your cap, transforms bill at 0.01 per transform run`,- ];-+ const { error, hadTransforms, isLoading, basicTransformsAddOn } =+ useTransformsBilling();const { isStoreUser, anyStoreUserEmailAddress } = useSelector(getStoreUsers);- const [selectedTier, setSelectedTier] = useState<TransformTier>("basic");-- const {- advancedTransformsAddOn,- basicTransformsAddOn,- billingPeriodMonths,- error,- hadTransforms,- isLoading,- isOnTrial,- } = useTransformsBilling();-- const hasData =- billingPeriodMonths !== undefined &&- (basicTransformsAddOn || advancedTransformsAddOn);- const billingPeriod: BillingPeriod =- billingPeriodMonths === 1 ? "monthly" : "yearly";-- const basicTransformsPrice = basicTransformsAddOn?.default_base_fee ?? 0;- const advancedTransformsPrice =- advancedTransformsAddOn?.default_base_fee ?? 0;-- const canUserPurchase = hasData && isStoreUser;+ const [settingUpModalOpened, settingUpModalHandlers] = useDisclosure(false);+ const { sendErrorToast } = useMetadataToasts();+ const [purchaseCloudAddOn, { isLoading: isPurchasing }] =+ usePurchaseCloudAddOnMutation();+ const handlePurchase = useCallback(async () => {+ settingUpModalHandlers.open();+ try {+ await purchaseCloudAddOn({+ product_type: "transforms-basic-metered",+ }).unwrap();+ reload();+ } catch {+ settingUpModalHandlers.close();+ sendErrorToast(+ t`It looks like something went wrong. Please refresh the page and try again.`,+ );+ }+ }, [purchaseCloudAddOn, sendErrorToast, settingUpModalHandlers]);++ const [shouldShowAgreement, setShouldShowAgreement] = useState(false);+ const onEnableClick = () => {+ if (hadTransforms) {+ handlePurchase();+ return;+ }+ setShouldShowAgreement(true);+ };if (error || isLoading) {return (@@ -92,107 +79,83 @@ export function TransformsUpsellPage() {);}- let availableTrialDays =- selectedTier === "basic"- ? (basicTransformsAddOn?.trial_days ?? 0)- : (advancedTransformsAddOn?.trial_days ?? 0);-- if (hadTransforms) {- availableTrialDays = 0;- }-- const rightColumnTitle = getRightColumnTitle(isOnTrial, availableTrialDays);- const selectTierPrice =- selectedTier === "basic" ? basicTransformsPrice : advancedTransformsPrice;- const dueTodayAmount =- availableTrialDays > 0 || isOnTrial ? 0 : selectTierPrice;+ const freeUnitsStr = basicTransformsAddOn?.free_units?.toLocaleString();+ const perRunStr =+ basicTransformsAddOn?.default_price_per_unit != null &&+ `${basicTransformsAddOn.default_price_per_unit * 100}¢`;return (- <DottedBackground px="3.5rem" pb="2rem">+ <DottedBackground+ px="3.5rem"+ pb="2rem"+ style={{ display: "flex", flexDirection: "column" }}+ ><PaneHeaderbreadcrumbs={<DataStudioBreadcrumbs>{t`Transforms`}</DataStudioBreadcrumbs>}/>- <Flex- align="flex-start"- className={S.UpsellPageContent}- justify="center"- py="xl"- >- <LineDecorator>- <Card- className={cx(S.container, { [S.singleColumn]: !canUserPurchase })}- withBorder- >- <Stack gap="lg" className={S.leftColumn} p="xl">- <Title order={2}>- {/* eslint-disable-next-line metabase/no-literal-metabase-strings -- This string only shows for admins. */}- {t`Start transforming your data in Metabase`}- </Title>- <Text c="text-secondary">- {/* eslint-disable-next-line metabase/no-literal-metabase-strings -- This string only shows for admins. */}- {t`Clean up, reshape, and reuse data directly in Metabase. Add transforms to build models your whole team can use.`}- </Text>- <Stack gap="lg" py="sm">- {bulletPoints.map((point) => (- <Flex direction="row" gap="sm" key={point}>- <Center w={24} h={24}>- <Icon name="check_filled" size={16} c="text-brand" />- </Center>- <Text c="text-secondary">{point}</Text>- </Flex>- ))}- </Stack>- {!canUserPurchase && (- <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.`}+ <Flex justify="center" pos="relative" flex={1} mt="lg">+ <LineDecorator pos="absolute" mah="100%">+ <EnableTransformsCard+ onEnableClick={onEnableClick}+ permissionsErrorMessage={+ !isStoreUser && (+ <Text fz="1rem" fw="bold">+ {t`To enable Transforms, please contact a store administrator`}+ {anyStoreUserEmailAddress && ` (${anyStoreUserEmailAddress})`}+ .</Text>- )}- </Stack>- {canUserPurchase && (- <>- <Divider orientation="vertical" />- <Stack gap="lg" className={S.rightColumn} p="xl">- <Title order={3}>{rightColumnTitle}</Title>- <TierSelection- advancedTransformsPrice={advancedTransformsPrice}- basicTransformsPrice={basicTransformsPrice}- billingPeriod={billingPeriod}- selectedTier={selectedTier}- setSelectedTier={setSelectedTier}- />- <PricingSummary- dueTodayAmount={dueTodayAmount}- isOnTrial={isOnTrial}- selectedTier={selectedTier}- />- </Stack>- </>- )}- </Card>+ )+ }+ finePrint={+ hadTransforms &&+ t`By clicking Enable transforms, you agree to be charged ${perRunStr} per successful transform run.`+ }+ leftContent={+ !shouldShowAgreement ? undefined : (+ <>+ {perRunStr && freeUnitsStr ? (+ <>+ <Title+ order={2}+ >{t`${freeUnitsStr} free transform runs`}</Title>+ <Text c="text-secondary" fz="1rem" lh={1.4}>+ {jt`Your Cloud plan comes with ${freeUnitsStr} transform runs ${(+ <strong key="bold">{t`completely free`}.</strong>+ )}`}{" "}+ {t`After you use your ${freeUnitsStr} runs, you'll be charged ${perRunStr} per run. You only pay for what you use.`}+ </Text>+ <Text+ c="text-secondary"+ fz="1rem"+ lh={1.4}+ >{t`We'll notify you when you've hit ${NOTIFICATION_THRESHOLD * 100}% of your allotment.`}</Text>+ <Button+ loading={isPurchasing}+ variant="primary"+ onClick={handlePurchase}+ >{t`Agree and continue`}</Button>+ <Text c="text-secondary" lh={1.4}>+ {t`By clicking agree and continue, you agree to be charged in accordance with our terms of service. Your free transforms never expire, so they'll be waiting here for you when you're ready.`}+ </Text>+ </>+ ) : (+ <Text>{t`Error fetching information about available add-ons.`}</Text>+ )}+ </>+ )+ }+ /></LineDecorator></Flex>+ <TransformsSettingUpModal+ opened={settingUpModalOpened}+ onClose={() => {+ settingUpModalHandlers.close();+ reload();+ }}+ /></DottedBackground>);}--// Determine the title based on scenario-const getRightColumnTitle = (- isOnTrial: boolean,- availableTrialDays: number,-) => {- if (isOnTrial) {- return t`Add transforms to your trial`;- }-- if (availableTrialDays > 0) {- return t`Start a free ${availableTrialDays}-day trial of transforms`;- }-- return t`Add transforms to your plan`;-};diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.unit.spec.tsxindex dbb3e07b452..204b11dc7ae 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.unit.spec.tsx@@ -1,72 +1,94 @@import userEvent from "@testing-library/user-event";+import fetchMock from "fetch-mock";import { screen } from "__support__/ui";+import * as domUtils from "metabase/utils/dom";import {- assertLeftColumnContent,setup,- transformsAdvancedPrice,- transformsBasicPrice,waitForLoadingToFinish,} from "./TransformsUpsellPage.setup.spec";describe("TransformsUpsellPage", () => {- it("renders single column layout without CTA when user is not a store user", async () => {- setup({ isHosted: true, isStoreUser: false });+ beforeEach(() => {+ fetchMock.post("path:/api/ee/cloud-add-ons/transforms-basic-metered", 200);+ jest.spyOn(domUtils, "reload").mockImplementation(() => undefined);+ });+ it("does not render an enable button if the user is not a store user", async () => {+ setup({ isHosted: true, isStoreUser: false });await waitForLoadingToFinish();- assertLeftColumnContent();expect(- screen.queryByRole("heading", { name: "Add transforms to your plan" }),+ screen.queryByRole("button", { name: "Enable transforms" }),).not.toBeInTheDocument();-expect(- screen.queryByRole("button", { name: "Confirm purchase" }),- ).not.toBeInTheDocument();+ screen.getByText(/contact a store administrator/i),+ ).toBeInTheDocument();});- it("renders 2-column layout with CTA when user is a store user", async () => {+ it("proceeds to an agree step with an overview of the free bucket", async () => {setup({ isHosted: true, isStoreUser: true });-await waitForLoadingToFinish();- assertLeftColumnContent();expect(- screen.getByRole("heading", { name: "Add transforms to your plan" }),+ screen.getByText("Customize and clean up your data"),).toBeInTheDocument();+ await userEvent.click(+ screen.getByRole("button", { name: "Enable transforms" }),+ );++ expect(screen.getByText("1,000 free transform runs")).toBeInTheDocument();+ expect(+ fetchMock.callHistory.calls(+ "path:/api/ee/cloud-add-ons/transforms-basic-metered",+ { method: "POST" },+ ),+ ).toHaveLength(0);++ await userEvent.click(+ screen.getByRole("button", { name: "Agree and continue" }),+ );+expect(- screen.getByRole("button", { name: "Confirm purchase" }),+ screen.getByText("Setting up transforms, please wait"),).toBeInTheDocument();+ expect(+ fetchMock.callHistory.calls(+ "path:/api/ee/cloud-add-ons/transforms-basic-metered",+ { method: "POST" },+ ),+ ).toHaveLength(1);});- it("shows both transforms tiers and updates price when switching", async () => {- setup({ isHosted: true, isStoreUser: true });-+ it("skips the free bucket overview if the user has had transforms before", async () => {+ setup({ isHosted: true, isStoreUser: true, hadTransforms: true });await waitForLoadingToFinish();- await userEvent.click(screen.getByRole("radio", { name: /SQL only/ }));- expect(screen.getByTestId("due-today-amount")).toHaveTextContent(- `$${transformsBasicPrice}`,+ expect(+ screen.queryByText("1,000 free transform runs"),+ ).not.toBeInTheDocument();+ expect(+ fetchMock.callHistory.calls(+ "path:/api/ee/cloud-add-ons/transforms-basic-metered",+ { method: "POST" },+ ),+ ).toHaveLength(0);++ await userEvent.click(+ screen.getByRole("button", { name: "Enable transforms" }),);- await userEvent.click(screen.getByRole("radio", { name: /SQL \+ Python/ }));- expect(screen.getByTestId("due-today-amount")).toHaveTextContent(- `$${transformsAdvancedPrice}`,- );- });-- it("shows due today as $0 and trial heading when trial is available", async () => {- setup({ isHosted: true, isStoreUser: true, trialDays: 13 });-- await waitForLoadingToFinish();-expect(- screen.getByRole("heading", {- name: "Start a free 13-day trial of transforms",- }),+ screen.getByText("Setting up transforms, please wait"),).toBeInTheDocument();- expect(screen.getByTestId("due-today-amount")).toHaveTextContent(`$0`);++ expect(+ fetchMock.callHistory.calls(+ "path:/api/ee/cloud-add-ons/transforms-basic-metered",+ { method: "POST" },+ ),+ ).toHaveLength(1);});});diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/components/PricingSummary.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/components/PricingSummary.tsxdeleted file mode 100644index dae99e7221c..00000000000--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/components/PricingSummary.tsx+++ /dev/null@@ -1,84 +0,0 @@-import { useDisclosure } from "@mantine/hooks";-import { useCallback } from "react";-import { t } from "ttag";--import { useMetadataToasts } from "metabase/metadata/hooks";-import { Button, Divider, Group, Text } from "metabase/ui";-import { usePurchaseCloudAddOnMutation } from "metabase-enterprise/api";-import { TransformsSettingUpModal } from "metabase-enterprise/transforms/upsells/components/TransformsSettingUpModal";-import { Urls } from "metabase-enterprise/urls";--import type { TransformTier } from "./TierSelection";--type PricingSummaryProps = {- dueTodayAmount: number;- isOnTrial: boolean;- selectedTier: TransformTier;-};--export const PricingSummary = (props: PricingSummaryProps) => {- const { isOnTrial, dueTodayAmount, selectedTier } = props;- const [purchaseCloudAddOn, { isLoading: isPurchasing }] =- usePurchaseCloudAddOnMutation();- const [settingUpModalOpened, settingUpModalHandlers] = useDisclosure(false);- const { sendErrorToast } = useMetadataToasts();-- const handlePurchase = useCallback(async () => {- const productType =- selectedTier === "basic" ? "transforms-basic" : "transforms-advanced";- settingUpModalHandlers.open();- try {- await purchaseCloudAddOn({- product_type: productType,- }).unwrap();- window.location.href = Urls.transformList(); // On success, do a full-page redirect to transforms list- } catch {- sendErrorToast(- t`It looks like something went wrong. Please refresh the page and try again.`,- );- settingUpModalHandlers.close();- }- }, [- purchaseCloudAddOn,- selectedTier,- sendErrorToast,- settingUpModalHandlers,- ]);- let buttonText = isOnTrial ? t`Add to trial` : t`Confirm purchase`;-- if (!isOnTrial && !dueTodayAmount) {- // Instance is not currently on trial but trial is available for this add-on- buttonText = t`Start trial`;- }-- return (- <>- <Divider />- <Group justify="space-between" mb="sm">- <Text c="text-secondary">{t`Due today:`}</Text>- <Text- fw="bold"- data-testid="due-today-amount"- >{`$${dueTodayAmount}`}</Text>- </Group>- <Button- fullWidth- loading={isPurchasing}- onClick={handlePurchase}- size="md"- variant="filled"- >- {buttonText}- </Button>-- <TransformsSettingUpModal- opened={settingUpModalOpened}- onClose={() => {- settingUpModalHandlers.close();- window.location.reload();- }}- isPython={selectedTier === "advanced"}- />- </>- );-};diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/components/PricingSummary.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/components/PricingSummary.unit.spec.tsxdeleted file mode 100644index bf89ac36ca1..00000000000--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/components/PricingSummary.unit.spec.tsx+++ /dev/null@@ -1,99 +0,0 @@-import userEvent from "@testing-library/user-event";-import fetchMock from "fetch-mock";-import type { ComponentProps } from "react";--import { setupPropertiesEndpoints } from "__support__/server-mocks";-import { renderWithProviders, screen, waitFor } from "__support__/ui";-import { createMockSettings } from "metabase-types/api/mocks";--import { PricingSummary } from "./PricingSummary";--const defaultProps: ComponentProps<typeof PricingSummary> = {- dueTodayAmount: 100,- isOnTrial: false,- selectedTier: "basic",-};--describe("PricingSummary", () => {- beforeEach(() => {- fetchMock.post("path:/api/ee/cloud-add-ons/transforms-advanced", 200);- fetchMock.post("path:/api/ee/cloud-add-ons/transforms-basic", 200);- fetchMock.post("path:/api/premium-features/token/refresh", 200);- setupPropertiesEndpoints(createMockSettings());- });-- describe("confirm button", () => {- it("says 'Add to trial' when instance is currently on trial", () => {- renderWithProviders(- <PricingSummary {...defaultProps} dueTodayAmount={0} isOnTrial />,- );- expect(screen.getByRole("button")).toHaveTextContent("Add to trial");- });-- it("says 'Start trial' when not on trial but trial is available (due today = 0)", () => {- renderWithProviders(- <PricingSummary- {...defaultProps}- dueTodayAmount={0}- isOnTrial={false}- />,- );- expect(screen.getByRole("button")).toHaveTextContent("Start trial");- });-- it("says 'Confirm purchase' when not on trial and trial is not available (due today > 0)", () => {- renderWithProviders(<PricingSummary {...defaultProps} />);- expect(screen.getByRole("button")).toHaveTextContent("Confirm purchase");- });-- it("renders correct loading text when selected tier is basic", async () => {- renderWithProviders(- <PricingSummary {...defaultProps} selectedTier="basic" />,- );-- await userEvent.click(- screen.getByRole("button", { name: "Confirm purchase" }),- );- expect(- screen.getByText("Setting up transforms, please wait"),- ).toBeInTheDocument();- });-- it("renders correct loading heading when selected tier is advanced", async () => {- renderWithProviders(- <PricingSummary {...defaultProps} selectedTier="advanced" />,- );-- await userEvent.click(- screen.getByRole("button", { name: "Confirm purchase" }),- );- expect(- screen.getByText("Setting up Python transforms, please wait"),- ).toBeInTheDocument();- });- });-- describe("purchase flow", () => {- it("closes setting up modal on error without redirecting", async () => {- fetchMock.removeRoutes();- fetchMock.post("path:/api/ee/cloud-add-ons/transforms-basic", 500);- fetchMock.post("path:/api/premium-features/token/refresh", 200);- setupPropertiesEndpoints(createMockSettings());-- renderWithProviders(- <PricingSummary {...defaultProps} selectedTier="basic" />,- );-- await userEvent.click(- screen.getByRole("button", { name: "Confirm purchase" }),- );-- // Setting up modal should be dismissed after error- await waitFor(() => {- expect(- screen.queryByText("Setting up transforms, please wait"),- ).not.toBeInTheDocument();- });- });- });-});diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/components/TierSelection.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/components/TierSelection.module.cssdeleted file mode 100644index d6301ce6cc8..00000000000--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/components/TierSelection.module.css+++ /dev/null@@ -1,3 +0,0 @@-.selectedTierOptionCard {- box-shadow: 0 0 0 2px var(--mb-color-brand);-}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/components/TierSelection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/components/TierSelection.tsxdeleted file mode 100644index 138a98dfbc9..00000000000--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/components/TierSelection.tsx+++ /dev/null@@ -1,86 +0,0 @@-import cx from "classnames";-import { Fragment, useMemo } from "react";-import { t } from "ttag";--import type { BillingPeriod } from "metabase/data-studio/upsells/types";-import { Card, Center, Flex, Group, Radio, Stack, Text } from "metabase/ui";--import S from "./TierSelection.module.css";--export type TransformTier = "basic" | "advanced";--type TierSelectionProps = {- advancedTransformsPrice: number;- basicTransformsPrice: number;- billingPeriod: BillingPeriod;- selectedTier: TransformTier;- setSelectedTier: (tier: TransformTier) => void;-};--export const TierSelection = (props: TierSelectionProps) => {- const {- billingPeriod,- advancedTransformsPrice,- selectedTier,- setSelectedTier,- basicTransformsPrice,- } = props;-- const tierOptions = useMemo(() => {- return [- {- value: "basic",- label: t`SQL only`,- price: basicTransformsPrice,- },- {- value: "advanced",- label: t`SQL + Python`,- price: advancedTransformsPrice,- description: t`Run Python-based transforms alongside SQL to handle more complex logic and data workflows.`,- },- ];- }, [advancedTransformsPrice, basicTransformsPrice]);- const billingPeriodLabel = billingPeriod === "monthly" ? t`month` : t`year`;-- return (- <Radio.Group- value={selectedTier}- onChange={(value) => setSelectedTier(value as TransformTier)}- >- <Stack gap="md">- {tierOptions.map((option) => (- <Fragment key={option.value}>- <Card- withBorder- p={0}- radius="md"- className={cx({- [S.selectedTierOptionCard]: selectedTier === option.value,- })}- >- <Radio.Card value={option.value} p="md" radius="md">- <Flex direction="row" align="flex-start" gap="md">- <Center mt={2}>- <Radio.Indicator />- </Center>- <Flex direction="column" style={{ flex: 1 }}>- <Group justify="space-between" align="flex-start">- <Text fw="bold">{option.label}</Text>- <Text fw="bold">{`$${option.price} / ${billingPeriodLabel}`}</Text>- </Group>- {option.description && (- <Text size="sm" c="text-secondary" mt="sm">- {option.description}- </Text>- )}- </Flex>- </Flex>- </Radio.Card>- </Card>- </Fragment>- ))}- </Stack>- </Radio.Group>- );-};diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/components/TierSelection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/components/TierSelection.unit.spec.tsxdeleted file mode 100644index c9ca2607e1d..00000000000--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/components/TierSelection.unit.spec.tsx+++ /dev/null@@ -1,31 +0,0 @@-import userEvent from "@testing-library/user-event";-import type { ComponentProps } from "react";--import { render, screen } from "__support__/ui";--import { TierSelection } from "./TierSelection";--const setSelectedTier = jest.fn();-const defaultProps: ComponentProps<typeof TierSelection> = {- billingPeriod: "yearly",- advancedTransformsPrice: 250,- selectedTier: "basic",- setSelectedTier,- basicTransformsPrice: 100,-};--describe("TierSelection", () => {- beforeEach(() => {- setSelectedTier.mockClear();- });-- it("calls setSelectedTier with correct param when a tier is selected", async () => {- render(<TierSelection {...defaultProps} />);-- await userEvent.click(screen.getByText(/SQL only/));- expect(setSelectedTier).toHaveBeenCalledWith("basic");-- await userEvent.click(screen.getByText(/SQL \+ Python/));- expect(setSelectedTier).toHaveBeenCalledWith("advanced");- });-});diff --git a/frontend/src/metabase-types/api/cloud-add-ons.ts b/frontend/src/metabase-types/api/cloud-add-ons.tsindex c51f344baca..350521fa48f 100644--- a/frontend/src/metabase-types/api/cloud-add-ons.ts+++ b/frontend/src/metabase-types/api/cloud-add-ons.ts@@ -1,17 +1,11 @@-export type CloudAddOnProductType =- | "metabase-ai"- | "metabase-ai-tiered"- | "metabase-ai-managed"- | "python-execution"- | "transforms-basic"- | "transforms-advanced";+import type { AddOnProductType } from "./store";export interface PurchaseCloudAddOnRequest {- product_type: CloudAddOnProductType;+ product_type: AddOnProductType;quantity?: number;terms_of_service?: boolean;}export interface RemoveCloudAddOnRequest {- product_type: CloudAddOnProductType;+ product_type: AddOnProductType;}diff --git a/frontend/src/metabase-types/api/mocks/add-ons.ts b/frontend/src/metabase-types/api/mocks/add-ons.tsindex b39f8a012d8..b0a2675b1f0 100644--- a/frontend/src/metabase-types/api/mocks/add-ons.ts+++ b/frontend/src/metabase-types/api/mocks/add-ons.ts@@ -1,5 +1,27 @@import type { ICloudAddOnProduct } from "metabase-types/api";+export const mockAdvancedTransformsAddOn: ICloudAddOnProduct = {+ active: true,+ billing_period_months: 1,+ default_base_fee: 0,+ default_included_units: 0,+ default_prepaid_units: 1,+ default_price_per_unit: 0.02,+ default_total_units: 1,+ deployment: "hosting",+ description: "Advanced Transforms Add-on (Monthly)- metered",+ free_units: 1000,+ id: 1,+ is_metered: true,+ name: "Advanced Transforms Add-on metered",+ product_tiers: [],+ product_type: "transforms-advanced-metered",+ self_service: true,+ short_name: "Advanced Transforms - metered",+ token_features: ["transforms-python", "transforms-basic"],+ trial_days: 0,+};+export function createMockCloudAddOns(opts?: Partial<ICloudAddOnProduct>,): Partial<ICloudAddOnProduct>[] {@@ -97,8 +119,14 @@ export function createMockCloudAddOns(is_default: true,},],- product_type: "other",+ product_type: "other" as any, // test unexpected product_typeself_service: true,},++ // transforms+ {+ ...mockAdvancedTransformsAddOn,+ billing_period_months,+ },];}diff --git a/frontend/src/metabase-types/api/store.ts b/frontend/src/metabase-types/api/store.tsindex 7edcdc479c3..cd9d9ddf381 100644--- a/frontend/src/metabase-types/api/store.ts+++ b/frontend/src/metabase-types/api/store.ts@@ -35,9 +35,21 @@ type BillingInfoFormatType =export type BillingInfoLineItem = BillingInfoFormatType &BillingInfoDisplayType;+export type AddOnProductType =+ | "metabase-ai"+ | "metabase-ai-tiered"+ | "metabase-ai-managed"+ | "python-execution"+ | "transforms-basic"+ | "transforms-basic-metered"+ | "transforms-advanced"+ | "transforms-advanced-metered";+interface IBillingInfoData {billing_period_months?: number | null;- previous_add_ons?: { product_type: string; self_service: boolean }[] | null;+ previous_add_ons?:+ | { product_type: AddOnProductType; self_service: boolean }[]+ | null;}export type BillingInfo = {@@ -68,7 +80,7 @@ export interface ICloudAddOnProduct {is_metered: boolean | null;name: string;product_tiers: ICloudAddOnProductTier[];- product_type: string;+ product_type: AddOnProductType;self_service: boolean;short_name: string;token_features: TokenFeature[];diff --git a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsxindex 7793088b541..de752a390a0 100644--- a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsx@@ -1,5 +1,7 @@import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {+ setupDatabaseListEndpoint,+ setupPropertiesEndpoints,setupStoreEEBillingEndpoint,setupStoreEECloudAddOnsEndpoint,setupUserMetabotPermissionsEndpoint,@@ -8,6 +10,7 @@ import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";import {+ createMockSettings,createMockTokenFeatures,createMockUser,} from "metabase-types/api/mocks";@@ -23,22 +26,40 @@ const setup = ({hasTransformFeature = false,transformsEnabled = false,isAdmin = false,+ isStoreUser = false,}: {isHosted?: boolean;hasTransformFeature?: boolean;transformsEnabled?: boolean;isAdmin?: boolean;+ isStoreUser?: boolean;} = {}) => {setupUserMetabotPermissionsEndpoint();- const settings = mockSettings({+ const storeUserEmail = "[email protected]";+ const currentUser = createMockUser({ is_superuser: isAdmin });+ if (isStoreUser) {+ currentUser.email = storeUserEmail;+ }++ const settingsValues = createMockSettings({"token-features": createMockTokenFeatures({"transforms-basic": hasTransformFeature,hosting: isHosted,}),"transforms-enabled": transformsEnabled,"is-hosted?": isHosted,+ "token-status": {+ status: "valid",+ valid: true,+ "store-users": isStoreUser ? [{ email: storeUserEmail }] : [],+ features: [],+ },});+ const settings = mockSettings(settingsValues);++ setupDatabaseListEndpoint([]);+ setupPropertiesEndpoints(settingsValues);if (isHosted || hasTransformFeature) {setupEnterpriseOnlyPlugin("transforms");@@ -49,7 +70,7 @@ const setup = ({{storeInitialState: createMockState({settings,- currentUser: createMockUser({ is_superuser: isAdmin }),+ currentUser,}),},);@@ -97,13 +118,13 @@ describe("TransformSectionLayout", () => {});it("should show you an upsell page if you are hosted and the transform feature is not present", async () => {- setup({ isHosted: true });- await assertDataStudioUpsellPage();+ setup({ isHosted: true, isStoreUser: true });+ await assertEnableScreen();});it("should show you an upsell page if you are hosted and the transform feature is not present, even when transforms are enabled on the instance", async () => {- setup({ isHosted: true, transformsEnabled: true });- await assertDataStudioUpsellPage();+ setup({ isHosted: true, isStoreUser: true, transformsEnabled: true });+ await assertEnableScreen();});it("should show you the app if the instance is hosted and the transform feature is present", async () => {@@ -119,8 +140,3 @@ const assertEnableScreen = async () =>expect(await screen.findByText("Customize and clean up your data"),).toBeInTheDocument();--const assertDataStudioUpsellPage = async () =>- expect(- await screen.findByText("Start transforming your data in Metabase"),- ).toBeInTheDocument();diff --git a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard.tsx b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard.tsxnew file mode 100644index 00000000000..cfc82236054--- /dev/null+++ b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard.tsx@@ -0,0 +1,147 @@+import { jt, t } from "ttag";++import { useListDatabasesQuery } from "metabase/api/database";+import { Link } from "metabase/common/components/Link";+import { getPlan } from "metabase/common/utils/plan";+import { useSelector } from "metabase/redux";+import { getSetting } from "metabase/selectors/settings";+import { doesDatabaseSupportTransforms } from "metabase/transforms/utils";+import {+ Alert,+ Button,+ Card,+ Flex,+ Group,+ Icon,+ type IconName,+ Stack,+ Text,+ Title,+} from "metabase/ui";++export function EnableTransformsCard({+ onEnableClick,+ permissionsErrorMessage,+ finePrint,+ leftContent,+ loading,+}: {+ onEnableClick: () => void;+ permissionsErrorMessage?: React.ReactNode;+ finePrint?: React.ReactNode;+ leftContent?: React.ReactNode;+ loading?: boolean;+}) {+ const { data: databases } = useListDatabasesQuery();+ const hasDbThatSupportsTransforms =+ databases?.data.some(doesDatabaseSupportTransforms) ?? false;+ const plan = useSelector((state) =>+ getPlan(getSetting(state, "token-features")),+ );+ const permissionsDescription =+ plan === "pro-self-hosted"+ ? t`Only Analysts and Admins can create and run transforms`+ : t`Only Admins can create and run transforms`;++ return (+ <Card withBorder maw="60rem" p={0} w="100%" style={{ overflow: "auto" }}>+ <Flex w="100%" p={{ xs: "2.5rem", xl: "3rem" }}>+ <Stack gap="lg" align="start" pt="xl" pl="lg" flex="1 1 auto">+ {leftContent ?? (+ <>+ <Title order={2}>{t`Customize and clean up your data`}</Title>+ <Text+ c="text-secondary"+ fz="1rem"+ lh={1.4}+ >{t`Transforms let you create new tables within your connected databases, helping you make nicer and more self-explanatory datasets for your end users to look at and explore.`}</Text>+ {permissionsErrorMessage || (+ <Stack gap="lg" align="start">+ <Text+ c="text-secondary"+ fz="1rem"+ lh={1.4}+ fw="bold"+ >{t`Because transforms require write access to your database, make sure you know what you’re doing and that you understand the risks.`}</Text>+ <Button+ loading={loading}+ variant="primary"+ onClick={onEnableClick}+ >{t`Enable transforms`}</Button>+ {finePrint && (+ <Text c="text-secondary" lh={1.4} maw="28rem">+ {finePrint}+ </Text>+ )}+ {!hasDbThatSupportsTransforms && (+ <Alert+ color="warning"+ variant="light"+ icon={<Icon name="warning" size={16} />}+ title={t`No writable database connection`}+ >+ {/* eslint-disable-next-line metabase/no-literal-metabase-strings -- Only admins can see this */}+ {jt`Transforms create tables in your database, so Metabase needs write access. ${(+ <Link+ key="link"+ to="/admin/databases"+ style={{ textDecoration: "underline" }}+ >{t`Reconnect or add a connection`}</Link>+ )} with a user that has the right privileges.`}+ </Alert>+ )}+ </Stack>+ )}+ </>+ )}+ </Stack>+ <Stack flex="0 0 30%" ml="4rem">+ <SimpleCard+ icon="sql"+ title={t`Custom tables`}+ description={t`Create the tables your end users need with SQL queries`}+ />+ <SimpleCard+ icon="clock"+ title={t`Smart scheduling`}+ description={t`Tell your transforms when to run by assigning tags`}+ />+ <SimpleCard+ icon="eye"+ title={t`Observability`}+ description={t`See which transforms ran, and when`}+ />+ <SimpleCard+ icon="lock"+ title={t`Permissioned`}+ description={permissionsDescription}+ />+ </Stack>+ </Flex>+ </Card>+ );+}++const SimpleCard = ({+ icon,+ title,+ description,+}: {+ icon: IconName;+ title: string;+ description: string;+}) => (+ <Card bg="background-secondary" shadow="none">+ <Group wrap="nowrap" align="start" gap="sm">+ <Icon name={icon} c="brand" size={16} flex="0 0 1rem" />+ <Stack gap="xs">+ <Text fw="bold" lh="1rem">+ {title}+ </Text>+ <Text fz="sm" lh="1rem">+ {description}+ </Text>+ </Stack>+ </Group>+ </Card>+);diff --git a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsxindex 09775881049..3689bf91664 100644--- a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx+++ b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx@@ -1,36 +1,19 @@import { t } from "ttag";import { useUpdateSettingMutation } from "metabase/api";-import { getPlan } from "metabase/common/utils/plan";+import { useSetting } from "metabase/common/hooks";import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";import { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";-import {- Button,- Card,- Center,- Group,- Icon,- type IconName,- SimpleGrid,- Stack,- Text,- Title,-} from "metabase/ui";+import { Center, Text } from "metabase/ui";++import { EnableTransformsCard } from "./EnableTransformsCard";export const EnableTransformsPage = () => {const isAdmin = useSelector(getUserIsAdmin);- const plan = useSelector((state) =>- getPlan(getSetting(state, "token-features")),- );- const permissionsDescription =- plan === "pro-self-hosted"- ? t`Only Analysts and Admins can create and run transforms`- : t`Only Admins can create and run transforms`;-+ const adminEmail = useSetting("admin-email");const [updateSetting, { isLoading: updateSettingLoading }] =useUpdateSettingMutation();@@ -48,72 +31,19 @@ export const EnableTransformsPage = () => {}/><Center>- <Card withBorder p="3rem" w="40rem">- <Stack gap="md" align="start">- <Title order={2}>{t`Customize and clean up your data`}</Title>- <Text lh="1.25rem">{t`Transforms let you create new tables within your connected databases, helping you make nicer and more self-explanatory datasets for your end users to look at and explore.`}</Text>- {isAdmin && (- <>- <Text- fw="bold"- lh="1.25rem"- >{t`Because transforms require write access to your database, make sure you know what you’re doing and that you understand the risks.`}</Text>- <Button- loading={updateSettingLoading}- variant="primary"- onClick={enableTransforms}- >{t`Enable transforms`}</Button>- </>- )}- </Stack>- <SimpleGrid cols={2} mt="3rem" spacing="sm">- <SimpleCard- icon="sql"- title={t`Custom tables`}- description={t`Create the tables your end users need with SQL queries`}- />- <SimpleCard- icon="clock"- title={t`Smart scheduling`}- description={t`Tell your transforms when to run by assigning tags`}- />- <SimpleCard- icon="eye"- title={t`Observability`}- description={t`See which transforms ran, and when`}- />- <SimpleCard- icon="lock"- title={t`Permissioned`}- description={permissionsDescription}- />- </SimpleGrid>- </Card>+ <EnableTransformsCard+ onEnableClick={enableTransforms}+ permissionsErrorMessage={+ !isAdmin && (+ <Text fz="1rem" fw="bold">+ {t`To enable Transforms, please contact your administrator`}+ {adminEmail && ` (${adminEmail})`}.+ </Text>+ )+ }+ loading={updateSettingLoading}+ /></Center></PageContainer>);};--const SimpleCard = ({- icon,- title,- description,-}: {- icon: IconName;- title: string;- description: string;-}) => (- <Card bg="background-secondary" shadow="none">- <Group wrap="nowrap" align="start" gap="sm">- <Icon name={icon} c="brand" size={16} flex="0 0 1rem" />- <Stack gap="xs">- <Text fw="bold" lh="1rem">- {title}- </Text>- <Text fz="sm" lh="1rem">- {description}- </Text>- </Stack>- </Group>- </Card>-);diff --git a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.unit.spec.tsxindex fe4c49b5b12..aef92520722 100644--- a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.unit.spec.tsx@@ -1,6 +1,7 @@import { Route } from "react-router";import {+ setupDatabaseListEndpoint,setupPropertiesEndpoints,setupUserMetabotPermissionsEndpoint,} from "__support__/server-mocks";@@ -24,6 +25,7 @@ type SetupOpts = {const setup = ({ isAdmin = true, tokenFeatures = {} }: SetupOpts = {}) => {setupPropertiesEndpoints(createMockSettings());setupUserMetabotPermissionsEndpoint();+ setupDatabaseListEndpoint([]);const state = createMockState({currentUser: createMockUser({ is_superuser: isAdmin }),settings: mockSettings({diff --git a/frontend/test/__support__/server-mocks/store.ts b/frontend/test/__support__/server-mocks/store.tsindex 52f82856b91..75e87ca9eac 100644--- a/frontend/test/__support__/server-mocks/store.ts+++ b/frontend/test/__support__/server-mocks/store.ts@@ -1,27 +1,25 @@import fetchMock from "fetch-mock";import { match } from "ts-pattern";-import { createMockCloudAddOns } from "metabase-types/api/mocks/add-ons";+import {+ createMockCloudAddOns,+ mockAdvancedTransformsAddOn,+} from "metabase-types/api/mocks/add-ons";+import type { AddOnProductType } from "metabase-types/api/store";export function setupBillingEndpoints({billingPeriodMonths = 12,hasBasicTransformsAddOn = true,hasAdvancedTransformsAddOn = true,skipCloudAddOns = false,- transformsBasicPrice = 100,- transformsAdvancedPrice = 250,- trialDays,previousAddOns = [],}: {billingPeriodMonths?: number;hasBasicTransformsAddOn?: boolean;hasAdvancedTransformsAddOn?: boolean;skipCloudAddOns?: boolean;- transformsBasicPrice?: number;- transformsAdvancedPrice?: number;- trialDays?: number;previousAddOns?: Array<{- product_type: string;+ product_type: AddOnProductType;self_service: boolean;}>;} = {}) {@@ -30,22 +28,23 @@ export function setupBillingEndpoints({? [{id: 1,- name: "Transforms (basic)",- short_name: "Transforms",+ name: "Basic Transforms Add-on metered",+ short_name: "Basic Transforms - metered",description: null,active: true,self_service: true,- deployment: "cloud",+ deployment: "hosting",billing_period_months: billingPeriodMonths,- default_base_fee: transformsBasicPrice,+ default_base_fee: 0,default_included_units: 0,- default_prepaid_units: 0,- default_price_per_unit: 0,- default_total_units: 0,- is_metered: false,- product_type: "transforms-basic",- token_features: [],- trial_days: trialDays,+ default_prepaid_units: 1,+ default_price_per_unit: 0.01,+ default_total_units: 1,+ free_units: 1000,+ is_metered: true,+ product_type: "transforms-basic-metered",+ token_features: ["transforms-basic"],+ trial_days: 0,product_tiers: [],},]@@ -53,24 +52,8 @@ export function setupBillingEndpoints({...(hasAdvancedTransformsAddOn? [{- id: 2,- name: "Transforms (advanced)",- short_name: "Transforms + Python",- description: null,- active: true,- self_service: true,- deployment: "cloud",+ ...mockAdvancedTransformsAddOn,billing_period_months: billingPeriodMonths,- default_base_fee: transformsAdvancedPrice,- default_included_units: 0,- default_prepaid_units: 0,- default_price_per_unit: 0,- default_total_units: 0,- is_metered: false,- product_type: "transforms-advanced",- token_features: [],- trial_days: trialDays,- product_tiers: [],},]: []),