From 8ec299e924ca14cbf33dec5dd5c3c3bb43e42a69 Mon Sep 17 00:00:00 2001
From: melohagan <101575380+melohagan@users.noreply.github.com>
Date: Fri, 26 Jan 2024 10:21:45 +0000
Subject: [PATCH 1/2] Cannot select relationship field value in design section
 (#12876)

* Revert "Quick fix, if compare isn't set then don't try to use it at all."

This reverts commit b8c7da02e28f5fa0fbae4125b69be5ec1cd86778.

* Revert "Quick fix for all usages of compare function in select."

This reverts commit b4be6daea6a5fac4e16a7ce2436638ae903ba942.

* Don't force fetch rows on fieldApi change

* Revert "Revert "Quick fix for all usages of compare function in select.""

This reverts commit 8cb5e2b5695cf575d63a6a241802f6f28b1f8079.

* Revert "Revert "Quick fix, if compare isn't set then don't try to use it at all.""

This reverts commit 0c09d5878b7de8860a66f9ce9caa74147c23bc71.

* update account portal
---
 packages/account-portal                                    | 2 +-
 .../src/components/app/forms/RelationshipField.svelte      | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/account-portal b/packages/account-portal
index 1b9fa56fd7..e9af6686ba 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit 1b9fa56fd7b0991b4963de9f3e8b4711abdcae71
+Subproject commit e9af6686ba135c367e9145a53d26c68325b9bf68
diff --git a/packages/client/src/components/app/forms/RelationshipField.svelte b/packages/client/src/components/app/forms/RelationshipField.svelte
index 9d0503be8e..7cd571f6d9 100644
--- a/packages/client/src/components/app/forms/RelationshipField.svelte
+++ b/packages/client/src/components/app/forms/RelationshipField.svelte
@@ -108,16 +108,13 @@
     }
   }
 
-  $: forceFetchRows(filter, fieldApi)
+  $: forceFetchRows(filter)
   $: debouncedFetchRows(searchTerm, primaryDisplay, defaultValue)
 
   const forceFetchRows = async () => {
-    if (!fieldApi) {
-      return
-    }
     // if the filter has changed, then we need to reset the options, clear the selection, and re-fetch
     optionsObj = {}
-    fieldApi.setValue([])
+    fieldApi?.setValue([])
     selectedValue = []
     debouncedFetchRows(searchTerm, primaryDisplay, defaultValue)
   }

From 97af9b2ec069ef37623c08d182df74f45aab2f87 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 26 Jan 2024 10:26:57 +0000
Subject: [PATCH 2/2] Bump version to 2.15.7

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 4049d5d734..65f04ecf2c 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.15.6",
+  "version": "2.15.7",
   "npmClient": "yarn",
   "packages": [
     "packages/*",