jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support enum label inferral for simplified config

Browse Source 
Reviewed By: LukeDefeo

Differential Revision: D51199436

fbshipit-source-id: c611f0d5a21d7500447342d3e2a5e12c55e9b67d
This commit is contained in:
Andrey Goncharov
2023-11-10 09:08:28 -08:00
committed by Facebook GitHub Bot
parent 2d253b1387
commit 2d28ca2c37
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
desktop/flipper-plugin/src/ui/data-table/DataTableWithPowerSearch.tsx
View File

@@ -146,7 +146,8 @@ type DataTableInput<T = any> =
}; };
type PowerSearchSimplifiedConfig = type PowerSearchSimplifiedConfig =
| {type: 'enum'; enumLabels: EnumLabels} | {type: 'enum'; enumLabels: EnumLabels; inferEnumOptionsFromData?: false}
| {type: 'enum'; enumLabels?: never; inferEnumOptionsFromData: true}
| {type: 'int'} | {type: 'int'}
| {type: 'float'} | {type: 'float'}
| {type: 'string'} | {type: 'string'}
@@ -175,6 +176,17 @@ const powerSearchConfigIsExtendedConfig = (
!!powerSearchConfig && !!powerSearchConfig &&
Array.isArray((powerSearchConfig as PowerSearchExtendedConfig).operators); Array.isArray((powerSearchConfig as PowerSearchExtendedConfig).operators);
const powerSearchConfigIsSimplifiedConfig = (
powerSearchConfig:
| undefined
| PowerSearchSimplifiedConfig
| OperatorConfig[]
| false
| PowerSearchExtendedConfig,
): powerSearchConfig is PowerSearchSimplifiedConfig =>
!!powerSearchConfig &&
typeof (powerSearchConfig as PowerSearchSimplifiedConfig).type === 'string';
export type DataTableColumn<T = any> = { export type DataTableColumn<T = any> = {
//this can be a dotted path into a nest objects. e.g foo.bar //this can be a dotted path into a nest objects. e.g foo.bar
key: keyof T & string; key: keyof T & string;
@@ -311,7 +323,9 @@ export function DataTable<T extends object>(
for (const column of columns) { for (const column of columns) {
if ( if (
powerSearchConfigIsExtendedConfig(column.powerSearchConfig) && (powerSearchConfigIsExtendedConfig(column.powerSearchConfig) ||
(powerSearchConfigIsSimplifiedConfig(column.powerSearchConfig) &&
column.powerSearchConfig.type === 'enum')) &&
column.powerSearchConfig.inferEnumOptionsFromData column.powerSearchConfig.inferEnumOptionsFromData
) { ) {
if (!secondaryIndeciesKeys.has(column.key)) { if (!secondaryIndeciesKeys.has(column.key)) {
@@ -461,24 +475,22 @@ export function DataTable<T extends object>(
break; break;
} }
case 'enum': { case 'enum': {
let enumLabels: EnumLabels;
if (column.powerSearchConfig.inferEnumOptionsFromData) {
enumLabels = inferredPowerSearchEnumLabels[column.key] ?? {};
} else {
enumLabels = column.powerSearchConfig.enumLabels;
}
columnPowerSearchOperators = [ columnPowerSearchOperators = [
dataTablePowerSearchOperators.enum_is( dataTablePowerSearchOperators.enum_is(enumLabels),
column.powerSearchConfig.enumLabels, dataTablePowerSearchOperators.enum_is_not(enumLabels),
), dataTablePowerSearchOperators.enum_is_nullish_or(enumLabels),
dataTablePowerSearchOperators.enum_is_not( dataTablePowerSearchOperators.enum_set_is_any_of(enumLabels),
column.powerSearchConfig.enumLabels, dataTablePowerSearchOperators.enum_set_is_none_of(enumLabels),
),
dataTablePowerSearchOperators.enum_is_nullish_or(
column.powerSearchConfig.enumLabels,
),
dataTablePowerSearchOperators.enum_set_is_any_of(
column.powerSearchConfig.enumLabels,
),
dataTablePowerSearchOperators.enum_set_is_none_of(
column.powerSearchConfig.enumLabels,
),
dataTablePowerSearchOperators.enum_set_is_nullish_or_any_of( dataTablePowerSearchOperators.enum_set_is_nullish_or_any_of(
column.powerSearchConfig.enumLabels, enumLabels,
), ),
]; ];
break; break;