From b1a3bbd73d4981f6fcf96ea7fdd75582de12bd48 Mon Sep 17 00:00:00 2001
From: vardhan0604 <harsh062004@gmail.com>
Date: Mon, 5 Aug 2024 14:03:22 +0530
Subject: [PATCH 1/2] fix Filter string is erased when changing filter
 condition

---
 src/components/Filter/Filter.react.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/Filter/Filter.react.js b/src/components/Filter/Filter.react.js
index f9490c4958..9cb4e10798 100644
--- a/src/components/Filter/Filter.react.js
+++ b/src/components/Filter/Filter.react.js
@@ -51,17 +51,19 @@ function changeField(schema, currentClassName, filters, index, newField) {
   return filters.set(index, newFilter);
 }
 
-function changeConstraint(schema, currentClassName, filters, index, newConstraint) {
+function changeConstraint(schema, currentClassName, filters, index, newConstraint, prevCompareTo) {
   const field = filters.get(index).get('field');
   let compareType = schema[currentClassName][field].type;
   if (Object.prototype.hasOwnProperty.call(Filters.Constraints[newConstraint], 'field')) {
     compareType = Filters.Constraints[newConstraint].field;
   }
+
+  console.log(compareType, newConstraint)
   const newFilter = new Map({
     class: currentClassName,
     field: field,
     constraint: newConstraint,
-    compareTo: Filters.DefaultComparisons[compareType],
+    compareTo: (compareType && prevCompareTo) ? prevCompareTo : Filters.DefaultComparisons[compareType],
   });
   return filters.set(index, newFilter);
 }
@@ -189,11 +191,13 @@ const Filter = ({
             onChange(changeField(schema, currentClassName, filters, i, newField));
           },
           onChangeConstraint: (newConstraint, prevCompareTo) => {
+            console.log('onChangeConstraint', newConstraint, prevCompareTo);
             onChange(
               changeConstraint(schema, currentClassName, filters, i, newConstraint, prevCompareTo)
             );
           },
           onChangeCompareTo: newCompare => {
+            console.log('onChangeCompareTo', newCompare);
             onChange(changeCompareTo(schema, filters, i, compareType, newCompare));
           },
           onKeyDown: ({ key }) => {

From b683df7c247aa58647db12de7268bbc08e80922a Mon Sep 17 00:00:00 2001
From: vardhan0604 <harsh062004@gmail.com>
Date: Mon, 5 Aug 2024 15:10:25 +0530
Subject: [PATCH 2/2] deleted console.log statements

---
 src/components/Filter/Filter.react.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/Filter/Filter.react.js b/src/components/Filter/Filter.react.js
index 9cb4e10798..29397f4213 100644
--- a/src/components/Filter/Filter.react.js
+++ b/src/components/Filter/Filter.react.js
@@ -57,8 +57,6 @@ function changeConstraint(schema, currentClassName, filters, index, newConstrain
   if (Object.prototype.hasOwnProperty.call(Filters.Constraints[newConstraint], 'field')) {
     compareType = Filters.Constraints[newConstraint].field;
   }
-
-  console.log(compareType, newConstraint)
   const newFilter = new Map({
     class: currentClassName,
     field: field,
@@ -191,13 +189,11 @@ const Filter = ({
             onChange(changeField(schema, currentClassName, filters, i, newField));
           },
           onChangeConstraint: (newConstraint, prevCompareTo) => {
-            console.log('onChangeConstraint', newConstraint, prevCompareTo);
             onChange(
               changeConstraint(schema, currentClassName, filters, i, newConstraint, prevCompareTo)
             );
           },
           onChangeCompareTo: newCompare => {
-            console.log('onChangeCompareTo', newCompare);
             onChange(changeCompareTo(schema, filters, i, compareType, newCompare));
           },
           onKeyDown: ({ key }) => {