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
Separate public from shared embedding code (#73486)
Frasercb7617e9304b
diff --git a/enterprise/frontend/src/metabase-enterprise/resource_downloads/resource_downloads_plugin.ts b/enterprise/frontend/src/metabase-enterprise/resource_downloads/resource_downloads_plugin.tsindex 78296bd68fa..fbb4c85cb04 100644--- a/enterprise/frontend/src/metabase-enterprise/resource_downloads/resource_downloads_plugin.ts+++ b/enterprise/frontend/src/metabase-enterprise/resource_downloads/resource_downloads_plugin.ts@@ -1,7 +1,7 @@import { P, match } from "ts-pattern";+import type { EmbedResourceDownloadOptions } from "metabase/embedding/types";import { PLUGIN_RESOURCE_DOWNLOADS } from "metabase/plugins";-import type { EmbedResourceDownloadOptions } from "metabase/public/lib/types";import { hasPremiumFeature } from "metabase-enterprise/settings";/**diff --git a/enterprise/frontend/src/metabase-enterprise/resource_downloads/tests/setup.ts b/enterprise/frontend/src/metabase-enterprise/resource_downloads/tests/setup.tsindex 240b982cdb6..f478f8f7b6d 100644--- a/enterprise/frontend/src/metabase-enterprise/resource_downloads/tests/setup.ts+++ b/enterprise/frontend/src/metabase-enterprise/resource_downloads/tests/setup.ts@@ -1,6 +1,6 @@import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import { mockSettings } from "__support__/settings";-import type { EmbedResourceDownloadOptions } from "metabase/public/lib/types";+import type { EmbedResourceDownloadOptions } from "metabase/embedding/types";import type { TokenFeatures } from "metabase-types/api";import { createMockTokenFeatures } from "metabase-types/api/mocks";diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjsindex 3ecf7f31826..7df6df6be07 100644--- a/frontend/lint/module-boundaries.mjs+++ b/frontend/lint/module-boundaries.mjs@@ -53,6 +53,7 @@ const elements = [createElement({ type: "basic", name: "ui", enforceOutgoing: true }),createElement({ type: "shared", name: "api", enforceOutgoing: true }),// shared+ createElement({ type: "shared", name: "embedding" }),createElement({ type: "shared", name: "common", enforceOutgoing: true }),createElement({ type: "shared", name: "palette", enforceOutgoing: true }),createElement({ type: "shared", name: "querying" }),@@ -127,6 +128,7 @@ const elements = [enforceOutgoing: true,}),createElement({ type: "feature", name: "admin", enforceOutgoing: true }),+ createElement({ type: "feature", name: "public", enforceOutgoing: true }),createElement({ type: "feature", name: "reference", enforceOutgoing: true }),createElement({type: "feature",@@ -203,6 +205,11 @@ const rules = [allow: ["feature/*"],message: "Enterprise module can import from all feature modules",},+ {+ from: ["feature/public"],+ allow: ["feature/*"],+ message: "Public module can import from all feature modules",+ },{from: ["app/*"],allow: ["lib/*", "basic/*", "shared/*", "feature/*", "app/*"],diff --git a/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx b/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsxindex c0df35f8650..ba94f4c657d 100644--- a/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx@@ -19,9 +19,9 @@ import type { SdkStore } from "embedding-sdk-bundle/store/types";import type { MetabaseProviderProps } from "embedding-sdk-bundle/types/metabase-provider";import { EnsureSingleInstance } from "embedding-sdk-shared/components/EnsureSingleInstance/EnsureSingleInstance";import { useInstanceLocale } from "metabase/common/hooks/use-instance-locale";+import { LocaleProvider } from "metabase/embedding/LocaleProvider";import { isEmbeddingEajs } from "metabase/embedding-sdk/config";import { isEmbeddingThemeV1 } from "metabase/embedding-sdk/theme";-import { LocaleProvider } from "metabase/public/LocaleProvider";import { MetabaseReduxProvider, useSelector } from "metabase/redux";import { setOptions } from "metabase/redux/embed";import { EmotionCacheProvider } from "metabase/ui/components/theme/EmotionCacheProvider";diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsxindex a4a0fdc9829..e6a37b1f655 100644--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx@@ -61,8 +61,8 @@ import {import { getDashboardComplete, getIsDirty } from "metabase/dashboard/selectors";import type { RefreshPeriod } from "metabase/dashboard/types";import { EmbeddingEntityContextProvider } from "metabase/embedding/context";+import EmbedFrameS from "metabase/embedding/theme.module.css";import type { ParameterValues } from "metabase/embedding-sdk/types/dashboard";-import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";import { useSelector } from "metabase/redux";import { resetErrorPage, setErrorPage } from "metabase/redux/app";import { dismissAllUndo } from "metabase/redux/undo";diff --git a/frontend/src/metabase-types/analytics/embed-flow.ts b/frontend/src/metabase-types/analytics/embed-flow.tsindex a546248a9d8..229ef7617a3 100644--- a/frontend/src/metabase-types/analytics/embed-flow.ts+++ b/frontend/src/metabase-types/analytics/embed-flow.ts@@ -1,4 +1,4 @@-import type { EmbedResourceDownloadOptions } from "metabase/public/lib/types";+import type { EmbedResourceDownloadOptions } from "metabase/embedding/types";type EmbedFlowParams = {locked?: number;diff --git a/frontend/src/metabase-types/api/card.ts b/frontend/src/metabase-types/api/card.tsindex 5e3d0efa5bc..41f1c027d61 100644--- a/frontend/src/metabase-types/api/card.ts+++ b/frontend/src/metabase-types/api/card.ts@@ -1,7 +1,7 @@import type {EmbeddingParameters,EmbeddingType,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";import type { IconName } from "metabase/ui";import type { CurrencyStyle } from "metabase/utils/formatting";import type { EntityToken, EntityUuid } from "metabase-types/api/entity";diff --git a/frontend/src/metabase-types/api/dashboard.ts b/frontend/src/metabase-types/api/dashboard.tsindex 966e67ce06b..8b2dbbafb5f 100644--- a/frontend/src/metabase-types/api/dashboard.ts+++ b/frontend/src/metabase-types/api/dashboard.ts@@ -1,7 +1,7 @@import type {EmbeddingParameters,EmbeddingType,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";import type {BaseEntityId,CardDisplayType,diff --git a/frontend/src/metabase/AppThemeProvider.tsx b/frontend/src/metabase/AppThemeProvider.tsxindex 3b9b84289b0..1e89b3e58fb 100644--- a/frontend/src/metabase/AppThemeProvider.tsx+++ b/frontend/src/metabase/AppThemeProvider.tsx@@ -4,8 +4,8 @@ import {isPublicEmbedding,isStaticEmbedding,} from "metabase/embedding/config";+import type { DisplayTheme } from "metabase/embedding/types";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";-import type { DisplayTheme } from "metabase/public/lib/types";import type { MantineThemeOverride } from "metabase/ui";import { mutateColors } from "metabase/ui/colors/colors";import { ThemeProvider } from "metabase/ui/components/theme/ThemeProvider";diff --git a/frontend/src/metabase/account/login-history/containers/LoginHistoryApp/LoginHistoryApp.tsx b/frontend/src/metabase/account/login-history/containers/LoginHistoryApp/LoginHistoryApp.tsxindex 48b689c0fe9..cce582df512 100644--- a/frontend/src/metabase/account/login-history/containers/LoginHistoryApp/LoginHistoryApp.tsx+++ b/frontend/src/metabase/account/login-history/containers/LoginHistoryApp/LoginHistoryApp.tsx@@ -1,5 +1,5 @@import { useGetLoginHistoryQuery } from "metabase/api";-import { LoadingAndErrorWrapper } from "metabase/public/containers/PublicAction/PublicAction.styled";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import LoginHistoryList from "../../components/LoginHistory";diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemList.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemList.tsxindex 29a9bc24955..c178f895e44 100644--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemList.tsx+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemList.tsx@@ -1,10 +1,10 @@import type React from "react";import { useMemo } from "react";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { VirtualizedList } from "metabase/common/components/VirtualizedList";import { useTranslateContent } from "metabase/i18n/hooks";import { PLUGIN_MODERATION } from "metabase/plugins";-import { LoadingAndErrorWrapper } from "metabase/public/containers/PublicAction/PublicAction.styled";import { useSelector } from "metabase/redux";import { getIsTenantUser } from "metabase/selectors/user";import {diff --git a/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx b/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsxindex 7fbf9bc7c85..a625f081b83 100644--- a/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx+++ b/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx@@ -8,7 +8,7 @@ import { getStore } from "__support__/entities-store";import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { Api } from "metabase/api";-import { LocaleProvider } from "metabase/public/LocaleProvider";+import { LocaleProvider } from "metabase/embedding/LocaleProvider";import { publicReducers } from "metabase/reducers-public";import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";diff --git a/frontend/src/metabase/common/hooks/use-locale/use-locale.ts b/frontend/src/metabase/common/hooks/use-locale/use-locale.tsindex ed3a125a097..58d7afd7ee5 100644--- a/frontend/src/metabase/common/hooks/use-locale/use-locale.ts+++ b/frontend/src/metabase/common/hooks/use-locale/use-locale.ts@@ -1,7 +1,7 @@import { useContext } from "react";import { useInstanceLocale } from "metabase/common/hooks/use-instance-locale";-import { FrontendLocaleContext } from "metabase/public/LocaleProvider";+import { FrontendLocaleContext } from "metabase/embedding/LocaleProvider";import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";diff --git a/frontend/src/metabase/dashboard/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.unit.spec.tsx b/frontend/src/metabase/dashboard/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.unit.spec.tsxindex 72d4e20213e..002d4ff6844 100644--- a/frontend/src/metabase/dashboard/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.unit.spec.tsx@@ -2,7 +2,7 @@ import { screen, waitFor } from "@testing-library/react";import { setupAnalyzeChartEndpoint } from "__support__/server-mocks";import { renderWithProviders } from "__support__/ui";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { createMockDashboardState } from "metabase/redux/store/mocks";import type { AIEntityAnalysisResponse, Card } from "metabase-types/api";import {diff --git a/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.unit.spec.tsx b/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.unit.spec.tsxindex b23ba525cf7..95c5d015d1e 100644--- a/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.unit.spec.tsx@@ -12,7 +12,7 @@ import {waitFor,waitForLoaderToBeRemoved,} from "__support__/ui";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import type { DashCardId } from "metabase-types/api";import {createMockActionDashboardCard,diff --git a/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.unit.spec.tsx b/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.unit.spec.tsxindex 8c10b43a647..2faccba3e56 100644--- a/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.unit.spec.tsx@@ -7,8 +7,8 @@ import {} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";import { getNextId } from "__support__/utils";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { ROOT_COLLECTION as ROOT } from "metabase/entities/collections";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";import {createMockDashboardState,createMockState,diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsxindex 5759726f3a4..ea9fa156603 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx@@ -15,10 +15,10 @@ import {getDashcardResultsError,isDashcardLoading,} from "metabase/dashboard/utils";+import EmbedFrameS from "metabase/embedding/theme.module.css";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import type { NewParameterOpts } from "metabase/parameters/utils/dashboards";import { PLUGIN_COLLECTIONS } from "metabase/plugins";-import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";import { useDispatch, useSelector, useStore } from "metabase/redux";import type { StoreDashcard } from "metabase/redux/store";import type { VisualizerVizDefinitionWithColumns } from "metabase/redux/store/visualizer";diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/ChartSettingsButton/ChartSettingsButton.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/ChartSettingsButton/ChartSettingsButton.unit.spec.tsxindex 8a739c9b0a6..8eb888caaf2 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/ChartSettingsButton/ChartSettingsButton.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/ChartSettingsButton/ChartSettingsButton.unit.spec.tsx@@ -3,7 +3,7 @@ import userEvent from "@testing-library/user-event";import { setupDatabaseEndpoints } from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";import { ChartSettingsButton } from "metabase/dashboard/components/DashCard/DashCardActionsPanel/ChartSettingsButton/ChartSettingsButton";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import registerVisualizations from "metabase/visualizations/register";import {createMockColumn,diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsxindex 02e4e0cc3b8..71c4440cb4a 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx@@ -7,7 +7,7 @@ import {} from "__support__/server-mocks";import { createMockEntitiesState } from "__support__/store";import { getIcon, renderWithProviders, screen } from "__support__/ui";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import {createMockDashboardState,createMockState,diff --git a/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsxindex ac7ba744f62..575d1f899d0 100644--- a/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx@@ -11,12 +11,12 @@ import {screen,within,} from "__support__/ui";-import * as dashboardSelectors from "metabase/dashboard/selectors";-import registerDashboardVisualizations from "metabase/dashboard/visualizations/register";import {MockDashboardContext,type MockDashboardContextProps,-} from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+} from "metabase/dashboard/context/mock-context";+import * as dashboardSelectors from "metabase/dashboard/selectors";+import registerDashboardVisualizations from "metabase/dashboard/visualizations/register";import {createMockDashboardState,createMockState,diff --git a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsxindex 0c2cd2640a1..c07e5c648ee 100644--- a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx+++ b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx@@ -7,9 +7,9 @@ import DashboardS from "metabase/css/dashboard.module.css";import { DashboardHeader } from "metabase/dashboard/components/DashboardHeader";import { useDashboardContext } from "metabase/dashboard/context";import { getIsHeaderVisible } from "metabase/dashboard/selectors";+import EmbedFrameS from "metabase/embedding/theme.module.css";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { FilterApplyToast } from "metabase/parameters/components/FilterApplyToast";-import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";import { useSelector } from "metabase/redux";import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";import { Box, Flex, Loader } from "metabase/ui";diff --git a/frontend/src/metabase/dashboard/components/DashboardChartSettings/DashboardChartSettings.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardChartSettings/DashboardChartSettings.unit.spec.tsxindex 6f9f84c26d0..5868209aa68 100644--- a/frontend/src/metabase/dashboard/components/DashboardChartSettings/DashboardChartSettings.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardChartSettings/DashboardChartSettings.unit.spec.tsx@@ -1,7 +1,7 @@import userEvent from "@testing-library/user-event";import { renderWithProviders, screen } from "__support__/ui";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import registerVisualizations from "metabase/visualizations/register";import {createMockCard,diff --git a/frontend/src/metabase/dashboard/components/DashboardGrid.tsx b/frontend/src/metabase/dashboard/components/DashboardGrid.tsxindex 0d40a491ae8..31303e51575 100644--- a/frontend/src/metabase/dashboard/components/DashboardGrid.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardGrid.tsx@@ -18,7 +18,7 @@ import {import { ContentViewportContext } from "metabase/common/context/ContentViewportContext";import DashboardS from "metabase/css/dashboard.module.css";import { getVisibleCardIds } from "metabase/dashboard/utils";-import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";+import EmbedFrameS from "metabase/embedding/theme.module.css";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { addUndo } from "metabase/redux/undo";diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.unit.spec.tsxindex 25633a778a1..8398f065021 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.unit.spec.tsx@@ -6,7 +6,7 @@ import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen, within } from "__support__/ui";import type { DashboardActionKey } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/types";import { DASHBOARD_APP_ACTIONS } from "metabase/dashboard/containers/DashboardApp/DashboardApp";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import {createMockDashboardState,createMockStoreDashboard,diff --git a/frontend/src/metabase/embedding/components/SharingMenu/test/DashboardSharingMenu.enterprise.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.enterprise.unit.spec.tsxsimilarity index 91%rename from frontend/src/metabase/embedding/components/SharingMenu/test/DashboardSharingMenu.enterprise.unit.spec.tsxrename to frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.enterprise.unit.spec.tsxindex a5d0ee823d2..0bfceac12d6 100644--- a/frontend/src/metabase/embedding/components/SharingMenu/test/DashboardSharingMenu.enterprise.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.enterprise.unit.spec.tsx@@ -1,7 +1,7 @@import { screen } from "__support__/ui";import { createMockCollection } from "metabase-types/api/mocks";-import { openMenu, setupDashboardSharingMenu } from "./setup";+import { openMenu, setupDashboardSharingMenu } from "./tests/setup";describe("DashboardSharingMenu > Enterprise", () => {it("should not allow embedding instance analytics dashboard", async () => {diff --git a/frontend/src/metabase/embedding/components/SharingMenu/DashboardSharingMenu.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsxsimilarity index 63%rename from frontend/src/metabase/embedding/components/SharingMenu/DashboardSharingMenu.tsxrename to frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsxindex 4f511cb5a0a..552feaf0d1a 100644--- a/frontend/src/metabase/embedding/components/SharingMenu/DashboardSharingMenu.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsx@@ -1,18 +1,17 @@import { isInstanceAnalyticsCollection } from "metabase/collections/utils";import { getIsDashCardsRunning } from "metabase/dashboard/selectors";+import { EmbedMenuItem } from "metabase/embedding/components/SharingMenu/MenuItems/EmbedMenuItem";+import { ExportPdfMenuItem } from "metabase/embedding/components/SharingMenu/MenuItems/ExportPdfMenuItem";+import { PublicLinkMenuItem } from "metabase/embedding/components/SharingMenu/MenuItems/PublicLinkMenuItem";+import { SharingMenu } from "metabase/embedding/components/SharingMenu/SharingMenu";+import type { DashboardSharingModalType } from "metabase/embedding/components/SharingMenu/types";import { GUEST_EMBED_EMBEDDING_TYPE } from "metabase/embedding/constants";+import { useSharingModal } from "metabase/embedding/hooks/use-sharing-modal";import { useSelector } from "metabase/redux";-import { Flex, Menu } from "metabase/ui";+import { Box, Flex, Menu } from "metabase/ui";import type { Dashboard } from "metabase-types/api";-import { useSharingModal } from "../../hooks/use-sharing-modal";--import { EmbedMenuItem } from "./MenuItems/EmbedMenuItem";-import { ExportPdfMenuItem } from "./MenuItems/ExportPdfMenuItem";-import { PublicLinkMenuItem } from "./MenuItems/PublicLinkMenuItem";-import { PublicLinkModals } from "./PublicLinkModals";-import { SharingMenu } from "./SharingMenu";-import type { DashboardSharingModalType } from "./types";+import { DashboardPublicLinkPopover } from "../../../DashboardInfoSidebar/DashboardPublicLinkPopover/DashboardPublicLinkPopover";export function DashboardSharingMenu({ dashboard }: { dashboard: Dashboard }) {const { modalType, setModalType } =@@ -50,9 +49,10 @@ export function DashboardSharingMenu({ dashboard }: { dashboard: Dashboard }) {</>)}</SharingMenu>- <PublicLinkModals- modalType={modalType}+ <DashboardPublicLinkPopoverdashboard={dashboard}+ target={<Box h="2rem" />}+ isOpen={modalType === "dashboard-public-link"}onClose={() => setModalType(null)}/></Flex>diff --git a/frontend/src/metabase/embedding/components/SharingMenu/test/DashboardSharingMenu.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.unit.spec.tsxsimilarity index 98%rename from frontend/src/metabase/embedding/components/SharingMenu/test/DashboardSharingMenu.unit.spec.tsxrename to frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.unit.spec.tsxindex 5cbd0fb96dc..2805305c682 100644--- a/frontend/src/metabase/embedding/components/SharingMenu/test/DashboardSharingMenu.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.unit.spec.tsx@@ -1,6 +1,6 @@import { screen } from "__support__/ui";-import { openMenu, setupDashboardSharingMenu } from "./setup";+import { openMenu, setupDashboardSharingMenu } from "./tests/setup";describe("DashboardSharingMenu", () => {it("should have a 'sharing' tooltip by default", () => {diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/tests/setup.tsxnew file mode 100644index 00000000000..0f348a50b2e--- /dev/null+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/tests/setup.tsx@@ -0,0 +1,145 @@+import userEvent from "@testing-library/user-event";++import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";+import { setupNotificationChannelsEndpoints } from "__support__/server-mocks";+import { mockSettings } from "__support__/settings";+import { renderWithProviders, screen } from "__support__/ui";+import { useSelector } from "metabase/redux";+import type { DashboardState } from "metabase/redux/store/dashboard";+import {+ createMockDashboardState,+ createMockState,+} from "metabase/redux/store/mocks";+import type { Dashboard, User } from "metabase-types/api";+import {+ createMockCard,+ createMockDashboard,+ createMockDashboardCard,+ createMockSettings,+ createMockTokenFeatures,+ createMockUser,+} from "metabase-types/api/mocks";++import { DashboardSharingMenu } from "../DashboardSharingMenu";++const FakeSidebar = () => {+ const sidebar = useSelector((state) => state.dashboard.sidebar);++ if (sidebar.name) {+ return <div data-testid="fake-sidebar">Sidebar: {sidebar.name}</div>;+ }++ return null;+};++type SettingsProps = {+ isEmbeddingEnabled?: boolean;+ isPublicSharingEnabled?: boolean;+ isEmailSetup?: boolean;+ isSlackSetup?: boolean;+ isAdmin?: boolean;+ canManageSubscriptions?: boolean;+ isEnterprise?: boolean;+ dashboardState?: Partial<DashboardState>;+};++const setupState = ({+ isEmbeddingEnabled = false,+ isPublicSharingEnabled = false,+ isEmailSetup = false,+ isSlackSetup = false,+ isAdmin = false,+ canManageSubscriptions = false,+ isEnterprise = false,+ dashboardState,+}: SettingsProps) => {+ const tokenFeatures = createMockTokenFeatures({+ advanced_permissions: isEnterprise,+ dashboard_subscription_filters: isEnterprise,+ audit_app: isEnterprise,+ });++ setupNotificationChannelsEndpoints({+ slack: { configured: isSlackSetup },+ email: { configured: isEmailSetup },+ } as any);++ const settingValues = createMockSettings({+ "token-features": tokenFeatures,+ "enable-public-sharing": isPublicSharingEnabled,+ "enable-embedding-static": isEmbeddingEnabled,+ "email-configured?": isEmailSetup,+ "slack-token-valid?": isSlackSetup,+ });++ const user = createMockUser({+ is_superuser: isAdmin,+ });++ return createMockState({+ settings: mockSettings(settingValues),+ currentUser: {+ ...user,+ permissions: {+ can_access_subscription: canManageSubscriptions,+ },+ } as User,+ dashboard: createMockDashboardState(dashboardState),+ });+};++export function setupDashboardSharingMenu({+ isPublicSharingEnabled = false,+ isEmbeddingEnabled = false,+ isEmailSetup = false,+ isSlackSetup = false,+ isAdmin = false,+ canManageSubscriptions = false,+ isEnterprise = false,+ hasPublicLink = false,+ dashboard: dashboardOverrides = {},+ dashboardState,+}: {+ dashboard?: Partial<Dashboard>;+ hasPublicLink?: boolean;+} & SettingsProps) {+ const dashboard = createMockDashboard({+ name: "My Cool Dashboard",+ public_uuid: hasPublicLink && isPublicSharingEnabled ? "1337bad801" : null,+ dashcards: [+ createMockDashboardCard({+ card: createMockCard({ display: "pie" }),+ }),+ ],+ ...dashboardOverrides,+ });++ const state = setupState({+ isPublicSharingEnabled,+ isEmbeddingEnabled,+ isEmailSetup,+ isSlackSetup,+ isAdmin,+ canManageSubscriptions,+ isEnterprise,+ dashboardState,+ });++ if (isEnterprise) {+ setupEnterpriseOnlyPlugin("audit_app");+ setupEnterpriseOnlyPlugin("application_permissions");+ setupEnterpriseOnlyPlugin("collections");+ }++ renderWithProviders(+ <div>+ <DashboardSharingMenu dashboard={dashboard} />+ <FakeSidebar />+ </div>,+ { storeInitialState: state },+ );+}++export const openMenu = () => {+ return userEvent.click(screen.getByTestId("sharing-menu-button"));+};diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/action-buttons.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/action-buttons.tsxindex 99d1054165e..533a46c2ca6 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/action-buttons.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/action-buttons.tsx@@ -1,4 +1,3 @@-import { DashboardSharingMenu } from "metabase/embedding/components/SharingMenu/DashboardSharingMenu";import { Center, Divider } from "metabase/ui";import { DashboardBookmark } from "../../DashboardBookmark";@@ -22,6 +21,7 @@ import { AddLinkOrEmbedButton } from "../buttons/AddLinkOrEmbedButton";import { DashboardSubscriptionsButton } from "../buttons/DashboardSubscriptionsButton";import { RefreshIndicator } from "../buttons/RefreshIndicator";+import { DashboardSharingMenu } from "./DashboardSharingMenu/DashboardSharingMenu";import { DASHBOARD_ACTION } from "./dashboard-action-keys";import type { DashboardActionButton, DashboardActionKey } from "./types";diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddFilterParameterButton/AddFilterParameterButton.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddFilterParameterButton/AddFilterParameterButton.unit.spec.tsxindex 510e77e9541..a37b8d48bec 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddFilterParameterButton/AddFilterParameterButton.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddFilterParameterButton/AddFilterParameterButton.unit.spec.tsx@@ -1,7 +1,7 @@import userEvent from "@testing-library/user-event";import { renderWithProviders, screen, within } from "__support__/ui";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import {createMockDashboardState,createMockState,diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.unit.spec.tsxindex ca77bcf8804..89287fb938d 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.unit.spec.tsx@@ -5,8 +5,8 @@ import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import { setupNotificationChannelsEndpoints } from "__support__/server-mocks/pulse";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { getIsSharing } from "metabase/dashboard/selectors";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";import { createMockDashboardState } from "metabase/redux/store/mocks";import type { ChannelApiResponse, User } from "metabase-types/api";import {diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/ExportAsPdfButton.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/ExportAsPdfButton.unit.spec.tsxindex 2e9a3dfa459..4e213c68bae 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/ExportAsPdfButton.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/ExportAsPdfButton.unit.spec.tsx@@ -1,7 +1,7 @@import userEvent from "@testing-library/user-event";import { renderWithProviders, screen, waitFor } from "__support__/ui";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { createMockDashboardState } from "metabase/redux/store/mocks";import { createMockDashboard } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/tests/setup.tsxindex cd1aae59fb3..3b80ce6bec5 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/tests/setup.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/tests/setup.tsx@@ -11,7 +11,7 @@ import { mockSettings } from "__support__/settings";import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";import { getDefaultTab } from "metabase/dashboard/actions";import { DASHBOARD_APP_ACTIONS } from "metabase/dashboard/containers/DashboardApp/DashboardApp";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { createMockDashboardState } from "metabase/redux/store/mocks";import type { Collection, TokenFeatures } from "metabase-types/api";import {diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardDetails.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardDetails.tsxindex 00a95178c04..f83c97fd6ae 100644--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardDetails.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardDetails.tsx@@ -7,13 +7,13 @@ import { DateTime } from "metabase/common/components/DateTime";import { Link } from "metabase/common/components/Link";import { SidesheetCardSection } from "metabase/common/components/Sidesheet";import Styles from "metabase/css/core/index.css";-import { DashboardPublicLinkPopover } from "metabase/embedding/components/PublicLinkPopover";import { Box, FixedSizeIcon, Flex, Text } from "metabase/ui";import { collection as collectionUrl } from "metabase/urls";import { getUserName } from "metabase/utils/user";import type { Dashboard } from "metabase-types/api";import SidebarStyles from "./DashboardInfoSidebar.module.css";+import { DashboardPublicLinkPopover } from "./DashboardPublicLinkPopover/DashboardPublicLinkPopover";export const DashboardDetails = ({ dashboard }: { dashboard: Dashboard }) => {const lastEditInfo = dashboard["last-edit-info"];diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/DashboardPublicLinkPopover.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardPublicLinkPopover/DashboardPublicLinkPopover.tsxsimilarity index 90%rename from frontend/src/metabase/embedding/components/PublicLinkPopover/DashboardPublicLinkPopover.tsxrename to frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardPublicLinkPopover/DashboardPublicLinkPopover.tsxindex bafc6df5c5a..ba878d48d97 100644--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/DashboardPublicLinkPopover.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardPublicLinkPopover/DashboardPublicLinkPopover.tsx@@ -2,15 +2,14 @@ import {useCreateDashboardPublicLinkMutation,useDeleteDashboardPublicLinkMutation,} from "metabase/api";+import { PublicLinkPopover } from "metabase/embedding/components/PublicLinkPopover/PublicLinkPopover";import {trackPublicLinkCopied,trackPublicLinkRemoved,-} from "metabase/public/lib/analytics";+} from "metabase/embedding/lib/analytics";import { publicDashboard as getPublicDashboardUrl } from "metabase/urls";import type { Dashboard } from "metabase-types/api";-import { PublicLinkPopover } from "./PublicLinkPopover";-export const DashboardPublicLinkPopover = ({dashboard,target,diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/DashboardPublicLinkPopover.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardPublicLinkPopover/DashboardPublicLinkPopover.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/embedding/components/PublicLinkPopover/DashboardPublicLinkPopover.unit.spec.tsxrename to frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardPublicLinkPopover/DashboardPublicLinkPopover.unit.spec.tsxdiff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/setup.tsxindex dd7e7e4dd8b..83c612fccd8 100644--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/setup.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/setup.tsx@@ -11,7 +11,7 @@ import {import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { createMockState } from "metabase/redux/store/mocks";import type { Dashboard, Settings, TokenFeatures } from "metabase-types/api";import {diff --git a/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/setup.tsxindex 85bfc115b16..1f85809a7d2 100644--- a/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/setup.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/setup.tsx@@ -10,7 +10,7 @@ import {import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { createMockState } from "metabase/redux/store/mocks";import type { Dashboard, Settings } from "metabase-types/api";import {diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/tests/setup.tsxindex d8039c05c45..01b90f15b2f 100644--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/tests/setup.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/tests/setup.tsx@@ -8,8 +8,8 @@ import { mockSettings } from "__support__/settings";import type { Screen } from "__support__/ui";import { renderWithProviders } from "__support__/ui";import { getNextId } from "__support__/utils";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { isEmbeddingSdk as mockIsEmbeddingSdk } from "metabase/embedding-sdk/config";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";import {createMockDashboardState,createMockState,diff --git a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsxindex c147336ad96..db2e346d3d6 100644--- a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx@@ -11,10 +11,10 @@ import {import { renderWithProviders, screen, within } from "__support__/ui";import { INPUT_WRAPPER_TEST_ID } from "metabase/common/components/TabButton";import { getDefaultTab, resetTempTabId } from "metabase/dashboard/actions";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { useDashboardUrlQuery } from "metabase/dashboard/hooks/use-dashboard-url-query";import { getSelectedTabId } from "metabase/dashboard/selectors";import { createTabSlug } from "metabase/dashboard/utils";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";import { TEST_CARD } from "metabase/query_builder/containers/test-utils";import { useSelector } from "metabase/redux";import type { DashboardState, State } from "metabase/redux/store";diff --git a/frontend/src/metabase/dashboard/components/ParameterSettings/ParameterSettings.tsx b/frontend/src/metabase/dashboard/components/ParameterSettings/ParameterSettings.tsxindex 937d189ab8f..18fbca56f3c 100644--- a/frontend/src/metabase/dashboard/components/ParameterSettings/ParameterSettings.tsx+++ b/frontend/src/metabase/dashboard/components/ParameterSettings/ParameterSettings.tsx@@ -7,12 +7,12 @@ import {} from "react";import { t } from "ttag";+import type { EmbeddingParameterVisibility } from "metabase/embedding/types";import { ParameterValueWidget } from "metabase/parameters/components/ParameterValueWidget";import { RequiredParamToggle } from "metabase/parameters/components/RequiredParamToggle";import { TemporalUnitSettings } from "metabase/parameters/components/TemporalUnitSettings";import { ValuesSourceSettings } from "metabase/parameters/components/ValuesSourceSettings";import { isSingleOrMultiSelectable } from "metabase/parameters/utils/parameter-type";-import type { EmbeddingParameterVisibility } from "metabase/public/lib/types";import { useDispatch } from "metabase/redux";import {Box,diff --git a/frontend/src/metabase/dashboard/components/ParameterSidebar/ParameterSidebar.unit.spec.tsx b/frontend/src/metabase/dashboard/components/ParameterSidebar/ParameterSidebar.unit.spec.tsxindex e0e197011ba..0b22f475800 100644--- a/frontend/src/metabase/dashboard/components/ParameterSidebar/ParameterSidebar.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/ParameterSidebar/ParameterSidebar.unit.spec.tsx@@ -2,7 +2,7 @@ import userEvent from "@testing-library/user-event";import { useState } from "react";import { act, renderWithProviders, screen } from "__support__/ui";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { createMockUiParameter } from "metabase-lib/v1/parameters/mock";import type { UiParameter } from "metabase-lib/v1/parameters/types";import {diff --git a/frontend/src/metabase/dashboard/context/context.tsx b/frontend/src/metabase/dashboard/context/context.tsxindex 6bd0eca2158..93165cf206d 100644--- a/frontend/src/metabase/dashboard/context/context.tsx+++ b/frontend/src/metabase/dashboard/context/context.tsx@@ -14,7 +14,7 @@ import { usePrevious, useUnmount } from "react-use";import { isEqual, isObject, noop } from "underscore";import { useEmbeddingEntityContext } from "metabase/embedding/context";-import { getTabHiddenParameterSlugs } from "metabase/public/lib/tab-parameters";+import { getTabHiddenParameterSlugs } from "metabase/embedding/lib/tab-parameters";import type {Dashboard,DashboardCard,diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/mock-context.tsx b/frontend/src/metabase/dashboard/context/mock-context.tsxsimilarity index 100%rename from frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/mock-context.tsxrename to frontend/src/metabase/dashboard/context/mock-context.tsxdiff --git a/frontend/src/metabase/dashboard/selectors.ts b/frontend/src/metabase/dashboard/selectors.tsindex f7f6bfbd588..63f5616d91b 100644--- a/frontend/src/metabase/dashboard/selectors.ts+++ b/frontend/src/metabase/dashboard/selectors.ts@@ -7,6 +7,7 @@ import {DASHBOARD_SLOW_TIMEOUT,SIDEBAR_NAME,} from "metabase/dashboard/constants";+import type { EmbeddingParameterVisibility } from "metabase/embedding/types";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import {getDashboardQuestions,@@ -15,7 +16,6 @@ import {} from "metabase/parameters/utils/dashboards";import { getParameterMappingOptions as _getParameterMappingOptions } from "metabase/parameters/utils/mapping-options";import { getVisibleParameters } from "metabase/parameters/utils/ui";-import type { EmbeddingParameterVisibility } from "metabase/public/lib/types";import type {ClickBehaviorSidebarState,EditParameterSidebarState,diff --git a/frontend/src/metabase/dashboard/types/display-options.ts b/frontend/src/metabase/dashboard/types/display-options.tsindex e8d0f9ee7cb..bf150148a8c 100644--- a/frontend/src/metabase/dashboard/types/display-options.ts+++ b/frontend/src/metabase/dashboard/types/display-options.ts@@ -1,4 +1,4 @@-import type { EmbedResourceDownloadOptions } from "metabase/public/lib/types";+import type { EmbedResourceDownloadOptions } from "metabase/embedding/types";export type DashboardFullscreenControls = {isFullscreen: boolean;diff --git a/frontend/src/metabase/dashboard/types/embed-display-options.ts b/frontend/src/metabase/dashboard/types/embed-display-options.tsindex 61a5e99ebd9..be8b1bf7fe8 100644--- a/frontend/src/metabase/dashboard/types/embed-display-options.ts+++ b/frontend/src/metabase/dashboard/types/embed-display-options.ts@@ -1,7 +1,7 @@import type {DisplayTheme,EmbedResourceDownloadOptions,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";import type { ClickActionModeGetter } from "metabase/visualizations/types";type EmbedBackground = boolean;diff --git a/frontend/src/metabase/dashboard/types/hash-options.ts b/frontend/src/metabase/dashboard/types/hash-options.tsindex e63e3ace2d8..c9b9044134e 100644--- a/frontend/src/metabase/dashboard/types/hash-options.ts+++ b/frontend/src/metabase/dashboard/types/hash-options.ts@@ -1,7 +1,7 @@import type {EmbeddingAdditionalHashOptions,EmbeddingDisplayOptions,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";/*** This is a type that controls some dashboard states.diff --git a/frontend/src/metabase/dashboard/visualizations/Heading/Heading.unit.spec.tsx b/frontend/src/metabase/dashboard/visualizations/Heading/Heading.unit.spec.tsxindex 3f6f783490c..f9ea118e92c 100644--- a/frontend/src/metabase/dashboard/visualizations/Heading/Heading.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/visualizations/Heading/Heading.unit.spec.tsx@@ -1,7 +1,7 @@import userEvent from "@testing-library/user-event";import { renderWithProviders, screen } from "__support__/ui";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { createMockDashboardState } from "metabase/redux/store/mocks";import { buildTextTagTarget } from "metabase-lib/v1/parameters/utils/targets";import type {diff --git a/frontend/src/metabase/documents/components/DocumentHeader.tsx b/frontend/src/metabase/documents/components/DocumentHeader.tsxindex 53896847cd0..e8414348bab 100644--- a/frontend/src/metabase/documents/components/DocumentHeader.tsx+++ b/frontend/src/metabase/documents/components/DocumentHeader.tsx@@ -27,11 +27,11 @@ import {import { isWithinIframe } from "metabase/utils/iframe";import type { Document } from "metabase-types/api";-import { DocumentPublicLinkPopover } from "../../embedding/components/PublicLinkPopover";import { trackDocumentPrint } from "../analytics";import { DOCUMENT_TITLE_MAX_LENGTH } from "../constants";import { getListCommentsQuery } from "../utils/api";+import { DocumentPublicLinkPopover } from "./DocumentHeader/DocumentPublicLinkPopover/DocumentPublicLinkPopover";import S from "./DocumentHeader.module.css";const saveButtonTransition: TransitionProps["transition"] = {diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopover.tsx b/frontend/src/metabase/documents/components/DocumentHeader/DocumentPublicLinkPopover/DocumentPublicLinkPopover.tsxsimilarity index 98%rename from frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopover.tsxrename to frontend/src/metabase/documents/components/DocumentHeader/DocumentPublicLinkPopover/DocumentPublicLinkPopover.tsxindex c76d7b40d11..3d7eb4b53e5 100644--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopover.tsx+++ b/frontend/src/metabase/documents/components/DocumentHeader/DocumentPublicLinkPopover/DocumentPublicLinkPopover.tsx@@ -9,7 +9,7 @@ import {trackPublicEmbedCodeCopied,trackPublicLinkCopied,trackPublicLinkRemoved,-} from "metabase/public/lib/analytics";+} from "metabase/embedding/lib/analytics";import { Box, Popover, Title } from "metabase/ui";import { publicDocument as getPublicDocumentUrl } from "metabase/urls/documents";import type { Document } from "metabase-types/api";diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.module.css b/frontend/src/metabase/documents/components/DocumentHeader/DocumentPublicLinkPopover/DocumentPublicLinkPopoverContent.module.csssimilarity index 100%rename from frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.module.cssrename to frontend/src/metabase/documents/components/DocumentHeader/DocumentPublicLinkPopover/DocumentPublicLinkPopoverContent.module.cssdiff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.tsx b/frontend/src/metabase/documents/components/DocumentHeader/DocumentPublicLinkPopover/DocumentPublicLinkPopoverContent.tsxsimilarity index 97%rename from frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.tsxrename to frontend/src/metabase/documents/components/DocumentHeader/DocumentPublicLinkPopover/DocumentPublicLinkPopoverContent.tsxindex 1fc2ed6481f..fc98f6f2d76 100644--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.tsx+++ b/frontend/src/metabase/documents/components/DocumentHeader/DocumentPublicLinkPopover/DocumentPublicLinkPopoverContent.tsx@@ -2,7 +2,7 @@ import { useState } from "react";import { t } from "ttag";import { CopyButton } from "metabase/common/components/CopyButton";-import { getPublicEmbedHTMLWithResizer } from "metabase/public/lib/code-templates";+import { getPublicEmbedHTMLWithResizer } from "metabase/embedding/lib/code-templates";import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import {diff --git a/frontend/src/metabase/documents/contexts/ExternalCardDataContext.tsx b/frontend/src/metabase/documents/contexts/ExternalCardDataContext.tsxnew file mode 100644index 00000000000..c5a1ba6eab8--- /dev/null+++ b/frontend/src/metabase/documents/contexts/ExternalCardDataContext.tsx@@ -0,0 +1,21 @@+import { createContext, useContext } from "react";++import type { Card, Dataset } from "metabase-types/api";++export interface ExternalCardDataContextValue {+ /** Pre-loaded card metadata, keyed by card ID */+ cards: Record<number, Card>;+ /** Identifier for the external source (e.g., public document UUID) */+ documentUuid: string;+ /** Load query results for a card from the external source */+ loadCardQuery: (cardId: number) => Promise<Dataset>;+}++const ExternalCardDataContext =+ createContext<ExternalCardDataContextValue | null>(null);++export const ExternalCardDataProvider = ExternalCardDataContext.Provider;++export function useExternalCardData() {+ return useContext(ExternalCardDataContext);+}diff --git a/frontend/src/metabase/public/hooks/use-public-document-card-data.ts b/frontend/src/metabase/documents/hooks/use-external-card-data.tssimilarity index 52%rename from frontend/src/metabase/public/hooks/use-public-document-card-data.tsrename to frontend/src/metabase/documents/hooks/use-external-card-data.tsindex cc99772a646..ea64b424551 100644--- a/frontend/src/metabase/public/hooks/use-public-document-card-data.ts+++ b/frontend/src/metabase/documents/hooks/use-external-card-data.ts@@ -1,26 +1,13 @@import { useMemo } from "react";import { useAsync } from "react-use";-import { usePublicDocumentContext } from "metabase/public/contexts/PublicDocumentContext";+import { useExternalCardData } from "metabase/documents/contexts/ExternalCardDataContext";import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { PublicApi } from "metabase/services";import Question from "metabase-lib/v1/Question";import type { Card, Dataset, RawSeries } from "metabase-types/api";-interface UsePublicDocumentCardDataProps {- cardId: number;- documentUuid: string;-}--interface UsePublicDocumentCardDataResult {- card?: Card;- dataset?: Dataset;- isLoading: boolean;- series: RawSeries | null;- question?: Question;- error?: "not found" | "unknown" | null;-}+import type { UseCardDataResult } from "./use-card-data";function buildSeries(card: Card, dataset: Dataset): RawSeries {return [@@ -32,48 +19,50 @@ function buildSeries(card: Card, dataset: Dataset): RawSeries {];}-export function usePublicDocumentCardData({- cardId,- documentUuid,-}: UsePublicDocumentCardDataProps): UsePublicDocumentCardDataResult {- const { publicDocumentCards } = usePublicDocumentContext();+export function useExternalCardDataLoader(cardId: number): UseCardDataResult {+ const context = useExternalCardData();const metadata = useSelector(getMetadata);- // Get the card metadata from the document response — we hydrate all cards upfront so the frontend- // doesn't have to make authenticated requests to fetch them individually- const card = publicDocumentCards?.[cardId];+ const card = context?.cards?.[cardId];++ const documentUuid = context?.documentUuid;+ const loadCardQuery = context?.loadCardQuery;const {value: dataset,loading: isLoadingDataset,error: datasetError,} = useAsync(async () => {- if (!cardId || !documentUuid || !card) {+ if (!loadCardQuery || !cardId || !documentUuid || !card) {return undefined;}try {- const result = await PublicApi.documentCardQuery({- uuid: documentUuid,- cardId,- });- return result as Dataset;+ return await loadCardQuery(cardId);} catch (error) {- console.error("Failed to load public document card data:", error);+ console.error("Failed to load external document card data:", error);throw error;}}, [cardId, documentUuid, card]);- const isLoading = !card || isLoadingDataset;-- const hasDataForVisualization = card && dataset?.data;- const series = hasDataForVisualization ? buildSeries(card, dataset) : null;-const question = useMemo(() => (card ? new Question(card, metadata) : undefined),[card, metadata],);+ if (!context) {+ return {+ isLoading: false,+ series: null,+ error: null,+ };+ }++ const isLoading = !card || isLoadingDataset;++ const hasDataForVisualization = card && dataset?.data;+ const series = hasDataForVisualization ? buildSeries(card, dataset) : null;+const error = datasetError ? "not found" : !card ? "not found" : null;return {diff --git a/frontend/src/metabase/public/LocaleProvider.tsx b/frontend/src/metabase/embedding/LocaleProvider.tsxsimilarity index 100%rename from frontend/src/metabase/public/LocaleProvider.tsxrename to frontend/src/metabase/embedding/LocaleProvider.tsxdiff --git a/frontend/src/metabase/public/LocaleProvider.unit.spec.tsx b/frontend/src/metabase/embedding/LocaleProvider.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/public/LocaleProvider.unit.spec.tsxrename to frontend/src/metabase/embedding/LocaleProvider.unit.spec.tsxdiff --git a/frontend/src/metabase/dashboard/containers/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsx b/frontend/src/metabase/embedding/components/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsxsimilarity index 95%rename from frontend/src/metabase/dashboard/containers/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsxrename to frontend/src/metabase/embedding/components/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsxindex 168003b515d..4c737c0ca31 100644--- a/frontend/src/metabase/dashboard/containers/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsx+++ b/frontend/src/metabase/embedding/components/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsx@@ -3,8 +3,8 @@ import {useUpdateDashboardEnableEmbeddingMutation,} from "metabase/api";import { getParameters } from "metabase/dashboard/selectors";+import { EmbedModal } from "metabase/embedding/components/EmbedModal";import { STATIC_LEGACY_EMBEDDING_TYPE } from "metabase/embedding/constants";-import { EmbedModal } from "metabase/public/components/EmbedModal";import { useSelector } from "metabase/redux";import type { Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/containers/DashboardSharingEmbeddingModal/index.ts b/frontend/src/metabase/embedding/components/DashboardSharingEmbeddingModal/index.tssimilarity index 100%rename from frontend/src/metabase/dashboard/containers/DashboardSharingEmbeddingModal/index.tsrename to frontend/src/metabase/embedding/components/DashboardSharingEmbeddingModal/index.tsdiff --git a/frontend/src/metabase/embedding/components/EmbedFooter.styled.tsx b/frontend/src/metabase/embedding/components/EmbedFooter.styled.tsxnew file mode 100644index 00000000000..9ded61f43de--- /dev/null+++ b/frontend/src/metabase/embedding/components/EmbedFooter.styled.tsx@@ -0,0 +1,50 @@+// eslint-disable-next-line no-restricted-imports+import { css } from "@emotion/react";+// eslint-disable-next-line no-restricted-imports+import styled from "@emotion/styled";++import {+ breakpointMinLarge,+ breakpointMinSmall,+} from "metabase/styled-components/theme";++export const ActionButtonsContainer = styled.div`+ color: var(--mb-color-text-secondary);+ margin-left: auto;+`;++export type FooterVariant = "default" | "large";++const footerVariantStyles = {+ default: css`+ border-top: 1px solid var(--mb-color-border);+ `,+ large: css`+ justify-content: center;+ align-items: center;+ margin-bottom: 2rem;++ ${ActionButtonsContainer} {+ display: none;+ }+ `,+};++export const Footer = styled.footer<{ variant: FooterVariant }>`+ display: flex;+ flex-shrink: 0;+ align-items: center;+ ${(props) => footerVariantStyles[props.variant]}+ height: calc(50 / 16 * 1rem);+ padding: 0 1em;++ ${breakpointMinSmall} {+ height: calc(65 / 16 * 1rem);+ padding: 0 1.5rem;+ }++ ${breakpointMinLarge} {+ height: calc(80 / 16 * 1rem);+ padding: 0 2rem;+ }+`;diff --git a/frontend/src/metabase/public/components/EmbedModal/EmbedModal.styled.tsx b/frontend/src/metabase/embedding/components/EmbedModal/EmbedModal.styled.tsxsimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/EmbedModal.styled.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/EmbedModal.styled.tsxdiff --git a/frontend/src/metabase/public/components/EmbedModal/EmbedModal.tsx b/frontend/src/metabase/embedding/components/EmbedModal/EmbedModal.tsxsimilarity index 90%rename from frontend/src/metabase/public/components/EmbedModal/EmbedModal.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/EmbedModal.tsxindex a165f095034..636b5e04436 100644--- a/frontend/src/metabase/public/components/EmbedModal/EmbedModal.tsx+++ b/frontend/src/metabase/embedding/components/EmbedModal/EmbedModal.tsx@@ -1,13 +1,13 @@import { t } from "ttag";import { Modal } from "metabase/common/components/Modal";-import { StaticEmbedSetupPane } from "metabase/public/components/EmbedModal/StaticEmbedSetupPane";+import { StaticEmbedSetupPane } from "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane";import type {EmbedResource,EmbedResourceParameter,EmbeddingParameters,GuestEmbedResourceType,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";import { EmbedModalHeader } from "./EmbedModal.styled";diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ClientEmbedCodePane.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/ClientEmbedCodePane.tsxsimilarity index 93%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ClientEmbedCodePane.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/ClientEmbedCodePane.tsxindex d7da6b4d8f8..ed6f7f1dada 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ClientEmbedCodePane.tsx+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/ClientEmbedCodePane.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import type { ClientCodeSampleConfig } from "metabase/public/lib/types";+import type { ClientCodeSampleConfig } from "metabase/embedding/types";import { CodeSample } from "./CodeSample";diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/CodeSample.styled.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/CodeSample.styled.tsxsimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/CodeSample.styled.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/CodeSample.styled.tsxdiff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/CodeSample.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/CodeSample.tsxsimilarity index 90%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/CodeSample.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/CodeSample.tsxindex 2e7d604cc11..c2085d3eb19 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/CodeSample.tsx+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/CodeSample.tsx@@ -5,8 +5,8 @@ import type { CodeLanguage } from "metabase/common/components/CodeEditor";import { CodeEditor } from "metabase/common/components/CodeEditor";import { CopyButton } from "metabase/common/components/CopyButton";import CS from "metabase/css/core/index.css";-import { EmbedServerSnippetLanguageSelect } from "metabase/public/components/EmbedServerSnippetLanguageSelect/EmbedServerSnippetLanguageSelect";-import type { CodeSampleOption } from "metabase/public/lib/types";+import { EmbedServerSnippetLanguageSelect } from "metabase/embedding/components/EmbedServerSnippetLanguageSelect/EmbedServerSnippetLanguageSelect";+import type { CodeSampleOption } from "metabase/embedding/types";import { CopyButtonContainer } from "./CodeSample.styled";import { getHighlightedRanges } from "./utils";diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/DownloadSettings.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/DownloadSettings.tsxsimilarity index 96%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/DownloadSettings.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/DownloadSettings.tsxindex a09ac233712..b8083769f22 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/DownloadSettings.tsx+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/DownloadSettings.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import type { EmbeddingDisplayOptions } from "metabase/public/lib/types";+import type { EmbeddingDisplayOptions } from "metabase/embedding/types";import { Stack, Switch } from "metabase/ui";import { DisplayOptionSection } from "./StaticEmbedSetupPane.styled";diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/EmbedModalContentStatusBar.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/EmbedModalContentStatusBar.tsxsimilarity index 97%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/EmbedModalContentStatusBar.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/EmbedModalContentStatusBar.tsxindex 9e870b8fe6a..05c2ada6631 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/EmbedModalContentStatusBar.tsx+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/EmbedModalContentStatusBar.tsx@@ -2,7 +2,7 @@ import { useState } from "react";import { t } from "ttag";import CS from "metabase/css/core/index.css";-import type { EmbedResourceType } from "metabase/public/lib/types";+import type { EmbedResourceType } from "metabase/embedding/types";import { Button, Flex, Group, Text } from "metabase/ui";interface EmbedModalContentStatusBarProps {diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsxsimilarity index 99%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsxindex 8f708bad953..ee587d09864 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsx+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsx@@ -8,7 +8,7 @@ import type {DisplayTheme,EmbedResourceType,EmbeddingDisplayOptions,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";import { useSelector } from "metabase/redux";import { getSetting, getUpgradeUrl } from "metabase/selectors/settings";import { getCanWhitelabel } from "metabase/selectors/whitelabel";diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/OverviewSettings.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/OverviewSettings.tsxsimilarity index 96%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/OverviewSettings.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/OverviewSettings.tsxindex 68ecc286b27..895be85f9ce 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/OverviewSettings.tsx+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/OverviewSettings.tsx@@ -7,11 +7,11 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";import { useDocsUrl } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import { MoreServerSnippetExamplesLink } from "metabase/embedding/components/MoreServerSnippetExamplesLink/MoreServerSnippetExamplesLink";-import { getEmbedClientCodeExampleOptions } from "metabase/public/lib/code";+import { getEmbedClientCodeExampleOptions } from "metabase/embedding/lib/code";import type {EmbedResourceType,ServerCodeSampleConfig,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";import { Stack, Text } from "metabase/ui";import { ClientEmbedCodePane } from "./ClientEmbedCodePane";diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ParametersSettings.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/ParametersSettings.tsxsimilarity index 99%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ParametersSettings.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/ParametersSettings.tsxindex 1636a6f4ac6..90414a81fd7 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ParametersSettings.tsx+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/ParametersSettings.tsx@@ -5,15 +5,15 @@ import { t } from "ttag";import { Option, Select } from "metabase/common/components/Select";import CS from "metabase/css/core/index.css";-import { ParameterWidget as StaticParameterWidget } from "metabase/parameters/components/ParameterWidget";-import { getParameterIconName } from "metabase/parameters/utils/ui";import type {EmbedResourceParameter,EmbedResourceType,EmbeddingParameterVisibility,EmbeddingParameters,EmbeddingParametersValues,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";+import { ParameterWidget as StaticParameterWidget } from "metabase/parameters/components/ParameterWidget";+import { getParameterIconName } from "metabase/parameters/utils/ui";import { Box, Divider, Icon, Stack, Text } from "metabase/ui";import { getValuePopulatedParameters } from "metabase-lib/v1/parameters/utils/parameter-values";diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/PreviewModeSelector.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/PreviewModeSelector.tsxsimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/PreviewModeSelector.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/PreviewModeSelector.tsxdiff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/PreviewPane.module.css b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/PreviewPane.module.csssimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/PreviewPane.module.cssrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/PreviewPane.module.cssdiff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/PreviewPane.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/PreviewPane.tsxsimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/PreviewPane.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/PreviewPane.tsxdiff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/PreviewPane.unit.spec.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/PreviewPane.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/PreviewPane.unit.spec.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/PreviewPane.unit.spec.tsxdiff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/index.ts b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/index.tssimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/index.tsrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/index.tsdiff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/utils.ts b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/utils.tssimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/utils.tsrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/PreviewPane/utils.tsdiff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ServerEmbedCodePane.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/ServerEmbedCodePane.tsxsimilarity index 97%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ServerEmbedCodePane.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/ServerEmbedCodePane.tsxindex cfd9f5ddb81..f9ebed832ee 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ServerEmbedCodePane.tsx+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/ServerEmbedCodePane.tsx@@ -1,14 +1,14 @@import { t } from "ttag";import _ from "underscore";-import { getEmbedServerCodeExampleOptions } from "metabase/public/lib/code";+import { getEmbedServerCodeExampleOptions } from "metabase/embedding/lib/code";import type {EmbedResource,EmbedResourceType,EmbeddingDisplayOptions,EmbeddingParametersValues,ServerCodeSampleConfig,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";import { useSelector } from "metabase/redux";import { getCanWhitelabel } from "metabase/selectors/whitelabel";diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.styled.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.styled.tsxsimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.styled.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.styled.tsxdiff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsxsimilarity index 94%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsxindex 52eff89864f..91b55a3bfb8 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsx+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsx@@ -5,12 +5,12 @@ import { t } from "ttag";import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";-import { getPreviewParamsBySlug } from "metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-preview-params-by-slug";-import { getStaticEmbedSetupPublishHandlers } from "metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-static-embed-setup-publish-handlers";-import { trackStaticEmbedCodeCopied } from "metabase/public/lib/analytics";-import { getEmbedServerCodeExampleOptions } from "metabase/public/lib/code";-import { getIframeQueryWithoutDefaults } from "metabase/public/lib/code-templates";-import { getSignedPreviewUrlWithoutHash } from "metabase/public/lib/embed";+import { getPreviewParamsBySlug } from "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-preview-params-by-slug";+import { getStaticEmbedSetupPublishHandlers } from "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-static-embed-setup-publish-handlers";+import { trackStaticEmbedCodeCopied } from "metabase/embedding/lib/analytics";+import { getEmbedServerCodeExampleOptions } from "metabase/embedding/lib/code";+import { getIframeQueryWithoutDefaults } from "metabase/embedding/lib/code-templates";+import { getSignedPreviewUrlWithoutHash } from "metabase/embedding/lib/embed";import type {EmbedResource,EmbedResourceParameter,@@ -18,7 +18,7 @@ import type {EmbeddingParameters,EmbeddingParametersValues,GuestEmbedResourceType,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";import { useSelector } from "metabase/redux";import { getCanWhitelabel } from "metabase/selectors/whitelabel";import { Paper, Stack, Tabs } from "metabase/ui";diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPaneSettingsContentSection.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPaneSettingsContentSection.tsxsimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPaneSettingsContentSection.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPaneSettingsContentSection.tsxdiff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/config.ts b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/config.tssimilarity index 80%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/config.tsrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/config.tsindex 07770f57b72..819ab6c6899 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/config.ts+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/config.ts@@ -1,4 +1,4 @@-import type { EmbeddingDisplayOptions } from "metabase/public/lib/types";+import type { EmbeddingDisplayOptions } from "metabase/embedding/types";export function getDefaultDisplayOptions(shouldShownDownloadData: boolean,diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/index.ts b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/index.tssimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/index.tsrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/index.tsdiff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-default-embedding-params.ts b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-default-embedding-params.tssimilarity index 97%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-default-embedding-params.tsrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-default-embedding-params.tsindex 6313921b963..b375ad841e1 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-default-embedding-params.ts+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-default-embedding-params.ts@@ -4,7 +4,7 @@ import type {EmbedResource,EmbedResourceParameter,EmbeddingParameters,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";export function getDefaultEmbeddingParams(resource: EmbedResource,diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-has-params-changed.ts b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-has-params-changed.tssimilarity index 92%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-has-params-changed.tsrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-has-params-changed.tsindex d0f9e704f98..28d0f0b48a0 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-has-params-changed.ts+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-has-params-changed.ts@@ -1,6 +1,6 @@import _ from "underscore";-import type { EmbeddingParameters } from "metabase/public/lib/types";+import type { EmbeddingParameters } from "metabase/embedding/types";function getNonDisabledEmbeddingParams(embeddingParams: EmbeddingParameters,diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-locked-preview-parameters.ts b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-locked-preview-parameters.tssimilarity index 89%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-locked-preview-parameters.tsrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-locked-preview-parameters.tsindex 77181399a6a..19e899f06dd 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-locked-preview-parameters.ts+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-locked-preview-parameters.ts@@ -1,7 +1,7 @@import type {EmbedResourceParameter,EmbeddingParameters,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";export function getLockedPreviewParameters(resourceParameters: EmbedResourceParameter[],diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-preview-params-by-slug.ts b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-preview-params-by-slug.tssimilarity index 83%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-preview-params-by-slug.tsrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-preview-params-by-slug.tsindex 1ec54aa9f83..21b55268251 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-preview-params-by-slug.ts+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-preview-params-by-slug.ts@@ -1,9 +1,9 @@-import { getLockedPreviewParameters } from "metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-locked-preview-parameters";+import { getLockedPreviewParameters } from "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-locked-preview-parameters";import type {EmbedResourceParameter,EmbeddingParameters,EmbeddingParametersValues,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";import { getParameterValue } from "metabase-lib/v1/parameters/utils/parameter-values";export function getPreviewParamsBySlug({diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-static-embed-setup-publish-handlers.ts b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-static-embed-setup-publish-handlers.tssimilarity index 90%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-static-embed-setup-publish-handlers.tsrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-static-embed-setup-publish-handlers.tsindex 9aced763de1..a4288f5f1fc 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-static-embed-setup-publish-handlers.ts+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-static-embed-setup-publish-handlers.ts@@ -1,14 +1,14 @@-import { countEmbeddingParameterOptions } from "metabase/embedding/lib/count-embedding-parameter-options";-import type { StaticEmbedSetupPaneProps } from "metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane";+import type { StaticEmbedSetupPaneProps } from "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane";import {trackStaticEmbedDiscarded,trackStaticEmbedPublished,trackStaticEmbedUnpublished,-} from "metabase/public/lib/analytics";+} from "metabase/embedding/lib/analytics";+import { countEmbeddingParameterOptions } from "metabase/embedding/lib/count-embedding-parameter-options";import type {EmbedResourceParameter,EmbeddingParameters,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";import { getDefaultEmbeddingParams } from "./get-default-embedding-params";diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/tabs.ts b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tabs.tssimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/tabs.tsrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tabs.tsdiff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/tests/common.unit.spec.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/common.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/tests/common.unit.spec.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/common.unit.spec.tsxdiff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/enterprise.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/tests/enterprise.unit.spec.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/enterprise.unit.spec.tsxdiff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/tests/premium.unit.spec.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/premium.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/tests/premium.unit.spec.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/premium.unit.spec.tsxdiff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/tests/setup.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/setup.tsxsimilarity index 99%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/tests/setup.tsxrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/setup.tsxindex 3700a1e800a..8e29d757472 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/tests/setup.tsx+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/setup.tsx@@ -11,7 +11,7 @@ import { renderWithProviders } from "__support__/ui";import type {EmbedResource,EmbedResourceType,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";import { createMockState } from "metabase/redux/store/mocks";import type { TokenFeatures } from "metabase-types/api";import {diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/types.ts b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/types.tssimilarity index 75%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/types.tsrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/types.tsindex ba414724254..79b6a4cb876 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/types.ts+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/types.ts@@ -1,4 +1,4 @@-import type { EmbedResourceParameter } from "metabase/public/lib/types";+import type { EmbedResourceParameter } from "metabase/embedding/types";export type ActivePreviewPane = "preview" | "code";diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/utils.ts b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/utils.tssimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/utils.tsrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/utils.tsdiff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/utils.unit.spec.ts b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/utils.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/utils.unit.spec.tsrename to frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/utils.unit.spec.tsdiff --git a/frontend/src/metabase/public/components/EmbedModal/index.ts b/frontend/src/metabase/embedding/components/EmbedModal/index.tssimilarity index 100%rename from frontend/src/metabase/public/components/EmbedModal/index.tsrename to frontend/src/metabase/embedding/components/EmbedModal/index.tsdiff --git a/frontend/src/metabase/public/components/EmbedServerSnippetLanguageSelect/EmbedServerSnippetLanguageSelect.tsx b/frontend/src/metabase/embedding/components/EmbedServerSnippetLanguageSelect/EmbedServerSnippetLanguageSelect.tsxsimilarity index 93%rename from frontend/src/metabase/public/components/EmbedServerSnippetLanguageSelect/EmbedServerSnippetLanguageSelect.tsxrename to frontend/src/metabase/embedding/components/EmbedServerSnippetLanguageSelect/EmbedServerSnippetLanguageSelect.tsxindex 6afae6c2f52..ebdaa2802a0 100644--- a/frontend/src/metabase/public/components/EmbedServerSnippetLanguageSelect/EmbedServerSnippetLanguageSelect.tsx+++ b/frontend/src/metabase/embedding/components/EmbedServerSnippetLanguageSelect/EmbedServerSnippetLanguageSelect.tsx@@ -2,7 +2,7 @@ import type { ChangeEvent } from "react";import { Option, Select } from "metabase/common/components/Select";import CS from "metabase/css/core/index.css";-import type { CodeSampleOption } from "metabase/public/lib/types";+import type { CodeSampleOption } from "metabase/embedding/types";type Props = {languageOptions: CodeSampleOption[];diff --git a/frontend/src/metabase/embedding/components/EmbeddingFooter/EmbeddingFooter.tsx b/frontend/src/metabase/embedding/components/EmbeddingFooter/EmbeddingFooter.tsxindex 16172fb5c09..eca895b8b9f 100644--- a/frontend/src/metabase/embedding/components/EmbeddingFooter/EmbeddingFooter.tsx+++ b/frontend/src/metabase/embedding/components/EmbeddingFooter/EmbeddingFooter.tsx@@ -3,8 +3,8 @@ import type { PropsWithChildren } from "react";import {Footer,type FooterVariant,-} from "metabase/public/components/EmbedFrame/EmbedFrame.styled";-import { LogoBadge } from "metabase/public/components/EmbedFrame/LogoBadge";+} from "metabase/embedding/components/EmbedFooter.styled";+import { LogoBadge } from "metabase/embedding/components/LogoBadge";import EmbeddingFooterS from "./EmbeddingFooter.module.css";diff --git a/frontend/src/metabase/public/components/EmbedFrame/LogoBadge/LogoBadge.module.css b/frontend/src/metabase/embedding/components/LogoBadge/LogoBadge.module.csssimilarity index 100%rename from frontend/src/metabase/public/components/EmbedFrame/LogoBadge/LogoBadge.module.cssrename to frontend/src/metabase/embedding/components/LogoBadge/LogoBadge.module.cssdiff --git a/frontend/src/metabase/public/components/EmbedFrame/LogoBadge/LogoBadge.tsx b/frontend/src/metabase/embedding/components/LogoBadge/LogoBadge.tsxsimilarity index 95%rename from frontend/src/metabase/public/components/EmbedFrame/LogoBadge/LogoBadge.tsxrename to frontend/src/metabase/embedding/components/LogoBadge/LogoBadge.tsxindex 1f90a848e24..b961373258b 100644--- a/frontend/src/metabase/public/components/EmbedFrame/LogoBadge/LogoBadge.tsx+++ b/frontend/src/metabase/embedding/components/LogoBadge/LogoBadge.tsx@@ -2,8 +2,7 @@ import cx from "classnames";import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";--import EmbedFrameS from "../EmbedFrame.module.css";+import EmbedFrameS from "metabase/embedding/theme.module.css";import LogoBadgeStyle from "./LogoBadge.module.css";import MetabaseLogoWithText from "./metabase_logo_with_text.svg?component";diff --git a/frontend/src/metabase/public/components/EmbedFrame/LogoBadge/LogoBadge.unit.spec.tsx b/frontend/src/metabase/embedding/components/LogoBadge/LogoBadge.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/public/components/EmbedFrame/LogoBadge/LogoBadge.unit.spec.tsxrename to frontend/src/metabase/embedding/components/LogoBadge/LogoBadge.unit.spec.tsxdiff --git a/frontend/src/metabase/public/components/EmbedFrame/LogoBadge/index.ts b/frontend/src/metabase/embedding/components/LogoBadge/index.tssimilarity index 100%rename from frontend/src/metabase/public/components/EmbedFrame/LogoBadge/index.tsrename to frontend/src/metabase/embedding/components/LogoBadge/index.tsdiff --git a/frontend/src/metabase/public/components/EmbedFrame/LogoBadge/metabase_logo_with_text.svg b/frontend/src/metabase/embedding/components/LogoBadge/metabase_logo_with_text.svgsimilarity index 100%rename from frontend/src/metabase/public/components/EmbedFrame/LogoBadge/metabase_logo_with_text.svgrename to frontend/src/metabase/embedding/components/LogoBadge/metabase_logo_with_text.svgdiff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/index.ts b/frontend/src/metabase/embedding/components/PublicLinkPopover/index.tsdeleted file mode 100644index 02bd171acba..00000000000--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/index.ts+++ /dev/null@@ -1,3 +0,0 @@-export { QuestionPublicLinkPopover } from "./QuestionPublicLinkPopover";-export { DashboardPublicLinkPopover } from "./DashboardPublicLinkPopover";-export { DocumentPublicLinkPopover } from "./DocumentPublicLinkPopover";diff --git a/frontend/src/metabase/query_builder/components/QuestionEmbedWidget/QuestionEmbedWidget.tsx b/frontend/src/metabase/embedding/components/QuestionEmbedWidget/QuestionEmbedWidget.tsxsimilarity index 95%rename from frontend/src/metabase/query_builder/components/QuestionEmbedWidget/QuestionEmbedWidget.tsxrename to frontend/src/metabase/embedding/components/QuestionEmbedWidget/QuestionEmbedWidget.tsxindex 39ee8e71ef0..2b926d1b22a 100644--- a/frontend/src/metabase/query_builder/components/QuestionEmbedWidget/QuestionEmbedWidget.tsx+++ b/frontend/src/metabase/embedding/components/QuestionEmbedWidget/QuestionEmbedWidget.tsx@@ -2,8 +2,8 @@ import {useUpdateCardEmbeddingParamsMutation,useUpdateCardEnableEmbeddingMutation,} from "metabase/api";+import { EmbedModal } from "metabase/embedding/components/EmbedModal";import { STATIC_LEGACY_EMBEDDING_TYPE } from "metabase/embedding/constants";-import { EmbedModal } from "metabase/public/components/EmbedModal";import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { getCardUiParameters } from "metabase-lib/v1/parameters/utils/cards";diff --git a/frontend/src/metabase/query_builder/components/QuestionEmbedWidget/index.ts b/frontend/src/metabase/embedding/components/QuestionEmbedWidget/index.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/QuestionEmbedWidget/index.tsrename to frontend/src/metabase/embedding/components/QuestionEmbedWidget/index.tsdiff --git a/frontend/src/metabase/embedding/components/SharingMenu/PublicLinkModals.tsx b/frontend/src/metabase/embedding/components/SharingMenu/PublicLinkModals.tsxdeleted file mode 100644index 8c689647792..00000000000--- a/frontend/src/metabase/embedding/components/SharingMenu/PublicLinkModals.tsx+++ /dev/null@@ -1,76 +0,0 @@-import { type Ref, forwardRef } from "react";--import { Box } from "metabase/ui";-import type Question from "metabase-lib/v1/Question";-import type { Dashboard } from "metabase-types/api";--import {- DashboardPublicLinkPopover,- QuestionPublicLinkPopover,-} from "../PublicLinkPopover";--import type {- DashboardSharingModalType,- QuestionSharingModalType,-} from "./types";--const MenuTarget = forwardRef(function _MenuTarget(- _props,- ref: Ref<HTMLDivElement>,-) {- return <Box h="2rem" ref={ref} />;-});--type BaseSharingModalProps = {- onClose: () => void;-};--type SharingModalProps = BaseSharingModalProps &- (- | {- modalType: QuestionSharingModalType;- question: Question;- dashboard?: never;- }- | {- modalType: DashboardSharingModalType;- dashboard: Dashboard;- question?: never;- }- | {- modalType: null;- question?: Question;- dashboard?: Dashboard;- }- );--export const PublicLinkModals = ({- modalType,- onClose,- question,- dashboard,-}: SharingModalProps) => {- if (modalType === "question-public-link") {- return (- <QuestionPublicLinkPopover- question={question}- target={<MenuTarget />}- onClose={onClose}- isOpen- />- );- }-- if (modalType === "dashboard-public-link") {- return (- <DashboardPublicLinkPopover- dashboard={dashboard}- target={<MenuTarget />}- onClose={onClose}- isOpen- />- );- }-- return null;-};diff --git a/frontend/src/metabase/embedding/components/SharingMenu/index.ts b/frontend/src/metabase/embedding/components/SharingMenu/index.tsdeleted file mode 100644index f1cf768f41b..00000000000--- a/frontend/src/metabase/embedding/components/SharingMenu/index.ts+++ /dev/null@@ -1,2 +0,0 @@-export * from "./DashboardSharingMenu";-export * from "./QuestionSharingMenu";diff --git a/frontend/src/metabase/embedding/constants.ts b/frontend/src/metabase/embedding/constants.tsindex 07e80b0169f..6f282037efc 100644--- a/frontend/src/metabase/embedding/constants.ts+++ b/frontend/src/metabase/embedding/constants.ts@@ -1,4 +1,4 @@-import type { EmbeddingType } from "metabase/public/lib/types";+import type { EmbeddingType } from "metabase/embedding/types";export const STATIC_LEGACY_EMBEDDING_TYPE: EmbeddingType = "static-legacy";export const GUEST_EMBED_EMBEDDING_TYPE: EmbeddingType = "guest-embed";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/analytics.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/analytics.tsindex 47952748f54..123f057f75e 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/analytics.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/analytics.ts@@ -8,8 +8,8 @@ import type {import { getAuthSubTypeForSettings } from "metabase/embedding/embedding-iframe-sdk-setup/utils/get-auth-sub-type-for-settings";import { getAuthTypeForSettings } from "metabase/embedding/embedding-iframe-sdk-setup/utils/get-auth-type-for-settings";import { countEmbeddingParameterOptions } from "metabase/embedding/lib/count-embedding-parameter-options";+import type { EmbeddingParameters } from "metabase/embedding/types";import type { SdkIframeEmbedSetupModalInitialState } from "metabase/plugins";-import type { EmbeddingParameters } from "metabase/public/lib/types";import type { Card, Dashboard } from "metabase-types/api";import type {diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Authentication/DatabaseRoutingWarning.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Authentication/DatabaseRoutingWarning.tsxindex c925f9459fe..6c6e5566f70 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Authentication/DatabaseRoutingWarning.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Authentication/DatabaseRoutingWarning.tsx@@ -9,7 +9,7 @@ import {import type {EmbedResource,GuestEmbedResourceType,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";import { Alert, Icon } from "metabase/ui";import type { Card, Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/GetCodeStep.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/GetCodeStep.tsxindex 15fb4b22033..2be5ac92179 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/GetCodeStep.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/GetCodeStep.tsx@@ -2,12 +2,12 @@ import { t } from "ttag";import { useUpdateSettingsMutation } from "metabase/api";import { CodeEditor } from "metabase/common/components/CodeEditor";+import { EmbedServerSnippetLanguageSelect } from "metabase/embedding/components/EmbedServerSnippetLanguageSelect/EmbedServerSnippetLanguageSelect";import { MoreServerSnippetExamplesLink } from "metabase/embedding/components/MoreServerSnippetExamplesLink/MoreServerSnippetExamplesLink";import { MetabaseAccountSection } from "metabase/embedding/embedding-iframe-sdk-setup/components/Authentication/MetabaseAccountSection";import { CopyCodeSnippetButton } from "metabase/embedding/embedding-iframe-sdk-setup/components/GetCode/CopyCodeSnippetButton";import { PublishQuestionEmptyState } from "metabase/embedding/embedding-iframe-sdk-setup/components/GetCode/PublishQuestionEmptyState";import { useSdkIframeEmbedServerSnippet } from "metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-server-snippet";-import { EmbedServerSnippetLanguageSelect } from "metabase/public/components/EmbedServerSnippetLanguageSelect/EmbedServerSnippetLanguageSelect";import { Card, Flex, Stack, Text } from "metabase/ui";import type { SettingKey } from "metabase-types/api";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingModal.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingModal.tsxindex 8768002acb8..6fac9942605 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingModal.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingModal.tsx@@ -1,12 +1,12 @@import { t } from "ttag";-import { DashboardSharingEmbeddingModal } from "metabase/dashboard/containers/DashboardSharingEmbeddingModal";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { DashboardSharingEmbeddingModal } from "metabase/embedding/components/DashboardSharingEmbeddingModal";+import { QuestionEmbedWidget } from "metabase/embedding/components/QuestionEmbedWidget";import { useGetCurrentResource } from "metabase/embedding/embedding-iframe-sdk-setup/hooks";import type { SdkIframeEmbedSetupExperience } from "metabase/embedding/embedding-iframe-sdk-setup/types";import { useOpenEmbedJsWizard } from "metabase/embedding/hooks/use-open-embed-js-wizard";import type { SdkIframeEmbedSetupModalInitialState } from "metabase/plugins";-import { LoadingAndErrorWrapper } from "metabase/public/containers/PublicAction/PublicAction.styled";-import { QuestionEmbedWidget } from "metabase/query_builder/components/QuestionEmbedWidget";import type { Card, Dashboard, DashboardId } from "metabase-types/api";export type LegacyStaticEmbeddingModalProps = {diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/ParameterSettings.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/ParameterSettings.tsxindex 1ee5bd4cebf..0c32cd0aa6e 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/ParameterSettings.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/ParameterSettings.tsx@@ -2,11 +2,11 @@ import { useMemo } from "react";import { t } from "ttag";import CS from "metabase/css/core/index.css";+import { ParametersSettings } from "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/ParametersSettings";+import { getLockedPreviewParameters } from "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-locked-preview-parameters";import { getResourceTypeFromExperience } from "metabase/embedding/embedding-iframe-sdk-setup/utils/get-resource-type-from-experience";import { isQuestionOrDashboardSettings } from "metabase/embedding/embedding-iframe-sdk-setup/utils/is-question-or-dashboard-settings";import { ParameterWidget } from "metabase/parameters/components/ParameterWidget";-import { ParametersSettings } from "metabase/public/components/EmbedModal/StaticEmbedSetupPane/ParametersSettings";-import { getLockedPreviewParameters } from "metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-locked-preview-parameters";import { Group, Stack, Text } from "metabase/ui";import type { UiParameter } from "metabase-lib/v1/parameters/types";import { getValuePopulatedParameters } from "metabase-lib/v1/parameters/utils/parameter-values";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeGuestEmbedStatusBar.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeGuestEmbedStatusBar.tsxindex 81f9f0c1300..42b591d23fb 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeGuestEmbedStatusBar.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeGuestEmbedStatusBar.tsx@@ -1,8 +1,8 @@+import { EmbedModalContentStatusBar } from "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/EmbedModalContentStatusBar";+import { getHasParamsChanged } from "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-has-params-changed";import { useSdkIframeEmbedSetupContext } from "metabase/embedding/embedding-iframe-sdk-setup/context";import { useToggleResourceEmbedding } from "metabase/embedding/embedding-iframe-sdk-setup/hooks/use-toggle-resource-embedding";import { isStepWithResource } from "metabase/embedding/embedding-iframe-sdk-setup/utils/is-step-with-resource";-import { EmbedModalContentStatusBar } from "metabase/public/components/EmbedModal/StaticEmbedSetupPane/EmbedModalContentStatusBar";-import { getHasParamsChanged } from "metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-has-params-changed";import { Card } from "metabase/ui";export const SdkIframeGuestEmbedStatusBar = () => {diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/context.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/context.tsindex 9e84a3d16cb..4196ef65693 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/context.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/context.ts@@ -1,10 +1,10 @@import { createContext, useContext } from "react";-import type { SdkIframeEmbedSetupModalInitialState } from "metabase/plugins";import type {EmbeddingParameters,EmbeddingParametersValues,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";+import type { SdkIframeEmbedSetupModalInitialState } from "metabase/plugins";import type { Card, Dashboard, Parameter } from "metabase-types/api";import type {diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters-conversion.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters-conversion.tsindex 2489c5c7cb0..359c536e1be 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters-conversion.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters-conversion.ts@@ -1,7 +1,7 @@import { useCallback } from "react";import type { SdkIframeEmbedSetupSettings } from "metabase/embedding/embedding-iframe-sdk-setup/types";-import type { EmbeddingParameters } from "metabase/public/lib/types";+import type { EmbeddingParameters } from "metabase/embedding/types";import type { Parameter } from "metabase-types/api";export const useEmbeddingParametersConversion = () => {diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters-conversion.unit.spec.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters-conversion.unit.spec.tsindex a247bb903ee..55ca82807c1 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters-conversion.unit.spec.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters-conversion.unit.spec.ts@@ -1,7 +1,7 @@import { renderHook } from "@testing-library/react";import { useEmbeddingParametersConversion } from "metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters-conversion";-import type { EmbeddingParameters } from "metabase/public/lib/types";+import type { EmbeddingParameters } from "metabase/embedding/types";import type { Parameter } from "metabase-types/api";import { createMockParameter } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters.tsindex 259cf582926..365a580f65c 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters.ts@@ -1,10 +1,10 @@import { useCallback, useEffect, useMemo, useRef } from "react";import { usePrevious } from "react-use";+import { getDefaultEmbeddingParams } from "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-default-embedding-params";import type { SdkIframeEmbedSetupContextType } from "metabase/embedding/embedding-iframe-sdk-setup/context";import { useEmbeddingParametersConversion } from "metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters-conversion";-import { getDefaultEmbeddingParams } from "metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-default-embedding-params";-import type { EmbeddingParameters } from "metabase/public/lib/types";+import type { EmbeddingParameters } from "metabase/embedding/types";import type { Card, Dashboard, Parameter } from "metabase-types/api";export const useEmbeddingParameters = ({diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters.unit.spec.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters.unit.spec.tsindex ebad96bd95b..8ba6deb80d9 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters.unit.spec.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters.unit.spec.ts@@ -2,7 +2,7 @@ import { renderHook } from "@testing-library/react";import { useEmbeddingParameters } from "metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters";import type { SdkIframeEmbedSetupSettings } from "metabase/embedding/embedding-iframe-sdk-setup/types";-import type { EmbeddingParameters } from "metabase/public/lib/types";+import type { EmbeddingParameters } from "metabase/embedding/types";import type { Card, Dashboard, Parameter } from "metabase-types/api";import {createMockCard,@@ -14,7 +14,7 @@ jest.mock("metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters-conversion",);jest.mock(- "metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-default-embedding-params",+ "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-default-embedding-params",);const mockUseEmbeddingParametersConversion = jest.requireMock(@@ -22,7 +22,7 @@ const mockUseEmbeddingParametersConversion = jest.requireMock().useEmbeddingParametersConversion;const mockGetDefaultEmbeddingParams = jest.requireMock(- "metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-default-embedding-params",+ "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-default-embedding-params",).getDefaultEmbeddingParams;const mockUpdateSettings = jest.fn();diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-guest-embed-signed-token.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-guest-embed-signed-token.tsindex ec5dfefff2b..4540f418d94 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-guest-embed-signed-token.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-guest-embed-signed-token.ts@@ -5,7 +5,7 @@ import { useSetting } from "metabase/common/hooks";import type { SdkIframeEmbedSetupContextType } from "metabase/embedding/embedding-iframe-sdk-setup/context";import { getResourceTypeFromExperience } from "metabase/embedding/embedding-iframe-sdk-setup/utils/get-resource-type-from-experience";import { isQuestionOrDashboardSettings } from "metabase/embedding/embedding-iframe-sdk-setup/utils/is-question-or-dashboard-settings";-import { getSignedToken } from "metabase/public/lib/embed";+import { getSignedToken } from "metabase/embedding/lib/embed";const SIGNED_TOKEN_FOR_SNIPPET_EXPIRATION_MINUTES = 10;const SIGNED_TOKEN_FOR_PREVIEW_EXPIRATION_MINUTES = 60;diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-parameters-values.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-parameters-values.tsindex 73121e7b4d3..c905d837915 100644--- a/frontend/src/metabase/embedding/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 { getPreviewParamsBySlug } from "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-preview-params-by-slug";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 { getPreviewParamsBySlug } from "metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-preview-params-by-slug";-import type { EmbeddingParameters } from "metabase/public/lib/types";+import type { EmbeddingParameters } from "metabase/embedding/types";import type { Parameter } from "metabase-types/api";interface UseParametersValuesProps {diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-server-snippet.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-server-snippet.tsindex f658752374c..75fbc2d6758 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-server-snippet.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-server-snippet.ts@@ -9,11 +9,11 @@ import {node,python,ruby,-} from "metabase/public/lib/code-templates";+} from "metabase/embedding/lib/code-templates";import type {CodeSampleParameters,ServerCodeSampleConfig,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";const getEmbedServerCodeExampleOptions = (codeSampleParameters: Omit<CodeSampleParameters, "displayOptions">,diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-toggle-resource-embedding.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-toggle-resource-embedding.tsindex 269ec923770..c136ae4d6d7 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-toggle-resource-embedding.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-toggle-resource-embedding.ts@@ -5,9 +5,9 @@ import {useUpdateDashboardEnableEmbeddingMutation,} from "metabase/api";import { useSetting } from "metabase/common/hooks";+import { getStaticEmbedSetupPublishHandlers } from "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-static-embed-setup-publish-handlers";import { GUEST_EMBED_EMBEDDING_TYPE } from "metabase/embedding/constants";-import { getStaticEmbedSetupPublishHandlers } from "metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-static-embed-setup-publish-handlers";-import type { EmbeddingParameters } from "metabase/public/lib/types";+import type { EmbeddingParameters } from "metabase/embedding/types";import { useSdkIframeEmbedSetupContext } from "../context";import { getResourceTypeFromExperience } from "../utils/get-resource-type-from-experience";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/get-resource-type-from-experience.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/get-resource-type-from-experience.tsindex e9b5dd8290f..d36a2dfce9a 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/get-resource-type-from-experience.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/get-resource-type-from-experience.ts@@ -1,5 +1,5 @@import type { SdkIframeEmbedSetupExperience } from "metabase/embedding/embedding-iframe-sdk-setup/types";-import type { GuestEmbedResourceType } from "metabase/public/lib/types";+import type { GuestEmbedResourceType } from "metabase/embedding/types";export const getResourceTypeFromExperience = (experience: SdkIframeEmbedSetupExperience,diff --git a/frontend/src/metabase/embedding/hooks/use-sharing-modal.ts b/frontend/src/metabase/embedding/hooks/use-sharing-modal.tsindex c09dee339f5..a77b5d6086f 100644--- a/frontend/src/metabase/embedding/hooks/use-sharing-modal.ts+++ b/frontend/src/metabase/embedding/hooks/use-sharing-modal.ts@@ -9,7 +9,7 @@ import { useOpenEmbedJsWizard } from "metabase/embedding/hooks/use-open-embed-jsimport type {EmbedResource,EmbedResourceType,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";import { useDispatch } from "metabase/redux";import { setOpenModal } from "metabase/redux/ui";diff --git a/frontend/src/metabase/public/lib/analytics.ts b/frontend/src/metabase/embedding/lib/analytics.tssimilarity index 99%rename from frontend/src/metabase/public/lib/analytics.tsrename to frontend/src/metabase/embedding/lib/analytics.tsindex c99eaf94875..7eef727cbc7 100644--- a/frontend/src/metabase/public/lib/analytics.ts+++ b/frontend/src/metabase/embedding/lib/analytics.ts@@ -8,7 +8,7 @@ import type {EmbedResourceType,EmbeddingDisplayOptions,EmbeddingParameterVisibility,-} from "./types";+} from "../types";const SCHEMA_NAME = "embed_flow";diff --git a/frontend/src/metabase/public/lib/code-templates.ts b/frontend/src/metabase/embedding/lib/code-templates.tssimilarity index 99%rename from frontend/src/metabase/public/lib/code-templates.tsrename to frontend/src/metabase/embedding/lib/code-templates.tsindex ef58fbaafe5..84e4b1ea35d 100644--- a/frontend/src/metabase/public/lib/code-templates.ts+++ b/frontend/src/metabase/embedding/lib/code-templates.ts@@ -1,12 +1,13 @@import { match } from "ts-pattern";-import { optionsToHashParams } from "./embed";import type {CodeSampleParameters,EmbeddingDisplayOptions,EmbeddingHashOptions,EmbeddingParametersValues,-} from "./types";+} from "../types";++import { optionsToHashParams } from "./embed";export function getIframeQueryWithoutDefaults(displayOptions: EmbeddingDisplayOptions,diff --git a/frontend/src/metabase/public/lib/code.ts b/frontend/src/metabase/embedding/lib/code.tssimilarity index 99%rename from frontend/src/metabase/public/lib/code.tsrename to frontend/src/metabase/embedding/lib/code.tsindex d2f414be511..35412d6f068 100644--- a/frontend/src/metabase/public/lib/code.ts+++ b/frontend/src/metabase/embedding/lib/code.ts@@ -1,3 +1,9 @@+import type {+ ClientCodeSampleConfig,+ CodeSampleParameters,+ ServerCodeSampleConfig,+} from "../types";+import {clojure,getHtmlSource,@@ -7,11 +13,6 @@ import {python,ruby,} from "./code-templates";-import type {- ClientCodeSampleConfig,- CodeSampleParameters,- ServerCodeSampleConfig,-} from "./types";export const getEmbedClientCodeExampleOptions =(): ClientCodeSampleConfig[] => [diff --git a/frontend/src/metabase/embedding/lib/count-embedding-parameter-options.ts b/frontend/src/metabase/embedding/lib/count-embedding-parameter-options.tsindex 4c2bbb0b83d..38091bff64c 100644--- a/frontend/src/metabase/embedding/lib/count-embedding-parameter-options.ts+++ b/frontend/src/metabase/embedding/lib/count-embedding-parameter-options.ts@@ -1,7 +1,7 @@import type {EmbeddingParameterVisibility,EmbeddingParameters,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";export const countEmbeddingParameterOptions = (embeddingParams: EmbeddingParameters,diff --git a/frontend/src/metabase/public/lib/embed.ts b/frontend/src/metabase/embedding/lib/embed.tssimilarity index 99%rename from frontend/src/metabase/public/lib/embed.tsrename to frontend/src/metabase/embedding/lib/embed.tsindex 2e673690bd1..c654f7a60e5 100644--- a/frontend/src/metabase/public/lib/embed.ts+++ b/frontend/src/metabase/embedding/lib/embed.ts@@ -6,7 +6,7 @@ import type {EmbedResource,EmbedResourceType,EmbeddingParametersValues,-} from "./types";+} from "../types";const DEFAULT_SIGNED_TOKEN_EXPIRATION_MINUTES = 10;diff --git a/frontend/src/metabase/public/lib/tab-parameters.tsx b/frontend/src/metabase/embedding/lib/tab-parameters.tsxsimilarity index 100%rename from frontend/src/metabase/public/lib/tab-parameters.tsxrename to frontend/src/metabase/embedding/lib/tab-parameters.tsxdiff --git a/frontend/src/metabase/embedding/theme.module.css b/frontend/src/metabase/embedding/theme.module.cssnew file mode 100644index 00000000000..aba170bba04--- /dev/null+++ b/frontend/src/metabase/embedding/theme.module.css@@ -0,0 +1,74 @@+/*+ * Shared embed theme classes.+ *+ * Components inside the embed frame apply these class names to themselves+ * so that theme transitions, background colors, and transparent-theme+ * overrides work correctly.+ *+ * This module lives in embed/ (shared tier) so that dashboard,+ * visualizations, and public/ can all import without violations.+ *+ * EmbedFrame.tsx also imports this module — all styles referencing these+ * class names live here to ensure hash consistency.+ */++/* ---- Base theme colors ---- */++.EmbedFrame {+ color: var(--mb-color-text-primary);+ background-color: var(--mb-color-bg-dashboard);+ border-color: var(--mb-color-border);+}++.EmbedFrameHeader,+.EmbedFrameFooter {+ color: var(--mb-color-text-primary);+ background-color: var(--mb-color-bg-dashboard);+}++/* Used by EmbedFrame's ContentContainer and by image/PDF export code */+.WithThemeBackground {+ background-color: var(--mb-color-bg-dashboard);+ border-color: var(--mb-color-border);+}++/* ---- Theme transition rules ---- */++.EmbedFrame,+.EmbedFrame .DashCard .Card,+.EmbedFrame .ContentContainer,+.EmbedFrame .EmbedFrameHeader,+.EmbedFrame .Separator,+.EmbedFrame .ParameterFieldSet,+.EmbedFrame .ParametersWidgetContainer,+.EmbedFrame .EmbedFrameFooter,+.EmbedFrame .LogoBadge {+ transition: var(--transition-theme-change);+}++/* ---- NoBackground override ---- */++.NoBackground {+ --mb-color-bg-dashboard: transparent;+}++/* ---- Transparent theme overrides ---- */++[data-metabase-theme="transparent"][data-metabase-theme="transparent"] {+ .EmbedFrame {+ background-color: transparent;++ .DashCard .Card {+ background-color: transparent;+ }+ }++ .WithThemeBackground {+ background-color: transparent;+ }++ .EmbedFrameHeader,+ .EmbedFrameFooter {+ background-color: transparent;+ }+}diff --git a/frontend/src/metabase/public/lib/types.ts b/frontend/src/metabase/embedding/types.tssimilarity index 100%rename from frontend/src/metabase/public/lib/types.tsrename to frontend/src/metabase/embedding/types.tsdiff --git a/frontend/src/metabase/plugins/oss/resource-downloads.ts b/frontend/src/metabase/plugins/oss/resource-downloads.tsindex 1ebdd483a29..43cd20c9f9f 100644--- a/frontend/src/metabase/plugins/oss/resource-downloads.ts+++ b/frontend/src/metabase/plugins/oss/resource-downloads.ts@@ -1,4 +1,4 @@-import type { EmbedResourceDownloadOptions } from "metabase/public/lib/types";+import type { EmbedResourceDownloadOptions } from "metabase/embedding/types";const getDefaultPluginResourceDownloads = () => ({areDownloadsEnabled: (_args: {diff --git a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.module.css b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.module.cssindex d1651a2549c..2254f42f905 100644--- a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.module.css+++ b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.module.css@@ -1,36 +1,14 @@+/*+ * EmbedFrame-specific styles.+ *+ * Shared theme class names (EmbedFrame, DashCard, Card, WithThemeBackground,+ * etc.) are in metabase/embedding/theme.module.css — EmbedFrame.tsx imports both.+ */+body:where(:global(.mb-wrapper)) {background-color: transparent;}-.EmbedFrame {- color: var(--mb-color-text-primary);-}--.EmbedFrame,-/* this is to make it work when exporting to pdfs, where the EmbedFrame is not part of the exported dom */-.WithThemeBackground {- background-color: var(--mb-color-bg-dashboard);- border-color: var(--mb-color-border);-}--.EmbedFrameHeader,-.EmbedFrameFooter {- color: var(--mb-color-text-primary);- background-color: var(--mb-color-bg-dashboard);-}--.EmbedFrame,-.EmbedFrame .DashCard .Card,-.EmbedFrame .ContentContainer,-.EmbedFrame .EmbedFrameHeader,-.EmbedFrame .Separator,-.EmbedFrame .ParameterFieldSet,-.EmbedFrame .ParametersWidgetContainer,-.EmbedFrame .EmbedFrameFooter,-.EmbedFrame .LogoBadge {- transition: var(--transition-theme-change);-}-.ParameterPanel.AllowSticky {position: sticky;top: 0;@@ -78,28 +56,7 @@ body:where(:global(.mb-wrapper)) {);}-.NoBackground {- --mb-color-bg-dashboard: transparent;-}-[data-metabase-theme="transparent"][data-metabase-theme="transparent"] {- .EmbedFrame {- background-color: transparent;-- .DashCard .Card {- background-color: transparent;- }- }-- .WithThemeBackground {- background-color: transparent;- }-- .EmbedFrameHeader,- .EmbedFrameFooter {- background-color: transparent;- }-.ParameterPanel.IsSticky {background-color: color-mix(in srgb,diff --git a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.styled.tsx b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.styled.tsxindex b0aa74b75ae..f0c0a1ead2b 100644--- a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.styled.tsx+++ b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.styled.tsx@@ -111,47 +111,6 @@ export const Body = styled.main`position: relative;`;-export const ActionButtonsContainer = styled.div`- color: var(--mb-color-text-secondary);- margin-left: auto;-`;--export type FooterVariant = "default" | "large";--const footerVariantStyles = {- default: css`- border-top: 1px solid var(--mb-color-border);- `,- large: css`- justify-content: center;- align-items: center;- margin-bottom: 2rem;-- ${ActionButtonsContainer} {- display: none;- }- `,-};--export const Footer = styled.footer<{ variant: FooterVariant }>`- display: flex;- flex-shrink: 0;- align-items: center;- ${(props) => footerVariantStyles[props.variant]}- height: calc(50 / 16 * 1rem);- padding: 0 1em;-- ${breakpointMinSmall} {- height: calc(65 / 16 * 1rem);- padding: 0 1.5rem;- }-- ${breakpointMinLarge} {- height: calc(80 / 16 * 1rem);- padding: 0 2rem;- }-`;-export const TitleAndButtonsContainer = styled(FixedWidthContainer)`display: flex;flex-direction: row;diff --git a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsxindex 763eba3a4c7..a008329cd8f 100644--- a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx+++ b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx@@ -14,7 +14,12 @@ import {DASHBOARD_PDF_EXPORT_ROOT_ID,} from "metabase/dashboard/constants";import { useIsParameterPanelSticky } from "metabase/dashboard/hooks/use-is-parameter-panel-sticky";+import {+ ActionButtonsContainer,+ type FooterVariant,+} from "metabase/embedding/components/EmbedFooter.styled";import { EmbeddingFooter } from "metabase/embedding/components/EmbeddingFooter/EmbeddingFooter";+import EmbedThemeS from "metabase/embedding/theme.module.css";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { FilterApplyToast } from "metabase/parameters/components/FilterApplyToast";import { ParametersList } from "metabase/parameters/components/ParametersList";@@ -40,9 +45,7 @@ import type {import type { DashboardUrlHashOptions } from "../../../dashboard/types";import EmbedFrameS from "./EmbedFrame.module.css";-import type { FooterVariant } from "./EmbedFrame.styled";import {- ActionButtonsContainer,Body,ContentContainer,DashboardTabsContainer,@@ -182,8 +185,8 @@ export const EmbedFrame = ({hasScroll={hasFrameScroll}isBordered={bordered}hasVisibleOverflowWhenPriting={isPublicDashboard}- className={cx(className, EmbedFrameS.EmbedFrame, {- [EmbedFrameS.NoBackground]: !background,+ className={cx(className, EmbedThemeS.EmbedFrame, {+ [EmbedThemeS.NoBackground]: !background,})}data-testid="embed-frame"data-embed-theme={theme}@@ -191,8 +194,8 @@ export const EmbedFrame = ({<ContentContainerid={DASHBOARD_PDF_EXPORT_ROOT_ID}className={cx(contentClassName, {- [EmbedFrameS.ContentContainer]: true,- [EmbedFrameS.WithThemeBackground]: true,+ [EmbedThemeS.ContentContainer]: true,+ [EmbedThemeS.WithThemeBackground]: true,// If we are showing a standalone question, make the entire card a hover parent[CS.hoverParent]: question,@@ -202,7 +205,7 @@ export const EmbedFrame = ({{hasHeader && (<HeaderclassName={cx(- EmbedFrameS.EmbedFrameHeader,+ EmbedThemeS.EmbedFrameHeader,SAVING_DOM_IMAGE_DISPLAY_NONE_CLASS,)}data-testid="embed-frame-header"@@ -246,7 +249,7 @@ export const EmbedFrame = ({</DashboardTabsContainer>)}- {finalName && <Separator className={EmbedFrameS.Separator} />}+ {finalName && <Separator className={EmbedThemeS.Separator} />}</Header>)}diff --git a/frontend/src/metabase/public/components/EmbedFrame/useGlobalTheme.tsx b/frontend/src/metabase/public/components/EmbedFrame/useGlobalTheme.tsxindex ffbe735a87d..c7af7e173fb 100644--- a/frontend/src/metabase/public/components/EmbedFrame/useGlobalTheme.tsx+++ b/frontend/src/metabase/public/components/EmbedFrame/useGlobalTheme.tsx@@ -1,7 +1,7 @@import { useEffect } from "react";+import type { DisplayTheme } from "metabase/embedding/types";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";-import type { DisplayTheme } from "metabase/public/lib/types";export function useGlobalTheme(theme: DisplayTheme | undefined) {useEffect(() => {diff --git a/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.tsx b/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.tsxindex 29022935098..071880b801d 100644--- a/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.tsx+++ b/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.tsx@@ -8,8 +8,8 @@ import { useAsync, useMount } from "react-use";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { ExternalCardDataProvider } from "metabase/documents/contexts/ExternalCardDataContext";import { EmbedFrame } from "metabase/public/components/EmbedFrame";-import { PublicDocumentProvider } from "metabase/public/contexts/PublicDocumentContext";import { useEmbedFrameOptions } from "metabase/public/hooks";import { useDispatch, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";@@ -25,7 +25,7 @@ import { getSetting } from "metabase/selectors/settings";import { PublicApi } from "metabase/services";import { Box } from "metabase/ui";import { initializeIframeResizer } from "metabase/utils/dom";-import type { Document } from "metabase-types/api";+import type { Dataset, Document } from "metabase-types/api";import S from "./PublicDocument.module.css";@@ -120,6 +120,16 @@ export const PublicDocument = ({ location, params }: PublicDocumentProps) => {initializeIframeResizer();});+ const externalCardDataValue = useMemo(+ () => ({+ cards: document?.cards ?? {},+ documentUuid: uuid,+ loadCardQuery: (cardId: number) =>+ PublicApi.documentCardQuery({ uuid, cardId }) as Promise<Dataset>,+ }),+ [document?.cards, uuid],+ );+return (<EmbedFrametheme={theme}@@ -139,20 +149,14 @@ export const PublicDocument = ({ location, params }: PublicDocumentProps) => {}}>{document && editor && (- <PublicDocumentProvider- value={{- publicDocumentUuid: uuid,- publicDocument: document,- publicDocumentCards: document.cards,- }}- >+ <ExternalCardDataProvider value={externalCardDataValue}><Box maw={900} mx="auto" p="xl" w="100%"><h1 style={{ marginBottom: "1rem" }}>{document.name}</h1><div className={S.editorContent}><EditorContent data-testid="document-content" editor={editor} /></div></Box>- </PublicDocumentProvider>+ </ExternalCardDataProvider>)}</LoadingAndErrorWrapper></EmbedFrame>diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsxindex ee789c807ac..19a88917435 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx@@ -5,8 +5,8 @@ import { DASHBOARD_DISPLAY_ACTIONS } from "metabase/dashboard/components/Dashboaimport { useDashboardLocationSync } from "metabase/dashboard/containers/DashboardApp/use-dashboard-location-sync";import { DashboardContextProvider } from "metabase/dashboard/context";import { useDashboardUrlQuery } from "metabase/dashboard/hooks/use-dashboard-url-query";+import { LocaleProvider } from "metabase/embedding/LocaleProvider";import { EmbeddingEntityContextProvider } from "metabase/embedding/context";-import { LocaleProvider } from "metabase/public/LocaleProvider";import { useEmbedFrameOptions, useSetEmbedFont } from "metabase/public/hooks";import { useDispatch, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-card-filters.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-card-filters.stories.tsxindex d856f26ee76..c68c54f9057 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-card-filters.stories.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-card-filters.stories.tsx@@ -7,11 +7,11 @@ import { getStore } from "__support__/entities-store";import { getNextId } from "__support__/utils";import { NumberColumn, StringColumn } from "__support__/visualizations";import { Api } from "metabase/api";-import { Heading } from "metabase/dashboard/visualizations/Heading";import {MockDashboardContext,type MockDashboardContextProps,-} from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+} from "metabase/dashboard/context/mock-context";+import { Heading } from "metabase/dashboard/visualizations/Heading";import { publicReducers } from "metabase/reducers-public";import { MetabaseReduxProvider } from "metabase/redux";import {diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsxindex fa08a8c7c2d..d8b68ef18aa 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx@@ -13,7 +13,7 @@ import { DASHBOARD_DISPLAY_ACTIONS } from "metabase/dashboard/components/Dashboaimport {MockDashboardContext,type MockDashboardContextProps,-} from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+} from "metabase/dashboard/context/mock-context";import { publicReducers } from "metabase/reducers-public";import { MetabaseReduxProvider } from "metabase/redux";import {diff --git a/frontend/src/metabase/visualizations/visualizations/Map/GridMapPdfExport.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-pdf-export.stories.tsxsimilarity index 98%rename from frontend/src/metabase/visualizations/visualizations/Map/GridMapPdfExport.stories.tsxrename to frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-pdf-export.stories.tsxindex 4beb405ce28..1ce73ec5992 100644--- a/frontend/src/metabase/visualizations/visualizations/Map/GridMapPdfExport.stories.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-pdf-export.stories.tsx@@ -9,11 +9,11 @@ import { createWaitForResizeToStopDecorator } from "__support__/storybook";import { getNextId } from "__support__/utils";import { Api } from "metabase/api";import { DASHBOARD_DISPLAY_ACTIONS } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/constants";-import { PublicOrEmbeddedDashboardView } from "metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView";import {MockDashboardContext,type MockDashboardContextProps,-} from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+} from "metabase/dashboard/context/mock-context";+import { PublicOrEmbeddedDashboardView } from "metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView";import { publicReducers } from "metabase/reducers-public";import { MetabaseReduxProvider } from "metabase/redux";import {@@ -23,6 +23,7 @@ import {} from "metabase/redux/store/mocks";import MetabaseSettings from "metabase/utils/settings";import { registerVisualization } from "metabase/visualizations";+import { Map } from "metabase/visualizations/visualizations/Map";import type { Dashboard } from "metabase-types/api";import {createMockCard,@@ -34,8 +35,6 @@ import {createMockDatasetData,} from "metabase-types/api/mocks";-import { Map } from "./index";-// @ts-expect-error: incompatible prop types with registerVisualizationregisterVisualization(Map);diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsxindex d5bd0633d25..1de272d7777 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx@@ -14,7 +14,7 @@ import { DASHBOARD_DISPLAY_ACTIONS } from "metabase/dashboard/components/Dashboaimport {MockDashboardContext,type MockDashboardContextProps,-} from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+} from "metabase/dashboard/context/mock-context";import { publicReducers } from "metabase/reducers-public";import { MetabaseReduxProvider } from "metabase/redux";import {diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.tsxindex eef2fbae880..6e6213ad04e 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.tsx@@ -6,9 +6,9 @@ import DashboardS from "metabase/css/dashboard.module.css";import { Dashboard } from "metabase/dashboard/components/Dashboard";import { DashboardHeaderButtonRow } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow";import { useDashboardContext } from "metabase/dashboard/context";+import { getTabHiddenParameterSlugs } from "metabase/embedding/lib/tab-parameters";+import type { DisplayTheme } from "metabase/embedding/types";import { usePageTitle } from "metabase/hooks/use-page-title";-import { getTabHiddenParameterSlugs } from "metabase/public/lib/tab-parameters";-import type { DisplayTheme } from "metabase/public/lib/types";import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";import { isWithinIframe } from "metabase/utils/iframe";diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.tsxindex 52f641cf9d7..02726a70c2a 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.tsx@@ -4,9 +4,9 @@ import { useLatest, useMount } from "react-use";import { applyParameters } from "metabase/common/utils/card";import { fetchDataOrError } from "metabase/dashboard/utils";+import { LocaleProvider } from "metabase/embedding/LocaleProvider";import { EmbeddingEntityContextProvider } from "metabase/embedding/context";import { getParameterValuesByIdFromQueryParams } from "metabase/parameters/utils/parameter-parsing";-import { LocaleProvider } from "metabase/public/LocaleProvider";import { useEmbedFrameOptions } from "metabase/public/hooks";import { usePublicEndpoints } from "metabase/public/hooks/use-public-endpoints";import { useSetEmbedFont } from "metabase/public/hooks/use-set-embed-font";diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.tsxindex 8ee839e3828..173f4be0f3a 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.tsx@@ -4,12 +4,12 @@ import type { Dispatch, SetStateAction } from "react";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";-import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";-import { EmbedFrame } from "metabase/public/components/EmbedFrame";import type {DisplayTheme,EmbedResourceDownloadOptions,-} from "metabase/public/lib/types";+} from "metabase/embedding/types";+import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";+import { EmbedFrame } from "metabase/public/components/EmbedFrame";import { PublicOrEmbeddedQuestionDownloadPopover } from "metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover";import { PublicMode } from "metabase/visualizations/click-actions/modes/PublicMode";import Visualization from "metabase/visualizations/components/Visualization";diff --git a/frontend/src/metabase/public/contexts/PublicDocumentContext.tsx b/frontend/src/metabase/public/contexts/PublicDocumentContext.tsxdeleted file mode 100644index 2e651f703dc..00000000000--- a/frontend/src/metabase/public/contexts/PublicDocumentContext.tsx+++ /dev/null@@ -1,17 +0,0 @@-import { createContext, useContext } from "react";--import type { Card, Document } from "metabase-types/api";--interface PublicDocumentContextValue {- publicDocumentUuid?: string;- publicDocument?: Document;- publicDocumentCards?: Record<number, Card>;-}--const PublicDocumentContext = createContext<PublicDocumentContextValue>({});--export const PublicDocumentProvider = PublicDocumentContext.Provider;--export function usePublicDocumentContext() {- return useContext(PublicDocumentContext);-}diff --git a/frontend/src/metabase/public/hooks/use-embed-frame-options.ts b/frontend/src/metabase/public/hooks/use-embed-frame-options.tsindex a32da20d106..577f8daa3db 100644--- a/frontend/src/metabase/public/hooks/use-embed-frame-options.ts+++ b/frontend/src/metabase/public/hooks/use-embed-frame-options.ts@@ -2,12 +2,12 @@ import type { Location } from "history";import { useEffect } from "react";import { useDocsUrl } from "metabase/common/hooks";+import type { EmbeddingHashOptions } from "metabase/embedding/types";import { PLUGIN_RESOURCE_DOWNLOADS } from "metabase/plugins";import { parseHashOptions } from "metabase/utils/browser";import { isWithinIframe } from "metabase/utils/iframe";import { DEFAULT_EMBED_DISPLAY_PARAMS } from "../constants";-import type { EmbeddingHashOptions } from "../lib/types";export const useEmbedFrameOptions = ({ location }: { location: Location }) => {const {diff --git a/frontend/src/metabase/public/hooks/use-set-embed-font.ts b/frontend/src/metabase/public/hooks/use-set-embed-font.tsindex 0cc925e3242..cad240dd9a1 100644--- a/frontend/src/metabase/public/hooks/use-set-embed-font.ts+++ b/frontend/src/metabase/public/hooks/use-set-embed-font.ts@@ -1,7 +1,7 @@import type { Location } from "history";import { useEffect } from "react";-import type { EmbeddingHashOptions } from "metabase/public/lib/types";+import type { EmbeddingHashOptions } from "metabase/embedding/types";import { useDispatch } from "metabase/redux";import { setOptions } from "metabase/redux/embed";import { parseHashOptions } from "metabase/utils/browser";diff --git a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsxindex f8d1f102a3d..cf32e1d9d39 100644--- a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx+++ b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx@@ -8,12 +8,12 @@ import { useGetDefaultCollectionId } from "metabase/collections/hooks";import { Modal } from "metabase/common/components/Modal";import { SaveQuestionModal } from "metabase/common/components/SaveQuestionModal";import { type ToastArgs, useToast } from "metabase/common/hooks";+import { QuestionEmbedWidget } from "metabase/embedding/components/QuestionEmbedWidget";import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";import { QuestionAlertListModal } from "metabase/notifications/modals";import { setArchivedQuestion } from "metabase/query_builder/actions";import { ImpossibleToCreateModelModal } from "metabase/query_builder/components/ImpossibleToCreateModelModal";import { NewDatasetModal } from "metabase/query_builder/components/NewDatasetModal";-import { QuestionEmbedWidget } from "metabase/query_builder/components/QuestionEmbedWidget";import { PreviewQueryModal } from "metabase/query_builder/components/view/PreviewQueryModal";import { getQuestionWithoutComposing } from "metabase/query_builder/selectors";import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.tsx b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.tsxindex 8f34d2ef779..d3d09e0102a 100644--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.tsx+++ b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.tsx@@ -2,10 +2,10 @@ import { Component } from "react";import { t } from "ttag";import _ from "underscore";+import type { EmbeddingParameterVisibility } from "metabase/embedding/types";import { TemporalUnitSettings } from "metabase/parameters/components/TemporalUnitSettings";import { ValuesSourceSettings } from "metabase/parameters/components/ValuesSourceSettings";import { isSingleOrMultiSelectable } from "metabase/parameters/utils/parameter-type";-import type { EmbeddingParameterVisibility } from "metabase/public/lib/types";import { setTemplateTagConfig } from "metabase/query_builder/actions";import { getOriginalQuestion } from "metabase/query_builder/selectors";import { type DispatchFn, connect } from "metabase/redux";diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorSidebar.tsx b/frontend/src/metabase/query_builder/components/template_tags/TagEditorSidebar.tsxindex 1e37cf6943e..7c7b1c3b3cd 100644--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/template_tags/TagEditorSidebar.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import _ from "underscore";import { SidebarContent } from "metabase/common/components/SidebarContent";-import type { EmbeddingParameterVisibility } from "metabase/public/lib/types";+import type { EmbeddingParameterVisibility } from "metabase/embedding/types";import { Box, Tabs } from "metabase/ui";import type Question from "metabase-lib/v1/Question";import type Database from "metabase-lib/v1/metadata/Database";diff --git a/frontend/src/metabase/query_builder/components/view/View/NativeQueryRightSidebar/NativeQueryRightSidebar.tsx b/frontend/src/metabase/query_builder/components/view/View/NativeQueryRightSidebar/NativeQueryRightSidebar.tsxindex c5a837158f2..071fc866a4a 100644--- a/frontend/src/metabase/query_builder/components/view/View/NativeQueryRightSidebar/NativeQueryRightSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/view/View/NativeQueryRightSidebar/NativeQueryRightSidebar.tsx@@ -1,7 +1,7 @@import { match } from "ts-pattern";+import type { EmbeddingParameterVisibility } from "metabase/embedding/types";import { AIQuestionAnalysisSidebar } from "metabase/metabot/components/AIQuestionAnalysisSidebar";-import type { EmbeddingParameterVisibility } from "metabase/public/lib/types";import { TagEditorSidebar } from "metabase/query_builder/components/template_tags/TagEditorSidebar";import { QuestionInfoSidebar } from "metabase/query_builder/components/view/sidebars/QuestionInfoSidebar";import { QuestionSettingsSidebar } from "metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar";diff --git a/frontend/src/metabase/embedding/components/SharingMenu/test/QuestionSharingMenu.enterprise.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.enterprise.unit.spec.tsxsimilarity index 98%rename from frontend/src/metabase/embedding/components/SharingMenu/test/QuestionSharingMenu.enterprise.unit.spec.tsxrename to frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.enterprise.unit.spec.tsxindex b92c4d3032e..bb9718ec576 100644--- a/frontend/src/metabase/embedding/components/SharingMenu/test/QuestionSharingMenu.enterprise.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.enterprise.unit.spec.tsx@@ -3,7 +3,7 @@ import userEvent from "@testing-library/user-event";import { screen } from "__support__/ui";import { createMockCollection } from "metabase-types/api/mocks";-import { setupQuestionSharingMenu } from "./setup";+import { setupQuestionSharingMenu } from "./tests/setup";describe("QuestionSharingMenu > Enterprise", () => {describe("non-admins", () => {diff --git a/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.tsxsimilarity index 74%rename from frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsxrename to frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.tsxindex 7f01c130bf7..c6e50d34521 100644--- a/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.tsx@@ -2,7 +2,15 @@ import { t } from "ttag";import { isInstanceAnalyticsCollection } from "metabase/collections/utils";import { useSetting } from "metabase/common/hooks";+import { EmbedMenuItem } from "metabase/embedding/components/SharingMenu/MenuItems/EmbedMenuItem";+import { PublicLinkMenuItem } from "metabase/embedding/components/SharingMenu/MenuItems/PublicLinkMenuItem";+import {+ SharingButton,+ SharingMenu,+} from "metabase/embedding/components/SharingMenu/SharingMenu";+import type { QuestionSharingModalType } from "metabase/embedding/components/SharingMenu/types";import { GUEST_EMBED_EMBEDDING_TYPE } from "metabase/embedding/constants";+import { useSharingModal } from "metabase/embedding/hooks/use-sharing-modal";import { MODAL_TYPES } from "metabase/querying/constants";import { useDispatch, useSelector } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";@@ -10,16 +18,10 @@ import {canManageSubscriptions as canManageSubscriptionsSelector,getUserIsAdmin,} from "metabase/selectors/user";-import { Flex } from "metabase/ui";+import { Box, Flex } from "metabase/ui";import type Question from "metabase-lib/v1/Question";-import { useSharingModal } from "../../hooks/use-sharing-modal";--import { EmbedMenuItem } from "./MenuItems/EmbedMenuItem";-import { PublicLinkMenuItem } from "./MenuItems/PublicLinkMenuItem";-import { PublicLinkModals } from "./PublicLinkModals";-import { SharingButton, SharingMenu } from "./SharingMenu";-import type { QuestionSharingModalType } from "./types";+import { QuestionPublicLinkPopover } from "../../../../sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover";export function QuestionSharingMenu({ question }: { question: Question }) {const dispatch = useDispatch();@@ -77,9 +79,10 @@ export function QuestionSharingMenu({ question }: { question: Question }) {tooltip={t`Public link`}onClick={() => setModalType("question-public-link")}/>- <PublicLinkModals- modalType={modalType}+ <QuestionPublicLinkPopoverquestion={question}+ target={<Box h="2rem" />}+ isOpen={modalType === "question-public-link"}onClose={() => setModalType(null)}/></Flex>@@ -97,9 +100,10 @@ export function QuestionSharingMenu({ question }: { question: Question }) {onClick={() => setModalType(GUEST_EMBED_EMBEDDING_TYPE)}/></SharingMenu>- <PublicLinkModals- modalType={modalType}+ <QuestionPublicLinkPopoverquestion={question}+ target={<Box h="2rem" />}+ isOpen={modalType === "question-public-link"}onClose={() => setModalType(null)}/></Flex>diff --git a/frontend/src/metabase/embedding/components/SharingMenu/test/QuestionSharingMenu.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.unit.spec.tsxsimilarity index 98%rename from frontend/src/metabase/embedding/components/SharingMenu/test/QuestionSharingMenu.unit.spec.tsxrename to frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.unit.spec.tsxindex 9fe49d281da..75a980cf7e0 100644--- a/frontend/src/metabase/embedding/components/SharingMenu/test/QuestionSharingMenu.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.unit.spec.tsx@@ -2,7 +2,7 @@ import userEvent from "@testing-library/user-event";import { screen } from "__support__/ui";-import { openMenu, setupQuestionSharingMenu } from "./setup";+import { openMenu, setupQuestionSharingMenu } from "./tests/setup";describe("QuestionSharingMenu", () => {it("should not render anything if the question is a model", async () => {diff --git a/frontend/src/metabase/embedding/components/SharingMenu/test/setup.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/tests/setup.tsxsimilarity index 67%rename from frontend/src/metabase/embedding/components/SharingMenu/test/setup.tsxrename to frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/tests/setup.tsxindex ada2f2c173a..7c117527139 100644--- a/frontend/src/metabase/embedding/components/SharingMenu/test/setup.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/tests/setup.tsx@@ -1,5 +1,3 @@-/* eslint-disable i18next/no-literal-string */-import userEvent from "@testing-library/user-event";import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";@@ -13,27 +11,19 @@ import { setupListNotificationEndpoints } from "__support__/server-mocks/notificimport { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { useSelector } from "metabase/redux";-import type { DashboardState } from "metabase/redux/store/dashboard";-import {- createMockDashboardState,- createMockState,-} from "metabase/redux/store/mocks";+import { createMockState } from "metabase/redux/store/mocks";import { checkNotNull } from "metabase/utils/types";import Question from "metabase-lib/v1/Question";-import type { Card, Dashboard, Notification, User } from "metabase-types/api";+import type { Card, Notification, User } from "metabase-types/api";import {createMockCard,- createMockDashboard,- createMockDashboardCard,createMockSettings,createMockTokenFeatures,createMockUser,} from "metabase-types/api/mocks";-import { DashboardSharingMenu } from "../DashboardSharingMenu";import { QuestionSharingMenu } from "../QuestionSharingMenu";-// This is a fake sidebar that we can use to check if the correct redux state is getting updatedconst FakeSidebar = () => {const sidebar = useSelector((state) => state.dashboard.sidebar);@@ -53,7 +43,6 @@ type SettingsProps = {canManageSubscriptions?: boolean;isEnterprise?: boolean;card?: Card;- dashboardState?: Partial<DashboardState>;};const setupState = ({@@ -65,7 +54,6 @@ const setupState = ({canManageSubscriptions = false,isEnterprise = false,card,- dashboardState,}: SettingsProps) => {const tokenFeatures = createMockTokenFeatures({advanced_permissions: isEnterprise,@@ -90,7 +78,7 @@ const setupState = ({is_superuser: isAdmin,});- const state = createMockState({+ return createMockState({settings: mockSettings(settingValues),currentUser: {...user,@@ -101,64 +89,9 @@ const setupState = ({card,},} as User,- dashboard: createMockDashboardState(dashboardState),});-- return state;};-export function setupDashboardSharingMenu({- isPublicSharingEnabled = false,- isEmbeddingEnabled = false,- isEmailSetup = false,- isSlackSetup = false,- isAdmin = false,- canManageSubscriptions = false,- isEnterprise = false,- hasPublicLink = false,- dashboard: dashboardOverrides = {},- dashboardState,-}: {- dashboard?: Partial<Dashboard>;- hasPublicLink?: boolean;-} & SettingsProps) {- const dashboard = createMockDashboard({- name: "My Cool Dashboard",- public_uuid: hasPublicLink && isPublicSharingEnabled ? "1337bad801" : null,- dashcards: [- createMockDashboardCard({- card: createMockCard({ display: "pie" }),- }),- ],- ...dashboardOverrides,- });-- const state = setupState({- isPublicSharingEnabled,- isEmbeddingEnabled,- isEmailSetup,- isSlackSetup,- isAdmin,- canManageSubscriptions,- isEnterprise,- dashboardState,- });-- if (isEnterprise) {- setupEnterpriseOnlyPlugin("audit_app");- setupEnterpriseOnlyPlugin("application_permissions");- setupEnterpriseOnlyPlugin("collections");- }-- renderWithProviders(- <div>- <DashboardSharingMenu dashboard={dashboard} />- <FakeSidebar />- </div>,- { storeInitialState: state },- );-}-export function setupQuestionSharingMenu({isPublicSharingEnabled = false,isEmbeddingEnabled = false,diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsxindex ce37ecba4f4..57e5f15a502 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx@@ -3,7 +3,6 @@ import type React from "react";import { useCallback } from "react";import { t } from "ttag";-import { QuestionSharingMenu } from "metabase/embedding/components/SharingMenu";import { AIQuestionAnalysisButton } from "metabase/metabot/components/AIQuestionAnalysisButton";import { canAnalyzeQuestion } from "metabase/metabot/utils/chart-analysis";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";@@ -28,6 +27,8 @@ import { QuestionNotebookButton } from "../QuestionNotebookButton";import { QuestionSummarizeWidget } from "../QuestionSummarizeWidget";import { ToggleNativeQueryPreview } from "../ToggleNativeQueryPreview";+import { QuestionSharingMenu } from "./QuestionSharingMenu/QuestionSharingMenu";+interface ViewTitleHeaderRightSideProps {question: Question;result: Dataset;diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsxindex 7a39d450cb0..08cd46a7395 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsx@@ -8,13 +8,13 @@ import { DateTime } from "metabase/common/components/DateTime";import { Link } from "metabase/common/components/Link";import { SidesheetCardSection } from "metabase/common/components/Sidesheet";import Styles from "metabase/css/core/index.css";-import { QuestionPublicLinkPopover } from "metabase/embedding/components/PublicLinkPopover";import { Box, Flex, FixedSizeIcon as Icon, Loader, Text } from "metabase/ui";import * as Urls from "metabase/urls";import { getUserName } from "metabase/utils/user";import type Question from "metabase-lib/v1/Question";import SidebarStyles from "./QuestionInfoSidebar.module.css";+import { QuestionPublicLinkPopover } from "./QuestionPublicLinkPopover/QuestionPublicLinkPopover";import { QuestionSources } from "./components/QuestionSources";export const QuestionDetails = ({ question }: { question: Question }) => {diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.tsxsimilarity index 92%rename from frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.tsxrename to frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.tsxindex e1d00b3668b..e10f683c805 100644--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.tsx@@ -5,15 +5,14 @@ import {useDeleteCardPublicLinkMutation,} from "metabase/api";import { type ExportFormat, exportFormats } from "metabase/common/types/export";+import { PublicLinkPopover } from "metabase/embedding/components/PublicLinkPopover/PublicLinkPopover";import {trackPublicLinkCopied,trackPublicLinkRemoved,-} from "metabase/public/lib/analytics";+} from "metabase/embedding/lib/analytics";import { publicQuestion as getPublicQuestionUrl } from "metabase/urls";import type Question from "metabase-lib/v1/Question";-import { PublicLinkPopover } from "./PublicLinkPopover";-export const QuestionPublicLinkPopover = ({question,target,diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.unit.spec.tsxrename to frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.unit.spec.tsxdiff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsxindex 3994d6a5ea4..9a4dd5656bd 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx@@ -24,11 +24,13 @@ import {} from "metabase/documents/analytics";import { EDITOR_STYLE_BOUNDARY_CLASS } from "metabase/documents/components/Editor/constants";import { MAX_GROUP_SIZE } from "metabase/documents/constants";+import { useExternalCardData } from "metabase/documents/contexts/ExternalCardDataContext";import {loadMetadataForDocumentCard,openVizSettingsSidebar,} from "metabase/documents/documents.slice";import { useCardData } from "metabase/documents/hooks/use-card-data";+import { useExternalCardDataLoader } from "metabase/documents/hooks/use-external-card-data";import { useUnresolvedCommentsCount } from "metabase/documents/hooks/use-unresolved-comments-count";import {getChildTargetId,@@ -36,8 +38,6 @@ import {getHasUnsavedChanges,getHoveredChildTargetId,} from "metabase/documents/selectors";-import { usePublicDocumentContext } from "metabase/public/contexts/PublicDocumentContext";-import { usePublicDocumentCardData } from "metabase/public/hooks/use-public-document-card-data";import { useDispatch, useSelector } from "metabase/redux";import { DropZone } from "metabase/rich_text_editing/tiptap/extensions/shared/dnd/DropZone";import { getMetadata } from "metabase/selectors/metadata";@@ -72,7 +72,7 @@ import { useDndHelpers } from "../shared/dnd/use-dnd-helpers";import { CardEmbedMenuDropdown } from "./CardEmbedMenuDropdown";import styles from "./CardEmbedNode.module.css";-import { PublicDocumentCardMenu } from "./PublicDocumentCardMenu";+import { ExternalDocumentCardMenu } from "./ExternalDocumentCardMenu";import { ModifyQuestionModal } from "./modals/ModifyQuestionModal";import { useUpdateCardOperations } from "./use-update-card-operations";import { getEmbedIndex } from "./utils";@@ -178,7 +178,7 @@ export const CardEmbedComponent = memo(const childTargetId = useSelector(getChildTargetId);const hoveredChildTargetId = useSelector(getHoveredChildTargetId);const document = useSelector(getCurrentDocument);- const { publicDocumentUuid } = usePublicDocumentContext();+ const externalCardData = useExternalCardData();const { _id } = node.attrs;const unresolvedCommentsCount = useUnresolvedCommentsCount(_id);@@ -202,16 +202,13 @@ export const CardEmbedComponent = memo(const embedIndex = getEmbedIndex(editor, getPos);- // Use public hook when viewing a public document, otherwise use regular hook- const isPublicDocument = Boolean(publicDocumentUuid);+ // Use external hook when viewing an externally-rendered document (e.g. public), otherwise use regular hook+ const isExternalDocument = externalCardData != null;const regularCardData = useCardData({ id });- const publicCardData = usePublicDocumentCardData({- cardId: id,- documentUuid: publicDocumentUuid || "",- });+ const externalCardDataResult = useExternalCardDataLoader(id);- const { card, dataset, isLoading, series, error } = isPublicDocument- ? publicCardData+ const { card, dataset, isLoading, series, error } = isExternalDocument+ ? externalCardDataResult: regularCardData;const metadata = useSelector(getMetadata);@@ -554,10 +551,10 @@ export const CardEmbedComponent = memo(fw={700}truncate="end"onClick={- isPublicDocument ? undefined : handleTitleClick+ isExternalDocument ? undefined : handleTitleClick}style={{- cursor: isPublicDocument ? undefined : "pointer",+ cursor: isExternalDocument ? undefined : "pointer",}}>{displayName}@@ -594,9 +591,9 @@ export const CardEmbedComponent = memo(</Box>)}{!isEditingTitle &&- (isPublicDocument && dataset && !canWrite ? (- <PublicDocumentCardMenu card={card} dataset={dataset} />- ) : !isPublicDocument && (canWrite || dataset) ? (+ (isExternalDocument && dataset && !canWrite ? (+ <ExternalDocumentCardMenu card={card} dataset={dataset} />+ ) : !isExternalDocument && (canWrite || dataset) ? (<MenuwithinPortalposition="bottom-end"@@ -658,13 +655,13 @@ export const CardEmbedComponent = memo(metadata={metadata}mode={DocumentMode}onChangeCardAndRun={- isPublicDocument ? undefined : handleChangeCardAndRun+ isExternalDocument ? undefined : handleChangeCardAndRun}onUpdateQuestion={- isPublicDocument ? undefined : handleUpdateQuestion+ isExternalDocument ? undefined : handleUpdateQuestion}onUpdateVisualizationSettings={- isPublicDocument+ isExternalDocument? undefined: handleUpdateVisualizationSettings}diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/PublicDocumentCardMenu.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/ExternalDocumentCardMenu.tsxsimilarity index 88%rename from frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/PublicDocumentCardMenu.tsxrename to frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/ExternalDocumentCardMenu.tsxindex 6730b30a390..c3ddcdd9ceb 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/PublicDocumentCardMenu.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/ExternalDocumentCardMenu.tsx@@ -5,7 +5,7 @@ import { t } from "ttag";import { QuestionDownloadWidget } from "metabase/common/components/QuestionDownloadWidget";import { useDownloadData } from "metabase/common/components/QuestionDownloadWidget/use-download-data";-import { usePublicDocumentContext } from "metabase/public/contexts/PublicDocumentContext";+import { useExternalCardData } from "metabase/documents/contexts/ExternalCardDataContext";import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { ActionIcon, Icon, Menu } from "metabase/ui";@@ -14,16 +14,16 @@ import { SAVING_DOM_IMAGE_HIDDEN_CLASS } from "metabase/visualizations/lib/save-import Question from "metabase-lib/v1/Question";import type { Card, Dataset } from "metabase-types/api";-type PublicDocumentCardMenuProps = {+type ExternalDocumentCardMenuProps = {card: Card;dataset: Dataset;};-export const PublicDocumentCardMenu = ({+export const ExternalDocumentCardMenu = ({card,dataset,-}: PublicDocumentCardMenuProps) => {- const { publicDocumentUuid } = usePublicDocumentContext();+}: ExternalDocumentCardMenuProps) => {+ const externalCardData = useExternalCardData();const [menuView, setMenuView] = useState<string | null>(null);const [isOpen, { close, toggle }] = useDisclosure(false, {onClose: () => {@@ -40,7 +40,7 @@ export const PublicDocumentCardMenu = ({const [{ loading: isDownloadingData }, handleDownload] = useDownloadData({question: question,result: dataset,- documentUuid: checkNotNull(publicDocumentUuid),+ documentUuid: checkNotNull(externalCardData).documentUuid,});return (diff --git a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.unit.spec.js b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.unit.spec.jsindex a7538aa7731..24e76ba190d 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.unit.spec.js+++ b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.unit.spec.js@@ -3,7 +3,7 @@ import userEvent from "@testing-library/user-event";import { renderWithProviders, screen, within } from "__support__/ui";import { DashboardChartSettings } from "metabase/dashboard/components/DashboardChartSettings";-import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import registerVisualizations from "metabase/visualizations/register";import { createMockCard } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/visualizations/lib/exports-branding-utils.tsx b/frontend/src/metabase/visualizations/lib/exports-branding-utils.tsxindex dd495091ddd..d3afeab491e 100644--- a/frontend/src/metabase/visualizations/lib/exports-branding-utils.tsx+++ b/frontend/src/metabase/visualizations/lib/exports-branding-utils.tsx@@ -1,7 +1,7 @@import ReactDOMServer from "react-dom/server";import { t } from "ttag";-import BrandingLogo from "metabase/public/components/EmbedFrame/LogoBadge/metabase_logo_with_text.svg?component";+import BrandingLogo from "metabase/embedding/components/LogoBadge/metabase_logo_with_text.svg?component";type BrandingSize = "xs" | "s" | "m" | "l" | "xl" | "xxl" | "xxxl";diff --git a/frontend/src/metabase/visualizations/lib/image-exports.ts b/frontend/src/metabase/visualizations/lib/image-exports.tsindex d890e93ad04..5356ab59c3e 100644--- a/frontend/src/metabase/visualizations/lib/image-exports.ts+++ b/frontend/src/metabase/visualizations/lib/image-exports.ts@@ -2,9 +2,9 @@import { css } from "@emotion/react";import GlobalDashboardS from "metabase/css/dashboard.module.css";+import EmbedFrameS from "metabase/embedding/theme.module.css";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { isStorybookActive } from "metabase/env";-import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";import { utf8_to_b64 } from "metabase/utils/encoding";import { openImageBlobOnStorybook } from "metabase/utils/loki-utils";diff --git a/frontend/src/metabase/visualizations/lib/save-chart-image.ts b/frontend/src/metabase/visualizations/lib/save-chart-image.tsindex 813e793e2ed..03ade07d763 100644--- a/frontend/src/metabase/visualizations/lib/save-chart-image.ts+++ b/frontend/src/metabase/visualizations/lib/save-chart-image.ts@@ -1,5 +1,5 @@+import EmbedFrameS from "metabase/embedding/theme.module.css";import { isStorybookActive } from "metabase/env";-import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";import { openImageBlobOnStorybook } from "metabase/utils/loki-utils";import {