From eb00ce401f9819406acde58c60018945bc95864e Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 6 Mar 2024 10:10:28 +0000
Subject: [PATCH] pr comments

---
 packages/shared-core/src/filters.ts            |  7 ++++---
 packages/shared-core/src/tests/filters.test.ts | 10 ++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index 0a1673e558..84b6076d56 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -12,6 +12,7 @@ import {
 import dayjs from "dayjs"
 import { OperatorOptions, SqlNumberTypeRangeMap } from "./constants"
 import { deepGet } from "./helpers"
+import test from "node:test"
 
 const HBS_REGEX = /{{([^{].*?)}}/g
 
@@ -359,6 +360,7 @@ export const runLuceneQuery = (docs: any[], query?: SearchQuery) => {
   const oneOf = match(
     SearchQueryOperators.ONE_OF,
     (docValue: any, testValue: any) => {
+      console.log(testValue)
       if (typeof testValue === "string") {
         testValue = testValue.split(",")
         if (typeof docValue === "number") {
@@ -410,13 +412,13 @@ export const runLuceneQuery = (docs: any[], query?: SearchQuery) => {
       .filter(
         ([key, value]: [string, any]) =>
           !["allOr", "onEmptyFilter"].includes(key) &&
+          value &&
           Object.keys(value as Record<string, any>).length > 0
       )
       .map(([key]) => key as any)
 
     const results: boolean[] = activeFilterKeys.map(filterKey => {
-      const filterFunction = filterFunctions[filterKey]
-      return filterFunction ? filterFunction(doc) : true
+      return filterFunctions[filterKey]?.(doc) ?? false
     })
 
     if (query!.allOr) {
@@ -425,7 +427,6 @@ export const runLuceneQuery = (docs: any[], query?: SearchQuery) => {
       return results.every(result => result === true)
     }
   }
-
   return docs.filter(docMatch)
 }
 
diff --git a/packages/shared-core/src/tests/filters.test.ts b/packages/shared-core/src/tests/filters.test.ts
index 0cf7e0e92a..1f8f534f0d 100644
--- a/packages/shared-core/src/tests/filters.test.ts
+++ b/packages/shared-core/src/tests/filters.test.ts
@@ -240,6 +240,16 @@ describe("runLuceneQuery", () => {
 
     expect(runLuceneQuery(docs, query).map(row => row.order_id)).toEqual([])
   })
+
+  it("should handle when a value is null or undefined", () => {
+    const query = buildQuery({
+      allOr: true,
+      equal: { order_status: null },
+      oneOf: { label: ["FRAGILE"] },
+    })
+
+    expect(runLuceneQuery(docs, query).map(row => row.order_id)).toEqual([2])
+  })
 })
 
 describe("buildLuceneQuery", () => {