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
Sprinkled upsell gems in embed wizard (#71076)
Sébastien0cc35ac87683
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/WithNotAvailableForOssOrGuestEmbedsGuard.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/WithNotAvailableForOssOrGuestEmbedsGuard.tsxindex 86cfb39bef1..7e22219558c 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/WithNotAvailableForOssOrGuestEmbedsGuard.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/WithNotAvailableForOssOrGuestEmbedsGuard.tsx@@ -1,9 +1,10 @@import type { ReactNode } from "react";import { t } from "ttag";-import { TooltipWarning } from "metabase/embedding/embedding-iframe-sdk-setup/components/Common/TooltipWarning";import { useSdkIframeEmbedSetupContext } from "metabase/embedding/embedding-iframe-sdk-setup/context";+import { TooltipWarning } from "./TooltipWarning";+export const WithNotAvailableForOssOrGuestEmbedsGuard = ({children,}: {@@ -12,15 +13,19 @@ export const WithNotAvailableForOssOrGuestEmbedsGuard = ({const { isSimpleEmbedFeatureAvailable, settings } =useSdkIframeEmbedSetupContext();+ if (!isSimpleEmbedFeatureAvailable) {+ return children({ disabled: true, hoverCard: null });+ }+return (<TooltipWarning- enableTooltip={isSimpleEmbedFeatureAvailable}+ enableTooltiptooltip={t`Not available if Guest Mode is selected`}disabled={!!settings.isGuest}>{({ disabled: disabledForGuestEmbeds, hoverCard }) =>children({- disabled: !isSimpleEmbedFeatureAvailable || disabledForGuestEmbeds,+ disabled: disabledForGuestEmbeds,hoverCard,})}diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedOptionsStep.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedOptionsStep.tsxindex 0bf9eeb4a9e..408a325ddd0 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedOptionsStep.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedOptionsStep.tsx@@ -3,6 +3,7 @@ import { Link } from "react-router";import { P, match } from "ts-pattern";import { c, t } from "ttag";+import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";import { useDocsUrl, useHasEmailSetup } from "metabase/common/hooks";import type {MetabaseColors,@@ -18,6 +19,7 @@ import {Icon,Stack,Text,+ Tooltip,} from "metabase/ui";import { UPSELL_CAMPAIGN_BEHAVIOR } from "../analytics";@@ -262,9 +264,19 @@ const BehaviorSection = () => {return (<Card p="md"><Flex align="center" justify="space-between" gap="xs" mb="md">- <Text size="lg" fw="bold">- {t`Behavior`}- </Text>+ <Flex align="center" gap="xs">+ <Text size="lg" fw="bold">+ {t`Behavior`}+ </Text>+ {!isSimpleEmbedFeatureAvailable && (+ // eslint-disable-next-line metabase/no-literal-metabase-strings -- Only admins can see the EmbedJS Wizard+ <Tooltip label={t`Available on Metabase Pro plans`}>+ <Flex align="center">+ <UpsellGem />+ </Flex>+ </Tooltip>+ )}+ </Flex>{!!behaviorDocsParams?.page && (<Anchordata-testid="behavior-docs-link"diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/SdkIframeEmbedSetup.unit.spec.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/SdkIframeEmbedSetup.unit.spec.tsxindex 8b9fe30bae7..d7a4ee4bbc6 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/SdkIframeEmbedSetup.unit.spec.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/SdkIframeEmbedSetup.unit.spec.tsx@@ -5,7 +5,7 @@ import {setupCardQueryMetadataEndpoint,setupDatabasesEndpoints,} from "__support__/server-mocks";-import { screen } from "__support__/ui";+import { screen, waitFor } from "__support__/ui";import { PLUGIN_EMBEDDING_IFRAME_SDK_SETUP } from "metabase/plugins";import {createMockCard,@@ -149,3 +149,144 @@ describe("Embed flow > forward and backward navigation", () => {).not.toBeInTheDocument();});});++describe("Embed flow > Pro feature upsell indicators", () => {+ it("disables Pro checkboxes for OSS users (question)", () => {+ const mockDatabase = createMockDatabase();+ const mockCard = createMockCard({ id: 456 });++ setupDatabasesEndpoints([mockDatabase]);+ setupCardEndpoints(mockCard);+ setupCardQueryMetadataEndpoint(+ mockCard,+ createMockCardQueryMetadata({+ databases: [mockDatabase],+ }),+ );++ setup({+ simpleEmbeddingEnabled: false,+ initialState: {+ resourceType: "question",+ resourceId: 456,+ },+ });++ // All Pro-gated checkboxes should be disabled+ expect(+ screen.getByRole("checkbox", {+ name: "Allow people to drill through on data points",+ }),+ ).toBeDisabled();+ expect(+ screen.getByRole("checkbox", { name: "Allow downloads" }),+ ).toBeDisabled();+ expect(+ screen.getByRole("checkbox", {+ name: "Allow people to save new questions",+ }),+ ).toBeDisabled();+ expect(+ screen.getByRole("checkbox", { name: "Allow alerts" }),+ ).toBeDisabled();+ });++ it("enables Pro checkboxes for Pro users (question)", async () => {+ PLUGIN_EMBEDDING_IFRAME_SDK_SETUP.isEnabled = jest.fn(() => true);++ const mockDatabase = createMockDatabase();+ const mockCard = createMockCard({ id: 456 });++ setupDatabasesEndpoints([mockDatabase]);+ setupCardEndpoints(mockCard);+ setupCardQueryMetadataEndpoint(+ mockCard,+ createMockCardQueryMetadata({+ databases: [mockDatabase],+ }),+ );++ setup({+ simpleEmbeddingEnabled: true,+ hasEmailSetup: true,+ initialState: {+ resourceType: "question",+ resourceId: 456,+ },+ });++ expect(+ screen.getByRole("checkbox", {+ name: "Allow people to drill through on data points",+ }),+ ).toBeEnabled();+ expect(+ screen.getByRole("checkbox", { name: "Allow downloads" }),+ ).toBeEnabled();+ expect(+ screen.getByRole("checkbox", {+ name: "Allow people to save new questions",+ }),+ ).toBeEnabled();+ await waitFor(() => {+ expect(+ screen.getByRole("checkbox", { name: "Allow alerts" }),+ ).toBeEnabled();+ });++ PLUGIN_EMBEDDING_IFRAME_SDK_SETUP.isEnabled = () => false;+ });++ it("disables Pro checkboxes for OSS users (dashboard)", () => {+ setupDatabasesEndpoints([createMockDatabase()]);++ setup({+ simpleEmbeddingEnabled: false,+ initialState: {+ resourceType: "dashboard",+ resourceId: 1,+ },+ });++ expect(+ screen.getByRole("checkbox", {+ name: "Allow people to drill through on data points",+ }),+ ).toBeDisabled();+ expect(+ screen.getByRole("checkbox", { name: "Allow downloads" }),+ ).toBeDisabled();+ expect(+ screen.getByRole("checkbox", { name: "Allow subscriptions" }),+ ).toBeDisabled();+ });++ it("enables Pro checkboxes for Pro users (dashboard)", async () => {+ PLUGIN_EMBEDDING_IFRAME_SDK_SETUP.isEnabled = jest.fn(() => true);++ setup({+ simpleEmbeddingEnabled: true,+ hasEmailSetup: true,+ });++ // Navigate to options step: Next (experience) → Next (resource)+ await userEvent.click(screen.getByRole("button", { name: "Next" }));+ await userEvent.click(screen.getByRole("button", { name: "Next" }));++ expect(+ screen.getByRole("checkbox", {+ name: "Allow people to drill through on data points",+ }),+ ).toBeEnabled();+ expect(+ screen.getByRole("checkbox", { name: "Allow downloads" }),+ ).toBeEnabled();+ await waitFor(() => {+ expect(+ screen.getByRole("checkbox", { name: "Allow subscriptions" }),+ ).toBeEnabled();+ });++ PLUGIN_EMBEDDING_IFRAME_SDK_SETUP.isEnabled = () => false;+ });+});diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/test-setup.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/test-setup.tsxindex 6492f5b9b53..94a8e3e79ee 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/test-setup.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/test-setup.tsx@@ -29,6 +29,7 @@ export const setup = (options?: {showSimpleEmbedTerms?: boolean;jwtReady?: boolean;initialState?: SdkIframeEmbedSetupModalInitialState;+ hasEmailSetup?: boolean;}) => {const { enterprisePlugins } = options ?? {};@@ -65,7 +66,9 @@ export const setup = (options?: {);setupUpdateSettingsEndpoint();setupUpdateSettingEndpoint();- setupNotificationChannelsEndpoints({});+ setupNotificationChannelsEndpoints(+ options?.hasEmailSetup ? { email: { configured: true } as any } : {},+ );renderWithProviders(<SdkIframeEmbedSetupModaldiff --git a/frontend/src/metabase/ui/components/inputs/Checkbox/Checkbox.module.css b/frontend/src/metabase/ui/components/inputs/Checkbox/Checkbox.module.cssindex 56ba621ca48..b1481e12b1c 100644--- a/frontend/src/metabase/ui/components/inputs/Checkbox/Checkbox.module.css+++ b/frontend/src/metabase/ui/components/inputs/Checkbox/Checkbox.module.css@@ -65,7 +65,6 @@}.input {- cursor: pointer;border: 1px solid var(--mb-color-border);background-color: var(--mb-color-background-primary);@@ -81,6 +80,10 @@background-color: var(--mb-color-brand);}+ &:not(:disabled) {+ cursor: pointer;+ }+&:disabled {border-color: var(--mb-color-background-disabled);background-color: var(--mb-color-background-disabled);@@ -91,7 +94,6 @@color: var(--mb-color-text-primary);font-size: var(--mantine-font-size-md);line-height: var(--mantine-line-height-md);- cursor: pointer;}.description {@@ -99,7 +101,6 @@font-size: var(--mantine-font-size-sm);line-height: var(--mantine-line-height-sm);margin-top: var(--mantine-spacing-xs);- cursor: pointer;}.icon {diff --git a/frontend/src/metabase/ui/components/inputs/Radio/Radio.module.css b/frontend/src/metabase/ui/components/inputs/Radio/Radio.module.cssindex 48bc04eecbb..dadd89a0ef5 100644--- a/frontend/src/metabase/ui/components/inputs/Radio/Radio.module.css+++ b/frontend/src/metabase/ui/components/inputs/Radio/Radio.module.css@@ -20,9 +20,12 @@}.radio {- cursor: pointer;border-color: var(--mb-color-text-tertiary);+ &:not(:disabled) {+ cursor: pointer;+ }+&:checked {border-color: var(--mb-color-brand);background-color: var(--mb-color-brand);