From af73cbb669997045d844f2c9426f5ed56e864943 Mon Sep 17 00:00:00 2001 From: Andrey Goncharov Date: Thu, 14 Sep 2023 04:48:12 -0700 Subject: [PATCH] Add power search config to data table column config Summary: Doc: https://docs.google.com/document/d/1miofxds9DJgWScj0zFyBbdpRH5Rj0T9FqiCapof5-vU/edit#heading=h.pg8svtdjlx7 Reviewed By: lblasa Differential Revision: D48866308 fbshipit-source-id: 72ed7eb1401e44722d9bb9e680d6fa5d558b8eed --- desktop/flipper-plugin/src/__tests__/api.node.tsx | 3 +++ desktop/flipper-plugin/src/ui/PowerSearch/index.tsx | 8 ++++++-- .../src/ui/data-table/DataTableWithPowerSearch.tsx | 11 ++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/desktop/flipper-plugin/src/__tests__/api.node.tsx b/desktop/flipper-plugin/src/__tests__/api.node.tsx index 8d3623479..435874c7c 100644 --- a/desktop/flipper-plugin/src/__tests__/api.node.tsx +++ b/desktop/flipper-plugin/src/__tests__/api.node.tsx @@ -116,6 +116,7 @@ test('Correct top level API exposed', () => { "ElementSearchResultSet", "ElementsInspectorElement", "ElementsInspectorProps", + "FieldConfig", "FileDescriptor", "FileEncoding", "FlipperLib", @@ -129,9 +130,11 @@ test('Correct top level API exposed', () => { "MenuEntry", "NormalizedMenuEntry", "Notification", + "OperatorConfig", "PluginClient", "PowerSearchConfig", "RemoteServerContext", + "SearchExpressionTerm", "ServerAddOn", "ServerAddOnPluginConnection", ] diff --git a/desktop/flipper-plugin/src/ui/PowerSearch/index.tsx b/desktop/flipper-plugin/src/ui/PowerSearch/index.tsx index 3cf14e4a8..8c1cfb63a 100644 --- a/desktop/flipper-plugin/src/ui/PowerSearch/index.tsx +++ b/desktop/flipper-plugin/src/ui/PowerSearch/index.tsx @@ -9,7 +9,11 @@ import * as React from 'react'; import {Space} from 'antd'; -import {PowerSearchConfig} from './PowerSearchConfig'; +import { + PowerSearchConfig, + FieldConfig, + OperatorConfig, +} from './PowerSearchConfig'; import {PowerSearchContainer} from './PowerSearchContainer'; import { PowerSearchTermFinder, @@ -25,7 +29,7 @@ import {useLatestRef} from '../../utils/useLatestRef'; import {useUpdateEffect} from 'react-use'; import {theme} from '../theme'; -export {PowerSearchConfig}; +export {PowerSearchConfig, OperatorConfig, FieldConfig, SearchExpressionTerm}; type PowerSearchProps = { config: PowerSearchConfig; diff --git a/desktop/flipper-plugin/src/ui/data-table/DataTableWithPowerSearch.tsx b/desktop/flipper-plugin/src/ui/data-table/DataTableWithPowerSearch.tsx index b3841cce9..e332c9675 100644 --- a/desktop/flipper-plugin/src/ui/data-table/DataTableWithPowerSearch.tsx +++ b/desktop/flipper-plugin/src/ui/data-table/DataTableWithPowerSearch.tsx @@ -57,7 +57,7 @@ import { } from 'flipper-plugin-core'; import {HighlightProvider} from '../Highlight'; import {useLatestRef} from '../../utils/useLatestRef'; -import {PowerSearch} from '../PowerSearch'; +import {PowerSearch, OperatorConfig} from '../PowerSearch'; import {powerSearchExampleConfig} from '../PowerSearch/PowerSearchExampleConfig'; type DataTableBaseProps = { @@ -115,16 +115,9 @@ export type DataTableColumn = { wrap?: boolean; align?: 'left' | 'right' | 'center'; visible?: boolean; - filters?: { - label: string; - value: string; - enabled: boolean; - predefined?: boolean; - strict?: boolean; - exact?: boolean; - }[]; inversed?: boolean; sortable?: boolean; + powerSearchConfig?: {[key: string]: OperatorConfig}; }; export interface TableRowRenderContext {