Skip to content

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

Move `metabase/browse` to `feature` tier (#75377)

Romeo Van Snick403ceceffc89
diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjs
index d21121ae611..e04e6827c98 100644
--- a/frontend/lint/module-boundaries.mjs
+++ b/frontend/lint/module-boundaries.mjs
@@ -52,7 +52,7 @@ const elements = [
createElement({ type: "shared", name: "api" }),
createElement({ type: "shared", name: "archive" }),
createElement({ type: "feature", name: "auth" }),
- createElement({ type: "shared", name: "browse" }),
+ createElement({ type: "feature", name: "browse" }),
createElement({ type: "shared", name: "collections" }),
createElement({ type: "shared", name: "comments" }),
createElement({ type: "shared", name: "common" }),
diff --git a/frontend/src/metabase-types/api/activity.ts b/frontend/src/metabase-types/api/activity.ts
index ed06918c12b..f36e0bd4ea4 100644
--- a/frontend/src/metabase-types/api/activity.ts
+++ b/frontend/src/metabase-types/api/activity.ts
@@ -73,6 +73,13 @@ export type RecentCollectionItem = BaseRecentItem & {
collection_type?: CollectionType;
};
+/**
+ * Model retrieved through the recent views endpoint
+ */
+export interface RecentModel extends RecentCollectionItem {
+ model: "dataset";
+}
+
export type RecentItem = RecentTableItem | RecentCollectionItem;
export const isRecentTableItem = (item: RecentItem): item is RecentTableItem =>
diff --git a/frontend/src/metabase-types/api/mocks/activity.ts b/frontend/src/metabase-types/api/mocks/activity.ts
index 00df50de1df..7346b598313 100644
--- a/frontend/src/metabase-types/api/mocks/activity.ts
+++ b/frontend/src/metabase-types/api/mocks/activity.ts
@@ -1,6 +1,7 @@
import type {
PopularItem,
RecentCollectionItem,
+ RecentModel,
RecentTableDatabaseInfo,
RecentTableItem,
} from "metabase-types/api";
@@ -42,6 +43,11 @@ export const createMockRecentCollectionItem = (
...opts,
});
+export const createMockRecentModel = (
+ model: Partial<RecentCollectionItem>,
+): RecentModel =>
+ createMockRecentCollectionItem({ ...model, model: "dataset" }) as RecentModel;
+
export const createMockPopularTableItem = (
opts?: Partial<RecentTableItem>,
): PopularItem => createMockRecentTableItem(opts);
diff --git a/frontend/src/metabase-types/api/mocks/search.ts b/frontend/src/metabase-types/api/mocks/search.ts
index 7893258d060..111f10cf8ef 100644
--- a/frontend/src/metabase-types/api/mocks/search.ts
+++ b/frontend/src/metabase-types/api/mocks/search.ts
@@ -1,6 +1,10 @@
import _ from "underscore";
-import type { SearchResponse, SearchResult } from "metabase-types/api";
+import type {
+ ModelResult,
+ SearchResponse,
+ SearchResult,
+} from "metabase-types/api";
import { createMockCollection } from "./collection";
@@ -48,6 +52,11 @@ export const createMockSearchResult = (
};
};
+export const createMockModelResult = (
+ model: Partial<ModelResult> = {},
+): ModelResult =>
+ createMockSearchResult({ ...model, model: "dataset" }) as ModelResult;
+
export const createMockSearchResults = ({
items = [createMockSearchResult()],
options = {},
diff --git a/frontend/src/metabase-types/api/search.ts b/frontend/src/metabase-types/api/search.ts
index 820a248cc13..0083c0736ed 100644
--- a/frontend/src/metabase-types/api/search.ts
+++ b/frontend/src/metabase-types/api/search.ts
@@ -122,6 +122,11 @@ export interface SearchResult<
collection_id?: CollectionId;
}
+/**
+ * Model retrieved through the search endpoint
+ */
+export type ModelResult = SearchResult<number, "dataset">;
+
// The frontend surface that issued a search request; the backend uses it to pick ranking weights and
// filter defaults. Keep in sync with `metabase.search.config/ui-contexts`.
export type SearchContext =
diff --git a/frontend/src/metabase/browse/metrics/analytics.ts b/frontend/src/metabase/browse/metrics/analytics.ts
index bd93145ebc6..55240275ce7 100644
--- a/frontend/src/metabase/browse/metrics/analytics.ts
+++ b/frontend/src/metabase/browse/metrics/analytics.ts
@@ -13,10 +13,3 @@ export const trackMetricBookmarked = () => {
triggered_from: "browse_metrics",
});
};
-
-export const trackMetricPageShowMoreClicked = (metricId: number) => {
- trackSimpleEvent({
- event: "metric_page_show_more_clicked",
- target_id: metricId,
- });
-};
diff --git a/frontend/src/metabase/browse/models/test-utils.ts b/frontend/src/metabase/browse/models/test-utils.ts
index c3b0e8c7635..8ebb12f3de2 100644
--- a/frontend/src/metabase/browse/models/test-utils.ts
+++ b/frontend/src/metabase/browse/models/test-utils.ts
@@ -1,17 +1,4 @@
-import type { RecentCollectionItem } from "metabase-types/api";
-import {
- createMockRecentCollectionItem,
- createMockSearchResult,
+export {
+ createMockModelResult,
+ createMockRecentModel,
} from "metabase-types/api/mocks";
-
-import type { ModelResult, RecentModel } from "./types";
-
-export const createMockModelResult = (
- model: Partial<ModelResult> = {},
-): ModelResult =>
- createMockSearchResult({ ...model, model: "dataset" }) as ModelResult;
-
-export const createMockRecentModel = (
- model: Partial<RecentCollectionItem>,
-): RecentModel =>
- createMockRecentCollectionItem({ ...model, model: "dataset" }) as RecentModel;
diff --git a/frontend/src/metabase/browse/models/types.tsx b/frontend/src/metabase/browse/models/types.tsx
index 8136335a2c3..54208e6c740 100644
--- a/frontend/src/metabase/browse/models/types.tsx
+++ b/frontend/src/metabase/browse/models/types.tsx
@@ -1,16 +1,4 @@
-import type { RecentCollectionItem, SearchResult } from "metabase-types/api";
-
-/**
- * Model retrieved through the search endpoint
- */
-export type ModelResult = SearchResult<number, "dataset">;
-
-/**
- * Model retrieved through the recent views endpoint
- */
-export interface RecentModel extends RecentCollectionItem {
- model: "dataset";
-}
+export type { ModelResult, RecentModel } from "metabase-types/api";
export type ModelFilterSettings = {
verified?: boolean;
diff --git a/frontend/src/metabase/metrics/analytics.ts b/frontend/src/metabase/metrics/analytics.ts
new file mode 100644
index 00000000000..d0eb3ff34b8
--- /dev/null
+++ b/frontend/src/metabase/metrics/analytics.ts
@@ -0,0 +1,8 @@
+import { trackSimpleEvent } from "metabase/analytics";
+
+export const trackMetricPageShowMoreClicked = (metricId: number) => {
+ trackSimpleEvent({
+ event: "metric_page_show_more_clicked",
+ target_id: metricId,
+ });
+};
diff --git a/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx
index 92c323e7c06..be31b3e5e05 100644
--- a/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx
+++ b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx
@@ -3,7 +3,7 @@ import { push } from "react-router-redux";
import { t } from "ttag";
import _ from "underscore";
-import { trackMetricPageShowMoreClicked } from "metabase/browse/metrics/analytics";
+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";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx b/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx
index a1e309bdf42..03099f00c81 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx
@@ -19,7 +19,6 @@ import {
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import type { ModelResult } from "metabase/browse/models";
import { ROOT_COLLECTION } from "metabase/collections/constants";
import type { DashboardState, StoreDashboard } from "metabase/redux/store";
import {
@@ -28,7 +27,13 @@ import {
createMockState,
} from "metabase/redux/store/mocks";
import * as iframeUtils from "metabase/utils/iframe";
-import type { Card, Dashboard, DashboardId, User } from "metabase-types/api";
+import type {
+ Card,
+ Dashboard,
+ DashboardId,
+ ModelResult,
+ User,
+} from "metabase-types/api";
import {
createMockCollection,
createMockDatabase,
diff --git a/frontend/src/metabase/querying/notebook/components/DataStep/tests/setup.tsx b/frontend/src/metabase/querying/notebook/components/DataStep/tests/setup.tsx
index d9af75b4de0..e1c79084f84 100644
--- a/frontend/src/metabase/querying/notebook/components/DataStep/tests/setup.tsx
+++ b/frontend/src/metabase/querying/notebook/components/DataStep/tests/setup.tsx
@@ -6,11 +6,13 @@ import {
setupSearchEndpoints,
} from "__support__/server-mocks";
import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";
-import { createMockModelResult } from "metabase/browse/models/test-utils";
import { ROOT_COLLECTION } from "metabase/collections/constants";
import * as Lib from "metabase-lib";
import { columnFinder } from "metabase-lib/test-helpers";
-import { createMockCollection } from "metabase-types/api/mocks";
+import {
+ createMockCollection,
+ createMockModelResult,
+} from "metabase-types/api/mocks";
import { createSampleDatabase } from "metabase-types/api/mocks/presets";
import { createMockNotebookStep } from "../../../test-utils";
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/tests/setup.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/tests/setup.tsx
index ba699d8224e..8a0db84dc02 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/tests/setup.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/tests/setup.tsx
@@ -4,12 +4,12 @@ import {
setupSearchEndpoints,
} from "__support__/server-mocks";
import { renderWithProviders } from "__support__/ui";
-import { createMockModelResult } from "metabase/browse/models/test-utils";
import type { EmbeddingEntityType } from "metabase/redux/store/embedding-data-picker";
import { createMockState } from "metabase/redux/store/mocks";
import { createMockEmbeddingDataPickerState } from "metabase/redux/store/mocks/embedding-data-picker";
import type { Query } from "metabase-lib";
import Question from "metabase-lib/v1/Question";
+import { createMockModelResult } from "metabase-types/api/mocks";
import {
createOrdersTable,
createPeopleTable,