From bf673bff71231a6c6b5d5307a7ccb401dd1910bf Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 25 Feb 2025 16:20:58 +0000
Subject: [PATCH] Fix filtering options

---
 .../app/forms/RelationshipField.svelte        | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/packages/client/src/components/app/forms/RelationshipField.svelte b/packages/client/src/components/app/forms/RelationshipField.svelte
index 5da03eba2b..914d552e06 100644
--- a/packages/client/src/components/app/forms/RelationshipField.svelte
+++ b/packages/client/src/components/app/forms/RelationshipField.svelte
@@ -89,8 +89,8 @@
   $: updateOptions(optionsMap)
   $: !open && sortOptions()
 
-  // Fetch new options when search term changes
-  $: debouncedFetchRows(searchTerm, primaryDisplay)
+  // Search for new options when search term changes
+  $: debouncedSearchOptions(searchTerm || "", primaryDisplayField)
 
   // Ensure backwards compatibility
   $: enrichedDefaultValue = enrichDefaultValue(defaultValue)
@@ -310,28 +310,29 @@
     return val.includes(",") ? val.split(",") : val
   }
 
-  async function fetchRows(searchTerm: any, primaryDisplay: string) {
-    // Don't request until we have the primary display or default value has been fetched
+  // Searches for new options matching the given term
+  async function searchOptions(searchTerm: string, primaryDisplay?: string) {
     if (!primaryDisplay) {
       return
     }
 
     // Ensure we match all filters, rather than any
-    // @ts-expect-error this doesn't fit types, but don't want to change it yet
-    const baseFilter: any = (filter || []).filter(x => x.operator !== "allOr")
+    let newFilter: any = filter
+    if (searchTerm) {
+      // @ts-expect-error this doesn't fit types, but don't want to change it yet
+      newFilter = (newFilter || []).filter(x => x.operator !== "allOr")
+      newFilter.push({
+        // Use a big numeric prefix to avoid clashing with an existing filter
+        field: `999:${primaryDisplay}`,
+        operator: "string",
+        value: searchTerm,
+      })
+    }
     await fetch?.update({
-      filter: [
-        ...baseFilter,
-        {
-          // Use a big numeric prefix to avoid clashing with an existing filter
-          field: `999:${primaryDisplay}`,
-          operator: "string",
-          value: searchTerm,
-        },
-      ],
+      filter: newFilter,
     })
   }
-  const debouncedFetchRows = Utils.debounce(fetchRows, 250)
+  const debouncedSearchOptions = Utils.debounce(searchOptions, 250)
 
   // Flattens an array of row-like objects into a simple array of row IDs
   const flatten = (values: any | any[]): string[] => {