Skip to content

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

Address issues found by Claude review on "Data Studio Upsells" #68886 (#69258)

Andersonb6427ea1070c
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/components/PythonTransformsUpsellModal/CloudPurchaseContent.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/components/PythonTransformsUpsellModal/CloudPurchaseContent.tsx
index a9fd57a8738..0f81710a353 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/components/PythonTransformsUpsellModal/CloudPurchaseContent.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/components/PythonTransformsUpsellModal/CloudPurchaseContent.tsx
@@ -3,6 +3,7 @@ import { useCallback } from "react";
import { t } from "ttag";
import { trackUpsellClicked } from "metabase/admin/upsells/components/analytics";
+import { useMetadataToasts } from "metabase/metadata/hooks";
import { Button, Card, Divider, Flex, Group, Stack, Text } from "metabase/ui";
import { usePurchaseCloudAddOnMutation } from "metabase-enterprise/api";
import { TransformsSettingUpModal } from "metabase-enterprise/data-studio/upsells/components";
@@ -25,6 +26,7 @@ export const CloudPurchaseContent = (props: CloudPurchaseContentProps) => {
const [purchaseCloudAddOn, { isLoading: isPurchasing }] =
usePurchaseCloudAddOnMutation();
const [settingUpModalOpened, settingUpModalHandlers] = useDisclosure(false);
+ const { sendErrorToast } = useMetadataToasts();
const dueToday = isTrialFlow ? 0 : pythonPrice;
const handleCloudPurchase = useCallback(async () => {
@@ -36,10 +38,19 @@ export const CloudPurchaseContent = (props: CloudPurchaseContentProps) => {
product_type: "transforms-advanced",
}).unwrap();
} catch {
+ sendErrorToast(
+ t`It looks like something went wrong. Please refresh the page and try again.`,
+ );
settingUpModalHandlers.close();
onError();
}
- }, [purchaseCloudAddOn, settingUpModalHandlers, handleModalClose, onError]);
+ }, [
+ handleModalClose,
+ onError,
+ purchaseCloudAddOn,
+ sendErrorToast,
+ settingUpModalHandlers,
+ ]);
const billingPeriodLabel = billingPeriod === "monthly" ? t`month` : t`year`;
return (
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/components/PythonTransformsUpsellModal/SelfHostedContent.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/components/PythonTransformsUpsellModal/SelfHostedContent.tsx
index efee17945b0..42e0db8242f 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/components/PythonTransformsUpsellModal/SelfHostedContent.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/components/PythonTransformsUpsellModal/SelfHostedContent.tsx
@@ -25,7 +25,6 @@ export const SelfHostedContent = (props: SelfHostedContentProps) => {
});
const handleSelfHostedClick = () => {
- trackUpsellClicked({ location: LOCATION, campaign: CAMPAIGN });
triggerUpsellFlow?.();
handleModalClose();
};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/hooks/useTransformsBilling.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/hooks/useTransformsBilling.ts
index adaa84aedb6..cc763c0f0b2 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/hooks/useTransformsBilling.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/hooks/useTransformsBilling.ts
@@ -64,10 +64,9 @@ export function useTransformsBilling(): {
const trialEndDate = tokenStatus?.["valid-thru"];
// Check if user already has basic transforms (to show upgrade-only)
- const hasBasicTransforms =
- (hasPremiumFeature("transforms") &&
- !hasPremiumFeature("transforms-python")) ??
- false;
+ const hasBasicTransforms = Boolean(
+ hasPremiumFeature("transforms") && !hasPremiumFeature("transforms-python"),
+ );
return {
error: addOnsError || billingInfoError,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/pages/TransformsUpsellPage/components/PricingSummary.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/pages/TransformsUpsellPage/components/PricingSummary.tsx
index 4707495f5da..eb2c2395154 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/pages/TransformsUpsellPage/components/PricingSummary.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/upsells/pages/TransformsUpsellPage/components/PricingSummary.tsx
@@ -2,6 +2,7 @@ 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/data-studio/upsells/components";
@@ -28,6 +29,7 @@ export const PricingSummary = (props: PricingSummaryProps) => {
const [purchaseCloudAddOn, { isLoading: isPurchasing }] =
usePurchaseCloudAddOnMutation();
const [settingUpModalOpened, settingUpModalHandlers] = useDisclosure(false);
+ const { sendErrorToast } = useMetadataToasts();
// When showing advanced only, always use python price
const selectedPrice = showAdvancedOnly
@@ -51,13 +53,17 @@ export const PricingSummary = (props: PricingSummaryProps) => {
product_type: productType,
}).unwrap();
} catch {
+ sendErrorToast(
+ t`It looks like something went wrong. Please refresh the page and try again.`,
+ );
settingUpModalHandlers.close();
}
}, [
- showAdvancedOnly,
- selectedTier,
purchaseCloudAddOn,
+ selectedTier,
+ sendErrorToast,
settingUpModalHandlers,
+ showAdvancedOnly,
]);
return (
diff --git a/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx
index ac920eae8bf..cdc03ec656d 100644
--- a/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx
+++ b/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx
@@ -101,8 +101,8 @@ export function RemoteSyncUpsellPage() {
t`Please ask a Metabase Store Admin to upgrade your plan.`}
</Text>
)}
- {!isTrialAvailable && (
- <Text>{t`Get a 14 day free trial of this and other pro features`}</Text>
+ {isTrialAvailable && (
+ <Text>{t`Get a 14-day free trial of this and other pro features`}</Text>
)}
</Stack>
{!shouldShowContactAdmin && (