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
Remove linking between static and simple embedding settings when toggling guest embeds in Admin UI (#68231)
Timofey Kachalov70cf127afd24
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.ednindex 14b68c8a92a..42e213d2adb 100644--- a/.clj-kondo/config/modules/config.edn+++ b/.clj-kondo/config/modules/config.edn@@ -614,7 +614,6 @@metabase.embedding.validation}:uses #{analyticsapi- configpremium-featuresserversettingsdiff --git a/e2e/support/helpers/e2e-embedding-iframe-sdk-setup-helpers.ts b/e2e/support/helpers/e2e-embedding-iframe-sdk-setup-helpers.tsindex c75bb3dae14..b07ab411625 100644--- a/e2e/support/helpers/e2e-embedding-iframe-sdk-setup-helpers.ts+++ b/e2e/support/helpers/e2e-embedding-iframe-sdk-setup-helpers.ts@@ -4,10 +4,20 @@ export const embedModalContent = () =>export const embedModalEnableEmbeddingCard = () =>cy.findByTestId("enable-embedding-card");-export const embedModalEnableEmbedding = () =>- embedModalEnableEmbeddingCard().within(() => {- cy.findByText(/(Agree and (continue|enable)|Enable)/).click();+export const embedModalEnableEmbedding = () => {+ cy.get("body").then(($body) => {+ const isEmbeddingDisabled =+ $body.find('[data-testid="enable-embedding-card"]').length > 0;++ if (isEmbeddingDisabled) {+ embedModalEnableEmbeddingCard().within(() => {+ cy.findByText(+ /(Agree and (continue|enable)|Enable and continue)/,+ ).click();+ });+ }});+};export const legacyStaticEmbeddingButton = () =>cy.findByTestId("legacy-static-embedding-button");diff --git a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/common.cy.spec.ts b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/common-ee.cy.spec.tssimilarity index 81%rename from e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/common.cy.spec.tsrename to e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/common-ee.cy.spec.tsindex 7cfcbf31927..3acef6d9c87 100644--- a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/common.cy.spec.ts+++ b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/common-ee.cy.spec.ts@@ -1,5 +1,7 @@-import { ORDERS_QUESTION_ID } from "e2e/support/cypress_sample_instance_data";-import { embedModalEnableEmbedding } from "e2e/support/helpers";+import {+ ORDERS_COUNT_QUESTION_ID,+ ORDERS_QUESTION_ID,+} from "e2e/support/cypress_sample_instance_data";import {getEmbedSidebar,@@ -19,7 +21,9 @@ describe("scenarios > embedding > sdk iframe embed setup > common", () => {H.activateToken("bleeding-edge");H.enableTracking();H.updateSetting("enable-embedding-simple", true);+ H.updateSetting("show-simple-embed-terms", false);H.updateSetting("enable-embedding-static", true);+ H.updateSetting("show-static-embed-terms", false);cy.intercept("GET", "/api/dashboard/**").as("dashboard");@@ -77,8 +81,6 @@ describe("scenarios > embedding > sdk iframe embed setup > common", () => {cy.wait("@dashboard");- H.embedModalEnableEmbedding();-cy.get("[data-iframe-loaded]", { timeout: 20000 }).should("have.length", 1);H.modal().should("exist");@@ -92,6 +94,26 @@ describe("scenarios > embedding > sdk iframe embed setup > common", () => {});describe("auth type switch", () => {+ it("allows to select the `guest` item even when static embedding setting is disabled", () => {+ H.updateSetting("enable-embedding-static", false);++ H.visitQuestion(ORDERS_COUNT_QUESTION_ID);++ visitNewEmbedPage({ waitForResource: false });++ cy.findByLabelText("Guest").should("be.enabled");+ });++ it("allows to select the `Metabase Account` item even when simple embedding setting is disabled", () => {+ H.updateSetting("enable-embedding-simple", false);++ H.visitQuestion(ORDERS_COUNT_QUESTION_ID);++ visitNewEmbedPage({ waitForResource: false });++ cy.findByLabelText("Metabase account (SSO)").should("be.enabled");+ });+it("should reset experience to a default only when switching from SSO to Guest auth type and the current experience does not support guest embeds", () => {visitNewEmbedPage();@@ -124,8 +146,6 @@ describe("scenarios > embedding > sdk iframe embed setup > common", () => {H.openSharingMenu("Embed");getEmbedSidebar().within(() => {- embedModalEnableEmbedding();-H.waitForSimpleEmbedIframesToLoad();H.getSimpleEmbedIframeContent().within(() => {diff --git a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/common-oss-and-starter.cy.spec.ts b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/common-oss-and-starter.cy.spec.tsnew file mode 100644index 00000000000..6c2892e642d--- /dev/null+++ b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/common-oss-and-starter.cy.spec.ts@@ -0,0 +1,48 @@+import { ORDERS_COUNT_QUESTION_ID } from "e2e/support/cypress_sample_instance_data";++import { visitNewEmbedPage } from "./helpers";++const { H } = cy;++describe("scenarios > embedding > sdk iframe embed setup > common (oss and starter)", () => {+ describe("OSS", { tags: "@OSS" }, () => runTests({ token: null }));++ describe("Starter", () => runTests({ token: "starter" }));++ function runTests({ token }: { token: "starter" | null }) {+ beforeEach(() => {+ H.restore();+ cy.signInAsAdmin();++ if (token) {+ H.activateToken(token);+ }++ H.enableTracking();++ cy.intercept("GET", "/api/dashboard/**").as("dashboard");++ H.mockEmbedJsToDevServer();+ });++ it("allows to select the `guest` item even when static embedding setting is disabled", () => {+ H.updateSetting("enable-embedding-static", false);++ H.visitQuestion(ORDERS_COUNT_QUESTION_ID);++ visitNewEmbedPage({ waitForResource: false });++ cy.findByLabelText("Guest").should("be.enabled");+ });++ it("does not allow to select the `Metabase Account`, when token feature is missing (oss)", () => {+ H.updateSetting("enable-embedding-simple", false);++ H.visitQuestion(ORDERS_COUNT_QUESTION_ID);++ visitNewEmbedPage({ waitForResource: false });++ cy.findByLabelText("Metabase account (SSO)").should("be.disabled");+ });+ }+});diff --git a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/embed-flow-enable-embed-js.cy.spec.ts b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/embed-flow-enable-embed-js-ee.cy.spec.tssimilarity index 83%rename from e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/embed-flow-enable-embed-js.cy.spec.tsrename to e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/embed-flow-enable-embed-js-ee.cy.spec.tsindex e6bb72f7ba7..2999428b221 100644--- a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/embed-flow-enable-embed-js.cy.spec.ts+++ b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/embed-flow-enable-embed-js-ee.cy.spec.ts@@ -4,19 +4,21 @@ import { getEmbedSidebar } from "./helpers";const { H } = cy;-const { IS_ENTERPRISE } = Cypress.env();-const IS_OSS = !IS_ENTERPRISE;-const MB_EDITION = IS_ENTERPRISE ? "ee" : "oss";--const DATA_BY_MB_EDITION = {- oss: {+const DATA_BY_EMBEDDING_TYPE = {+ guest: {+ path: "/admin/embedding/guest",+ token: null,+ authMethodLabel: "Guest",cardTestId: "guest-embeds-setting-card",cardText:"To continue, enable guest embeds and agree to the usage conditions.",embeddingSettingName: "enable-embedding-static",showTermsSettingName: "show-static-embed-terms",},- ee: {+ modular: {+ path: "/admin/embedding",+ token: "bleeding-edge",+ authMethodLabel: "Metabase account (SSO)",cardTestId: "sdk-setting-card",cardText:"To continue, enable modular embedding and agree to the usage conditions.",@@ -25,19 +27,24 @@ const DATA_BY_MB_EDITION = {},} as const;-describe(- `scenarios > embedding > sdk iframe embed setup > enable embed js > ${MB_EDITION}`,- { ...(IS_OSS && { tags: "@OSS" }) },- () => {- const { embeddingSettingName, showTermsSettingName, cardTestId, cardText } =- DATA_BY_MB_EDITION[MB_EDITION];+Object.entries(DATA_BY_EMBEDDING_TYPE).forEach(([key, value]) => {+ describe(`scenarios > embedding > sdk iframe embed setup > enable embed js (EE) > ${key}`, () => {+ const {+ path,+ token,+ authMethodLabel,+ embeddingSettingName,+ showTermsSettingName,+ cardTestId,+ cardText,+ } = value;beforeEach(() => {H.restore();cy.signInAsAdmin();- if (IS_ENTERPRISE) {- H.activateToken("bleeding-edge");+ if (token) {+ H.activateToken(token);}H.mockEmbedJsToDevServer();@@ -47,7 +54,7 @@ describe(H.updateSetting(embeddingSettingName, false);H.updateSetting(showTermsSettingName, true);- cy.visit("/admin/embedding");+ cy.visit(path);cy.findAllByTestId(cardTestId).first()@@ -55,6 +62,8 @@ describe(cy.findByText("New embed").click();});+ cy.findByLabelText(authMethodLabel).click();+embedModalEnableEmbeddingCard().within(() => {cy.findByText(cardText).should("exist");});@@ -111,7 +120,7 @@ describe(H.updateSetting(embeddingSettingName, true);H.updateSetting(showTermsSettingName, true);- cy.visit("/admin/embedding");+ cy.visit(path);cy.findAllByTestId(cardTestId).first()@@ -119,6 +128,8 @@ describe(cy.findByText("New embed").click();});+ cy.findByLabelText(authMethodLabel).click();+embedModalEnableEmbeddingCard().within(() => {cy.findByText("Agree to the usage conditions to continue.").should("exist",@@ -141,7 +152,7 @@ describe(H.updateSetting(embeddingSettingName, true);H.updateSetting(showTermsSettingName, false);- cy.visit("/admin/embedding");+ cy.visit(path);cy.findAllByTestId(cardTestId).first()@@ -149,7 +160,9 @@ describe(cy.findByText("New embed").click();});+ cy.findByLabelText(authMethodLabel).click();+getEmbedSidebar().contains(cardText).should("not.exist");});- },-);+ });+});diff --git a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/embed-flow-enable-embed-js-oss-and-starter.cy.spec.ts b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/embed-flow-enable-embed-js-oss-and-starter.cy.spec.tsnew file mode 100644index 00000000000..320e62a1005--- /dev/null+++ b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/embed-flow-enable-embed-js-oss-and-starter.cy.spec.ts@@ -0,0 +1,168 @@+import { embedModalEnableEmbeddingCard } from "e2e/support/helpers";++import { getEmbedSidebar } from "./helpers";++const { H } = cy;++describe("scenarios > embedding > sdk iframe embed setup > enable embed js (oss and starter)", () => {+ describe("OSS", { tags: "@OSS" }, () => runTests({ token: null }));++ describe("Starter", () => runTests({ token: "starter" }));++ function runTests({ token }: { token: "starter" | null }) {+ beforeEach(() => {+ H.restore();+ cy.signInAsAdmin();++ if (token) {+ H.activateToken(token);+ }++ H.mockEmbedJsToDevServer();+ });++ describe("guest", () => {+ it("shows the Enable to Continue button and enables embedding on click", () => {+ H.updateSetting("enable-embedding-static", false);+ H.updateSetting("show-static-embed-terms", true);++ cy.visit("/admin/embedding");++ cy.findAllByTestId("guest-embeds-setting-card")+ .first()+ .within(() => {+ cy.findByText("New embed").click();+ });++ embedModalEnableEmbeddingCard().within(() => {+ cy.findByText(+ "To continue, enable guest embeds and agree to the usage conditions.",+ ).should("exist");+ });++ cy.log("shows tooltip with fair usage info");+ embedModalEnableEmbeddingCard()+ .findByLabelText("info icon")+ .trigger("mouseover");++ H.hovercard()+ .contains(+ /You should, however, read the license text linked above as that is the actual license that you will be agreeing to by enabling this feature/,+ )+ .should("be.visible");++ embedModalEnableEmbeddingCard()+ .findByLabelText("info icon")+ .trigger("mouseout");++ cy.findByRole("button", { name: "Agree and enable" }).should(+ "be.visible",+ );++ cy.log("preview panel should show placeholder");+ cy.get('[alt="No results"]').should("be.visible");++ cy.findByRole("button", { name: "Agree and enable" }).click();++ cy.log("button should change to Enabled state");+ cy.findByRole("button", { name: /Enabled/ })+ .should("be.visible")+ .should("be.disabled");++ // Going to the next step and selecting "Orders in a dashboard" explicitely+ // because sometimes it selects another one that's been used recently+ // see EMB-1106+ cy.log(+ "Navigating to embed flow step 2 and selecting an item to embed",+ );+ cy.findByRole("button", { name: "Next" }).click();+ cy.get('[data-testid="embed-recent-item-card"]')+ .should("have.length.greaterThan", 0)+ .contains("Orders in a dashboard")+ .click();++ cy.log("Preview should load after embedding is enabled");+ H.waitForSimpleEmbedIframesToLoad();+ H.getSimpleEmbedIframeContent().within(() => {+ cy.findByText("Orders in a dashboard", { timeout: 60_000 }).should(+ "be.visible",+ );+ });+ });++ it("shows the enable card with fair usage terms when embedding is already enabled", () => {+ H.updateSetting("enable-embedding-static", true);+ H.updateSetting("show-static-embed-terms", true);++ cy.visit("/admin/embedding");++ cy.findAllByTestId("guest-embeds-setting-card")+ .first()+ .within(() => {+ cy.findByText("New embed").click();+ });++ embedModalEnableEmbeddingCard().within(() => {+ cy.findByText("Agree to the usage conditions to continue.").should(+ "exist",+ );++ cy.findByText(+ "To continue, enable guest embeds and agree to the usage conditions.",+ ).should("not.exist");+ });++ cy.log("shows tooltip with fair usage info");+ getEmbedSidebar().findByLabelText("info icon").trigger("mouseover");++ H.hovercard()+ .contains(+ /You should, however, read the license text linked above as that is the actual license that you will be agreeing to by enabling this feature/,+ )+ .should("be.visible");+ });++ it("hides the enable card when embedding is already enabled", () => {+ H.updateSetting("enable-embedding-static", true);+ H.updateSetting("show-static-embed-terms", false);++ cy.visit("/admin/embedding");++ cy.findAllByTestId("guest-embeds-setting-card")+ .first()+ .within(() => {+ cy.findByText("New embed").click();+ });++ getEmbedSidebar()+ .contains(+ "To continue, enable guest embeds and agree to the usage conditions.",+ )+ .should("not.exist");+ });+ });++ describe("Metabase account (sso)", () => {+ it("does not show the Enable to Continue button and disables item", () => {+ H.updateSetting("enable-embedding-simple", false);+ H.updateSetting("show-simple-embed-terms", true);++ cy.visit("/admin/embedding");++ cy.findAllByTestId("guest-embeds-setting-card")+ .first()+ .within(() => {+ cy.findByText("New embed").click();+ });++ embedModalEnableEmbeddingCard().within(() => {+ cy.findByText(+ "To continue, enable guest embeds and agree to the usage conditions.",+ ).should("not.exist");+ });++ cy.findByLabelText("Metabase account (SSO)").should("be.disabled");+ });+ });+ }+});diff --git a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/embed-parameters.cy.spec.ts b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/embed-parameters.cy.spec.tsindex 6a8f1c4a4b0..e1509f87d5f 100644--- a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/embed-parameters.cy.spec.ts+++ b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/embed-parameters.cy.spec.ts@@ -56,6 +56,7 @@ describe(suiteTitle, () => {navigateToEmbedOptionsStep({experience: "dashboard",resourceName: "Dashboard with Parameters",+ preselectSso: true,});getEmbedSidebar().within(() => {@@ -85,6 +86,7 @@ describe(suiteTitle, () => {navigateToEmbedOptionsStep({experience: "dashboard",resourceName: "Dashboard with Parameters",+ preselectSso: true,});cy.log("set default value for id");@@ -127,6 +129,7 @@ describe(suiteTitle, () => {navigateToEmbedOptionsStep({experience: "dashboard",resourceName: "Dashboard with Parameters",+ preselectSso: true,});cy.log("hide both parameters");@@ -179,6 +182,7 @@ describe(suiteTitle, () => {navigateToEmbedOptionsStep({experience: "chart",resourceName: "Question with Parameters",+ preselectSso: true,});getEmbedSidebar().within(() => {@@ -223,6 +227,7 @@ describe(suiteTitle, () => {navigateToEmbedOptionsStep({experience: "dashboard",resourceName: "Orders in a dashboard",+ preselectSso: true,});getEmbedSidebar().within(() => {@@ -236,6 +241,7 @@ describe(suiteTitle, () => {navigateToEmbedOptionsStep({experience: "chart",resourceName: "Orders, Count",+ preselectSso: true,});getEmbedSidebar().within(() => {@@ -246,7 +252,10 @@ describe(suiteTitle, () => {});it("should not show parameter settings for exploration template", () => {- navigateToEntitySelectionStep({ experience: "exploration" });+ navigateToEntitySelectionStep({+ experience: "exploration",+ preselectSso: true,+ });getEmbedSidebar().within(() => {cy.log("go to embed options step");diff --git a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/guest-embed-ee.cy.spec.ts b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/guest-embed-ee.cy.spec.tsindex efc42a66ebb..8f8114996f0 100644--- a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/guest-embed-ee.cy.spec.ts+++ b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/guest-embed-ee.cy.spec.ts@@ -1,6 +1,7 @@import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";import {JWT_SHARED_SECRET,+ embedModalEnableEmbedding,entityPickerModal,getParametersContainer,} from "e2e/support/helpers";@@ -376,8 +377,13 @@ describe("scenarios > embedding > sdk iframe embed setup > guest-embed", () => {cy.findByText("Back").click();cy.findByLabelText("Guest").should("be.visible").should("be.checked");+cy.findByLabelText("Metabase account (SSO)").click();+ });+ embedModalEnableEmbedding();++ getEmbedSidebar().within(() => {cy.findByText("Next").click();cy.findByText("Next").click();cy.findByText("Get code").click();diff --git a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/helpers/index.ts b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/helpers/index.tsindex 59831e09ac8..39e3f506a04 100644--- a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/helpers/index.ts+++ b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/helpers/index.ts@@ -36,15 +36,10 @@ export const visitNewEmbedPage = (cy.findByText("New embed").click();});- cy.get("body").then(($body) => {- const isEmbeddingDisabled =- $body.find('[data-testid="enable-embedding-card"]').length > 0;-- if (isEmbeddingDisabled) {+ cy.get("body").then(() => {+ if (waitForResource) {embedModalEnableEmbedding();- }- if (waitForResource) {cy.wait("@dashboard");cy.get("[data-iframe-loaded]", { timeout: 20000 }).should(@@ -103,6 +98,7 @@ export const navigateToEntitySelectionStep = (if (preselectSso || !isQuestionOrDashboardExperience) {cy.findByLabelText("Metabase account (SSO)").click();+ embedModalEnableEmbedding();}const labelByExperience = match(experience)diff --git a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/select-embed-entity.cy.spec.ts b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/select-embed-entity.cy.spec.tsindex c39031b18f1..c06931e14fc 100644--- a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/select-embed-entity.cy.spec.ts+++ b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/select-embed-entity.cy.spec.ts@@ -3,7 +3,10 @@ import {ORDERS_COUNT_QUESTION_ID,ORDERS_DASHBOARD_ID,} from "e2e/support/cypress_sample_instance_data";-import { mockEmbedJsToDevServer } from "e2e/support/helpers";+import {+ embedModalEnableEmbedding,+ mockEmbedJsToDevServer,+} from "e2e/support/helpers";import {getEmbedSidebar,@@ -221,7 +224,11 @@ describe(suiteTitle, () => {getEmbedSidebar().within(() => {cy.findByLabelText("Metabase account (SSO)").click();+ });+ embedModalEnableEmbedding();++ getEmbedSidebar().within(() => {cy.findByText("Browser").click();cy.findByText("Next").click();cy.findByText("Select a collection to embed").should("be.visible");@@ -304,7 +311,11 @@ describe(suiteTitle, () => {it("can open a collection picker from browser empty state", () => {getEmbedSidebar().within(() => {cy.findByLabelText("Metabase account (SSO)").click();+ });++ embedModalEnableEmbedding();+ getEmbedSidebar().within(() => {cy.findByText("Browser").click();cy.findByText("Next").click();diff --git a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/select-embed-experience.cy.spec.ts b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/select-embed-experience.cy.spec.tsindex 264cde35552..1a0b9e3d33b 100644--- a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/select-embed-experience.cy.spec.ts+++ b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/select-embed-experience.cy.spec.ts@@ -2,6 +2,7 @@ import {ORDERS_COUNT_QUESTION_ID,ORDERS_QUESTION_ID,} from "e2e/support/cypress_sample_instance_data";+import { embedModalEnableEmbedding } from "e2e/support/helpers";import {assertDashboard,@@ -66,48 +67,6 @@ describe(suiteTitle, () => {});});- it("shows the `guest embeds disabled` icon + tooltip when guest embeds disabled", () => {- H.updateSetting("enable-embedding-static", false);-- H.visitQuestion(ORDERS_COUNT_QUESTION_ID);-- visitNewEmbedPage({ waitForResource: false });-- cy.url().should("not.match", /\/admin\/embedding\/guest/);-- getEmbedSidebar().within(() => {- cy.findByTestId("guest-embeds-disabled-info-icon").should("be.visible");- cy.findByTestId("guest-embeds-disabled-info-icon").click();- });-- H.hovercard()- .findByText(/You can enable guest embeds in/)- .should("exist");-- H.hovercard()- .findByText(/admin settings/)- .click();-- cy.findAllByTestId(/(sdk-setting-card|guest-embeds-setting-card)/)- .first()- .within(() => {- cy.url().should("match", /\/admin\/embedding\/guest/);- cy.findByText("Enable guest embeds").should("be.visible");- });- });-- it("hides the `guest embeds disabled` icon + tooltip when guest embeds enabled", () => {- H.updateSetting("enable-embedding-static", true);-- H.visitQuestion(ORDERS_COUNT_QUESTION_ID);-- visitNewEmbedPage({ waitForResource: false });-- getEmbedSidebar().within(() => {- cy.findByTestId("guest-embeds-disabled-info-icon").should("not.exist");- });- });-it("shows the most recent question from the activity log when selected", () => {const questionName = "Orders, Count";@@ -165,7 +124,11 @@ describe(suiteTitle, () => {getEmbedSidebar().within(() => {cy.findByLabelText("Metabase account (SSO)").click();+ });++ embedModalEnableEmbedding();+ getEmbedSidebar().within(() => {cy.findByText("Browser").click();cy.findByText("Next").click();});@@ -307,7 +270,11 @@ describe(suiteTitle, () => {getEmbedSidebar().within(() => {cy.findByLabelText("Metabase account (SSO)").click();+ });++ embedModalEnableEmbedding();+ getEmbedSidebar().within(() => {cy.findByText("Metabot").click();cy.findByText("Next").click();});diff --git a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/select-embed-options.cy.spec.ts b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/select-embed-options.cy.spec.tsindex 1b7afbed168..d4881906e82 100644--- a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/select-embed-options.cy.spec.ts+++ b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/select-embed-options.cy.spec.ts@@ -1,5 +1,8 @@import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";-import { mockEmbedJsToDevServer } from "e2e/support/helpers";+import {+ embedModalEnableEmbedding,+ mockEmbedJsToDevServer,+} from "e2e/support/helpers";import {codeBlock,@@ -208,7 +211,11 @@ describe(suiteTitle, () => {cy.button("Back").click();cy.findByLabelText("Metabase account (SSO)").click();+ });+ embedModalEnableEmbedding();++ getEmbedSidebar().within(() => {cy.button("Next").click();cy.button("Next").click();diff --git a/e2e/test/scenarios/embedding/sdk-iframe-embedding/embed-options.cy.spec.ts b/e2e/test/scenarios/embedding/sdk-iframe-embedding/embed-options.cy.spec.tsindex 703c0794b0b..0524c117a23 100644--- a/e2e/test/scenarios/embedding/sdk-iframe-embedding/embed-options.cy.spec.ts+++ b/e2e/test/scenarios/embedding/sdk-iframe-embedding/embed-options.cy.spec.ts@@ -166,7 +166,8 @@ describe("scenarios > embedding > sdk iframe embed options passthrough", () => {);cy.log("2. clicking on the column value should not show the popover");- cy.findAllByText("37.65").first().should("be.visible").click();+ cy.findAllByText("37.65").first().should("be.visible");+ cy.findAllByText("37.65").first().click();cy.findByText(/Filter by this value/).should("not.exist");});});diff --git a/e2e/test/scenarios/sharing/public-sharing-embed-button-behavior.cy.spec.js b/e2e/test/scenarios/sharing/public-sharing-embed-button-behavior.cy.spec.jsindex 575ff67e346..4d18e581b0b 100644--- a/e2e/test/scenarios/sharing/public-sharing-embed-button-behavior.cy.spec.js+++ b/e2e/test/scenarios/sharing/public-sharing-embed-button-behavior.cy.spec.js@@ -181,6 +181,8 @@ describe("Embed JS modal display", () => {H.openSharingMenu("Embed");+ cy.findByLabelText("Metabase account (SSO)").click();+H.embedModalEnableEmbeddingCard().within(() => {cy.findByText(/modular embedding/).should("be.visible");});@@ -196,8 +198,9 @@ describe("Embed JS modal display", () => {H.visitDashboard("@dashboardId");H.openSharingMenu("Embed");- it("should open Embed JS modal with the `enable simple embedding` card", () => {+ it("should open Embed JS modal with the `enable guest embedding` card", () => {H.activateToken("pro-self-hosted");+ H.updateSetting("enable-embedding-static", false);H.visitDashboard("@dashboardId");H.openSharingMenu("Embed");diff --git a/e2e/test/scenarios/sharing/subscriptions.cy.spec.js b/e2e/test/scenarios/sharing/subscriptions.cy.spec.jsindex 10ca3c838ff..74d91f7d988 100644--- a/e2e/test/scenarios/sharing/subscriptions.cy.spec.js+++ b/e2e/test/scenarios/sharing/subscriptions.cy.spec.js@@ -2,6 +2,7 @@ const { H } = cy;import { USERS } from "e2e/support/cypress_data";import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";import { ORDERS_DASHBOARD_ID } from "e2e/support/cypress_sample_instance_data";+import { embedModalEnableEmbedding } from "e2e/support/helpers";const { PRODUCTS, PRODUCTS_ID } = SAMPLE_DATABASE;const { admin, normal } = USERS;@@ -803,8 +804,8 @@ describe("scenarios > dashboard > subscriptions", () => {H.openSharingMenu();H.sharingMenu().findByRole("menuitem", { name: "Embed" }).click();- cy.findByRole("button", { name: "Agree and enable" }).click();cy.findByLabelText("Metabase account (SSO)").click();+ embedModalEnableEmbedding();cy.findByLabelText("Allow subscriptions").check().should("be.checked");H.getIframeBody().within(() => {cy.button("Subscriptions").click();diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsxindex 0f0dbb97b30..d055b2538e4 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx@@ -1,9 +1,7 @@-import { useMemo } from "react";import { t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";import { EmbeddingSettingsCard } from "metabase/admin/settings/components/EmbeddingSettings";-import type { EmbeddingSettingKey } from "metabase/admin/settings/components/EmbeddingSettings/EmbeddingToggle";import { NewEmbedButton } from "metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton";import { UpsellBanner } from "metabase/admin/upsells/components";import { useSetting } from "metabase/common/hooks";@@ -38,12 +36,6 @@ export function SharedCombinedEmbeddingSettings({getUpgradeUrl(state, { utm_content: "embedding-settings" }),);- const dependentSettingKeys: EmbeddingSettingKey[] = useMemo(- // When the simple embed feature is not available (oss), we toggle both guest and simple embeds- () => (isSimpleEmbedFeatureAvailable ? [] : ["enable-embedding-simple"]),- [isSimpleEmbedFeatureAvailable],- );-return (<><EmbeddingSettingsCard@@ -51,7 +43,6 @@ export function SharedCombinedEmbeddingSettings({description={t`A secure way to embed charts and dashboards, without single sign-on, when you don’t want to offer ad-hoc querying or chart drill-through. Enables modular embedding and static embedding.`}settingKey="enable-embedding-static"actionButton={<NewEmbedButton />}- dependentSettingKeys={dependentSettingKeys}sdk-setting-cardtestId="guest-embeds-setting-card"/>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.tsxindex 3df1119d3c8..4e92896ad25 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@@ -60,7 +60,6 @@ describe("SharedCombinedEmbeddingSettings", () => {const [{ url, body }] = puts;expect(url).toContain("/setting");expect(body).toEqual({- "enable-embedding-simple": true,"enable-embedding-static": true,});});diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Authentication/AuthenticationSection.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Authentication/AuthenticationSection.tsxindex 07235d98559..6a208617caa 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Authentication/AuthenticationSection.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Authentication/AuthenticationSection.tsx@@ -1,7 +1,6 @@-import type { ReactNode } from "react";-import { Link } from "react-router";-import { c, t } from "ttag";+import { t } from "ttag";+import { SdkIframeStepEnableEmbeddingSection } from "metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeStepEnableEmbeddingSection";import { useSdkIframeEmbedSetupContext } from "metabase/embedding/embedding-iframe-sdk-setup/context";import {DEFAULT_EXPERIENCE,@@ -10,10 +9,7 @@ import {import { getAuthTypeForSettings } from "metabase/embedding/embedding-iframe-sdk-setup/utils/get-auth-type-for-settings";import { isQuestionOrDashboardExperience } from "metabase/embedding/embedding-iframe-sdk-setup/utils/is-question-or-dashboard-experience";import { isStepWithResource } from "metabase/embedding/embedding-iframe-sdk-setup/utils/is-step-with-resource";-import { useDispatch } from "metabase/lib/redux";-import { isEEBuild } from "metabase/lib/utils";-import { closeModal } from "metabase/redux/ui";-import { Card, Flex, HoverCard, Icon, Radio, Stack, Text } from "metabase/ui";+import { Card, Radio, Stack, Text } from "metabase/ui";export const AuthenticationSection = () => {const {@@ -61,15 +57,7 @@ export const AuthenticationSection = () => {<Radio.Group value={authType} onChange={handleAuthTypeChange}><Stack gap="sm">- <WithGuestEmbedsDisabledWarning>- {({ disabled }) => (- <Radio- disabled={disabled}- value="guest-embed"- label={t`Guest`}- />- )}- </WithGuestEmbedsDisabledWarning>+ <Radio value="guest-embed" label={t`Guest`} /><Radiovalue="sso"@@ -81,55 +69,9 @@ export const AuthenticationSection = () => {/></Stack></Radio.Group>++ <SdkIframeStepEnableEmbeddingSection /></Stack></Card>);};--const WithGuestEmbedsDisabledWarning = ({- children,-}: {- children: (data: { disabled: boolean }) => ReactNode;-}) => {- const dispatch = useDispatch();-- const { isGuestEmbedsEnabled } = useSdkIframeEmbedSetupContext();-- // We show the icon only in the EE build. For the OSS build we show the EnableEmbeddingCard- const showIcon = isEEBuild();-- return (- <Flex align="center" gap="xs">- {children({ disabled: !isGuestEmbedsEnabled })}-- <HoverCard>- {showIcon && !isGuestEmbedsEnabled && (- <HoverCard.Target>- <Icon- data-testid="guest-embeds-disabled-info-icon"- name="info"- size={14}- c="text-secondary"- />- </HoverCard.Target>- )}-- <HoverCard.Dropdown p="sm">- <Text>{c(- "{0} is a link to guest embeds settings page with text 'admin settings'",- ).jt`You can enable guest embeds in ${(- <Link- key="admin-settings-link"- to="/admin/embedding/guest"- onClick={() => dispatch(closeModal())}- >- <Text display="inline" c="text-brand" fw="bold">{c(- "is a link in a sentence 'You can enable guest embeds in admin settings'",- ).t`admin settings`}</Text>- </Link>- )}`}</Text>- </HoverCard.Dropdown>- </HoverCard>- </Flex>- );-};diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableEmbeddedAnalyticsCard.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableEmbeddedAnalyticsCard.tsxindex cdc19ea4134..a676f3c09f1 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableEmbeddedAnalyticsCard.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableEmbeddedAnalyticsCard.tsx@@ -20,8 +20,6 @@ export const EnableEmbeddedAnalyticsCard = () => {termsAccepted={isSimpleEmbeddingTermsAccepted}settingsToUpdate={{"enable-embedding-simple": true,- // accept the terms for Embedded Analytics JS- "show-simple-embed-terms": false,...(!isSimpleEmbeddingTermsAccepted && {"show-simple-embed-terms": false,}),diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableEmbeddingCard.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableEmbeddingCard.tsxindex 91b8b149d50..8ba8f17f698 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableEmbeddingCard.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableEmbeddingCard.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import { useUpdateSettingsMutation } from "metabase/api";import { useToast } from "metabase/common/hooks";-import { Button, Card, Group, HoverCard, Icon, Stack, Text } from "metabase/ui";+import { Button, Group, HoverCard, Icon, Stack, Text } from "metabase/ui";import type { EnterpriseSettings } from "metabase-types/api";interface EmbeddingControlCardProps {@@ -85,53 +85,52 @@ export const EnableEmbeddingCard = ({const { title, buttonCaption } = data;return (- <Card p="md" mb="md" data-testid="enable-embedding-card">- <Stack gap={0}>- <Text fz="md" c="text-primary">- {title}- {!termsAccepted && (- <HoverCard position="bottom" withArrow>- <HoverCard.Target>- <Icon- name="info"- size={14}- c="text-secondary"- ml="sm"- style={{ verticalAlign: "middle" }}- />- </HoverCard.Target>-- <HoverCard.Dropdown>- <Stack maw={340} p="md" gap="md">- <Text fz="sm" lh="lg">- {/* eslint-disable-next-line no-literal-metabase-strings -- User facing text */}- {t`When you embed charts or dashboards from Metabase in your+ <Stack gap={0} data-testid="enable-embedding-card">+ <Text fz="md" c="text-primary">+ {title}++ {!termsAccepted && (+ <HoverCard position="bottom" withArrow>+ <HoverCard.Target>+ <Icon+ name="info"+ size={14}+ c="text-secondary"+ ml="sm"+ style={{ verticalAlign: "middle" }}+ />+ </HoverCard.Target>++ <HoverCard.Dropdown>+ <Stack maw={340} p="md" gap="md">+ <Text fz="sm" lh="lg">+ {/* eslint-disable-next-line no-literal-metabase-strings -- User facing text */}+ {t`When you embed charts or dashboards from Metabase in yourown application that application isn't subject to the AfferoGeneral Public License that covers the rest of Metabase,provided you keep the Metabase logo and the "Powered byMetabase" visible on those embeds.`}- </Text>-- <Text fz="sm" lh="lg">- {t`You should, however, read the license text linked above as that is the actual license that you will be agreeing to by enabling this feature.`}- </Text>- </Stack>- </HoverCard.Dropdown>- </HoverCard>- )}- </Text>-- <Group justify="flex-end" mt="md">- <Button- variant={isAccepted ? "default" : "filled"}- onClick={handleEnableEmbedding}- disabled={isAccepted}- leftSection={isAccepted && <Icon name="check" />}- >- {isAccepted ? "Enabled" : buttonCaption}- </Button>- </Group>- </Stack>- </Card>+ </Text>++ <Text fz="sm" lh="lg">+ {t`You should, however, read the license text linked above as that is the actual license that you will be agreeing to by enabling this feature.`}+ </Text>+ </Stack>+ </HoverCard.Dropdown>+ </HoverCard>+ )}+ </Text>++ <Group justify="flex-end" mt="md">+ <Button+ variant={isAccepted ? "default" : "filled"}+ onClick={handleEnableEmbedding}+ disabled={isAccepted}+ leftSection={isAccepted && <Icon name="check" />}+ >+ {isAccepted ? "Enabled" : buttonCaption}+ </Button>+ </Group>+ </Stack>);};diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableGuestEmbedsCard.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableGuestEmbedsCard.tsxindex da1a7feff4f..a18986c4e2f 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableGuestEmbedsCard.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableGuestEmbedsCard.tsx@@ -5,15 +5,8 @@ import { useSdkIframeEmbedSetupContext } from "metabase/embedding/embedding-ifraimport { EnableEmbeddingCard } from "./EnableEmbeddingCard";export const EnableGuestEmbedsCard = () => {- const {- isSimpleEmbedFeatureAvailable,- isGuestEmbedsEnabled,- isGuestEmbedsTermsAccepted,- } = useSdkIframeEmbedSetupContext();-- if (isSimpleEmbedFeatureAvailable) {- return null;- }+ const { isGuestEmbedsEnabled, isGuestEmbedsTermsAccepted } =+ useSdkIframeEmbedSetupContext();// Not yet fetchedif (isGuestEmbedsEnabled === undefined) {@@ -27,10 +20,6 @@ export const EnableGuestEmbedsCard = () => {termsAccepted={isGuestEmbedsTermsAccepted}settingsToUpdate={{"enable-embedding-static": true,- // When the simple embed feature is not available (oss), we toggle both static and simple embedding- ...(!isSimpleEmbedFeatureAvailable && {- "enable-embedding-simple": true,- }),...(!isGuestEmbedsTermsAccepted && {"show-static-embed-terms": false,}),diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsxindex a3507e08013..e478129f98c 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx@@ -9,8 +9,8 @@ import "react-resizable/css/styles.css";import noResultsSource from "assets/img/no_results.svg";import { useUpdateSettingsMutation } from "metabase/api";import CS from "metabase/css/core/index.css";+import { AuthenticationSection } from "metabase/embedding/embedding-iframe-sdk-setup/components/Authentication/AuthenticationSection";import { SdkIframeGuestEmbedStatusBar } from "metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeGuestEmbedStatusBar";-import { SdkIframeStepHeader } from "metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeStepHeader";import { EMBED_STEPS } from "metabase/embedding/embedding-iframe-sdk-setup/constants";import { isQuestionOrDashboardSettings } from "metabase/embedding/embedding-iframe-sdk-setup/utils/is-question-or-dashboard-settings";import { useDispatch } from "metabase/lib/redux";@@ -39,15 +39,11 @@ export const SdkIframeEmbedSetupContent = () => {const dispatch = useDispatch();const [updateSettings] = useUpdateSettingsMutation();const {- isSimpleEmbedFeatureAvailable,- isSimpleEmbeddingEnabled,- isSimpleEmbeddingTermsAccepted,- isGuestEmbedsEnabled,- isGuestEmbedsTermsAccepted,currentStep,handleNext,handleBack,canGoBack,+ allowPreviewAndNavigation,isLoading,experience,resource,@@ -71,10 +67,6 @@ export const SdkIframeEmbedSetupContent = () => {dispatch(closeModal());}- const allowPreviewAndNavigation = isSimpleEmbedFeatureAvailable- ? isSimpleEmbeddingEnabled && isSimpleEmbeddingTermsAccepted- : isGuestEmbedsEnabled && isGuestEmbedsTermsAccepted;-const isQuestionOrDashboard = isQuestionOrDashboardSettings(experience,settings,@@ -122,7 +114,7 @@ export const SdkIframeEmbedSetupContent = () => {<Box className={S.Sidebar} component="aside"><Stack className={S.SidebarContent} gap="md"><Stack gap="md" flex={1}>- <SdkIframeStepHeader />+ <AuthenticationSection /><Stackgap="md"diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupProvider.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupProvider.tsxindex 8fb4d1c406a..396a1d6b4d9 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupProvider.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupProvider.tsx@@ -7,6 +7,7 @@ import { trackEmbedWizardOpened } from "metabase/embedding/embedding-iframe-sdk-import { useEmbeddingParameters } from "metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters";import { useGetGuestEmbedSignedToken } from "metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-guest-embed-signed-token";import { useIsSsoEnabledAndConfigured } from "metabase/embedding/embedding-iframe-sdk-setup/hooks/use-is-sso-enabled-and-configured";+import { shouldAllowPreviewAndNavigation } from "metabase/embedding/embedding-iframe-sdk-setup/utils/should-allow-preview-and-navigation";import {PLUGIN_EMBEDDING_IFRAME_SDK_SETUP,type SdkIframeEmbedSetupModalInitialState,@@ -162,6 +163,16 @@ export const SdkIframeEmbedSetupProvider = ({embeddingParameters,});+ const isGuestEmbed = !!settings.isGuest;+ const allowPreviewAndNavigation = shouldAllowPreviewAndNavigation({+ isGuestEmbed,+ isGuestEmbedsEnabled,+ isGuestEmbedsTermsAccepted,+ isSimpleEmbedFeatureAvailable,+ isSimpleEmbeddingEnabled,+ isSimpleEmbeddingTermsAccepted,+ });+const value: SdkIframeEmbedSetupContextType = {isSimpleEmbedFeatureAvailable,isSimpleEmbeddingEnabled,@@ -177,6 +188,7 @@ export const SdkIframeEmbedSetupProvider = ({isFirstStep,isLastStep,initialState,+ allowPreviewAndNavigation,experience,resource,isError,diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeStepHeader.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeStepEnableEmbeddingSection.tsxsimilarity index 66%rename from frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeStepHeader.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeStepEnableEmbeddingSection.tsxindex 4142d538afd..5a036a594d5 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeStepHeader.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeStepEnableEmbeddingSection.tsx@@ -2,15 +2,18 @@ import { EnableEmbeddedAnalyticsCard } from "metabase/embedding/embedding-iframeimport { EnableGuestEmbedsCard } from "metabase/embedding/embedding-iframe-sdk-setup/components/EnableGuestEmbedsCard";import { useSdkIframeEmbedSetupContext } from "metabase/embedding/embedding-iframe-sdk-setup/context";-export const SdkIframeStepHeader = () => {- const { isSimpleEmbedFeatureAvailable, currentStep } =+export const SdkIframeStepEnableEmbeddingSection = () => {+ const { isSimpleEmbedFeatureAvailable, currentStep, settings } =useSdkIframeEmbedSetupContext();+ const isGuestEmbed = !!settings.isGuest;const rerenderKey = currentStep;+ if (isGuestEmbed) {+ return <EnableGuestEmbedsCard key={rerenderKey} />;+ }+return isSimpleEmbedFeatureAvailable ? (<EnableEmbeddedAnalyticsCard key={rerenderKey} />- ) : (- <EnableGuestEmbedsCard key={rerenderKey} />- );+ ) : null;};diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedExperienceStep.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedExperienceStep.tsxindex 30f7572c7b3..7e377a5c6e4 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedExperienceStep.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedExperienceStep.tsx@@ -9,7 +9,6 @@ import { useSdkIframeEmbedSetupContext } from "../context";import { useHandleExperienceChange } from "../hooks/use-handle-experience-change";import type { SdkIframeEmbedSetupExperience } from "../types";-import { AuthenticationSection } from "./Authentication/AuthenticationSection";import { EmbeddingUpsell } from "./Common/EmbeddingUpsell";export const SelectEmbedExperienceStep = () => {@@ -27,8 +26,6 @@ export const SelectEmbedExperienceStep = () => {return (<>- <AuthenticationSection />-<Card p="md" mb="md"><Text size="lg" fw="bold" mb="md">{t`Select your embed experience`}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 40612d8887b..3d7a470c853 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@@ -24,7 +24,6 @@ import { useSdkIframeEmbedSetupContext } from "../context";import { ColorCustomizationSection } from "./Appearance/ColorCustomizationSection";import { SimpleThemeSwitcherSection } from "./Appearance/SimpleThemeSwitcherSection";-import { AuthenticationSection } from "./Authentication/AuthenticationSection";import { EmbeddingUpsell } from "./Common/EmbeddingUpsell";import { WithNotAvailableForOssOrGuestEmbedsGuard } from "./Common/WithNotAvailableForOssOrGuestEmbedsGuard";import { LegacyStaticEmbeddingAlert } from "./LegacyStaticEmbeddingAlert";@@ -33,7 +32,6 @@ import { ParameterSettings } from "./ParameterSettings";export const SelectEmbedOptionsStep = () => (<Stack gap="md">- <AuthenticationSection /><BehaviorSection /><ParametersSection /><AppearanceSection />diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/context.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/context.tsindex 14f274a41ed..9e84a3d16cb 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/context.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/context.ts@@ -36,6 +36,7 @@ export interface SdkIframeEmbedSetupContextType {canGoBack: boolean;isFirstStep: boolean;isLastStep: boolean;+ allowPreviewAndNavigation: boolean;// Initial stateinitialState: SdkIframeEmbedSetupModalInitialState | undefined;diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/get-common-embed-settings.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/get-common-embed-settings.tsindex 9a988f2504d..d65022f5538 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/get-common-embed-settings.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/get-common-embed-settings.ts@@ -81,7 +81,6 @@ const GET_DISABLE_GUEST_EMBED_SETTINGS: (data: {export const getCommonEmbedSettings = ({experience,- isGuestEmbedsEnabled,isSsoEnabledAndConfigured,isGuest,useExistingUserSession,@@ -96,7 +95,7 @@ export const getCommonEmbedSettings = ({PLUGIN_EMBEDDING_IFRAME_SDK_SETUP.isEnabled();if (isSimpleEmbedFeatureAvailable) {- return isGuestEmbedsEnabled && isGuest+ return isGuest? GET_ENABLE_GUEST_EMBED_SETTINGS({experience,isSimpleEmbedFeatureAvailable,diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/should-allow-preview-and-navigation.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/should-allow-preview-and-navigation.tsnew file mode 100644index 00000000000..59a3f53423a--- /dev/null+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/should-allow-preview-and-navigation.ts@@ -0,0 +1,24 @@+export const shouldAllowPreviewAndNavigation = ({+ isGuestEmbed,+ isGuestEmbedsEnabled,+ isGuestEmbedsTermsAccepted,+ isSimpleEmbedFeatureAvailable,+ isSimpleEmbeddingEnabled,+ isSimpleEmbeddingTermsAccepted,+}: {+ isGuestEmbed: boolean;+ isGuestEmbedsEnabled: boolean;+ isGuestEmbedsTermsAccepted: boolean;+ isSimpleEmbedFeatureAvailable: boolean;+ isSimpleEmbeddingEnabled: boolean;+ isSimpleEmbeddingTermsAccepted: boolean;+}) => {+ if (isGuestEmbed) {+ return isGuestEmbedsEnabled && isGuestEmbedsTermsAccepted;+ }++ return isSimpleEmbedFeatureAvailable+ ? isSimpleEmbeddingEnabled && isSimpleEmbeddingTermsAccepted+ : // For Metabase Account SSO auth type we disable navigation/preview as this auth type is non-supported in OSS/Starter editions+ false;+};diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/should-allow-preview-and-navigation.unit.spec.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/should-allow-preview-and-navigation.unit.spec.tsnew file mode 100644index 00000000000..9c1fb3a64d1--- /dev/null+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/should-allow-preview-and-navigation.unit.spec.ts@@ -0,0 +1,124 @@+import { shouldAllowPreviewAndNavigation } from "./should-allow-preview-and-navigation";++describe("shouldAllowPreviewAndNavigation", () => {+ const defaultParams = {+ isGuestEmbed: false,+ isGuestEmbedsEnabled: false,+ isGuestEmbedsTermsAccepted: false,+ isSimpleEmbedFeatureAvailable: false,+ isSimpleEmbeddingEnabled: false,+ isSimpleEmbeddingTermsAccepted: false,+ };++ describe("when Guest auth type is selected", () => {+ it("should return true when guest embeds are enabled and terms are accepted", () => {+ expect(+ shouldAllowPreviewAndNavigation({+ ...defaultParams,+ isGuestEmbed: true,+ isGuestEmbedsEnabled: true,+ isGuestEmbedsTermsAccepted: true,+ }),+ ).toBe(true);+ });++ it("should return false when guest embeds are not enabled", () => {+ expect(+ shouldAllowPreviewAndNavigation({+ ...defaultParams,+ isGuestEmbed: true,+ isGuestEmbedsEnabled: false,+ isGuestEmbedsTermsAccepted: true,+ }),+ ).toBe(false);+ });++ it("should return false when terms are not accepted", () => {+ expect(+ shouldAllowPreviewAndNavigation({+ ...defaultParams,+ isGuestEmbed: true,+ isGuestEmbedsEnabled: true,+ isGuestEmbedsTermsAccepted: false,+ }),+ ).toBe(false);+ });++ it("should return false when neither enabled nor terms accepted", () => {+ expect(+ shouldAllowPreviewAndNavigation({+ ...defaultParams,+ isGuestEmbed: true,+ isGuestEmbedsEnabled: false,+ isGuestEmbedsTermsAccepted: false,+ }),+ ).toBe(false);+ });+ });++ describe("when Metabase Account auth type is selected", () => {+ describe("when simple embed feature is available", () => {+ it("should return true when simple embedding is enabled and terms are accepted", () => {+ expect(+ shouldAllowPreviewAndNavigation({+ ...defaultParams,+ isGuestEmbed: false,+ isSimpleEmbedFeatureAvailable: true,+ isSimpleEmbeddingEnabled: true,+ isSimpleEmbeddingTermsAccepted: true,+ }),+ ).toBe(true);+ });++ it("should return false when simple embedding is not enabled", () => {+ expect(+ shouldAllowPreviewAndNavigation({+ ...defaultParams,+ isGuestEmbed: false,+ isSimpleEmbedFeatureAvailable: true,+ isSimpleEmbeddingEnabled: false,+ isSimpleEmbeddingTermsAccepted: true,+ }),+ ).toBe(false);+ });++ it("should return false when terms are not accepted", () => {+ expect(+ shouldAllowPreviewAndNavigation({+ ...defaultParams,+ isGuestEmbed: false,+ isSimpleEmbedFeatureAvailable: true,+ isSimpleEmbeddingEnabled: true,+ isSimpleEmbeddingTermsAccepted: false,+ }),+ ).toBe(false);+ });++ it("should return false when neither enabled nor terms accepted", () => {+ expect(+ shouldAllowPreviewAndNavigation({+ ...defaultParams,+ isGuestEmbed: false,+ isSimpleEmbedFeatureAvailable: true,+ isSimpleEmbeddingEnabled: false,+ isSimpleEmbeddingTermsAccepted: false,+ }),+ ).toBe(false);+ });+ });++ describe("when simple embed feature is not available", () => {+ it("should return false regardless of other flags", () => {+ expect(+ shouldAllowPreviewAndNavigation({+ ...defaultParams,+ isGuestEmbed: false,+ isSimpleEmbedFeatureAvailable: false,+ isSimpleEmbeddingEnabled: true,+ isSimpleEmbeddingTermsAccepted: true,+ }),+ ).toBe(false);+ });+ });+ });+});diff --git a/src/metabase/embedding/settings.clj b/src/metabase/embedding/settings.cljindex ac62650ca67..c599fc5037b 100644--- a/src/metabase/embedding/settings.clj+++ b/src/metabase/embedding/settings.clj@@ -3,7 +3,6 @@(:require[clojure.string :as str][metabase.analytics.core :as analytics]- [metabase.config.core :as config][metabase.premium-features.core :as premium-features][metabase.server.settings :as server.settings][metabase.settings.core :as setting :refer [defsetting]]@@ -31,9 +30,9 @@:default true:export? true:getter (fn []- (if-not (and config/ee-available? (:valid (premium-features/token-status)))- (setting/get-value-of-type :boolean :show-static-embed-terms)- false)))+ (if (premium-features/hide-embed-branding?)+ false+ (setting/get-value-of-type :boolean :show-static-embed-terms))))(defsetting show-sdk-embed-terms(deferred-tru "Check if admin should see the SDK licensing terms popup")diff --git a/test/metabase/embedding/settings_test.clj b/test/metabase/embedding/settings_test.cljindex c8a3baeb84e..a24731882cf 100644--- a/test/metabase/embedding/settings_test.clj+++ b/test/metabase/embedding/settings_test.clj@@ -3,34 +3,30 @@[clojure.string :as str][clojure.test :refer :all][metabase.analytics.snowplow-test :as snowplow-test]- [metabase.config.core :as config][metabase.embedding.settings :as embed.settings][metabase.test :as mt][toucan2.core :as t2]))(deftest show-static-embed-terms-test(mt/with-test-user :crowberto- (mt/with-temporary-setting-values [show-static-embed-terms nil]- (testing "Check if the user needs to accept the embedding licensing terms before static embedding"- (when-not config/ee-available?- (testing "should return true when user is OSS and has not accepted licensing terms"- (is (embed.settings/show-static-embed-terms)))- (testing "should return false when user is OSS and has already accepted licensing terms"- (embed.settings/show-static-embed-terms! false)- (is (not (embed.settings/show-static-embed-terms)))))- (when config/ee-available?- (testing "should return false when an EE user has a valid token"- (mt/with-random-premium-token! [_token]- (is (not (embed.settings/show-static-embed-terms)))+ (testing "when hide-embed-branding? is true (Pro/EE with :embedding feature)"+ (mt/with-premium-features #{:embedding}+ (testing "should always return false regardless of setting value"+ (mt/with-temporary-setting-values [show-static-embed-terms nil]+ (is (not (embed.settings/show-static-embed-terms))))+ (mt/with-temporary-setting-values [show-static-embed-terms true]+ (is (not (embed.settings/show-static-embed-terms))))+ (mt/with-temporary-setting-values [show-static-embed-terms false]+ (is (not (embed.settings/show-static-embed-terms)))))))+ (testing "when hide-embed-branding? is false (OSS/Starter without :embedding feature)"+ (mt/with-premium-features #{}+ (testing "should return the setting value"+ (mt/with-temporary-setting-values [show-static-embed-terms nil]+ (testing "default is true when not set"+ (is (embed.settings/show-static-embed-terms)))+ (testing "returns false after user accepts terms"(embed.settings/show-static-embed-terms! false)- (is (not (embed.settings/show-static-embed-terms)))))- (testing "when an EE user doesn't have a valid token"- (mt/with-temporary-setting-values [premium-embedding-token nil show-static-embed-terms nil]- (testing "should return true when the user has not accepted licensing terms"- (is (embed.settings/show-static-embed-terms)))- (testing "should return false when the user has already accepted licensing terms"- (embed.settings/show-static-embed-terms! false)- (is (not (embed.settings/show-static-embed-terms)))))))))))+ (is (not (embed.settings/show-static-embed-terms))))))))))(defn- embedding-event?"Used to make sure we only test against embedding-events in `snowplow-test/pop-event-data-and-user-id!`."