Skip to content

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

Move metrics to feature tier (#75776)

Romeo Van Snick9cdd481113c7
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricAboutPage/DataStudioMetricAboutPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricAboutPage/DataStudioMetricAboutPage.tsx
index b1a7216121c..db6d418e7d7 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricAboutPage/DataStudioMetricAboutPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricAboutPage/DataStudioMetricAboutPage.tsx
@@ -1,5 +1,5 @@
+import type { MetricPageParams } from "metabase/common/metrics/types";
import { MetricAboutPage } from "metabase/metrics/pages/MetricAboutPage";
-import type { MetricPageParams } from "metabase/metrics/types";
import { DataStudioMetricBreadcrumbs } from "../../components/DataStudioMetricBreadcrumbs";
import { dataStudioMetricUrls } from "../../urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricDependenciesPage/DataStudioMetricDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricDependenciesPage/DataStudioMetricDependenciesPage.tsx
index 3b8416bccad..ba7854609bf 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricDependenciesPage/DataStudioMetricDependenciesPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricDependenciesPage/DataStudioMetricDependenciesPage.tsx
@@ -1,7 +1,7 @@
import type { ReactNode } from "react";
+import type { MetricPageParams } from "metabase/common/metrics/types";
import { MetricDependenciesPage } from "metabase/metrics/pages/MetricDependenciesPage";
-import type { MetricPageParams } from "metabase/metrics/types";
import { DataStudioMetricBreadcrumbs } from "../../components/DataStudioMetricBreadcrumbs";
import { dataStudioMetricUrls } from "../../urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricHistoryPage/DataStudioMetricHistoryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricHistoryPage/DataStudioMetricHistoryPage.tsx
index 20f6fd2e75b..fee7087de66 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricHistoryPage/DataStudioMetricHistoryPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricHistoryPage/DataStudioMetricHistoryPage.tsx
@@ -1,5 +1,5 @@
+import type { MetricPageParams } from "metabase/common/metrics/types";
import { MetricHistoryPage } from "metabase/metrics/pages/MetricHistoryPage";
-import type { MetricPageParams } from "metabase/metrics/types";
import { DataStudioMetricBreadcrumbs } from "../../components/DataStudioMetricBreadcrumbs";
import { dataStudioMetricUrls } from "../../urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricOverviewPage/DataStudioMetricOverviewPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricOverviewPage/DataStudioMetricOverviewPage.tsx
index f32472701db..9132b719cf9 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricOverviewPage/DataStudioMetricOverviewPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricOverviewPage/DataStudioMetricOverviewPage.tsx
@@ -1,5 +1,5 @@
+import type { MetricPageParams } from "metabase/common/metrics/types";
import { MetricOverviewPage } from "metabase/metrics/pages/MetricOverviewPage";
-import type { MetricPageParams } from "metabase/metrics/types";
import { DataStudioMetricBreadcrumbs } from "../../components/DataStudioMetricBreadcrumbs";
import { dataStudioMetricUrls } from "../../urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricQueryPage/DataStudioMetricQueryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricQueryPage/DataStudioMetricQueryPage.tsx
index 084a7f97fa5..3e0cd472a12 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricQueryPage/DataStudioMetricQueryPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricQueryPage/DataStudioMetricQueryPage.tsx
@@ -1,7 +1,7 @@
import type { Route } from "react-router";
+import type { MetricPageParams } from "metabase/common/metrics/types";
import { MetricQueryPage } from "metabase/metrics/pages/MetricQueryPage";
-import type { MetricPageParams } from "metabase/metrics/types";
import { DataStudioMetricBreadcrumbs } from "../../components/DataStudioMetricBreadcrumbs";
import { dataStudioMetricUrls } from "../../urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/urls.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/urls.ts
index 72f9496259f..051b9af7585 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/urls.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/urls.ts
@@ -1,4 +1,4 @@
-import type { MetricUrls } from "metabase/metrics/types";
+import type { MetricUrls } from "metabase/common/metrics/types";
import * as Urls from "metabase/urls";
export const dataStudioMetricUrls: MetricUrls = {
diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjs
index f89f7b506e0..1d5f33c4cc3 100644
--- a/frontend/lint/module-boundaries.mjs
+++ b/frontend/lint/module-boundaries.mjs
@@ -95,8 +95,6 @@ const elements = [
}),
createElement({ type: "shared", name: "metabot" }),
createElement({ type: "shared", name: "metadata" }),
- createElement({ type: "shared", name: "metrics" }),
- createElement({ type: "feature", name: "metrics-viewer" }),
createElement({ type: "feature", name: "models" }),
createElement({ type: "shared", name: "new" }),
createElement({ type: "shared", name: "notifications" }),
@@ -138,6 +136,8 @@ const elements = [
pattern: "enterprise/frontend/src/metabase-enterprise/**",
mode: "full",
}),
+ createElement({ type: "feature", name: "metrics" }),
+ createElement({ type: "feature", name: "metrics-viewer" }),
createElement({ type: "feature", name: "public" }),
createElement({ type: "feature", name: "query_builder" }),
createElement({ type: "feature", name: "reference" }),
diff --git a/frontend/src/metabase/common/metrics-viewer/types.ts b/frontend/src/metabase/common/metrics-viewer/types.ts
index 005fc66793a..0a5bf1c873b 100644
--- a/frontend/src/metabase/common/metrics-viewer/types.ts
+++ b/frontend/src/metabase/common/metrics-viewer/types.ts
@@ -1,4 +1,4 @@
-import type { DimensionType } from "metabase/metrics/common/utils/dimension-types";
+import type { DimensionType } from "metabase/common/metrics/utils/dimension-types";
import type {
BooleanFilterParts,
CoordinateFilterParts,
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.tsx
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.tsx
rename to frontend/src/metabase/common/metrics/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.tsx
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/hooks.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/BooleanFilterPicker/hooks.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/hooks.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/BooleanFilterPicker/hooks.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/index.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/BooleanFilterPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/index.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/BooleanFilterPicker/index.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/utils.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/BooleanFilterPicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/utils.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/BooleanFilterPicker/utils.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/CoordinateDimensionPicker.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/CoordinateDimensionPicker.tsx
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/CoordinateDimensionPicker.tsx
rename to frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/CoordinateDimensionPicker.tsx
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/index.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/index.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/index.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/types.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/types.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/types.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/types.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/utils.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/utils.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/utils.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx
rename to frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/constants.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/constants.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/constants.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/constants.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/hooks.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/hooks.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/hooks.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/hooks.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/index.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/index.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/index.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/types.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/types.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/types.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/types.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/utils.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/utils.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/CoordinateFilterPicker/utils.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx
similarity index 97%
rename from frontend/src/metabase/metrics/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx
rename to frontend/src/metabase/common/metrics/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx
index 637eeed7e08..ad5b3dd6530 100644
--- a/frontend/src/metabase/metrics/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx
+++ b/frontend/src/metabase/common/metrics/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx
@@ -5,7 +5,7 @@ import {
getDateFilterClause,
getDatePickerUnits,
getDatePickerValue,
-} from "metabase/metrics/utils/dates";
+} from "metabase/common/metrics/utils/dates";
import { DatePicker } from "metabase/querying/common/components/DatePicker";
import type { DatePickerValue } from "metabase/querying/common/types";
import { Button, Flex, PopoverBackButton } from "metabase/ui";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/DateFilterPicker/index.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/DateFilterPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/DateFilterPicker/index.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/DateFilterPicker/index.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/DefaultFilterPicker.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/DefaultFilterPicker/DefaultFilterPicker.tsx
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/DefaultFilterPicker.tsx
rename to frontend/src/metabase/common/metrics/components/FilterPicker/DefaultFilterPicker/DefaultFilterPicker.tsx
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/constants.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/DefaultFilterPicker/constants.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/constants.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/DefaultFilterPicker/constants.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/hooks.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/DefaultFilterPicker/hooks.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/hooks.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/DefaultFilterPicker/hooks.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/index.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/DefaultFilterPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/index.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/DefaultFilterPicker/index.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/types.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/DefaultFilterPicker/types.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/types.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/DefaultFilterPicker/types.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/utils.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/DefaultFilterPicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/utils.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/DefaultFilterPicker/utils.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.module.css b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.module.css
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.module.css
rename to frontend/src/metabase/common/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.module.css
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx
rename to frontend/src/metabase/common/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterOperatorPicker/index.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterOperatorPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/FilterOperatorPicker/index.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/FilterOperatorPicker/index.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerBody/FilterPickerBody.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerBody/FilterPickerBody.tsx
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/FilterPickerBody/FilterPickerBody.tsx
rename to frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerBody/FilterPickerBody.tsx
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerBody/index.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerBody/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/FilterPickerBody/index.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerBody/index.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.module.css b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.module.css
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.module.css
rename to frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.module.css
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.tsx
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.tsx
rename to frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.tsx
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerFooter/index.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerFooter/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/FilterPickerFooter/index.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerFooter/index.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerHeader/FilterPickerHeader.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerHeader/FilterPickerHeader.tsx
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/FilterPickerHeader/FilterPickerHeader.tsx
rename to frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerHeader/FilterPickerHeader.tsx
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerHeader/index.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerHeader/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/FilterPickerHeader/index.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/FilterPickerHeader/index.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterSubmitButton/FilterSubmitButton.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterSubmitButton/FilterSubmitButton.tsx
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/FilterSubmitButton/FilterSubmitButton.tsx
rename to frontend/src/metabase/common/metrics/components/FilterPicker/FilterSubmitButton/FilterSubmitButton.tsx
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterSubmitButton/index.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterSubmitButton/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/FilterSubmitButton/index.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/FilterSubmitButton/index.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx
rename to frontend/src/metabase/common/metrics/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/index.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterValuePicker/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/index.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/FilterValuePicker/index.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/utils.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/FilterValuePicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/utils.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/FilterValuePicker/utils.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx
rename to frontend/src/metabase/common/metrics/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/constants.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/NumberFilterPicker/constants.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/constants.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/NumberFilterPicker/constants.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/hooks.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/NumberFilterPicker/hooks.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/hooks.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/NumberFilterPicker/hooks.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/index.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/NumberFilterPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/index.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/NumberFilterPicker/index.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/types.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/NumberFilterPicker/types.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/types.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/NumberFilterPicker/types.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/utils.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/NumberFilterPicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/utils.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/NumberFilterPicker/utils.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/StringFilterPicker.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/StringFilterPicker/StringFilterPicker.tsx
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/StringFilterPicker.tsx
rename to frontend/src/metabase/common/metrics/components/FilterPicker/StringFilterPicker/StringFilterPicker.tsx
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/constants.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/StringFilterPicker/constants.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/constants.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/StringFilterPicker/constants.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/hooks.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/StringFilterPicker/hooks.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/hooks.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/StringFilterPicker/hooks.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/index.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/StringFilterPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/index.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/StringFilterPicker/index.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/types.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/StringFilterPicker/types.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/types.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/StringFilterPicker/types.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/utils.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/StringFilterPicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/utils.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/StringFilterPicker/utils.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.tsx b/frontend/src/metabase/common/metrics/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.tsx
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.tsx
rename to frontend/src/metabase/common/metrics/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.tsx
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/constants.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/TimeFilterPicker/constants.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/constants.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/TimeFilterPicker/constants.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/hooks.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/TimeFilterPicker/hooks.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/hooks.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/TimeFilterPicker/hooks.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/index.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/TimeFilterPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/index.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/TimeFilterPicker/index.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/types.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/TimeFilterPicker/types.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/types.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/TimeFilterPicker/types.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/utils.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/TimeFilterPicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/utils.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/TimeFilterPicker/utils.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/constants.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/constants.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/constants.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/constants.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/types.ts b/frontend/src/metabase/common/metrics/components/FilterPicker/types.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/FilterPicker/types.ts
rename to frontend/src/metabase/common/metrics/components/FilterPicker/types.ts
diff --git a/frontend/src/metabase/metrics/components/TemporalBucketPicker/TemporalBucketPicker.tsx b/frontend/src/metabase/common/metrics/components/TemporalBucketPicker/TemporalBucketPicker.tsx
similarity index 90%
rename from frontend/src/metabase/metrics/components/TemporalBucketPicker/TemporalBucketPicker.tsx
rename to frontend/src/metabase/common/metrics/components/TemporalBucketPicker/TemporalBucketPicker.tsx
index 337f799b046..fab88e657ac 100644
--- a/frontend/src/metabase/metrics/components/TemporalBucketPicker/TemporalBucketPicker.tsx
+++ b/frontend/src/metabase/common/metrics/components/TemporalBucketPicker/TemporalBucketPicker.tsx
@@ -1,8 +1,8 @@
import { type Ref, forwardRef } from "react";
import { t } from "ttag";
-import type { DimensionWithDefinition } from "metabase/metrics/types";
-import { getCommonTemporalUnits } from "metabase/metrics/utils/dates";
+import type { DimensionWithDefinition } from "metabase/common/metrics/types";
+import { getCommonTemporalUnits } from "metabase/common/metrics/utils/dates";
import { TemporalUnitPicker } from "metabase/querying/common/components/TemporalUnitPicker";
import { Button } from "metabase/ui";
import * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/metrics/components/TemporalBucketPicker/index.ts b/frontend/src/metabase/common/metrics/components/TemporalBucketPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics/components/TemporalBucketPicker/index.ts
rename to frontend/src/metabase/common/metrics/components/TemporalBucketPicker/index.ts
diff --git a/frontend/src/metabase/metrics/types.ts b/frontend/src/metabase/common/metrics/types.ts
similarity index 100%
rename from frontend/src/metabase/metrics/types.ts
rename to frontend/src/metabase/common/metrics/types.ts
diff --git a/frontend/src/metabase/metrics/utils/dates.ts b/frontend/src/metabase/common/metrics/utils/dates.ts
similarity index 100%
rename from frontend/src/metabase/metrics/utils/dates.ts
rename to frontend/src/metabase/common/metrics/utils/dates.ts
diff --git a/frontend/src/metabase/metrics/common/utils/dimension-descriptors.ts b/frontend/src/metabase/common/metrics/utils/dimension-descriptors.ts
similarity index 100%
rename from frontend/src/metabase/metrics/common/utils/dimension-descriptors.ts
rename to frontend/src/metabase/common/metrics/utils/dimension-descriptors.ts
diff --git a/frontend/src/metabase/metrics/common/utils/dimension-types.ts b/frontend/src/metabase/common/metrics/utils/dimension-types.ts
similarity index 100%
rename from frontend/src/metabase/metrics/common/utils/dimension-types.ts
rename to frontend/src/metabase/common/metrics/utils/dimension-types.ts
diff --git a/frontend/src/metabase/metrics/utils/dimensions.ts b/frontend/src/metabase/common/metrics/utils/dimensions.ts
similarity index 100%
rename from frontend/src/metabase/metrics/utils/dimensions.ts
rename to frontend/src/metabase/common/metrics/utils/dimensions.ts
diff --git a/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopoverContent.tsx b/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopoverContent.tsx
index 06b5945e16e..6ecf8f057a1 100644
--- a/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopoverContent.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopoverContent.tsx
@@ -3,7 +3,7 @@ import { useCallback, useMemo, useState } from "react";
import { t } from "ttag";
import { SourceColorIndicator } from "metabase/common/components/SourceColorIndicator";
-import { FilterPickerBody } from "metabase/metrics/components/FilterPicker/FilterPickerBody";
+import { FilterPickerBody } from "metabase/common/metrics/components/FilterPicker/FilterPickerBody";
import {
Badge,
Box,
diff --git a/frontend/src/metabase/metrics-viewer/components/FilterPopover/MetricGroupFilterSectionList.tsx b/frontend/src/metabase/metrics-viewer/components/FilterPopover/MetricGroupFilterSectionList.tsx
index 3f778a65a43..d2f39d5f816 100644
--- a/frontend/src/metabase/metrics-viewer/components/FilterPopover/MetricGroupFilterSectionList.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/FilterPopover/MetricGroupFilterSectionList.tsx
@@ -1,7 +1,7 @@
import { useCallback } from "react";
import { AccordionList } from "metabase/common/components/AccordionList";
-import { getDimensionIcon } from "metabase/metrics/utils/dimensions";
+import { getDimensionIcon } from "metabase/common/metrics/utils/dimensions";
import type {
DimensionListItem,
FilterItem,
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BucketButton/BucketButton.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BucketButton/BucketButton.tsx
index cd10ed5bc67..f9d5e9d3dc8 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BucketButton/BucketButton.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BucketButton/BucketButton.tsx
@@ -1,8 +1,8 @@
import { useMemo, useState } from "react";
import { t } from "ttag";
-import { TemporalBucketPicker } from "metabase/metrics/components/TemporalBucketPicker";
-import type { DimensionWithDefinition } from "metabase/metrics/types";
+import { TemporalBucketPicker } from "metabase/common/metrics/components/TemporalBucketPicker";
+import type { DimensionWithDefinition } from "metabase/common/metrics/types";
import { Button, Popover } from "metabase/ui";
import * as Lib from "metabase-lib";
import type {
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/DimensionFilterButton/DimensionFilterButton.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/DimensionFilterButton/DimensionFilterButton.tsx
index 98f04da9c1d..10af5862b65 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/DimensionFilterButton/DimensionFilterButton.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/DimensionFilterButton/DimensionFilterButton.tsx
@@ -1,7 +1,7 @@
import { useCallback, useMemo, useState } from "react";
import { t } from "ttag";
-import { FilterPickerBody } from "metabase/metrics/components/FilterPicker/FilterPickerBody";
+import { FilterPickerBody } from "metabase/common/metrics/components/FilterPicker/FilterPickerBody";
import {
trackMetricsViewerFilterAdded,
trackMetricsViewerFilterEdited,
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPillPopover.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPillPopover.tsx
index 23356205730..a50ea976d14 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPillPopover.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPillPopover.tsx
@@ -1,6 +1,6 @@
import { useState } from "react";
-import { FilterPickerBody } from "metabase/metrics/components/FilterPicker/FilterPickerBody";
+import { FilterPickerBody } from "metabase/common/metrics/components/FilterPicker/FilterPickerBody";
import {
trackMetricsViewerFilterEdited,
trackMetricsViewerFilterRemoved,
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/utils.ts b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/utils.ts
index 89991c17b30..2a9f2278613 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/utils.ts
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/utils.ts
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { getDatePickerValue } from "metabase/metrics/utils/dates";
+import { getDatePickerValue } from "metabase/common/metrics/utils/dates";
import { getDateFilterDisplayName } from "metabase/querying/common/utils/dates";
import * as Lib from "metabase-lib";
import * as LibMetric from "metabase-lib/metric";
diff --git a/frontend/src/metabase/metrics-viewer/types/viewer-state.ts b/frontend/src/metabase/metrics-viewer/types/viewer-state.ts
index edc2f720459..1cb817e95a1 100644
--- a/frontend/src/metabase/metrics-viewer/types/viewer-state.ts
+++ b/frontend/src/metabase/metrics-viewer/types/viewer-state.ts
@@ -1,9 +1,9 @@
+import type { GeoSubtype } from "metabase/common/metrics/utils/dimension-types";
import type {
MetricsViewerDimensionBreakoutType,
MetricsViewerDisplayType,
SerializedDefinitionInfo,
} from "metabase/common/metrics-viewer";
-import type { GeoSubtype } from "metabase/metrics/common/utils/dimension-types";
import type {
DimensionGroup,
MetricDefinition,
diff --git a/frontend/src/metabase/metrics-viewer/utils/dimension-breakout-config.ts b/frontend/src/metabase/metrics-viewer/utils/dimension-breakout-config.ts
index 6cf5a022a54..418dcb8014e 100644
--- a/frontend/src/metabase/metrics-viewer/utils/dimension-breakout-config.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/dimension-breakout-config.ts
@@ -1,7 +1,7 @@
import {
DIMENSION_PREDICATES,
getGeoSubtype,
-} from "metabase/metrics/common/utils/dimension-types";
+} from "metabase/common/metrics/utils/dimension-types";
import { getColorplethColorScale } from "metabase/visualizations/components/ChoroplethMap";
import { getBreakoutSeriesName } from "metabase/visualizations/echarts/cartesian/model/series";
import type { DimensionMetadata } from "metabase-lib/metric";
diff --git a/frontend/src/metabase/metrics-viewer/utils/dimension-breakouts.ts b/frontend/src/metabase/metrics-viewer/utils/dimension-breakouts.ts
index a001092a8c0..10c41c830ec 100644
--- a/frontend/src/metabase/metrics-viewer/utils/dimension-breakouts.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/dimension-breakouts.ts
@@ -1,8 +1,8 @@
import { t } from "ttag";
-import type { DimensionDescriptor } from "metabase/metrics/common/utils/dimension-descriptors";
-import { getDimensionDescriptors } from "metabase/metrics/common/utils/dimension-descriptors";
-import { GEO_SUBTYPE_PRIORITY } from "metabase/metrics/common/utils/dimension-types";
+import type { DimensionDescriptor } from "metabase/common/metrics/utils/dimension-descriptors";
+import { getDimensionDescriptors } from "metabase/common/metrics/utils/dimension-descriptors";
+import { GEO_SUBTYPE_PRIORITY } from "metabase/common/metrics/utils/dimension-types";
import { getObjectEntries, objectFromEntries } from "metabase/utils/objects";
import { isNotNull } from "metabase/utils/types";
import type { DimensionMetadata, MetricDefinition } from "metabase-lib/metric";
diff --git a/frontend/src/metabase/metrics-viewer/utils/dimension-picker.ts b/frontend/src/metabase/metrics-viewer/utils/dimension-picker.ts
index f2bc7c04cd7..222878b1a4c 100644
--- a/frontend/src/metabase/metrics-viewer/utils/dimension-picker.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/dimension-picker.ts
@@ -1,7 +1,7 @@
import {
type GeoSubtype,
getGeoSubtype,
-} from "metabase/metrics/common/utils/dimension-types";
+} from "metabase/common/metrics/utils/dimension-types";
import type {
DimensionGroup,
DimensionMetadata,
diff --git a/frontend/src/metabase/metrics/common/hooks/use-metric-dimension-query.ts b/frontend/src/metabase/metrics/common/hooks/use-metric-dimension-query.ts
index 428a756829f..0d7458a57ff 100644
--- a/frontend/src/metabase/metrics/common/hooks/use-metric-dimension-query.ts
+++ b/frontend/src/metabase/metrics/common/hooks/use-metric-dimension-query.ts
@@ -1,10 +1,10 @@
import { useMemo } from "react";
import { skipToken, useGetMetricDatasetQuery } from "metabase/api";
+import { getDimensionDescriptors } from "metabase/common/metrics/utils/dimension-descriptors";
import type { MetricDefinition } from "metabase-lib/metric";
import * as LibMetric from "metabase-lib/metric";
-import { getDimensionDescriptors } from "../utils/dimension-descriptors";
import { projectDimension } from "../utils/project-dimension";
export function useMetricDimensionQuery(
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/DateFilterSection/DateFilterSection.tsx b/frontend/src/metabase/metrics/components/FilterPanel/DateFilterSection/DateFilterSection.tsx
index 2f3b30ff86d..f1079719701 100644
--- a/frontend/src/metabase/metrics/components/FilterPanel/DateFilterSection/DateFilterSection.tsx
+++ b/frontend/src/metabase/metrics/components/FilterPanel/DateFilterSection/DateFilterSection.tsx
@@ -1,6 +1,6 @@
import { useMemo } from "react";
-import { getDatePickerValue } from "metabase/metrics/utils/dates";
+import { getDatePickerValue } from "metabase/common/metrics/utils/dates";
import { getDateFilterDisplayName } from "metabase/querying/common/utils/dates";
import * as LibMetric from "metabase-lib/metric";
diff --git a/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx
index be31b3e5e05..54a08cedb9a 100644
--- a/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx
+++ b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx
@@ -3,9 +3,9 @@ import { push } from "react-router-redux";
import { t } from "ttag";
import _ from "underscore";
+import type { DimensionType } from "metabase/common/metrics/utils/dimension-types";
import { trackMetricPageShowMoreClicked } from "metabase/metrics/analytics";
import { useMetricDimensionQuery } from "metabase/metrics/common/hooks";
-import type { DimensionType } from "metabase/metrics/common/utils/dimension-types";
import { useDispatch } from "metabase/redux";
import {
Button,
diff --git a/frontend/src/metabase/metrics/components/MetricDimensionGrid/utils.ts b/frontend/src/metabase/metrics/components/MetricDimensionGrid/utils.ts
index 864349fadd9..e7a95064c73 100644
--- a/frontend/src/metabase/metrics/components/MetricDimensionGrid/utils.ts
+++ b/frontend/src/metabase/metrics/components/MetricDimensionGrid/utils.ts
@@ -1,13 +1,13 @@
-import type { DimensionDescriptor } from "metabase/metrics/common/utils/dimension-descriptors";
-import { getDimensionDescriptors } from "metabase/metrics/common/utils/dimension-descriptors";
+import type { DimensionDescriptor } from "metabase/common/metrics/utils/dimension-descriptors";
+import { getDimensionDescriptors } from "metabase/common/metrics/utils/dimension-descriptors";
import type {
DimensionType,
GeoSubtype,
-} from "metabase/metrics/common/utils/dimension-types";
+} from "metabase/common/metrics/utils/dimension-types";
import {
GEO_SUBTYPE_PRIORITY,
getGeoSubtype,
-} from "metabase/metrics/common/utils/dimension-types";
+} from "metabase/common/metrics/utils/dimension-types";
import type { MetricDefinition } from "metabase-lib/metric";
export interface DefaultDimension {
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricHeader.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricHeader.tsx
index cea2823ea4d..d57f1be5e2a 100644
--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricHeader.tsx
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricHeader.tsx
@@ -1,5 +1,6 @@
import type { ReactNode } from "react";
+import type { MetricUrls } from "metabase/common/metrics/types";
import {
PaneHeader,
PanelHeaderTitle,
@@ -8,8 +9,6 @@ import { PLUGIN_MODERATION } from "metabase/plugins";
import { Flex, Group } from "metabase/ui";
import type { Card } from "metabase-types/api";
-import type { MetricUrls } from "../../types";
-
import { MetricNameInput } from "./MetricNameInput";
import { MetricTabs } from "./MetricTabs";
import { MetricToolbar } from "./MetricToolbar";
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
index 0f2ab83cc45..29f23975c48 100644
--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
@@ -2,6 +2,7 @@ import { useMemo } from "react";
import { t } from "ttag";
import { useGetMetricQuery } from "metabase/api/metric";
+import type { MetricUrls } from "metabase/common/metrics/types";
import {
type PaneHeaderTab,
PaneHeaderTabs,
@@ -15,8 +16,6 @@ import * as Lib from "metabase-lib";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type { Card } from "metabase-types/api";
-import type { MetricUrls } from "../../../types";
-
interface MetricTabsProps {
card: Card;
urls: MetricUrls;
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.unit.spec.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.unit.spec.tsx
index 91b11b3ea19..529ac15a817 100644
--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.unit.spec.tsx
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.unit.spec.tsx
@@ -3,6 +3,7 @@ import { setupMetricEndpoint } from "__support__/server-mocks/metric";
import { mockSettings } from "__support__/settings";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
+import type { MetricUrls } from "metabase/common/metrics/types";
import { createMockState } from "metabase/redux/store/mocks";
import type { Card } from "metabase-types/api";
import {
@@ -17,8 +18,6 @@ import {
} from "metabase-types/api/mocks/metric";
import { createSampleDatabase } from "metabase-types/api/mocks/presets";
-import type { MetricUrls } from "../../../types";
-
import { MetricTabs } from "./MetricTabs";
const urls: MetricUrls = {
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx
index cc6491ef7f8..11592511149 100644
--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx
@@ -9,6 +9,7 @@ import {
useListNotificationsQuery,
} from "metabase/api";
import { AddToDashSelectDashModal } from "metabase/common/components/Pickers/AddToDashSelectDashModal";
+import type { MetricUrls } from "metabase/common/metrics/types";
import { canAccessDataStudio as canAccessDataStudioSelector } from "metabase/data-studio/selectors";
import { QuestionAlertListModal } from "metabase/notifications/modals/QuestionAlertListModal";
import {
@@ -30,8 +31,6 @@ import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type { Card } from "metabase-types/api";
-import type { MetricUrls } from "../../../types";
-
import S from "./MetricToolbar.module.css";
type MetricModalType =
diff --git a/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.tsx b/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.tsx
index 571fbf59f05..ffbab194b91 100644
--- a/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.tsx
+++ b/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.tsx
@@ -5,11 +5,11 @@ import { t } from "ttag";
import { useDeleteCardMutation, useUpdateCardMutation } from "metabase/api";
import { ArchivedEntityBanner } from "metabase/archive/components/ArchivedEntityBanner";
import type { CollectionPickerValueItem } from "metabase/common/components/Pickers/CollectionPicker";
+import type { MetricUrls } from "metabase/common/metrics/types";
import { useDispatch } from "metabase/redux";
import { addUndo } from "metabase/redux/undo";
import type { Card } from "metabase-types/api";
-import type { MetricUrls } from "../../types";
import { CollectionBreadcrumbs } from "../CollectionBreadcrumbs";
import { MetricHeader } from "../MetricHeader";
diff --git a/frontend/src/metabase/metrics/components/TemporalFilterPicker/TemporalFilterPicker.tsx b/frontend/src/metabase/metrics/components/TemporalFilterPicker/TemporalFilterPicker.tsx
index e2d8eda0743..02bd017572d 100644
--- a/frontend/src/metabase/metrics/components/TemporalFilterPicker/TemporalFilterPicker.tsx
+++ b/frontend/src/metabase/metrics/components/TemporalFilterPicker/TemporalFilterPicker.tsx
@@ -1,11 +1,11 @@
import { type Ref, forwardRef } from "react";
import { t } from "ttag";
-import type { DimensionWithDefinition } from "metabase/metrics/types";
+import type { DimensionWithDefinition } from "metabase/common/metrics/types";
import {
getCommonTemporalUnits,
isDatePickerUnit,
-} from "metabase/metrics/utils/dates";
+} from "metabase/common/metrics/utils/dates";
import { SimpleDatePicker } from "metabase/querying/common/components/DatePicker/SimpleDatePicker";
import type { DatePickerValue } from "metabase/querying/common/types";
import { getDateFilterDisplayName } from "metabase/querying/filters/utils/dates";
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.tsx
index b651ef1a01f..c5209a28939 100644
--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.tsx
@@ -8,6 +8,7 @@ import {
import { DateTime } from "metabase/common/components/DateTime";
import { EditableText } from "metabase/common/components/EditableText";
import { Markdown } from "metabase/common/components/Markdown";
+import type { MetricUrls } from "metabase/common/metrics/types";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { useSelector } from "metabase/redux";
@@ -16,8 +17,6 @@ import { Box, Stack, Text, Tooltip } from "metabase/ui";
import { getRelativeTime } from "metabase/utils/time-dayjs";
import type { Card as CardApiType, CardType } from "metabase-types/api";
-import type { MetricUrls } from "../../../../types";
-
import { MetadataCard, MetadataRow, MetadataRowLink } from "./MetadataCard";
import { MetricSubSection } from "./MetricSubSection";
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.unit.spec.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.unit.spec.tsx
index f08357f9bf9..ba4db288944 100644
--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.unit.spec.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.unit.spec.tsx
@@ -6,6 +6,7 @@ import { setupDependencyGraphEndpoint } from "__support__/server-mocks/dependenc
import { setupTableEndpoints } from "__support__/server-mocks/table";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
+import type { MetricUrls } from "metabase/common/metrics/types";
import { createMockState } from "metabase/redux/store/mocks";
import type { Card } from "metabase-types/api";
import {
@@ -21,8 +22,6 @@ import {
createMockDependencyGraph,
} from "metabase-types/api/mocks/dependencies";
-import type { MetricUrls } from "../../../../types";
-
import { DescriptionSection } from "./DescriptionSection";
const DATABASE_ID = 42;
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx
index 5314c3ae553..6e91bd02751 100644
--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx
@@ -1,3 +1,4 @@
+import type { MetricUrls } from "metabase/common/metrics/types";
import { MetricCardVisualization } from "metabase/data-studio/common/components/OverviewVisualization";
import { useCardQueryData } from "metabase/data-studio/common/hooks/use-card-query-data";
import { isNumericMetric } from "metabase/metrics/utils/validation";
@@ -5,8 +6,6 @@ import { Box, Flex, Stack } from "metabase/ui";
import { isDate, isNumeric } from "metabase-lib/v1/types/utils/isa";
import type { Card } from "metabase-types/api";
-import type { MetricUrls } from "../../../types";
-
import { AboutVisualization } from "./AboutVisualization";
import { DescriptionSection } from "./DescriptionSection";
import { ExploreMetricButton } from "./ExploreMetricButton";
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx
index 0b9dd1eb3c1..8ec0c3c2436 100644
--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx
@@ -1,8 +1,8 @@
+import type { MetricPageProps } from "metabase/common/metrics/types";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { MetricPageCard } from "../../components/MetricPageCard";
import { MetricPageShell } from "../../components/MetricPageShell";
-import type { MetricPageProps } from "../../types";
import { metricUrls as defaultUrls } from "../../urls";
import { MetricAbout } from "./MetricAbout";
diff --git a/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx b/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
index 89e10ba8588..05a618427e4 100644
--- a/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
@@ -1,12 +1,12 @@
import type { ReactNode } from "react";
+import type { MetricPageProps } from "metabase/common/metrics/types";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Card } from "metabase/ui";
import { MetricPageCard } from "../../components/MetricPageCard";
import { MetricPageShell } from "../../components/MetricPageShell";
-import type { MetricPageProps } from "../../types";
import { metricUrls as defaultUrls } from "../../urls";
interface MetricDependenciesPageProps extends MetricPageProps {
diff --git a/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx b/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx
index ff82c9fef88..b5a9485d4c0 100644
--- a/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx
@@ -1,10 +1,10 @@
+import type { MetricPageProps } from "metabase/common/metrics/types";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { Box, Card } from "metabase/ui";
import { MetricActivityTimeline } from "../../components/MetricActivityTimeline";
import { MetricPageCard } from "../../components/MetricPageCard";
import { MetricPageShell } from "../../components/MetricPageShell";
-import type { MetricPageProps } from "../../types";
import { metricUrls as defaultUrls } from "../../urls";
import S from "./MetricHistoryPage.module.css";
diff --git a/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx b/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
index 01fddb5bf6e..bd4a73ee165 100644
--- a/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
@@ -3,6 +3,10 @@ import { replace } from "react-router-redux";
import { useGetMetricQuery } from "metabase/api/metric";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import type {
+ MetricPageProps,
+ MetricUrls,
+} from "metabase/common/metrics/types";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { useDispatch } from "metabase/redux";
import { Center } from "metabase/ui";
@@ -11,7 +15,6 @@ import type { Card } from "metabase-types/api";
import { MetricDimensionGrid } from "../../components/MetricDimensionGrid";
import { MetricPageCard } from "../../components/MetricPageCard";
import { MetricPageShell } from "../../components/MetricPageShell";
-import type { MetricPageProps, MetricUrls } from "../../types";
import { metricUrls as defaultUrls } from "../../urls";
export function MetricOverviewPage({
diff --git a/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
index 76bc6ff616c..6f76957fe9b 100644
--- a/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
@@ -5,6 +5,10 @@ import { t } from "ttag";
import { useUpdateCardMutation } from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import type {
+ MetricPageProps,
+ MetricUrls,
+} from "metabase/common/metrics/types";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";
import { getResultMetadata } from "metabase/data-studio/common/utils";
@@ -20,7 +24,6 @@ import type { Card as CardApiType } from "metabase-types/api";
import { MetricPageCard } from "../../components/MetricPageCard";
import { MetricPageShell } from "../../components/MetricPageShell";
import { MetricQueryEditor } from "../../components/MetricQueryEditor";
-import type { MetricPageProps, MetricUrls } from "../../types";
import { metricUrls as defaultUrls } from "../../urls";
import { getValidationResult } from "../../utils/validation";
diff --git a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx
index b6897c028b0..9d683defe40 100644
--- a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx
+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx
@@ -8,6 +8,7 @@ import { t } from "ttag";
import { useGetDefaultCollectionId } from "metabase/collections/hooks";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import type { MetricUrls } from "metabase/common/metrics/types";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import {
PaneHeader,
@@ -25,7 +26,6 @@ import * as Urls from "metabase/urls";
import * as Lib from "metabase-lib";
import type { Card as CardApiType } from "metabase-types/api";
-import type { MetricUrls } from "../../types";
import { metricUrls as defaultUrls } from "../../urls";
import { getValidationResult } from "../../utils/validation";
diff --git a/frontend/src/metabase/metrics/urls.ts b/frontend/src/metabase/metrics/urls.ts
index 9649ab03d9d..3d80b366472 100644
--- a/frontend/src/metabase/metrics/urls.ts
+++ b/frontend/src/metabase/metrics/urls.ts
@@ -1,8 +1,7 @@
+import type { MetricUrls } from "metabase/common/metrics/types";
import * as Urls from "metabase/urls";
import { isConcreteTableId } from "metabase-types/api";
-import type { MetricUrls } from "./types";
-
export const metricUrls: MetricUrls = {
about: Urls.metricAbout,
overview: Urls.metricOverview,
diff --git a/frontend/src/metabase/urls/metrics.ts b/frontend/src/metabase/urls/metrics.ts
index f57aedd2221..22dd4d0632b 100644
--- a/frontend/src/metabase/urls/metrics.ts
+++ b/frontend/src/metabase/urls/metrics.ts
@@ -1,9 +1,9 @@
+import type { DimensionType } from "metabase/common/metrics/utils/dimension-types";
import {
type MetricsViewerDisplayType,
type SerializedMetricsViewerPageState,
encodeState,
} from "metabase/common/metrics-viewer";
-import type { DimensionType } from "metabase/metrics/common/utils/dimension-types";
import type { CardId, CollectionId } from "metabase-types/api";
import { card as urlForCard } from "./cards";