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
Move search to feature tier (#75613)
Romeo Van Snickeff532c50f5e
diff --git a/enterprise/frontend/src/metabase-enterprise/content_verification/VerifiedFilter/VerifiedFilter.tsx b/enterprise/frontend/src/metabase-enterprise/content_verification/VerifiedFilter/VerifiedFilter.tsxindex 6f35554abc5..a6560451f81 100644--- a/enterprise/frontend/src/metabase-enterprise/content_verification/VerifiedFilter/VerifiedFilter.tsx+++ b/enterprise/frontend/src/metabase-enterprise/content_verification/VerifiedFilter/VerifiedFilter.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import type { SearchFilterComponent } from "metabase/search/types";+import type { SearchFilterComponent } from "metabase/common/search/types";export const VerifiedFilter: SearchFilterComponent<"verified"> = {label: () => t`Verified items only`,diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjsindex fe23eae87b2..a31b4d9b0ec 100644--- a/frontend/lint/module-boundaries.mjs+++ b/frontend/lint/module-boundaries.mjs@@ -115,7 +115,6 @@ const elements = [mode: "full",enforceOutgoing: false,}),- createElement({ type: "shared", name: "search" }),createElement({ type: "feature", name: "setup" }),createElement({ type: "shared", name: "status" }),createElement({ type: "shared", name: "styled-components" }),@@ -142,6 +141,7 @@ const elements = [createElement({ type: "feature", name: "public" }),createElement({ type: "feature", name: "query_builder" }),createElement({ type: "feature", name: "reference" }),+ createElement({ type: "feature", name: "search" }),// app...[diff --git a/frontend/src/metabase/api/analytics.ts b/frontend/src/metabase/api/analytics.tsindex 53d39033fa2..56fdb07325b 100644--- a/frontend/src/metabase/api/analytics.ts+++ b/frontend/src/metabase/api/analytics.ts@@ -1,7 +1,7 @@import { trackSchemaEvent } from "metabase/analytics";-import { isTrackedSearchContext } from "metabase/search/analytics";+import { hashSearchTerm, shouldReportSearchTerm } from "metabase/common/search";+import { isTrackedSearchContext } from "metabase/common/search/analytics";import { openSaveDialog } from "metabase/utils/dom";-import { hashSearchTerm, shouldReportSearchTerm } from "metabase/utils/search";import type { SearchRequest, SearchResponse } from "metabase-types/api";import { Api } from "./api";diff --git a/frontend/src/metabase/api/search.ts b/frontend/src/metabase/api/search.tsindex d231b5827e8..4bf1b65b50b 100644--- a/frontend/src/metabase/api/search.ts+++ b/frontend/src/metabase/api/search.ts@@ -1,4 +1,4 @@-import { isTrackedSearchContext } from "metabase/search/analytics";+import { isTrackedSearchContext } from "metabase/common/search/analytics";import type { SearchRequest, SearchResponse } from "metabase-types/api";import { trackSearchRequest } from "./analytics";diff --git a/frontend/src/metabase/search/components/InfoText/InfoText.tsx b/frontend/src/metabase/common/components/InfoText/InfoText.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/InfoText/InfoText.tsxrename to frontend/src/metabase/common/components/InfoText/InfoText.tsxdiff --git a/frontend/src/metabase/search/components/InfoText/InfoText.unit.spec.tsx b/frontend/src/metabase/common/components/InfoText/InfoText.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/InfoText/InfoText.unit.spec.tsxrename to frontend/src/metabase/common/components/InfoText/InfoText.unit.spec.tsxdiff --git a/frontend/src/metabase/search/components/InfoText/InfoTextAssetLink.tsx b/frontend/src/metabase/common/components/InfoText/InfoTextAssetLink.tsxsimilarity index 98%rename from frontend/src/metabase/search/components/InfoText/InfoTextAssetLink.tsxrename to frontend/src/metabase/common/components/InfoText/InfoTextAssetLink.tsxindex 84d77c4df51..abd56d2765b 100644--- a/frontend/src/metabase/search/components/InfoText/InfoTextAssetLink.tsx+++ b/frontend/src/metabase/common/components/InfoText/InfoTextAssetLink.tsx@@ -1,7 +1,7 @@import { t } from "ttag";+import { SearchResultLink } from "metabase/common/components/SearchResultLink";import { useDatabaseQuery, useTableQuery } from "metabase/common/hooks";-import { SearchResultLink } from "metabase/search/components/SearchResultLink";import { Box, Icon, Text } from "metabase/ui";import {browseDatabase,diff --git a/frontend/src/metabase/search/components/InfoText/InfoTextEditedInfo.styled.tsx b/frontend/src/metabase/common/components/InfoText/InfoTextEditedInfo.styled.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/InfoText/InfoTextEditedInfo.styled.tsxrename to frontend/src/metabase/common/components/InfoText/InfoTextEditedInfo.styled.tsxdiff --git a/frontend/src/metabase/search/components/InfoText/InfoTextEditedInfo.tsx b/frontend/src/metabase/common/components/InfoText/InfoTextEditedInfo.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/InfoText/InfoTextEditedInfo.tsxrename to frontend/src/metabase/common/components/InfoText/InfoTextEditedInfo.tsxdiff --git a/frontend/src/metabase/search/components/InfoText/get-info-text.tsx b/frontend/src/metabase/common/components/InfoText/get-info-text.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/InfoText/get-info-text.tsxrename to frontend/src/metabase/common/components/InfoText/get-info-text.tsxdiff --git a/frontend/src/metabase/search/components/InfoText/index.ts b/frontend/src/metabase/common/components/InfoText/index.tssimilarity index 100%rename from frontend/src/metabase/search/components/InfoText/index.tsrename to frontend/src/metabase/common/components/InfoText/index.tsdiff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResultsItemList.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResultsItemList.tsxindex 11cbf4c2784..4529523d000 100644--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResultsItemList.tsx+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResultsItemList.tsx@@ -2,7 +2,7 @@ import { useCallback, useMemo } from "react";import { pick } from "underscore";import { skipToken, useSearchQuery } from "metabase/api";-import { trackSearchClick } from "metabase/search/analytics";+import { trackSearchClick } from "metabase/common/search/analytics";import { Stack } from "metabase/ui";import {SEARCH_MODELS,diff --git a/frontend/src/metabase/search/components/SearchResult/SearchResult.styled.tsx b/frontend/src/metabase/common/components/SearchResult/SearchResult.styled.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/SearchResult/SearchResult.styled.tsxrename to frontend/src/metabase/common/components/SearchResult/SearchResult.styled.tsxdiff --git a/frontend/src/metabase/search/components/SearchResult/SearchResult.tsx b/frontend/src/metabase/common/components/SearchResult/SearchResult.tsxsimilarity index 98%rename from frontend/src/metabase/search/components/SearchResult/SearchResult.tsxrename to frontend/src/metabase/common/components/SearchResult/SearchResult.tsxindex d3cab8697cc..c0681c0796c 100644--- a/frontend/src/metabase/search/components/SearchResult/SearchResult.tsx+++ b/frontend/src/metabase/common/components/SearchResult/SearchResult.tsx@@ -3,9 +3,9 @@ import type { MouseEvent } from "react";import { useCallback } from "react";import { push } from "react-router-redux";+import { trackSearchClick } from "metabase/common/search/analytics";import { PLUGIN_MODERATION } from "metabase/plugins";import { useDispatch } from "metabase/redux";-import { trackSearchClick } from "metabase/search/analytics";import { Group, Icon, Loader } from "metabase/ui";import { modelToUrl } from "metabase/urls";import { isSyncCompleted } from "metabase/utils/syncing";diff --git a/frontend/src/metabase/search/components/SearchResult/components/CollectionIcon.tsx b/frontend/src/metabase/common/components/SearchResult/components/CollectionIcon.tsxsimilarity index 90%rename from frontend/src/metabase/search/components/SearchResult/components/CollectionIcon.tsxrename to frontend/src/metabase/common/components/SearchResult/components/CollectionIcon.tsxindex 586074dc420..626db1034ea 100644--- a/frontend/src/metabase/search/components/SearchResult/components/CollectionIcon.tsx+++ b/frontend/src/metabase/common/components/SearchResult/components/CollectionIcon.tsx@@ -1,8 +1,8 @@-import { useGetIcon } from "metabase/hooks/use-icon";import {DEFAULT_ICON_SIZE,LARGE_ICON_SIZE,-} from "metabase/search/components/SearchResult/components";+} from "metabase/common/components/SearchResult/components";+import { useGetIcon } from "metabase/hooks/use-icon";import { Icon } from "metabase/ui";import type { IconComponentProps } from "./ItemIcon";diff --git a/frontend/src/metabase/search/components/SearchResult/components/Context.styled.tsx b/frontend/src/metabase/common/components/SearchResult/components/Context.styled.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/SearchResult/components/Context.styled.tsxrename to frontend/src/metabase/common/components/SearchResult/components/Context.styled.tsxdiff --git a/frontend/src/metabase/search/components/SearchResult/components/Context.tsx b/frontend/src/metabase/common/components/SearchResult/components/Context.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/SearchResult/components/Context.tsxrename to frontend/src/metabase/common/components/SearchResult/components/Context.tsxdiff --git a/frontend/src/metabase/search/components/SearchResult/components/DefaultIcon.tsx b/frontend/src/metabase/common/components/SearchResult/components/DefaultIcon.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/SearchResult/components/DefaultIcon.tsxrename to frontend/src/metabase/common/components/SearchResult/components/DefaultIcon.tsxdiff --git a/frontend/src/metabase/search/components/SearchResult/components/ItemIcon.styled.tsx b/frontend/src/metabase/common/components/SearchResult/components/ItemIcon.styled.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/SearchResult/components/ItemIcon.styled.tsxrename to frontend/src/metabase/common/components/SearchResult/components/ItemIcon.styled.tsxdiff --git a/frontend/src/metabase/search/components/SearchResult/components/ItemIcon.tsx b/frontend/src/metabase/common/components/SearchResult/components/ItemIcon.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/SearchResult/components/ItemIcon.tsxrename to frontend/src/metabase/common/components/SearchResult/components/ItemIcon.tsxdiff --git a/frontend/src/metabase/search/components/SearchResult/components/constants.ts b/frontend/src/metabase/common/components/SearchResult/components/constants.tssimilarity index 100%rename from frontend/src/metabase/search/components/SearchResult/components/constants.tsrename to frontend/src/metabase/common/components/SearchResult/components/constants.tsdiff --git a/frontend/src/metabase/search/components/SearchResult/components/index.ts b/frontend/src/metabase/common/components/SearchResult/components/index.tssimilarity index 100%rename from frontend/src/metabase/search/components/SearchResult/components/index.tsrename to frontend/src/metabase/common/components/SearchResult/components/index.tsdiff --git a/frontend/src/metabase/search/components/SearchResult/index.ts b/frontend/src/metabase/common/components/SearchResult/index.tssimilarity index 100%rename from frontend/src/metabase/search/components/SearchResult/index.tsrename to frontend/src/metabase/common/components/SearchResult/index.tsdiff --git a/frontend/src/metabase/search/components/SearchResult/tests/SearchResult-Collections.unit.spec.tsx b/frontend/src/metabase/common/components/SearchResult/tests/SearchResult-Collections.unit.spec.tsxsimilarity index 98%rename from frontend/src/metabase/search/components/SearchResult/tests/SearchResult-Collections.unit.spec.tsxrename to frontend/src/metabase/common/components/SearchResult/tests/SearchResult-Collections.unit.spec.tsxindex ab32deed0e7..21398611b3b 100644--- a/frontend/src/metabase/search/components/SearchResult/tests/SearchResult-Collections.unit.spec.tsx+++ b/frontend/src/metabase/common/components/SearchResult/tests/SearchResult-Collections.unit.spec.tsx@@ -10,9 +10,9 @@ import {renderWithProviders,screen,} from "__support__/ui";+import { SearchResult } from "metabase/common/components/SearchResult";import { reinitialize } from "metabase/plugins";import { createMockState } from "metabase/redux/store/mocks";-import { SearchResult } from "metabase/search/components/SearchResult";import type {SearchResult as ApiSearchResult,TokenFeatures,diff --git a/frontend/src/metabase/search/components/SearchResult/tests/SearchResult-Tables.unit.spec.tsx b/frontend/src/metabase/common/components/SearchResult/tests/SearchResult-Tables.unit.spec.tsxsimilarity index 94%rename from frontend/src/metabase/search/components/SearchResult/tests/SearchResult-Tables.unit.spec.tsxrename to frontend/src/metabase/common/components/SearchResult/tests/SearchResult-Tables.unit.spec.tsxindex 022f374d26f..1f606dc4564 100644--- a/frontend/src/metabase/search/components/SearchResult/tests/SearchResult-Tables.unit.spec.tsx+++ b/frontend/src/metabase/common/components/SearchResult/tests/SearchResult-Tables.unit.spec.tsx@@ -7,8 +7,8 @@ import {setupUsersEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";-import { SearchResult } from "metabase/search/components/SearchResult";-import { createWrappedSearchResult } from "metabase/search/components/SearchResult/tests/util";+import { SearchResult } from "metabase/common/components/SearchResult";+import { createWrappedSearchResult } from "metabase/common/components/SearchResult/tests/util";import type { InitialSyncStatus } from "metabase-types/api";import {createMockDatabase,diff --git a/frontend/src/metabase/search/components/SearchResult/tests/SearchResult.unit.spec.tsx b/frontend/src/metabase/common/components/SearchResult/tests/SearchResult.unit.spec.tsxsimilarity index 96%rename from frontend/src/metabase/search/components/SearchResult/tests/SearchResult.unit.spec.tsxrename to frontend/src/metabase/common/components/SearchResult/tests/SearchResult.unit.spec.tsxindex 0face3acc10..36862b1b6d3 100644--- a/frontend/src/metabase/search/components/SearchResult/tests/SearchResult.unit.spec.tsx+++ b/frontend/src/metabase/common/components/SearchResult/tests/SearchResult.unit.spec.tsx@@ -7,8 +7,8 @@ import {setupUsersEndpoints,} from "__support__/server-mocks";import { getIcon, renderWithProviders, screen } from "__support__/ui";-import { SearchResult } from "metabase/search/components/SearchResult/SearchResult";-import { createWrappedSearchResult } from "metabase/search/components/SearchResult/tests/util";+import { SearchResult } from "metabase/common/components/SearchResult/SearchResult";+import { createWrappedSearchResult } from "metabase/common/components/SearchResult/tests/util";import { modelToUrl } from "metabase/urls";import type { SearchResult as ApiSearchResult } from "metabase-types/api";import { createMockCollection, createMockUser } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/search/components/SearchResult/tests/util.ts b/frontend/src/metabase/common/components/SearchResult/tests/util.tssimilarity index 100%rename from frontend/src/metabase/search/components/SearchResult/tests/util.tsrename to frontend/src/metabase/common/components/SearchResult/tests/util.tsdiff --git a/frontend/src/metabase/search/components/SearchResultLink/SearchResultLink.styled.tsx b/frontend/src/metabase/common/components/SearchResultLink/SearchResultLink.styled.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/SearchResultLink/SearchResultLink.styled.tsxrename to frontend/src/metabase/common/components/SearchResultLink/SearchResultLink.styled.tsxdiff --git a/frontend/src/metabase/search/components/SearchResultLink/SearchResultLink.tsx b/frontend/src/metabase/common/components/SearchResultLink/SearchResultLink.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/SearchResultLink/SearchResultLink.tsxrename to frontend/src/metabase/common/components/SearchResultLink/SearchResultLink.tsxdiff --git a/frontend/src/metabase/search/components/SearchResultLink/index.ts b/frontend/src/metabase/common/components/SearchResultLink/index.tssimilarity index 100%rename from frontend/src/metabase/search/components/SearchResultLink/index.tsrename to frontend/src/metabase/common/components/SearchResultLink/index.tsdiff --git a/frontend/src/metabase/search/analytics.ts b/frontend/src/metabase/common/search/analytics.tssimilarity index 96%rename from frontend/src/metabase/search/analytics.tsrename to frontend/src/metabase/common/search/analytics.tsindex 8c205ea0946..3f8c516b723 100644--- a/frontend/src/metabase/search/analytics.ts+++ b/frontend/src/metabase/common/search/analytics.ts@@ -1,7 +1,8 @@import { trackSchemaEvent } from "metabase/analytics";-import { hashSearchTerm, shouldReportSearchTerm } from "metabase/utils/search";import type { SearchContext, SearchRequest } from "metabase-types/api";+import { hashSearchTerm, shouldReportSearchTerm } from "./term";+// The search `context` values we publish Snowplow analytics events for.// The other contexts (data pickers, browse, etc.) also issue searches; we don't publish those because it// would require a Snowplow schema migration — this list must stay a subset of the `context` enum in thediff --git a/frontend/src/metabase/search/constants.ts b/frontend/src/metabase/common/search/constants.tssimilarity index 100%rename from frontend/src/metabase/search/constants.tsrename to frontend/src/metabase/common/search/constants.tsdiff --git a/frontend/src/metabase/search/utils/enabled-search-type/enabled-search-type.ts b/frontend/src/metabase/common/search/enabled-search-type/enabled-search-type.tssimilarity index 85%rename from frontend/src/metabase/search/utils/enabled-search-type/enabled-search-type.tsrename to frontend/src/metabase/common/search/enabled-search-type/enabled-search-type.tsindex 9ab4ce10f4a..a22798fcbdc 100644--- a/frontend/src/metabase/search/utils/enabled-search-type/enabled-search-type.ts+++ b/frontend/src/metabase/common/search/enabled-search-type/enabled-search-type.ts@@ -1,4 +1,4 @@-import { enabledSearchTypes } from "metabase/search/constants";+import { enabledSearchTypes } from "metabase/common/search/constants";import type { EnabledSearchModel } from "metabase-types/api";export function isEnabledSearchModelType(diff --git a/frontend/src/metabase/search/utils/enabled-search-type/enabled-search-type.unit.spec.ts b/frontend/src/metabase/common/search/enabled-search-type/enabled-search-type.unit.spec.tssimilarity index 97%rename from frontend/src/metabase/search/utils/enabled-search-type/enabled-search-type.unit.spec.tsrename to frontend/src/metabase/common/search/enabled-search-type/enabled-search-type.unit.spec.tsindex bc740cd79c8..e28b5dacff2 100644--- a/frontend/src/metabase/search/utils/enabled-search-type/enabled-search-type.unit.spec.ts+++ b/frontend/src/metabase/common/search/enabled-search-type/enabled-search-type.unit.spec.ts@@ -1,7 +1,7 @@import {filterEnabledSearchTypes,isEnabledSearchModelType,-} from "metabase/search/utils";+} from "metabase/common/search";const TEST_VALID_VALUES = ["collection",diff --git a/frontend/src/metabase/search/utils/enabled-search-type/index.ts b/frontend/src/metabase/common/search/enabled-search-type/index.tssimilarity index 100%rename from frontend/src/metabase/search/utils/enabled-search-type/index.tsrename to frontend/src/metabase/common/search/enabled-search-type/index.tsdiff --git a/frontend/src/metabase/search/utils/index.ts b/frontend/src/metabase/common/search/index.tssimilarity index 51%rename from frontend/src/metabase/search/utils/index.tsrename to frontend/src/metabase/common/search/index.tsindex 032853aba4e..7580101a20d 100644--- a/frontend/src/metabase/search/utils/index.ts+++ b/frontend/src/metabase/common/search/index.ts@@ -1,3 +1,7 @@+export * from "./term";+export * from "./analytics";+export * from "./constants";+export * from "./types";export * from "./search-location";export * from "./user-search-params";export * from "./enabled-search-type";diff --git a/frontend/src/metabase/search/utils/search-location/index.ts b/frontend/src/metabase/common/search/search-location/index.tssimilarity index 100%rename from frontend/src/metabase/search/utils/search-location/index.tsrename to frontend/src/metabase/common/search/search-location/index.tsdiff --git a/frontend/src/metabase/search/utils/search-location/search-location.ts b/frontend/src/metabase/common/search/search-location/search-location.tssimilarity index 85%rename from frontend/src/metabase/search/utils/search-location/search-location.tsrename to frontend/src/metabase/common/search/search-location/search-location.tsindex e686a38c1cb..42206237001 100644--- a/frontend/src/metabase/search/utils/search-location/search-location.ts+++ b/frontend/src/metabase/common/search/search-location/search-location.ts@@ -1,10 +1,10 @@import _ from "underscore";-import { SearchFilterKeys } from "metabase/search/constants";+import { SearchFilterKeys } from "metabase/common/search/constants";import type {SearchAwareLocation,URLSearchFilterQueryParams,-} from "metabase/search/types";+} from "metabase/common/search/types";export function isSearchPageLocation(location?: SearchAwareLocation): boolean {return location ? /^\/?search$/.test(location.pathname) : false;diff --git a/frontend/src/metabase/search/utils/search-location/search-location.unit.spec.ts b/frontend/src/metabase/common/search/search-location/search-location.unit.spec.tssimilarity index 94%rename from frontend/src/metabase/search/utils/search-location/search-location.unit.spec.tsrename to frontend/src/metabase/common/search/search-location/search-location.unit.spec.tsindex 2f20e0e083c..a1555c7534f 100644--- a/frontend/src/metabase/search/utils/search-location/search-location.unit.spec.ts+++ b/frontend/src/metabase/common/search/search-location/search-location.unit.spec.ts@@ -1,10 +1,10 @@-import { SearchFilterKeys } from "metabase/search/constants";-import type { SearchAwareLocation } from "metabase/search/types";import {getFiltersFromLocation,getSearchTextFromLocation,isSearchPageLocation,-} from "metabase/search/utils";+} from "metabase/common/search";+import { SearchFilterKeys } from "metabase/common/search/constants";+import type { SearchAwareLocation } from "metabase/common/search/types";describe("isSearchPageLocation", () => {it("should return true for a search page location", () => {diff --git a/frontend/src/metabase/utils/search.ts b/frontend/src/metabase/common/search/term.tssimilarity index 100%rename from frontend/src/metabase/utils/search.tsrename to frontend/src/metabase/common/search/term.tsdiff --git a/frontend/src/metabase/search/types.ts b/frontend/src/metabase/common/search/types.tssimilarity index 97%rename from frontend/src/metabase/search/types.tsrename to frontend/src/metabase/common/search/types.tsindex fbb99e242b6..94384ad15ed 100644--- a/frontend/src/metabase/search/types.ts+++ b/frontend/src/metabase/common/search/types.ts@@ -1,7 +1,7 @@import type { Location } from "history";import type { ComponentType } from "react";-import type { SearchFilterKeys } from "metabase/search/constants";+import type { SearchFilterKeys } from "metabase/common/search/constants";import type { EnabledSearchModel, IconName, UserId } from "metabase-types/api";export type TypeFilterProps = EnabledSearchModel[];diff --git a/frontend/src/metabase/search/utils/user-search-params/index.ts b/frontend/src/metabase/common/search/user-search-params/index.tssimilarity index 100%rename from frontend/src/metabase/search/utils/user-search-params/index.tsrename to frontend/src/metabase/common/search/user-search-params/index.tsdiff --git a/frontend/src/metabase/search/utils/user-search-params/user-search-params.ts b/frontend/src/metabase/common/search/user-search-params/user-search-params.tssimilarity index 92%rename from frontend/src/metabase/search/utils/user-search-params/user-search-params.tsrename to frontend/src/metabase/common/search/user-search-params/user-search-params.tsindex 4581d0d3b1e..7e9eea2f602 100644--- a/frontend/src/metabase/search/utils/user-search-params/user-search-params.ts+++ b/frontend/src/metabase/common/search/user-search-params/user-search-params.ts@@ -1,4 +1,4 @@-import type { SearchQueryParamValue } from "metabase/search/types";+import type { SearchQueryParamValue } from "metabase/common/search/types";import { isNotNull } from "metabase/utils/types";import type { UserId } from "metabase-types/api";diff --git a/frontend/src/metabase/search/utils/user-search-params/user-search-params.unit.spec.ts b/frontend/src/metabase/common/search/user-search-params/user-search-params.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/search/utils/user-search-params/user-search-params.unit.spec.tsrename to frontend/src/metabase/common/search/user-search-params/user-search-params.unit.spec.tsdiff --git a/frontend/src/metabase/nav/components/search/RecentsList/RecentsListContent.tsx b/frontend/src/metabase/nav/components/search/RecentsList/RecentsListContent.tsxindex 0d340d51318..f7e425a979a 100644--- a/frontend/src/metabase/nav/components/search/RecentsList/RecentsListContent.tsx+++ b/frontend/src/metabase/nav/components/search/RecentsList/RecentsListContent.tsx@@ -1,6 +1,14 @@import { t } from "ttag";import { EmptyState } from "metabase/common/components/EmptyState";+import {+ ItemIcon,+ LoadingSection,+ ResultNameSection,+ ResultTitle,+ SearchResultContainer,+} from "metabase/common/components/SearchResult";+import { SearchResultLink } from "metabase/common/components/SearchResultLink";import { useListKeyboardNavigation } from "metabase/common/hooks/use-list-keyboard-navigation";import { getTranslatedEntityName } from "metabase/common/utils/model-names";import {@@ -8,14 +16,6 @@ import {SearchLoadingSpinner,} from "metabase/nav/components/search/SearchResults";import { PLUGIN_MODERATION } from "metabase/plugins";-import {- ItemIcon,- LoadingSection,- ResultNameSection,- ResultTitle,- SearchResultContainer,-} from "metabase/search/components/SearchResult";-import { SearchResultLink } from "metabase/search/components/SearchResultLink";import { Group, Loader, Stack, Title } from "metabase/ui";import { getName } from "metabase/utils/name";import { isSyncCompleted } from "metabase/utils/syncing";diff --git a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsxindex eea66bbeb40..5e0a24bd572 100644--- a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx+++ b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx@@ -14,15 +14,15 @@ import { t } from "ttag";import { useKeyboardShortcut } from "metabase/common/hooks/use-keyboard-shortcut";import { useOnClickOutside } from "metabase/common/hooks/use-on-click-outside";import { useToggle } from "metabase/common/hooks/use-toggle";-import { RecentsList } from "metabase/nav/components/search/RecentsList";-import { SearchResultsDropdown } from "metabase/nav/components/search/SearchResultsDropdown";-import { useDispatch, useSelector } from "metabase/redux";-import type { SearchAwareLocation } from "metabase/search/types";import {getFiltersFromLocation,getSearchTextFromLocation,isSearchPageLocation,-} from "metabase/search/utils";+} from "metabase/common/search";+import type { SearchAwareLocation } from "metabase/common/search/types";+import { RecentsList } from "metabase/nav/components/search/RecentsList";+import { SearchResultsDropdown } from "metabase/nav/components/search/SearchResultsDropdown";+import { useDispatch, useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import { Icon } from "metabase/ui";import { modelToUrl } from "metabase/urls";diff --git a/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx b/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsxindex dcef65dc91d..c6a001dc48e 100644--- a/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx+++ b/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx@@ -4,8 +4,8 @@ import { withRouter } from "react-router";import { t } from "ttag";import { useIsSmallScreen } from "metabase/common/hooks/use-is-small-screen";-import type { SearchAwareLocation } from "metabase/search/types";-import { getSearchTextFromLocation } from "metabase/search/utils";+import { getSearchTextFromLocation } from "metabase/common/search";+import type { SearchAwareLocation } from "metabase/common/search/types";import { Button, type ButtonProps, Flex, Icon } from "metabase/ui";import { METAKEY } from "metabase/utils/browser";diff --git a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsxindex 714c8254175..a536d86aec6 100644--- a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx+++ b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx@@ -5,7 +5,9 @@ import { t } from "ttag";import { skipToken, useSearchQuery } from "metabase/api";import { EmptyState } from "metabase/common/components/EmptyState";+import { SearchResult } from "metabase/common/components/SearchResult/SearchResult";import { useListKeyboardNavigation } from "metabase/common/hooks/use-list-keyboard-navigation";+import type { SearchFilters } from "metabase/common/search/types";import {EmptyStateContainer,ResultsContainer,@@ -13,8 +15,6 @@ import {SearchResultsList,} from "metabase/nav/components/search/SearchResults/SearchResults.styled";import { useDispatch } from "metabase/redux";-import { SearchResult } from "metabase/search/components/SearchResult/SearchResult";-import type { SearchFilters } from "metabase/search/types";import { Loader } from "metabase/ui";import { modelToUrl } from "metabase/urls";import {diff --git a/frontend/src/metabase/palette/components/PaletteResults.tsx b/frontend/src/metabase/palette/components/PaletteResults.tsxindex 4c11236bacf..ea6070b33ef 100644--- a/frontend/src/metabase/palette/components/PaletteResults.tsx+++ b/frontend/src/metabase/palette/components/PaletteResults.tsx@@ -7,7 +7,7 @@ import { t } from "ttag";import NoResults from "assets/img/no_results.svg";import { useShowOtherUsersCollections } from "metabase/common/hooks/use-show-other-users-collections";-import { trackSearchClick } from "metabase/search/analytics";+import { trackSearchClick } from "metabase/common/search/analytics";import {Flex,Group,diff --git a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx b/frontend/src/metabase/palette/hooks/useCommandPalette.tsxindex 5cad57c9949..ea72114daf1 100644--- a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPalette.tsx@@ -9,9 +9,9 @@ import { ROOT_COLLECTION } from "metabase/collections/constants";import { getCollection } from "metabase/collections/utils";import type { OmniPickerItem } from "metabase/common/components/Pickers";import { useSetting } from "metabase/common/hooks";+import { trackSearchClick } from "metabase/common/search/analytics";import { useGetIcon } from "metabase/hooks/use-icon";import { useSelector } from "metabase/redux";-import { trackSearchClick } from "metabase/search/analytics";import {getDocsSearchUrl,getDocsUrl,diff --git a/frontend/src/metabase/plugins/oss/content-verification.ts b/frontend/src/metabase/plugins/oss/content-verification.tsindex df02155385b..2d3db84c5b1 100644--- a/frontend/src/metabase/plugins/oss/content-verification.ts+++ b/frontend/src/metabase/plugins/oss/content-verification.ts@@ -1,5 +1,5 @@+import type { SearchFilterComponent } from "metabase/common/search/types";import type { State } from "metabase/redux/store";-import type { SearchFilterComponent } from "metabase/search/types";import type { CollectionEssentials } from "metabase-types/api";export type ModelFilterControlsProps = any;diff --git a/frontend/src/metabase/search/components/SearchFilterDateDisplay/SearchFilterDateDisplay.tsx b/frontend/src/metabase/querying/filters/components/SearchFilterDateDisplay/SearchFilterDateDisplay.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/SearchFilterDateDisplay/SearchFilterDateDisplay.tsxrename to frontend/src/metabase/querying/filters/components/SearchFilterDateDisplay/SearchFilterDateDisplay.tsxdiff --git a/frontend/src/metabase/search/components/SearchFilterDateDisplay/SearchFilterDateDisplay.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/SearchFilterDateDisplay/SearchFilterDateDisplay.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/SearchFilterDateDisplay/SearchFilterDateDisplay.unit.spec.tsxrename to frontend/src/metabase/querying/filters/components/SearchFilterDateDisplay/SearchFilterDateDisplay.unit.spec.tsxdiff --git a/frontend/src/metabase/search/components/SearchFilterDateDisplay/index.ts b/frontend/src/metabase/querying/filters/components/SearchFilterDateDisplay/index.tssimilarity index 100%rename from frontend/src/metabase/search/components/SearchFilterDateDisplay/index.tsrename to frontend/src/metabase/querying/filters/components/SearchFilterDateDisplay/index.tsdiff --git a/frontend/src/metabase/search/components/SearchFilterDatePicker/SearchFilterDatePicker.tsx b/frontend/src/metabase/querying/filters/components/SearchFilterDatePicker/SearchFilterDatePicker.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/SearchFilterDatePicker/SearchFilterDatePicker.tsxrename to frontend/src/metabase/querying/filters/components/SearchFilterDatePicker/SearchFilterDatePicker.tsxdiff --git a/frontend/src/metabase/search/components/SearchFilterDatePicker/SearchFilterDatePicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/SearchFilterDatePicker/SearchFilterDatePicker.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/search/components/SearchFilterDatePicker/SearchFilterDatePicker.unit.spec.tsxrename to frontend/src/metabase/querying/filters/components/SearchFilterDatePicker/SearchFilterDatePicker.unit.spec.tsxdiff --git a/frontend/src/metabase/search/components/SearchFilterDatePicker/index.ts b/frontend/src/metabase/querying/filters/components/SearchFilterDatePicker/index.tssimilarity index 100%rename from frontend/src/metabase/search/components/SearchFilterDatePicker/index.tsrename to frontend/src/metabase/querying/filters/components/SearchFilterDatePicker/index.tsdiff --git a/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx b/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsxindex 92f9b6b34b0..f661f73c058 100644--- a/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx+++ b/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx@@ -4,13 +4,13 @@ import { isEmpty } from "underscore";import { useCaptureEvent } from "metabase/common/hooks";import { useIsSmallScreen } from "metabase/common/hooks/use-is-small-screen";-import { useSelector } from "metabase/redux";import type {FilterTypeKeys,SearchFilterComponentProps,SearchFilterDropdown,SearchFilterPropTypes,-} from "metabase/search/types";+} from "metabase/common/search/types";+import { useSelector } from "metabase/redux";import { getIsNavbarOpen } from "metabase/selectors/app";import { Box, Button, Center, Icon, Popover, Stack, Text } from "metabase/ui";import { isNotNull } from "metabase/utils/types";diff --git a/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.unit.spec.tsx b/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.unit.spec.tsxindex 6f32eb1b749..fa4e56696cd 100644--- a/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.unit.spec.tsx+++ b/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.unit.spec.tsx@@ -4,7 +4,7 @@ import userEvent, {import { useState } from "react";import { renderWithProviders, screen, within } from "__support__/ui";-import type { SearchFilterComponent } from "metabase/search/types";+import type { SearchFilterComponent } from "metabase/common/search/types";import type { DropdownSidebarFilterProps } from "./DropdownSidebarFilter";import { DropdownSidebarFilter } from "./DropdownSidebarFilter";diff --git a/frontend/src/metabase/search/components/SearchFilterPopoverWrapper/SearchFilterPopoverWrapper.tsx b/frontend/src/metabase/search/components/SearchFilterPopoverWrapper/SearchFilterPopoverWrapper.tsxindex 4f677adc5ba..c221183e33c 100644--- a/frontend/src/metabase/search/components/SearchFilterPopoverWrapper/SearchFilterPopoverWrapper.tsx+++ b/frontend/src/metabase/search/components/SearchFilterPopoverWrapper/SearchFilterPopoverWrapper.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import type {FilterTypeKeys,SearchFilterPropTypes,-} from "metabase/search/types";+} from "metabase/common/search/types";import type { StackProps } from "metabase/ui";import { Button, Center, FocusTrap, Group, Loader } from "metabase/ui";diff --git a/frontend/src/metabase/search/components/SearchSidebar/SearchSidebar.tsx b/frontend/src/metabase/search/components/SearchSidebar/SearchSidebar.tsxindex 56139e0175a..c004f6ae510 100644--- a/frontend/src/metabase/search/components/SearchSidebar/SearchSidebar.tsx+++ b/frontend/src/metabase/search/components/SearchSidebar/SearchSidebar.tsx@@ -2,6 +2,13 @@ import { useState } from "react";import _ from "underscore";import { useShowOtherUsersCollections } from "metabase/common/hooks/use-show-other-users-collections";+import { SearchFilterKeys } from "metabase/common/search/constants";+import type {+ FilterTypeKeys,+ SearchFilterComponent,+ SearchQueryParamValue,+ URLSearchFilterQueryParams,+} from "metabase/common/search/types";import { PLUGIN_CONTENT_VERIFICATION } from "metabase/plugins";import { DropdownSidebarFilter } from "metabase/search/components/DropdownSidebarFilter";import { ToggleSidebarFilter } from "metabase/search/components/ToggleSidebarFilter";@@ -13,13 +20,6 @@ import { NativeQueryFilter } from "metabase/search/components/filters/NativeQuerimport { PersonalCollectionsFilter } from "metabase/search/components/filters/PersonalCollectionsFilter";import { SearchTrashedItemsFilter } from "metabase/search/components/filters/SearchTrashedItemsFilter";import { TypeFilter } from "metabase/search/components/filters/TypeFilter";-import { SearchFilterKeys } from "metabase/search/constants";-import type {- FilterTypeKeys,- SearchFilterComponent,- SearchQueryParamValue,- URLSearchFilterQueryParams,-} from "metabase/search/types";import { Stack } from "metabase/ui";type SearchSidebarProps = {diff --git a/frontend/src/metabase/search/components/SearchSidebar/tests/setup.tsx b/frontend/src/metabase/search/components/SearchSidebar/tests/setup.tsxindex 53e6b2b3f35..93d772267e4 100644--- a/frontend/src/metabase/search/components/SearchSidebar/tests/setup.tsx+++ b/frontend/src/metabase/search/components/SearchSidebar/tests/setup.tsx@@ -2,9 +2,9 @@ import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import { setupDatabasesEndpoints } from "__support__/server-mocks";import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";+import type { URLSearchFilterQueryParams } from "metabase/common/search/types";import { createMockState } from "metabase/redux/store/mocks";import { SearchSidebar } from "metabase/search/components/SearchSidebar";-import type { URLSearchFilterQueryParams } from "metabase/search/types";import type { TokenFeatures } from "metabase-types/api";import {createMockDatabase,diff --git a/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.unit.spec.tsx b/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.unit.spec.tsxindex ab7259f28ce..56efcdacf43 100644--- a/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.unit.spec.tsx+++ b/frontend/src/metabase/search/components/SearchUserPicker/SearchUserPicker.unit.spec.tsx@@ -3,8 +3,8 @@ import { useState } from "react";import { setupUserRecipientsEndpoint } from "__support__/server-mocks";import { renderWithProviders, screen, waitFor, within } from "__support__/ui";+import type { CreatedByFilterProps } from "metabase/common/search/types";import { SearchUserPicker } from "metabase/search/components/SearchUserPicker";-import type { CreatedByFilterProps } from "metabase/search/types";import type { User, UserId } from "metabase-types/api";import { createMockUser } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/search/components/ToggleSidebarFilter/ToggleSidebarFilter.tsx b/frontend/src/metabase/search/components/ToggleSidebarFilter/ToggleSidebarFilter.tsxindex bdb7244ef37..8de3a07f33f 100644--- a/frontend/src/metabase/search/components/ToggleSidebarFilter/ToggleSidebarFilter.tsx+++ b/frontend/src/metabase/search/components/ToggleSidebarFilter/ToggleSidebarFilter.tsx@@ -1,4 +1,4 @@-import type { SearchFilterToggle } from "metabase/search/types";+import type { SearchFilterToggle } from "metabase/common/search/types";import { Switch, Text } from "metabase/ui";export type ToggleSidebarFilterProps = {diff --git a/frontend/src/metabase/search/components/ToggleSidebarFilter/ToggleSidebarFilter.unit.spec.tsx b/frontend/src/metabase/search/components/ToggleSidebarFilter/ToggleSidebarFilter.unit.spec.tsxindex cc2bf28eb8b..41399cfa954 100644--- a/frontend/src/metabase/search/components/ToggleSidebarFilter/ToggleSidebarFilter.unit.spec.tsx+++ b/frontend/src/metabase/search/components/ToggleSidebarFilter/ToggleSidebarFilter.unit.spec.tsx@@ -2,9 +2,9 @@ import userEvent from "@testing-library/user-event";import { useState } from "react";import { renderWithProviders, screen } from "__support__/ui";+import type { SearchFilterComponent } from "metabase/common/search/types";import type { ToggleSidebarFilterProps } from "metabase/search/components/ToggleSidebarFilter";import { ToggleSidebarFilter } from "metabase/search/components/ToggleSidebarFilter";-import type { SearchFilterComponent } from "metabase/search/types";const mockFilter: SearchFilterComponent = {label: () => "Mock Filter",diff --git a/frontend/src/metabase/search/components/filters/CreatedAtFilter.tsx b/frontend/src/metabase/search/components/filters/CreatedAtFilter.tsxindex 2a2ac89233c..b79e714c551 100644--- a/frontend/src/metabase/search/components/filters/CreatedAtFilter.tsx+++ b/frontend/src/metabase/search/components/filters/CreatedAtFilter.tsx@@ -1,8 +1,8 @@import { t } from "ttag";-import { SearchFilterDateDisplay } from "metabase/search/components/SearchFilterDateDisplay";-import { SearchFilterDatePicker } from "metabase/search/components/SearchFilterDatePicker";-import type { SearchFilterDropdown } from "metabase/search/types";+import type { SearchFilterDropdown } from "metabase/common/search/types";+import { SearchFilterDateDisplay } from "metabase/querying/filters/components/SearchFilterDateDisplay";+import { SearchFilterDatePicker } from "metabase/querying/filters/components/SearchFilterDatePicker";import { Box } from "metabase/ui";export const CreatedAtFilter: SearchFilterDropdown<"created_at"> = {diff --git a/frontend/src/metabase/search/components/filters/CreatedByFilter/CreatedByFilter.tsx b/frontend/src/metabase/search/components/filters/CreatedByFilter/CreatedByFilter.tsxindex a17687672a0..c3562bf568a 100644--- a/frontend/src/metabase/search/components/filters/CreatedByFilter/CreatedByFilter.tsx+++ b/frontend/src/metabase/search/components/filters/CreatedByFilter/CreatedByFilter.tsx@@ -1,15 +1,15 @@import { t } from "ttag";+import type { SearchFilterDropdown } from "metabase/common/search/types";+import {+ parseUserIdArray,+ stringifyUserIdArray,+} from "metabase/common/search/user-search-params";import {SearchUserPicker,SearchUserPickerContainer,} from "metabase/search/components/SearchUserPicker";import { UserNameDisplay } from "metabase/search/components/UserNameDisplay";-import type { SearchFilterDropdown } from "metabase/search/types";-import {- parseUserIdArray,- stringifyUserIdArray,-} from "metabase/search/utils/user-search-params";export const CreatedByFilter: SearchFilterDropdown<"created_by"> = {iconName: "person",diff --git a/frontend/src/metabase/search/components/filters/LastEditedAtFilter.tsx b/frontend/src/metabase/search/components/filters/LastEditedAtFilter.tsxindex d7e65a5a0f0..dc88d989a23 100644--- a/frontend/src/metabase/search/components/filters/LastEditedAtFilter.tsx+++ b/frontend/src/metabase/search/components/filters/LastEditedAtFilter.tsx@@ -1,8 +1,8 @@import { t } from "ttag";-import { SearchFilterDateDisplay } from "metabase/search/components/SearchFilterDateDisplay";-import { SearchFilterDatePicker } from "metabase/search/components/SearchFilterDatePicker";-import type { SearchFilterDropdown } from "metabase/search/types";+import type { SearchFilterDropdown } from "metabase/common/search/types";+import { SearchFilterDateDisplay } from "metabase/querying/filters/components/SearchFilterDateDisplay";+import { SearchFilterDatePicker } from "metabase/querying/filters/components/SearchFilterDatePicker";import { Box } from "metabase/ui";export const LastEditedAtFilter: SearchFilterDropdown<"last_edited_at"> = {diff --git a/frontend/src/metabase/search/components/filters/LastEditedByFilter.tsx b/frontend/src/metabase/search/components/filters/LastEditedByFilter.tsxindex c1c2b798796..c46e5b86fe7 100644--- a/frontend/src/metabase/search/components/filters/LastEditedByFilter.tsx+++ b/frontend/src/metabase/search/components/filters/LastEditedByFilter.tsx@@ -1,10 +1,10 @@import { t } from "ttag";+import { parseUserIdArray, stringifyUserIdArray } from "metabase/common/search";+import type { SearchFilterDropdown } from "metabase/common/search/types";import { SearchUserPicker } from "metabase/search/components/SearchUserPicker/SearchUserPicker";import { SearchUserPickerContainer } from "metabase/search/components/SearchUserPicker/SearchUserPicker.styled";import { UserNameDisplay } from "metabase/search/components/UserNameDisplay/UserNameDisplay";-import type { SearchFilterDropdown } from "metabase/search/types";-import { parseUserIdArray, stringifyUserIdArray } from "metabase/search/utils";export const LastEditedByFilter: SearchFilterDropdown<"last_edited_by"> = {iconName: "person",diff --git a/frontend/src/metabase/search/components/filters/NativeQueryFilter/NativeQueryFilter.tsx b/frontend/src/metabase/search/components/filters/NativeQueryFilter/NativeQueryFilter.tsxindex 3ca070181fd..19afab47c6e 100644--- a/frontend/src/metabase/search/components/filters/NativeQueryFilter/NativeQueryFilter.tsx+++ b/frontend/src/metabase/search/components/filters/NativeQueryFilter/NativeQueryFilter.tsx@@ -1,5 +1,5 @@+import type { SearchFilterToggle } from "metabase/common/search/types";import { NativeQueryLabel } from "metabase/search/components/filters/NativeQueryFilter/NativeQueryLabel";-import type { SearchFilterToggle } from "metabase/search/types";export const NativeQueryFilter: SearchFilterToggle = {label: NativeQueryLabel,diff --git a/frontend/src/metabase/search/components/filters/PersonalCollectionsFilter.tsx b/frontend/src/metabase/search/components/filters/PersonalCollectionsFilter.tsxindex e7823f84e59..59feffe4d65 100644--- a/frontend/src/metabase/search/components/filters/PersonalCollectionsFilter.tsx+++ b/frontend/src/metabase/search/components/filters/PersonalCollectionsFilter.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import type { SearchFilterToggle } from "metabase/search/types";+import type { SearchFilterToggle } from "metabase/common/search/types";export const PersonalCollectionsFilter: SearchFilterToggle = {label: () => t`Search all personal collections`,diff --git a/frontend/src/metabase/search/components/filters/SearchTrashedItemsFilter.tsx b/frontend/src/metabase/search/components/filters/SearchTrashedItemsFilter.tsxindex 16d946a129e..d828ab6be09 100644--- a/frontend/src/metabase/search/components/filters/SearchTrashedItemsFilter.tsx+++ b/frontend/src/metabase/search/components/filters/SearchTrashedItemsFilter.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import type { SearchFilterToggle } from "metabase/search/types";+import type { SearchFilterToggle } from "metabase/common/search/types";export const SearchTrashedItemsFilter: SearchFilterToggle = {label: () => t`Search items in trash`,diff --git a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilter.tsx b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilter.tsxindex 27e06bf0025..ab71e0604a6 100644--- a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilter.tsx+++ b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilter.tsx@@ -1,13 +1,13 @@import { t } from "ttag";-import type {- SearchFilterComponent,- TypeFilterProps,-} from "metabase/search/types";import {filterEnabledSearchTypes,isEnabledSearchModelType,-} from "metabase/search/utils/enabled-search-type";+} from "metabase/common/search/enabled-search-type";+import type {+ SearchFilterComponent,+ TypeFilterProps,+} from "metabase/common/search/types";import { TypeFilterContent } from "./TypeFilterContent";import { TypeFilterDisplay } from "./TypeFilterDisplay";diff --git a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.tsx b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.tsxindex b2481fe5aed..3ed0eedc188 100644--- a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.tsx+++ b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.tsx@@ -1,10 +1,10 @@import { useState } from "react";import { useSearchQuery } from "metabase/api";+import { enabledSearchTypes } from "metabase/common/search/constants";+import type { SearchFilterDropdown } from "metabase/common/search/types";import { getTranslatedEntityName } from "metabase/common/utils/model-names";import { SearchFilterPopoverWrapper } from "metabase/search/components/SearchFilterPopoverWrapper";-import { enabledSearchTypes } from "metabase/search/constants";-import type { SearchFilterDropdown } from "metabase/search/types";import { Checkbox, Stack } from "metabase/ui";import type { EnabledSearchModel } from "metabase-types/api";diff --git a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.tsx b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.tsxindex 5877a550b6d..5057b0d0f81 100644--- a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.tsx+++ b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.tsx@@ -1,8 +1,8 @@import { t } from "ttag";+import type { SearchFilterDropdown } from "metabase/common/search/types";import { getTranslatedEntityName } from "metabase/common/utils/model-names";import { TypeFilter } from "metabase/search/components/filters/TypeFilter";-import type { SearchFilterDropdown } from "metabase/search/types";import { Text } from "metabase/ui";export const TypeFilterDisplay: SearchFilterDropdown<"type">["DisplayComponent"] =diff --git a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.unit.spec.tsx b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.unit.spec.tsxindex f7b01f6e06a..8bf133a4dd6 100644--- a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.unit.spec.tsx+++ b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.unit.spec.tsx@@ -1,5 +1,5 @@import { render, screen } from "__support__/ui";-import type { TypeFilterProps } from "metabase/search/types";+import type { TypeFilterProps } from "metabase/common/search/types";import type { EnabledSearchModel } from "metabase-types/api";import { TypeFilterDisplay } from "./TypeFilterDisplay";diff --git a/frontend/src/metabase/search/containers/SearchApp.tsx b/frontend/src/metabase/search/containers/SearchApp.tsxindex adc32ecd6a4..85796404e26 100644--- a/frontend/src/metabase/search/containers/SearchApp.tsx+++ b/frontend/src/metabase/search/containers/SearchApp.tsx@@ -9,13 +9,22 @@ 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 { usePageTitle } from "metabase/hooks/use-page-title";-import { useDispatch } from "metabase/redux";-import { SearchSidebar } from "metabase/search/components/SearchSidebar";+import {+ filterEnabledSearchTypes,+ getFiltersFromLocation,+ getSearchTextFromLocation,+} from "metabase/common/search";import {SearchContextTypes,SearchFilterKeys,-} from "metabase/search/constants";+} from "metabase/common/search/constants";+import type {+ SearchAwareLocation,+ URLSearchFilterQueryParams,+} from "metabase/common/search/types";+import { usePageTitle } from "metabase/hooks/use-page-title";+import { useDispatch } from "metabase/redux";+import { SearchSidebar } from "metabase/search/components/SearchSidebar";import {SearchBody,SearchControls,@@ -24,16 +33,9 @@ import {} from "metabase/search/containers/SearchApp.styled";import { SearchResultSection } from "metabase/search/containers/SearchResultSection";import { PAGE_SIZE } from "metabase/search/containers/constants";-import {- filterEnabledSearchTypes,- getFiltersFromLocation,- getSearchTextFromLocation,-} from "metabase/search/utils";import { Box, Group, Paper, Text } from "metabase/ui";import type { SearchRequest } from "metabase-types/api";-import type { SearchAwareLocation, URLSearchFilterQueryParams } from "../types";-const getPageFromLocation = (location: SearchAwareLocation) => {const maybePage = location.query?.page? parseInt(location.query.page, 10)diff --git a/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx b/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsxindex f4e6d07490d..4a70b408351 100644--- a/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx+++ b/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx@@ -14,8 +14,8 @@ import {waitForLoaderToBeRemoved,within,} from "__support__/ui";+import type { SearchFilters } from "metabase/common/search/types";import { SearchApp } from "metabase/search/containers/SearchApp";-import type { SearchFilters } from "metabase/search/types";import { checkNotNull } from "metabase/utils/types";import type { EnabledSearchModel, SearchResult } from "metabase-types/api";import {diff --git a/frontend/src/metabase/search/containers/SearchResultSection.tsx b/frontend/src/metabase/search/containers/SearchResultSection.tsxindex bc4510c0016..b6db4540a58 100644--- a/frontend/src/metabase/search/containers/SearchResultSection.tsx+++ b/frontend/src/metabase/search/containers/SearchResultSection.tsx@@ -1,6 +1,6 @@import { msgid, ngettext } from "ttag";-import { SearchResult } from "metabase/search/components/SearchResult";+import { SearchResult } from "metabase/common/components/SearchResult";import { Paper, Stack, Text } from "metabase/ui";import type { SearchResult as ApiSearchResult } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/TimeFilterWidget.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/TimeFilterWidget.tsxindex 82ba5bcde4e..b91336f8142 100644--- a/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/TimeFilterWidget.tsx+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/TimeFilterWidget.tsx@@ -4,8 +4,8 @@ import type {DatePickerShortcut,RelativeIntervalDirection,} from "metabase/querying/common/types";-import { SearchFilterDateDisplay } from "metabase/search/components/SearchFilterDateDisplay";-import { SearchFilterDatePicker } from "metabase/search/components/SearchFilterDatePicker";+import { SearchFilterDateDisplay } from "metabase/querying/filters/components/SearchFilterDateDisplay";+import { SearchFilterDatePicker } from "metabase/querying/filters/components/SearchFilterDatePicker";import { Popover } from "metabase/ui";import { FilterFieldSet } from "../FilterFieldSet";