From 165eb206d9c03e370d8f106fd0908677f81c335d Mon Sep 17 00:00:00 2001
From: melohagan <101575380+melohagan@users.noreply.github.com>
Date: Mon, 22 Jan 2024 11:29:34 +0000
Subject: [PATCH 1/4] If the filter has changed, re-fetch (#12625)

* If the filter has changed, re-fetch

* lint

* Clear value when filter changes
---
 .../src/components/app/forms/RelationshipField.svelte     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/client/src/components/app/forms/RelationshipField.svelte b/packages/client/src/components/app/forms/RelationshipField.svelte
index fcdc93020e..af48183c20 100644
--- a/packages/client/src/components/app/forms/RelationshipField.svelte
+++ b/packages/client/src/components/app/forms/RelationshipField.svelte
@@ -108,8 +108,16 @@
     }
   }
 
+  $: forceFetchRows(filter)
   $: debouncedFetchRows(searchTerm, primaryDisplay, defaultValue)
 
+  const forceFetchRows = async () => {
+    // if the filter has changed, then we need to reset the options, clear the selection, and re-fetch
+    optionsObj = {}
+    fieldApi.setValue([])
+    selectedValue = []
+    debouncedFetchRows(searchTerm, primaryDisplay, defaultValue)
+  }
   const fetchRows = async (searchTerm, primaryDisplay, defaultVal) => {
     const allRowsFetched =
       $fetch.loaded &&

From e2620af76c7982a9efb1fd202c172fff14d7c675 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 22 Jan 2024 11:46:55 +0000
Subject: [PATCH 2/4] Bump version to 2.15.3

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

diff --git a/lerna.json b/lerna.json
index 3ab56dc0b1..6663aebfe6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.15.2",
+  "version": "2.15.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*",

From 2a24c8537857af19c99ceb48fe111c814a8f29c6 Mon Sep 17 00:00:00 2001
From: melohagan <101575380+melohagan@users.noreply.github.com>
Date: Mon, 22 Jan 2024 15:30:21 +0000
Subject: [PATCH 3/4] Surface email error (#12837)

---
 packages/server/src/utilities/workerRequests.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/server/src/utilities/workerRequests.ts b/packages/server/src/utilities/workerRequests.ts
index 56ceff226c..1604a724d2 100644
--- a/packages/server/src/utilities/workerRequests.ts
+++ b/packages/server/src/utilities/workerRequests.ts
@@ -48,6 +48,9 @@ async function checkResponse(
     let error
     try {
       error = await response.json()
+      if (!error.message) {
+        error = JSON.stringify(error)
+      }
     } catch (err) {
       error = await response.text()
     }

From 6e86f3e27158e55168a063b6f8ef5bc89f298280 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 22 Jan 2024 15:32:13 +0000
Subject: [PATCH 4/4] Bump version to 2.15.4

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

diff --git a/lerna.json b/lerna.json
index 6663aebfe6..480b577bb4 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.15.3",
+  "version": "2.15.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*",