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 1/8] 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 2/8] 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 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 3/8] 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 1fcba987c381c41654c8e7bf25fca4fb19887950 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Tue, 28 Nov 2023 10:19:16 +0000
Subject: [PATCH 4/8] Add healthchecking to CouchDB image, remove directory
 settings in Kube.

---
 hosting/couchdb/Dockerfile     |  4 ++++
 hosting/couchdb/healthcheck.sh | 13 +++++++++++++
 hosting/couchdb/runner.sh      | 23 ++++++++++++++++++++++-
 hosting/single/Dockerfile      |  2 +-
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 hosting/couchdb/healthcheck.sh

diff --git a/hosting/couchdb/Dockerfile b/hosting/couchdb/Dockerfile
index f83df7038b..254a676f63 100644
--- a/hosting/couchdb/Dockerfile
+++ b/hosting/couchdb/Dockerfile
@@ -29,6 +29,10 @@ WORKDIR /opt/couchdb
 ADD couch/vm.args couch/local.ini ./etc/
 
 WORKDIR /
+ADD healthcheck.sh ./healthcheck.sh
+RUN chmod +x ./healthcheck.sh
+HEALTHCHECK --interval=15s --timeout=15s --start-period=45s CMD "/healthcheck.sh"
+
 ADD runner.sh ./bbcouch-runner.sh
 RUN chmod +x ./bbcouch-runner.sh /opt/clouseau/bin/clouseau
 CMD ["./bbcouch-runner.sh"]
diff --git a/hosting/couchdb/healthcheck.sh b/hosting/couchdb/healthcheck.sh
new file mode 100644
index 0000000000..758ee5111a
--- /dev/null
+++ b/hosting/couchdb/healthcheck.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+healthy=true
+
+if [[ $(curl -s -w "%{http_code}\n" http://localhost:5984/_up -o /dev/null) -ne 200 ]]; then
+    echo 'ERROR: CouchDB is not running';
+    healthy=false
+fi
+
+if [ $healthy == true ]; then
+  exit 0
+else
+  exit 1
+fi
diff --git a/hosting/couchdb/runner.sh b/hosting/couchdb/runner.sh
index 2e4d26122f..b576c886c2 100644
--- a/hosting/couchdb/runner.sh
+++ b/hosting/couchdb/runner.sh
@@ -26,27 +26,48 @@ if [[ "${TARGETBUILD}" = "aas" ]]; then
     sed -i "s#DATA_DIR#/home#g" /opt/clouseau/clouseau.ini
     sed -i "s#DATA_DIR#/home#g" /opt/couchdb/etc/local.ini
 elif [[ "${TARGETBUILD}" = "single" ]]; then
+    # In the single image build, the Dockerfile specifies /data as a volume
+    # mount, so we use that for all persistent data.
     sed -i "s#DATA_DIR#/data#g" /opt/clouseau/clouseau.ini
     sed -i "s#DATA_DIR#/data#g" /opt/couchdb/etc/local.ini
 elif [[ -n $KUBERNETES_SERVICE_HOST ]]; then
     # In Kubernetes the directory /opt/couchdb/data has a persistent volume
     # mount for storing database data.
     sed -i "s#DATA_DIR#/opt/couchdb/data#g" /opt/clouseau/clouseau.ini
-    sed -i "s#DATA_DIR#/opt/couchdb/data#g" /opt/couchdb/etc/local.ini
+
+    # We remove the database_dir and view_index_dir settings from the local.ini
+    # in Kubernetes because it will default to /opt/couchdb/data which is what
+    # our Helm chart was using prior to us switching to using our own CouchDB
+    # image.
+    sed -i "s#^database_dir.*\$##g" /opt/couchdb/etc/local.ini
+    sed -i "s#^view_index_dir.*\$##g" /opt/couchdb/etc/local.ini
+
+    # We remove the -name setting from the vm.args file in Kubernetes because
+    # it will default to the pod FQDN, which is what's required for clustering
+    # to work.
     sed -i "s/^-name .*$//g" /opt/couchdb/etc/vm.args
 else
+    # For all other builds, we use /data for persistent data.
     sed -i "s#DATA_DIR#/data#g" /opt/clouseau/clouseau.ini
     sed -i "s#DATA_DIR#/data#g" /opt/couchdb/etc/local.ini
 fi
 
+# Start Clouseau. Budibase won't function correctly without Clouseau running, it
+# powers the search API endpoints which are used to do all sorts, including
+# populating app grids.
 /opt/clouseau/bin/clouseau > /dev/stdout 2>&1 &
+
+# Start CouchDB.
 /docker-entrypoint.sh /opt/couchdb/bin/couchdb &
 
+# Wati for CouchDB to start up.
 while [[ $(curl -s -w "%{http_code}\n" http://localhost:5984/_up -o /dev/null) -ne 200 ]]; do
     echo 'Waiting for CouchDB to start...';
     sleep 5;
 done
 
+# CouchDB needs the `_users` and `_replicator` databases to exist before it will
+# function correctly, so we create them here.
 curl -X PUT http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@localhost:5984/_users
 curl -X PUT http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@localhost:5984/_replicator
 sleep infinity
\ No newline at end of file
diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile
index e9ff6c6596..a1b93d7f1a 100644
--- a/hosting/single/Dockerfile
+++ b/hosting/single/Dockerfile
@@ -39,7 +39,7 @@ COPY packages/worker/pm2.config.js packages/worker/pm2.config.js
 COPY packages/string-templates packages/string-templates
 
 
-FROM budibase/couchdb as runner
+FROM samwho/test as runner
 ARG TARGETARCH
 ENV TARGETARCH $TARGETARCH
 ENV NODE_MAJOR 18

From 3956c83d974fc2150eff0d8da86dfa0785bd22b3 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Tue, 28 Nov 2023 10:22:44 +0000
Subject: [PATCH 5/8] Put singleimage base image back to budibase/couchdb.

---
 hosting/single/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile
index a1b93d7f1a..e9ff6c6596 100644
--- a/hosting/single/Dockerfile
+++ b/hosting/single/Dockerfile
@@ -39,7 +39,7 @@ COPY packages/worker/pm2.config.js packages/worker/pm2.config.js
 COPY packages/string-templates packages/string-templates
 
 
-FROM samwho/test as runner
+FROM budibase/couchdb as runner
 ARG TARGETARCH
 ENV TARGETARCH $TARGETARCH
 ENV NODE_MAJOR 18

From 9ac413a73fd0dcf858fdd92d21b96d381f79845b Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Tue, 28 Nov 2023 11:20:19 +0000
Subject: [PATCH 6/8] Remove healthcheck script for now.

---
 hosting/couchdb/Dockerfile     |  4 ----
 hosting/couchdb/healthcheck.sh | 13 -------------
 2 files changed, 17 deletions(-)
 delete mode 100644 hosting/couchdb/healthcheck.sh

diff --git a/hosting/couchdb/Dockerfile b/hosting/couchdb/Dockerfile
index 254a676f63..f83df7038b 100644
--- a/hosting/couchdb/Dockerfile
+++ b/hosting/couchdb/Dockerfile
@@ -29,10 +29,6 @@ WORKDIR /opt/couchdb
 ADD couch/vm.args couch/local.ini ./etc/
 
 WORKDIR /
-ADD healthcheck.sh ./healthcheck.sh
-RUN chmod +x ./healthcheck.sh
-HEALTHCHECK --interval=15s --timeout=15s --start-period=45s CMD "/healthcheck.sh"
-
 ADD runner.sh ./bbcouch-runner.sh
 RUN chmod +x ./bbcouch-runner.sh /opt/clouseau/bin/clouseau
 CMD ["./bbcouch-runner.sh"]
diff --git a/hosting/couchdb/healthcheck.sh b/hosting/couchdb/healthcheck.sh
deleted file mode 100644
index 758ee5111a..0000000000
--- a/hosting/couchdb/healthcheck.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-healthy=true
-
-if [[ $(curl -s -w "%{http_code}\n" http://localhost:5984/_up -o /dev/null) -ne 200 ]]; then
-    echo 'ERROR: CouchDB is not running';
-    healthy=false
-fi
-
-if [ $healthy == true ]; then
-  exit 0
-else
-  exit 1
-fi

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 7/8] 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 8/8] 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/*"