From bcf431a476bffe9691824f1561aed5843bff4c04 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 8 Nov 2023 14:43:28 +0000
Subject: [PATCH 01/10] Fix a few svelte bugs with the LinkedRowSelector
 component to fix adding/editing relationships via a model from the data UI

---
 .../automation/SetupPanel/RowSelectorTypes.svelte          | 2 +-
 .../components/backend/DataTable/RowFieldControl.svelte    | 7 ++++++-
 .../builder/src/components/common/LinkedRowSelector.svelte | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
index 373d174541..f6cce6182c 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
@@ -64,7 +64,7 @@
   </span>
 {:else if schema.type === "link"}
   <LinkedRowSelector
-    bind:linkedRows={value[field]}
+    linkedRows={value[field]}
     {schema}
     on:change={e => onChange(e, field)}
   />
diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index 61b706e28e..1ec32cb3fd 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -70,7 +70,12 @@
     options={meta.constraints.inclusion}
   />
 {:else if type === "link"}
-  <LinkedRowSelector {error} bind:linkedRows={value} schema={meta} />
+  <LinkedRowSelector
+    {error}
+    linkedRows={value}
+    schema={meta}
+    on:change={e => (value = e.detail)}
+  />
 {:else if type === "longform"}
   {#if meta.useRichText}
     <RichTextField {error} {label} height="150px" bind:value />
diff --git a/packages/builder/src/components/common/LinkedRowSelector.svelte b/packages/builder/src/components/common/LinkedRowSelector.svelte
index d357a0a54d..c45b7be195 100644
--- a/packages/builder/src/components/common/LinkedRowSelector.svelte
+++ b/packages/builder/src/components/common/LinkedRowSelector.svelte
@@ -56,12 +56,12 @@
   />
 {:else}
   <Multiselect
-    bind:value={linkedIds}
+    value={linkedIds}
     {label}
     options={rows}
     getOptionLabel={getPrettyName}
     getOptionValue={row => row._id}
     sort
-    on:change={() => dispatch("change", linkedIds)}
+    on:change
   />
 {/if}

From 3d39a2f77b85b56fd0c563e7ddf59ba2d91f44aa Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 23 Nov 2023 09:47:07 +0000
Subject: [PATCH 02/10] Fix relationship filter setting being ignored, and
 debounce searches

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

diff --git a/packages/client/src/components/app/forms/RelationshipField.svelte b/packages/client/src/components/app/forms/RelationshipField.svelte
index 41a071686e..f047b53a94 100644
--- a/packages/client/src/components/app/forms/RelationshipField.svelte
+++ b/packages/client/src/components/app/forms/RelationshipField.svelte
@@ -1,6 +1,6 @@
 <script>
   import { CoreSelect, CoreMultiselect } from "@budibase/bbui"
-  import { fetchData } from "@budibase/frontend-core"
+  import { fetchData, Utils } from "@budibase/frontend-core"
   import { getContext } from "svelte"
   import Field from "./Field.svelte"
   import { FieldTypes } from "../../../constants"
@@ -108,7 +108,7 @@
     }
   }
 
-  $: fetchRows(searchTerm, primaryDisplay, defaultValue)
+  $: debouncedFetchRows(searchTerm, primaryDisplay, defaultValue)
 
   const fetchRows = async (searchTerm, primaryDisplay, defaultVal) => {
     const allRowsFetched =
@@ -124,10 +124,21 @@
         query: { equal: { _id: defaultVal } },
       })
     }
+
+    // Ensure we match all filters, rather than any
+    const baseFilter = (filter || []).filter(x => x.operator !== "allOr")
     await fetch.update({
-      query: { string: { [primaryDisplay]: searchTerm } },
+      filter: [
+        ...baseFilter,
+        {
+          field: `999:${primaryDisplay}`,
+          operator: "string",
+          value: searchTerm,
+        },
+      ],
     })
   }
+  const debouncedFetchRows = Utils.debounce(fetchRows, 250)
 
   const flatten = values => {
     if (!values) {

From a65b29eb880f264fbc4fc78d3468f6109bc7044b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 27 Nov 2023 18:50:44 +0000
Subject: [PATCH 03/10] banner changes for new pricing, fix for onboarding to
 prevent flash of UI before onboarding tutorial

---
 packages/backend-core/src/objectStore/objectStore.ts |  4 ++--
 .../src/pages/builder/portal/apps/_layout.svelte     |  2 +-
 .../src/pages/builder/portal/apps/index.svelte       | 12 ++++++++++++
 packages/pro                                         |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/backend-core/src/objectStore/objectStore.ts b/packages/backend-core/src/objectStore/objectStore.ts
index cdaf19fa55..cfd988f5e0 100644
--- a/packages/backend-core/src/objectStore/objectStore.ts
+++ b/packages/backend-core/src/objectStore/objectStore.ts
@@ -260,12 +260,12 @@ export async function listAllObjects(bucketName: string, path: string) {
 }
 
 /**
- * Generate a presigned url with a default TTL of 1 hour
+ * Generate a presigned url with a default TTL of 1 day
  */
 export function getPresignedUrl(
   bucketName: string,
   key: string,
-  durationSeconds: number = 3600
+  durationSeconds: number = 86400
 ) {
   const objectStore = ObjectStore(bucketName, { presigning: true })
   const params = {
diff --git a/packages/builder/src/pages/builder/portal/apps/_layout.svelte b/packages/builder/src/pages/builder/portal/apps/_layout.svelte
index 38c0274eca..8810edca9c 100644
--- a/packages/builder/src/pages/builder/portal/apps/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/_layout.svelte
@@ -14,7 +14,7 @@
   import PortalSideBar from "./_components/PortalSideBar.svelte"
 
   // Don't block loading if we've already hydrated state
-  let loaded = $apps.length != null
+  let loaded = !!$apps?.length
 
   onMount(async () => {
     try {
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index ad0d3658ea..fb0ba8bc2e 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -1,5 +1,6 @@
 <script>
   import {
+    banner,
     Heading,
     Layout,
     Button,
@@ -10,6 +11,7 @@
     Notification,
     Body,
     Search,
+    BANNER_TYPES,
   } from "@budibase/bbui"
   import Spinner from "components/common/Spinner.svelte"
   import CreateAppModal from "components/start/CreateAppModal.svelte"
@@ -198,6 +200,16 @@
       if (usersLimitLockAction) {
         usersLimitLockAction()
       }
+      banner.queue([
+        {
+          message:
+            "We've updated our pricing - read the blog post to learn more.",
+          type: BANNER_TYPES.NEUTRAL,
+          extraButtonText: "Learn More",
+          extraButtonAction: () =>
+            window.open("https://budibase.com/blog/updates/pricing-v3"),
+        },
+      ])
     } catch (error) {
       notifications.error("Error getting init info")
     }
diff --git a/packages/pro b/packages/pro
index 618613f357..1037b032d4 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 618613f3575b01f74940d9f58fdb53a9a5b2dc1a
+Subproject commit 1037b032d49244678204704d1bca779a29e395eb

From 5301c1edd9667823c691d7669bd274359e7379eb Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 27 Nov 2023 19:03:37 +0000
Subject: [PATCH 04/10] update presigned url time

---
 packages/backend-core/src/objectStore/objectStore.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend-core/src/objectStore/objectStore.ts b/packages/backend-core/src/objectStore/objectStore.ts
index cfd988f5e0..1971c09e9d 100644
--- a/packages/backend-core/src/objectStore/objectStore.ts
+++ b/packages/backend-core/src/objectStore/objectStore.ts
@@ -260,12 +260,12 @@ export async function listAllObjects(bucketName: string, path: string) {
 }
 
 /**
- * Generate a presigned url with a default TTL of 1 day
+ * Generate a presigned url with a default TTL of 36 hours
  */
 export function getPresignedUrl(
   bucketName: string,
   key: string,
-  durationSeconds: number = 86400
+  durationSeconds: number = 129600
 ) {
   const objectStore = ObjectStore(bucketName, { presigning: true })
   const params = {

From b357b6d2e8cea53e628faaa94b51a8b55a73e668 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 28 Nov 2023 08:59:34 +0000
Subject: [PATCH 05/10] only show pricing banner in prod and once

---
 .../pages/builder/portal/apps/index.svelte    | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index fb0ba8bc2e..6a15d756cd 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -200,16 +200,20 @@
       if (usersLimitLockAction) {
         usersLimitLockAction()
       }
-      banner.queue([
-        {
-          message:
-            "We've updated our pricing - read the blog post to learn more.",
-          type: BANNER_TYPES.NEUTRAL,
-          extraButtonText: "Learn More",
-          extraButtonAction: () =>
-            window.open("https://budibase.com/blog/updates/pricing-v3"),
-        },
-      ])
+      if (!$admin.isDev) {
+        await banner.show({
+          messages: [
+            {
+              message:
+                      "We've updated our pricing - read the blog post to learn more.",
+              type: BANNER_TYPES.NEUTRAL,
+              extraButtonText: "Learn More",
+              extraButtonAction: () =>
+                      window.open("https://budibase.com/blog/updates/pricing-v3"),
+            },
+          ],
+        })
+      }
     } catch (error) {
       notifications.error("Error getting init info")
     }

From 3a0d409e9b0d0fbedea0789fcc95fd47c965438c Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 28 Nov 2023 09:06:25 +0000
Subject: [PATCH 06/10] point banner to pricing website

---
 packages/builder/src/pages/builder/portal/apps/index.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 6a15d756cd..fac5c502b3 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -205,11 +205,11 @@
           messages: [
             {
               message:
-                      "We've updated our pricing - read the blog post to learn more.",
+                "We've updated our pricing - read the blog post to learn more.",
               type: BANNER_TYPES.NEUTRAL,
               extraButtonText: "Learn More",
               extraButtonAction: () =>
-                      window.open("https://budibase.com/blog/updates/pricing-v3"),
+                window.open("https://budibase.com/pricing"),
             },
           ],
         })

From 3730988e7ffe619c640533df4803f52c29f1c561 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 28 Nov 2023 09:19:25 +0000
Subject: [PATCH 07/10] Bump version to 2.13.18

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

diff --git a/lerna.json b/lerna.json
index 40e167f36c..38872a31b1 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.13.17",
+  "version": "2.13.18",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 69dd67541422417935a3b7b8ed799555a791a08c Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 28 Nov 2023 09:41:29 +0000
Subject: [PATCH 08/10] Add comment to explain numeric prefix

---
 .../client/src/components/app/forms/RelationshipField.svelte     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/components/app/forms/RelationshipField.svelte b/packages/client/src/components/app/forms/RelationshipField.svelte
index f047b53a94..fcdc93020e 100644
--- a/packages/client/src/components/app/forms/RelationshipField.svelte
+++ b/packages/client/src/components/app/forms/RelationshipField.svelte
@@ -131,6 +131,7 @@
       filter: [
         ...baseFilter,
         {
+          // Use a big numeric prefix to avoid clashing with an existing filter
           field: `999:${primaryDisplay}`,
           operator: "string",
           value: searchTerm,

From 24357aa7de033002501b446eca22866500af2292 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 28 Nov 2023 11:42:20 +0000
Subject: [PATCH 09/10] update copy in banner

---
 packages/builder/src/pages/builder/portal/apps/index.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index fac5c502b3..cf2c61b11d 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -205,7 +205,7 @@
           messages: [
             {
               message:
-                "We've updated our pricing - read the blog post to learn more.",
+                "We've updated our pricing - see our website to learn more.",
               type: BANNER_TYPES.NEUTRAL,
               extraButtonText: "Learn More",
               extraButtonAction: () =>

From e35e4b592c441a3f075a47c1fb03793e3eece354 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 28 Nov 2023 11:48:11 +0000
Subject: [PATCH 10/10] Bump version to 2.13.19

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

diff --git a/lerna.json b/lerna.json
index 38872a31b1..e54b76c5e9 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.13.18",
+  "version": "2.13.19",
   "npmClient": "yarn",
   "packages": [
     "packages/*"