Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Move single-consumer code to its consumer

Fraserd60573c199fd
diff --git a/frontend/src/metabase/selectors/collection.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/collection.ts
similarity index 100%
rename from frontend/src/metabase/selectors/collection.ts
rename to enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/collection.ts
diff --git a/frontend/src/metabase/selectors/collection.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/collection.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/selectors/collection.unit.spec.ts
rename to enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/collection.unit.spec.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/model-configs.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/model-configs.ts
index 9bf4164f9a2..7b921a4c255 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/model-configs.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/model-configs.ts
@@ -14,11 +14,11 @@ import { timelineEventApi } from "metabase/api/timeline-event";
import { transformApi } from "metabase/api/transform";
import { transformTagApi } from "metabase/api/transform-tag";
import type { State } from "metabase/redux/store";
-import { getCollectionFromCollectionsTree } from "metabase/selectors/collection";
import { pythonLibraryApi } from "metabase-enterprise/api/python-transform-library";
import { tableApi as enterpriseTableApi } from "metabase-enterprise/api/table";
import type { CardId, CollectionId, DashboardId } from "metabase-types/api";
+import { getCollectionFromCollectionsTree } from "./collection";
import {
InvalidationType,
type ModelMutationConfig,
diff --git a/frontend/src/metabase/transforms/lib/transforms-inspector.ts b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/lib/transforms-inspector.ts
similarity index 100%
rename from frontend/src/metabase/transforms/lib/transforms-inspector.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms-inspector/lib/transforms-inspector.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensContent/LensContentContext.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensContent/LensContentContext.tsx
index 6ea20a7f83d..af49618b9e5 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensContent/LensContentContext.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensContent/LensContentContext.tsx
@@ -5,7 +5,7 @@ import {
useMemo,
} from "react";
-import type { CardStats } from "metabase/transforms/lib/transforms-inspector";
+import type { CardStats } from "metabase-enterprise/transforms-inspector/lib/transforms-inspector";
import type {
InspectorAlertTrigger,
InspectorCardId,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/DefaultLensSections.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/DefaultLensSections.unit.spec.tsx
index e2ee03e002b..facab649677 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/DefaultLensSections.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/DefaultLensSections.unit.spec.tsx
@@ -18,10 +18,15 @@ import { LensContentProvider } from "../../LensContent/LensContentContext";
import { DefaultLensSections } from "./DefaultLensSections";
-jest.mock("metabase/transforms/lib/transforms-inspector", () => ({
- ...jest.requireActual("metabase/transforms/lib/transforms-inspector"),
- computeCardStats: () => null,
-}));
+jest.mock(
+ "metabase-enterprise/transforms-inspector/lib/transforms-inspector",
+ () => ({
+ ...jest.requireActual(
+ "metabase-enterprise/transforms-inspector/lib/transforms-inspector",
+ ),
+ computeCardStats: () => null,
+ }),
+);
const scalarCard1 = createMockInspectorCard({
id: "card-1",
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/ComparisonLayout/ComparisonLayout.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/ComparisonLayout/ComparisonLayout.unit.spec.tsx
index bba10d15b58..f1f6dbc1cd6 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/ComparisonLayout/ComparisonLayout.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/ComparisonLayout/ComparisonLayout.unit.spec.tsx
@@ -21,15 +21,18 @@ import { LensContentProvider } from "../../../../LensContent/LensContentContext"
import { ComparisonLayout } from "./ComparisonLayout";
import { type CardGroup, sortGroupsByScore } from "./utils";
-jest.mock("metabase/transforms/lib/transforms-inspector", () => ({
- interestingFields: (
- fields: InspectorField[],
- _visitedFields: unknown,
- // we use field ID as the score for testing purposes
- ): Array<InspectorField & { interestingness: { score: number } }> =>
- fields.map((f) => ({ ...f, interestingness: { score: f.id ?? 0 } })),
- computeCardStats: () => null,
-}));
+jest.mock(
+ "metabase-enterprise/transforms-inspector/lib/transforms-inspector",
+ () => ({
+ interestingFields: (
+ fields: InspectorField[],
+ _visitedFields: unknown,
+ // we use field ID as the score for testing purposes
+ ): Array<InspectorField & { interestingness: { score: number } }> =>
+ fields.map((f) => ({ ...f, interestingness: { score: f.id ?? 0 } })),
+ computeCardStats: () => null,
+ }),
+);
const makeSource = (
tableName: string,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/ComparisonLayout/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/ComparisonLayout/utils.ts
index 6b8668753f0..b93a7becab6 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/ComparisonLayout/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/ComparisonLayout/utils.ts
@@ -1,4 +1,4 @@
-import { interestingFields } from "metabase/transforms/lib/transforms-inspector";
+import { interestingFields } from "metabase-enterprise/transforms-inspector/lib/transforms-inspector";
import type {
InspectorCard,
InspectorSource,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/JoinAnalysisSections/types.ts b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/JoinAnalysisSections/types.ts
index f598dcc01f3..5eb38c9104c 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/JoinAnalysisSections/types.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/JoinAnalysisSections/types.ts
@@ -1,4 +1,4 @@
-import type { CardStats } from "metabase/transforms/lib/transforms-inspector";
+import type { CardStats } from "metabase-enterprise/transforms-inspector/lib/transforms-inspector";
import type {
InspectorAlertTrigger,
InspectorCard,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/hooks/useLensCardLoader.ts b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/hooks/useLensCardLoader.ts
index 0da5f634015..840e3121fec 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/hooks/useLensCardLoader.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/hooks/useLensCardLoader.ts
@@ -4,7 +4,7 @@ import { useRunInspectorQueryQuery } from "metabase/api";
import {
type CardStats,
computeCardStats,
-} from "metabase/transforms/lib/transforms-inspector";
+} from "metabase-enterprise/transforms-inspector/lib/transforms-inspector";
import type { InspectorCard } from "metabase-types/api";
import { useLensContentContext } from "../components/LensContent/LensContentContext";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/hooks/useTriggerEvaluation.ts b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/hooks/useTriggerEvaluation.ts
index ebaf461997c..0da65b530ad 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/hooks/useTriggerEvaluation.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/hooks/useTriggerEvaluation.ts
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useMemo, useState } from "react";
import _ from "underscore";
-import { evaluateTriggers } from "metabase/transforms/lib/transforms-inspector";
+import { evaluateTriggers } from "metabase-enterprise/transforms-inspector/lib/transforms-inspector";
import type {
InspectorAlertTrigger,
InspectorCardId,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/types.ts b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/types.ts
index f350709d8c1..b2d64cca786 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/types.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/types.ts
@@ -1,7 +1,7 @@
import type { InspectorLensId } from "metabase-types/api";
export type { LensHandle } from "metabase-types/api";
-export type { CardStats } from "metabase/transforms/lib/transforms-inspector";
+export type { CardStats } from "metabase-enterprise/transforms-inspector/lib/transforms-inspector";
export type RouteParams = { transformId: string; lensId?: InspectorLensId };
diff --git a/frontend/src/metabase/app/nav/AppBar.tsx b/frontend/src/metabase/app/nav/AppBar.tsx
index 824ae919a04..eb8d2242158 100644
--- a/frontend/src/metabase/app/nav/AppBar.tsx
+++ b/frontend/src/metabase/app/nav/AppBar.tsx
@@ -1,4 +1,5 @@
import { skipToken, useGetDashboardQuery } from "metabase/api";
+import { QuestionLineage } from "metabase/app/nav/QuestionLineage";
import {
getCollectionId,
getIsAppSwitcherVisible,
@@ -18,7 +19,6 @@ import {
import { getMetabotVisible } from "metabase/metabot/state";
import { AppBar as AppBarView } from "metabase/nav/components/AppBar";
import type { AppBarProps } from "metabase/nav/components/AppBar/AppBar";
-import { QuestionLineage } from "metabase/nav/components/QuestionLineage";
import { CollectionBreadcrumbs } from "metabase/nav/containers/CollectionBreadcrumbs";
import { isQuestionPath } from "metabase/nav/containers/MainNavbar/getSelectedItems";
import { zoomInRow } from "metabase/query_builder/actions";
diff --git a/frontend/src/metabase/nav/components/QuestionLineage/QuestionLineage.tsx b/frontend/src/metabase/app/nav/QuestionLineage/QuestionLineage.tsx
similarity index 100%
rename from frontend/src/metabase/nav/components/QuestionLineage/QuestionLineage.tsx
rename to frontend/src/metabase/app/nav/QuestionLineage/QuestionLineage.tsx
diff --git a/frontend/src/metabase/nav/components/QuestionLineage/index.ts b/frontend/src/metabase/app/nav/QuestionLineage/index.ts
similarity index 100%
rename from frontend/src/metabase/nav/components/QuestionLineage/index.ts
rename to frontend/src/metabase/app/nav/QuestionLineage/index.ts
diff --git a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
index c06842da248..0f1114f65f0 100644
--- a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
+++ b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
@@ -9,7 +9,6 @@ import { ForwardRefLink, Link } from "metabase/common/components/Link";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
import { trackMetricCreateStarted } from "metabase/common/data-studio/analytics";
import { useDocsUrl } from "metabase/common/hooks";
-import { useFetchMetrics } from "metabase/common/hooks/use-fetch-metrics";
import { PLUGIN_CONTENT_VERIFICATION, PLUGIN_LIBRARY } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import { getIsEmbeddingIframe } from "metabase/selectors/embed";
@@ -33,6 +32,7 @@ import S from "../components/BrowseContainer.module.css";
import { MetricsTable } from "./MetricsTable";
import { trackNewMetricInitiated } from "./analytics";
import type { MetricFilterSettings, MetricResult } from "./types";
+import { useFetchMetrics } from "./use-fetch-metrics";
const {
contentVerificationEnabled,
diff --git a/frontend/src/metabase/common/hooks/use-fetch-metrics.tsx b/frontend/src/metabase/browse/metrics/use-fetch-metrics.tsx
similarity index 100%
rename from frontend/src/metabase/common/hooks/use-fetch-metrics.tsx
rename to frontend/src/metabase/browse/metrics/use-fetch-metrics.tsx
diff --git a/frontend/src/metabase/browse/models/BrowseModels.tsx b/frontend/src/metabase/browse/models/BrowseModels.tsx
index 8a3a055d400..15453af2039 100644
--- a/frontend/src/metabase/browse/models/BrowseModels.tsx
+++ b/frontend/src/metabase/browse/models/BrowseModels.tsx
@@ -7,7 +7,6 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";
import { ForwardRefLink } from "metabase/common/components/Link";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
import { useDocsUrl } from "metabase/common/hooks";
-import { useFetchModels } from "metabase/common/hooks/use-fetch-models";
import {
PLUGIN_COLLECTIONS,
PLUGIN_CONTENT_VERIFICATION,
@@ -39,6 +38,7 @@ import { ModelsTable } from "./ModelsTable";
import { RecentModels } from "./RecentModels";
import { trackNewModelInitiated } from "./analytics";
import type { ModelFilterSettings, ModelResult } from "./types";
+import { useFetchModels } from "./use-fetch-models";
import { getMaxRecentModelCount, isRecentModel } from "./utils";
const {
diff --git a/frontend/src/metabase/common/hooks/use-fetch-models.tsx b/frontend/src/metabase/browse/models/use-fetch-models.tsx
similarity index 100%
rename from frontend/src/metabase/common/hooks/use-fetch-models.tsx
rename to frontend/src/metabase/browse/models/use-fetch-models.tsx
diff --git a/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx b/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx
index bf47ec70886..b65651388ce 100644
--- a/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx
+++ b/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx
@@ -12,7 +12,6 @@ import { EditorBubbleMenu } from "metabase/rich_text_editing/tiptap/components/E
import type { FormattingOptions } from "metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/types";
import { CustomStarterKit } from "metabase/rich_text_editing/tiptap/extensions/CustomStarterKit/CustomStarterKit";
import { DisableMetabotSidebar } from "metabase/rich_text_editing/tiptap/extensions/DisableMetabotSidebar";
-import { EmojiSuggestionExtension } from "metabase/rich_text_editing/tiptap/extensions/Emoji/EmojiSuggestionExtension";
import { MentionExtension } from "metabase/rich_text_editing/tiptap/extensions/Mention/MentionExtension";
import { createMentionSuggestion } from "metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion";
import { SmartLink } from "metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode";
@@ -24,6 +23,7 @@ import { METAKEY } from "metabase/utils/browser";
import type { DocumentContent } from "metabase-types/api";
import S from "./CommentEditor.module.css";
+import { EmojiSuggestionExtension } from "./EmojiSuggestionExtension";
const BUBBLE_MENU_DISALLOWED_NODES: string[] = [SmartLink.name];
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Emoji/EmojiSuggestionExtension.tsx b/frontend/src/metabase/comments/components/CommentEditor/EmojiSuggestionExtension.tsx
similarity index 100%
rename from frontend/src/metabase/rich_text_editing/tiptap/extensions/Emoji/EmojiSuggestionExtension.tsx
rename to frontend/src/metabase/comments/components/CommentEditor/EmojiSuggestionExtension.tsx
diff --git a/frontend/src/metabase/common/components/Sidesheet/components/InsightsTab/InsightsTab.tsx b/frontend/src/metabase/common/components/upsells/components/InsightsTab/InsightsTab.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/Sidesheet/components/InsightsTab/InsightsTab.tsx
rename to frontend/src/metabase/common/components/upsells/components/InsightsTab/InsightsTab.tsx
diff --git a/frontend/src/metabase/common/components/Sidesheet/components/InsightsTab/index.ts b/frontend/src/metabase/common/components/upsells/components/InsightsTab/index.ts
similarity index 100%
rename from frontend/src/metabase/common/components/Sidesheet/components/InsightsTab/index.ts
rename to frontend/src/metabase/common/components/upsells/components/InsightsTab/index.ts
diff --git a/frontend/src/metabase/common/components/Sidesheet/components/InsightsTabOrLink/InsightsTabOrLink.tsx b/frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/InsightsTabOrLink.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/Sidesheet/components/InsightsTabOrLink/InsightsTabOrLink.tsx
rename to frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/InsightsTabOrLink.tsx
diff --git a/frontend/src/metabase/common/components/Sidesheet/components/InsightsTabOrLink/index.ts b/frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/index.ts
similarity index 100%
rename from frontend/src/metabase/common/components/Sidesheet/components/InsightsTabOrLink/index.ts
rename to frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/index.ts
diff --git a/frontend/src/metabase/common/components/Sidesheet/components/InsightsTabOrLink/tests/common.unit.spec.tsx b/frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/tests/common.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/Sidesheet/components/InsightsTabOrLink/tests/common.unit.spec.tsx
rename to frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/tests/common.unit.spec.tsx
diff --git a/frontend/src/metabase/common/components/Sidesheet/components/InsightsTabOrLink/tests/premium.unit.spec.tsx b/frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/tests/premium.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/Sidesheet/components/InsightsTabOrLink/tests/premium.unit.spec.tsx
rename to frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/tests/premium.unit.spec.tsx
diff --git a/frontend/src/metabase/common/components/Sidesheet/components/InsightsTabOrLink/tests/setup.tsx b/frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/tests/setup.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/Sidesheet/components/InsightsTabOrLink/tests/setup.tsx
rename to frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/tests/setup.tsx
diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx
index b8d346a6c0f..62a42c066a7 100644
--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx
@@ -14,10 +14,10 @@ import {
SidesheetCard,
SidesheetTabPanelContainer,
} from "metabase/common/components/Sidesheet";
-import { InsightsTabOrLink } from "metabase/common/components/Sidesheet/components/InsightsTabOrLink";
import { 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 { InsightsTabOrLink } from "metabase/common/components/upsells/components/InsightsTabOrLink";
import { DASHBOARD_DESCRIPTION_MAX_LENGTH } from "metabase/common/utils/dashboard";
import { revertToRevision, updateDashboard } from "metabase/dashboard/actions";
import {
diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditEmailSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditEmailSidebar.tsx
index 7e25e269ba0..ba0a7b9ae08 100644
--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditEmailSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditEmailSidebar.tsx
@@ -11,7 +11,6 @@ import { SendTestPulse } from "metabase/common/components/SendTestPulse";
import { Sidebar } from "metabase/common/components/Sidebar";
import CS from "metabase/css/core/index.css";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { EmailAttachmentPicker } from "metabase/notifications/EmailAttachmentPicker";
import { RecipientPicker } from "metabase/notifications/channels/RecipientPicker";
import { PLUGIN_DASHBOARD_SUBSCRIPTION_PARAMETERS_SECTION_OVERRIDE } from "metabase/plugins";
import { dashboardPulseIsValid } from "metabase/pulse";
@@ -34,6 +33,7 @@ import S from "./AddEditSidebar.module.css";
import { CaveatMessage } from "./CaveatMessage";
import DefaultParametersSection from "./DefaultParametersSection";
import { DeleteSubscriptionAction } from "./DeleteSubscriptionAction";
+import { EmailAttachmentPicker } from "./EmailAttachmentPicker";
import { CHANNEL_NOUN_PLURAL } from "./constants";
interface AddEditEmailSidebarProps {
diff --git a/frontend/src/metabase/notifications/EmailAttachmentPicker.module.css b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/EmailAttachmentPicker.module.css
similarity index 100%
rename from frontend/src/metabase/notifications/EmailAttachmentPicker.module.css
rename to frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/EmailAttachmentPicker.module.css
diff --git a/frontend/src/metabase/notifications/EmailAttachmentPicker.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/EmailAttachmentPicker.tsx
similarity index 100%
rename from frontend/src/metabase/notifications/EmailAttachmentPicker.tsx
rename to frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/EmailAttachmentPicker.tsx
diff --git a/frontend/src/metabase/notifications/EmailAttachmentPicker.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/EmailAttachmentPicker.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/notifications/EmailAttachmentPicker.unit.spec.tsx
rename to frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/EmailAttachmentPicker.unit.spec.tsx
diff --git a/frontend/src/metabase/dashboard/visualizations/Heading/Heading.tsx b/frontend/src/metabase/dashboard/visualizations/Heading/Heading.tsx
index b76cfbfb46b..53c5049326d 100644
--- a/frontend/src/metabase/dashboard/visualizations/Heading/Heading.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/Heading/Heading.tsx
@@ -14,12 +14,12 @@ import {
getIsEditingParameter,
getParameterValues,
} from "metabase/dashboard/selectors";
+import { fillParametersInText } from "metabase/dashboard/visualizations/parameter-substitution";
import { useSelector } from "metabase/redux";
import { getSetting } from "metabase/selectors/settings";
import { Box, Ellipsified, Flex } from "metabase/ui";
import { measureTextWidth } from "metabase/utils/measure-text";
import { isEmpty } from "metabase/utils/validate";
-import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";
import type {
Dashboard,
VirtualDashboardCard,
diff --git a/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx b/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx
index fe68bf7edef..88a2e53d76d 100644
--- a/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx
@@ -6,6 +6,7 @@ import { Link } from "metabase/common/components/Link";
import { useDocsUrl, useSetting } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
import { getParameterValues } from "metabase/dashboard/selectors";
+import { fillParametersInText } from "metabase/dashboard/visualizations/parameter-substitution";
import { useSelector } from "metabase/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Box, Button, Group, Icon, Stack, Text } from "metabase/ui";
@@ -13,7 +14,6 @@ import {
getAllowedIframeAttributes,
isAllowedIframeUrl,
} from "metabase/visualizations/lib/iframe";
-import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";
import type {
Dashboard,
VirtualDashboardCard,
diff --git a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx
index 4b9ca7616d4..35155b09655 100644
--- a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx
@@ -4,12 +4,12 @@ import _ from "underscore";
import { useToggle } from "metabase/common/hooks/use-toggle";
import { getParameterValues } from "metabase/dashboard/selectors";
+import { fillParametersInText } from "metabase/dashboard/visualizations/parameter-substitution";
import { SearchResults } from "metabase/nav/components/search/SearchResults";
import { useSelector } from "metabase/redux";
import { Popover } from "metabase/ui";
import { modelToUrl } from "metabase/urls";
import { getUrlTarget } from "metabase/visualizations/lib/open-url";
-import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";
import type {
Dashboard,
LinkCardSettings,
diff --git a/frontend/src/metabase/dashboard/visualizations/Text/Text.tsx b/frontend/src/metabase/dashboard/visualizations/Text/Text.tsx
index fdfae6b2325..5d275d9f523 100644
--- a/frontend/src/metabase/dashboard/visualizations/Text/Text.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/Text/Text.tsx
@@ -13,10 +13,10 @@ import { useTranslateContent } from "metabase/content-translation/hooks";
import CS from "metabase/css/core/index.css";
import { updateParameterMappingsForDashcardText } from "metabase/dashboard/actions";
import { getParameterValues } from "metabase/dashboard/selectors";
+import { fillParametersInText } from "metabase/dashboard/visualizations/parameter-substitution";
import { useDispatch, useSelector } from "metabase/redux";
import { isEmpty } from "metabase/utils/validate";
import { DATA_IMAGE_URI_PATTERN } from "metabase/visualizations/lib/utils";
-import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";
import type { VisualizationGridSize } from "metabase/visualizations/types";
import type {
Dashboard,
diff --git a/frontend/src/metabase/visualizations/shared/utils/parameter-substitution.ts b/frontend/src/metabase/dashboard/visualizations/parameter-substitution.ts
similarity index 100%
rename from frontend/src/metabase/visualizations/shared/utils/parameter-substitution.ts
rename to frontend/src/metabase/dashboard/visualizations/parameter-substitution.ts
diff --git a/frontend/src/metabase/transforms/pages/NoWritableDatabasesEmptyState/NoWritableDatabasesEmptyState.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/NoWritableDatabasesEmptyState/NoWritableDatabasesEmptyState.tsx
similarity index 100%
rename from frontend/src/metabase/transforms/pages/NoWritableDatabasesEmptyState/NoWritableDatabasesEmptyState.tsx
rename to frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/NoWritableDatabasesEmptyState/NoWritableDatabasesEmptyState.tsx
diff --git a/frontend/src/metabase/transforms/pages/NoWritableDatabasesEmptyState/index.ts b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/NoWritableDatabasesEmptyState/index.ts
similarity index 100%
rename from frontend/src/metabase/transforms/pages/NoWritableDatabasesEmptyState/index.ts
rename to frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/NoWritableDatabasesEmptyState/index.ts
diff --git a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
index 8ce189e3a39..9487deef92b 100644
--- a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
@@ -9,11 +9,12 @@ import { useSelector } from "metabase/redux";
import type { WithRouterProps } from "metabase/router";
import { useTransformSupportedDbs } from "metabase/transforms/hooks/use-transform-supported-dbs";
import { EnableTransformsPage } from "metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage";
-import { NoWritableDatabasesEmptyState } from "metabase/transforms/pages/NoWritableDatabasesEmptyState";
import { getShouldShowTransformsUpsell } from "metabase/transforms/selectors";
import { SectionLayout } from "../../components/SectionLayout";
+import { NoWritableDatabasesEmptyState } from "./NoWritableDatabasesEmptyState";
+
type TransformsSectionLayoutProps = WithRouterProps & {
children?: ReactNode;
};
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/DropCursor/DropCursor.module.css b/frontend/src/metabase/documents/components/Editor/DropCursor.module.css
similarity index 100%
rename from frontend/src/metabase/rich_text_editing/tiptap/extensions/DropCursor/DropCursor.module.css
rename to frontend/src/metabase/documents/components/Editor/DropCursor.module.css
diff --git a/frontend/src/metabase/documents/components/Editor/Editor.tsx b/frontend/src/metabase/documents/components/Editor/Editor.tsx
index fbb344abab1..35be0964ab1 100644
--- a/frontend/src/metabase/documents/components/Editor/Editor.tsx
+++ b/frontend/src/metabase/documents/components/Editor/Editor.tsx
@@ -20,7 +20,6 @@ import { CommandExtension } from "metabase/rich_text_editing/tiptap/extensions/C
import { CommandSuggestion } from "metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion";
import { CustomStarterKit } from "metabase/rich_text_editing/tiptap/extensions/CustomStarterKit/CustomStarterKit";
import { DisableMetabotSidebar } from "metabase/rich_text_editing/tiptap/extensions/DisableMetabotSidebar";
-import DropCursorS from "metabase/rich_text_editing/tiptap/extensions/DropCursor/DropCursor.module.css";
import { FlexContainer } from "metabase/rich_text_editing/tiptap/extensions/FlexContainer/FlexContainer";
import { HandleEditorDrop } from "metabase/rich_text_editing/tiptap/extensions/HandleEditorDrop/HandleEditorDrop";
import { LinkHoverMenu } from "metabase/rich_text_editing/tiptap/extensions/LinkHoverMenu/LinkHoverMenu";
@@ -43,6 +42,7 @@ import { Box, Center, Loader } from "metabase/ui";
import { DocumentBlockShell } from "./DocumentBlockShell";
import { DocumentEditorHostProvider } from "./DocumentEditorHost";
+import DropCursorS from "./DropCursor.module.css";
import S from "./Editor.module.css";
import { useCardEmbedsTracking, useQuestionSelection } from "./hooks";
diff --git a/frontend/src/metabase/home/components/HomePage/HomePage.tsx b/frontend/src/metabase/home/components/HomePage/HomePage.tsx
index 9cf39e74ce9..db37913852d 100644
--- a/frontend/src/metabase/home/components/HomePage/HomePage.tsx
+++ b/frontend/src/metabase/home/components/HomePage/HomePage.tsx
@@ -2,7 +2,7 @@ import { useLayoutEffect } from "react";
import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useHomepageDashboard } from "metabase/common/hooks/use-homepage-dashboard";
+import { useHomepageDashboard } from "metabase/home/use-homepage-dashboard";
import { useDispatch, useSelector } from "metabase/redux";
import { updateUserSetting } from "metabase/redux/settings";
import { addUndo } from "metabase/redux/undo";
diff --git a/frontend/src/metabase/common/hooks/use-homepage-dashboard.tsx b/frontend/src/metabase/home/use-homepage-dashboard.tsx
similarity index 100%
rename from frontend/src/metabase/common/hooks/use-homepage-dashboard.tsx
rename to frontend/src/metabase/home/use-homepage-dashboard.tsx
diff --git a/frontend/src/metabase/common/data-studio/hooks/use-load-card-with-metadata/index.ts b/frontend/src/metabase/metrics/common/use-load-card-with-metadata/index.ts
similarity index 100%
rename from frontend/src/metabase/common/data-studio/hooks/use-load-card-with-metadata/index.ts
rename to frontend/src/metabase/metrics/common/use-load-card-with-metadata/index.ts
diff --git a/frontend/src/metabase/common/data-studio/hooks/use-load-card-with-metadata/use-load-card-with-metadata.ts b/frontend/src/metabase/metrics/common/use-load-card-with-metadata/use-load-card-with-metadata.ts
similarity index 100%
rename from frontend/src/metabase/common/data-studio/hooks/use-load-card-with-metadata/use-load-card-with-metadata.ts
rename to frontend/src/metabase/metrics/common/use-load-card-with-metadata/use-load-card-with-metadata.ts
diff --git a/frontend/src/metabase/metrics/components/MetricPageCard/MetricPageCard.tsx b/frontend/src/metabase/metrics/components/MetricPageCard/MetricPageCard.tsx
index 9116050bf4c..7be6523b4f3 100644
--- a/frontend/src/metabase/metrics/components/MetricPageCard/MetricPageCard.tsx
+++ b/frontend/src/metabase/metrics/components/MetricPageCard/MetricPageCard.tsx
@@ -3,7 +3,7 @@ import type { ReactNode } from "react";
import { skipToken, useGetCardQueryQuery } from "metabase/api";
import { Unauthorized } from "metabase/common/components/ErrorPages";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useLoadCardWithMetadata } from "metabase/common/data-studio/hooks/use-load-card-with-metadata";
+import { useLoadCardWithMetadata } from "metabase/metrics/common/use-load-card-with-metadata";
import { Center } from "metabase/ui";
import * as Urls from "metabase/urls";
import { is403Error } from "metabase/utils/errors";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx
index 1a1bc949dc2..93120a0b47c 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx
@@ -12,10 +12,10 @@ import {
SidesheetCardTitle,
SidesheetTabPanelContainer,
} from "metabase/common/components/Sidesheet";
-import { InsightsTabOrLink } from "metabase/common/components/Sidesheet/components/InsightsTabOrLink";
import { SidesheetEditableDescription } from "metabase/common/components/Sidesheet/components/SidesheetEditableDescription";
import SidesheetStyles from "metabase/common/components/Sidesheet/sidesheet.module.css";
import { InsightsUpsellTab } from "metabase/common/components/upsells/InsightsUpsellTab";
+import { InsightsTabOrLink } from "metabase/common/components/upsells/components/InsightsTabOrLink";
import { PLUGIN_MODERATION } from "metabase/plugins";
import { QuestionActivityTimeline } from "metabase/query_builder/components/QuestionActivityTimeline";
import { useDispatch } from "metabase/redux";