Remove extra operators

Summary: Project doc: https://docs.google.com/document/d/1miofxds9DJgWScj0zFyBbdpRH5Rj0T9FqiCapof5-vU

Reviewed By: lblasa

Differential Revision: D48605289

fbshipit-source-id: f3168a8db4532ddd368a96f013749e4abc627e0f
This commit is contained in:
Andrey Goncharov
2023-08-30 07:26:35 -07:00
committed by Facebook GitHub Bot
parent 9bca358ab2
commit f16ff8ade4
2 changed files with 3 additions and 134 deletions

View File

@@ -9,21 +9,12 @@
// Mostly matches https://www.internalfb.com/code/www/html/intern/js/ui/PowerSearch/PowerSearchExampleConfig.js // Mostly matches https://www.internalfb.com/code/www/html/intern/js/ui/PowerSearch/PowerSearchExampleConfig.js
export type SimpleFilterValueType = export type SimpleFilterValueType = 'NO_VALUE' | 'INTEGER' | 'FLOAT' | 'STRING';
| 'NO_VALUE'
| 'INTEGER'
| 'FLOAT'
| 'STRING_SET'
| 'STRING';
export type EnumFilterValueType = 'ENUM_SET' | 'ENUM'; export type EnumFilterValueType = 'ENUM';
export type RelativeDateFilterValueType = 'RELATIVE_DATE';
export type AbsoluteDateFilterValueType = 'ABSOLUTE_DATE'; export type AbsoluteDateFilterValueType = 'ABSOLUTE_DATE';
export type TimeFilterValueType = 'TIME';
export type SimpleOperatorConfig = { export type SimpleOperatorConfig = {
valueType: SimpleFilterValueType; valueType: SimpleFilterValueType;
key: string; key: string;
@@ -37,19 +28,6 @@ export type EnumOperatorConfig = {
enumLabels: {[key: string]: string}; enumLabels: {[key: string]: string};
}; };
export type InternPowerSearchRelativeDateAllowableTensesType =
| 'PAST_ONLY'
| 'FUTURE_ONLY'
| 'PAST_AND_FUTURE';
export type RelativeDateOperatorConfig = {
valueType: RelativeDateFilterValueType;
key: string;
label: string;
allowableTenses: InternPowerSearchRelativeDateAllowableTensesType;
isNegative?: boolean;
};
export type AbsoluteDateOperatorConfig = { export type AbsoluteDateOperatorConfig = {
valueType: AbsoluteDateFilterValueType; valueType: AbsoluteDateFilterValueType;
key: string; key: string;
@@ -60,21 +38,10 @@ export type AbsoluteDateOperatorConfig = {
isNegative?: boolean; isNegative?: boolean;
}; };
export type TimeOperatorConfig = {
valueType: TimeFilterValueType;
key: string;
label: string;
minValue?: Date;
maxValue?: Date;
isNegative?: boolean;
};
export type OperatorConfig = export type OperatorConfig =
| SimpleOperatorConfig | SimpleOperatorConfig
| EnumOperatorConfig | EnumOperatorConfig
| AbsoluteDateOperatorConfig | AbsoluteDateOperatorConfig;
| RelativeDateOperatorConfig
| TimeOperatorConfig;
export type FieldConfig = { export type FieldConfig = {
key: string; key: string;

View File

@@ -9,16 +9,6 @@
import {OperatorConfig, PowerSearchConfig} from './PowerSearchConfig'; import {OperatorConfig, PowerSearchConfig} from './PowerSearchConfig';
const MyStatusEnum = {
NEEDS_REVIEW: 'Needs review',
NEEDS_REVISION: 'Waiting for author',
ACCEPTED: 'Accepted',
CLOSED: 'Closed',
ABANDONED: 'Abandoned',
CHANGES_PLANNED: 'Changes planned',
IN_PREPARATION: 'Unpublished',
};
const MyMacroEnum = { const MyMacroEnum = {
SURE_WHY_NOT: 'surewhynot', SURE_WHY_NOT: 'surewhynot',
DOGSCIENCE: 'dogscience', DOGSCIENCE: 'dogscience',
@@ -27,16 +17,6 @@ const MyMacroEnum = {
}; };
const operators = { const operators = {
in: {
label: 'is any of',
key: 'in',
valueType: 'STRING_SET',
},
not_in: {
label: 'is none of',
key: 'not_in',
valueType: 'STRING_SET',
},
contain: { contain: {
label: 'contains', label: 'contains',
key: 'contain', key: 'contain',
@@ -67,23 +47,6 @@ const operators = {
key: 'less_than_float', key: 'less_than_float',
valueType: 'FLOAT', valueType: 'FLOAT',
}, },
status_any: {
label: 'is any of',
key: 'status_any',
valueType: 'ENUM_SET',
enumLabels: MyStatusEnum,
},
status_not_any: {
label: 'is not any of',
key: 'status_not_any',
valueType: 'ENUM_SET',
enumLabels: MyStatusEnum,
},
ent_class_any_with_arbitrary_strings: {
label: 'is any of (arbitrary allowed)',
key: 'ent_class_any_with_arbitrary_strings',
valueType: 'STRING_SET',
},
caller_is: { caller_is: {
label: 'is', label: 'is',
key: 'caller_is', key: 'caller_is',
@@ -111,13 +74,6 @@ const operators = {
key: 'predictive_not_contain', key: 'predictive_not_contain',
valueType: 'STRING', valueType: 'STRING',
}, },
newer_than_relative_date: {
key: 'newer_than_relative_date',
label: 'is newer than',
isNegative: false,
valueType: 'RELATIVE_DATE',
allowableTenses: 'PAST_AND_FUTURE',
},
newer_than_absolute_date: { newer_than_absolute_date: {
key: 'newer_than_absolute_date', key: 'newer_than_absolute_date',
label: 'is after', label: 'is after',
@@ -132,20 +88,6 @@ const operators = {
valueType: 'ABSOLUTE_DATE', valueType: 'ABSOLUTE_DATE',
dateOnly: true, dateOnly: true,
}, },
time_after: {
label: 'is after',
key: 'time_after',
valueType: 'TIME',
},
filtered_time_after: {
label: 'is after',
key: 'filtered_time_after',
valueType: 'TIME',
// TODO: Fix me
// Only show times between 4 - 11:59PM
minValue: undefined,
maxValue: undefined,
},
unread: { unread: {
key: 'unread', key: 'unread',
label: '', label: '',
@@ -156,14 +98,6 @@ const operators = {
export const powerSearchExampleConfig: PowerSearchConfig = { export const powerSearchExampleConfig: PowerSearchConfig = {
name: 'FlipperPowerSearchExampleConfig', name: 'FlipperPowerSearchExampleConfig',
fields: { fields: {
id: {
key: 'id',
label: 'ID',
operators: {
in: operators.in,
not_in: operators.not_in,
},
},
title: { title: {
key: 'title', key: 'title',
label: 'Title', label: 'Title',
@@ -204,14 +138,6 @@ export const powerSearchExampleConfig: PowerSearchConfig = {
less_than_float: operators.less_than_float, less_than_float: operators.less_than_float,
}, },
}, },
status: {
key: 'status',
label: 'Status',
operators: {
status_any: operators.status_any,
status_not_any: operators.status_not_any,
},
},
caller: { caller: {
key: 'caller', key: 'caller',
label: 'Caller', label: 'Caller',
@@ -227,30 +153,6 @@ export const powerSearchExampleConfig: PowerSearchConfig = {
macro_is_not: operators.macro_is_not, macro_is_not: operators.macro_is_not,
}, },
}, },
time: {
key: 'time',
label: 'Time',
operators: {
time_after: operators.time_after,
},
},
filtered_time: {
key: 'filtered_time',
label: 'Time After 4PM',
operators: {
filtered_time_after: operators.filtered_time_after,
},
},
last_update: {
key: 'last_update',
label: 'Last Update',
operators: {
newer_than_relative_date: operators.newer_than_relative_date,
newer_than_absolute_date: operators.newer_than_absolute_date,
newer_than_absolute_date_no_time:
operators.newer_than_absolute_date_no_time,
},
},
unread_only: { unread_only: {
key: 'unread_only', key: 'unread_only',
label: 'Unread Only', label: 'Unread Only',