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-411 Corrects transform inspector upsell (#74227)
Brad Andersonfd43bd85e354
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/index.tsindex 671a47e38f1..ac9f30ccfa3 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/index.ts@@ -1,9 +1,11 @@import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import { hasPremiumFeature } from "metabase-enterprise/settings";-import { getInspectorRoutes } from "./routes";+import { getInspectorRoutes, getInspectorUpsellRoutes } from "./routes";export function initializePlugin() {+ PLUGIN_TRANSFORMS_PYTHON.shouldShowInspectTab = true;+ PLUGIN_TRANSFORMS_PYTHON.getInspectorRoutes = getInspectorUpsellRoutes;if (hasPremiumFeature("transforms-python")) {PLUGIN_TRANSFORMS_PYTHON.getInspectorRoutes = getInspectorRoutes;}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/routes.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/routes.tsxindex 4c226cec526..f94ba8f31e6 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/routes.tsx@@ -1,7 +1,24 @@import { Route } from "react-router";+import { TransformInspectorUpsellPage } from "metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage";+import { TransformInspectPage } from "./pages/TransformInspectPage";+export function getInspectorUpsellRoutes() {+ return (+ <>+ <Route+ path=":transformId/inspect"+ component={TransformInspectorUpsellPage}+ />+ <Route+ path=":transformId/inspect/:lensId"+ component={TransformInspectorUpsellPage}+ />+ </>+ );+}+export function getInspectorRoutes() {return (<>diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.tsxindex f1f0f1ce1d6..d6022129b09 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.tsx@@ -5,7 +5,6 @@ import { t } from "ttag";import { trackUpsellClicked } from "metabase/common/components/upsells/components/analytics";import { useMetadataToasts } from "metabase/metadata/hooks";import { Button, Stack, Text } from "metabase/ui";-import * as Urls from "metabase/urls";import { formatNumber } from "metabase/utils/formatting";import { usePurchaseCloudAddOnMutation } from "metabase-enterprise/api";import { TransformsSettingUpModal } from "metabase-enterprise/transforms/upsells/components/TransformsSettingUpModal";@@ -14,15 +13,17 @@ import type { ICloudAddOnProduct } from "metabase-types/api/store";import { CAMPAIGN, LOCATION } from "./constants";type PurchaseAdvancedTransformsProps = {- handleModalClose: VoidFunction;+ handleModalClose?: VoidFunction;addOn: ICloudAddOnProduct;freeUnitsIncluded: boolean;+ onSuccess: () => void;};export const PurchaseAdvancedTransforms = ({handleModalClose,addOn,freeUnitsIncluded,+ onSuccess,}: PurchaseAdvancedTransformsProps) => {const [purchaseCloudAddOn, { isLoading: isPurchasing }] =usePurchaseCloudAddOnMutation();@@ -37,17 +38,18 @@ export const PurchaseAdvancedTransforms = ({await purchaseCloudAddOn({product_type: "transforms-advanced-metered",}).unwrap();- window.location.href = Urls.transformList(); // On success, do a full-page redirect to transforms list+ onSuccess();} catch {sendErrorToast(t`It looks like something went wrong. Please refresh the page and try again.`,);} finally {settingUpModalHandlers.close();- handleModalClose();+ handleModalClose?.();}}, [handleModalClose,+ onSuccess,purchaseCloudAddOn,sendErrorToast,settingUpModalHandlers,diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.unit.spec.tsxindex 70186d6fb96..c4bbc39ff2d 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.unit.spec.tsx@@ -38,6 +38,7 @@ const setup = () => {handleModalClose={handleModalClose}addOn={mockAdvancedTransformsCloudAddOn}freeUnitsIncluded+ onSuccess={jest.fn()}/>,{storeInitialState: state,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 d938f99c8fe..9aa93a40157 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx@@ -1,4 +1,4 @@-import { useEffect } from "react";+import { useCallback, useEffect } from "react";import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";@@ -17,6 +17,7 @@ import {Text,Title,} from "metabase/ui";+import * as Urls from "metabase/urls";import { useTransformsBilling } from "metabase-enterprise/transforms/upsells/hooks";import { PurchaseAdvancedTransforms } from "./PurchaseAdvancedTransforms";@@ -26,14 +27,20 @@ type PythonTransformsUpsellModalProps = {onClose: VoidFunction;};-export function PythonTransformsUpsellModal({+export function PythonTransformsUpsell({+ shouldShowLeftColumn,onClose,-}: PythonTransformsUpsellModalProps) {+ onSuccess,+}: {+ shouldShowLeftColumn: boolean;+ onClose?: () => void;+ onSuccess: () => void;+}) {const bulletPoints = [t`Use Python to handle complex logic that's awkward or brittle in SQL`,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`,+ t`Add a separate database connection for write operations`,];const isHosted = useSelector(getIsHosted);@@ -46,7 +53,97 @@ export function PythonTransformsUpsellModal({trackUpsellViewed({ location: LOCATION, campaign: CAMPAIGN });}, []);+ return (+ <>+ {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}>+ {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.`}{" "}+ {t`Use the transform inspector to verify output.`}+ </Text>+ {!advancedTransformsAddOn ? (+ <Text>+ {t`Error fetching information about available add-ons.`}+ </Text>+ ) : (+ <PurchaseAdvancedTransforms+ handleModalClose={onClose}+ addOn={advancedTransformsAddOn}+ freeUnitsIncluded={!hadAdvancedTransforms}+ onSuccess={onSuccess}+ />+ )}+ </Stack>+ )}+ {/* 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>+ )}+ </>+ );+}++export function PythonTransformsUpsellModal({+ onClose,+}: PythonTransformsUpsellModalProps) {+ const isHosted = useSelector(getIsHosted);+ const { isStoreUser } = useSelector(getStoreUsers);const shouldShowLeftColumn = isStoreUser && isHosted;+ const onSuccess = useCallback(() => {+ window.location.href = Urls.transformList(); // On success, do a full-page redirect to transforms list+ }, []);return (<Modal.Root@@ -57,81 +154,11 @@ export function PythonTransformsUpsellModal({<Modal.Overlay /><Modal.Content><Modal.Body p={0}>- {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}>- {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.`}{" "}- {t`Use the transform inspector to verify output output to verify it.`}- </Text>- {!advancedTransformsAddOn ? (- <Text>- {t`Error fetching information about available add-ons.`}- </Text>- ) : (- <PurchaseAdvancedTransforms- handleModalClose={onClose}- addOn={advancedTransformsAddOn}- freeUnitsIncluded={!hadAdvancedTransforms}- />- )}- </Stack>- )}- {/* 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>- )}+ <PythonTransformsUpsell+ shouldShowLeftColumn={shouldShowLeftColumn}+ onClose={onClose}+ onSuccess={onSuccess}+ /></Modal.Body></Modal.Content></Modal.Root>diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsxnew file mode 100644index 00000000000..1623237c8a8--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx@@ -0,0 +1,51 @@+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { DottedBackground } from "metabase/common/components/upsells/components/DottedBackground";+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";+import { useSelector } from "metabase/redux/hooks";+import { getStoreUsers } from "metabase/selectors/store-users";+import { getIsHosted } from "metabase/setup/selectors";+import { TransformHeader } from "metabase/transforms/components/TransformHeader";+import { useTransformWithPolling } from "metabase/transforms/hooks/use-transform-with-polling";+import { Card, Center, Stack } from "metabase/ui";+import * as Urls from "metabase/urls";+import { reload } from "metabase/utils/dom";++import { PythonTransformsUpsell } from "./PythonTransformsUpsellModal";++type TransformInspectorUpsellPageProps = {+ params: { transformId: string };+};++export function TransformInspectorUpsellPage({+ params,+}: TransformInspectorUpsellPageProps) {+ const transformId = Urls.extractEntityId(params.transformId);+ const { transform, isLoading, error } = useTransformWithPolling(transformId);+ const isHosted = useSelector(getIsHosted);+ const { isStoreUser } = useSelector(getStoreUsers);+ const shouldShowLeftColumn = isStoreUser && isHosted;++ if (isLoading || error || !transform) {+ return (+ <Center h="100%">+ <LoadingAndErrorWrapper loading={isLoading} error={error} />+ </Center>+ );+ }++ return (+ <DottedBackground>+ <PageContainer>+ <TransformHeader transform={transform} />+ <Stack align="center" py="lg">+ <Card p={0} withBorder maw="48rem" w="100%">+ <PythonTransformsUpsell+ shouldShowLeftColumn={shouldShowLeftColumn}+ onSuccess={reload}+ />+ </Card>+ </Stack>+ </PageContainer>+ </DottedBackground>+ );+}diff --git a/frontend/src/metabase/plugins/oss/transforms.ts b/frontend/src/metabase/plugins/oss/transforms.tsindex bb15e6c6ea1..2bc4f01ffa4 100644--- a/frontend/src/metabase/plugins/oss/transforms.ts+++ b/frontend/src/metabase/plugins/oss/transforms.ts@@ -50,6 +50,7 @@ export type PythonTransformSourceValidationResult = {export type PythonTransformsPlugin = {isEnabled: boolean;+ shouldShowInspectTab: boolean;getPythonTransformsRoutes: () => ReactNode;getInspectorRoutes: () => ReactNode;getPythonSourceValidationResult: (@@ -72,14 +73,9 @@ export const PLUGIN_TRANSFORMS = getDefaultPluginTransforms();const getDefaultPluginTransformsPython = (): PythonTransformsPlugin => ({isEnabled: false,+ shouldShowInspectTab: false,getPythonTransformsRoutes: () => null,- getInspectorRoutes: () => {- const {- getDefaultInspectorRoutes,- // eslint-disable-next-line @typescript-eslint/no-require-imports- } = require("metabase/transforms/pages/TransformInspectorUpsellPage/routes");- return getDefaultInspectorRoutes();- },+ getInspectorRoutes: () => null,getPythonSourceValidationResult: () => ({ isValid: true }),TransformEditor: PluginPlaceholder,SourceSection: PluginPlaceholder,diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsxindex 7c481ca5c9f..3a612ff02b1 100644--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx@@ -85,13 +85,14 @@ describe("TransformHeader", () => {});describe("inspect tab upsell", () => {- it("should always render the Inspect tab", () => {+ it("should not render the Inspect tab for oss", () => {setup();- expect(screen.getByText("Inspect")).toBeInTheDocument();+ expect(screen.queryByText("Inspect")).not.toBeInTheDocument();});it("should show upsell gem when transforms-python is not enabled", () => {+ setupEnterprisePlugins();setup();const inspectLink = screen.getByRole("link", { name: /Inspect/ });diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsxindex fea2d7afbec..0e5b8326f99 100644--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx@@ -35,13 +35,16 @@ function getTabs(id: TransformId): PaneHeaderTab[] {label: t`Settings`,to: Urls.transformSettings(id),},- {+ ];++ if (PLUGIN_TRANSFORMS_PYTHON.shouldShowInspectTab) {+ tabs.push({label: t`Inspect`,to: inspectUrl,isGated: !PLUGIN_TRANSFORMS_PYTHON.isEnabled,isSelected: (pathname: string) => pathname.startsWith(inspectUrl),- },- ];+ });+ }if (PLUGIN_DEPENDENCIES.isEnabled) {tabs.push({diff --git a/frontend/src/metabase/transforms/pages/TransformInspectorUpsellPage/TransformInspectorUpsellPage.tsx b/frontend/src/metabase/transforms/pages/TransformInspectorUpsellPage/TransformInspectorUpsellPage.tsxdeleted file mode 100644index a21d2351999..00000000000--- a/frontend/src/metabase/transforms/pages/TransformInspectorUpsellPage/TransformInspectorUpsellPage.tsx+++ /dev/null@@ -1,62 +0,0 @@-import { t } from "ttag";--import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { DottedBackground } from "metabase/common/components/upsells/components/DottedBackground";-import { LineDecorator } from "metabase/common/components/upsells/components/LineDecorator";-import { useUpgradeAction } from "metabase/common/components/upsells/components/UpgradeModal";-import { UpsellCardContent } from "metabase/common/components/upsells/components/UpsellCardContent";-import { DATA_STUDIO_UPGRADE_URL } from "metabase/common/components/upsells/constants";-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";-import { TransformHeader } from "metabase/transforms/components/TransformHeader";-import {- INSPECTOR_UPSELL_CAMPAIGN,- INSPECTOR_UPSELL_LOCATION,-} from "metabase/transforms/constants";-import { useTransformWithPolling } from "metabase/transforms/hooks/use-transform-with-polling";-import { Center, Stack } from "metabase/ui";-import * as Urls from "metabase/urls";--type TransformInspectorUpsellPageProps = {- params: { transformId: string };-};--export function TransformInspectorUpsellPage({- params,-}: TransformInspectorUpsellPageProps) {- const transformId = Urls.extractEntityId(params.transformId);- const { transform, isLoading, error } = useTransformWithPolling(transformId);-- const { onClick: upgradeOnClick, url: upgradeUrl } = useUpgradeAction({- url: DATA_STUDIO_UPGRADE_URL,- campaign: INSPECTOR_UPSELL_CAMPAIGN,- location: INSPECTOR_UPSELL_LOCATION,- });-- if (isLoading || error || !transform) {- return (- <Center h="100%">- <LoadingAndErrorWrapper loading={isLoading} error={error} />- </Center>- );- }-- return (- <DottedBackground>- <PageContainer>- <TransformHeader transform={transform} />- <Stack align="center" py="xl">- <LineDecorator>- <UpsellCardContent- campaign={INSPECTOR_UPSELL_CAMPAIGN}- location={INSPECTOR_UPSELL_LOCATION}- title={t`See what's happening inside your transforms`}- description={t`Get a diagnostic view of your transforms, so you can catch data quality issues before they cause problems downstream.`}- upgradeOnClick={upgradeOnClick}- upgradeUrl={upgradeUrl}- />- </LineDecorator>- </Stack>- </PageContainer>- </DottedBackground>- );-}diff --git a/frontend/src/metabase/transforms/pages/TransformInspectorUpsellPage/index.ts b/frontend/src/metabase/transforms/pages/TransformInspectorUpsellPage/index.tsdeleted file mode 100644index 2533179eb83..00000000000--- a/frontend/src/metabase/transforms/pages/TransformInspectorUpsellPage/index.ts+++ /dev/null@@ -1 +0,0 @@-export { TransformInspectorUpsellPage } from "./TransformInspectorUpsellPage";diff --git a/frontend/src/metabase/transforms/pages/TransformInspectorUpsellPage/routes.tsx b/frontend/src/metabase/transforms/pages/TransformInspectorUpsellPage/routes.tsxdeleted file mode 100644index e751aef0dfa..00000000000--- a/frontend/src/metabase/transforms/pages/TransformInspectorUpsellPage/routes.tsx+++ /dev/null@@ -1,18 +0,0 @@-import { Route } from "react-router";--import { TransformInspectorUpsellPage } from "./TransformInspectorUpsellPage";--export function getDefaultInspectorRoutes() {- return (- <>- <Route- path=":transformId/inspect"- component={TransformInspectorUpsellPage}- />- <Route- path=":transformId/inspect/:lensId"- component={TransformInspectorUpsellPage}- />- </>- );-}