From d7522aceb43268a78e0b58989338ca27e3cc5852 Mon Sep 17 00:00:00 2001
From: Akshay Sasidharan <akshaysasidharan93@gmail.com>
Date: Wed, 15 Mar 2023 04:28:44 +0530
Subject: [PATCH] fix tjdb filter conditions using same columns

---
 .../QueryEditors/TooljetDatabase/DeleteRows.jsx           | 7 -------
 .../QueryEditors/TooljetDatabase/ListRows.jsx             | 8 --------
 .../QueryEditors/TooljetDatabase/UpdateRows.jsx           | 7 -------
 3 files changed, 22 deletions(-)

diff --git a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/DeleteRows.jsx b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/DeleteRows.jsx
index 92d219d748..6078539ec0 100644
--- a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/DeleteRows.jsx
+++ b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/DeleteRows.jsx
@@ -44,18 +44,11 @@ export const DeleteRows = React.memo(({ currentState, darkMode }) => {
   }
 
   const RenderFilterFields = ({ column, operator, value, id }) => {
-    const existingColumnOptions = Object.values(deleteRowsOptions?.where_filters).map((f) => f.column);
     let displayColumns = columns.map(({ accessor }) => ({
       value: accessor,
       label: accessor,
     }));
 
-    if (existingColumnOptions.length > 0) {
-      displayColumns = displayColumns.filter(
-        ({ value }) => !existingColumnOptions.map((item) => item !== column && item).includes(value)
-      );
-    }
-
     const handleColumnChange = (selectedOption) => {
       updateFilterOptionsChanged({ ...deleteRowsOptions?.where_filters[id], ...{ column: selectedOption } });
     };
diff --git a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ListRows.jsx b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ListRows.jsx
index 5baac5e090..bdf8aa51aa 100644
--- a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ListRows.jsx
+++ b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ListRows.jsx
@@ -77,19 +77,11 @@ export const ListRows = React.memo(({ currentState, darkMode }) => {
   }
 
   const RenderFilterFields = ({ column, operator, value, id }) => {
-    const existingColumnOptions = Object.values(listRowsOptions?.where_filters).map((f) => f.column);
-
     let displayColumns = columns.map(({ accessor }) => ({
       value: accessor,
       label: accessor,
     }));
 
-    if (existingColumnOptions.length > 0) {
-      displayColumns = displayColumns.filter(
-        ({ value }) => !existingColumnOptions.map((item) => item !== column && item).includes(value)
-      );
-    }
-
     const handleColumnChange = (selectedOption) => {
       updateFilterOptionsChanged({ ...listRowsOptions?.where_filters[id], ...{ column: selectedOption } });
     };
diff --git a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/UpdateRows.jsx b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/UpdateRows.jsx
index 3073af0c45..dccbae1e4e 100644
--- a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/UpdateRows.jsx
+++ b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/UpdateRows.jsx
@@ -70,18 +70,11 @@ export const UpdateRows = React.memo(({ currentState, darkMode }) => {
   }
 
   const RenderFilterFields = ({ column, operator, value, id }) => {
-    const existingColumnOptions = Object.values(updateRowsOptions?.where_filters).map((f) => f.column);
     let displayColumns = columns.map(({ accessor }) => ({
       value: accessor,
       label: accessor,
     }));
 
-    if (existingColumnOptions.length > 0) {
-      displayColumns = displayColumns.filter(
-        ({ value }) => !existingColumnOptions.map((item) => item !== column && item).includes(value)
-      );
-    }
-
     const handleColumnChange = (selectedOption) => {
       updateFilterOptionsChanged({ ...updateRowsOptions?.where_filters[id], ...{ column: selectedOption } });
     };