From 06d881aa7f2ef97e406fc2c6126381eb075ecf2b Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 22 Sep 2023 10:14:17 +0200
Subject: [PATCH] Unify selectedValue func

---
 .../src/components/app/forms/RelationshipField.svelte      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/app/forms/RelationshipField.svelte b/packages/client/src/components/app/forms/RelationshipField.svelte
index 9caab6f355..34c38de2e4 100644
--- a/packages/client/src/components/app/forms/RelationshipField.svelte
+++ b/packages/client/src/components/app/forms/RelationshipField.svelte
@@ -39,8 +39,9 @@
 
   $: options = $fetch.rows
   $: tableDefinition = $fetch.definition
-  $: singleValue = flatten(fieldState?.value)?.[0]
-  $: multiValue = flatten(fieldState?.value) ?? []
+  $: selectedValue = multiselect
+    ? flatten(fieldState?.value) ?? []
+    : flatten(fieldState?.value)?.[0]
   $: component = multiselect ? CoreMultiselect : CoreSelect
   $: expandedDefaultValue = expand(defaultValue)
   $: primaryDisplay = tableDefinition?.primaryDisplay || "_id"
@@ -121,7 +122,7 @@
       this={component}
       {options}
       {autocomplete}
-      value={multiselect ? multiValue : singleValue}
+      value={selectedValue}
       on:change={multiselect ? multiHandler : singleHandler}
       id={fieldState.fieldId}
       disabled={fieldState.disabled}