From 67fea6eaff4223ed24dd5018aace0d3175552880 Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
Date: Mon, 27 Apr 2020 19:45:36 +0300
Subject: [PATCH] fix: make all filter operators uppercase (#378)

* fix: make all filter operators uppercase

* fix: test case

* fix: convertFilter test case
---
 .../packages/superset-ui-query/src/types/Operator.ts          | 4 ++--
 .../packages/superset-ui-query/test/convertFilter.test.ts     | 4 ++--
 .../packages/superset-ui-query/test/types/Filter.test.ts      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-query/src/types/Operator.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-query/src/types/Operator.ts
index cfd9153f0af4..40c606f050ac 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-query/src/types/Operator.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-query/src/types/Operator.ts
@@ -2,10 +2,10 @@
 const UNARY_OPERATORS = ['IS NOT NULL', 'IS NULL'] as const;
 
 /** List of operators that require another operand that is a single value */
-const BINARY_OPERATORS = ['=', '!=', '>', '<', '>=', '<=', 'like', 'regex'] as const;
+const BINARY_OPERATORS = ['=', '!=', '>', '<', '>=', '<=', 'LIKE', 'REGEX'] as const;
 
 /** List of operators that require another operand that is a set */
-const SET_OPERATORS = ['in', 'not in'] as const;
+const SET_OPERATORS = ['IN', 'NOT IN'] as const;
 
 //---------------------------------------------------
 // Derived types
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-query/test/convertFilter.test.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-query/test/convertFilter.test.ts
index cd591b86986a..2947b82a4bfe 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-query/test/convertFilter.test.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-query/test/convertFilter.test.ts
@@ -37,12 +37,12 @@ describe('convertFilter', () => {
         expressionType: 'SIMPLE',
         clause: 'WHERE',
         subject: 'toppings',
-        operator: 'in',
+        operator: 'IN',
         comparator: ['boba', 'grass jelly'],
       }),
     ).toEqual({
       col: 'toppings',
-      op: 'in',
+      op: 'IN',
       val: ['boba', 'grass jelly'],
     });
   });
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-query/test/types/Filter.test.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-query/test/types/Filter.test.ts
index 0f6fb5337892..92035bde9c2b 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-query/test/types/Filter.test.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-query/test/types/Filter.test.ts
@@ -56,7 +56,7 @@ describe('Filter type guards', () => {
           expressionType: 'SIMPLE',
           clause: 'WHERE',
           subject: 'tea',
-          operator: 'in',
+          operator: 'IN',
           comparator: ['hojicha', 'earl grey'],
         }),
       ).toEqual(true);