Skip to content

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

Embedding upsells now open data studio modal in cloud (#70565)

Sébastienff9d9acdac0d
diff --git a/e2e/test/scenarios/embedding/embedding-admin-settings-oss.cy.spec.ts b/e2e/test/scenarios/embedding/embedding-admin-settings-oss.cy.spec.ts
index 655aa86b177..54135c27703 100644
--- a/e2e/test/scenarios/embedding/embedding-admin-settings-oss.cy.spec.ts
+++ b/e2e/test/scenarios/embedding/embedding-admin-settings-oss.cy.spec.ts
@@ -50,7 +50,7 @@ describe(
.should("have.attr", "href")
.and(
"eq",
- "https://www.metabase.com/upgrade?utm_source=product&utm_medium=upsell&utm_content=embedding-page&source_plan=oss&utm_users=10&utm_campaign=embedded-analytics-js",
+ "https://www.metabase.com/upgrade?utm_source=product&utm_medium=upsell&utm_content=embedding-page&source_plan=oss&utm_users=10&utm_campaign=embedding-methods",
);
});
});
diff --git a/e2e/test/scenarios/embedding/embedding-smoketests.cy.spec.js b/e2e/test/scenarios/embedding/embedding-smoketests.cy.spec.js
index efac6e24bbe..5fb173e904c 100644
--- a/e2e/test/scenarios/embedding/embedding-smoketests.cy.spec.js
+++ b/e2e/test/scenarios/embedding/embedding-smoketests.cy.spec.js
@@ -46,7 +46,7 @@ describe("scenarios > embedding > smoke tests", { tags: "@OSS" }, () => {
.should("have.attr", "href")
.and(
"eq",
- "https://www.metabase.com/upgrade?utm_source=product&utm_medium=upsell&utm_content=embedding-page&source_plan=oss&utm_users=10&utm_campaign=embedded-analytics-js",
+ "https://www.metabase.com/upgrade?utm_source=product&utm_medium=upsell&utm_content=embedding-page&source_plan=oss&utm_users=10&utm_campaign=embedding-methods",
);
});
});
diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/GuestEmbedsSettings/GuestEmbedsSettings.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/GuestEmbedsSettings/GuestEmbedsSettings.unit.spec.tsx
index 1b3f0356a82..d7d22e5baf6 100644
--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/GuestEmbedsSettings/GuestEmbedsSettings.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/GuestEmbedsSettings/GuestEmbedsSettings.unit.spec.tsx
@@ -5,6 +5,7 @@ import {
setupPropertiesEndpoints,
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
+ setupUpsellEndpoints,
setupUserKeyValueEndpoints,
} from "__support__/server-mocks";
import { renderWithProviders, screen } from "__support__/ui";
@@ -22,6 +23,7 @@ const setup = async ({ enabled }: { enabled: boolean }) => {
setupPropertiesEndpoints(settings);
setupSettingsEndpoints([]);
setupUpdateSettingEndpoint();
+ setupUpsellEndpoints();
setupEmbeddableEntitiesEndpoints({
dashboards: [createMockDashboard({ name: "My cool dashboard" })],
cards: [createMockCard({ name: "My cool card" })],
diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx
index bcdb480135a..e1fa281b3bd 100644
--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx
+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx
@@ -7,6 +7,7 @@ import { UpsellBanner } from "metabase/common/components/upsells/components";
import { useSetting } from "metabase/common/hooks";
import { useSelector } from "metabase/lib/redux";
import {
+ PLUGIN_ADMIN_SETTINGS,
PLUGIN_CONTENT_TRANSLATION,
PLUGIN_EMBEDDING_IFRAME_SDK_SETUP,
} from "metabase/plugins";
@@ -36,6 +37,11 @@ export function SharedCombinedEmbeddingSettings({
getUpgradeUrl(state, { utm_content: "embedding-settings" }),
);
+ const { triggerUpsellFlow } = PLUGIN_ADMIN_SETTINGS.useUpsellFlow({
+ campaign: "enterprise",
+ location: "embedding-settings",
+ });
+
return (
<>
<EmbeddingSettingsCard
@@ -50,10 +56,11 @@ export function SharedCombinedEmbeddingSettings({
{!isSimpleEmbedFeatureAvailable && (
<UpsellBanner
title={t`Upgrade to Metabase Pro for more powerful embedding methods`}
- campaign="embedded-analytics-js"
+ campaign="embedding-methods"
location="embedding-page"
buttonText={t`Upgrade`}
buttonLink={upgradeUrl}
+ onClick={triggerUpsellFlow}
dismissible
>
<Text c="text-secondary" lh="md">
diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.unit.spec.tsx
index 4e92896ad25..414181bbe15 100644
--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.unit.spec.tsx
@@ -8,6 +8,7 @@ import {
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
setupUpdateSettingsEndpoint,
+ setupUpsellEndpoints,
setupUserKeyValueEndpoints,
} from "__support__/server-mocks";
import { renderWithProviders, screen } from "__support__/ui";
@@ -26,6 +27,7 @@ const setup = async ({ enabled }: { enabled: boolean }) => {
setupSettingsEndpoints([]);
setupUpdateSettingEndpoint();
setupUpdateSettingsEndpoint();
+ setupUpsellEndpoints();
setupEmbeddableEntitiesEndpoints({
dashboards: [createMockDashboard({ name: "My cool dashboard" })],
cards: [createMockCard({ name: "My cool card" })],
diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/tests/setup.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/tests/setup.tsx
index 22332c544e0..26193762cef 100644
--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/tests/setup.tsx
+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/tests/setup.tsx
@@ -6,6 +6,7 @@ import {
setupTokenStatusEndpoint,
setupUpdateSettingEndpoint,
setupUpdateSettingsEndpoint,
+ setupUpsellEndpoints,
setupUserKeyValueEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
@@ -64,6 +65,7 @@ export async function setup({
setupSettingsEndpoints([]);
setupUpdateSettingEndpoint();
setupUpdateSettingsEndpoint();
+ setupUpsellEndpoints();
setupUserKeyValueEndpoints({
namespace: "user_acknowledgement",
key: "upsell-dev_instances",
diff --git a/frontend/src/metabase/common/components/ExternalLink/ExternalLink.tsx b/frontend/src/metabase/common/components/ExternalLink/ExternalLink.tsx
index 7aa83d520e4..72c4e6d15a1 100644
--- a/frontend/src/metabase/common/components/ExternalLink/ExternalLink.tsx
+++ b/frontend/src/metabase/common/components/ExternalLink/ExternalLink.tsx
@@ -20,6 +20,7 @@ export const ExternalLink = forwardRef(function ExternalLink(
return (
<a
ref={ref}
+ role="link"
href={href}
className={`${S.LinkRoot} ${className || CS.link}`}
target={target}
diff --git a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsx
index 778a6260679..155ac74530a 100644
--- a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsx
+++ b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsx
@@ -32,7 +32,8 @@ export function useUpgradeAction({
}, [dispatch]);
const shouldUseModal =
- isHosted && (url === UPGRADE_URL || url === DATA_STUDIO_UPGRADE_URL);
+ isHosted &&
+ (url.startsWith(UPGRADE_URL) || url === DATA_STUDIO_UPGRADE_URL);
if (shouldUseModal) {
return {
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/EmbeddingUpsell.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/EmbeddingUpsell.tsx
index 6878cf5d843..91eb71993bf 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/EmbeddingUpsell.tsx
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/EmbeddingUpsell.tsx
@@ -4,6 +4,7 @@ import { UpsellCard } from "metabase/common/components/upsells/UpsellCard";
import { UTM_LOCATION } from "metabase/embedding/embedding-iframe-sdk-setup/analytics";
import { useSdkIframeEmbedSetupContext } from "metabase/embedding/embedding-iframe-sdk-setup/context";
import { useSelector } from "metabase/lib/redux";
+import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";
import { getUpgradeUrl } from "metabase/selectors/settings";
type Props = {
@@ -13,18 +14,30 @@ type Props = {
export const EmbeddingUpsell = ({ campaign }: Props) => {
const { isSimpleEmbedFeatureAvailable } = useSdkIframeEmbedSetupContext();
+ if (isSimpleEmbedFeatureAvailable) {
+ return null;
+ }
+
+ return <EmbeddingUpsellInner campaign={campaign} />;
+};
+
+// useUpsellFlow hook sets window.name = "metabase-instance" in a useEffect
+// which means we don't want to call useUpsellFlow unless necessary (as in, in Cypress for instance, where it breaks AUT).
+const EmbeddingUpsellInner = ({ campaign }: Props) => {
const upgradeUrl = useSelector((state) =>
getUpgradeUrl(state, { utm_content: "embedding-page" }),
);
- if (isSimpleEmbedFeatureAvailable) {
- return null;
- }
+ const { triggerUpsellFlow } = PLUGIN_ADMIN_SETTINGS.useUpsellFlow({
+ campaign,
+ location: "embedding-page",
+ });
return (
<UpsellCard
title={t`Get more powerful embedding`}
buttonLink={upgradeUrl}
+ onClick={triggerUpsellFlow}
campaign={campaign}
location={UTM_LOCATION}
/* eslint-disable-next-line metabase/no-literal-metabase-strings -- Button text */
diff --git a/frontend/test/__support__/server-mocks/settings.ts b/frontend/test/__support__/server-mocks/settings.ts
index cc86d9d4d3f..63e480d68f3 100644
--- a/frontend/test/__support__/server-mocks/settings.ts
+++ b/frontend/test/__support__/server-mocks/settings.ts
@@ -51,3 +51,10 @@ export function setupScimEndpoints(
fetchMock.get("path:/api/ee/scim/api_key", payload);
fetchMock.post("path:/api/ee/scim/api_key", payload);
}
+
+export function setupUpsellEndpoints() {
+ fetchMock.get(
+ "path:/api/user-key-value/namespace/user_acknowledgement/key/upsell-embedding-methods",
+ { status: 204 },
+ );
+}