remove -is- operator

This commit is contained in:
shamsmosowi
2023-06-11 12:20:39 +02:00
parent 8d94c5a941
commit 8733e96b19
4 changed files with 8 additions and 6 deletions

View File

@@ -124,7 +124,7 @@ export default function Filters() {
);
if (!isFilterableColumn?.length) return false;
filter.key = isFilterableColumn?.[0]?.value;
filter.operator = filter.operator === "-is-" ? "id-equal" : filter.operator;
filter.operator = filter.operator;
filter.value =
filter.operator === "id-equal" ? filter.value.toString() : filter.value;
return true;
@@ -225,8 +225,7 @@ export default function Filters() {
} else {
const [filter] = filters;
const fieldName = filter.key === "_rowy_ref.id" ? "ID" : filter.key;
const operator =
filter.operator === "id-equal" ? "-is-" : filter.operator;
const operator = filter.operator;
const formattedValue = availableFilters?.valueFormatter
? availableFilters.valueFormatter(filter.value, filter.operator)
: filter.value.toString();

View File

@@ -21,7 +21,7 @@ export function changePageUrl(newURL: string | undefined = URL) {
}
function findOperators(str: string) {
const operators = [">=", "<=", ">", "<", "==", "!=", "=", "-is-"];
const operators = [">=", "<=", ">", "<", "==", "!=", "="];
const regex = new RegExp(operators.map((op) => `\\${op}`).join("|"), "g");
return str.match(regex) || [];
}

View File

@@ -24,6 +24,10 @@ export const config: IFieldConfig = {
dataType: "Record<string, any>",
initialValue: {},
initializable: true,
filter: {
operators: filterOperators,
valueFormatter,
},
icon: <ColorIcon />,
description:
"Color stored as Hex, RGB, and HSV. Edited with a visual picker.",

View File

@@ -193,8 +193,7 @@ export type TableFilter = {
| "time-minute-equal"
| "id-equal"
| "color-equal"
| "color-not-equal"
| "-is-";
| "color-not-equal";
value: any;
};