From f09554bd7b2fed5e2f0036c50307b21c338c9789 Mon Sep 17 00:00:00 2001
From: Vik <vkb.info@gmail.com>
Date: Thu, 27 Apr 2023 21:12:15 +0530
Subject: [PATCH 1/3] Add is operator

---
 .../QueryEditors/TooljetDatabase/ListRows.jsx | 36 ++++++++++++++-----
 .../TooljetDatabase/operations.js             |  7 ++--
 frontend/src/TooljetDatabase/constants.js     |  1 +
 .../src/_helpers/postgrestQueryBuilder.js     |  7 +++-
 4 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ListRows.jsx b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ListRows.jsx
index bdf8aa51aa..a4ae2179e2 100644
--- a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ListRows.jsx
+++ b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ListRows.jsx
@@ -5,6 +5,11 @@ import { uniqueId } from 'lodash';
 import Select from '@/_ui/Select';
 import { operators } from '@/TooljetDatabase/constants';
 
+const isOperatorOptions = [
+  { value: 'null', label: 'null' },
+  { value: 'notNull', label: 'not null' },
+];
+
 export const ListRows = React.memo(({ currentState, darkMode }) => {
   const { columns, listRowsOptions, limitOptionChanged, handleOptionsChange } = useContext(TooljetDatabaseContext);
 
@@ -94,6 +99,9 @@ export const ListRows = React.memo(({ currentState, darkMode }) => {
       updateFilterOptionsChanged({ ...listRowsOptions?.where_filters[id], ...{ value: newValue } });
     };
 
+    console.log('value', value);
+    console.log('operator', operator);
+
     return (
       <div className="mt-1 row-container">
         <div className="d-flex fields-container">
@@ -116,15 +124,25 @@ export const ListRows = React.memo(({ currentState, darkMode }) => {
             />
           </div>
           <div className="field col-4">
-            <CodeHinter
-              currentState={currentState}
-              initialValue={value ? (typeof value === 'string' ? value : JSON.stringify(value)) : value}
-              className="codehinter-plugins"
-              theme={darkMode ? 'monokai' : 'default'}
-              height={'32px'}
-              placeholder="key"
-              onChange={(newValue) => handleValueChange(newValue)}
-            />
+            {operator === 'is' ? (
+              <Select
+                useMenuPortal={true}
+                placeholder="Select operation"
+                value={value}
+                options={isOperatorOptions}
+                onChange={handleValueChange}
+              />
+            ) : (
+              <CodeHinter
+                currentState={currentState}
+                initialValue={value ? (typeof value === 'string' ? value : JSON.stringify(value)) : value}
+                className="codehinter-plugins"
+                theme={darkMode ? 'monokai' : 'default'}
+                height={'32px'}
+                placeholder="key"
+                onChange={(newValue) => handleValueChange(newValue)}
+              />
+            )}
           </div>
           <div className="col-1 cursor-pointer m-1 mr-2">
             <svg
diff --git a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/operations.js b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/operations.js
index 87fabfa900..e71a8085bb 100644
--- a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/operations.js
+++ b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/operations.js
@@ -49,8 +49,11 @@ function buildPostgrestQuery(filters) {
       }
     }
   });
-
-  return postgrestQueryBuilder.url.toString();
+  let whereQuery = postgrestQueryBuilder.url.toString();
+  // if (whereQuery && whereQuery.includes('nulltest=isNotNull')) {
+  //   whereQuery = whereQuery.replace('nulltest=isNotNull', 'nulltest=not.is.null');
+  // }
+  return whereQuery;
 }
 
 async function listRows(queryOptions, organizationId, currentState) {
diff --git a/frontend/src/TooljetDatabase/constants.js b/frontend/src/TooljetDatabase/constants.js
index fcf8639afd..5409c8584e 100644
--- a/frontend/src/TooljetDatabase/constants.js
+++ b/frontend/src/TooljetDatabase/constants.js
@@ -19,4 +19,5 @@ export const operators = [
   { value: 'match', label: 'match' },
   { value: 'imatch', label: 'imatch' },
   { value: 'in', label: 'in' },
+  { value: 'is', label: 'is' },
 ];
diff --git a/frontend/src/_helpers/postgrestQueryBuilder.js b/frontend/src/_helpers/postgrestQueryBuilder.js
index 4f0b8239dd..74461aad78 100644
--- a/frontend/src/_helpers/postgrestQueryBuilder.js
+++ b/frontend/src/_helpers/postgrestQueryBuilder.js
@@ -132,9 +132,14 @@ export default class PostgrestQueryBuilder {
    * @param value  The value to filter with.
    */
   is(column, value) {
-    this.url.append(`${column}`, `is.${value}`);
+    if (value === 'notNull') {
+      this.url.append(`${column}`, `not.is.null`);
+    } else {
+      this.url.append(`${column}`, `is.${value}`);
+    }
     return this;
   }
+
   /**
    * Finds all rows whose value on the stated `column` is found on the
    * specified `values`.

From 2928fc63ed6ca0b22deb4093a819e374b8c3ad82 Mon Sep 17 00:00:00 2001
From: Vik <vkb.info@gmail.com>
Date: Fri, 28 Apr 2023 14:18:34 +0530
Subject: [PATCH 2/3] Add is operator for delete and update operations

---
 .../TooljetDatabase/DeleteRows.jsx            | 29 +++++++++++++------
 .../QueryEditors/TooljetDatabase/ListRows.jsx | 11 ++-----
 .../TooljetDatabase/UpdateRows.jsx            | 29 +++++++++++++------
 .../QueryEditors/TooljetDatabase/util.js      |  6 ++++
 4 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/DeleteRows.jsx b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/DeleteRows.jsx
index 6078539ec0..a3aa90b4fb 100644
--- a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/DeleteRows.jsx
+++ b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/DeleteRows.jsx
@@ -4,6 +4,7 @@ import { uniqueId } from 'lodash';
 import { CodeHinter } from '@/Editor/CodeBuilder/CodeHinter';
 import Select from '@/_ui/Select';
 import { operators } from '@/TooljetDatabase/constants';
+import { isOperatorOptions } from './util';
 
 export const DeleteRows = React.memo(({ currentState, darkMode }) => {
   const { columns, deleteOperationLimitOptionChanged, deleteRowsOptions, handleDeleteRowsOptionsChange } =
@@ -83,15 +84,25 @@ export const DeleteRows = React.memo(({ currentState, darkMode }) => {
             />
           </div>
           <div className="field col-4">
-            <CodeHinter
-              currentState={currentState}
-              initialValue={value ? (typeof value === 'string' ? value : JSON.stringify(value)) : value}
-              className="codehinter-plugins"
-              theme={darkMode ? 'monokai' : 'default'}
-              height={'32px'}
-              placeholder="key"
-              onChange={(newValue) => handleValueChange(newValue)}
-            />
+            {operator === 'is' ? (
+              <Select
+                useMenuPortal={true}
+                placeholder="Select value"
+                value={value}
+                options={isOperatorOptions}
+                onChange={handleValueChange}
+              />
+            ) : (
+              <CodeHinter
+                currentState={currentState}
+                initialValue={value ? (typeof value === 'string' ? value : JSON.stringify(value)) : value}
+                className="codehinter-plugins"
+                theme={darkMode ? 'monokai' : 'default'}
+                height={'32px'}
+                placeholder="key"
+                onChange={(newValue) => handleValueChange(newValue)}
+              />
+            )}
           </div>
           <div className="col-1 cursor-pointer m-1 mr-2">
             <svg
diff --git a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ListRows.jsx b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ListRows.jsx
index a4ae2179e2..062995da6f 100644
--- a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ListRows.jsx
+++ b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ListRows.jsx
@@ -4,11 +4,7 @@ import { TooljetDatabaseContext } from '@/TooljetDatabase/index';
 import { uniqueId } from 'lodash';
 import Select from '@/_ui/Select';
 import { operators } from '@/TooljetDatabase/constants';
-
-const isOperatorOptions = [
-  { value: 'null', label: 'null' },
-  { value: 'notNull', label: 'not null' },
-];
+import { isOperatorOptions } from './util';
 
 export const ListRows = React.memo(({ currentState, darkMode }) => {
   const { columns, listRowsOptions, limitOptionChanged, handleOptionsChange } = useContext(TooljetDatabaseContext);
@@ -99,9 +95,6 @@ export const ListRows = React.memo(({ currentState, darkMode }) => {
       updateFilterOptionsChanged({ ...listRowsOptions?.where_filters[id], ...{ value: newValue } });
     };
 
-    console.log('value', value);
-    console.log('operator', operator);
-
     return (
       <div className="mt-1 row-container">
         <div className="d-flex fields-container">
@@ -127,7 +120,7 @@ export const ListRows = React.memo(({ currentState, darkMode }) => {
             {operator === 'is' ? (
               <Select
                 useMenuPortal={true}
-                placeholder="Select operation"
+                placeholder="Select value"
                 value={value}
                 options={isOperatorOptions}
                 onChange={handleValueChange}
diff --git a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/UpdateRows.jsx b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/UpdateRows.jsx
index dccbae1e4e..883bce3c48 100644
--- a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/UpdateRows.jsx
+++ b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/UpdateRows.jsx
@@ -4,6 +4,7 @@ import { TooljetDatabaseContext } from '@/TooljetDatabase/index';
 import Select from '@/_ui/Select';
 import { operators } from '@/TooljetDatabase/constants';
 import { uniqueId } from 'lodash';
+import { isOperatorOptions } from './util';
 
 export const UpdateRows = React.memo(({ currentState, darkMode }) => {
   const { columns, updateRowsOptions, handleUpdateRowsOptionsChange } = useContext(TooljetDatabaseContext);
@@ -109,15 +110,25 @@ export const UpdateRows = React.memo(({ currentState, darkMode }) => {
             />
           </div>
           <div className="field col-4">
-            <CodeHinter
-              currentState={currentState}
-              initialValue={value ? (typeof value === 'string' ? value : JSON.stringify(value)) : value}
-              className="codehinter-plugins"
-              theme={darkMode ? 'monokai' : 'default'}
-              height={'32px'}
-              placeholder="key"
-              onChange={(newValue) => handleValueChange(newValue)}
-            />
+            {operator === 'is' ? (
+              <Select
+                useMenuPortal={true}
+                placeholder="Select value"
+                value={value}
+                options={isOperatorOptions}
+                onChange={handleValueChange}
+              />
+            ) : (
+              <CodeHinter
+                currentState={currentState}
+                initialValue={value ? (typeof value === 'string' ? value : JSON.stringify(value)) : value}
+                className="codehinter-plugins"
+                theme={darkMode ? 'monokai' : 'default'}
+                height={'32px'}
+                placeholder="key"
+                onChange={(newValue) => handleValueChange(newValue)}
+              />
+            )}
           </div>
           <div className="col-1 cursor-pointer m-1 mr-2">
             <svg
diff --git a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/util.js b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/util.js
index d67aa2d53c..f26545d3fe 100644
--- a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/util.js
+++ b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/util.js
@@ -1,4 +1,5 @@
 import { get } from 'lodash';
+
 /**
  * Checks if the queryOptions object contains a filter with an 'eq' (equal) operator and a value equal to '{{null}}'.
  *
@@ -34,3 +35,8 @@ export const hasEqualWithNull = (queryOptions, operation) => {
   }
   return false;
 };
+
+export const isOperatorOptions = [
+  { value: 'null', label: 'null' },
+  { value: 'notNull', label: 'not null' },
+];

From f7f1d05dc5d2f1407b9943373bf1ca293bfe812a Mon Sep 17 00:00:00 2001
From: Vik <vkb.info@gmail.com>
Date: Fri, 28 Apr 2023 14:21:45 +0530
Subject: [PATCH 3/3] revert unnecessary change

---
 .../QueryManager/QueryEditors/TooljetDatabase/operations.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/operations.js b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/operations.js
index e71a8085bb..1290920fee 100644
--- a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/operations.js
+++ b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/operations.js
@@ -49,11 +49,7 @@ function buildPostgrestQuery(filters) {
       }
     }
   });
-  let whereQuery = postgrestQueryBuilder.url.toString();
-  // if (whereQuery && whereQuery.includes('nulltest=isNotNull')) {
-  //   whereQuery = whereQuery.replace('nulltest=isNotNull', 'nulltest=not.is.null');
-  // }
-  return whereQuery;
+  return postgrestQueryBuilder.url.toString();
 }
 
 async function listRows(queryOptions, organizationId, currentState) {