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
Dissolve the app-tier cycle clusters (#81289)
Romeo Van Snickb0de2cb6789e
diff --git a/enterprise/frontend/src/embedding-sdk-package/test/environment.unit.spec.ts b/enterprise/frontend/src/embedding-sdk-package/test/environment.unit.spec.tsnew file mode 100644index 00000000000..7c481d96808--- /dev/null+++ b/enterprise/frontend/src/embedding-sdk-package/test/environment.unit.spec.ts@@ -0,0 +1,19 @@+import { EMBEDDING_SDK_CONFIG } from "metabase/embedding-sdk/config";++describe("SDK environment config", () => {+ beforeEach(() => {+ EMBEDDING_SDK_CONFIG.isEmbeddingSdk = false;+ });++ it("sets isEmbeddingSdk() to true when SDK is imported", async () => {+ expect(+ (await import("metabase/embedding-sdk/config")).isEmbeddingSdk(),+ ).toBe(false);++ await import("embedding-sdk-package");++ expect(+ (await import("metabase/embedding-sdk/config")).isEmbeddingSdk(),+ ).toBe(true);+ });+});diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjsindex 8024f640d55..3acc5b82f56 100644--- a/frontend/lint/module-boundaries.mjs+++ b/frontend/lint/module-boundaries.mjs@@ -373,8 +373,6 @@ const elements = ["frontend/src/metabase/AppComponent.tsx","frontend/src/metabase/App.styled.tsx","frontend/src/metabase/AppKBarProvider.tsx",- "frontend/src/metabase/app/selectors.ts",- "frontend/src/metabase/app/selectors.unit.spec.ts","frontend/src/metabase/reducers-main.ts","frontend/src/metabase/reducers-public.ts","frontend/src/metabase/routes.tsx",diff --git a/frontend/src/embedding-sdk-bundle/test/environment.unit.spec.ts b/frontend/src/embedding-sdk-bundle/test/environment.unit.spec.tsindex 7c55af0263d..1fccb5c4ecb 100644--- a/frontend/src/embedding-sdk-bundle/test/environment.unit.spec.ts+++ b/frontend/src/embedding-sdk-bundle/test/environment.unit.spec.ts@@ -5,18 +5,6 @@ describe("SDK environment config", () => {EMBEDDING_SDK_CONFIG.isEmbeddingSdk = false;});- it("sets isEmbeddingSdk() to true when SDK is imported", async () => {- expect(- (await import("metabase/embedding-sdk/config")).isEmbeddingSdk(),- ).toBe(false);-- await import("embedding-sdk-package");-- expect(- (await import("metabase/embedding-sdk/config")).isEmbeddingSdk(),- ).toBe(true);- });-it("sets isEmbeddingSdk() to true when SDK bundle is imported", async () => {expect((await import("metabase/embedding-sdk/config")).isEmbeddingSdk(),diff --git a/frontend/src/metabase/AppComponent.tsx b/frontend/src/metabase/AppComponent.tsxindex 8f45ce23dfa..89441867e34 100644--- a/frontend/src/metabase/AppComponent.tsx+++ b/frontend/src/metabase/AppComponent.tsx@@ -9,7 +9,7 @@ import {getIsDataStudioApp,getIsMonitorApp,getIsNavBarEnabled,-} from "metabase/app/selectors";+} from "metabase/app/nav/selectors";import { AppBanner } from "metabase/common/components/AppBanner";import ErrorBoundary from "metabase/common/components/ErrorBoundary";import {diff --git a/frontend/src/metabase/app/nav/AppBar.tsx b/frontend/src/metabase/app/nav/AppBar.tsxindex 247a96e932c..6371e78fa1d 100644--- a/frontend/src/metabase/app/nav/AppBar.tsx+++ b/frontend/src/metabase/app/nav/AppBar.tsx@@ -10,7 +10,7 @@ import {getIsNewButtonVisible,getIsQuestionLineageVisible,getIsSearchVisible,-} from "metabase/app/selectors";+} from "metabase/app/nav/selectors";import { useInitialCollectionId } from "metabase/common/collections/hooks";import { getUser } from "metabase/current-user";import { getIsSidebarOpen } from "metabase/documents/selectors";diff --git a/frontend/src/metabase/app/selectors.ts b/frontend/src/metabase/app/nav/selectors.tssimilarity index 100%rename from frontend/src/metabase/app/selectors.tsrename to frontend/src/metabase/app/nav/selectors.tsdiff --git a/frontend/src/metabase/app/selectors.unit.spec.ts b/frontend/src/metabase/app/nav/selectors.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/app/selectors.unit.spec.tsrename to frontend/src/metabase/app/nav/selectors.unit.spec.tsdiff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/types.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/types.tsindex 40d918e4313..279bf5eaf3b 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/types.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/types.ts@@ -1,11 +1,11 @@import type {BrowserEmbedOptions,- DashboardEmbedOptions,ExplorationEmbedOptions,MetabotEmbedOptions,- QuestionEmbedOptions,+ SdkIframeDashboardEmbedSettings,SdkIframeEmbedAuthTypeSettings,SdkIframeEmbedBaseSettings,+ SdkIframeQuestionEmbedSettings,} from "metabase/embedding/embedding-iframe-sdk/types/embed";import type {BaseRecentItem,@@ -32,14 +32,6 @@ export type SdkIframeEmbedSetupRecentItem = Pick<export type SdkIframeEmbedSetupGuestEmbedSettings =SdkIframeEmbedAuthTypeSettings;-export type SdkIframeDashboardEmbedSettings = DashboardEmbedOptions & {- lockedParameters?: string[];-};--export type SdkIframeQuestionEmbedSettings = QuestionEmbedOptions & {- lockedParameters?: string[];-};-export type SdkIframeEmbedSetupTemplateSettings =| SdkIframeDashboardEmbedSettings| SdkIframeQuestionEmbedSettingsdiff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/build-embed-attributes.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/build-embed-attributes.tsindex a21d22fff42..d7d72e2b993 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/build-embed-attributes.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/build-embed-attributes.ts@@ -9,13 +9,11 @@ import type {DashboardEmbedOptions,ExplorationEmbedOptions,QuestionEmbedOptions,- SdkIframeEmbedBaseSettings,-} from "metabase/embedding/embedding-iframe-sdk/types/embed";-import type {SdkIframeDashboardEmbedSettings,- SdkIframeEmbedSetupSettings,+ SdkIframeEmbedBaseSettings,SdkIframeQuestionEmbedSettings,-} from "metabase/embedding/embedding-iframe-sdk-setup/types";+} from "metabase/embedding/embedding-iframe-sdk/types/embed";+import type { SdkIframeEmbedSetupSettings } from "metabase/embedding/embedding-iframe-sdk-setup/types";import { getVisibleParameters } from "metabase/embedding/embedding-iframe-sdk-setup/utils/get-visible-parameters";import type { SdkIframeEmbedSetupExperience } from "metabase/embedding/types";import type { EntityToken } from "metabase-types/api/entity";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/get-common-embed-settings.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/get-common-embed-settings.tsindex 426132b4516..dc8934736ad 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/get-common-embed-settings.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/get-common-embed-settings.ts@@ -1,12 +1,14 @@+import type {+ SdkIframeDashboardEmbedSettings,+ SdkIframeQuestionEmbedSettings,+} from "metabase/embedding/embedding-iframe-sdk/types/embed";import { hasAuthToSelect } from "metabase/embedding/embedding-iframe-sdk-setup/utils/has-auth-to-select";import type { SdkIframeEmbedSetupExperience } from "metabase/embedding/types";import { PLUGIN_EMBEDDING_IFRAME_SDK_SETUP } from "metabase/plugins";import type {- SdkIframeDashboardEmbedSettings,SdkIframeEmbedSetupGuestEmbedSettings,SdkIframeEmbedSetupSettings,- SdkIframeQuestionEmbedSettings,} from "../types";const GET_ENABLE_GUEST_EMBED_SETTINGS: (data: {diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/is-question-or-dashboard-settings.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/is-question-or-dashboard-settings.tsindex b5b0d963f58..cd45c62099f 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/is-question-or-dashboard-settings.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/is-question-or-dashboard-settings.ts@@ -1,8 +1,8 @@import type {SdkIframeDashboardEmbedSettings,- SdkIframeEmbedSetupSettings,SdkIframeQuestionEmbedSettings,-} from "metabase/embedding/embedding-iframe-sdk-setup/types";+} from "metabase/embedding/embedding-iframe-sdk/types/embed";+import type { SdkIframeEmbedSetupSettings } from "metabase/embedding/embedding-iframe-sdk-setup/types";import type { SdkIframeEmbedSetupExperience } from "metabase/embedding/types";export const isQuestionOrDashboardSettings = (diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/types/embed.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/types/embed.tsindex da029a4e451..18c54689b5a 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/types/embed.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/types/embed.ts@@ -9,10 +9,6 @@ import type { ParameterChangePayload } from "embedding-sdk-bundle/types/dashboarimport type { SqlParameterChangePayload } from "embedding-sdk-bundle/types/question";import type { MetabaseError } from "embedding-sdk-shared/errors";import type { MetabaseErrorCode } from "embedding-sdk-shared/errors/error-code";-import type {- SdkIframeDashboardEmbedSettings,- SdkIframeQuestionEmbedSettings,-} from "metabase/embedding/embedding-iframe-sdk-setup/types";import type { ParameterValues } from "metabase/embedding-sdk/types/dashboard";import type {MetabaseEmbeddingSessionToken,@@ -156,6 +152,17 @@ export type QuestionEmbedOptions = StrictUnion<dashboardId?: never;};+// The embed setup wizard extends the runtime options with locked parameters;+// the runtime accepts the key, so the types live here with the options they+// extend.+export type SdkIframeDashboardEmbedSettings = DashboardEmbedOptions & {+ lockedParameters?: string[];+};++export type SdkIframeQuestionEmbedSettings = QuestionEmbedOptions & {+ lockedParameters?: string[];+};+export interface ExplorationEmbedOptions {componentName: "metabase-question";template: "exploration";