From 8733e96b19dcd26f5e883abe02574a491e374135 Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Sun, 11 Jun 2023 12:20:39 +0200
Subject: [PATCH] remove -is- operator

---
 src/components/TableToolbar/Filters/Filters.tsx | 5 ++---
 src/components/TableToolbar/Filters/utils.tsx   | 2 +-
 src/components/fields/Color/index.tsx           | 4 ++++
 src/types/table.d.ts                            | 3 +--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/TableToolbar/Filters/Filters.tsx b/src/components/TableToolbar/Filters/Filters.tsx
index 868d6f86..b59c124e 100644
--- a/src/components/TableToolbar/Filters/Filters.tsx
+++ b/src/components/TableToolbar/Filters/Filters.tsx
@@ -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();
diff --git a/src/components/TableToolbar/Filters/utils.tsx b/src/components/TableToolbar/Filters/utils.tsx
index e675839e..e9537745 100644
--- a/src/components/TableToolbar/Filters/utils.tsx
+++ b/src/components/TableToolbar/Filters/utils.tsx
@@ -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) || [];
 }
diff --git a/src/components/fields/Color/index.tsx b/src/components/fields/Color/index.tsx
index c5c95fa1..3374b5d6 100644
--- a/src/components/fields/Color/index.tsx
+++ b/src/components/fields/Color/index.tsx
@@ -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.",
diff --git a/src/types/table.d.ts b/src/types/table.d.ts
index 5b33e6d7..3ed4b7c3 100644
--- a/src/types/table.d.ts
+++ b/src/types/table.d.ts
@@ -193,8 +193,7 @@ export type TableFilter = {
     | "time-minute-equal"
     | "id-equal"
     | "color-equal"
-    | "color-not-equal"
-    | "-is-";
+    | "color-not-equal";
   value: any;
 };