The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Remove search entity (#73860)
Romeo Van Snickd9447616deb5
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsxindex ad213ae91a9..8701d747050 100644--- a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx+++ b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx@@ -4,13 +4,13 @@ import { Component } from "react";import { t } from "ttag";import _ from "underscore";+import { useSearchQuery } from "metabase/api";import { EmptyState } from "metabase/common/components/EmptyState";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";import { Databases } from "metabase/entities/databases";import { Questions } from "metabase/entities/questions";import { Schemas } from "metabase/entities/schemas";-import { Search } from "metabase/entities/search";import { Tables } from "metabase/entities/tables";import { connect } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";@@ -282,7 +282,6 @@ export class UnconnectedDataSelector extends Component {}isSearchLoading = () => {- // indicates status of API request triggered by Search.loadListreturn this.props.loading;};@@ -858,26 +857,40 @@ export class UnconnectedDataSelector extends Component {}}+// If there is at least one model, we want to display a slightly different+// data picker view (see DATA_BUCKET step). Pre-fetches available models via+// search and exposes them as `metadata`/`loading`/`loaded` props.+function withAvailableModels(WrappedComponent) {+ return function DataSelectorWithAvailableModels(props) {+ const { data: response, isLoading } = useSearchQuery({+ calculate_available_models: true,+ limit: 0,+ models: ["dataset"],+ });+ const { data: _data, ...metadata } = response ?? {};+ return (+ <WrappedComponent+ {...props}+ metadata={metadata}+ loading={isLoading}+ loaded={!isLoading && response != null}+ allLoading={isLoading || (props.allLoading ?? false)}+ />+ );+ };+}+const DataSelector = _.compose(Databases.loadList({loadingAndErrorWrapper: false,listName: "databases",query: { saved: true },}),- // If there is at least one model,- // we want to display a slightly different data picker view- // (see DATA_BUCKET step)- Search.loadList({- query: {- calculate_available_models: true,- limit: 0,- models: ["dataset"],- },- loadingAndErrorWrapper: false,- }),+ withAvailableModels,connect((state, ownProps) => ({- // `metadata` is the response of `Search.loadList`. Not to be confused with Query Builder's metadata.+ // `metadata` exposes the search response (available_models, etc.). Not to+ // be confused with Query Builder's metadata.availableModels: ownProps.metadata?.available_models ?? [],metadata: getMetadata(state),hasLoadedDatabasesWithTablesSaved: Databases.selectors.getLoaded(state, {diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsxindex e37e58afa7d..5161dafd7df 100644--- a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx@@ -7,8 +7,6 @@ import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/Loadinimport { PaginationControls } from "metabase/common/components/PaginationControls";import { useUserSetting } from "metabase/common/hooks";import { useListSelect } from "metabase/common/hooks/use-list-select";-import { Search } from "metabase/entities/search";-import { useDispatch } from "metabase/redux";import { Flex, Modal } from "metabase/ui";import * as Urls from "metabase/urls";import { useListStaleCollectionItemsQuery } from "metabase-enterprise/api/collection";@@ -44,7 +42,6 @@ export const CleanupCollectionModal = ({onClose: handleClose,params,}: CleanupCollectionModalProps) => {- const dispatch = useDispatch();const collectionId = Urls.extractCollectionId(params.slug ?? "");// selection@@ -104,11 +101,11 @@ export const CleanupCollectionModal = ({{ refetchOnMountOrArgChange: true },);- const itemsData = staleItemsData?.data;const total = staleItemsData?.total ?? 0;- const items: StaleCollectionItem[] = useMemo(() => {- return (itemsData ?? []).map((item) => Search.wrapEntity(item, dispatch));- }, [itemsData, dispatch]);+ const items: StaleCollectionItem[] = useMemo(+ () => staleItemsData?.data ?? [],+ [staleItemsData?.data],+ );// selection cont.const { getIsSelected } = selection;diff --git a/frontend/src/metabase/actions/containers/ActionPicker/ActionPicker.tsx b/frontend/src/metabase/actions/containers/ActionPicker/ActionPicker.tsxindex 1ab699d93c2..61cdcbe56f5 100644--- a/frontend/src/metabase/actions/containers/ActionPicker/ActionPicker.tsx+++ b/frontend/src/metabase/actions/containers/ActionPicker/ActionPicker.tsx@@ -1,14 +1,14 @@import type { MouseEvent } from "react";import { useMemo, useState } from "react";import { t } from "ttag";-import _ from "underscore";import ActionCreator from "metabase/actions/containers/ActionCreator";+import { useSearchQuery } from "metabase/api";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { Modal } from "metabase/common/components/Modal";import { useToggle } from "metabase/common/hooks/use-toggle";import CS from "metabase/css/core/index.css";import { Actions } from "metabase/entities/actions";-import { Search } from "metabase/entities/search";import type { Card, WritebackAction } from "metabase-types/api";import {@@ -22,20 +22,22 @@ import {} from "./ActionPicker.styled";import { sortAndGroupActions } from "./utils";+type ActionPickerModel = Pick<Card, "id" | "name" | "database_id">;+export function ActionPicker({models,actions,onClick,currentAction,}: {- models: Card[];+ models: ActionPickerModel[];actions: WritebackAction[];onClick: (action: WritebackAction) => void;currentAction?: WritebackAction;}) {const sortedModels =useMemo(- () => models?.sort((a, b) => a.name.localeCompare(b.name)),+ () => models?.toSorted((a, b) => a.name.localeCompare(b.name)),[models],) ?? [];@@ -70,7 +72,7 @@ function ModelActionPicker({currentAction,}: {onClick: (newValue: WritebackAction) => void;- model: Card;+ model: ActionPickerModel;actions: WritebackAction[];currentAction?: WritebackAction;}) {@@ -153,14 +155,32 @@ function ModelActionPicker({);}-export const ConnectedActionPicker = _.compose(- Search.loadList({- query: () => ({- models: ["dataset"],- }),- listName: "models",- }),- Actions.loadList({- loadingAndErrorWrapper: false,- }),-)(ActionPicker);+function ActionPickerWithModels(+ props: Omit<Parameters<typeof ActionPicker>[0], "models">,+) {+ const {+ data: searchResponse,+ isLoading,+ error,+ } = useSearchQuery({ models: ["dataset"] });+ const models = (searchResponse?.data ?? []).flatMap((result) =>+ typeof result.id === "number"+ ? [+ {+ id: result.id,+ name: result.name,+ database_id: result.database_id,+ },+ ]+ : [],+ );+ return (+ <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper>+ <ActionPicker {...props} models={models} />+ </LoadingAndErrorWrapper>+ );+}++export const ConnectedActionPicker = Actions.loadList({+ loadingAndErrorWrapper: false,+})(ActionPickerWithModels);diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsxindex fcd1be7497f..5d99eb80687 100644--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx@@ -38,7 +38,6 @@ import {import { useListSelect } from "metabase/common/hooks/use-list-select";import { Bookmarks } from "metabase/entities/bookmarks";import { Collections } from "metabase/entities/collections";-import { Search } from "metabase/entities/search";import { useDispatch } from "metabase/redux";import { MAX_UPLOAD_SIZE, MAX_UPLOAD_STRING } from "metabase/redux/uploads";import type Database from "metabase-lib/v1/metadata/Database";@@ -93,11 +92,7 @@ export const CollectionContentView = ({sort_direction: "asc",});- const list = useMemo(- () =>- pinnedItemsData?.data.map((item) => Search.wrapEntity(item, dispatch)),- [pinnedItemsData, dispatch],- );+ const list = pinnedItemsData?.data;const [isBookmarked, setIsBookmarked] = useState(false);const [selectedItems, setSelectedItems] = useState<CollectionItem[] | null>(null,diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsxindex 0d9c947a920..f62f3f90e7b 100644--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx@@ -26,8 +26,6 @@ import { PaginationControls } from "metabase/common/components/PaginationControlimport { usePagination } from "metabase/common/hooks/use-pagination";import CS from "metabase/css/core/index.css";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";-import { Search } from "metabase/entities/search";-import { useDispatch } from "metabase/redux";import type Database from "metabase-lib/v1/metadata/Database";import type {Bookmark,@@ -220,14 +218,10 @@ const CollectionItemsTableContent = ({onPreviousPage,onUnpinnedItemsSortingChange,}: CollectionItemsTableContentProps) => {- const dispatch = useDispatch();const { data, isLoading: loadingUnpinnedItems } =useListCollectionItemsQuery(unpinnedQuery);- const unpinnedItems = useMemo(- () => data?.data.map((item) => Search.wrapEntity(item, dispatch)) ?? [],- [data, dispatch],- );+ const unpinnedItems = data?.data ?? [];const total = data?.total;const visibleColumnsMap = useMemo(() => getVisibleColumnsMap(visibleColumns),diff --git a/frontend/src/metabase/common/hooks/entity-framework/index.ts b/frontend/src/metabase/common/hooks/entity-framework/index.tsindex 1b762f6453f..2b762f8abf6 100644--- a/frontend/src/metabase/common/hooks/entity-framework/index.ts+++ b/frontend/src/metabase/common/hooks/entity-framework/index.ts@@ -9,5 +9,4 @@ export * from "./use-database-list-query";export * from "./use-database-query";export * from "./use-question-list-query";export * from "./use-question-query";-export * from "./use-search-list-query";export * from "./use-table-query";diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/index.ts b/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/index.tsdeleted file mode 100644index 17aa2718d87..00000000000--- a/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./use-search-list-query";diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/use-search-list-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/use-search-list-query.tsdeleted file mode 100644index 5311eeeb4de..00000000000--- a/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/use-search-list-query.ts+++ /dev/null@@ -1,31 +0,0 @@-import { Search } from "metabase/entities/search";-import type {- CollectionItem,- SearchRequest,- SearchResponse,-} from "metabase-types/api";--import type {- UseEntityListQueryProps,- UseEntityListQueryResult,-} from "../use-entity-list-query";-import { useEntityListQuery } from "../use-entity-list-query";--/**- * @deprecated use "metabase/api" instead- */-export const useSearchListQuery = <- TItem = CollectionItem,- TResult = Omit<SearchResponse, "data">,->(- props: UseEntityListQueryProps<SearchRequest> = {},-): UseEntityListQueryResult<TItem, TResult> => {- return useEntityListQuery(props, {- fetchList: Search.actions.fetchList,- getList: Search.selectors.getList,- getLoading: Search.selectors.getLoading,- getLoaded: Search.selectors.getLoaded,- getError: Search.selectors.getError,- getListMetadata: Search.selectors.getListMetadata,- });-};diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/use-search-list-query.unit.spec.tsx b/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/use-search-list-query.unit.spec.tsxdeleted file mode 100644index d3f4d6e9f81..00000000000--- a/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/use-search-list-query.unit.spec.tsx+++ /dev/null@@ -1,125 +0,0 @@-import _ from "underscore";--import { setupSearchEndpoints } from "__support__/server-mocks";-import {- renderWithProviders,- screen,- waitForLoaderToBeRemoved,- within,-} from "__support__/ui";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { checkNotNull } from "metabase/utils/types";-import {- createMockCollection,- createMockCollectionItem,- createMockSearchResult,- createMockSearchResults,-} from "metabase-types/api/mocks";--import { useSearchListQuery } from "./use-search-list-query";--const TEST_ITEM_MODEL = "card";-const TEST_ITEM = createMockCollectionItem({ model: TEST_ITEM_MODEL });-const TEST_COLLECTION = createMockCollection();--const TEST_TABLE_DB_ID = 1;-const TEST_SEARCH_RESULTS = createMockSearchResults({- items: [- createMockSearchResult({ collection: { ...TEST_COLLECTION, type: null } }),- ],- options: { table_db_id: TEST_TABLE_DB_ID },-});--const TEST_SEARCH_METADATA = _.omit(TEST_SEARCH_RESULTS, "data");--const TestComponent = () => {- const {- data = [],- metadata,- isLoading,- error,- } = useSearchListQuery({- query: {- models: [TEST_ITEM_MODEL],- limit: TEST_SEARCH_METADATA.limit,- offset: TEST_SEARCH_METADATA.offset,- table_db_id: TEST_TABLE_DB_ID,- },- });-- if (isLoading || error) {- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;- }-- return (- <div>- {data.map((item) => (- <div key={item.id}>{item.name}</div>- ))}- <div data-testid="metadata">- {metadata && (- <>- <div data-testid="available-models">- {(metadata.available_models || []).join(", ")}- </div>- <div data-testid="limit">{metadata.limit}</div>- <div data-testid="models">{(metadata.models || []).join(", ")}</div>- <div data-testid="offset">{metadata.offset}</div>- <div data-testid="table-db-id">{metadata.table_db_id}</div>- <div data-testid="total">{metadata.total}</div>- </>- )}- </div>- </div>- );-};--const setup = () => {- setupSearchEndpoints([TEST_ITEM]);- renderWithProviders(<TestComponent />);-};--describe("useSearchListQuery", () => {- it("should be initially loading", () => {- setup();- expect(screen.getByTestId("loading-indicator")).toBeInTheDocument();- });-- it("should show data from the response", async () => {- setup();- await waitForLoaderToBeRemoved();- expect(screen.getByText(TEST_ITEM.name)).toBeInTheDocument();- });-- it("should show metadata from the response", async () => {- setup();- await waitForLoaderToBeRemoved();-- const metadata = within(screen.getByTestId("metadata"));-- const availableModelTextContent = checkNotNull(- TEST_SEARCH_METADATA.available_models,- ).join(", ");-- const modelsTextContent = checkNotNull(TEST_SEARCH_METADATA.models).join(- ", ",- );-- expect(metadata.getByTestId("available-models")).toHaveTextContent(- availableModelTextContent,- );- expect(metadata.getByTestId("limit")).toHaveTextContent(- String(TEST_SEARCH_METADATA.limit),- );- expect(metadata.getByTestId("models")).toHaveTextContent(modelsTextContent);- expect(metadata.getByTestId("offset")).toHaveTextContent(- String(TEST_SEARCH_METADATA.offset),- );- expect(metadata.getByTestId("table-db-id")).toHaveTextContent(- String(TEST_SEARCH_METADATA.table_db_id),- );- expect(metadata.getByTestId("total")).toHaveTextContent(- String(TEST_SEARCH_METADATA.total),- );- });-});diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsxindex 2449c8a0e00..39cbf120fc6 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx@@ -1,4 +1,4 @@-import { type ComponentProps, useEffect, useMemo, useState } from "react";+import { type ComponentProps, useEffect, useState } from "react";import { t } from "ttag";import {@@ -16,7 +16,6 @@ import { usePagination } from "metabase/common/hooks/use-pagination";import { addCardWithVisualization } from "metabase/dashboard/actions";import { getSelectedTabId } from "metabase/dashboard/selectors";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";-import { Search } from "metabase/entities/search";import { useGetIcon } from "metabase/hooks/use-icon";import { PLUGIN_MODERATION } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";@@ -115,9 +114,7 @@ export function QuestionList({const error = isSearching ? searchError : itemsError;const isFetching = isSearching ? searchIsFetching : itemsIsFetching;const dispatch = useDispatch();- const list: (SearchResult | CollectionItem)[] = useMemo(() => {- return data?.data?.map((item) => Search.wrapEntity(item, dispatch)) ?? [];- }, [data, dispatch]);+ const list: (SearchResult | CollectionItem)[] = data?.data ?? [];if (collectionId === "personal" && !searchText) {return null;diff --git a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsxindex ce49e7f54f7..41817309f0b 100644--- a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx+++ b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx@@ -5,7 +5,6 @@ import _ from "underscore";import { TippyPopover } from "metabase/common/components/Popover/TippyPopover";import { useToggle } from "metabase/common/hooks/use-toggle";import { getParameterValues } from "metabase/dashboard/selectors";-import { Search } from "metabase/entities/search";import { SearchResults } from "metabase/nav/components/search/SearchResults";import { useSelector } from "metabase/redux";import { modelToUrl } from "metabase/urls";@@ -123,17 +122,17 @@ function LinkVizInner({);}- const wrappedEntity: UnrestrictedLinkEntity = Search.wrapEntity({+ const linkEntity = {...entity,database_id: entity.db_id ?? entity.database_id,table_id: entity.model === "table" ? entity.id : undefined,collection: {},- });+ };if (isEditing) {return (<EditLinkCardWrapper data-testid="entity-edit-display-link">- <EntityDisplay entity={wrappedEntity} showDescription={false} />+ <EntityDisplay entity={linkEntity} showDescription={false} /></EditLinkCardWrapper>);}@@ -142,11 +141,11 @@ function LinkVizInner({<DisplayLinkCardWrapper><CardLinkdata-testid="entity-view-display-link"- to={modelToUrl(wrappedEntity)}+ to={modelToUrl(linkEntity)}rel="noreferrer"role="link">- <EntityDisplay entity={wrappedEntity} showDescription />+ <EntityDisplay entity={linkEntity} showDescription /></CardLink></DisplayLinkCardWrapper>);diff --git a/frontend/src/metabase/entities/containers/EntityListLoader.unit.spec.js b/frontend/src/metabase/entities/containers/EntityListLoader.unit.spec.jsdeleted file mode 100644index 80e350c9969..00000000000--- a/frontend/src/metabase/entities/containers/EntityListLoader.unit.spec.js+++ /dev/null@@ -1,59 +0,0 @@-import "mutationobserver-shim";--import { waitFor } from "@testing-library/react";--import { renderWithProviders } from "__support__/ui";-import { LegacyApi } from "metabase/api/legacy-client";-import { EntityListLoader } from "metabase/entities/containers/rtk-query";--describe("EntityListLoader", () => {- let _makeRequest;-- beforeEach(() => {- _makeRequest = LegacyApi.prototype._makeRequest;- LegacyApi.prototype._makeRequest = jest- .fn()- .mockReturnValue(Promise.resolve({ data: [] }));- });-- afterEach(() => {- LegacyApi.prototype._makeRequest = _makeRequest;- });-- describe("with entityType of search", () => {- const MockComponent = () => <div>Mock Component</div>;-- it("should handle object entityQuery", async () => {- renderWithProviders(- <EntityListLoader- entityType="search"- entityQuery={{ collection: "foo" }}- ComposedComponent={MockComponent}- />,- );- await waitFor(() => {- expect(LegacyApi.prototype._makeRequest).toHaveBeenCalled();- });- expect(- LegacyApi.prototype._makeRequest.mock.calls.map((c) => c.slice(0, 2)),- ).toEqual([["GET", "/api/collection/foo/items"]]);- });-- it("should handle function entityQuery", async () => {- renderWithProviders(- <EntityListLoader- entityType="search"- entityQuery={(state, props) => ({ collection: props.collectionId })}- collectionId="foo"- ComposedComponent={MockComponent}- />,- );- await waitFor(() => {- expect(LegacyApi.prototype._makeRequest).toHaveBeenCalled();- });- expect(- LegacyApi.prototype._makeRequest.mock.calls.map((c) => c.slice(0, 2)),- ).toEqual([["GET", "/api/collection/foo/items"]]);- });- });-});diff --git a/frontend/src/metabase/entities/index.ts b/frontend/src/metabase/entities/index.tsindex 3a9bf5577af..7c1d23d30a0 100644--- a/frontend/src/metabase/entities/index.ts+++ b/frontend/src/metabase/entities/index.ts@@ -83,7 +83,6 @@ export { Segments as segments } from "./segments";export { Measures as measures } from "./measures";export { Metrics as metrics } from "./metrics";-export { Search as search } from "./search";export { Snippets as snippets } from "./snippets";export { entityCompatibleQuery, combineEntities } from "./utils";diff --git a/frontend/src/metabase/entities/search.js b/frontend/src/metabase/entities/search.jsdeleted file mode 100644index dc97e22f22b..00000000000--- a/frontend/src/metabase/entities/search.js+++ /dev/null@@ -1,225 +0,0 @@-import { useMemo } from "react";--import {- cardApi,- collectionApi,- searchApi,- skipToken,- useListCollectionItemsQuery,- useSearchQuery,-} from "metabase/api";-import { canonicalCollectionId } from "metabase/collections/utils";-import { ObjectUnionSchema } from "metabase/schema";--import { Actions } from "./actions";-import { Bookmarks } from "./bookmarks";-import { Collections } from "./collections";-import { Dashboards } from "./dashboards";-import { Questions } from "./questions";-import { Segments } from "./segments";-import { SnippetCollections } from "./snippet-collections";-import { Snippets } from "./snippets";-import { createEntity, entityCompatibleQuery, entityForObject } from "./utils";--/**- * @deprecated use "metabase/api" instead- */-export const Search = createEntity({- name: "search",- path: "/api/search",-- rtk: () => ({- useListQuery,- }),-- api: {- list: async (query = {}, dispatch) => {- if (query.collection) {- const {- collection,- archived,- models,- namespace,- pinned_state,- limit,- offset,- sort_column,- sort_direction,- show_dashboard_questions,- ...unsupported- } = query;- if (Object.keys(unsupported).length > 0) {- throw new Error(- "search with `collection` filter does not support these filters: " +- Object.keys(unsupported).join(", "),- );- }-- const { data, ...rest } = await entityCompatibleQuery(- {- id: collection,- archived,- models,- namespace,- pinned_state,- limit,- offset,- sort_column,- sort_direction,- show_dashboard_questions,- },- dispatch,- collectionApi.endpoints.listCollectionItems,- );-- return {- ...rest,- data: data- ? data.map((item) => ({- collection_id: canonicalCollectionId(collection),- archived: archived || false,- ...item,- }))- : [],- };- } else {- const { data, ...rest } = await entityCompatibleQuery(- query,- dispatch,- searchApi.endpoints.search,- );-- return {- ...rest,- data: data- ? data.map((item) => {- const collectionKey = item.collection- ? { collection_id: item.collection.id }- : {};- return {- ...collectionKey,- ...item,- };- })- : [],- };- }- },- },-- schema: ObjectUnionSchema,-- // delegate to the actual object's entity wrapEntity- wrapEntity(object, dispatch = null) {- const entity = entityForObject(object);- return entity ? entity.wrapEntity(object, dispatch) : object;- },-- objectActions: {- delete: (object) => {- return (dispatch) => {- const entity = entityForObject(object);- return entity ? dispatch(entity.actions.delete(object)) : object;- };- },- },-- // delegate to each entity's actionShouldInvalidateLists- actionShouldInvalidateLists(action) {- return (- Actions.actionShouldInvalidateLists(action) ||- Bookmarks.actionShouldInvalidateLists(action) ||- Collections.actionShouldInvalidateLists(action) ||- Dashboards.actionShouldInvalidateLists(action) ||- Questions.actionShouldInvalidateLists(action) ||- Segments.actionShouldInvalidateLists(action) ||- Snippets.actionShouldInvalidateLists(action) ||- SnippetCollections.actionShouldInvalidateLists(action) ||- cardApi.endpoints.updateCard.matchFulfilled(action)- );- },-});--function useListQuery(query = {}, options) {- const collectionItemsQuery = useListCollectionItemsQuery(- query.collection ? getCollectionItemsQueryPayload(query) : skipToken,- options,- );- const collectionItems = useMemo(() => {- return {- ...collectionItemsQuery,- data: collectionItemsQuery.data- ? {- ...collectionItemsQuery.data,- data: collectionItemsQuery.data.data.map((item) => ({- collection_id: canonicalCollectionId(query.collection),- archived: query.archived || false,- ...item,- })),- }- : undefined,- };- }, [collectionItemsQuery, query]);-- const searchQuery = useSearchQuery(- query.collection ? skipToken : query,- options,- );- const search = useMemo(() => {- return {- ...searchQuery,- data: searchQuery.data- ? {- ...searchQuery.data,- data: searchQuery.data.data.map((item) => {- const collectionKey = item.collection- ? { collection_id: item.collection.id }- : {};- return {- ...collectionKey,- ...item,- };- }),- }- : undefined,- };- }, [searchQuery]);-- return query.collection ? collectionItems : search;-}--function getCollectionItemsQueryPayload(query) {- const {- collection,- archived,- models,- namespace,- pinned_state,- limit,- offset,- sort_column,- sort_direction,- show_dashboard_questions,- ...unsupported- } = query;-- if (Object.keys(unsupported).length > 0) {- throw new Error(- "search with `collection` filter does not support these filters: " +- Object.keys(unsupported).join(", "),- );- }-- return {- id: collection,- archived,- models,- namespace,- pinned_state,- limit,- offset,- sort_column,- sort_direction,- show_dashboard_questions,- };-}diff --git a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsxindex 74da0964e11..902aa439a85 100644--- a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx+++ b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx@@ -3,10 +3,9 @@ import { push } from "react-router-redux";import { useDebounce } from "react-use";import { t } from "ttag";+import { skipToken, useSearchQuery } from "metabase/api";import { EmptyState } from "metabase/common/components/EmptyState";-import { useSearchListQuery } from "metabase/common/hooks";import { useListKeyboardNavigation } from "metabase/common/hooks/use-list-keyboard-navigation";-import { Search } from "metabase/entities/search";import {EmptyStateContainer,ResultsContainer,@@ -26,6 +25,7 @@ import {import type {CollectionItem,SearchModel,+ SearchResult as SearchResultType,SearchResponse as SearchResultsType,} from "metabase-types/api";@@ -94,15 +94,18 @@ export const SearchResults = ({query.context = SearchContextTypes.SEARCH_BAR;}- const {- data: list = [],- metadata,- isLoading,- } = useSearchListQuery({- query,- reload: true,- enabled: !!debouncedSearchText,- });+ const { data: response, isLoading } = useSearchQuery(+ debouncedSearchText ? query : skipToken,+ { refetchOnMountOrArgChange: true },+ );+ const list = useMemo(() => response?.data ?? [], [response?.data]);+ const metadata = useMemo<Omit<SearchResultsType, "data"> | undefined>(() => {+ if (!response) {+ return undefined;+ }+ const { data: _data, ...rest } = response;+ return rest;+ }, [response]);const hasResults = list.length > 0;const showFooter = hasResults && footerComponent && metadata;@@ -111,14 +114,19 @@ export const SearchResults = ({return showFooter ? [...list, footerComponent] : list;}, [footerComponent, list, showFooter]);- const onEnterSelect = (item?: CollectionItem | SearchResultsFooter) => {+ type ItemType =+ | CollectionItem+ | SearchResultsProps["footerComponent"]+ | SearchResultType;++ const onEnterSelect = (item?: ItemType) => {if (showFooter && cursorIndex === dropdownItemList.length - 1) {onFooterSelect?.();}if (item && typeof item !== "function") {if (onEntitySelect) {- onEntitySelect(Search.wrapEntity(item, dispatch));+ onEntitySelect(item);} else if (item && modelToUrl(item)) {dispatch(push(modelToUrl(item)));}@@ -126,7 +134,7 @@ export const SearchResults = ({};const { reset, getRef, cursorIndex } = useListKeyboardNavigation<- CollectionItem | SearchResultsProps["footerComponent"],+ ItemType,HTMLLIElement>({list: dropdownItemList,@@ -152,12 +160,11 @@ export const SearchResults = ({? onEntitySelect: undefined;const ref = getRef(item);- const wrappedResult = Search.wrapEntity(item, dispatch);return (<li key={`${item.model}:${item.id}`} ref={ref}><SearchResult- result={wrappedResult}+ result={item}compact={true}showDescription={true}isSelected={cursorIndex === index}diff --git a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx b/frontend/src/metabase/palette/hooks/useCommandPalette.tsxindex 75de7909312..170ea432654 100644--- a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPalette.tsx@@ -9,9 +9,8 @@ import { getCollection } from "metabase/collections/utils";import type { OmniPickerItem } from "metabase/common/components/Pickers";import { useSetting } from "metabase/common/hooks";import { ROOT_COLLECTION } from "metabase/entities/collections/constants";-import { Search } from "metabase/entities/search";import { useGetIcon } from "metabase/hooks/use-icon";-import { useDispatch, useSelector } from "metabase/redux";+import { useSelector } from "metabase/redux";import { trackSearchClick } from "metabase/search/analytics";import {getDocsSearchUrl,@@ -43,7 +42,6 @@ export const useCommandPalette = ({locationQuery: Query;}) => {const getIcon = useGetIcon();- const dispatch = useDispatch();const docsUrl = useSelector((state) => getDocsUrl(state, {}));const showMetabaseLinks = useSelector(getShowMetabaseLinks);const { isVisible } = useKBar((s) => ({@@ -180,8 +178,7 @@ export const useCommandPalette = ({} else if (debouncedSearchText) {if (searchResults?.data.length) {return searchResults.data.map((result, index) => {- const wrappedResult = Search.wrapEntity(result, dispatch);- const icon = getIcon(wrappedResult);+ const icon = getIcon(result);return {id: `search-result-${result.model}-${result.id}`,name: result.name,@@ -205,9 +202,9 @@ export const useCommandPalette = ({},extra: {moderatedStatus: result.moderated_status,- href: modelToUrl(wrappedResult),+ href: modelToUrl(result),iconColor: icon.color,- subtext: getSearchResultSubtext(wrappedResult),+ subtext: getSearchResultSubtext(result),},};});@@ -226,7 +223,6 @@ export const useCommandPalette = ({return [];}, [disabled,- dispatch,debouncedSearchText,searchQuery,isSearchLoading,diff --git a/frontend/src/metabase/palette/hooks/useCommandPalette.unit.spec.tsx b/frontend/src/metabase/palette/hooks/useCommandPalette.unit.spec.tsxindex 64b23459be2..159bd3b13ab 100644--- a/frontend/src/metabase/palette/hooks/useCommandPalette.unit.spec.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPalette.unit.spec.tsx@@ -1,7 +1,6 @@import type React from "react";import { render, screen } from "__support__/ui";-import { Search } from "metabase/entities/search";import { Text } from "metabase/ui";import {createMockCollection,@@ -22,12 +21,10 @@ const setup = (child: React.ReactNode) => {describe("useCommandPalette", () => {describe("getSearchResultSubtext", () => {it("should work for model indexes", async () => {- const mockSearchResult = Search.wrapEntity(- createMockSearchResult({- model: "indexed-entity",- model_name: "foo",- }),- );+ const mockSearchResult = createMockSearchResult({+ model: "indexed-entity",+ model_name: "foo",+ });setup(getSearchResultSubtext(mockSearchResult));expect(await screen.findByText(/a record in/)).toBeInTheDocument();@@ -38,42 +35,36 @@ describe("useCommandPalette", () => {});it("should work for cards", async () => {- const mockSearchResult = Search.wrapEntity(- createMockSearchResult({- model: "card",- collection: createMockCollection({- name: "Foo Collection",- id: 2,- }),+ const mockSearchResult = createMockSearchResult({+ model: "card",+ collection: createMockCollection({+ name: "Foo Collection",+ id: 2,}),- );+ });setup(getSearchResultSubtext(mockSearchResult));expect(await screen.findByText("Foo Collection")).toBeInTheDocument();});it("should work for tables", async () => {- const mockSearchResult = Search.wrapEntity(- createMockSearchResult({- model: "table",- collection: createMockCollection({ id: undefined, name: undefined }),- database_name: "Bar Database",- }),- );+ const mockSearchResult = createMockSearchResult({+ model: "table",+ collection: createMockCollection({ id: undefined, name: undefined }),+ database_name: "Bar Database",+ });setup(getSearchResultSubtext(mockSearchResult));expect(await screen.findByText("Bar Database")).toBeInTheDocument();});it("should should include the schema name in table search results when provided", async () => {- const mockSearchResult = Search.wrapEntity(- createMockSearchResult({- model: "table",- collection: createMockCollection({ id: undefined, name: undefined }),- database_name: "Bar Database",- table_schema: "My Schema",- }),- );+ const mockSearchResult = createMockSearchResult({+ model: "table",+ collection: createMockCollection({ id: undefined, name: undefined }),+ database_name: "Bar Database",+ table_schema: "My Schema",+ });setup(getSearchResultSubtext(mockSearchResult));expect(@@ -82,14 +73,12 @@ describe("useCommandPalette", () => {});it("should should include the collection name in table search results when the table is published to a collection", async () => {- const mockSearchResult = Search.wrapEntity(- createMockSearchResult({- model: "table",- collection: createMockCollection({ id: 1, name: "Data" }),- database_name: "Bar Database",- table_schema: "My Schema",- }),- );+ const mockSearchResult = createMockSearchResult({+ model: "table",+ collection: createMockCollection({ id: 1, name: "Data" }),+ database_name: "Bar Database",+ table_schema: "My Schema",+ });setup(getSearchResultSubtext(mockSearchResult));expect(await screen.findByText("Data")).toBeInTheDocument();diff --git a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsxindex de74391318a..d08e07399fd 100644--- a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx@@ -5,11 +5,9 @@ import { push } from "react-router-redux";import { useLatest } from "react-use";import { t } from "ttag";+import { skipToken, useSearchQuery } from "metabase/api";import { useInitialCollectionId } from "metabase/collections/hooks";-import {- useDatabaseListQuery,- useSearchListQuery,-} from "metabase/common/hooks";+import { useDatabaseListQuery } from "metabase/common/hooks";import { trackMetricCreateStarted } from "metabase/data-studio/analytics";import { canAccessDataStudio } from "metabase/data-studio/selectors";import { useDispatch, useSelector } from "metabase/redux";@@ -66,10 +64,10 @@ export const useCommandPaletteBasicActions = ({const { data: databases = [] } = useDatabaseListQuery({enabled: isLoggedIn,});- const { data: models = [] } = useSearchListQuery({- query: { models: ["dataset"], limit: 1 },- enabled: isLoggedIn,- });+ const { data: searchResults } = useSearchQuery(+ isLoggedIn ? { models: ["dataset"], limit: 1 } : skipToken,+ );+ const hasModels = (searchResults?.data?.length ?? 0) > 0;const personalCollectionId = useSelector(getUserPersonalCollectionId);const isAdmin = useSelector(getUserIsAdmin);@@ -79,7 +77,6 @@ export const useCommandPaletteBasicActions = ({const hasNativeWrite = useSelector(canUserCreateNativeQueries);const hasDatabaseWithActionsEnabled =getHasDatabaseWithActionsEnabled(databases);- const hasModels = models.length > 0;const openNewModal = useCallback((modalId: ModalName) => {diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.jsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.jsxindex a78316a224f..cdb4cf3fef9 100644--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.jsx+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.jsx@@ -5,13 +5,13 @@ import { Component } from "react";import { t } from "ttag";import _ from "underscore";+import { useSearchQuery } from "metabase/api";import { EmptyState } from "metabase/common/components/EmptyState";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";import { Databases } from "metabase/entities/databases";import { Questions } from "metabase/entities/questions";import { Schemas } from "metabase/entities/schemas";-import { Search } from "metabase/entities/search";import { Tables } from "metabase/entities/tables";import { connect } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";@@ -440,7 +440,6 @@ export class UnconnectedDataSelector extends Component {}isSearchLoading = () => {- // indicates status of API request triggered by Search.loadListreturn this.props.loading;};@@ -1060,22 +1059,39 @@ export class UnconnectedDataSelector extends Component {}}-const DataSelector = _.compose(- Databases.loadList({- loadingAndErrorWrapper: false,- listName: "allDatabases",- }),- // If there is at least one model or metric,- // we want to display a slightly different data picker view- // (see DATA_BUCKET step)- Search.loadList({- query: {+// If there is at least one model or metric, we want to display a slightly+// different data picker view (see DATA_BUCKET step). Pre-fetches available+// models via search and exposes them as `metadata`/`loading`/`loaded` props.+function withAvailableModels(WrappedComponent) {+ return function DataSelectorWithAvailableModels(props) {+ const { data: response, isLoading } = useSearchQuery({calculate_available_models: true,limit: 0,models: ["dataset", "metric"],- },+ });+ let metadata;+ if (response) {+ const { data: _data, ...rest } = response;+ metadata = rest;+ }+ return (+ <WrappedComponent+ {...props}+ metadata={metadata}+ loading={isLoading}+ loaded={!isLoading && response != null}+ allLoading={isLoading || (props.allLoading ?? false)}+ />+ );+ };+}++const DataSelector = _.compose(+ Databases.loadList({loadingAndErrorWrapper: false,+ listName: "allDatabases",}),+ withAvailableModels,connect((state, ownProps) => ({availableModels: ownProps.metadata?.available_models ?? [],diff --git a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.jsx b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.jsxindex c622763fafb..5e4d9c55112 100644--- a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.jsx+++ b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.jsx@@ -4,11 +4,12 @@ import * as React from "react";import { t } from "ttag";import _ from "underscore";+import { useListCollectionItemsQuery } from "metabase/api";import { canonicalCollectionId } from "metabase/collections/utils";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { SidebarContent } from "metabase/common/components/SidebarContent";import { SidebarHeader } from "metabase/common/components/SidebarHeader";import CS from "metabase/css/core/index.css";-import { Search } from "metabase/entities/search";import { SnippetCollections } from "metabase/entities/snippet-collections";import { Snippets } from "metabase/entities/snippets";import {@@ -249,6 +250,25 @@ class SnippetSidebarInner extends React.Component {}}+function SnippetSidebarWithSearch(props) {+ const collectionId =+ props.snippetCollectionId === null ? "root" : props.snippetCollectionId;+ const {+ data: searchResponse,+ isLoading,+ error,+ } = useListCollectionItemsQuery({+ id: collectionId,+ namespace: "snippets",+ });+ const search = searchResponse?.data ?? [];+ return (+ <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper>+ <SnippetSidebarInner {...props} search={search} />+ </LoadingAndErrorWrapper>+ );+}+export const SnippetSidebar = _.compose(Snippets.loadList(),SnippetCollections.loadList(),@@ -257,17 +277,10 @@ export const SnippetSidebar = _.compose(props.snippetCollectionId === null ? "root" : props.snippetCollectionId,wrapped: true,}),- Search.loadList({- query: (state, props) => ({- collection:- props.snippetCollectionId === null ? "root" : props.snippetCollectionId,- namespace: "snippets",- }),- }),connect((state, { list }) => ({isRemoteSyncReadOnly: PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly(state),})),-)(SnippetSidebarInner);+)(SnippetSidebarWithSearch);function ArchivedSnippetsInner(props) {const {diff --git a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.tsx b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.tsxindex b9ee1c8b204..ae84a55dc0d 100644--- a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.tsx+++ b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.tsx@@ -1,6 +1,6 @@import { useState } from "react";-import { useSearchListQuery } from "metabase/common/hooks";+import { useSearchQuery } from "metabase/api";import { getTranslatedEntityName } from "metabase/common/utils/model-names";import { SearchFilterPopoverWrapper } from "metabase/search/components/SearchFilterPopoverWrapper";import { enabledSearchTypes } from "metabase/search/constants";@@ -16,15 +16,13 @@ const EMPTY_SEARCH_QUERY = {export const TypeFilterContent: SearchFilterDropdown<"type">["ContentComponent"] =({ value, onChange, width }) => {- const { metadata, isLoading } = useSearchListQuery({- query: EMPTY_SEARCH_QUERY,- });+ const { data: response, isLoading } = useSearchQuery(EMPTY_SEARCH_QUERY);const [selectedTypes, setSelectedTypes] = useState<EnabledSearchModel[]>(value ?? [],);- const availableModels = (metadata && metadata.available_models) ?? [];+ const availableModels = response?.available_models ?? [];const typeFilters = enabledSearchTypes.filter((type) =>availableModels.includes(type),);diff --git a/frontend/src/metabase/search/containers/SearchApp.jsx b/frontend/src/metabase/search/containers/SearchApp.jsxindex 7b82b41c646..c2724885d71 100644--- a/frontend/src/metabase/search/containers/SearchApp.jsx+++ b/frontend/src/metabase/search/containers/SearchApp.jsx@@ -9,7 +9,6 @@ import { EmptyState } from "metabase/common/components/EmptyState";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PaginationControls } from "metabase/common/components/PaginationControls";import { NoObjectError } from "metabase/common/components/errors/NoObjectError";-import { Search } from "metabase/entities/search";import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch } from "metabase/redux";import { SearchSidebar } from "metabase/search/components/SearchSidebar";@@ -89,9 +88,7 @@ function SearchApp({ location }) {};const { data, error, isFetching, requestId } = useSearchQuery(query);- const list = useMemo(() => {- return data?.data?.map((item) => Search.wrapEntity(item, dispatch)) ?? [];- }, [data, dispatch]);+ const list = useMemo(() => data?.data ?? [], [data?.data]);return (<SearchMain direction="column" gap="2rem" m="auto" data-testid="search-app">