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
Fix embedding hub violations (#73076)
Fraser5ac5c57af21c
diff --git a/frontend/src/embedding-sdk-bundle/components/public/CreateDashboardModal/CreateDashboardModal.tsx b/frontend/src/embedding-sdk-bundle/components/public/CreateDashboardModal/CreateDashboardModal.tsxindex 789d56831e4..bee49ff0dc5 100644--- a/frontend/src/embedding-sdk-bundle/components/public/CreateDashboardModal/CreateDashboardModal.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/CreateDashboardModal/CreateDashboardModal.tsx@@ -7,8 +7,8 @@ import type {MetabaseDashboard,SdkCollectionId,} from "embedding-sdk-bundle/types";+import { CreateDashboardModal as CreateDashboardModalCore } from "metabase/common/CreateDashboard/CreateDashboardModal";import { useCollectionQuery, useLocale } from "metabase/common/hooks";-import { CreateDashboardModal as CreateDashboardModalCore } from "metabase/dashboard/containers/CreateDashboardModal";import { useSelector } from "metabase/redux";import { createDashboardModalSchema } from "./CreateDashboardModal.schema";diff --git a/frontend/src/embedding-sdk-bundle/types/dashboard.ts b/frontend/src/embedding-sdk-bundle/types/dashboard.tsindex 41dd42a262e..fa947437946 100644--- a/frontend/src/embedding-sdk-bundle/types/dashboard.ts+++ b/frontend/src/embedding-sdk-bundle/types/dashboard.ts@@ -2,7 +2,7 @@ import type {MetabaseCollection,SdkCollectionId,} from "embedding-sdk-bundle/types/collection";-import type { CreateDashboardProperties } from "metabase/dashboard/containers/CreateDashboardForm";+import type { CreateDashboardProperties } from "metabase/common/CreateDashboard/CreateDashboardForm";import type { CardDisplayType } from "metabase-types/api";import type { SdkEntityId, SdkEntityToken } from "./entity";diff --git a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsxindex dae70f2832e..59172e569bb 100644--- a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx+++ b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx@@ -13,8 +13,8 @@ import { GenericError } from "metabase/common/components/ErrorPages";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";-import { ReturnToSetupGuideModal } from "metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal";-import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/embedding-hub/constants";+import { ReturnToSetupGuideModal } from "metabase/embedding/components/ReturnToSetupGuideModal";+import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/constants";import { usePageTitle } from "metabase/hooks/use-page-title";import {PLUGIN_DATABASE_REPLICATION,diff --git a/frontend/src/metabase/admin/databases/hooks/use-database-connection.ts b/frontend/src/metabase/admin/databases/hooks/use-database-connection.tsindex d728cff072c..a4dbf4c2c85 100644--- a/frontend/src/metabase/admin/databases/hooks/use-database-connection.ts+++ b/frontend/src/metabase/admin/databases/hooks/use-database-connection.ts@@ -3,7 +3,7 @@ import { t } from "ttag";import { skipToken, useGetDatabaseQuery } from "metabase/api";import { getDefaultEngineKey } from "metabase/databases/utils/engine";-import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/embedding-hub/constants";+import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/constants";import { PLUGIN_DB_ROUTING } from "metabase/plugins";import { useDispatch } from "metabase/redux";import type { DatabaseId, Engine, EngineKey } from "metabase-types/api";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubAdminSettingsPage.tsx b/frontend/src/metabase/admin/embedding/embedding-hub/EmbeddingHubAdminSettingsPage.tsxsimilarity index 93%rename from frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubAdminSettingsPage.tsxrename to frontend/src/metabase/admin/embedding/embedding-hub/EmbeddingHubAdminSettingsPage.tsxindex c5aa4eb07e6..a8c21689015 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubAdminSettingsPage.tsx+++ b/frontend/src/metabase/admin/embedding/embedding-hub/EmbeddingHubAdminSettingsPage.tsx@@ -5,10 +5,9 @@ import {getModularEmbeddingRelatedSettingItems,} from "metabase/admin/components/RelatedSettingsSection";import { useHasTokenFeature, useSetting } from "metabase/common/hooks";+import { EmbeddingHub } from "metabase/embedding/embedding-hub";import { Stack, Text, Title } from "metabase/ui";-import { EmbeddingHub } from "./EmbeddingHub";-export const EmbeddingHubAdminSettingsPage = () => {const isUsingTenants = useSetting("use-tenants");const hasSimpleEmbedding = useHasTokenFeature("embedding_simple");diff --git a/frontend/src/metabase/admin/embedding/embedding-hub/index.ts b/frontend/src/metabase/admin/embedding/embedding-hub/index.tsnew file mode 100644index 00000000000..4144bafd687--- /dev/null+++ b/frontend/src/metabase/admin/embedding/embedding-hub/index.ts@@ -0,0 +1 @@+export { EmbeddingHubAdminSettingsPage } from "./EmbeddingHubAdminSettingsPage";diff --git a/frontend/src/metabase/admin/routes.tsx b/frontend/src/metabase/admin/routes.tsxindex 74a7aa81476..fe88c9e0cd4 100644--- a/frontend/src/metabase/admin/routes.tsx+++ b/frontend/src/metabase/admin/routes.tsx@@ -17,6 +17,7 @@ import { SegmentListApp } from "metabase/admin/datamodel/containers/SegmentListAimport { EmbeddingThemeEditorApp } from "metabase/admin/embedding/components/ThemeEditor";import { EmbeddingThemeListingApp } from "metabase/admin/embedding/components/ThemeListing";import { AdminEmbeddingApp } from "metabase/admin/embedding/containers/AdminEmbeddingApp";+import { EmbeddingHubAdminSettingsPage } from "metabase/admin/embedding/embedding-hub";import { AdminPeopleApp } from "metabase/admin/people/containers/AdminPeopleApp";import { EditUserModal } from "metabase/admin/people/containers/EditUserModal";import { GroupDetailApp } from "metabase/admin/people/containers/GroupDetailApp";@@ -43,7 +44,6 @@ import {ModelCacheRefreshJobModal,} from "metabase/admin/tools/components/ModelCacheRefreshJobs";import {- EmbeddingHubAdminSettingsPage,SetupPermissionsAndTenantsPage,SetupSsoPage,} from "metabase/embedding/embedding-hub";diff --git a/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsx b/frontend/src/metabase/common/CreateDashboard/CreateDashboardForm.tsxsimilarity index 98%rename from frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsxrename to frontend/src/metabase/common/CreateDashboard/CreateDashboardForm.tsxindex dd3d6adac16..d37b4d829ae 100644--- a/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsx+++ b/frontend/src/metabase/common/CreateDashboard/CreateDashboardForm.tsx@@ -6,6 +6,10 @@ import type { SdkCollectionId } from "embedding-sdk-bundle/types";import { useCreateDashboardMutation } from "metabase/api";import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker/FormCollectionPicker";import { FormFooter } from "metabase/common/components/FormFooter";+import {+ DASHBOARD_DESCRIPTION_MAX_LENGTH,+ DASHBOARD_NAME_MAX_LENGTH,+} from "metabase/common/utils/dashboard";import { Collections } from "metabase/entities/collections";import {Form,@@ -20,11 +24,6 @@ import { Button, Stack } from "metabase/ui";import * as Errors from "metabase/utils/errors";import type { CollectionId, Dashboard } from "metabase-types/api";-import {- DASHBOARD_DESCRIPTION_MAX_LENGTH,- DASHBOARD_NAME_MAX_LENGTH,-} from "../constants";-const DASHBOARD_SCHEMA = Yup.object({name: Yup.string().required(Errors.required)diff --git a/frontend/src/metabase/dashboard/containers/CreateDashboardModal.tsx b/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.tsxsimilarity index 100%rename from frontend/src/metabase/dashboard/containers/CreateDashboardModal.tsxrename to frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.tsxdiff --git a/frontend/src/metabase/dashboard/containers/CreateDashboardModal.unit.spec.tsx b/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/dashboard/containers/CreateDashboardModal.unit.spec.tsxrename to frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.unit.spec.tsxdiff --git a/frontend/src/metabase/common/utils/dashboard.ts b/frontend/src/metabase/common/utils/dashboard.tsnew file mode 100644index 00000000000..d7c2d6fb0e4--- /dev/null+++ b/frontend/src/metabase/common/utils/dashboard.ts@@ -0,0 +1,48 @@+import type {+ DashboardCard,+ DashboardCardLayoutAttrs,+ VirtualCard,+ VirtualCardDisplay,+} from "metabase-types/api";++export const DASHBOARD_NAME_MAX_LENGTH = 254;+export const DASHBOARD_DESCRIPTION_MAX_LENGTH = 1500;++let tempId = -1;++export function generateTemporaryDashcardId() {+ return tempId--;+}++export type NewDashboardCard = Omit<+ DashboardCard,+ "entity_id" | "created_at" | "updated_at"+>;++type MandatoryDashboardCardAttrs = Pick<+ DashboardCard,+ "dashboard_id" | "card"+> &+ DashboardCardLayoutAttrs;++export function createDashCard(+ attrs: Partial<NewDashboardCard> & MandatoryDashboardCardAttrs,+): NewDashboardCard {+ return {+ id: generateTemporaryDashcardId(),+ dashboard_tab_id: null,+ card_id: null,+ parameter_mappings: [],+ visualization_settings: {},+ ...attrs,+ };+}++export function createVirtualCard(display: VirtualCardDisplay): VirtualCard {+ return {+ name: null,+ display,+ visualization_settings: {},+ archived: false,+ };+}diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsxindex 254d292315c..32822be376e 100644--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx@@ -18,8 +18,8 @@ import { InsightsTabOrLink } from "metabase/common/components/Sidesheet/componenimport { SidesheetEditableDescription } from "metabase/common/components/Sidesheet/components/SidesheetEditableDescription";import SidesheetS from "metabase/common/components/Sidesheet/sidesheet.module.css";import { InsightsUpsellTab } from "metabase/common/components/upsells/InsightsUpsellTab";+import { DASHBOARD_DESCRIPTION_MAX_LENGTH } from "metabase/common/utils/dashboard";import { revertToRevision, updateDashboard } from "metabase/dashboard/actions";-import { DASHBOARD_DESCRIPTION_MAX_LENGTH } from "metabase/dashboard/constants";import {type DashboardContextReturned,useDashboardContext,diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/common.unit.spec.ts b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/common.unit.spec.tsindex a21751b58d2..ded4a342485 100644--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/common.unit.spec.ts+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/common.unit.spec.ts@@ -9,8 +9,8 @@ import {import { setup } from "./setup";-jest.mock("metabase/dashboard/constants", () => ({- ...jest.requireActual("metabase/dashboard/constants"),+jest.mock("metabase/common/utils/dashboard", () => ({+ ...jest.requireActual("metabase/common/utils/dashboard"),DASHBOARD_DESCRIPTION_MAX_LENGTH: 20,}));diff --git a/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/common.unit.spec.ts b/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/common.unit.spec.tsindex 0f46259cc49..8960fb65cfa 100644--- a/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/common.unit.spec.ts+++ b/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/common.unit.spec.ts@@ -4,8 +4,8 @@ import { screen } from "__support__/ui";import { setup } from "./setup";-jest.mock("metabase/dashboard/constants", () => ({- ...jest.requireActual("metabase/dashboard/constants"),+jest.mock("metabase/common/utils/dashboard", () => ({+ ...jest.requireActual("metabase/common/utils/dashboard"),DASHBOARD_DESCRIPTION_MAX_LENGTH: 20,}));diff --git a/frontend/src/metabase/dashboard/components/DashboardTitle/DashboardTitle.tsx b/frontend/src/metabase/dashboard/components/DashboardTitle/DashboardTitle.tsxindex 3c4fd4e2408..c461835ce1c 100644--- a/frontend/src/metabase/dashboard/components/DashboardTitle/DashboardTitle.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardTitle/DashboardTitle.tsx@@ -1,7 +1,7 @@import { t } from "ttag";import { EditableText } from "metabase/common/components/EditableText";-import { DASHBOARD_NAME_MAX_LENGTH } from "metabase/dashboard/constants";+import { DASHBOARD_NAME_MAX_LENGTH } from "metabase/common/utils/dashboard";import { useDashboardContext } from "metabase/dashboard/context";import { useDashboardTitle } from "metabase/dashboard/hooks/use-dashboard-title";import { useTranslateContent } from "metabase/i18n/hooks";diff --git a/frontend/src/metabase/dashboard/constants.ts b/frontend/src/metabase/dashboard/constants.tsindex fe512d92127..bc29c1293ff 100644--- a/frontend/src/metabase/dashboard/constants.ts+++ b/frontend/src/metabase/dashboard/constants.ts@@ -5,9 +5,6 @@ import type {import type { EmbedDisplayParams } from "./types";-export const DASHBOARD_NAME_MAX_LENGTH = 254;-export const DASHBOARD_DESCRIPTION_MAX_LENGTH = 1500;-export const SIDEBAR_NAME: Record<DashboardSidebarName, DashboardSidebarName> ={addQuestion: "addQuestion",diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsxindex 622c5c3503c..8a662b83bc0 100644--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx@@ -18,8 +18,8 @@ import {useDashboardContext,} from "metabase/dashboard/context";import { useDashboardUrlQuery } from "metabase/dashboard/hooks";-import { ReturnToSetupGuideModal } from "metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal";-import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/embedding-hub/constants";+import { ReturnToSetupGuideModal } from "metabase/embedding/components/ReturnToSetupGuideModal";+import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/constants";import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";diff --git a/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsx b/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsxindex 867eb85e262..d8b66b0e588 100644--- a/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsx+++ b/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsx@@ -8,6 +8,10 @@ import FormCollectionPicker from "metabase/collections/containers/FormCollectionimport { Button } from "metabase/common/components/Button";import { FormFooter } from "metabase/common/components/FormFooter";import type { FilterItemsInPersonalCollection } from "metabase/common/components/Pickers";+import {+ DASHBOARD_DESCRIPTION_MAX_LENGTH,+ DASHBOARD_NAME_MAX_LENGTH,+} from "metabase/common/utils/dashboard";import { Dashboards } from "metabase/entities/dashboards";import {Form,@@ -24,11 +28,6 @@ import { isVirtualDashCard } from "metabase/utils/dashboard";import * as Errors from "metabase/utils/errors";import type { CollectionId, Dashboard, DashboardId } from "metabase-types/api";-import {- DASHBOARD_DESCRIPTION_MAX_LENGTH,- DASHBOARD_NAME_MAX_LENGTH,-} from "../constants";-const DASHBOARD_SCHEMA = Yup.object({name: Yup.string().required(Errors.required)diff --git a/frontend/src/metabase/dashboard/utils.ts b/frontend/src/metabase/dashboard/utils.tsindex 68c0a41adfc..ddefd88a5a6 100644--- a/frontend/src/metabase/dashboard/utils.ts+++ b/frontend/src/metabase/dashboard/utils.ts@@ -33,7 +33,6 @@ import type {DashCardDataMap,Dashboard,DashboardCard,- DashboardCardLayoutAttrs,Database,Dataset,DatasetQuery,@@ -42,7 +41,6 @@ import type {ParameterId,QuestionDashboardCard,VirtualCard,- VirtualCardDisplay,VirtualDashboardCard,} from "metabase-types/api";@@ -389,44 +387,12 @@ export const getActionIsEnabledInDatabase = (export const calculateDashCardRowAfterUndo = (originalRow: number) =>originalRow - 0.1;-let tempId = -1;--export function generateTemporaryDashcardId() {- return tempId--;-}--export type NewDashboardCard = Omit<- DashboardCard,- "entity_id" | "created_at" | "updated_at"->;--type MandatoryDashboardCardAttrs = Pick<- DashboardCard,- "dashboard_id" | "card"-> &- DashboardCardLayoutAttrs;--export function createDashCard(- attrs: Partial<NewDashboardCard> & MandatoryDashboardCardAttrs,-): NewDashboardCard {- return {- id: generateTemporaryDashcardId(),- dashboard_tab_id: null,- card_id: null,- parameter_mappings: [],- visualization_settings: {},- ...attrs,- };-}--export function createVirtualCard(display: VirtualCardDisplay): VirtualCard {- return {- name: null,- display,- visualization_settings: {},- archived: false,- };-}+export {+ createDashCard,+ createVirtualCard,+ generateTemporaryDashcardId,+ type NewDashboardCard,+} from "metabase/common/utils/dashboard";export const isDashboardCacheable = (dashboard: Dashboard,diff --git a/frontend/src/metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsx b/frontend/src/metabase/embedding/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsxsimilarity index 79%rename from frontend/src/metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsxrename to frontend/src/metabase/embedding/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsxindex 6c61ed9ce22..9a2d303c4a0 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsx+++ b/frontend/src/metabase/embedding/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsx@@ -1,10 +1,14 @@import { push } from "react-router-redux";import { t } from "ttag";-import { EMBEDDING_SETUP_GUIDE_PATH } from "metabase/embedding/embedding-hub/constants";import { useDispatch } from "metabase/redux";import { Button, Group, Modal, Stack, Text } from "metabase/ui";+// Path to the admin embedding setup guide. Inlined here (rather than+// imported from admin/) so this modal can live at the shared tier and be+// invoked from dashboard/admin/etc. without a cross-feature dependency.+const EMBEDDING_SETUP_GUIDE_PATH = "/admin/embedding/setup-guide";+interface ReturnToSetupGuideModalProps {opened: boolean;onClose: () => void;diff --git a/frontend/src/metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal/index.ts b/frontend/src/metabase/embedding/components/ReturnToSetupGuideModal/index.tssimilarity index 100%rename from frontend/src/metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal/index.tsrename to frontend/src/metabase/embedding/components/ReturnToSetupGuideModal/index.tsdiff --git a/frontend/src/metabase/embedding/constants.ts b/frontend/src/metabase/embedding/constants.tsindex f3583dc42d0..07e80b0169f 100644--- a/frontend/src/metabase/embedding/constants.ts+++ b/frontend/src/metabase/embedding/constants.ts@@ -2,3 +2,10 @@ import type { EmbeddingType } from "metabase/public/lib/types";export const STATIC_LEGACY_EMBEDDING_TYPE: EmbeddingType = "static-legacy";export const GUEST_EMBED_EMBEDDING_TYPE: EmbeddingType = "guest-embed";++/**+ * URL query param used to signal that a sub-flow (dashboard editing,+ * database connection, xray picker) was entered from the embedding setup+ * guide and should offer a "return to setup guide" affordance on completion.+ */+export const RETURN_TO_SETUP_GUIDE_PARAM = "returnToEmbeddingSetupGuide";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHub.tsx b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHub.tsxindex 8fc99de46b9..4a10a4ed204 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHub.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHub.tsx@@ -2,7 +2,7 @@ import { useMemo, useState } from "react";import { P, match } from "ts-pattern";import { t } from "ttag";-import { CreateDashboardModal } from "metabase/dashboard/containers/CreateDashboardModal";+import { CreateDashboardModal } from "metabase/common/CreateDashboard/CreateDashboardModal";import { AddDataModal } from "metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal";import { PLUGIN_TENANTS } from "metabase/plugins";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubXrayPickerModal.tsx b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubXrayPickerModal.tsxindex 6940b2aef3a..6e6115f1be2 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubXrayPickerModal.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubXrayPickerModal.tsx@@ -2,7 +2,7 @@ import { push } from "react-router-redux";import { t } from "ttag";import { DataPickerModal } from "metabase/common/components/Pickers/DataPicker";-import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/embedding-hub/constants";+import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/constants";import { useDispatch } from "metabase/redux";import type { TableId } from "metabase-types/api";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-xray-dashboards.ts b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-xray-dashboards.tsindex 083f40c9660..8cfa45e59a0 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-xray-dashboards.ts+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-xray-dashboards.ts@@ -9,7 +9,10 @@ import {useUpdateDashboardMutation,} from "metabase/api";import { listTag } from "metabase/api/tags";-import { createDashCard, createVirtualCard } from "metabase/dashboard/utils";+import {+ createDashCard,+ createVirtualCard,+} from "metabase/common/utils/dashboard";import { useDispatch } from "metabase/redux";import type {CollectionId,diff --git a/frontend/src/metabase/embedding/embedding-hub/components/index.ts b/frontend/src/metabase/embedding/embedding-hub/components/index.tsindex 86cd5648acc..b912384cc2e 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/index.ts+++ b/frontend/src/metabase/embedding/embedding-hub/components/index.ts@@ -1,5 +1,3 @@export { EmbeddingHub } from "./EmbeddingHub";-export { EmbeddingHubAdminSettingsPage } from "./EmbeddingHubAdminSettingsPage";-export { EmbeddingHubHomePage } from "./EmbeddingHubHomePage";export { SetupPermissionsAndTenantsPage } from "./SetupPermissionsAndTenantsPage";export { SetupSsoPage } from "./SetupSsoPage";diff --git a/frontend/src/metabase/embedding/embedding-hub/constants.ts b/frontend/src/metabase/embedding/embedding-hub/constants.tsdeleted file mode 100644index f73a531af14..00000000000--- a/frontend/src/metabase/embedding/embedding-hub/constants.ts+++ /dev/null@@ -1,2 +0,0 @@-export const EMBEDDING_SETUP_GUIDE_PATH = "/admin/embedding/setup-guide";-export const RETURN_TO_SETUP_GUIDE_PARAM = "returnToEmbeddingSetupGuide";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubHomePage.tsx b/frontend/src/metabase/home/components/EmbeddingHubHomePage/EmbeddingHubHomePage.tsxsimilarity index 85%rename from frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubHomePage.tsxrename to frontend/src/metabase/home/components/EmbeddingHubHomePage/EmbeddingHubHomePage.tsxindex 7207e89bdbf..8c2482f15b2 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubHomePage.tsx+++ b/frontend/src/metabase/home/components/EmbeddingHubHomePage/EmbeddingHubHomePage.tsx@@ -2,13 +2,13 @@ import { useDisclosure } from "@mantine/hooks";import type { ReactNode } from "react";import { t } from "ttag";-import { CustomHomePageModal } from "metabase/home/components/CustomHomePageModal";-import { dismissEmbeddingHomepage } from "metabase/home/components/EmbedHomepage/actions";-import { MetabotGreeting } from "metabase/home/components/HomeGreeting";+import { EmbeddingHub } from "metabase/embedding/embedding-hub";import { useDispatch } from "metabase/redux";import { ActionIcon, Group, Icon, Menu, Stack, Text } from "metabase/ui";-import { EmbeddingHub } from "./EmbeddingHub";+import { CustomHomePageModal } from "../CustomHomePageModal";+import { dismissEmbeddingHomepage } from "../EmbedHomepage/actions";+import { MetabotGreeting } from "../HomeGreeting";/*** Embedding Hub shown in the embedding home page for admins in EE instances.diff --git a/frontend/src/metabase/home/components/EmbeddingHubHomePage/index.ts b/frontend/src/metabase/home/components/EmbeddingHubHomePage/index.tsnew file mode 100644index 00000000000..a628f65ff83--- /dev/null+++ b/frontend/src/metabase/home/components/EmbeddingHubHomePage/index.ts@@ -0,0 +1 @@+export { EmbeddingHubHomePage } from "./EmbeddingHubHomePage";diff --git a/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx b/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsxindex b4e3f2fd9c1..039bf4a803c 100644--- a/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx+++ b/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx@@ -4,13 +4,13 @@ import { t } from "ttag";import { LighthouseIllustration } from "metabase/common/components/LighthouseIllustration";import { useHasTokenFeature, useSetting } from "metabase/common/hooks";-import { EmbeddingHubHomePage } from "metabase/embedding/embedding-hub";import { useSelector } from "metabase/redux";import { getUser, getUserIsAdmin } from "metabase/selectors/user";import { getLandingPageIllustration } from "metabase/selectors/whitelabel";import { Box, Button, Icon, Tooltip } from "metabase/ui";import { CustomHomePageModal } from "../CustomHomePageModal";+import { EmbeddingHubHomePage } from "../EmbeddingHubHomePage";import { HomeGreeting } from "../HomeGreeting";interface HomeLayoutProps {diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/DatabasesPanel.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/DatabasesPanel.tsxindex 951531fc3b7..e28abf2d7bd 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/DatabasesPanel.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/DatabasesPanel.tsx@@ -1,7 +1,7 @@import { push } from "react-router-redux";import { DatabaseEngineList } from "metabase/databases/components/DatabaseEngineList";-import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/embedding-hub/constants";+import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/constants";import { useDispatch } from "metabase/redux";import { trackDatabaseSelect } from "../analytics";diff --git a/frontend/src/metabase/new/components/NewModals/NewModals.tsx b/frontend/src/metabase/new/components/NewModals/NewModals.tsxindex 69094c4289c..6a8196cbd2c 100644--- a/frontend/src/metabase/new/components/NewModals/NewModals.tsx+++ b/frontend/src/metabase/new/components/NewModals/NewModals.tsx@@ -6,9 +6,9 @@ import { useLocation } from "react-use";import ActionCreator from "metabase/actions/containers/ActionCreator";import CreateCollectionModal from "metabase/collections/containers/CreateCollectionModal";+import { CreateDashboardModal } from "metabase/common/CreateDashboard/CreateDashboardModal";import { Modal } from "metabase/common/components/Modal";import { UpgradeModal } from "metabase/common/components/upsells/components/UpgradeModal";-import { CreateDashboardModal } from "metabase/dashboard/containers/CreateDashboardModal";import { STATIC_LEGACY_EMBEDDING_TYPE } from "metabase/embedding/constants";import {LegacyStaticEmbeddingModal,