mirror of
https://github.com/apache/superset.git
synced 2024-09-19 03:59:49 -04:00
feat(explore): More explicit labels of adhoc filter operators (#19691)
This commit is contained in:
parent
6d5d03e592
commit
b81982d8f3
@ -32,13 +32,13 @@ export enum Operators {
|
|||||||
EQUALS = 'EQUALS',
|
EQUALS = 'EQUALS',
|
||||||
NOT_EQUALS = 'NOT_EQUALS',
|
NOT_EQUALS = 'NOT_EQUALS',
|
||||||
LESS_THAN = 'LESS_THAN',
|
LESS_THAN = 'LESS_THAN',
|
||||||
GREATER_THAN = 'GREATER_THAN',
|
|
||||||
LESS_THAN_OR_EQUAL = 'LESS_THAN_OR_EQUAL',
|
LESS_THAN_OR_EQUAL = 'LESS_THAN_OR_EQUAL',
|
||||||
|
GREATER_THAN = 'GREATER_THAN',
|
||||||
GREATER_THAN_OR_EQUAL = 'GREATER_THAN_OR_EQUAL',
|
GREATER_THAN_OR_EQUAL = 'GREATER_THAN_OR_EQUAL',
|
||||||
IN = 'IN',
|
IN = 'IN',
|
||||||
NOT_IN = 'NOT_IN',
|
NOT_IN = 'NOT_IN',
|
||||||
ILIKE = 'ILIKE',
|
|
||||||
LIKE = 'LIKE',
|
LIKE = 'LIKE',
|
||||||
|
ILIKE = 'ILIKE',
|
||||||
REGEX = 'REGEX',
|
REGEX = 'REGEX',
|
||||||
IS_NOT_NULL = 'IS_NOT_NULL',
|
IS_NOT_NULL = 'IS_NOT_NULL',
|
||||||
IS_NULL = 'IS_NULL',
|
IS_NULL = 'IS_NULL',
|
||||||
@ -55,25 +55,31 @@ export interface OperatorType {
|
|||||||
export const OPERATOR_ENUM_TO_OPERATOR_TYPE: {
|
export const OPERATOR_ENUM_TO_OPERATOR_TYPE: {
|
||||||
[key in Operators]: OperatorType;
|
[key in Operators]: OperatorType;
|
||||||
} = {
|
} = {
|
||||||
[Operators.EQUALS]: { display: 'equals', operation: '==' },
|
[Operators.EQUALS]: { display: 'Equal to (=)', operation: '==' },
|
||||||
[Operators.NOT_EQUALS]: { display: 'not equals', operation: '!=' },
|
[Operators.NOT_EQUALS]: { display: 'Not equal to (≠)', operation: '!=' },
|
||||||
[Operators.GREATER_THAN]: { display: '>', operation: '>' },
|
[Operators.LESS_THAN]: { display: 'Less than (<)', operation: '<' },
|
||||||
[Operators.LESS_THAN]: { display: '<', operation: '<' },
|
[Operators.LESS_THAN_OR_EQUAL]: {
|
||||||
[Operators.GREATER_THAN_OR_EQUAL]: { display: '>=', operation: '>=' },
|
display: 'Less or equal (<=)',
|
||||||
[Operators.LESS_THAN_OR_EQUAL]: { display: '<=', operation: '<=' },
|
operation: '<=',
|
||||||
[Operators.IN]: { display: 'IN', operation: 'IN' },
|
},
|
||||||
[Operators.NOT_IN]: { display: 'NOT IN', operation: 'NOT IN' },
|
[Operators.GREATER_THAN]: { display: 'Greater than (>)', operation: '>' },
|
||||||
[Operators.LIKE]: { display: 'LIKE', operation: 'LIKE' },
|
[Operators.GREATER_THAN_OR_EQUAL]: {
|
||||||
[Operators.ILIKE]: { display: 'LIKE (case insensitive)', operation: 'ILIKE' },
|
display: 'Greater or equal (>=)',
|
||||||
[Operators.REGEX]: { display: 'REGEX', operation: 'REGEX' },
|
operation: '>=',
|
||||||
[Operators.IS_NOT_NULL]: { display: 'IS NOT NULL', operation: 'IS NOT NULL' },
|
},
|
||||||
[Operators.IS_NULL]: { display: 'IS NULL', operation: 'IS NULL' },
|
[Operators.IN]: { display: 'In', operation: 'IN' },
|
||||||
|
[Operators.NOT_IN]: { display: 'Not in', operation: 'NOT IN' },
|
||||||
|
[Operators.LIKE]: { display: 'Like', operation: 'LIKE' },
|
||||||
|
[Operators.ILIKE]: { display: 'Like (case insensitive)', operation: 'ILIKE' },
|
||||||
|
[Operators.REGEX]: { display: 'Regex', operation: 'REGEX' },
|
||||||
|
[Operators.IS_NOT_NULL]: { display: 'Is not null', operation: 'IS NOT NULL' },
|
||||||
|
[Operators.IS_NULL]: { display: 'Is null', operation: 'IS NULL' },
|
||||||
[Operators.LATEST_PARTITION]: {
|
[Operators.LATEST_PARTITION]: {
|
||||||
display: 'use latest_partition template',
|
display: 'use latest_partition template',
|
||||||
operation: 'LATEST PARTITION',
|
operation: 'LATEST PARTITION',
|
||||||
},
|
},
|
||||||
[Operators.IS_TRUE]: { display: 'IS TRUE', operation: '==' },
|
[Operators.IS_TRUE]: { display: 'Is true', operation: '==' },
|
||||||
[Operators.IS_FALSE]: { display: 'IS FALSE', operation: '==' },
|
[Operators.IS_FALSE]: { display: 'Is false', operation: '==' },
|
||||||
};
|
};
|
||||||
|
|
||||||
export const OPERATORS_OPTIONS = Object.values(Operators) as Operators[];
|
export const OPERATORS_OPTIONS = Object.values(Operators) as Operators[];
|
||||||
@ -83,10 +89,10 @@ export const DRUID_ONLY_OPERATORS = [Operators.REGEX];
|
|||||||
export const HAVING_OPERATORS = [
|
export const HAVING_OPERATORS = [
|
||||||
Operators.EQUALS,
|
Operators.EQUALS,
|
||||||
Operators.NOT_EQUALS,
|
Operators.NOT_EQUALS,
|
||||||
Operators.GREATER_THAN,
|
|
||||||
Operators.LESS_THAN,
|
Operators.LESS_THAN,
|
||||||
Operators.GREATER_THAN_OR_EQUAL,
|
|
||||||
Operators.LESS_THAN_OR_EQUAL,
|
Operators.LESS_THAN_OR_EQUAL,
|
||||||
|
Operators.GREATER_THAN,
|
||||||
|
Operators.GREATER_THAN_OR_EQUAL,
|
||||||
];
|
];
|
||||||
export const MULTI_OPERATORS = new Set([Operators.IN, Operators.NOT_IN]);
|
export const MULTI_OPERATORS = new Set([Operators.IN, Operators.NOT_IN]);
|
||||||
// CUSTOM_OPERATORS will show operator in simple mode,
|
// CUSTOM_OPERATORS will show operator in simple mode,
|
||||||
|
Loading…
Reference in New Issue
Block a user