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
Adjust EAJS/SDK/adjust full-app names (#66753)
Timofey Kachalovcf87e41548e3
diff --git a/e2e/test/scenarios/embedding/embedding-hub/embedding-hub.cy.spec.ts b/e2e/test/scenarios/embedding/embedding-hub/embedding-hub.cy.spec.tsindex de1535301dc..7b4df9bc13a 100644--- a/e2e/test/scenarios/embedding/embedding-hub/embedding-hub.cy.spec.ts+++ b/e2e/test/scenarios/embedding/embedding-hub/embedding-hub.cy.spec.ts@@ -191,7 +191,7 @@ describe("scenarios - embedding hub", () => {cy.visit("/");- cy.findAllByText("Get started with Embedded Analytics JS")+ cy.findAllByText("Get started with modular embedding").first().should("be.visible");@@ -211,7 +211,7 @@ describe("scenarios - embedding hub", () => {cy.visit("/");cy.get("main")- .findByText("Get started with Embedded Analytics JS")+ .findByText("Get started with modular embedding").should("not.exist");});@@ -244,7 +244,7 @@ describe("scenarios - embedding hub", () => {cy.visit("/");cy.get("main")- .findByText("Get started with Embedded Analytics JS")+ .findByText("Get started with modular embedding").should("be.visible");cy.log("Click overflow menu button on the embedding homepage");@@ -256,7 +256,7 @@ describe("scenarios - embedding hub", () => {cy.log("Verify guide is dismissed and no longer visible");cy.get("main")- .findByText("Get started with Embedded Analytics JS")+ .findByText("Get started with modular embedding").should("not.exist");});});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.cy.spec.tsindex fc8f3e0e175..d0175a0af3a 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.cy.spec.ts@@ -19,7 +19,7 @@ const DATA_BY_MB_EDITION = {ee: {cardTestId: "sdk-setting-card",cardText:- "To continue, enable Embedded Analytics JS and agree to the usage conditions.",+ "To continue, enable modular embedding and agree to the usage conditions.",embeddingSettingName: "enable-embedding-simple",showTermsSettingName: "show-simple-embed-terms",},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 897383a603c..cc84667f8be 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@@ -7,7 +7,7 @@ import {const { H } = cy;describe("OSS", { tags: "@OSS" }, () => {- describe("scenarios > embedding > Embedded Analytics JS (EAJS)", () => {+ describe("scenarios > embedding > Modular embedding (ex EAJS)", () => {beforeEach(() => {H.prepareSdkIframeEmbedTest({withToken: false,@@ -45,7 +45,7 @@ describe("OSS", { tags: "@OSS" }, () => {});describe("EE without license", () => {- describe("scenarios > embedding > Embedded Analytics JS (EAJS)", () => {+ describe("scenarios > embedding > Modular embedding (EAJS)", () => {beforeEach(() => {H.prepareSdkIframeEmbedTest({withToken: "starter",@@ -83,7 +83,7 @@ describe("EE without license", () => {});describe("EE", () => {- describe("scenarios > embedding > Embedded Analytics JS (EAJS)", () => {+ describe("scenarios > embedding > Modular embedding (EAJS)", () => {beforeEach(() => {H.prepareSdkIframeEmbedTest({ withToken: "bleeding-edge" });H.setupSMTP();diff --git a/e2e/test/scenarios/embedding/sdk-iframe-embedding/sdk-iframe-embedding.cy.spec.ts b/e2e/test/scenarios/embedding/sdk-iframe-embedding/sdk-iframe-embedding.cy.spec.tsindex c6efcf22e68..eae295e0564 100644--- a/e2e/test/scenarios/embedding/sdk-iframe-embedding/sdk-iframe-embedding.cy.spec.ts+++ b/e2e/test/scenarios/embedding/sdk-iframe-embedding/sdk-iframe-embedding.cy.spec.ts@@ -310,7 +310,7 @@ describe("scenarios > embedding > sdk iframe embedding", () => {});});-describe("scenarios > embedding > embedded analytics JS", () => {+describe("scenarios > embedding > Modular embedding", () => {beforeEach(() => {H.resetSnowplow();H.prepareSdkIframeEmbedTest({@@ -320,7 +320,7 @@ describe("scenarios > embedding > embedded analytics JS", () => {H.enableTracking();});- it("should send an Embedded Analytics JS usage event", () => {+ it("should send an modular embedding usage event", () => {cy.signOut();cy.visit("http://localhost:4000");const frame = H.loadSdkIframeEmbedTestPage({@@ -410,7 +410,7 @@ describe("scenarios > embedding > embedded analytics JS", () => {});});- it("should not send an Embedded Analytics JS usage event in the preview", () => {+ it("should not send an modular embedding usage event in the preview", () => {cy.visit(`/question/${ORDERS_QUESTION_ID}`);H.openEmbedJsModal();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 cff7f20288b..b41e8a3d696 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@@ -182,7 +182,7 @@ describe("Embed JS modal display", () => {H.openSharingMenu("Embed");H.embedModalEnableEmbeddingCard().within(() => {- cy.findByText(/Embedded Analytics JS/).should("be.visible");+ cy.findByText(/Modular embedding/).should("be.visible");});});});diff --git a/enterprise/backend/src/metabase_enterprise/sso/integrations/jwt.clj b/enterprise/backend/src/metabase_enterprise/sso/integrations/jwt.cljindex e43de714a5a..2d7f0761866 100644--- a/enterprise/backend/src/metabase_enterprise/sso/integrations/jwt.clj+++ b/enterprise/backend/src/metabase_enterprise/sso/integrations/jwt.clj@@ -51,7 +51,7 @@(defn- throw-simple-embedding-disabled[](throw- (ex-info (tru "Embedded Analytics JS is disabled. Enable it in the embedding settings.")+ (ex-info (tru "You need to turn on modular embedding in the embedding settings."){:status "error-embedding-simple-disabled":status-code 402})))diff --git a/frontend/src/embedding-sdk-bundle/lib/usage-problem.ts b/frontend/src/embedding-sdk-bundle/lib/usage-problem.tsindex d2b8cb01c0e..69cede8159e 100644--- a/frontend/src/embedding-sdk-bundle/lib/usage-problem.ts+++ b/frontend/src/embedding-sdk-bundle/lib/usage-problem.ts@@ -158,7 +158,7 @@ const toWarning = (type: SdkUsageProblemKey): SdkUsageProblem => ({const getTitle = () => {if (isEmbeddingEajs()) {// eslint-disable-next-line no-literal-metabase-strings -- only shown in development or config error.- return "This embed is powered by the Metabase Embedded Analytics JS";+ return "This embed is powered by Metabase";}// eslint-disable-next-line no-literal-metabase-strings -- only shown in development or config error.diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingLegaleseModal/EmbeddingLegaleseModal.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingLegaleseModal/EmbeddingLegaleseModal.tsxindex a0c349c7c0f..b2703fa8525 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingLegaleseModal/EmbeddingLegaleseModal.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingLegaleseModal/EmbeddingLegaleseModal.tsx@@ -75,7 +75,7 @@ const getTitle = (key: SettingKey) =>.with("enable-embedding-simple",() =>- t`When using Embedded Analytics JS, each end user should have their own Metabase account.`,+ t`When using modular embedding, each end user must have their own Metabase account.`,).exhaustive();diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/CorsInputWidget.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/CorsInputWidget.tsxindex c82eb0e53bb..db281848e73 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/CorsInputWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/CorsInputWidget.tsx@@ -25,7 +25,7 @@ export const CorsInputWidget = () => {description={<Group align="center" gap="sm"><Text c="text-medium" fz="md">- {jt`Add the website domains where you want to allow Embedded Analytics JS and SDK. SDK using API keys can only run on localhost.. ${(+ {jt`Add the website domains where you want to allow modular embedding (with or without SDK). API keys can only be used on localhost. ${(<HoverCard key="embedding-cors-hint" position="bottom"><HoverCard.Target><Icondiff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/EmbeddingSettings.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/EmbeddingSettings.tsxindex b5ff9ea1b32..4c89f1ec46c 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/EmbeddingSettings.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/EmbeddingSettings.tsx@@ -54,8 +54,8 @@ function EmbeddingSettingsEE() {</Text><EmbeddingSettingsCard- title={t`Enable Embedded Analytics JS`}- description={t`An easy-to-use library that lets you embed Metabase entities like charts, dashboards, or even the query builder into your own application using customizable components.`}+ title={t`Enable modular embedding`}+ description={t`The simplest way to embed Metabase. Embed dashboards, questions, the query builder, natural language querying with AI, and more in your app with components. Built on the SDK with per-component controls and theming.`}settingKey="enable-embedding-simple"links={[{diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/common.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/common.unit.spec.tsxindex 658a3cd3855..435a36d1c86 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/common.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/common.unit.spec.tsx@@ -50,17 +50,17 @@ describe("EmbeddingSdkSettings (OSS)", () => {expect(await screen.findByText("Appearance")).toBeInTheDocument();});- it("does not show the Embedded Analytics JS toggle when token features are missing", () => {+ it("does not show the modular embedding toggle when token features are missing", () => {setup({ tokenFeatures: { embedding_simple: false } });expect(- screen.queryByText("Enable Embedded Analytics JS"),+ screen.queryByText("Enable modular embedding"),).not.toBeInTheDocument();});it("shows the Guest Embeds toggle when token features are missing", () => {setup({ tokenFeatures: { embedding_simple: false } });- expect(screen.getByText("Guest embeds")).toBeInTheDocument();+ expect(screen.getByText("Enable guest embeds")).toBeInTheDocument();});});diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/simple-embedding.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/simple-embedding.unit.spec.tsxindex de069aa9dbb..f9fb04ad87c 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/simple-embedding.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/simple-embedding.unit.spec.tsx@@ -32,7 +32,7 @@ describe("EmbeddingSdkSettings (EE with Simple Embedding feature)", () => {expect(screen.getByRole("switch", {- name: "Enable Embedded Analytics JS toggle",+ name: "Enable modular embedding toggle",}),).toBeInTheDocument();});@@ -48,7 +48,7 @@ describe("EmbeddingSdkSettings (EE with Simple Embedding feature)", () => {// Enable Embedded Analytics JSconst toggle = await screen.findByRole("switch", {- name: "Enable Embedded Analytics JS toggle",+ name: "Enable modular embedding toggle",});await userEvent.click(toggle);@@ -68,7 +68,7 @@ describe("EmbeddingSdkSettings (EE with Simple Embedding feature)", () => {});const toggle = await screen.findByRole("switch", {- name: "Enable Embedded Analytics JS toggle",+ name: "Enable modular embedding toggle",});await userEvent.click(toggle);@@ -94,9 +94,7 @@ describe("EmbeddingSdkSettings (EE with Simple Embedding feature)", () => {const card = screen.getAllByTestId("sdk-setting-card")- .find((card) =>- card.textContent?.includes("Enable Embedded Analytics JS"),- );+ .find((card) => card.textContent?.includes("Enable modular embedding"));expect(card).toHaveTextContent("New embed");expect(card).toHaveTextContent("Documentation");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.tsxindex 099f8d1f4b0..1b3f0356a82 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@@ -38,7 +38,8 @@ const setup = async ({ enabled }: { enabled: boolean }) => {renderWithProviders(<GuestEmbedsSettings />);- expect(await screen.findAllByText("Guest embeds")).toHaveLength(2); // Title + Card+ expect(await screen.findAllByText("Guest embeds")).toHaveLength(1); // Title+ expect(await screen.findAllByText("Enable guest embeds")).toHaveLength(1); // Card};describe("GuestEmbedsSettings", () => {diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsxindex 173dcb9c011..f3d57cbfe1d 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx@@ -47,8 +47,8 @@ export function SharedCombinedEmbeddingSettings({return (<><EmbeddingSettingsCard- title={t`Guest embeds`}- description={t`A secure way to embed charts and dashboards when you don’t want to offer ad-hoc querying or chart drill-through.`}+ title={t`Enable guest embeds`}+ description={t`A secure way to embed charts and dashboards, without single sign-on. Useful when you don’t want to offer ad-hoc querying or chart drill-through.`}settingKey="enable-embedding-static"actionButton={<NewEmbedButton />}dependentSettingKeys={dependentSettingKeys}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 e31c2caee56..3df1119d3c8 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@@ -47,10 +47,10 @@ describe("SharedCombinedEmbeddingSettings", () => {it("should toggle static embedding on", async () => {await setup({ enabled: false });- await screen.findByText("Guest embeds");+ await screen.findByText("Enable guest embeds");const toggle = screen.getByRole("switch", {- name: /Guest embeds toggle/i,+ name: /Enable guest embeds toggle/i,});await userEvent.click(toggle);@@ -74,7 +74,7 @@ describe("SharedCombinedEmbeddingSettings", () => {it("should hide embeddable dashboards and cards when embedding is disabled", async () => {await setup({ enabled: false });- expect(await screen.findByText("Guest embeds")).toBeInTheDocument();+ expect(await screen.findByText("Enable guest embeds")).toBeInTheDocument();expect(screen.queryByText("Manage embeds")).not.toBeInTheDocument();});diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/dashboard-action-keys.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/dashboard-action-keys.tsxindex 3dd277a9d67..0898d3cba9c 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/dashboard-action-keys.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/dashboard-action-keys.tsx@@ -17,7 +17,7 @@ export const DASHBOARD_ACTION = {DASHBOARD_ACTION_MENU: "DASHBOARD_ACTION_MENU",FULLSCREEN_ANALYTICS_DASHBOARD: "FULLSCREEN_ANALYTICS_DASHBOARD",DOWNLOAD_PDF: "DOWNLOAD_PDF",- // Modular embeddings (SDK, EAJS)+ // Modular embeddings (modular embedding, modular embedding SDK)DASHBOARD_SUBSCRIPTIONS: "DASHBOARD_SUBSCRIPTIONS",} as const;diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardSubscriptionsButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardSubscriptionsButton.tsxindex 2725f5d68a6..8bd740f6e7c 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardSubscriptionsButton.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardSubscriptionsButton.tsx@@ -7,7 +7,7 @@ export function DashboardSubscriptionsButton() {return <PLUGIN_EMBEDDING_IFRAME_SDK.DashboardSubscriptionsButton />;}- // This flag isn't exclusive it could mean we're on either SDK or EAJS+ // This flag isn't exclusive it could mean we're on either modular embedding or modular embedding SDKif (isEmbeddingSdk()) {return <PLUGIN_DASHBOARD_SUBSCRIPTIONS_SDK.DashboardSubscriptionsButton />;}diff --git a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubAdminSettingsPage.tsx b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubAdminSettingsPage.tsxindex b97850ac149..1601aafb8f5 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubAdminSettingsPage.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubAdminSettingsPage.tsx@@ -17,7 +17,7 @@ export const EmbeddingHubAdminSettingsPage = () => {c="var(--mb-color-text-primary)">{t`Embedding setup guide`}</Title>- <Text c="var(--mb-color-text-secondary)">{t`Follow the guide to get started with Embedded Analytics JS`}</Text>+ <Text c="var(--mb-color-text-secondary)">{t`Follow the guide to get started with modular embedding`}</Text></Stack><EmbeddingHub />diff --git a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubHomePage.tsx b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubHomePage.tsxindex b5991a685f9..d41cbe6afc7 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubHomePage.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubHomePage.tsx@@ -30,10 +30,7 @@ export const EmbeddingHubHomePage = (): ReactNode => {<Group gap="sm"><MetabotGreeting />- <Text- fw={700}- fz="lg"- >{t`Get started with Embedded Analytics JS`}</Text>+ <Text fw={700} fz="lg">{t`Get started with modular embedding`}</Text></Group><Menu position="bottom-end">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 86665a7244c..a36163c75a7 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@@ -15,7 +15,7 @@ export const EnableEmbeddedAnalyticsCard = () => {return (<EnableEmbeddingCard- embeddingType="Embedded Analytics JS"+ embeddingType="Modular embedding"isEnabled={isSimpleEmbeddingEnabled}termsAccepted={isSimpleEmbeddingTermsAccepted}settingsToUpdate={{@@ -26,7 +26,7 @@ export const EnableEmbeddedAnalyticsCard = () => {"show-simple-embed-terms": false,}),}}- errorMessage={t`Failed to enable Embedded Analytics JS`}+ errorMessage={t`Failed to enable modular embedding`}/>);};diff --git a/frontend/src/metabase/home/components/EmbedHomepage/EmbedJsContent.tsx b/frontend/src/metabase/home/components/EmbedHomepage/EmbedJsContent.tsxindex 64d4a054ec6..94670854ee5 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/EmbedJsContent.tsx+++ b/frontend/src/metabase/home/components/EmbedHomepage/EmbedJsContent.tsx@@ -45,7 +45,7 @@ export const EmbedJsContent = ({size="lg"color="text-medium"id="embed-js-title"- >{t`Embedded analytics JS`}</Text>+ >{t`Modular embedding`}</Text><Text mb="md">{/* eslint-disable-next-line no-literal-metabase-strings -- This string only shows for admins. */}{t`A JavaScript library built on top of Metabase’s React SDK that lets you embed individual components (charts, dashboards, query builder) using plain JS — no React setup required. You get per-component controls like drill-through, parameters, downloads, theming.`}@@ -53,7 +53,7 @@ export const EmbedJsContent = ({{showImage && (<EmbedJsImagesrc="/app/assets/img/embed-js-example.png"- alt="Embedded analytics JS example"+ alt="Modular embedding example"/>)}<Group gap="md">diff --git a/frontend/src/metabase/home/components/EmbedHomepage/tests/EmbedHomepage.unit.spec.tsx b/frontend/src/metabase/home/components/EmbedHomepage/tests/EmbedHomepage.unit.spec.tsxindex 4af056682e7..b805723522d 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/tests/EmbedHomepage.unit.spec.tsx+++ b/frontend/src/metabase/home/components/EmbedHomepage/tests/EmbedHomepage.unit.spec.tsx@@ -25,7 +25,7 @@ describe("EmbedHomepage (OSS)", () => {setup();const embedJsSection = screen.getByRole("region", {- name: "Embedded analytics JS",+ name: "Modular embedding",});// Then find the "Read the docs" button within that sectiondiff --git a/frontend/src/metabase/lib/dom.js b/frontend/src/metabase/lib/dom.jsindex 75a30270244..437173e9d5d 100644--- a/frontend/src/metabase/lib/dom.js+++ b/frontend/src/metabase/lib/dom.js@@ -363,7 +363,7 @@ export function shouldOpenInBlankWindow(} = {},) {if (isEmbeddingSdk()) {- // always open in new window in modular embedding (react SDK + EAJS)+ // always open in new window in modular embedding (react SDK + modular embedding)return true;}const isMetaKey = event && event.metaKey != null ? event.metaKey : metaKey;@@ -443,7 +443,7 @@ export function isSameOrSiteUrlOrigin(url) {export function getUrlTarget(url) {if (isEmbeddingSdk()) {- // always open in new window in modular embedding (react SDK + EAJS)+ // always open in new window in modular embedding (react SDK + modular embedding)return "_blank";}return isSameOrSiteUrlOrigin(url) ? "_self" : "_blank";diff --git a/frontend/src/metabase/notifications/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.jsx b/frontend/src/metabase/notifications/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.jsxindex ed9ca5480b9..0c3f65c245b 100644--- a/frontend/src/metabase/notifications/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.jsx+++ b/frontend/src/metabase/notifications/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.jsx@@ -143,10 +143,10 @@ class DashboardSubscriptionsSidebarInner extends Component {const { isAdmin, pulses, loading: isSubscriptionListLoading } = this.props;/**- * (EMB-976): In SDK/EAJS context we need to avoid showing the NEW_PULSE view (the view that lets users select+ * (EMB-976): In modular embedding/modular embedding SDK context we need to avoid showing the NEW_PULSE view (the view that lets users select* between Email and Slack options) because we only allow email subscriptions there.*- * And it's guaranteed that email would already be set up in SDK/EAJS context.+ * And it's guaranteed that email would already be set up in modular embedding/SDK context.* Otherwise, we won't show the subscription button to open this sidebar* in the first place.*/@@ -172,7 +172,7 @@ class DashboardSubscriptionsSidebarInner extends Component {fetchUsers = async () => {if (isEmbeddingSdk()) {- // We don't need the the list of users in SDK/EAJS context because we will hard code the recipient to the logged in user.+ // We don't need the the list of users in modular embedding/SDK context because we will hard code the recipient to the logged in user.this.setState({ users: [] });} else {this.setState({ users: (await UserApi.list()).data });diff --git a/src/metabase/embedding/settings.clj b/src/metabase/embedding/settings.cljindex c0d0b80e766..ac62650ca67 100644--- a/src/metabase/embedding/settings.clj+++ b/src/metabase/embedding/settings.clj@@ -106,7 +106,7 @@:setter (make-embedding-toggle-setter :enable-embedding-sdk "sdk-embedding"))(defsetting enable-embedding-simple- (deferred-tru "Allow admins to embed Metabase via Embedded Analytics JS?")+ (deferred-tru "Allow admins to embed Metabase via modular embedding?"):type :boolean:default false:visibility :authenticateddiff --git a/src/metabase/embedding/util.clj b/src/metabase/embedding/util.cljindex 070225de9b5..5e3def8d3b7 100644--- a/src/metabase/embedding/util.clj+++ b/src/metabase/embedding/util.clj@@ -10,12 +10,12 @@(= (get-in request [:headers "x-metabase-client"]) embedding-sdk-client))(defn has-embedded-analytics-js-header?- "Check if the client has indicated it is from Embedded Analytics JS"+ "Check if the client has indicated it is from modular embedding"[request](= (get-in request [:headers "x-metabase-client"]) embedded-analytics-js-client))(defn is-modular-embedding-request?- "Check if the request is either from Embedding SDK for React or from Embedded Analytics JS"+ "Check if the request is either from Embedding SDK for React or from modular embedding"[request](or (has-react-sdk-header? request)(has-embedded-analytics-js-header? request)))diff --git a/src/metabase/premium_features/settings.clj b/src/metabase/premium_features/settings.cljindex d201da055a1..f4789b70a10 100644--- a/src/metabase/premium_features/settings.clj+++ b/src/metabase/premium_features/settings.clj@@ -252,7 +252,7 @@; the "-feature" suffix avoids name collision with the setting getter(define-premium-feature ^{:added "0.55.0"} enable-embedding-simple-feature?- "Should we enable Embedded Analytics JS?"+ "Should we enable modular embedding?":embedding-simple)(define-premium-feature ^{:added "0.57.0"} enable-embedding-hub?diff --git a/src/metabase/server/routes/index.clj b/src/metabase/server/routes/index.cljindex 12f37c75fe5..6c9a276993b 100644--- a/src/metabase/server/routes/index.clj+++ b/src/metabase/server/routes/index.clj@@ -102,7 +102,7 @@:embedCode (when embeddable? (embed/head uri)):enableGoogleAuth (boolean google-auth-client-id):enableAnonTracking (boolean anon-tracking-enabled)- ;; (metabase#65533) color-scheme meta tag breaks EAJS because it has a transparent background.+ ;; (metabase#65533) color-scheme meta tag breaks Modular embedding because it has a transparent background.;; (metabase#66585) Also omit for static/public embedding to preserve legacy behavior for transparent iframes.:hasColorSchemeMetaTag (not (contains? #{"embed-sdk" "embed" "public"} entrypoint-name))}))diff --git a/test/metabase/request/util_test.clj b/test/metabase/request/util_test.cljindex 3d900434014..f8e403905e6 100644--- a/test/metabase/request/util_test.clj+++ b/test/metabase/request/util_test.clj@@ -40,7 +40,7 @@:embedded true:ip_address "0:0:0:0:0:0:0:1"}(req.util/device-info (update @mock-request :headers assoc "x-metabase-client" "embedding-sdk-react")))))- (testing "Embedded Analytics JS request"+ (testing "Modular embedding request"(is (= {:device_id "129d39d1-6758-4d2c-a751-35b860007002":device_description "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.72 Safari/537.36":embedded true