From 2933571c62e9a8f58a24cdb73e5d7eed768b8812 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 28 Feb 2024 08:34:41 +0000
Subject: [PATCH] update runLuceneQuery in client to allow for all filter
 matching

---
 packages/shared-core/src/filters.ts | 59 +++++++++++++++++++++--------
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index 46d765a7b5..2c4861ed60 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -390,23 +390,52 @@ export const runLuceneQuery = (docs: any[], query?: SearchQuery) => {
     }
   )
 
-  // Match a document against all criteria
   const docMatch = (doc: any) => {
-    return (
-      stringMatch(doc) &&
-      fuzzyMatch(doc) &&
-      rangeMatch(doc) &&
-      equalMatch(doc) &&
-      notEqualMatch(doc) &&
-      emptyMatch(doc) &&
-      notEmptyMatch(doc) &&
-      oneOf(doc) &&
-      contains(doc) &&
-      containsAny(doc) &&
-      notContains(doc)
-    )
-  }
+    // Determine active filters based on query object
+    const activeFilterKeys = Object.entries(query || {})
+      .filter(
+        ([key, value]) =>
+          !["allOr", "onEmptyFilter"].includes(key) &&
+          Object.keys(value).length > 0
+      )
+      .map(([key]) => key)
 
+    // Apply filters dynamically based on activeFilterKeys
+    const results = activeFilterKeys.map(filterKey => {
+      switch (filterKey) {
+        case "string":
+          return stringMatch(doc)
+        case "fuzzy":
+          return fuzzyMatch(doc)
+        case "range":
+          return rangeMatch(doc)
+        case "equal":
+          return equalMatch(doc)
+        case "notEqual":
+          return notEqualMatch(doc)
+        case "empty":
+          return emptyMatch(doc)
+        case "notEmpty":
+          return notEmptyMatch(doc)
+        case "oneOf":
+          return oneOf(doc)
+        case "contains":
+          return contains(doc)
+        case "containsAny":
+          return containsAny(doc)
+        case "notContains":
+          return notContains(doc)
+        default:
+          return true // If the filter type is not recognized, default to true (assuming pass)
+      }
+    })
+
+    if (query!.allOr) {
+      return results.some(result => result === true)
+    } else {
+      return results.every(result => result === true)
+    }
+  }
   // Process all docs
   return docs.filter(docMatch)
 }