Skip to content

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

Use Mini Picker and Entity Picker in Metrics Viewer (#73137)

Kevin Kelleher8b0f6d14f8fb
diff --git a/e2e/support/helpers/e2e-metrics-viewer-helpers.ts b/e2e/support/helpers/e2e-metrics-viewer-helpers.ts
index bbcbb147d9e..8fc17eb5d6a 100644
--- a/e2e/support/helpers/e2e-metrics-viewer-helpers.ts
+++ b/e2e/support/helpers/e2e-metrics-viewer-helpers.ts
@@ -7,7 +7,7 @@ export const MetricsViewer = {
return cy.findByTestId("metrics-viewer-search-input");
},
searchBarPills: () => cy.findAllByTestId("metrics-viewer-search-pill"),
- searchResults: () => cy.findByTestId("metrics-search-results"),
+ searchResults: () => cy.findByTestId("mini-picker"),
breakoutLegend: () => cy.findByTestId("metrics-viewer-breakout-legend"),
getFilterButton: () => cy.findByRole("button", { name: /Filter/ }),
getAllFilterPills: () => cy.findAllByTestId("metrics-viewer-filter-pill"),
diff --git a/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts b/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts
index 48128bd9a52..63990848810 100644
--- a/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts
+++ b/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts
@@ -9,6 +9,8 @@ import {
ORDERS_MODEL_ID,
} from "e2e/support/cypress_sample_instance_data";
import type { StructuredQuestionDetails } from "e2e/support/helpers";
+import { createLibraryWithTable } from "e2e/support/test-library-data";
+
const { ORDERS_ID, ORDERS, PRODUCTS_ID, PRODUCTS, ACCOUNTS_ID, FEEDBACK_ID } =
SAMPLE_DATABASE;
@@ -403,17 +405,60 @@ describe("scenarios > metrics > explorer", () => {
H.MetricsViewer.searchInput().type("{end}, xyznonexistent");
H.MetricsViewer.searchResults().should(
"contain.text",
- "No results found",
+ "No search results",
);
});
+ it("should add metrics and measures from the entity picker", () => {
+ H.activateToken("pro-self-hosted");
+ createLibraryWithTable();
+ H.MetricsViewer.goToViewer();
+
+ cy.log("Add a metric from the entity picker");
+ H.MetricsViewer.searchInput().click();
+ H.MetricsViewer.searchResults().findByText("Browse all").click();
+ H.pickEntity({ path: ["Our analytics", "Count of orders"] });
+
+ cy.log("Add a measure from the entity picker");
+ H.MetricsViewer.searchInput().click();
+ H.MetricsViewer.searchResults().findByText("Browse all").click();
+ H.pickEntity({ path: ["Library", "Data", "Orders", "Test Measure"] });
+
+ H.MetricsViewer.runButton().click();
+
+ verifyMetricCount(2);
+
+ H.MetricsViewer.searchInput().click();
+ H.MetricsViewer.searchResults().findByText("Browse all").click();
+ H.pickEntity({ path: ["Databases", "Sample Database"] });
+
+ cy.log("People is disabled because it doesn't have measures");
+ H.entityPickerModalItem(2, "People").should(
+ "have.attr",
+ "data-disabled",
+ "true",
+ );
+
+ cy.log("Orders is not disabled because it has measures");
+ H.entityPickerModalItem(2, "Orders").should(
+ "not.have.attr",
+ "data-disabled",
+ );
+
+ cy.log("Can search for measures");
+ H.entityPickerModal().within(() => {
+ cy.findByPlaceholderText("Search…").type("Test");
+ H.entityPickerModalItem(1, "Test Measure").should("be.visible");
+ });
+ });
+
it("should not show me metrics that live in collections I do not have permissions to see", () => {
cy.signIn("nocollection");
H.MetricsViewer.goToViewer();
H.MetricsViewer.searchInput().type("Count of");
H.MetricsViewer.searchResults().should(
"contain.text",
- "No results found",
+ "No search results",
);
H.MetricsViewer.searchInput().clear().type("Test Measure");
@@ -426,7 +471,7 @@ describe("scenarios > metrics > explorer", () => {
H.MetricsViewer.searchInput().type("Test Measure");
H.MetricsViewer.searchResults().should(
"contain.text",
- "No results found",
+ "No search results",
);
H.MetricsViewer.searchInput().clear();
diff --git a/frontend/src/metabase-types/api/bookmark.ts b/frontend/src/metabase-types/api/bookmark.ts
index f6d66bbafc4..3f300b693dc 100644
--- a/frontend/src/metabase-types/api/bookmark.ts
+++ b/frontend/src/metabase-types/api/bookmark.ts
@@ -13,6 +13,7 @@ export const BOOKMARK_TYPES = [
"transform",
"document",
"table",
+ "measure",
] as const;
export type BookmarkType = (typeof BOOKMARK_TYPES)[number];
export type BookmarkId = string;
diff --git a/frontend/src/metabase-types/api/collection.ts b/frontend/src/metabase-types/api/collection.ts
index cbee18b71e8..78c2e53356c 100644
--- a/frontend/src/metabase-types/api/collection.ts
+++ b/frontend/src/metabase-types/api/collection.ts
@@ -101,6 +101,7 @@ export const COLLECTION_ITEM_MODELS = [
"document",
"table",
"transform",
+ "measure",
] as const;
export type CollectionItemModel = (typeof COLLECTION_ITEM_MODELS)[number];
diff --git a/frontend/src/metabase-types/api/database.ts b/frontend/src/metabase-types/api/database.ts
index 8633266b88d..d614abd539f 100644
--- a/frontend/src/metabase-types/api/database.ts
+++ b/frontend/src/metabase-types/api/database.ts
@@ -185,6 +185,7 @@ export interface ListDatabaseSchemaTablesRequest {
include_editable_data_model?: boolean;
"can-query"?: boolean;
"can-write-metadata"?: boolean;
+ include_measures?: boolean;
}
export interface ListVirtualDatabaseTablesRequest {
diff --git a/frontend/src/metabase-types/api/mocks/search.ts b/frontend/src/metabase-types/api/mocks/search.ts
index 296eb76873a..7893258d060 100644
--- a/frontend/src/metabase-types/api/mocks/search.ts
+++ b/frontend/src/metabase-types/api/mocks/search.ts
@@ -23,6 +23,7 @@ export const createMockSearchResult = (
can_write: true,
table_id: 1,
table_name: null,
+ table_display_name: null,
bookmark: null,
database_id: 1,
database_name: "test-data",
diff --git a/frontend/src/metabase-types/api/search.ts b/frontend/src/metabase-types/api/search.ts
index 328989f33ac..10195da6503 100644
--- a/frontend/src/metabase-types/api/search.ts
+++ b/frontend/src/metabase-types/api/search.ts
@@ -105,6 +105,7 @@ export interface SearchResult<
model_index_id: number | null;
table_description: string | null;
table_name: string | null;
+ table_display_name: string | null;
initial_sync_status: InitialSyncStatus | null;
dashboard_count: number | null;
context: any; // this might be a dead property
diff --git a/frontend/src/metabase/analytics/event.ts b/frontend/src/metabase/analytics/event.ts
index 439f8aefd24..110bd24393c 100644
--- a/frontend/src/metabase/analytics/event.ts
+++ b/frontend/src/metabase/analytics/event.ts
@@ -24,7 +24,7 @@ const VERSIONS: Record<SchemaType, SchemaVersion> = {
invite: "1-0-1",
model: "1-0-0",
question: "1-0-6",
- search: "1-1-2",
+ search: "1-1-4",
serialization: "1-0-1",
settings: "1-0-2",
setup: "1-0-3",
diff --git a/frontend/src/metabase/archive/analytics.ts b/frontend/src/metabase/archive/analytics.ts
index 43c7484b865..e31b4501681 100644
--- a/frontend/src/metabase/archive/analytics.ts
+++ b/frontend/src/metabase/archive/analytics.ts
@@ -11,7 +11,8 @@ type MoveToTrashEventDetail =
| "snippet"
| "document"
| "table"
- | "transform";
+ | "transform"
+ | "measure";
type MoveToTrashTriggeredFrom = "collection" | "detail_page" | "cleanup_modal";
diff --git a/frontend/src/metabase/collections/analytics.ts b/frontend/src/metabase/collections/analytics.ts
index 4dca245f2be..66c0b7827b4 100644
--- a/frontend/src/metabase/collections/analytics.ts
+++ b/frontend/src/metabase/collections/analytics.ts
@@ -23,7 +23,8 @@ export const trackCollectionItemBookmarked = (
if (
item.model === "indexed-entity" ||
item.model === "snippet" ||
- item.model === "transform"
+ item.model === "transform" ||
+ item.model === "measure"
) {
// can't bookmark these
return;
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/DbItemList.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/DbItemList.tsx
index 747fdac02f1..8c50b21e516 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/DbItemList.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/DbItemList.tsx
@@ -15,6 +15,7 @@ import {
type OmniPickerSchemaItem,
type OmniPickerTableItem,
} from "../..";
+import { useOmniPickerContext } from "../../context";
const createSchemaItem = (
dbId: number,
@@ -38,7 +39,10 @@ const createTableItem = (table: Table): OmniPickerTableItem => ({
model: "table",
});
-const useGetDbItemListData = (parentItem: OmniPickerItem) => {
+const useGetDbItemListData = (
+ parentItem: OmniPickerItem,
+ models: OmniPickerItem["model"][],
+) => {
const {
data: databases,
isLoading: isLoadingDatabases,
@@ -79,6 +83,7 @@ const useGetDbItemListData = (parentItem: OmniPickerItem) => {
? {
id: dbId,
schema: schemaName,
+ include_measures: models.includes("measure"),
}
: skipToken,
);
@@ -102,7 +107,8 @@ export const DbItemList = ({
parentItem: OmniPickerItem;
pathIndex: number;
}) => {
- const { data, error, isLoading } = useGetDbItemListData(parentItem);
+ const { models } = useOmniPickerContext();
+ const { data, error, isLoading } = useGetDbItemListData(parentItem, models);
return (
<ItemList
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemListRouter.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemListRouter.tsx
index 5425f645aee..761ef56561b 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemListRouter.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemListRouter.tsx
@@ -12,6 +12,7 @@ import { DbItemList } from "./DbItemList";
import { PersonalCollectionsItemList } from "./PersonalCollectionItemList";
import { RecentsItemList } from "./RecentsItemList";
import { SearchResultsItemList } from "./SearchResultsItemList";
+import { TableItemList } from "./TableItemList";
const isDbItem = (item: OmniPickerItem) => {
return (
@@ -81,5 +82,9 @@ export const ItemListRouter = ({
return <DbItemList parentItem={parentItem} pathIndex={pathIndex} />;
}
+ if (parentItem.model === "table") {
+ return <TableItemList parentItem={parentItem} pathIndex={pathIndex} />;
+ }
+
return <CollectionItemList parentItem={parentItem} pathIndex={pathIndex} />;
};
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResults.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResults.tsx
index 74a6414dcbd..88f6d9812e1 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResults.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResults.tsx
@@ -16,7 +16,12 @@ import {
Text,
} from "metabase/ui";
-import type { OmniPickerItem, OmniPickerTableItem, SearchScope } from "../..";
+import type {
+ OmniPickerItem,
+ OmniPickerMeasureItem,
+ OmniPickerTableItem,
+ SearchScope,
+} from "../..";
import { useOmniPickerContext } from "../../context";
import {
useCurrentSearchScope,
@@ -134,6 +139,10 @@ const isTableInDb = (item: OmniPickerItem): item is OmniPickerTableItem => {
);
};
+const isMeasure = (item: OmniPickerItem): item is OmniPickerMeasureItem => {
+ return item.model === "measure";
+};
+
const getItemText = (item: OmniPickerItem) => {
const isTable = isTableInDb(item);
@@ -145,6 +154,10 @@ const getItemText = (item: OmniPickerItem) => {
return "";
}
+ if (isMeasure(item)) {
+ return item.table_display_name ?? item.table_name;
+ }
+
return isTable
? `${item.database_name}${item.schema ? ` (${item.schema})` : ""}`
: (item?.collection?.name ?? t`Our analytics`);
@@ -159,6 +172,10 @@ const getLocationIcon = (item: OmniPickerItem) => {
return null;
}
+ if (isMeasure(item)) {
+ return { name: "table" as const };
+ }
+
return getIcon({
...item,
model: "collection",
@@ -196,7 +213,7 @@ const LocationInfo = ({
};
export function SearchScopeSelector() {
- const { setSearchScope } = useOmniPickerContext();
+ const { setSearchScope, options: pickerOptions } = useOmniPickerContext();
const searchScope = useCurrentSearchScope();
const { data: libraryCollection } = PLUGIN_LIBRARY.useGetLibraryCollection();
@@ -216,6 +233,10 @@ export function SearchScopeSelector() {
: null,
].filter((i) => i !== null);
+ if (pickerOptions.disableSearchScope) {
+ return null;
+ }
+
return (
<Flex
justify="space-between"
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/TableItemList.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/TableItemList.tsx
new file mode 100644
index 00000000000..f0b6572590c
--- /dev/null
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/TableItemList.tsx
@@ -0,0 +1,30 @@
+import type { Measure } from "metabase-types/api";
+
+import {
+ ItemList,
+ type OmniPickerMeasureItem,
+ type OmniPickerTableItem,
+} from "../..";
+
+function createMeasureItem(measure: Measure): OmniPickerMeasureItem {
+ return {
+ model: "measure",
+ id: measure.id,
+ name: measure.name,
+ };
+}
+
+export function TableItemList({
+ parentItem,
+ pathIndex,
+}: {
+ parentItem: OmniPickerTableItem;
+ pathIndex: number;
+}) {
+ return (
+ <ItemList
+ items={parentItem.measures?.map(createMeasureItem)}
+ pathIndex={pathIndex}
+ />
+ );
+}
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-current-search-scope.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-current-search-scope.ts
index fb249d63428..ab4fa373f09 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-current-search-scope.ts
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-current-search-scope.ts
@@ -31,11 +31,15 @@ export const useGetLastCollection = ():
/**
* gets the narrowed search scope for the currently selected collection, if it is selectable */
export const useCurrentSearchScope = (): SearchScope => {
- const { searchScope } = useOmniPickerContext();
+ const { searchScope, options } = useOmniPickerContext();
const { data: libraryCollection } = PLUGIN_LIBRARY.useGetLibraryCollection();
const lastCollection = useGetLastCollection();
+ if (options.disableSearchScope) {
+ return "all";
+ }
+
if (searchScope || !lastCollection) {
return searchScope;
}
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/types.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/types.ts
index 2af4c7e7604..9d679b2f9c4 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/types.ts
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/types.ts
@@ -8,6 +8,8 @@ import type {
CollectionNamespace,
DashboardId,
DatabaseId,
+ Measure,
+ MeasureId,
NativeQuerySnippet,
RecentContexts,
RegularCollectionId,
@@ -25,6 +27,7 @@ export type EntityPickerOptions = {
hasRootCollection?: boolean;
hasPersonalCollections?: boolean; // other users personal collections
getItemTooltip?: (item: OmniPickerItem) => string | undefined;
+ disableSearchScope?: boolean;
// options to customize the button bar
hasConfirmButtons?: boolean;
@@ -128,6 +131,7 @@ export type OmniPickerTableItem = {
schema?: SchemaName;
name: string;
is_published?: boolean;
+ measures?: Measure[];
};
export type OmniPickerQuestionItem = Omit<
@@ -144,6 +148,14 @@ export type OmniPickerDatabaseItem = {
name: string;
};
+export type OmniPickerMeasureItem = {
+ model: "measure";
+ id: MeasureId;
+ name: string;
+ table_name?: string;
+ table_display_name?: string;
+};
+
export type OmniPickerSnippetItem = Pick<NativeQuerySnippet, "id" | "name"> & {
model: "snippet";
};
@@ -151,6 +163,7 @@ export type OmniPickerSnippetItem = Pick<NativeQuerySnippet, "id" | "name"> & {
export enum OmniPickerFolderModel {
Database = "database",
Schema = "schema",
+ Table = "table",
Collection = "collection",
Dashboard = "dashboard",
}
@@ -158,13 +171,15 @@ export enum OmniPickerFolderModel {
export type DbTreeItem =
| OmniPickerDatabaseItem
| OmniPickerSchemaItem
- | OmniPickerTableItem;
+ | OmniPickerTableItem
+ | OmniPickerMeasureItem;
export const isInDbTree = (item: OmniPickerItem): item is DbTreeItem => {
return (
item.model === "database" ||
item.model === "schema" ||
- item.model === "table"
+ item.model === "table" ||
+ item.model === "measure"
);
};
@@ -173,7 +188,8 @@ export type OmniPickerItem =
| OmniPickerCollectionItem
| OmniPickerSchemaItem
| OmniPickerTableItem
- | OmniPickerDatabaseItem;
+ | OmniPickerDatabaseItem
+ | OmniPickerMeasureItem;
export type OmniPickerDbValue = Pick<DbTreeItem, "model" | "id">;
export type OmniPickerTableValue = Pick<OmniPickerTableItem, "model" | "id">;
@@ -188,6 +204,7 @@ export type OmniPickerValue = OmniPickerDbValue | OmniPickerCollectionItemValue;
export type OmniPickerFolderItem =
| OmniPickerDatabaseItem
| OmniPickerSchemaItem
+ | OmniPickerTableItem // can be a parent of measures
| OmniPickerDashboardItem
| (OmniPickerCollectionItem & { model: "collection" });
@@ -195,7 +212,8 @@ export type OmniPickerFolderItem =
export type SearchableOmniPickerItem =
| OmniPickerCollectionItem
| OmniPickerTableItem
- | OmniPickerDatabaseItem;
+ | OmniPickerDatabaseItem
+ | OmniPickerMeasureItem;
// used to find only or exclude items in personal collections, usually when adding items to a dashboard
// so that you don't end up with personal items in a public dashboard
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.ts
index 9cce070e3de..f773bc2eeca 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.ts
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.ts
@@ -111,6 +111,15 @@ export function getItemFunctions({
return true;
}
+ if (
+ item.model === OmniPickerFolderModel.Table &&
+ modelSet.has("measure") &&
+ "measures" in item &&
+ (item.measures?.length ?? 0) > 0
+ ) {
+ return true;
+ }
+
if (item.model === OmniPickerFolderModel.Collection) {
if (!("here" in item) && !("below" in item)) {
return false;
@@ -201,6 +210,7 @@ export const validCollectionModels = new Set<CollectionItemModel>([
"table",
"snippet",
"transform",
+ "measure",
]);
export const allCollectionModels = Array.from(validCollectionModels);
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/MiniPicker.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/MiniPicker.tsx
index 18cb5d0170c..7e601c2ba0f 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/MiniPicker.tsx
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/MiniPicker.tsx
@@ -1,12 +1,12 @@
import { type Ref, useCallback, useEffect, useMemo } from "react";
import { PLUGIN_LIBRARY } from "metabase/plugins";
-import type { MenuDropdownProps } from "metabase/ui";
+import type { MenuDropdownProps, MenuProps } from "metabase/ui";
import { Box, Menu } from "metabase/ui";
import type { DataPickerValue } from "../../../DataPicker";
import { useLogRecentItem } from "../../../EntityPicker/hooks/use-log-recent-item";
-import { MiniPickerContext } from "../../context";
+import { MiniPickerContext, type MiniPickerSearchParams } from "../../context";
import type { MiniPickerItem, MiniPickerPickableItem } from "../../types";
import {
focusFirstMiniPickerItem,
@@ -27,7 +27,13 @@ export type MiniPickerProps = {
onBrowseAll?: () => void;
shouldHide?: (item: MiniPickerItem | unknown) => boolean;
shouldShowLibrary?: boolean;
+ forceSearch?: boolean;
+ showSearchInput?: boolean;
+ searchInputPlaceholder?: string;
+ searchParams?: MiniPickerSearchParams;
+ onSearchResults?: (results: MiniPickerPickableItem[]) => void;
children?: React.ReactNode;
+ menuProps?: MenuProps;
menuDropdownProps?: MenuDropdownProps;
closeOnClickOutside?: boolean;
menuDropdownRef?: Ref<HTMLDivElement>;
@@ -45,7 +51,13 @@ export function MiniPicker({
trapFocus = false,
shouldHide,
shouldShowLibrary = true,
+ forceSearch = false,
+ showSearchInput = false,
+ searchInputPlaceholder,
+ searchParams,
+ onSearchResults,
children = <Box />,
+ menuProps,
menuDropdownProps,
closeOnClickOutside = true,
menuDropdownRef,
@@ -94,6 +106,11 @@ export function MiniPicker({
canBrowse: !!onBrowseAll,
libraryCollection,
shouldShowLibrary,
+ forceSearch,
+ showSearchInput,
+ searchInputPlaceholder,
+ searchParams,
+ onSearchResults,
}}
>
<Menu
@@ -105,6 +122,7 @@ export function MiniPicker({
position="bottom-start"
// menuItemTabIndex={-1}
trapFocus={false}
+ {...menuProps}
>
<Menu.Target>{children}</Menu.Target>
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/oss.unit.spec.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/oss.unit.spec.tsx
index 533e4870db1..1ffbced2bfd 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/oss.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/oss.unit.spec.tsx
@@ -1,7 +1,8 @@
import userEvent from "@testing-library/user-event";
import { findRequests, setupCardEndpoints } from "__support__/server-mocks";
-import { screen } from "__support__/ui";
+import { screen, waitFor } from "__support__/ui";
+import type { SearchRequest } from "metabase-types/api";
import { createMockCard, createMockCollection } from "metabase-types/api/mocks";
import { setup } from "./setup";
@@ -260,5 +261,28 @@ describe("MiniPicker", () => {
}),
);
});
+
+ it("passes the local search input query to searchParams callbacks", async () => {
+ const searchParams = jest.fn((params: SearchRequest) => {
+ return params.q ? {} : { collection: 123 };
+ });
+
+ await setup({
+ forceSearch: true,
+ showSearchInput: true,
+ searchParams,
+ });
+
+ await userEvent.type(screen.getByRole("textbox"), "bing");
+
+ expect(searchParams).toHaveBeenCalledWith(
+ expect.objectContaining({ q: "" }),
+ );
+ await waitFor(() => {
+ expect(searchParams).toHaveBeenCalledWith(
+ expect.objectContaining({ q: "bing" }),
+ );
+ });
+ });
});
});
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx
index bd124e66689..d54700126d3 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx
@@ -1,4 +1,4 @@
-import { useMemo } from "react";
+import { useEffect, useMemo, useState } from "react";
import { t } from "ttag";
import _ from "underscore";
@@ -24,10 +24,12 @@ import {
Ellipsified,
Flex,
Icon,
+ Menu,
Repeat,
Skeleton,
Stack,
Text,
+ TextInput,
} from "metabase/ui";
import type {
CollectionItem,
@@ -36,10 +38,11 @@ import type {
SearchRequest,
} from "metabase-types/api";
-import { useMiniPickerContext } from "../context";
+import { type MiniPickerSearchParams, useMiniPickerContext } from "../context";
import type {
MiniPickerCollectionItem,
MiniPickerDatabaseItem,
+ MiniPickerMeasureItem,
MiniPickerPickableItem,
MiniPickerSchemaItem,
MiniPickerTableItem,
@@ -50,10 +53,10 @@ import { MiniPickerItem } from "./MiniPickerItem";
import styles from "./MiniPickerItem.module.css";
export function MiniPickerItemList() {
- const { path, searchQuery } = useMiniPickerContext();
+ const { path, searchQuery, forceSearch } = useMiniPickerContext();
- if (searchQuery) {
- return <SearchItemList query={searchQuery} />;
+ if (searchQuery || forceSearch) {
+ return <SearchItemList query={searchQuery ?? ""} />;
}
if (path.length === 0) {
@@ -319,23 +322,44 @@ function CollectionItemList({ parent }: { parent: MiniPickerCollectionItem }) {
}
}
-function SearchItemList({ query }: { query: string }) {
- const { onChange, models, isHidden } = useMiniPickerContext();
+function SearchItemList({ query: externalQuery }: { query: string }) {
+ const {
+ onChange,
+ models,
+ isHidden,
+ showSearchInput,
+ searchInputPlaceholder,
+ searchParams,
+ onSearchResults,
+ } = useMiniPickerContext();
+ const [localQuery, setLocalQuery] = useState("");
+ const query = showSearchInput ? localQuery : externalQuery;
+
const debouncedQuery = useDebouncedValue(query, 500);
const makeQueryArgs = (
query: string,
models: MiniPickerPickableItem["model"][],
- ): SearchRequest => ({
- q: query,
- models: models as SearchModel[],
- limit: 50,
- // FIXME: optionally pass table_db_id so we filter on the backend to valid joins
- });
+ searchParams?: MiniPickerSearchParams,
+ ): SearchRequest => {
+ const params: SearchRequest = {
+ q: query,
+ models: models as SearchModel[],
+ limit: 50,
+ };
+ const extraParams =
+ typeof searchParams === "function" ? searchParams(params) : searchParams;
+
+ return {
+ ...params,
+ // FIXME: optionally pass table_db_id so we filter on the backend to valid joins
+ ...(extraParams || {}),
+ };
+ };
const rawQueryArgs = useMemo(
- () => makeQueryArgs(query, models),
- [query, models],
+ () => makeQueryArgs(query, models, searchParams),
+ [query, models, searchParams],
);
const cachedSearch = useSelector(
@@ -345,45 +369,70 @@ function SearchItemList({ query }: { query: string }) {
const effectiveQuery = hasCachedResults ? query : debouncedQuery;
const searchQueryArgs = useMemo(
- () => makeQueryArgs(effectiveQuery, models),
- [effectiveQuery, models],
+ () => makeQueryArgs(effectiveQuery, models, searchParams),
+ [effectiveQuery, models, searchParams],
);
const { data: searchResponse, isFetching } = useSearchQuery(searchQueryArgs);
const isSearching =
isFetching || (!hasCachedResults && query !== debouncedQuery);
- const searchResults: MiniPickerPickableItem[] = (
- searchResponse?.data ?? []
- ).filter((i) => !isHidden(i));
+
+ const searchResults: MiniPickerPickableItem[] = useMemo(() => {
+ return (searchResponse?.data ?? []).filter((i) => !isHidden(i));
+ }, [searchResponse, isHidden]);
+
+ useEffect(() => {
+ onSearchResults?.(searchResults);
+ }, [searchResults, onSearchResults]);
return (
- <ItemList>
- {!isSearching && searchResults.length === 0 && (
- <Box>
- <Text px="md" py="sm" c="text-secondary">{t`No search results`}</Text>
- </Box>
+ <>
+ {showSearchInput && (
+ <>
+ <TextInput
+ placeholder={searchInputPlaceholder ?? t`Search…`}
+ value={localQuery}
+ onChange={(e) => setLocalQuery(e.target.value)}
+ autoFocus
+ px="sm"
+ pt="2px"
+ pb="sm"
+ />
+ <Menu.Divider mx="sm" />
+ </>
)}
- {isSearching && <MiniPickerListLoader />}
- {!isSearching &&
- searchResults.map((item) => {
- return (
- <MiniPickerItem
- key={`${item.model}-${item.id}`}
- name={item.name}
- model={item.model}
- onClick={() => {
- onChange(item);
- }}
- rightSection={<LocationInfo item={item} />}
- classNames={{
- itemLabel: styles.leftSection,
- itemSection: styles.rightSection,
- }}
- />
- );
- })}
- </ItemList>
+ <ItemList>
+ {!isSearching && searchResults.length === 0 && (
+ <Box>
+ <Text
+ px="md"
+ py="sm"
+ c="text-secondary"
+ >{t`No search results`}</Text>
+ </Box>
+ )}
+ {isSearching && <MiniPickerListLoader />}
+ {!isSearching &&
+ searchResults.map((item) => {
+ return (
+ <MiniPickerItem
+ key={`${item.model}-${item.id}`}
+ name={item.name}
+ model={item.model}
+ onClick={() => {
+ onChange(item);
+ }}
+ rightSection={<LocationInfo item={item} />}
+ classNames={{
+ itemLabel: styles.leftSection,
+ itemSection: styles.rightSection,
+ }}
+ />
+ );
+ })}
+ </ItemList>
+ </>
);
}
@@ -400,6 +449,10 @@ export const MiniPickerListLoader = () => (
</Stack>
);
+const ItemList = ({ children }: { children: React.ReactNode[] }) => {
+ return <VirtualizedList extraPadding={2}>{children}</VirtualizedList>;
+};
+
const isTableInDb = (
item: MiniPickerPickableItem,
): item is MiniPickerTableItem => {
@@ -412,28 +465,38 @@ const isTableInDb = (
);
};
-const ItemList = ({ children }: { children: React.ReactNode[] }) => {
- return <VirtualizedList extraPadding={2}>{children}</VirtualizedList>;
+const isMeasure = (
+ item: MiniPickerPickableItem,
+): item is MiniPickerMeasureItem => {
+ return item.model === "measure";
};
-const LocationInfo = ({ item }: { item: MiniPickerPickableItem }) => {
- const isTable = isTableInDb(item);
+const getLocationDetails = (item: MiniPickerPickableItem) => {
+ if (isTableInDb(item)) {
+ return {
+ itemText: `${item.database_name}${item.table_schema ? ` (${item.table_schema})` : ""}`,
+ iconProps: null,
+ };
+ }
+ if (isMeasure(item)) {
+ return {
+ itemText: item.table_display_name ?? item.table_name,
+ iconProps: { name: "table" as const },
+ };
+ }
+ return {
+ itemText: item?.collection?.name ?? t`Our analytics`,
+ iconProps: getIcon({ ...item.collection, model: "collection" }),
+ };
+};
- const itemText = isTable
- ? `${item.database_name}${item.table_schema ? ` (${item.table_schema})` : ""}`
- : (item?.collection?.name ?? t`Our analytics`);
+const LocationInfo = ({ item }: { item: MiniPickerPickableItem }) => {
+ const { itemText, iconProps } = getLocationDetails(item);
if (!itemText) {
return null;
}
- const iconProps = isTable
- ? null
- : getIcon({
- ...item.collection,
- model: "collection",
- });
-
return (
<Flex gap="xs" align="center" ml="auto" style={{ overflow: "hidden" }}>
{iconProps && <Icon {...iconProps} size={12} miw={12} />}
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerPane.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerPane.tsx
index dc2dad13d11..75c68fe1275 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerPane.tsx
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerPane.tsx
@@ -7,14 +7,14 @@ import { MiniPickerHeader } from "./MiniPickerHeader";
import { MiniPickerItemList } from "./MiniPickerItemList";
export function MiniPickerPane({ className }: { className?: string }) {
- const { path, searchQuery } = useMiniPickerContext();
+ const { path, searchQuery, forceSearch } = useMiniPickerContext();
const isRoot = path.length === 0;
return (
<Stack
mah="30rem"
- w={searchQuery ? "40rem" : "20rem"}
+ w={searchQuery || forceSearch ? "40rem" : "20rem"}
gap={0}
className={className}
>
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/context.ts b/frontend/src/metabase/common/components/Pickers/MiniPicker/context.ts
index 82dd88f2c3a..feefa76257e 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/context.ts
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/context.ts
@@ -5,6 +5,8 @@ import {
useContext,
} from "react";
+import type { SearchRequest } from "metabase-types/api";
+
import type {
MiniPickerCollectionItem,
MiniPickerFolderItem,
@@ -12,6 +14,10 @@ import type {
MiniPickerPickableItem,
} from "./types";
+export type MiniPickerSearchParams =
+ | Partial<SearchRequest>
+ | ((params: SearchRequest) => Partial<SearchRequest>);
+
export interface MiniPickerContextValue {
path: MiniPickerFolderItem[];
setPath: Dispatch<SetStateAction<MiniPickerFolderItem[]>>;
@@ -25,6 +31,11 @@ export interface MiniPickerContextValue {
onBrowseAll?: () => void;
libraryCollection?: MiniPickerCollectionItem;
shouldShowLibrary?: boolean;
+ forceSearch?: boolean;
+ showSearchInput?: boolean;
+ searchInputPlaceholder?: string;
+ searchParams?: MiniPickerSearchParams;
+ onSearchResults?: (results: MiniPickerPickableItem[]) => void;
}
export const MiniPickerContext = createContext<
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/types.ts b/frontend/src/metabase/common/components/Pickers/MiniPicker/types.ts
index 4ff050d59a0..20c997b2c38 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/types.ts
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/types.ts
@@ -2,6 +2,7 @@ import type {
CollectionId,
CollectionItem,
DatabaseId,
+ MeasureId,
SchemaName,
TableId,
} from "metabase-types/api";
@@ -50,6 +51,14 @@ export type MiniPickerDatabaseItem = {
name: string;
};
+export type MiniPickerMeasureItem = {
+ model: "measure";
+ id: MeasureId;
+ name: string;
+ table_name?: string;
+ table_display_name?: string;
+};
+
export enum MiniPickerFolderModel {
Database = "database",
Schema = "schema",
@@ -61,7 +70,8 @@ export type MiniPickerItem =
| MiniPickerCollectionItem
| MiniPickerSchemaItem
| MiniPickerTableItem
- | MiniPickerDatabaseItem;
+ | MiniPickerDatabaseItem
+ | MiniPickerMeasureItem;
// this is only the intermediate/folder types that cannot ultimately be picked
export type MiniPickerFolderItem =
@@ -72,10 +82,12 @@ export type MiniPickerFolderItem =
// this omits intermediate/folder types that cannot ultimately be picked
export type MiniPickerPickableItem =
| MiniPickerPickableCollectionItem
- | MiniPickerTableItem;
+ | MiniPickerTableItem
+ | MiniPickerMeasureItem;
// can't get schemas in search results
export type SearchableMiniPickerItem =
| MiniPickerPickableCollectionItem
| MiniPickerTableItem
- | MiniPickerDatabaseItem;
+ | MiniPickerDatabaseItem
+ | MiniPickerMeasureItem;
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx
index cfde8aafd97..94bb9df3a0a 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx
@@ -42,26 +42,6 @@ export function MetricPill({
}: MetricPillProps) {
const [popoverState, setPopoverState] = useState<PillPopoverState>("closed");
- const { selectedMetricIds, selectedMeasureIds } = useMemo(() => {
- if (metric.sourceType === "metric") {
- return {
- selectedMetricIds: new Set<number>([metric.id]),
- selectedMeasureIds: new Set<number>(),
- };
- }
- if (metric.sourceType === "measure") {
- return {
- selectedMetricIds: new Set<number>(),
- selectedMeasureIds: new Set<number>([metric.id]),
- };
- }
-
- return {
- selectedMetricIds: new Set<number>(),
- selectedMeasureIds: new Set<number>(),
- };
- }, [metric.id, metric.sourceType]);
-
const dimensions = useMemo(
() =>
definitionEntry.definition
@@ -131,6 +111,9 @@ export function MetricPill({
shadow="md"
withinPortal
trapFocus
+ // these are the defaults, but listing them explicitly
+ // since we're going to add listeners to stop propagation
+ clickOutsideEvents={["mousedown", "touchstart"]}
>
<Popover.Target>
<Pill
@@ -173,18 +156,25 @@ export function MetricPill({
</Flex>
</Pill>
</Popover.Target>
- <Popover.Dropdown p={0} mt="-0.15rem">
- <MetricSearchDropdown
- selectedMetricIds={selectedMetricIds}
- selectedMeasureIds={selectedMeasureIds}
- onSelect={handleSelect}
- onClose={handleClose}
- excludeMetric={{
- id: metric.id,
- sourceType: metric.sourceType,
- }}
- showSearchInput
- />
+ <Popover.Dropdown
+ p={0}
+ mt="-0.15rem"
+ bd="none" // the border causes the minipicker to be slightly mispositioned
+ >
+ <div
+ // prevent clicks in mini or entity picker from closing the popover
+ onMouseDown={(e) => e.stopPropagation()}
+ onTouchStart={(e) => e.stopPropagation()}
+ >
+ <MetricSearchDropdown
+ onSelect={handleSelect}
+ onClose={handleClose}
+ selectedMetric={metric}
+ menuProps={{
+ offset: 0,
+ }}
+ />
+ </div>
</Popover.Dropdown>
</Popover>
<Menu
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.unit.spec.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.unit.spec.tsx
index 970fe3481f3..9b3c3746fec 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.unit.spec.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.unit.spec.tsx
@@ -91,8 +91,6 @@ describe("MetricPill action menu", () => {
await openMenu();
await userEvent.click(screen.getByText("Replace"));
- expect(
- await screen.findByPlaceholderText("Search for metrics..."),
- ).toBeInTheDocument();
+ expect(await screen.findByText("Browse all")).toBeInTheDocument();
});
});
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/MetricResultItem.module.css b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/MetricResultItem.module.css
deleted file mode 100644
index 97cdbb481a8..00000000000
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/MetricResultItem.module.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.resultItem {
- cursor: pointer;
- border-radius: var(--mantine-radius-sm);
-}
-
-.resultItem:hover {
- background-color: var(--mb-color-background-hover);
-}
-
-.resultItem[data-active] {
- background-color: var(--mb-color-background-hover);
- color: var(--mb-color-text-hover);
-}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/MetricResultItem.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/MetricResultItem.tsx
deleted file mode 100644
index 9a6f2c831eb..00000000000
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/MetricResultItem.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { forwardRef } from "react";
-
-import type { IconName } from "metabase/ui";
-import { Flex, Icon, Text } from "metabase/ui";
-
-import S from "./MetricResultItem.module.css";
-
-type MetricResultItemProps = {
- name: string;
- slug?: string;
- icon?: IconName;
- active?: boolean;
- onClick?: () => void;
-};
-
-export const MetricResultItem = forwardRef<
- HTMLDivElement,
- MetricResultItemProps
->(function MetricResultItem(
- { name, slug, icon = "metric", active = false, onClick },
- ref,
-) {
- return (
- <Flex
- ref={ref}
- px="sm"
- py="xs"
- align="center"
- gap="xs"
- mih="2.25rem"
- c="text-primary"
- className={S.resultItem}
- data-active={active || undefined}
- onClick={onClick}
- >
- <Icon name={icon} c="text-tertiary" flex="0 0 auto" />
- <Text lh="md" lineClamp={1} flex="1">
- {name}
- </Text>
- {slug && (
- <Text fz="xs" c="text-tertiary" flex="0 0 auto">
- {slug}
- </Text>
- )}
- </Flex>
- );
-});
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/index.ts
deleted file mode 100644
index 8445a4caf5b..00000000000
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { MetricResultItem } from "./MetricResultItem";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.module.css b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.module.css
deleted file mode 100644
index b6cb462fff3..00000000000
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.module.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.searchInputWrapper {
- border-bottom: 1px solid var(--mb-color-border);
-}
-
-.resultsContainer {
- overflow-y: auto;
-}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.tsx
index 3baea5ab381..7e9b4d19ec7 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.tsx
@@ -1,172 +1,254 @@
import {
type Dispatch,
type SetStateAction,
+ forwardRef,
useCallback,
- useEffect,
- useMemo,
+ useImperativeHandle,
+ useRef,
useState,
} from "react";
import { useUnmount } from "react-use";
import { t } from "ttag";
-import { useListKeyboardNavigation } from "metabase/common/hooks/use-list-keyboard-navigation";
-import { Box, Flex, TextInput } from "metabase/ui";
-
import {
- type MetricOrMeasureResult,
- useMetricMeasureSearch,
-} from "../../../hooks/use-metric-measure-search";
+ EntityPickerModal,
+ MiniPicker,
+ type OmniPickerItem,
+} from "metabase/common/components/Pickers";
+import type {
+ MiniPickerItem,
+ MiniPickerPickableItem,
+} from "metabase/common/components/Pickers/MiniPicker/types";
+import { PLUGIN_LIBRARY } from "metabase/plugins";
+import type { MenuProps } from "metabase/ui";
+import type { SearchRequest } from "metabase-types/api";
+
import type { SelectedMetric } from "../../../types/viewer-state";
import { createSourceId } from "../../../utils/source-ids";
-import { MetricSearchResults } from "../MetricSearchResults";
-import {
- type ExcludeMetric,
- type MetricNameMap,
- filterSearchResults,
-} from "../utils";
+import type { MetricNameMap } from "../utils";
-import S from "./MetricSearchDropdown.module.css";
+export interface MetricSearchDropdownRef {
+ onArrowDown: () => boolean;
+ onArrowUp: () => boolean;
+ containerRef: React.RefObject<HTMLDivElement>;
+}
type MetricSearchDropdownProps = {
- selectedMetricIds?: Set<number>;
- selectedMeasureIds?: Set<number>;
+ anchorRect?: { left: number; top: number };
onSelect: (metric: SelectedMetric) => void;
- onClose?: () => void;
- excludeMetric?: ExcludeMetric;
- showSearchInput?: boolean;
- externalSearchText?: string;
- onHasSelectionChange?: (hasSelection: boolean) => void;
+ onClose: () => void;
+ searchQuery?: string;
+ selectedMetric?: SelectedMetric;
+ menuProps?: MenuProps;
setSearchMetricNames?: Dispatch<SetStateAction<MetricNameMap>>;
};
-export function MetricSearchDropdown({
- selectedMetricIds,
- selectedMeasureIds,
- onSelect,
- onClose,
- excludeMetric,
- showSearchInput = false,
- externalSearchText,
- onHasSelectionChange,
- setSearchMetricNames,
-}: MetricSearchDropdownProps) {
- const [internalSearchText, setInternalSearchText] = useState("");
- const searchText = showSearchInput
- ? internalSearchText
- : (externalSearchText ?? "");
-
- const { results, isLoading } = useMetricMeasureSearch(searchText);
-
- const filteredResults = useMemo(
- () =>
- filterSearchResults(
- results,
- selectedMetricIds,
- selectedMeasureIds,
- excludeMetric,
- ),
- [results, selectedMetricIds, selectedMeasureIds, excludeMetric],
+// needs to be stable, otherwise onSearchResults calling setSearchMetricNames creates an infinite loop
+const MINI_PICKER_MODELS = ["metric" as const, "measure" as const];
+
+export const MetricSearchDropdown = forwardRef<
+ MetricSearchDropdownRef,
+ MetricSearchDropdownProps
+>(function MetricSearchDropdown(
+ {
+ anchorRect,
+ onSelect,
+ onClose,
+ searchQuery,
+ selectedMetric,
+ menuProps,
+ setSearchMetricNames,
+ },
+ ref,
+) {
+ const [isBrowsing, setIsBrowsing] = useState(false);
+
+ const libraryMetricsCollection =
+ PLUGIN_LIBRARY.useGetLibraryChildCollectionByType({
+ type: "library-metrics",
+ });
+
+ const getSearchParams = useCallback(
+ (params: SearchRequest): Partial<SearchRequest> => {
+ const scopeMiniPickerToLibraryMetrics =
+ libraryMetricsCollection !== undefined &&
+ (libraryMetricsCollection.here?.includes("metric") ||
+ libraryMetricsCollection.below?.includes("metric")) &&
+ !params.q;
+
+ return {
+ limit: 5,
+ ...(scopeMiniPickerToLibraryMetrics
+ ? { collection: libraryMetricsCollection.id }
+ : {}),
+ };
+ },
+ [libraryMetricsCollection],
);
- useEffect(() => {
- setSearchMetricNames?.((prev) => ({
- ...prev,
- ...Object.fromEntries(
- filteredResults.map((result) => [
- createSourceId(result.id, result.model),
- result.name,
- ]),
- ),
- }));
- }, [filteredResults, setSearchMetricNames]);
+ const miniPickerRef = useRef<HTMLDivElement>(null);
+
+ useImperativeHandle(ref, () => ({
+ onArrowDown: () => {
+ const firstElement =
+ miniPickerRef.current?.querySelector('[role="menuitem"]');
+ if (firstElement) {
+ (firstElement as HTMLElement).focus();
+ }
+ return true;
+ },
+ onArrowUp: () => {
+ const elements =
+ miniPickerRef.current?.querySelectorAll('[role="menuitem"]') ?? [];
+ const lastElement = elements[elements.length - 1];
+ if (lastElement) {
+ (lastElement as HTMLElement).focus();
+ }
+ return true;
+ },
+ containerRef: miniPickerRef,
+ }));
+
+ const handleSearchResults = useCallback(
+ (results: MiniPickerPickableItem[]) => {
+ setSearchMetricNames?.((prev) => ({
+ ...prev,
+ ...Object.fromEntries(
+ results
+ .filter(
+ (
+ result,
+ ): result is {
+ id: number;
+ model: "metric" | "measure";
+ name: string;
+ } => result.model === "metric" || result.model === "measure",
+ )
+ .map((result) => [
+ createSourceId(result.id, result.model),
+ result.name,
+ ]),
+ ),
+ }));
+ },
+ [setSearchMetricNames],
+ );
useUnmount(() => {
setSearchMetricNames?.({});
});
const handleSelectResult = useCallback(
- (id: number, model: "metric" | "measure") => {
- const result = results?.find((r) => r.id === id && r.model === model);
- if (result) {
- onSelect({
- id,
- name: result.name,
- sourceType: result.model,
- tableId:
- result.model === "measure" && typeof result.table_id === "number"
- ? result.table_id
- : undefined,
- });
+ (item: OmniPickerItem) => {
+ if (item.model !== "metric" && item.model !== "measure") {
+ return;
}
+ if (typeof item.id !== "number") {
+ return;
+ }
+ onSelect({
+ id: item.id,
+ name: item.name,
+ sourceType: item.model,
+ });
},
- [results, onSelect],
- );
-
- const handleEnter = useCallback(
- (item: (typeof filteredResults)[number]) => {
- handleSelectResult(item.id, item.model);
- },
- [handleSelectResult],
+ [onSelect],
);
- const { cursorIndex, getRef } = useListKeyboardNavigation<
- MetricOrMeasureResult,
- HTMLDivElement
- >({
- list: filteredResults,
- onEnter: handleEnter,
- });
-
- useEffect(() => {
- onHasSelectionChange?.(cursorIndex != null);
- }, [cursorIndex, onHasSelectionChange]);
-
- const handleKeyDown = useCallback(
- (e: React.KeyboardEvent) => {
- if (e.key === "Escape") {
- onClose?.();
+ const shouldHide = useCallback(
+ (item: MiniPickerItem | unknown) => {
+ if (
+ !item ||
+ typeof item !== "object" ||
+ !("id" in item) ||
+ !("model" in item)
+ ) {
+ return true;
+ }
+ if (selectedMetric) {
+ return (
+ item.id === selectedMetric.id &&
+ item.model === selectedMetric.sourceType
+ );
}
+ return false;
},
- [onClose],
+ [selectedMetric],
);
- if (showSearchInput) {
- return (
- <Flex
- direction="column"
- w="22rem"
- mah="25rem"
- onClick={(e) => e.stopPropagation()}
+ return (
+ <>
+ <MiniPicker
+ opened={!isBrowsing}
+ searchQuery={searchQuery}
+ onChange={handleSelectResult}
+ onClose={onClose}
+ models={MINI_PICKER_MODELS}
+ onBrowseAll={() => setIsBrowsing(true)}
+ forceSearch={true}
+ showSearchInput={searchQuery === undefined}
+ searchInputPlaceholder={t`Search metrics and measures…`}
+ searchParams={getSearchParams}
+ onSearchResults={handleSearchResults}
+ shouldHide={shouldHide}
+ menuProps={menuProps}
+ menuDropdownRef={miniPickerRef}
>
- <Box p="sm" className={S.searchInputWrapper}>
- <TextInput
- placeholder={t`Search for metrics...`}
- value={internalSearchText}
- onChange={(e) => setInternalSearchText(e.target.value)}
- onKeyDown={handleKeyDown}
- autoFocus
+ {anchorRect && (
+ <span
+ aria-hidden
+ style={{
+ position: "fixed",
+ left: anchorRect.left,
+ top: anchorRect.top,
+ width: 0,
+ height: 0,
+ pointerEvents: "none",
+ }}
/>
- </Box>
- <Box flex={1} className={S.resultsContainer}>
- <MetricSearchResults
- results={filteredResults}
- isLoading={isLoading}
- cursorIndex={cursorIndex}
- getRef={getRef}
- onSelectResult={handleSelectResult}
- />
- </Box>
- </Flex>
- );
- }
+ )}
+ </MiniPicker>
+ {isBrowsing && (
+ <EntityPickerModal
+ title={t`Pick a metric or measure`}
+ value={
+ libraryMetricsCollection
+ ? {
+ model: "collection",
+ id: libraryMetricsCollection.id as number,
+ }
+ : undefined
+ }
+ onChange={handleSelectResult}
+ onClose={() => setIsBrowsing(false)}
+ models={["metric", "measure", "table"]}
+ isSelectableItem={(item) =>
+ item.model === "metric" || item.model === "measure"
+ }
+ isDisabledItem={isTableWithoutMeasures}
+ options={{
+ hasConfirmButtons: false,
+ hasDatabases: true,
+ getItemTooltip: getTableWithoutMeasuresTooltip,
+ disableSearchScope: true,
+ }}
+ />
+ )}
+ </>
+ );
+});
+function isTableWithoutMeasures(item: OmniPickerItem) {
return (
- <MetricSearchResults
- results={filteredResults}
- isLoading={isLoading}
- cursorIndex={cursorIndex}
- getRef={getRef}
- onSelectResult={handleSelectResult}
- />
+ item.model === "table" &&
+ "measures" in item &&
+ (item.measures?.length ?? 0) === 0
);
}
+
+function getTableWithoutMeasuresTooltip(item: OmniPickerItem) {
+ if (isTableWithoutMeasures(item)) {
+ return t`This table has no measures`;
+ }
+ return undefined;
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/index.ts
index 3b9bc8c964f..b4bbdd8c027 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/index.ts
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/index.ts
@@ -1 +1,4 @@
-export { MetricSearchDropdown } from "./MetricSearchDropdown";
+export {
+ MetricSearchDropdown,
+ type MetricSearchDropdownRef,
+} from "./MetricSearchDropdown";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.tsx
index 01abd60bd78..6ce7c429e5a 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.tsx
@@ -3,7 +3,7 @@ import { useMemo, useRef } from "react";
import { t } from "ttag";
import { CodeMirror } from "metabase/common/components/CodeMirror";
-import { Button, Flex, Icon, Popover } from "metabase/ui";
+import { Button, Flex, Icon } from "metabase/ui";
import type { ProjectionClause } from "metabase-lib/metric";
import type {
@@ -22,7 +22,10 @@ import {
} from "../../../utils/source-ids";
import { MetricExpressionPill } from "../MetricExpressionPill";
import { MetricPill } from "../MetricPill";
-import { MetricSearchDropdown } from "../MetricSearchDropdown";
+import {
+ MetricSearchDropdown,
+ type MetricSearchDropdownRef,
+} from "../MetricSearchDropdown";
import S from "./MetricSearchInput.module.css";
import { buildEditorExtensions } from "./editorExtensions";
@@ -60,6 +63,7 @@ export function MetricSearchInput({
}: MetricSearchInputProps) {
const containerRef = useRef<HTMLDivElement>(null);
const editorRef = useRef<ReactCodeMirrorRef>(null);
+ const dropdownRef = useRef<MetricSearchDropdownRef>(null);
const {
metricNames,
@@ -94,11 +98,8 @@ export function MetricSearchInput({
handleContainerClick,
handleEditorClick,
handleEditorKeyDown,
- handleDropdownHasSelectionChange,
handleRun,
handleRunRef,
- isOpenRef,
- dropdownHasSelectionRef,
} = useFormulaEditor({
formulaEntities,
onFormulaEntitiesChange,
@@ -109,16 +110,16 @@ export function MetricSearchInput({
handleRemoveMetric,
editorRef,
containerRef,
+ dropdownRef,
});
const editorExtensions = useMemo(
() =>
buildEditorExtensions(formulaEntities.length, {
- dropdownHasSelectionRef,
handleRunRef,
- isOpenRef,
+ dropdownRef,
}),
- [formulaEntities.length, dropdownHasSelectionRef, handleRunRef, isOpenRef],
+ [formulaEntities.length, handleRunRef, dropdownRef],
);
const isCollapsed = !isFocused && formulaEntities.length > 0;
@@ -226,43 +227,16 @@ export function MetricSearchInput({
data-testid="metrics-viewer-search-input"
/>
</div>
- <Popover
- opened={isOpen}
- onChange={setIsOpen}
- position="bottom-start"
- shadow="md"
- withinPortal
- >
- <Popover.Target>
- <span
- aria-hidden
- style={{
- position: "fixed",
- left: anchorRect.left,
- top: anchorRect.top,
- width: 0,
- height: 0,
- pointerEvents: "none",
- }}
- />
- </Popover.Target>
- <Popover.Dropdown
- p={0}
- miw="19rem"
- maw="25rem"
- onMouseDown={(e) => e.preventDefault()}
- >
- {isOpen && (
- <MetricSearchDropdown
- onSelect={handleSelect}
- externalSearchText={currentWord}
- onHasSelectionChange={handleDropdownHasSelectionChange}
- onClose={() => setIsOpen(false)}
- setSearchMetricNames={setSearchMetricNames}
- />
- )}
- </Popover.Dropdown>
- </Popover>
+ {isOpen && (
+ <MetricSearchDropdown
+ anchorRect={anchorRect}
+ onSelect={handleSelect}
+ searchQuery={currentWord}
+ onClose={() => setIsOpen(false)}
+ ref={dropdownRef}
+ setSearchMetricNames={setSearchMetricNames}
+ />
+ )}
</>
)}
</Flex>
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.unit.spec.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.unit.spec.tsx
index 25cf77c3056..d4e189bfba6 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.unit.spec.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.unit.spec.tsx
@@ -70,12 +70,12 @@ jest.mock("../MetricExpressionPill", () => ({
jest.mock("../MetricSearchDropdown", () => ({
MetricSearchDropdown: ({
onSelect,
- externalSearchText,
+ searchQuery,
}: {
onSelect: (metric: SelectedMetric) => void;
- externalSearchText: string;
+ searchQuery: string;
}) => (
- <div data-testid="search-dropdown" data-search-text={externalSearchText}>
+ <div data-testid="search-dropdown" data-search-text={searchQuery}>
<button
onClick={() =>
onSelect({ id: 99, name: "New Metric", sourceType: "metric" })
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/editorExtensions.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/editorExtensions.ts
index dbf4e7ebe62..50aa25a8f1d 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/editorExtensions.ts
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/editorExtensions.ts
@@ -3,14 +3,15 @@ import type { Extension } from "@codemirror/state";
import { keymap, placeholder } from "@codemirror/view";
import { t } from "ttag";
+import type { MetricSearchDropdownRef } from "../MetricSearchDropdown";
+
import { errorHighlight } from "./errorHighlight";
import { metricTokenHighlight } from "./metricTokenHighlight";
import { operatorHighlight } from "./operatorHighlight";
type EditorExtensionRefs = {
- dropdownHasSelectionRef: { current: boolean };
handleRunRef: { current: () => void };
- isOpenRef: { current: boolean };
+ dropdownRef: React.RefObject<MetricSearchDropdownRef>;
};
export function buildEditorExtensions(
@@ -24,38 +25,24 @@ export function buildEditorExtensions(
metricTokenHighlight,
placeholder(formulaEntityCount === 0 ? t`Search for metrics...` : ""),
// Prevent Enter from creating newlines; trigger run when dirty.
- // If the dropdown has a keyboard-highlighted item, skip running —
- // let the dropdown's Enter handler select the item instead.
keymap.of([
{ key: "Mod-z", run: undo, preventDefault: true },
{ key: "Mod-Shift-z", run: redo, preventDefault: true },
{
key: "Enter",
run: () => {
- if (!refs.dropdownHasSelectionRef.current) {
- refs.handleRunRef.current();
- }
+ refs.handleRunRef.current();
return true;
},
},
// don't move the cursor when using the arrow keys to navigate the dropdown
{
key: "ArrowDown",
- run: () => {
- if (refs.isOpenRef.current) {
- return true;
- }
- return false;
- },
+ run: () => refs.dropdownRef.current?.onArrowDown() ?? false,
},
{
key: "ArrowUp",
- run: () => {
- if (refs.isOpenRef.current) {
- return true;
- }
- return false;
- },
+ run: () => refs.dropdownRef.current?.onArrowUp() ?? false,
},
]),
];
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/useFormulaEditor.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/useFormulaEditor.ts
index 1a38edee3af..63a885cbaeb 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/useFormulaEditor.ts
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/useFormulaEditor.ts
@@ -16,6 +16,7 @@ import {
createMeasureSourceId,
createMetricSourceId,
} from "../../../utils/source-ids";
+import type { MetricSearchDropdownRef } from "../MetricSearchDropdown";
import {
ENTITY_SEPARATOR,
type MetricNameMap,
@@ -52,6 +53,7 @@ type UseFormulaEditorParams = {
) => void;
editorRef: React.RefObject<ReactCodeMirrorRef | null>;
containerRef: React.RefObject<HTMLDivElement | null>;
+ dropdownRef: React.RefObject<MetricSearchDropdownRef | null>;
};
export type UseFormulaEditorResult = {
@@ -65,7 +67,7 @@ export type UseFormulaEditorResult = {
isExpressionDirty: boolean;
pendingFocusRef: MutableRefObject<boolean>;
handleInputFocus: () => void;
- handleInputBlur: () => void;
+ handleInputBlur: (event: React.FocusEvent) => void;
handleEditExpression: (entityIndex: number) => void;
handleChange: (newText: string) => void;
handleSelect: (metric: SelectedMetric) => void;
@@ -73,12 +75,9 @@ export type UseFormulaEditorResult = {
handleContainerClick: (e: React.MouseEvent) => void;
handleEditorClick: () => void;
handleEditorKeyDown: (e: React.KeyboardEvent) => void;
- handleDropdownHasSelectionChange: (hasSelection: boolean) => void;
handleRun: () => void;
// Refs needed by editorExtensions builder
handleRunRef: MutableRefObject<() => void>;
- isOpenRef: MutableRefObject<boolean>;
- dropdownHasSelectionRef: MutableRefObject<boolean>;
};
export function useFormulaEditor({
@@ -91,14 +90,13 @@ export function useFormulaEditor({
handleRemoveMetric,
editorRef,
containerRef,
+ dropdownRef,
}: UseFormulaEditorParams): UseFormulaEditorResult {
// editText is the full expression as plain text — only meaningful while focused
const [editText, setEditText] = useState("");
// currentWord is the word under the cursor, used as the dropdown search query
const [currentWord, setCurrentWord] = useState("");
const [isOpen, setIsOpen] = useState(false);
- const isOpenRef = useRef(isOpen);
- isOpenRef.current = isOpen;
const [isFocused, setIsFocused] = useState(false);
const [validationError, setValidationError] = useState<string | null>(null);
// Pixel position (viewport-relative) of the current word's left edge and
@@ -124,9 +122,6 @@ export function useFormulaEditor({
// handleInputFocus initializes the session; set back to false in commitAndCollapse.
// Used to prevent autoFocus / view.focus() re-entrancy from reinitializing text.
const isEditingSessionActiveRef = useRef(false);
- // Tracks whether the dropdown has a keyboard-highlighted item.
- // When true, Enter should select from the dropdown, not run the expression.
- const dropdownHasSelectionRef = useRef(false);
const handleRunRef = useRef<() => void>(() => {});
// Text captured at focus time — used to detect whether the user actually
@@ -300,37 +295,42 @@ export function useFormulaEditor({
selectedMetrics,
]);
- const handleInputBlur = useCallback(() => {
- // If the text hasn't changed since focus, collapse back to pills view
- // without requiring the user to click "Run".
- if (
- editTextRef.current === textAtFocusRef.current &&
- !dropdownHasSelectionRef.current
- ) {
- isEditingSessionActiveRef.current = false;
- setIsFocused(false);
- setIsOpen(false);
- setCurrentWord("");
- setEditText("");
- setValidationError(null);
- setIsExpressionDirty(false);
- return;
- }
+ const handleInputBlur = useCallback(
+ (event: React.FocusEvent) => {
+ // If the text hasn't changed since focus, collapse back to pills view
+ // without requiring the user to click "Run".
+ if (
+ editTextRef.current === textAtFocusRef.current &&
+ !dropdownRef.current?.containerRef.current?.contains(
+ event.relatedTarget,
+ )
+ ) {
+ isEditingSessionActiveRef.current = false;
+ setIsFocused(false);
+ setIsOpen(false);
+ setCurrentWord("");
+ setEditText("");
+ setValidationError(null);
+ setIsExpressionDirty(false);
+ return;
+ }
- const view = editorRef.current?.view;
- const identities = view ? readMetricIdentities(view) : [];
- const invalidRanges = findInvalidRanges(
- editTextRef.current,
- metricNamesRef.current,
- identities,
- );
- if (invalidRanges.length > 0) {
- setValidationError(invalidRanges[0].message);
- return;
- }
+ const view = editorRef.current?.view;
+ const identities = view ? readMetricIdentities(view) : [];
+ const invalidRanges = findInvalidRanges(
+ editTextRef.current,
+ metricNamesRef.current,
+ identities,
+ );
+ if (invalidRanges.length > 0) {
+ setValidationError(invalidRanges[0].message);
+ return;
+ }
- setValidationError(null);
- }, [editorRef, metricNamesRef]);
+ setValidationError(null);
+ },
+ [editorRef, metricNamesRef, dropdownRef],
+ );
const handleChange = useCallback(
(newText: string) => {
@@ -434,7 +434,6 @@ export function useFormulaEditor({
setCurrentWord("");
setIsOpen(false);
- dropdownHasSelectionRef.current = false;
// Return focus to the editor after dropdown closes
setTimeout(() => {
@@ -570,13 +569,6 @@ export function useFormulaEditor({
}
}, []);
- const handleDropdownHasSelectionChange = useCallback(
- (hasSelection: boolean) => {
- dropdownHasSelectionRef.current = hasSelection;
- },
- [],
- );
-
/** Validate the expression and either show an error or commit + run the query. */
const handleRun = useCallback(() => {
const view = editorRef.current?.view;
@@ -633,10 +625,7 @@ export function useFormulaEditor({
handleContainerClick,
handleEditorClick,
handleEditorKeyDown,
- handleDropdownHasSelectionChange,
handleRun,
handleRunRef,
- isOpenRef,
- dropdownHasSelectionRef,
};
}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.module.css b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.module.css
deleted file mode 100644
index ff92e854c71..00000000000
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.listbox {
- overflow: auto;
-}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.tsx
deleted file mode 100644
index b52b917ed30..00000000000
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import type React from "react";
-import { t } from "ttag";
-
-import { getIcon } from "metabase/common/utils/icon";
-import { Box, Repeat, Skeleton, Stack, Text } from "metabase/ui";
-
-import type { MetricOrMeasureResult } from "../../../hooks/use-metric-measure-search";
-import { MetricResultItem } from "../MetricResultItem";
-
-import S from "./MetricSearchResults.module.css";
-
-type MetricSearchResultsProps = {
- results: MetricOrMeasureResult[];
- isLoading: boolean;
- cursorIndex: number | null;
- getRef: (
- item: MetricOrMeasureResult,
- ) => React.RefObject<HTMLDivElement> | undefined;
- onSelectResult: (id: number, model: "metric" | "measure") => void;
-};
-
-export function MetricSearchResults({
- results,
- isLoading,
- cursorIndex,
- getRef,
- onSelectResult,
-}: MetricSearchResultsProps) {
- if (isLoading) {
- return (
- <Stack gap="sm" p="sm">
- <Repeat times={3}>
- <Skeleton h="lg" natural radius="xs" />
- </Repeat>
- </Stack>
- );
- }
-
- if (results.length === 0) {
- return (
- <Box p="xl" data-testid="metrics-search-results">
- <Text c="text-secondary" ta="center">
- {t`No results found`}
- </Text>
- </Box>
- );
- }
-
- return (
- <Box
- mah="25rem"
- p="sm"
- className={S.listbox}
- data-testid="metrics-search-results"
- >
- {results.map((item, index) => (
- <MetricResultItem
- key={`${item.model}-${item.id}`}
- ref={getRef(item)}
- name={item.name}
- slug={item.table_name ?? undefined}
- icon={getIcon(item).name}
- active={cursorIndex === index}
- onClick={() => onSelectResult(item.id, item.model)}
- />
- ))}
- </Box>
- );
-}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/index.ts
deleted file mode 100644
index 9791dc45d5f..00000000000
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { MetricSearchResults } from "./MetricSearchResults";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.ts
index e6ed55e7c1e..cdd57507671 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.ts
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.ts
@@ -584,16 +584,6 @@ export function cleanupParens(
return current;
}
-export type ExcludeMetric = {
- id: number;
- sourceType: "metric" | "measure";
-};
-
-type SearchResultLike = {
- id: number;
- model: "metric" | "measure";
-};
-
// ── Positioned token type (internal) ────────────────────────────────────────
export type PositionedToken = (
@@ -978,25 +968,6 @@ export function findInvalidRanges(
return invalid;
}
-export function filterSearchResults<T extends SearchResultLike>(
- results: T[],
- selectedMetricIds?: Set<number>,
- selectedMeasureIds?: Set<number>,
- excludeMetric?: ExcludeMetric,
-): T[] {
- return results.filter((result) => {
- const isAlreadySelected =
- result.model === "metric"
- ? selectedMetricIds?.has(result.id)
- : selectedMeasureIds?.has(result.id);
- const isExcluded =
- excludeMetric &&
- result.id === excludeMetric.id &&
- result.model === excludeMetric.sourceType;
- return !isAlreadySelected && !isExcluded;
- });
-}
-
export type MetricIdentityEntry = {
sourceId: MetricSourceId;
from: number;
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.unit.spec.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.unit.spec.ts
index d818d0906d8..3689875295a 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.unit.spec.ts
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.unit.spec.ts
@@ -26,7 +26,6 @@ import {
buildExpressionText,
buildFullTextWithIdentities,
cleanupParens,
- filterSearchResults,
findInvalidRanges,
getWordAtCursor,
parseFullText,
@@ -59,86 +58,6 @@ function identitiesForAllMetrics(
}));
}
-function makeSearchResult(id: number, model: "metric" | "measure") {
- return { id, model, name: `Result ${id}` };
-}
-
-describe("filterSearchResults", () => {
- const results = [
- makeSearchResult(1, "metric"),
- makeSearchResult(2, "metric"),
- makeSearchResult(10, "measure"),
- makeSearchResult(20, "measure"),
- ];
-
- it("excludes already-selected metrics by ID", () => {
- const filtered = filterSearchResults(
- results,
- new Set([1]),
- new Set(),
- undefined,
- );
- expect(filtered.map((r) => ({ id: r.id, model: r.model }))).toEqual([
- { id: 2, model: "metric" },
- { id: 10, model: "measure" },
- { id: 20, model: "measure" },
- ]);
- });
-
- it("excludes already-selected measures by ID", () => {
- const filtered = filterSearchResults(
- results,
- new Set(),
- new Set([10, 20]),
- undefined,
- );
- expect(filtered.map((r) => ({ id: r.id, model: r.model }))).toEqual([
- { id: 1, model: "metric" },
- { id: 2, model: "metric" },
- ]);
- });
-
- it("excludes the excludeMetric param", () => {
- const filtered = filterSearchResults(results, new Set(), new Set(), {
- id: 2,
- sourceType: "metric",
- });
- expect(filtered.map((r) => ({ id: r.id, model: r.model }))).toEqual([
- { id: 1, model: "metric" },
- { id: 10, model: "measure" },
- { id: 20, model: "measure" },
- ]);
- });
-
- it("excludeMetric only matches same model type", () => {
- const filtered = filterSearchResults(results, new Set(), new Set(), {
- id: 1,
- sourceType: "measure",
- });
- expect(filtered).toHaveLength(4);
- });
-
- it("handles empty results", () => {
- const filtered = filterSearchResults(
- [],
- new Set([1]),
- new Set([2]),
- undefined,
- );
- expect(filtered).toEqual([]);
- });
-
- it("combines all exclusion criteria", () => {
- const filtered = filterSearchResults(results, new Set([1]), new Set([10]), {
- id: 2,
- sourceType: "metric",
- });
- expect(filtered.map((r) => ({ id: r.id, model: r.model }))).toEqual([
- { id: 20, model: "measure" },
- ]);
- });
-});
-
describe("cleanupParens", () => {
const m = (sourceId: MetricSourceId): ExpressionSubToken => ({
type: "metric",
diff --git a/frontend/src/metabase/metrics-viewer/hooks/index.ts b/frontend/src/metabase/metrics-viewer/hooks/index.ts
index ecbd16febd4..1ea8b44a1b7 100644
--- a/frontend/src/metabase/metrics-viewer/hooks/index.ts
+++ b/frontend/src/metabase/metrics-viewer/hooks/index.ts
@@ -1,2 +1 @@
-export { useMetricMeasureSearch } from "./use-metric-measure-search";
export { useMetricsViewer } from "./use-metrics-viewer";
diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-metric-measure-search.ts b/frontend/src/metabase/metrics-viewer/hooks/use-metric-measure-search.ts
deleted file mode 100644
index 480f975f83e..00000000000
--- a/frontend/src/metabase/metrics-viewer/hooks/use-metric-measure-search.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { useSearchQuery } from "metabase/api";
-import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
-import type { SearchResult } from "metabase-types/api";
-
-export type MetricOrMeasureResult = SearchResult<number, "metric" | "measure">;
-
-type UseMetricMeasureSearchResult = {
- results: MetricOrMeasureResult[];
- isLoading: boolean;
- error: Error | null;
-};
-
-const SEARCH_DEBOUNCE_MS = 300;
-const SEARCH_RESULTS_LIMIT = 5;
-
-export function useMetricMeasureSearch(
- searchText: string,
-): UseMetricMeasureSearchResult {
- const trimmed = searchText.trim();
- const debouncedSearchText = useDebouncedValue(trimmed, SEARCH_DEBOUNCE_MS);
- const effectiveText = trimmed === "" ? "" : debouncedSearchText;
-
- const { data, isLoading, error } = useSearchQuery({
- ...(effectiveText ? { q: effectiveText } : {}),
- models: ["metric", "measure"],
- filter_items_in_personal_collection: "exclude",
- model_ancestors: false,
- limit: SEARCH_RESULTS_LIMIT,
- });
-
- return {
- results: (data?.data ?? []) as MetricOrMeasureResult[],
- isLoading,
- error: error instanceof Error ? error : null,
- };
-}
diff --git a/frontend/src/metabase/metrics-viewer/types/viewer-state.ts b/frontend/src/metabase/metrics-viewer/types/viewer-state.ts
index 6bb1a8041fb..1d2e36d9210 100644
--- a/frontend/src/metabase/metrics-viewer/types/viewer-state.ts
+++ b/frontend/src/metabase/metrics-viewer/types/viewer-state.ts
@@ -2,7 +2,6 @@ import type { DimensionType } from "metabase/metrics/common/utils/dimension-type
import type { MetricDefinition } from "metabase-lib/metric";
import type {
CardDisplayType,
- ConcreteTableId,
DimensionId,
MathOperator,
TemporalUnit,
@@ -159,6 +158,5 @@ export type SelectedMetric = {
id: number;
name: string | null;
sourceType: "metric" | "measure";
- tableId?: ConcreteTableId;
isLoading?: boolean;
};
diff --git a/frontend/src/metabase/metrics-viewer/utils/series.ts b/frontend/src/metabase/metrics-viewer/utils/series.ts
index 85484f0e072..9ca9cf10c6d 100644
--- a/frontend/src/metabase/metrics-viewer/utils/series.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/series.ts
@@ -811,14 +811,12 @@ export function getSelectedMetricsInfo(
const measureId = LibMetric.sourceMeasureId(definition);
if (measureId != null) {
- const tableId = LibMetric.sourceMeasureTableId(definition);
return [
{
id: measureId,
sourceType: "measure",
name,
isLoading,
- tableId: tableId ?? undefined,
},
];
}
diff --git a/frontend/src/metabase/metrics-viewer/utils/series.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/series.unit.spec.ts
index 8c466a00cd4..788f5f7b843 100644
--- a/frontend/src/metabase/metrics-viewer/utils/series.unit.spec.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/series.unit.spec.ts
@@ -3,7 +3,6 @@ import type {
RowValues,
} from "metabase-types/api";
import { createMockColumn } from "metabase-types/api/mocks";
-import { ORDERS_ID } from "metabase-types/api/mocks/presets";
import { createMockSingleSeries } from "metabase-types/api/mocks/series";
import type { ExpressionDimensionItem } from "../components/DimensionPillBar";
@@ -471,7 +470,7 @@ describe("getSelectedMetricsInfo", () => {
});
describe("measure definition", () => {
- it("extracts measure id, name, tableId, and sourceType", () => {
+ it("extracts measure id, name, and sourceType", () => {
const sourceId: MetricSourceId = `measure:${TOTAL_MEASURE.id}`;
const result = getSelectedMetricsInfo(
[{ id: sourceId, definition: measureDefinition }],
@@ -484,7 +483,6 @@ describe("getSelectedMetricsInfo", () => {
sourceType: "measure",
name: "Total Revenue",
isLoading: false,
- tableId: ORDERS_ID,
},
]);
});
@@ -514,7 +512,6 @@ describe("getSelectedMetricsInfo", () => {
sourceType: "measure",
name: "Total Revenue",
isLoading: false,
- tableId: ORDERS_ID,
},
]);
});
@@ -543,7 +540,6 @@ describe("getSelectedMetricsInfo", () => {
sourceType: "measure",
name: "Total Revenue",
isLoading: true,
- tableId: ORDERS_ID,
},
]);
});
diff --git a/snowplow/iglu-client-embedded/schemas/com.metabase/search/jsonschema/1-1-4 b/snowplow/iglu-client-embedded/schemas/com.metabase/search/jsonschema/1-1-4
new file mode 100644
index 00000000000..fd9acf16657
--- /dev/null
+++ b/snowplow/iglu-client-embedded/schemas/com.metabase/search/jsonschema/1-1-4
@@ -0,0 +1,223 @@
+{
+ "$schema": "http://iglucentral.com/schemas/com.snowplowanalytics.self-desc/schema/jsonschema/1-0-0#",
+ "description": "Search events",
+ "self": {
+ "vendor": "com.metabase",
+ "name": "search",
+ "format": "jsonschema",
+ "version": "1-1-4"
+ },
+ "type": "object",
+ "properties": {
+ "event": {
+ "description": "Event name",
+ "type": "string",
+ "enum": [
+ "search_query",
+ "search_click",
+ "new_search_query",
+ "search_results_filtered"
+ ],
+ "maxLength": 1024
+ },
+ "runtime_milliseconds": {
+ "description": "Number of milliseconds it took to successfully run the search query",
+ "type": [
+ "integer",
+ "null"
+ ],
+ "minimum": 0,
+ "maximum": 2147483647
+ },
+ "context": {
+ "description": "Source of the search event",
+ "type": [
+ "string",
+ "null"
+ ],
+ "enum": [
+ "search-app",
+ "search-bar",
+ "command-palette",
+ "entity-picker"
+ ],
+ "maxLength": 1024
+ },
+ "total_results": {
+ "description": "The total number of results that matched the query",
+ "type": [
+ "integer",
+ "null"
+ ],
+ "minimum": 0,
+ "maximum": 2147483647
+ },
+ "page_results": {
+ "description": "The number of results returned per page",
+ "type": [
+ "integer",
+ "null"
+ ],
+ "minimum": 0,
+ "maximum": 2147483647
+ },
+ "position": {
+ "description": "The position of the result in the list that was clicked. Zero indexed",
+ "type": [
+ "integer",
+ "null"
+ ],
+ "minimum": 0,
+ "maximum": 2147483647
+ },
+ "target_type": {
+ "description": "The type of item in the search list that was clicked.",
+ "type": [
+ "string",
+ "null"
+ ],
+ "enum": [
+ "item",
+ "view_more"
+ ]
+ },
+ "content_type": {
+ "description": "Filter for entity types (question, database, model, etc.)",
+ "type": [
+ "array",
+ "null"
+ ],
+ "items": {
+ "description": "An entity type (card, question, dashboard, etc.)",
+ "type": "string",
+ "enum": [
+ "dashboard",
+ "card",
+ "dataset",
+ "segment",
+ "measure",
+ "metric",
+ "collection",
+ "database",
+ "table",
+ "action",
+ "indexed-entity",
+ "document",
+ "transform"
+ ],
+ "maxLength": 1024
+ }
+ },
+ "creator": {
+ "description": "Filter for created by a user",
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "last_editor": {
+ "description": "Filter for last edited by a user",
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "creation_date": {
+ "description": "Filter for a time when a user creates an entity",
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "last_edit_date": {
+ "description": "Filter for a time when a user last edited an entity",
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "verified_items": {
+ "description": "Filter for entities that have been marked as verified",
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "search_native_queries": {
+ "description": "Toggles whether search should include SQL and/or native queries",
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "search_archived": {
+ "description": "Toggles whether search should include archived items",
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "search_engine": {
+ "description": "The search engine used to perform the search",
+ "type": [
+ "string",
+ "null"
+ ],
+ "maxLength": 1024
+ },
+ "request_id": {
+ "description": "The unique request ID for the search request",
+ "type": [
+ "string",
+ "null"
+ ],
+ "maxLength": 1024
+ },
+ "offset": {
+ "description": "The offset of the search results (for pagination)",
+ "type": [
+ "integer",
+ "null"
+ ],
+ "minimum": 0,
+ "maximum": 2147483647
+ },
+ "entity_model": {
+ "description": "The model type of the clicked entity",
+ "type": [
+ "string",
+ "null"
+ ],
+ "maxLength": 1024
+ },
+ "entity_id": {
+ "description": "The ID of the clicked entity",
+ "type": [
+ "integer",
+ "null"
+ ],
+ "minimum": 0,
+ "maximum": 2147483647
+ },
+ "search_term_hash": {
+ "description": "A hash of the search term and instance id",
+ "type": [
+ "string",
+ "null"
+ ],
+ "maxLength": 1024
+ },
+ "search_term": {
+ "description": "The search term as a string (only reported for specific analytics UUIDs)",
+ "type": [
+ "string",
+ "null"
+ ],
+ "maxLength": 1024
+ }
+ },
+ "required": [
+ "event"
+ ],
+ "additionalProperties": true
+}
diff --git a/src/metabase/collections_rest/api.clj b/src/metabase/collections_rest/api.clj
index b87e68448d4..978ce3f0909 100644
--- a/src/metabase/collections_rest/api.clj
+++ b/src/metabase/collections_rest/api.clj
@@ -303,7 +303,8 @@
"no_models"
"timeline"
"table"
- "transform"})
+ "transform"
+ "measure"})
(def ^:private ModelString
(into [:enum] valid-model-param-values))
@@ -896,8 +897,12 @@
update-personal-collection)))))
(defmethod post-process-collection-children :table
- [_ _ _collection rows]
- (map #(update % :archived api/bit->boolean) rows))
+ [_ {:keys [models]} _collection rows]
+ (let [tables (map #(-> (t2/instance :model/Table %)
+ (update :archived api/bit->boolean)) rows)]
+ (if (contains? models :measure)
+ (t2/hydrate tables :measures)
+ tables)))
;;; TODO -- consider whether this function belongs here or in [[metabase.revisions.models.revision.last-edit]]
(mu/defn- coalesce-edit-info :- revisions/MaybeAnnotated
diff --git a/src/metabase/measures/models/measure.clj b/src/metabase/measures/models/measure.clj
index 83e0b59d1f3..b7b30be3872 100644
--- a/src/metabase/measures/models/measure.clj
+++ b/src/metabase/measures/models/measure.clj
@@ -230,6 +230,7 @@
:render-terms {:table-id :table_id
:table_description :table.description
:table_name :table.name
+ :table_display_name :table.display_name
:table_schema :table.schema}
:joins {:table [:model/Table [:= :table.id :this.table_id]]}})
diff --git a/src/metabase/search/in_place/legacy.clj b/src/metabase/search/in_place/legacy.clj
index 5d03bd98c22..38d720a15d5 100644
--- a/src/metabase/search/in_place/legacy.clj
+++ b/src/metabase/search/in_place/legacy.clj
@@ -101,6 +101,7 @@
:table_id :integer
:table_schema :text
:table_name :text
+ :table_display_name :text
:table_description :text
;; returned for Metric, Segment, and Action
:database_id :integer
@@ -452,6 +453,7 @@
[:table.db_id :database_id]
[:table.schema :table_schema]
[:table.name :table_name]
+ [:table.display_name :table_display_name]
[:table.description :table_description]])
(defmethod columns-for-model "metric"
diff --git a/src/metabase/segments/models/segment.clj b/src/metabase/segments/models/segment.clj
index 6c6eb59ec25..a4ac611c343 100644
--- a/src/metabase/segments/models/segment.clj
+++ b/src/metabase/segments/models/segment.clj
@@ -249,5 +249,6 @@
:render-terms {:table-id :table_id
:table_description :table.description
:table_name :table.name
+ :table_display_name :table.display_name
:table_schema :table.schema}
:joins {:table [:model/Table [:= :table.id :this.table_id]]}})
diff --git a/src/metabase/warehouses_rest/api.clj b/src/metabase/warehouses_rest/api.clj
index 7a4e49666ef..b30943d807d 100644
--- a/src/metabase/warehouses_rest/api.clj
+++ b/src/metabase/warehouses_rest/api.clj
@@ -1620,7 +1620,7 @@
(defn- schema-tables-list
([db-id schema]
(schema-tables-list db-id schema {}))
- ([db-id schema {:keys [include-hidden? include-editable-data-model? can-query? can-write-metadata?]}]
+ ([db-id schema {:keys [include-hidden? include-editable-data-model? can-query? can-write-metadata? include-measures?]}]
(when-not include-editable-data-model?
(api/read-check :model/Database db-id)
(api/check-403 (can-read-schema? db-id schema)))
@@ -1646,7 +1646,8 @@
can-query? (filter mi/can-query?)
can-write-metadata? (filter mi/can-write?))
hydration-keys (cond-> []
- (premium-features/has-feature? :transforms-basic) (conj :transform))]
+ (premium-features/has-feature? :transforms-basic) (conj :transform)
+ include-measures? (conj :measures))]
(if (seq hydration-keys)
(apply t2/hydrate filtered-tables hydration-keys)
filtered-tables))))
@@ -1668,18 +1669,20 @@
[{:keys [id schema]} :- [:map
[:id ms/PositiveInt]
[:schema ms/NonBlankString]]
- {:keys [include_hidden include_editable_data_model can-query can-write-metadata]} :- [:map
- [:include_hidden {:default false} [:maybe ms/BooleanValue]]
- [:include_editable_data_model {:default false} [:maybe ms/BooleanValue]]
- [:can-query {:optional true} [:maybe :boolean]]
- [:can-write-metadata {:optional true} [:maybe :boolean]]]]
+ {:keys [include_hidden include_editable_data_model can-query can-write-metadata include_measures]} :- [:map
+ [:include_hidden {:default false} [:maybe ms/BooleanValue]]
+ [:include_editable_data_model {:default false} [:maybe ms/BooleanValue]]
+ [:can-query {:optional true} [:maybe :boolean]]
+ [:can-write-metadata {:optional true} [:maybe :boolean]]
+ [:include_measures {:optional true} [:maybe :boolean]]]]
(api/check-404 (seq (schema-tables-list
id
schema
{:include-hidden? include_hidden
:include-editable-data-model? include_editable_data_model
:can-query? can-query
- :can-write-metadata? can-write-metadata}))))
+ :can-write-metadata? can-write-metadata
+ :include-measures? include_measures}))))
;; TODO (Cam 10/28/25) -- fix this endpoint so it uses kebab-case for query parameters for consistency with the rest
;; of the REST API
@@ -1697,15 +1700,17 @@
- `can-write-metadata=true` - filter to only tables the user can edit metadata for"
[{:keys [id]} :- [:map
[:id ms/PositiveInt]]
- {:keys [include_hidden include_editable_data_model can-query can-write-metadata]} :- [:map
- [:include_hidden {:default false} [:maybe ms/BooleanValue]]
- [:include_editable_data_model {:default false} [:maybe ms/BooleanValue]]
- [:can-query {:optional true} [:maybe :boolean]]
- [:can-write-metadata {:optional true} [:maybe :boolean]]]]
+ {:keys [include_hidden include_editable_data_model can-query can-write-metadata include_measures]} :- [:map
+ [:include_hidden {:default false} [:maybe ms/BooleanValue]]
+ [:include_editable_data_model {:default false} [:maybe ms/BooleanValue]]
+ [:can-query {:optional true} [:maybe :boolean]]
+ [:can-write-metadata {:optional true} [:maybe :boolean]]
+ [:include_measures {:optional true} [:maybe :boolean]]]]
(let [opts {:include-hidden? include_hidden
:include-editable-data-model? include_editable_data_model
:can-query? can-query
- :can-write-metadata? can-write-metadata}]
+ :can-write-metadata? can-write-metadata
+ :include-measures? include_measures}]
(api/check-404 (seq (concat (schema-tables-list id nil opts)
(schema-tables-list id "" opts))))))
diff --git a/test/metabase/search/api_test.clj b/test/metabase/search/api_test.clj
index 8904896e766..0a35f1dd9d3 100644
--- a/test/metabase/search/api_test.clj
+++ b/test/metabase/search/api_test.clj
@@ -65,6 +65,7 @@
:last_edited_at false
:pk_ref nil
:table_description nil
+ :table_display_name nil
:table_id false
:table_name nil
:table_schema nil
@@ -76,7 +77,8 @@
[]
(merge
{:table_id true, :database_id true}
- (t2/select-one [:model/Table [:name :table_name] [:schema :table_schema] [:description :table_description]]
+ (t2/select-one [:model/Table [:name :table_name] [:schema :table_schema]
+ [:display_name :table_display_name] [:description :table_description]]
:id (mt/id :checkins))))
(defn- clean-result [result]
diff --git a/test/metabase/search/impl_test.clj b/test/metabase/search/impl_test.clj
index 6784b3bc63a..d8f7110d405 100644
--- a/test/metabase/search/impl_test.clj
+++ b/test/metabase/search/impl_test.clj
@@ -47,9 +47,10 @@
[:like [:lower :collection_type] "%foo%"] [:inline 0]
[:like [:lower :display] "%foo%"] [:inline 0]
[:like [:lower :display_type] "%foo%"] [:inline 0]
- [:like [:lower :table_schema] "%foo%"] [:inline 0]
- [:like [:lower :table_name] "%foo%"] [:inline 0]
- [:like [:lower :table_description] "%foo%"] [:inline 0]
+ [:like [:lower :table_schema] "%foo%"] [:inline 0]
+ [:like [:lower :table_name] "%foo%"] [:inline 0]
+ [:like [:lower :table_display_name] "%foo%"] [:inline 0]
+ [:like [:lower :table_description] "%foo%"] [:inline 0]
[:like [:lower :database_name] "%foo%"] [:inline 0]
[:like [:lower :model_name] "%foo%"] [:inline 0]
[:like [:lower :dataset_query] "%foo%"] [:inline 0]
diff --git a/test/metabase/search/spec_test.clj b/test/metabase/search/spec_test.clj
index 149319c1d67..c1cc41569c3 100644
--- a/test/metabase/search/spec_test.clj
+++ b/test/metabase/search/spec_test.clj
@@ -96,7 +96,7 @@
(deftest ^:parallel search-model-hooks-test-2
;; TODO replace real specs with frozen test ones once things have stabilized
(is (= #:model{:Table #{{:search-model "segment",
- :fields #{:description :schema :name :db_id}
+ :fields #{:description :schema :name :db_id :display_name}
:where [:= :updated.id :this.table_id]}
{:search-model "table",
:fields