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 the verified search filter slot into search (#81860)
Fraser4bc6ccb00c9a
diff --git a/enterprise/frontend/src/metabase-enterprise/content_verification/index.ts b/enterprise/frontend/src/metabase-enterprise/content_verification/index.tsindex f77e4966e63..3ee2b064348 100644--- a/enterprise/frontend/src/metabase-enterprise/content_verification/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/content_verification/index.ts@@ -1,4 +1,5 @@import { PLUGIN_CONTENT_VERIFICATION } from "metabase/plugins";+import { PLUGIN_SEARCH_FILTERS } from "metabase/search/plugins";import { hasPremiumFeature } from "metabase-enterprise/settings";import { VerifiedFilter } from "./VerifiedFilter";@@ -10,9 +11,9 @@ import { ModelFilterControls, getDefaultModelFilters } from "./models";*/export function initializePlugin() {if (hasPremiumFeature("content_verification")) {+ Object.assign(PLUGIN_SEARCH_FILTERS, { VerifiedFilter });Object.assign(PLUGIN_CONTENT_VERIFICATION, {contentVerificationEnabled: true,- VerifiedFilter,ModelFilterControls,getDefaultModelFilters,getDefaultMetricFilters,diff --git a/frontend/src/metabase/plugins/oss/content-verification.ts b/frontend/src/metabase/plugins/oss/content-verification.tsindex b703e59e1ed..67fd29059b9 100644--- a/frontend/src/metabase/plugins/oss/content-verification.ts+++ b/frontend/src/metabase/plugins/oss/content-verification.ts@@ -1,4 +1,3 @@-import type { SearchFilterComponent } from "metabase/common/search/types";import type { State } from "metabase/redux/store";import type { CollectionEssentials } from "metabase-types/api";@@ -16,8 +15,6 @@ export type MetricFilterSettings = {const getDefaultPluginContentVerification = () => ({contentVerificationEnabled: false,- // Unjustified type cast. FIXME- VerifiedFilter: {} as SearchFilterComponent<"verified">,sortCollectionsByVerification: (_a: CollectionEssentials,_b: CollectionEssentials,diff --git a/frontend/src/metabase/search/components/SearchSidebar/SearchSidebar.tsx b/frontend/src/metabase/search/components/SearchSidebar/SearchSidebar.tsxindex a8dc60086cb..dc271e08fe6 100644--- a/frontend/src/metabase/search/components/SearchSidebar/SearchSidebar.tsx+++ b/frontend/src/metabase/search/components/SearchSidebar/SearchSidebar.tsx@@ -9,7 +9,6 @@ import type {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";import { CreatedAtFilter } from "metabase/search/components/filters/CreatedAtFilter";@@ -20,6 +19,7 @@ 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 { PLUGIN_SEARCH_FILTERS } from "metabase/search/plugins";import { Stack } from "metabase/ui";type SearchSidebarProps = {@@ -38,7 +38,7 @@ export const SearchSidebar = ({ value, onChange }: SearchSidebarProps) => {[SearchFilterKeys.CreatedAt]: CreatedAtFilter,[SearchFilterKeys.LastEditedBy]: LastEditedByFilter,[SearchFilterKeys.LastEditedAt]: LastEditedAtFilter,- [SearchFilterKeys.Verified]: PLUGIN_CONTENT_VERIFICATION.VerifiedFilter,+ [SearchFilterKeys.Verified]: PLUGIN_SEARCH_FILTERS.VerifiedFilter,[SearchFilterKeys.NativeQuery]: NativeQueryFilter,[SearchFilterKeys.SearchTrashedItems]: SearchTrashedItemsFilter,[SearchFilterKeys.PersonalCollections]: PersonalCollectionsFilter,diff --git a/frontend/src/metabase/search/plugins.ts b/frontend/src/metabase/search/plugins.tsnew file mode 100644index 00000000000..f1244982b7e--- /dev/null+++ b/frontend/src/metabase/search/plugins.ts@@ -0,0 +1,9 @@+import type { SearchFilterComponent } from "metabase/common/search/types";+import { definePluginSlot } from "metabase/plugins";++const getDefaultSearchFilters = () => ({+ // Leaving type unset hides the filter.+ VerifiedFilter: {} as SearchFilterComponent<"verified">,+});++export const PLUGIN_SEARCH_FILTERS = definePluginSlot(getDefaultSearchFilters);