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
refactor(embed-js): Move EmbedJS + EmbedJS wizard files to OSS folder (#65973)
Timofey Kachalov2d1b6c4a0215
diff --git a/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts b/enterprise/frontend/src/embedding-sdk-ee/auth/auth.tsindex 9a738db009f..46f96c639d4 100644--- a/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts+++ b/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts@@ -22,6 +22,7 @@ import type {} from "embedding-sdk-bundle/store/types";import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";import { getBuildInfo } from "embedding-sdk-shared/lib/get-build-info";+import { requestSessionTokenFromEmbedJs } from "metabase/embedding/embedding-iframe-sdk/utils";import { EMBEDDING_SDK_IFRAME_EMBEDDING_CONFIG } from "metabase/embedding-sdk/config";import { samlTokenStorage } from "metabase/embedding-sdk/lib/saml-token-storage";import type { MetabaseEmbeddingSessionToken } from "metabase/embedding-sdk/types/refresh-token";@@ -30,7 +31,6 @@ import { createAsyncThunk } from "metabase/lib/redux";import { PLUGIN_EMBEDDING_SDK } from "metabase/plugins";import { refreshSiteSettings } from "metabase/redux/settings";import { refreshCurrentUser } from "metabase/redux/user";-import { requestSessionTokenFromEmbedJs } from "metabase-enterprise/embedding_iframe_sdk/utils";const GET_OR_REFRESH_SESSION = "sdk/token/GET_OR_REFRESH_SESSION";diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/auth-manager/AuthManager.ts b/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/auth-manager/AuthManager.tsnew file mode 100644index 00000000000..d0bc36d8c31--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/auth-manager/AuthManager.ts@@ -0,0 +1,94 @@+import {+ connectToInstanceAuthSso,+ jwtDefaultRefreshTokenFunction,+ openSamlLoginPopup,+ validateSession,+} from "embedding/auth-common";+import {+ INVALID_AUTH_METHOD,+ MetabaseError,+} from "embedding-sdk-bundle/errors";+import type { EmbedAuthManagerContext } from "metabase/embedding/embedding-iframe-sdk/types/auth-manager";+import type { MetabaseEmbeddingSessionToken } from "metabase/embedding-sdk/types/refresh-token";++/**+ * Manages authentication for embedded Metabase components.+ * Handles SSO authentication via SAML or JWT methods.+ */+export class EmbedAuthManager {+ constructor(private context: EmbedAuthManagerContext) {}++ /**+ * Authenticate the user and send the session token to the iframe.+ * If using an API key, authentication is skipped.+ */+ async authenticate(): Promise<void> {+ // If we are using an API key, we don't need to authenticate via SSO.+ if (this.context.properties.apiKey) {+ return;+ }++ try {+ const { method, sessionToken } = await this.getMetabaseSessionToken();+ validateSession(sessionToken);++ if (sessionToken) {+ this.context.sendMessage("metabase.embed.submitSessionToken", {+ authMethod: method,+ sessionToken,+ });+ }+ } catch (error) {+ // if the error is an authentication error, show it to the iframe too+ if (error instanceof MetabaseError) {+ this.context.sendMessage("metabase.embed.reportAuthenticationError", {+ error,+ });+ }+ }+ }++ private async getMetabaseSessionToken(): Promise<{+ method: "saml" | "jwt";+ sessionToken: MetabaseEmbeddingSessionToken;+ }> {+ const { instanceUrl, preferredAuthMethod, fetchRequestToken } =+ this.context.properties;++ const urlResponseJson = await connectToInstanceAuthSso(instanceUrl, {+ headers: this.getAuthRequestHeader(),+ preferredAuthMethod,+ });++ const { method, url: responseUrl, hash } = urlResponseJson || {};++ if (method === "saml") {+ const sessionToken = await openSamlLoginPopup(responseUrl);++ return { method, sessionToken };+ }++ if (method === "jwt") {+ const sessionToken = await jwtDefaultRefreshTokenFunction(+ responseUrl,+ instanceUrl,+ this.getAuthRequestHeader(hash),+ fetchRequestToken,+ );++ return { method, sessionToken };+ }++ throw INVALID_AUTH_METHOD({ method });+ }++ private getAuthRequestHeader(hash?: string) {+ return {+ // eslint-disable-next-line no-literal-metabase-strings -- header name+ "X-Metabase-Client": "embedding-simple",++ // eslint-disable-next-line no-literal-metabase-strings -- header name+ ...(hash && { "X-Metabase-SDK-JWT-Hash": hash }),+ };+ }+}diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/index.ts b/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/index.tsindex 2387568e95e..6115cb6bc90 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/index.ts@@ -1,8 +1,7 @@+import { SdkIframeEmbedRoute } from "metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute";import { PLUGIN_EMBEDDING_IFRAME_SDK } from "metabase/plugins";import { hasPremiumFeature } from "metabase-enterprise/settings";-import { SdkIframeEmbedRoute } from "./components/SdkIframeEmbedRoute";-// We allow users try out the iframe embedding without valid license on localhost.// This should always be usable on an EE instance regardless of license.PLUGIN_EMBEDDING_IFRAME_SDK.SdkIframeEmbedRoute = SdkIframeEmbedRoute;diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/sdk-iframe-embedding-script-ee-plugins.ts b/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/sdk-iframe-embedding-script-ee-plugins.tsnew file mode 100644index 00000000000..39ff71d51f2--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/sdk-iframe-embedding-script-ee-plugins.ts@@ -0,0 +1,7 @@+import { PLUGIN_EMBED_JS_EE } from "metabase/embedding/embedding-iframe-sdk/plugin";++import { EmbedAuthManager } from "./auth-manager/AuthManager";++export const initializePlugins = () => {+ PLUGIN_EMBED_JS_EE.EmbedAuthManager = EmbedAuthManager;+};diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ParameterSettings/utils/parameter-placeholder.ts b/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ParameterSettings/utils/parameter-placeholder.tsdeleted file mode 100644index 6917b7059d3..00000000000--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ParameterSettings/utils/parameter-placeholder.ts+++ /dev/null@@ -1,40 +0,0 @@-import { match } from "ts-pattern";--import type { Parameter, ParameterType } from "metabase-types/api";--export const getParameterPlaceholder = (param: Parameter): string => {- // If the parameter has a list of default values.- if (Array.isArray(param.default)) {- return `${param.default.join(", ")}`;- }-- // If the parameter has a single default value.- if (param.default != null) {- return String(param.default);- }-- return getPlaceholderByParamType(param.type);-};--const getPlaceholderByParamType = (paramType: ParameterType): string => {- // parameter type format is "type/subtype", e.g. "date/range",- const [type, subtype] = paramType.split("/");-- // see [enterprise/backend/src/metabase_enterprise/metabot_v3/query_analyzer/parameter_substitution.clj] for list of default values- return match({ type, subtype })- .with({ type: "date", subtype: "single" }, () => "2024-01-09")- .with({ type: "date", subtype: "range" }, () => "2023-01-09~2024-01-09")- .with({ type: "date", subtype: "relative" }, () => "past1years")- .with({ type: "date", subtype: "month-year" }, () => "2024-01")- .with({ type: "date", subtype: "quarter-year" }, () => "Q1-2024")- .with({ type: "date", subtype: "all-options" }, () => "2024-01-09")- .with({ type: "date" }, () => "2024-01-09")- .with({ type: "temporal-unit" }, () => "minute, hour, day, month, year")- .with({ type: "number", subtype: "between" }, () => "50 100")- .with({ type: "number" }, () => "1")- .with({ type: "string" }, () => "sample text")- .with({ type: "boolean" }, () => "true")- .with({ type: "category" }, () => "sample category")- .with({ type: "id" }, () => "1")- .otherwise(() => "");-};diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ParameterSettings/utils/parameter-placeholder.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ParameterSettings/utils/parameter-placeholder.unit.spec.tsdeleted file mode 100644index 095dd71a64a..00000000000--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ParameterSettings/utils/parameter-placeholder.unit.spec.ts+++ /dev/null@@ -1,192 +0,0 @@-import type { Parameter } from "metabase-types/api";--import { getParameterPlaceholder } from "./parameter-placeholder";--const createParameter = (overrides: Partial<Parameter> = {}): Parameter => ({- id: "test-id",- name: "Test Parameter",- type: "string/=",- slug: "test_parameter",- ...overrides,-});--describe("getParameterPlaceholder", () => {- describe("when parameter contains an array of defaults", () => {- it("returns comma-separated values", () => {- const parameter = createParameter({- default: ["apple", "banana", "cherry"],- });-- expect(getParameterPlaceholder(parameter)).toBe("apple, banana, cherry");- });-- it("returns empty string for empty array", () => {- const parameter = createParameter({ default: [] });- expect(getParameterPlaceholder(parameter)).toBe("");- });-- it("handles array with single value", () => {- const parameter = createParameter({ default: ["single"] });- expect(getParameterPlaceholder(parameter)).toBe("single");- });-- it("handles array with mixed types", () => {- const parameter = createParameter({ default: ["text", 123, true] });- expect(getParameterPlaceholder(parameter)).toBe("text, 123, true");- });- });-- describe("when parameter has a non-array default", () => {- it("returns the default value as string", () => {- const stringDefault = createParameter({- default: "default value",- });-- expect(getParameterPlaceholder(stringDefault)).toBe("default value");-- const numberDefault = createParameter({- default: 42,- });-- expect(getParameterPlaceholder(numberDefault)).toBe("42");-- const booleanDefault = createParameter({- default: true,- });-- expect(getParameterPlaceholder(booleanDefault)).toBe("true");- });- });-- describe("when parameter has no default", () => {- it("returns type-specific placeholder for string parameters", () => {- const stringParam = createParameter({- type: "string/=",- default: null,- });-- expect(getParameterPlaceholder(stringParam)).toBe("sample text");-- const stringContainsParam = createParameter({- type: "string/contains",- default: undefined,- });-- expect(getParameterPlaceholder(stringContainsParam)).toBe("sample text");- });-- it("returns type-specific placeholder for number parameters", () => {- const numberParam = createParameter({- type: "number/=",- default: null,- });-- expect(getParameterPlaceholder(numberParam)).toBe("1");-- const numberBetweenParam = createParameter({- type: "number/between",- default: undefined,- });-- expect(getParameterPlaceholder(numberBetweenParam)).toBe("50 100");- });-- it("returns type-specific placeholder for date parameters", () => {- const dateSingleParam = createParameter({- type: "date/single",- default: null,- });-- expect(getParameterPlaceholder(dateSingleParam)).toBe("2024-01-09");-- const dateRangeParam = createParameter({- type: "date/range",- default: undefined,- });-- expect(getParameterPlaceholder(dateRangeParam)).toBe(- "2023-01-09~2024-01-09",- );-- const dateRelativeParam = createParameter({- type: "date/relative",- default: null,- });-- expect(getParameterPlaceholder(dateRelativeParam)).toBe("past1years");-- const dateMonthYearParam = createParameter({- type: "date/month-year",- default: null,- });-- expect(getParameterPlaceholder(dateMonthYearParam)).toBe("2024-01");-- const dateQuarterYearParam = createParameter({- type: "date/quarter-year",- default: null,- });-- expect(getParameterPlaceholder(dateQuarterYearParam)).toBe("Q1-2024");-- const dateAllOptionsParam = createParameter({- type: "date/all-options",- default: null,- });-- expect(getParameterPlaceholder(dateAllOptionsParam)).toBe("2024-01-09");-- const dateGenericParam = createParameter({- type: "date",- default: null,- });-- expect(getParameterPlaceholder(dateGenericParam)).toBe("2024-01-09");- });-- it("returns type-specific placeholder for boolean parameters", () => {- const booleanParam = createParameter({- type: "boolean/=",- default: null,- });-- expect(getParameterPlaceholder(booleanParam)).toBe("true");- });-- it("returns type-specific placeholder for temporal-unit parameters", () => {- const temporalUnitParam = createParameter({- type: "temporal-unit",- default: null,- });-- expect(getParameterPlaceholder(temporalUnitParam)).toBe(- "minute, hour, day, month, year",- );- });-- it("returns type-specific placeholder for category and id parameters", () => {- const categoryParam = createParameter({- type: "category",- default: null,- });-- expect(getParameterPlaceholder(categoryParam)).toBe("sample category");-- const idParam = createParameter({- type: "id",- default: undefined,- });-- expect(getParameterPlaceholder(idParam)).toBe("1");- });-- it("returns empty placeholder for unknown parameter types", () => {- const unknownParam = createParameter({- type: "unknown/unknown",- default: null,- });-- expect(getParameterPlaceholder(unknownParam)).toBe("");- });- });-});diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/index.ts b/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/index.tsindex 828c56b2382..65cc284b228 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/index.ts@@ -1,8 +1,7 @@+import { SdkIframeEmbedSetupModal } from "metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal";import { PLUGIN_EMBEDDING_IFRAME_SDK_SETUP } from "metabase/plugins";import { hasPremiumFeature } from "metabase-enterprise/settings";-import { SdkIframeEmbedSetupModal } from "./components/SdkIframeEmbedSetupModal";-/*** Initialize embedding iframe SDK setup plugin features that depend on hasPremiumFeature.*/diff --git a/enterprise/frontend/src/metabase-enterprise/sdk-iframe-embedding-script-plugins.js b/enterprise/frontend/src/metabase-enterprise/sdk-iframe-embedding-script-plugins.jsnew file mode 100644index 00000000000..15b7c4e1023--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/sdk-iframe-embedding-script-plugins.js@@ -0,0 +1,3 @@+import { initializePlugins } from "./embedding_iframe_sdk/sdk-iframe-embedding-script-ee-plugins";++initializePlugins();diff --git a/frontend/src/embedding-sdk-bundle/errors/error-code.ts b/frontend/src/embedding-sdk-bundle/errors/error-code.tsindex ceecd6e1ac1..da37ec171f4 100644--- a/frontend/src/embedding-sdk-bundle/errors/error-code.ts+++ b/frontend/src/embedding-sdk-bundle/errors/error-code.ts@@ -14,4 +14,5 @@ export type MetabaseErrorCode =| "CANNOT_CONNECT_TO_INSTANCE"| "INVALID_AUTH_METHOD"| "AUTH_TIMEOUT"- | "EMBED_TAG_ERROR";+ | "EMBED_TAG_ERROR"+ | "SSO_NOT_ALLOWED";diff --git a/frontend/src/embedding-sdk-bundle/errors/generic.ts b/frontend/src/embedding-sdk-bundle/errors/generic.tsindex 7c9c425d70b..6a24e960da1 100644--- a/frontend/src/embedding-sdk-bundle/errors/generic.ts+++ b/frontend/src/embedding-sdk-bundle/errors/generic.ts@@ -1,5 +1,12 @@import { MetabaseError } from "./base";+export function SSO_NOT_ALLOWED() {+ return new MetabaseError(+ "SSO_NOT_ALLOWED",+ "SSO authentication is not allowed for this instance.",+ );+}+export function USER_FETCH_FAILED() {return new MetabaseError("USER_FETCH_FAILED",diff --git a/frontend/src/metabase-types/api/settings.ts b/frontend/src/metabase-types/api/settings.tsindex 9f85a7c3204..b5ac85475b9 100644--- a/frontend/src/metabase-types/api/settings.ts+++ b/frontend/src/metabase-types/api/settings.ts@@ -1,7 +1,7 @@import type { ReactNode } from "react";+import type { SdkIframeEmbedSetupSettings } from "metabase/embedding/embedding-iframe-sdk-setup/types";import type { CurrencyStyle } from "metabase/lib/formatting";-import type { SdkIframeEmbedSetupSettings } from "metabase-enterprise/embedding_iframe_sdk_setup/types";import type { InputSettingType } from "./actions";import type { DashboardId } from "./dashboard";diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/analytics.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/analytics.tssimilarity index 98%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/analytics.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/analytics.tsindex 9193685eff9..ee139b7db07 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/analytics.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/analytics.ts@@ -1,10 +1,10 @@import _ from "underscore";-import { trackSimpleEvent } from "metabase/lib/analytics";import type {SdkIframeEmbedSettingKey,SdkIframeEmbedSettings,-} from "metabase-enterprise/embedding_iframe_sdk/types/embed";+} from "metabase/embedding/embedding-iframe-sdk/types/embed";+import { trackSimpleEvent } from "metabase/lib/analytics";import type {SdkIframeEmbedSetupExperience,diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ColorCustomizationSection.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ColorCustomizationSection.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ColorCustomizationSection.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ColorCustomizationSection.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/EmbedPreviewLoadingOverlay.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EmbedPreviewLoadingOverlay.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/EmbedPreviewLoadingOverlay.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EmbedPreviewLoadingOverlay.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/EnableEmbeddedAnalyticsCard.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableEmbeddedAnalyticsCard.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/EnableEmbeddedAnalyticsCard.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableEmbeddedAnalyticsCard.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/GetCodeStep.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/GetCodeStep.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/GetCodeStep.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/GetCodeStep.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/MetabotLayoutSetting.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/MetabotLayoutSetting.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/MetabotLayoutSetting.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/MetabotLayoutSetting.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ParameterSettings/ParameterSettings.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/ParameterSettings.tsxsimilarity index 96%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ParameterSettings/ParameterSettings.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/ParameterSettings.tsxindex 6bd0e58f3e3..a6723cc9550 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ParameterSettings/ParameterSettings.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/ParameterSettings.tsx@@ -3,9 +3,9 @@ import { useCallback, useMemo } from "react";import { t } from "ttag";import CS from "metabase/css/core/index.css";+import { SET_INITIAL_PARAMETER_DEBOUNCE_MS } from "metabase/embedding/embedding-iframe-sdk-setup/constants";import { ParameterWidget } from "metabase/parameters/components/ParameterWidget";import { Group, Stack, Text } from "metabase/ui";-import { SET_INITIAL_PARAMETER_DEBOUNCE_MS } from "metabase-enterprise/embedding_iframe_sdk_setup/constants";import type { UiParameter } from "metabase-lib/v1/parameters/types";import { getValuePopulatedParameters } from "metabase-lib/v1/parameters/utils/parameter-values";import type { ParameterValueOrArray } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ParameterSettings/ParameterVisibilityToggle.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/ParameterVisibilityToggle.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ParameterSettings/ParameterVisibilityToggle.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/ParameterVisibilityToggle.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ParameterSettings/hooks/use-hide-parameter.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/hooks/use-hide-parameter.tssimilarity index 90%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ParameterSettings/hooks/use-hide-parameter.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/hooks/use-hide-parameter.tsindex 98316e980b3..a5ad7f768cd 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ParameterSettings/hooks/use-hide-parameter.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/hooks/use-hide-parameter.ts@@ -1,6 +1,6 @@import { useCallback } from "react";-import type { SdkIframeEmbedSetupContextType } from "metabase-enterprise/embedding_iframe_sdk_setup/context";+import type { SdkIframeEmbedSetupContextType } from "metabase/embedding/embedding-iframe-sdk-setup/context";export function useHideParameter({settings,diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ParameterSettings/index.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/index.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/ParameterSettings/index.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/index.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SdkIframeEmbedPreview.module.css b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedPreview.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SdkIframeEmbedPreview.module.cssrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedPreview.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SdkIframeEmbedPreview.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedPreview.tsxsimilarity index 95%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SdkIframeEmbedPreview.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedPreview.tsxindex f3502fbcfdb..48c209ac757 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SdkIframeEmbedPreview.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedPreview.tsx@@ -9,14 +9,14 @@ import {import { match } from "ts-pattern";import { useSetting } from "metabase/common/hooks";+import { METABASE_CONFIG_IS_PROXY_FIELD_NAME } from "metabase/embedding/embedding-iframe-sdk/constants";+import { setupConfigWatcher } from "metabase/embedding/embedding-iframe-sdk/embed";+import type { SdkIframeEmbedBaseSettings } from "metabase/embedding/embedding-iframe-sdk/types/embed";import type { MetabaseTheme } from "metabase/embedding-sdk/theme";import { colors as defaultMetabaseColors } from "metabase/lib/colors";import { Card } from "metabase/ui";-import { METABASE_CONFIG_IS_PROXY_FIELD_NAME } from "metabase-enterprise/embedding_iframe_sdk/constants";// we import the equivalent of embed.js so that we don't add extra loading time// by appending the script-import { setupConfigWatcher } from "metabase-enterprise/embedding_iframe_sdk/embed";-import type { SdkIframeEmbedBaseSettings } from "metabase-enterprise/embedding_iframe_sdk/types/embed";import { useSdkIframeEmbedSetupContext } from "../context";import { getDerivedDefaultColorsForEmbedFlow } from "../utils/derived-colors-for-embed-flow";diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SdkIframeEmbedSetup.module.css b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetup.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SdkIframeEmbedSetup.module.cssrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetup.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SdkIframeEmbedSetupModal.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SdkIframeEmbedSetupModal.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SdkIframeEmbedSetupProvider.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupProvider.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SdkIframeEmbedSetupProvider.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupProvider.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SelectEmbedExperienceStep.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedExperienceStep.tsxsimilarity index 96%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SelectEmbedExperienceStep.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedExperienceStep.tsxindex 3a91d214a66..8c48674b050 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SelectEmbedExperienceStep.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedExperienceStep.tsx@@ -5,9 +5,9 @@ import _ from "underscore";import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";+import { ALLOWED_EMBED_SETTING_KEYS_MAP } from "metabase/embedding/embedding-iframe-sdk/constants";import { PLUGIN_METABOT } from "metabase/plugins";import { Card, Radio, Stack, Text } from "metabase/ui";-import { ALLOWED_EMBED_SETTING_KEYS_MAP } from "metabase-enterprise/embedding_iframe_sdk/constants";import {EMBED_FALLBACK_DASHBOARD_ID,diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SelectEmbedOptionsStep.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedOptionsStep.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SelectEmbedOptionsStep.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedOptionsStep.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SelectEmbedResourceMissingRecents.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceMissingRecents.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SelectEmbedResourceMissingRecents.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceMissingRecents.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SelectEmbedResourceRecentItemCard.module.css b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceRecentItemCard.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SelectEmbedResourceRecentItemCard.module.cssrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceRecentItemCard.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SelectEmbedResourceRecentItemCard.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceRecentItemCard.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SelectEmbedResourceRecentItemCard.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceRecentItemCard.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SelectEmbedResourceStep.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceStep.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/SelectEmbedResourceStep.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceStep.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/tests/SdkIframeEmbedSetup-embedding-hub.unit.spec.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/SdkIframeEmbedSetup-embedding-hub.unit.spec.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/tests/SdkIframeEmbedSetup-embedding-hub.unit.spec.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/SdkIframeEmbedSetup-embedding-hub.unit.spec.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/tests/SdkIframeEmbedSetup.unit.spec.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/SdkIframeEmbedSetup.unit.spec.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/tests/SdkIframeEmbedSetup.unit.spec.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/SdkIframeEmbedSetup.unit.spec.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/tests/test-setup.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/test-setup.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/components/tests/test-setup.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/test-setup.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/constants.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/constants.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/constants.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/constants.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/context.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/context.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/context.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/context.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/index.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/index.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/index.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/index.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-get-current-resource.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-current-resource.tssimilarity index 96%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-get-current-resource.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-current-resource.tsindex bac8801b912..d836d970774 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-get-current-resource.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-current-resource.ts@@ -3,11 +3,11 @@ import { useAsync } from "react-use";import { skipToken, useGetCardQuery } from "metabase/api";import { fetchDashboard } from "metabase/dashboard/actions";import { getDashboardComplete } from "metabase/dashboard/selectors";-import { useDispatch, useSelector } from "metabase/lib/redux";import type {SdkIframeEmbedSetupExperience,SdkIframeEmbedSetupSettings,-} from "metabase-enterprise/embedding_iframe_sdk_setup/types";+} from "metabase/embedding/embedding-iframe-sdk-setup/types";+import { useDispatch, useSelector } from "metabase/lib/redux";import type { Card, Dashboard } from "metabase-types/api";const getResource = ({diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-parameters-values.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-parameters-values.tssimilarity index 82%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-parameters-values.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-parameters-values.tsindex f0bf56db7b1..4cd22172305 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-parameters-values.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-parameters-values.ts@@ -1,9 +1,9 @@import { useMemo } from "react";import { P, match } from "ts-pattern";+import type { SdkIframeEmbedSetupSettings } from "metabase/embedding/embedding-iframe-sdk-setup/types";+import { convertParameterValuesBySlugToById } from "metabase/embedding/embedding-iframe-sdk-setup/utils/convert-parameter-values-by-slug-to-by-id";import type { EmbeddingParametersValues } from "metabase/public/lib/types";-import type { SdkIframeEmbedSetupSettings } from "metabase-enterprise/embedding_iframe_sdk_setup/types";-import { convertParameterValuesBySlugToById } from "metabase-enterprise/embedding_iframe_sdk_setup/utils/convert-parameter-values-by-slug-to-by-id";import type { Parameter } from "metabase-types/api";export const useParametersValues = ({diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-parameters.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-parameters.tssimilarity index 95%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-parameters.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-parameters.tsindex 98594e09dfd..169d6cb1293 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-parameters.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-parameters.ts@@ -1,11 +1,11 @@import { useEffect, useMemo } from "react";import { useLatest } from "react-use";+import type { SdkIframeEmbedSetupExperience } from "metabase/embedding/embedding-iframe-sdk-setup/types";import { useDispatch, useSelector } from "metabase/lib/redux";import { getSavedDashboardUiParameters } from "metabase/parameters/utils/dashboards";import { addFields } from "metabase/redux/metadata";import { getMetadata } from "metabase/selectors/metadata";-import type { SdkIframeEmbedSetupExperience } from "metabase-enterprise/embedding_iframe_sdk_setup/types";import { getCardUiParameters } from "metabase-lib/v1/parameters/utils/cards";import type { Card, Dashboard, Parameter } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-recent-items.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-recent-items.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-recent-items.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-recent-items.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-sdk-iframe-embed-navigation.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-navigation.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-sdk-iframe-embed-navigation.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-navigation.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-sdk-iframe-embed-settings.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-settings.tssimilarity index 97%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-sdk-iframe-embed-settings.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-settings.tsindex 2e3e02f715b..3e44134ca72 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-sdk-iframe-embed-settings.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-settings.ts@@ -3,15 +3,15 @@ import { P, match } from "ts-pattern";import _ from "underscore";import { useUserSetting } from "metabase/common/hooks";-import type { SdkIframeEmbedSetupModalInitialState } from "metabase/plugins";import {EMBED_FALLBACK_DASHBOARD_ID,USER_SETTINGS_DEBOUNCE_MS,-} from "metabase-enterprise/embedding_iframe_sdk_setup/constants";+} from "metabase/embedding/embedding-iframe-sdk-setup/constants";import type {SdkIframeEmbedSetupRecentItem,SdkIframeEmbedSetupSettings,-} from "metabase-enterprise/embedding_iframe_sdk_setup/types";+} from "metabase/embedding/embedding-iframe-sdk-setup/types";+import type { SdkIframeEmbedSetupModalInitialState } from "metabase/plugins";import { trackEmbedWizardOpened } from "../analytics";import {diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-sdk-iframe-embed-snippet.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-snippet.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/hooks/use-sdk-iframe-embed-snippet.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-snippet.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/types.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/types.tssimilarity index 95%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/types.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/types.tsindex c58e857d0bd..4942217d737 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/types.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/types.ts@@ -5,7 +5,7 @@ import type {MetabotEmbedOptions,QuestionEmbedOptions,SdkIframeEmbedBaseSettings,-} from "metabase-enterprise/embedding_iframe_sdk/types/embed";+} from "metabase/embedding/embedding-iframe-sdk/types/embed";import type { BaseRecentItem } from "metabase-types/api";export type SdkIframeEmbedSetupExperience =diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/convert-parameter-values-by-slug-to-by-id.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/convert-parameter-values-by-slug-to-by-id.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/convert-parameter-values-by-slug-to-by-id.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/convert-parameter-values-by-slug-to-by-id.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/convert-parameter-values-by-slug-to-by-id.unit.spec.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/convert-parameter-values-by-slug-to-by-id.unit.spec.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/convert-parameter-values-by-slug-to-by-id.unit.spec.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/convert-parameter-values-by-slug-to-by-id.unit.spec.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/derived-colors-for-embed-flow.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/derived-colors-for-embed-flow.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/derived-colors-for-embed-flow.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/derived-colors-for-embed-flow.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/derived-colors-for-embed-flow.unit.spec.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/derived-colors-for-embed-flow.unit.spec.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/derived-colors-for-embed-flow.unit.spec.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/derived-colors-for-embed-flow.unit.spec.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/dynamic-sdk-color-defaults.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/dynamic-sdk-color-defaults.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/dynamic-sdk-color-defaults.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/dynamic-sdk-color-defaults.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/embed-snippet.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/embed-snippet.tssimilarity index 97%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/embed-snippet.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/embed-snippet.tsindex 914e0d7c66c..c9e7a59d315 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/embed-snippet.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/embed-snippet.ts@@ -4,12 +4,12 @@ import _ from "underscore";import {ALLOWED_EMBED_SETTING_KEYS_MAP,type AllowedEmbedSettingKey,-} from "metabase-enterprise/embedding_iframe_sdk/constants";+} from "metabase/embedding/embedding-iframe-sdk/constants";import type {DashboardEmbedOptions,QuestionEmbedOptions,SdkIframeEmbedBaseSettings,-} from "metabase-enterprise/embedding_iframe_sdk/types/embed";+} from "metabase/embedding/embedding-iframe-sdk/types/embed";import type {SdkIframeDashboardEmbedSettings,diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/embed-snippet.unit.spec.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/embed-snippet.unit.spec.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/embed-snippet.unit.spec.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/embed-snippet.unit.spec.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/filter-empty-settings.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/filter-empty-settings.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/filter-empty-settings.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/filter-empty-settings.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/get-default-sdk-iframe-embed-setting.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/get-default-sdk-iframe-embed-setting.tssimilarity index 97%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/get-default-sdk-iframe-embed-setting.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/get-default-sdk-iframe-embed-setting.tsindex 35da6757bef..17889ead285 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/get-default-sdk-iframe-embed-setting.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/get-default-sdk-iframe-embed-setting.ts@@ -7,7 +7,7 @@ import type {ExplorationEmbedOptions,MetabotEmbedOptions,QuestionEmbedOptions,-} from "metabase-enterprise/embedding_iframe_sdk/types/embed";+} from "metabase/embedding/embedding-iframe-sdk/types/embed";import type {SdkIframeEmbedSetupExperience,diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/theme-colors.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/theme-colors.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/theme-colors.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/theme-colors.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/types.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/types.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk_setup/utils/types.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/types.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/analytics.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/analytics.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/analytics.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk/analytics.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/analytics.unit.spec.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk/analytics.unit.spec.tsxsimilarity index 98%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/analytics.unit.spec.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk/analytics.unit.spec.tsxindex 59189e86cad..2c030872cfc 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/analytics.unit.spec.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/analytics.unit.spec.tsx@@ -1,6 +1,6 @@// Ensure the custom elements are registered-import "metabase-enterprise/embedding_iframe_sdk/embed";-import type { MetabaseEmbedElement } from "metabase-enterprise/embedding_iframe_sdk/embed";+import "metabase/embedding/embedding-iframe-sdk/embed";+import type { MetabaseEmbedElement } from "metabase/embedding/embedding-iframe-sdk/embed";import { createEmbeddedAnalyticsJsUsage } from "./analytics";import type { SdkIframeEmbedBaseSettings } from "./types/embed";diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/components/MetabaseBrowser.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/MetabaseBrowser.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/components/MetabaseBrowser.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk/components/MetabaseBrowser.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/components/SdkIframeEmbedRoute.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsxsimilarity index 98%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/components/SdkIframeEmbedRoute.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsxindex 83533190ce9..257a98dee49 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/components/SdkIframeEmbedRoute.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx@@ -14,7 +14,7 @@ import {} from "embedding-sdk-bundle/components/public/dashboard";import { getSdkStore, useSdkSelector } from "embedding-sdk-bundle/store";import { getLoginStatus } from "embedding-sdk-bundle/store/selectors";-import type { MetabaseAuthConfig } from "embedding-sdk-package";+import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";import { EMBEDDING_SDK_IFRAME_EMBEDDING_CONFIG } from "metabase/embedding-sdk/config";import { createTracker } from "metabase/lib/analytics-untyped";import { PLUGIN_EMBEDDING_IFRAME_SDK } from "metabase/plugins";diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/components/SdkIframeError.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeError.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/components/SdkIframeError.tsxrename to frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeError.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/constants.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/constants.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/constants.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk/constants.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/embed.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/embed.tssimilarity index 86%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/embed.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk/embed.tsindex 948ebdc1793..d705fa2f21f 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/embed.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/embed.ts@@ -1,13 +1,9 @@-import {- connectToInstanceAuthSso,- jwtDefaultRefreshTokenFunction,- openSamlLoginPopup,- validateSession,-} from "embedding/auth-common";-import {- INVALID_AUTH_METHOD,- MetabaseError,-} from "embedding-sdk-bundle/errors";+import { MetabaseError, SSO_NOT_ALLOWED } from "embedding-sdk-bundle/errors";+import { PLUGIN_EMBED_JS_EE } from "metabase/embedding/embedding-iframe-sdk/plugin";+import type {+ EmbedAuthManager,+ EmbedAuthManagerContext,+} from "metabase/embedding/embedding-iframe-sdk/types/auth-manager";import { debouncedReportAnalytics } from "./analytics";import {@@ -25,6 +21,9 @@ import type {} from "./types/embed";import { attributeToSettingKey, parseAttributeValue } from "./webcomponents";+// Import EE Iframe Embedding script plugins+import "sdk-iframe-embedding-script-ee-plugins";+const EMBEDDING_ROUTE = "embed/sdk/v1";/** list of active embeds, used to know which embeds to update when the global config changes */@@ -137,7 +136,10 @@ function assertValidMetabaseConfigField(}}-export abstract class MetabaseEmbedElement extends HTMLElement {+export abstract class MetabaseEmbedElement+ extends HTMLElement+ implements EmbedAuthManagerContext+{private _iframe: HTMLIFrameElement | null = null;protected abstract _componentName: string;protected abstract _attributeNames: readonly string[];@@ -149,6 +151,7 @@ export abstract class MetabaseEmbedElement extends HTMLElement {SdkIframeEmbedEvent["type"],Set<SdkIframeEmbedEventHandler>> = new Map();+ private _authManager: EmbedAuthManager | null = null;get globalSettings() {return (window as any).metabaseConfig || {};@@ -261,6 +264,7 @@ export abstract class MetabaseEmbedElement extends HTMLElement {window.removeEventListener("message", this._handleMessage);this._isEmbedReady = false;this._eventHandlers.clear();+ this._authManager = null;if (this._iframe) {this._iframe.remove();@@ -329,6 +333,11 @@ export abstract class MetabaseEmbedElement extends HTMLElement {private _setup() {this._validateEmbedSettings(this.properties);+ // Initialize the auth manager+ this._authManager = PLUGIN_EMBED_JS_EE.EmbedAuthManager+ ? new PLUGIN_EMBED_JS_EE.EmbedAuthManager(this)+ : null;+this._iframe = document.createElement("iframe");this._iframe.src = `${this.globalSettings.instanceUrl}/${EMBEDDING_ROUTE}`;this._iframe.style.width = "100%";@@ -443,73 +452,15 @@ export abstract class MetabaseEmbedElement extends HTMLElement {}private async _authenticate() {- // If we are using an API key, we don't need to authenticate via SSO.- if (this.properties.apiKey) {- return;- }-- try {- const { method, sessionToken } = await this._getMetabaseSessionToken();- validateSession(sessionToken);-- if (sessionToken) {- this.sendMessage("metabase.embed.submitSessionToken", {- authMethod: method,- sessionToken,- });- }- } catch (error) {- // if the error is an authentication error, show it to the iframe too- if (error instanceof MetabaseError) {- this.sendMessage("metabase.embed.reportAuthenticationError", {- error,- });- }- }- }-- /**- * @returns {{ method: "saml" | "jwt", sessionToken: {jwt: string} }}- */- private async _getMetabaseSessionToken() {- const { instanceUrl, preferredAuthMethod, fetchRequestToken } =- this.properties;-- const urlResponseJson = await connectToInstanceAuthSso(instanceUrl, {- headers: this._getAuthRequestHeader(),- preferredAuthMethod,- });-- const { method, url: responseUrl, hash } = urlResponseJson || {};-- if (method === "saml") {- const sessionToken = await openSamlLoginPopup(responseUrl);-- return { method, sessionToken };- }+ if (!this._authManager) {+ this.sendMessage("metabase.embed.reportAuthenticationError", {+ error: SSO_NOT_ALLOWED(),+ });- if (method === "jwt") {- const sessionToken = await jwtDefaultRefreshTokenFunction(- responseUrl,- instanceUrl,- this._getAuthRequestHeader(hash),- fetchRequestToken,- );-- return { method, sessionToken };+ return;}- throw INVALID_AUTH_METHOD({ method });- }-- private _getAuthRequestHeader(hash?: string) {- return {- // eslint-disable-next-line no-literal-metabase-strings -- header name- "X-Metabase-Client": "embedding-simple",-- // eslint-disable-next-line no-literal-metabase-strings -- header name- ...(hash && { "X-Metabase-SDK-JWT-Hash": hash }),- };+ await this._authManager.authenticate();}}diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/embed.unit.spec.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/embed.unit.spec.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/embed.unit.spec.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk/embed.unit.spec.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/hooks/use-param-rerender-key.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/use-param-rerender-key.tssimilarity index 88%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/hooks/use-param-rerender-key.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/use-param-rerender-key.tsindex 6fb6ca6c611..0e7cc03d725 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/hooks/use-param-rerender-key.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/use-param-rerender-key.ts@@ -3,7 +3,7 @@ import { P, match } from "ts-pattern";import { stableStringify } from "metabase/lib/objects";-import type { SdkIframeEmbedSettings } from "../../embedding_iframe_sdk/types/embed";+import type { SdkIframeEmbedSettings } from "../types/embed";/*** Forces a re-render when the initial parameter changes.diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/hooks/use-sdk-iframe-embed-event-bus.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/use-sdk-iframe-embed-event-bus.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/hooks/use-sdk-iframe-embed-event-bus.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/use-sdk-iframe-embed-event-bus.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/hooks/use-sdk-iframe-embed-event-bus.unit.spec.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/use-sdk-iframe-embed-event-bus.unit.spec.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/hooks/use-sdk-iframe-embed-event-bus.unit.spec.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/use-sdk-iframe-embed-event-bus.unit.spec.tsdiff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/plugin.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/plugin.tsnew file mode 100644index 00000000000..8d0ae47d29e--- /dev/null+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/plugin.ts@@ -0,0 +1,5 @@+import type { EmbedAuthManagerConstructor } from "metabase/embedding/embedding-iframe-sdk/types/auth-manager";++export const PLUGIN_EMBED_JS_EE = {+ EmbedAuthManager: null as EmbedAuthManagerConstructor | null,+};diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/types/auth-manager.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/types/auth-manager.tsnew file mode 100644index 00000000000..7128704beb9--- /dev/null+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/types/auth-manager.ts@@ -0,0 +1,24 @@+import type { MetabaseAuthMethod } from "embedding-sdk-bundle/types";+import type { SdkIframeEmbedMessage } from "metabase/embedding/embedding-iframe-sdk/types/embed";+import type { MetabaseFetchRequestTokenFn } from "metabase/embedding-sdk/types/refresh-token";++export interface EmbedAuthManagerContext {+ properties: {+ apiKey?: string;+ instanceUrl: string;+ preferredAuthMethod?: MetabaseAuthMethod;+ fetchRequestToken?: MetabaseFetchRequestTokenFn;+ };+ sendMessage<Message extends SdkIframeEmbedMessage>(+ type: Message["type"],+ data: Message["data"],+ ): void;+}++export interface EmbedAuthManager {+ authenticate(): Promise<void>;+}++export type EmbedAuthManagerConstructor = new (+ context: EmbedAuthManagerContext,+) => EmbedAuthManager;diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/types/embed.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/types/embed.tssimilarity index 95%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/types/embed.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk/types/embed.tsindex b57bfa73ae2..9f5e1824307 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/types/embed.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/types/embed.ts@@ -1,13 +1,12 @@+import type { CollectionBrowserListColumns } from "embedding-sdk-bundle/components/public/CollectionBrowser";import type { MetabaseError } from "embedding-sdk-bundle/errors";import type { MetabaseErrorCode } from "embedding-sdk-bundle/errors/error-code";-import type { MetabaseAuthMethod } from "embedding-sdk-bundle/types";import type {- CollectionBrowserListColumns,- EmbeddingEntityType,EntityTypeFilterKeys,+ MetabaseAuthMethod,MetabaseTheme,SqlParameterValues,-} from "embedding-sdk-package";+} from "embedding-sdk-bundle/types";import type { ParameterValues } from "metabase/embedding-sdk/types/dashboard";import type {MetabaseEmbeddingSessionToken,@@ -15,6 +14,7 @@ import type {} from "metabase/embedding-sdk/types/refresh-token";import type { EmbeddedAnalyticsJsEventSchema } from "metabase-types/analytics/embedded-analytics-js";import type { CollectionId } from "metabase-types/api";+import type { EmbeddingEntityType } from "metabase-types/store/embedding-data-picker";/** Events that the embed.js script listens for */export type SdkIframeEmbedTagMessage =diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/types/store.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/types/store.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/types/store.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk/types/store.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/utils/index.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/utils/index.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/utils/index.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk/utils/index.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/utils/request-session-token.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/utils/request-session-token.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/utils/request-session-token.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk/utils/request-session-token.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/webcomponents.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/webcomponents.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/webcomponents.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk/webcomponents.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/webcomponents.unit.spec.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/webcomponents.unit.spec.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/webcomponents.unit.spec.tsrename to frontend/src/metabase/embedding/embedding-iframe-sdk/webcomponents.unit.spec.tsdiff --git a/rspack.iframe-sdk-embed.config.js b/rspack.iframe-sdk-embed.config.jsindex ef36d69a85d..04b322e4086 100644--- a/rspack.iframe-sdk-embed.config.js+++ b/rspack.iframe-sdk-embed.config.js@@ -7,24 +7,29 @@ const {CopyJsFromTmpDirectoryPlugin,} = require("./frontend/build/shared/rspack/copy-js-from-tmp-directory-plugin");+const SRC_PATH = __dirname + "/frontend/src/metabase";const ENTERPRISE_SRC_PATH =__dirname + "/enterprise/frontend/src/metabase-enterprise";const SCRIPT_TAG_PATH = path.resolve(- ENTERPRISE_SRC_PATH,- "embedding_iframe_sdk/embed.ts",+ SRC_PATH,+ "embedding/embedding-iframe-sdk/embed.ts",);const BUILD_PATH = __dirname + "/resources/frontend_client";const EMBEDDING_SRC_PATH = __dirname + "/enterprise/frontend/src/embedding";-const SDK_BUNDLE_SRC_PATH =- __dirname + "/frontend/src/embedding-sdk-bundle";+const SDK_BUNDLE_SRC_PATH = __dirname + "/frontend/src/embedding-sdk-bundle";const OUT_FILE_NAME = "embed.js";const OUT_TEMP_PATH = path.resolve(BUILD_PATH, "tmp-embed-js");const DEV_PORT = process.env.MB_FRONTEND_DEV_PORT || 8080;+const resolveEnterprisePathOrNoop = (path) =>+ process.env.MB_EDITION === "ee"+ ? ENTERPRISE_SRC_PATH + path+ : SRC_PATH + "/lib/noop";+module.exports = {name: "iframe_sdk_embed_v1",entry: SCRIPT_TAG_PATH,@@ -76,8 +81,12 @@ module.exports = {resolve: {extensions: [".js", ".ts"],alias: {+ metabase: SRC_PATH,embedding: EMBEDDING_SRC_PATH,"embedding-sdk-bundle": SDK_BUNDLE_SRC_PATH,+ "sdk-iframe-embedding-script-ee-plugins": resolveEnterprisePathOrNoop(+ "/sdk-iframe-embedding-script-plugins",+ ),},},};diff --git a/rspack.main.config.js b/rspack.main.config.jsindex 65a65333c3b..2b31141c52a 100644--- a/rspack.main.config.js+++ b/rspack.main.config.js@@ -32,10 +32,8 @@ const ENTERPRISE_SRC_PATH =const EMBEDDING_SRC_PATH = __dirname + "/enterprise/frontend/src/embedding";const SDK_PACKAGE_SRC_PATH =__dirname + "/enterprise/frontend/src/embedding-sdk-package";-const SDK_BUNDLE_SRC_PATH =- __dirname + "/frontend/src/embedding-sdk-bundle";-const SDK_SHARED_SRC_PATH =- __dirname + "/frontend/src/embedding-sdk-shared";+const SDK_BUNDLE_SRC_PATH = __dirname + "/frontend/src/embedding-sdk-bundle";+const SDK_SHARED_SRC_PATH = __dirname + "/frontend/src/embedding-sdk-shared";const TYPES_SRC_PATH = __dirname + "/frontend/src/metabase-types";const CLJS_SRC_PATH = __dirname + "/target/cljs_release";const CLJS_SRC_PATH_DEV = __dirname + "/target/cljs_dev";@@ -248,6 +246,9 @@ const config = {"sdk-iframe-embedding-ee-plugins": resolveEnterprisePathOrNoop("/sdk-iframe-embedding-plugins",),+ "sdk-iframe-embedding-script-ee-plugins": resolveEnterprisePathOrNoop(+ "/sdk-iframe-embedding-script-plugins",+ ),"sdk-ee-plugins":process.env.MB_EDITION === "ee"? ENTERPRISE_SRC_PATH + "/sdk-plugins"