From 85854aa8be9f4e601479562fa6f56433899c5527 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 22 Sep 2023 12:39:49 +0200
Subject: [PATCH] Keep options

---
 .../app/forms/RelationshipField.svelte        | 38 ++++++++-----------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/packages/client/src/components/app/forms/RelationshipField.svelte b/packages/client/src/components/app/forms/RelationshipField.svelte
index 2c847a2b1e..2a979ef26f 100644
--- a/packages/client/src/components/app/forms/RelationshipField.svelte
+++ b/packages/client/src/components/app/forms/RelationshipField.svelte
@@ -53,12 +53,24 @@
         [primaryDisplay]: x.primaryDisplay,
       })))
 
-  $: options = processOptions(selectedValue, $fetch.rows, initialValues)
+  $: allOptions = {
+    ...(allOptions || {}),
+    ...[...($fetch.rows || []), ...(initialValues || [])]?.reduce((p, c) => {
+      p[c._id] = c
+      return p
+    }, {}),
+  }
+
+  $: options = fetchTerm
+    ? Object.values(allOptions).filter(row =>
+        row[primaryDisplay].includes(fetchTerm)
+      )
+    : Object.values(allOptions)
 
   let lastFetchedTerm
-  $: search(fetchTerm)
+  $: fetchRows(fetchTerm)
 
-  const search = fetchTerm => {
+  const fetchRows = fetchTerm => {
     const termChangedSinceFetch = (lastFetchedTerm || "") !== (fetchTerm || "")
 
     const allRowsFetched = !lastFetchedTerm && !$fetch.hasNextPage
@@ -70,10 +82,6 @@
           query: { string: { [primaryDisplay]: fetchTerm } },
         })
       }
-    } else {
-      options = fetchTerm
-        ? $fetch.rows.filter(row => row[primaryDisplay].includes(fetchTerm))
-        : $fetch.rows
     }
   }
 
@@ -87,22 +95,6 @@
     return values.map(value => (typeof value === "object" ? value._id : value))
   }
 
-  const processOptions = (selectedValue, fetchedRows, initialValues = []) => {
-    selectedValue ??= []
-    if (!Array.isArray(selectedValue)) {
-      selectedValue = [selectedValue]
-    }
-
-    const missingItems = selectedValue
-      .filter(v => !fetchedRows.find(r => r._id === v))
-      .map(v => initialValues.find(o => o._id === v))
-      .filter(x => x)
-
-    const result = [...missingItems, ...fetchedRows]
-
-    return result
-  }
-
   const getDisplayName = row => {
     return row?.[primaryDisplay] || "-"
   }