From ac2c63f9edadd7561c5e6e4ea12fecb49e4e0f7f Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 28 Sep 2023 16:02:37 +0100
Subject: [PATCH 01/67] use Relationship selector for external datasource
 relationships

---
 .../Datasources/CreateEditRelationship.svelte | 103 ++++++++++--------
 .../common/RelationshipSelector.svelte        |  26 +++--
 2 files changed, 76 insertions(+), 53 deletions(-)

diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
index 9c98bdc2e5..8b0cb5b7bb 100644
--- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
+++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
@@ -13,6 +13,8 @@
   import { Helpers } from "@budibase/bbui"
   import { RelationshipErrorChecker } from "./relationshipErrors"
   import { onMount } from "svelte"
+  import RelationshipSelector from "components/common/RelationshipSelector.svelte"
+  import { PrettyRelationshipDefinitions } from "constants/backend"
 
   export let save
   export let datasource
@@ -22,16 +24,18 @@
   export let selectedFromTable
   export let close
 
-  const relationshipTypes = [
-    {
-      label: "One to Many",
-      value: RelationshipType.MANY_TO_ONE,
+  let relationshipMap = {
+    [RelationshipType.MANY_TO_MANY]: {
+      part1: PrettyRelationshipDefinitions.MANY,
+      part2: PrettyRelationshipDefinitions.MANY,
     },
-    {
-      label: "Many to Many",
-      value: RelationshipType.MANY_TO_MANY,
+    [RelationshipType.MANY_TO_ONE]: {
+      part1: PrettyRelationshipDefinitions.ONE,
+      part2: PrettyRelationshipDefinitions.MANY,
     },
-  ]
+  }
+  let relationshipOpts1 = Object.values(PrettyRelationshipDefinitions)
+  let relationshipOpts2 = Object.values(PrettyRelationshipDefinitions)
 
   let originalFromColumnName = toRelationship.name,
     originalToColumnName = fromRelationship.name
@@ -49,14 +53,32 @@
   )
   let errors = {}
   let fromPrimary, fromForeign, fromColumn, toColumn
-  let fromId, toId, throughId, throughToKey, throughFromKey
+  $: fromId = null
+  $: toId = null
+
+  let throughId, throughToKey, throughFromKey
   let isManyToMany, isManyToOne, relationshipType
   let hasValidated = false
 
   $: tableOptions = plusTables.map(table => ({
     label: table.name,
     value: table._id,
+    name: table.name,
+    _id: table._id,
   }))
+
+  $: {
+    // Determine the relationship type based on the selected values of both parts
+    relationshipType = Object.entries(relationshipMap).find(
+      ([_, parts]) =>
+        parts.part1 === relationshipPart1 && parts.part2 === relationshipPart2
+    )?.[0]
+
+    changed(() => {
+      hasValidated = false
+    })
+  }
+  $: console.log(relationshipType)
   $: valid = getErrorCount(errors) === 0 && allRequiredAttributesSet()
   $: isManyToMany = relationshipType === RelationshipType.MANY_TO_MANY
   $: isManyToOne = relationshipType === RelationshipType.MANY_TO_ONE
@@ -328,6 +350,8 @@
       fromPrimary = selectedFromTable?.primary[0] || null
     }
   })
+  let relationshipPart1 = PrettyRelationshipDefinitions.MANY
+  let relationshipPart2 = PrettyRelationshipDefinitions.ONE
 </script>
 
 <ModalContent
@@ -336,33 +360,34 @@
   onConfirm={saveRelationship}
   disabled={!valid}
 >
-  <Select
-    label="Relationship type"
-    options={relationshipTypes}
-    bind:value={relationshipType}
-    bind:error={errors.relationshipType}
-    on:change={() =>
-      changed(() => {
-        hasValidated = false
-      })}
-  />
   <div class="headings">
     <Detail>Tables</Detail>
   </div>
-  {#if !selectedFromTable}
-    <Select
-      label="Select from table"
-      options={tableOptions}
-      bind:value={fromId}
-      bind:error={errors.fromTable}
-      on:change={e =>
-        changed(() => {
-          const table = plusTables.find(tbl => tbl._id === e.detail)
-          fromColumn = table?.name || ""
-          fromPrimary = table?.primary?.[0]
-        })}
-    />
-  {/if}
+
+  <RelationshipSelector
+    bind:relationshipPart1
+    bind:relationshipPart2
+    {relationshipOpts1}
+    {relationshipOpts2}
+    bind:relationshipTableIdPrimary={fromId}
+    bind:relationshipTableIdSecondary={toId}
+    {tableOptions}
+    {errors}
+    primaryDisabled={selectedFromTable}
+    primaryTableChanged={e =>
+      changed(() => {
+        const table = plusTables.find(tbl => tbl._id === e.detail)
+        fromColumn = table?.name || ""
+        fromPrimary = table?.primary?.[0]
+      })}
+    secondaryTableChanged={e =>
+      changed(() => {
+        const table = plusTables.find(tbl => tbl._id === e.detail)
+        toColumn = table.name || ""
+        fromForeign = null
+      })}
+  />
+
   {#if isManyToOne && fromId}
     <Select
       label={`Primary Key (${getTable(fromId).name})`}
@@ -372,18 +397,6 @@
       on:change={changed}
     />
   {/if}
-  <Select
-    label={"Select to table"}
-    options={tableOptions}
-    bind:value={toId}
-    bind:error={errors.toTable}
-    on:change={e =>
-      changed(() => {
-        const table = plusTables.find(tbl => tbl._id === e.detail)
-        toColumn = table.name || ""
-        fromForeign = null
-      })}
-  />
   {#if isManyToMany}
     <Select
       label={"Through"}
diff --git a/packages/builder/src/components/common/RelationshipSelector.svelte b/packages/builder/src/components/common/RelationshipSelector.svelte
index 787a6106c7..0636deaf08 100644
--- a/packages/builder/src/components/common/RelationshipSelector.svelte
+++ b/packages/builder/src/components/common/RelationshipSelector.svelte
@@ -6,11 +6,14 @@
   export let relationshipTableIdPrimary
   export let relationshipTableIdSecondary
   export let editableColumn
-  export let linkEditDisabled
+  export let linkEditDisabled = false
   export let tableOptions
   export let errors
   export let relationshipOpts1
   export let relationshipOpts2
+  export let primaryTableChanged
+  export let secondaryTableChanged
+  export let primaryDisabled = true
 </script>
 
 <div class="relationship-container">
@@ -19,16 +22,19 @@
       disabled={linkEditDisabled}
       bind:value={relationshipPart1}
       options={relationshipOpts1}
+      bind:error={errors.relationshipType}
     />
   </div>
   <div class="relationship-label">in</div>
   <div class="relationship-part">
     <Select
-      disabled
+      disabled={primaryDisabled}
       options={tableOptions}
       getOptionLabel={table => table.name}
       getOptionValue={table => table._id}
       bind:value={relationshipTableIdPrimary}
+      on:change={primaryTableChanged}
+      bind:error={errors.fromTable}
     />
   </div>
 </div>
@@ -46,20 +52,24 @@
     <Select
       disabled={linkEditDisabled}
       bind:value={relationshipTableIdSecondary}
+      bind:error={errors.toTable}
       options={tableOptions.filter(
         table => table._id !== relationshipTableIdPrimary
       )}
       getOptionLabel={table => table.name}
       getOptionValue={table => table._id}
+      on:change={secondaryTableChanged}
     />
   </div>
 </div>
-<Input
-  disabled={linkEditDisabled}
-  label={`Column name in other table`}
-  bind:value={editableColumn.fieldName}
-  error={errors.relatedName}
-/>
+{#if editableColumn}
+  <Input
+    disabled={linkEditDisabled}
+    label={`Column name in other table`}
+    bind:value={editableColumn.fieldName}
+    error={errors.relatedName}
+  />
+{/if}
 
 <style>
   .relationship-container {

From c6442efcabe91dc68218cd8134a344f731836e1f Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 28 Sep 2023 16:29:45 +0100
Subject: [PATCH 02/67] tidy up

---
 .../Datasources/CreateEditRelationship.svelte     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
index 8b0cb5b7bb..f5be7a24eb 100644
--- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
+++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
@@ -37,6 +37,9 @@
   let relationshipOpts1 = Object.values(PrettyRelationshipDefinitions)
   let relationshipOpts2 = Object.values(PrettyRelationshipDefinitions)
 
+  let relationshipPart1 = PrettyRelationshipDefinitions.MANY
+  let relationshipPart2 = PrettyRelationshipDefinitions.ONE
+
   let originalFromColumnName = toRelationship.name,
     originalToColumnName = fromRelationship.name
   let originalFromTable = plusTables.find(
@@ -53,13 +56,14 @@
   )
   let errors = {}
   let fromPrimary, fromForeign, fromColumn, toColumn
-  $: fromId = null
-  $: toId = null
 
   let throughId, throughToKey, throughFromKey
   let isManyToMany, isManyToOne, relationshipType
   let hasValidated = false
 
+  $: fromId = null
+  $: toId = null
+
   $: tableOptions = plusTables.map(table => ({
     label: table.name,
     value: table._id,
@@ -78,7 +82,6 @@
       hasValidated = false
     })
   }
-  $: console.log(relationshipType)
   $: valid = getErrorCount(errors) === 0 && allRequiredAttributesSet()
   $: isManyToMany = relationshipType === RelationshipType.MANY_TO_MANY
   $: isManyToOne = relationshipType === RelationshipType.MANY_TO_ONE
@@ -350,8 +353,6 @@
       fromPrimary = selectedFromTable?.primary[0] || null
     }
   })
-  let relationshipPart1 = PrettyRelationshipDefinitions.MANY
-  let relationshipPart2 = PrettyRelationshipDefinitions.ONE
 </script>
 
 <ModalContent
@@ -367,10 +368,10 @@
   <RelationshipSelector
     bind:relationshipPart1
     bind:relationshipPart2
-    {relationshipOpts1}
-    {relationshipOpts2}
     bind:relationshipTableIdPrimary={fromId}
     bind:relationshipTableIdSecondary={toId}
+    {relationshipOpts1}
+    {relationshipOpts2}
     {tableOptions}
     {errors}
     primaryDisabled={selectedFromTable}

From 0912720f1966c321dbe9ab3e19ed103c6b800dd1 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 2 Oct 2023 15:43:32 +0100
Subject: [PATCH 03/67] Quick fix for built PKG CLI version, make sure
 prebuilds are loaded correctly.

---
 packages/cli/src/prebuilds.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/prebuilds.ts b/packages/cli/src/prebuilds.ts
index 21f3042274..561f9be474 100644
--- a/packages/cli/src/prebuilds.ts
+++ b/packages/cli/src/prebuilds.ts
@@ -12,6 +12,10 @@ if (!process.argv[0].includes("node")) {
   checkForBinaries()
 }
 
+function localPrebuildPath() {
+  return join(process.execPath, "..", PREBUILDS)
+}
+
 function checkForBinaries() {
   const readDir = join(__filename, "..", "..", "..", "cli", PREBUILDS, ARCH)
   if (fs.existsSync(PREBUILD_DIR) || !fs.existsSync(readDir)) {
@@ -19,17 +23,21 @@ function checkForBinaries() {
   }
   const natives = fs.readdirSync(readDir)
   if (fs.existsSync(readDir)) {
-    const writePath = join(process.execPath, PREBUILDS, ARCH)
+    const writePath = join(localPrebuildPath(), ARCH)
     fs.mkdirSync(writePath, { recursive: true })
     for (let native of natives) {
       const filename = `${native.split(".fake")[0]}.node`
       fs.cpSync(join(readDir, native), join(writePath, filename))
     }
-    console.log("copied something")
   }
 }
 
 function cleanup(evt?: number) {
+  // cleanup prebuilds first
+  const path = localPrebuildPath()
+  if (fs.existsSync(path)) {
+    fs.rmSync(path, { recursive: true })
+  }
   if (evt && !isNaN(evt)) {
     return
   }
@@ -41,10 +49,6 @@ function cleanup(evt?: number) {
     )
     console.error(error(evt))
   }
-  const path = join(process.execPath, PREBUILDS)
-  if (fs.existsSync(path)) {
-    fs.rmSync(path, { recursive: true })
-  }
 }
 
 const events = ["exit", "SIGINT", "SIGUSR1", "SIGUSR2", "uncaughtException"]

From b291633c79ab0ab1b1a032f39449c62eb4f693f4 Mon Sep 17 00:00:00 2001
From: melohagan <101575380+melohagan@users.noreply.github.com>
Date: Tue, 3 Oct 2023 10:19:19 +0100
Subject: [PATCH 04/67] Don't use DrawerBindableSlot in test modal (#11959)

---
 .../automation/SetupPanel/RowSelector.svelte  | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index c3097f3072..289f2e20be 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -110,20 +110,7 @@
   <div class="schema-fields">
     {#each schemaFields as [field, schema]}
       {#if !schema.autocolumn && schema.type !== "attachment"}
-        <DrawerBindableSlot
-          fillWidth
-          title={value.title}
-          label={field}
-          panel={AutomationBindingPanel}
-          type={schema.type}
-          {schema}
-          value={value[field]}
-          on:change={e => onChange(e, field)}
-          {bindings}
-          allowJS={true}
-          updateOnChange={false}
-          drawerLeft="260px"
-        >
+        {#if isTestModal}
           <RowSelectorTypes
             {isTestModal}
             {field}
@@ -132,7 +119,31 @@
             {value}
             {onChange}
           />
-        </DrawerBindableSlot>
+        {:else}
+          <DrawerBindableSlot
+            fillWidth
+            title={value.title}
+            label={field}
+            panel={AutomationBindingPanel}
+            type={schema.type}
+            {schema}
+            value={value[field]}
+            on:change={e => onChange(e, field)}
+            {bindings}
+            allowJS={true}
+            updateOnChange={false}
+            drawerLeft="260px"
+          >
+            <RowSelectorTypes
+              {isTestModal}
+              {field}
+              {schema}
+              bindings={parsedBindings}
+              {value}
+              {onChange}
+            />
+          </DrawerBindableSlot>
+        {/if}
       {/if}
       {#if isUpdateRow && schema.type === "link"}
         <div class="checkbox-field">

From f15ae4a69e635219c29979592e505a1f807b6e3d Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 3 Oct 2023 09:19:40 +0000
Subject: [PATCH 05/67] Bump version to 2.11.5

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

diff --git a/lerna.json b/lerna.json
index 9f8538dfb0..9db24b9056 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.4",
+  "version": "2.11.5",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From af924ae4a26490d268c6a80bccd4888c6264a93b Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 12:01:15 +0200
Subject: [PATCH 06/67] Use types

---
 packages/shared-core/src/filters.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index 2cd6fa8c13..ce03503882 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -44,21 +44,21 @@ export const getValidOperatorsForType = (
     value: string
     label: string
   }[] = []
-  if (type === "string") {
+  if (type === FieldType.STRING) {
     ops = stringOps
-  } else if (type === "number" || type === "bigint") {
+  } else if (type === FieldType.NUMBER || type === FieldType.BIGINT) {
     ops = numOps
-  } else if (type === "options") {
+  } else if (type === FieldType.OPTIONS) {
     ops = [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.In]
-  } else if (type === "array") {
+  } else if (type === FieldType.ARRAY) {
     ops = [Op.Contains, Op.NotContains, Op.Empty, Op.NotEmpty, Op.ContainsAny]
-  } else if (type === "boolean") {
+  } else if (type === FieldType.BOOLEAN) {
     ops = [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty]
-  } else if (type === "longform") {
+  } else if (type === FieldType.LONGFORM) {
     ops = stringOps
-  } else if (type === "datetime") {
+  } else if (type === FieldType.DATETIME) {
     ops = numOps
-  } else if (type === "formula") {
+  } else if (type === FieldType.FORMULA) {
     ops = stringOps.concat([Op.MoreThan, Op.LessThan])
   }
 

From 8a8cc7773db5cc351609a19f89d8876ff45b9d3c Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 3 Oct 2023 10:35:05 +0000
Subject: [PATCH 07/67] Bump version to 2.11.6

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

diff --git a/lerna.json b/lerna.json
index 9db24b9056..ff74792a2d 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.5",
+  "version": "2.11.6",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 3b937483766cf95503bdad8069154f2524aeac8b Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 12:46:06 +0200
Subject: [PATCH 08/67] Filter user (single) UI

---
 .../controls/FilterEditor/FilterDrawer.svelte |  4 +++
 .../controls/FilterEditor/FilterUsers.svelte  | 28 +++++++++++++++++++
 packages/shared-core/src/filters.ts           |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index ef8699824e..513450b7ae 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -17,7 +17,9 @@
   import { generate } from "shortid"
   import { LuceneUtils, Constants } from "@budibase/frontend-core"
   import { getFields } from "helpers/searchFields"
+  import { FieldType } from "@budibase/types"
   import { createEventDispatcher, onMount } from "svelte"
+  import FilterUsers from "./FilterUsers.svelte"
 
   export let schemaFields
   export let filters = []
@@ -285,6 +287,8 @@
                   timeOnly={getSchema(filter)?.timeOnly}
                   bind:value={filter.value}
                 />
+              {:else if filter.type === FieldType.BB_REFERENCE}
+                <FilterUsers {filter} />
               {:else}
                 <DrawerBindableInput disabled />
               {/if}
diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
new file mode 100644
index 0000000000..56f23b9bef
--- /dev/null
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
@@ -0,0 +1,28 @@
+<script>
+  import { Select } from "@budibase/bbui"
+  import { fetchData } from "@budibase/frontend-core"
+
+  import { API } from "api"
+
+  export let filter
+
+  $: fetch = fetchData({
+    API,
+    datasource: {
+      type: "user",
+    },
+    options: {
+      limit: 100,
+    },
+  })
+
+  $: options = $fetch.rows
+</script>
+
+<Select
+  autocomplete
+  bind:value={filter.value}
+  {options}
+  getOptionLabel={option => option.email}
+  getOptionValue={option => option._id}
+/>
diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index ce03503882..6ab8ce623e 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -60,6 +60,8 @@ export const getValidOperatorsForType = (
     ops = numOps
   } else if (type === FieldType.FORMULA) {
     ops = stringOps.concat([Op.MoreThan, Op.LessThan])
+  } else if (type === FieldType.BB_REFERENCE) {
+    ops = [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.In]
   }
 
   // Only allow equal/not equal for _id in SQL tables

From 9b14f50e8f645d001bd550abed3fe46019610535 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 12:59:15 +0200
Subject: [PATCH 09/67] Apply filter

---
 .../design/settings/controls/FilterEditor/FilterDrawer.svelte | 2 +-
 .../design/settings/controls/FilterEditor/FilterUsers.svelte  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index 513450b7ae..c73c916a4f 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -288,7 +288,7 @@
                   bind:value={filter.value}
                 />
               {:else if filter.type === FieldType.BB_REFERENCE}
-                <FilterUsers {filter} />
+                <FilterUsers bind:value={filter.value} />
               {:else}
                 <DrawerBindableInput disabled />
               {/if}
diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
index 56f23b9bef..e776d87d56 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
@@ -4,7 +4,7 @@
 
   import { API } from "api"
 
-  export let filter
+  export let value = null
 
   $: fetch = fetchData({
     API,
@@ -21,7 +21,7 @@
 
 <Select
   autocomplete
-  bind:value={filter.value}
+  bind:value
   {options}
   getOptionLabel={option => option.email}
   getOptionValue={option => option._id}

From 0702bc6c336758ad95ff0c5f49027c533f426aca Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 13:10:53 +0200
Subject: [PATCH 10/67] Sanity filter on change

---
 .../controls/FilterEditor/FilterUsers.svelte        | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
index e776d87d56..ef3046eaf3 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
@@ -5,6 +5,7 @@
   import { API } from "api"
 
   export let value = null
+  export let multiple = false
 
   $: fetch = fetchData({
     API,
@@ -17,11 +18,21 @@
   })
 
   $: options = $fetch.rows
+
+  function onChange(e) {
+    const val = e.detail
+    if (!val) {
+      value = val
+    } else {
+      value = Array.isArray(val) ? val : [val]
+    }
+  }
 </script>
 
 <Select
+  value={multiple ? value : value[0]}
   autocomplete
-  bind:value
+  on:change={onChange}
   {options}
   getOptionLabel={option => option.email}
   getOptionValue={option => option._id}

From f7e92992a8c5d12a33fa057b34578258feda2c8c Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 13:12:50 +0200
Subject: [PATCH 11/67] Fix error

---
 .../design/settings/controls/FilterEditor/FilterUsers.svelte  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
index ef3046eaf3..2d363add41 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
@@ -27,10 +27,12 @@
       value = Array.isArray(val) ? val : [val]
     }
   }
+
+  $: selectedValue = multiple || !value ? value : value[0]
 </script>
 
 <Select
-  value={multiple ? value : value[0]}
+  value={selectedValue}
   autocomplete
   on:change={onChange}
   {options}

From 4577ba823936a1315f05866832f48082afaf7fd7 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 13:19:28 +0200
Subject: [PATCH 12/67] Change filters

---
 packages/shared-core/src/filters.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index 6ab8ce623e..57add48ebd 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -61,7 +61,15 @@ export const getValidOperatorsForType = (
   } else if (type === FieldType.FORMULA) {
     ops = stringOps.concat([Op.MoreThan, Op.LessThan])
   } else if (type === FieldType.BB_REFERENCE) {
-    ops = [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.In]
+    ops = [
+      Op.Equals,
+      Op.NotEquals,
+      Op.Empty,
+      Op.NotEmpty,
+      Op.Contains,
+      Op.NotContains,
+      Op.ContainsAny,
+    ]
   }
 
   // Only allow equal/not equal for _id in SQL tables

From 2367ceeb8749d3392e080ad6f8313d8b4234961b Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 13:25:56 +0200
Subject: [PATCH 13/67] Disable when noValue

---
 .../settings/controls/FilterEditor/FilterDrawer.svelte       | 5 ++++-
 .../design/settings/controls/FilterEditor/FilterUsers.svelte | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index c73c916a4f..48e8e504c2 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -288,7 +288,10 @@
                   bind:value={filter.value}
                 />
               {:else if filter.type === FieldType.BB_REFERENCE}
-                <FilterUsers bind:value={filter.value} />
+                <FilterUsers
+                  bind:value={filter.value}
+                  disabled={filter.noValue}
+                />
               {:else}
                 <DrawerBindableInput disabled />
               {/if}
diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
index 2d363add41..2d804ce189 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
@@ -5,6 +5,7 @@
   import { API } from "api"
 
   export let value = null
+  export let disabled
   export let multiple = false
 
   $: fetch = fetchData({
@@ -38,4 +39,5 @@
   {options}
   getOptionLabel={option => option.email}
   getOptionValue={option => option._id}
+  {disabled}
 />

From 0834d33f9a990288447e471241e1f291aba5c431 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 13:43:42 +0200
Subject: [PATCH 14/67] Remove none array operators

---
 .../controls/FilterEditor/FilterDrawer.svelte | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index 48e8e504c2..bc2511779c 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -20,6 +20,7 @@
   import { FieldType } from "@budibase/types"
   import { createEventDispatcher, onMount } from "svelte"
   import FilterUsers from "./FilterUsers.svelte"
+  import { RelationshipType } from "constants/backend"
 
   export let schemaFields
   export let filters = []
@@ -31,7 +32,6 @@
 
   const dispatch = createEventDispatcher()
   const { OperatorOptions } = Constants
-  const { getValidOperatorsForType } = LuceneUtils
   const KeyedFieldRegex = /\d[0-9]*:/g
   const behaviourOptions = [
     { value: "and", label: "Match all filters" },
@@ -133,11 +133,7 @@
 
   const santizeOperator = filter => {
     // Ensure a valid operator is selected
-    const operators = getValidOperatorsForType(
-      filter.type,
-      filter.field,
-      datasource
-    ).map(x => x.value)
+    const operators = getValidOperatorsForType(filter).map(x => x.value)
     if (!operators.includes(filter.operator)) {
       filter.operator = operators[0] ?? OperatorOptions.Equals.value
     }
@@ -186,6 +182,30 @@
     const schema = enrichedSchemaFields.find(x => x.name === field)
     return schema?.constraints?.inclusion || []
   }
+
+  const getValidOperatorsForType = filter => {
+    let operators = LuceneUtils.getValidOperatorsForType(
+      filter.type,
+      filter.field,
+      datasource
+    )
+
+    const fieldSchema = getSchema(filter)
+    if (
+      fieldSchema.type === FieldType.BB_REFERENCE &&
+      fieldSchema.relationshipType !== RelationshipType.MANY_TO_MANY
+    ) {
+      operators = operators.filter(
+        o =>
+          ![
+            OperatorOptions.Contains.value,
+            OperatorOptions.NotContains.value,
+          ].includes(o.value)
+      )
+    }
+
+    return operators
+  }
 </script>
 
 <DrawerContent>
@@ -230,11 +250,7 @@
               />
               <Select
                 disabled={!filter.field}
-                options={getValidOperatorsForType(
-                  filter.type,
-                  filter.field,
-                  datasource
-                )}
+                options={getValidOperatorsForType(filter)}
                 bind:value={filter.operator}
                 on:change={() => onOperatorChange(filter)}
                 placeholder={null}

From 614bbb0412fd8b38b79199b50e627ce0407a2361 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 13:51:06 +0200
Subject: [PATCH 15/67] Handle has any

---
 .../controls/FilterEditor/FilterDrawer.svelte         |  2 ++
 .../settings/controls/FilterEditor/FilterUsers.svelte | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index bc2511779c..7ed7252af0 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -306,6 +306,8 @@
               {:else if filter.type === FieldType.BB_REFERENCE}
                 <FilterUsers
                   bind:value={filter.value}
+                  multiselect={filter.operator ===
+                    OperatorOptions.ContainsAny.value}
                   disabled={filter.noValue}
                 />
               {:else}
diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
index 2d804ce189..a25493fd0a 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
@@ -1,12 +1,12 @@
 <script>
-  import { Select } from "@budibase/bbui"
+  import { Select, Multiselect } from "@budibase/bbui"
   import { fetchData } from "@budibase/frontend-core"
 
   import { API } from "api"
 
   export let value = null
   export let disabled
-  export let multiple = false
+  export let multiselect = false
 
   $: fetch = fetchData({
     API,
@@ -29,10 +29,13 @@
     }
   }
 
-  $: selectedValue = multiple || !value ? value : value[0]
+  $: selectedValue = multiselect || !value ? value : value[0]
+
+  $: component = multiselect ? Multiselect : Select
 </script>
 
-<Select
+<svelte:component
+  this={component}
   value={selectedValue}
   autocomplete
   on:change={onChange}

From b2429e1fe0a61c955e41f6fa395b7f7a59282675 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 14:05:25 +0200
Subject: [PATCH 16/67] Allow selecting many for many-to-many

---
 .../settings/controls/FilterEditor/FilterDrawer.svelte       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index 7ed7252af0..dca6cd9294 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -306,8 +306,9 @@
               {:else if filter.type === FieldType.BB_REFERENCE}
                 <FilterUsers
                   bind:value={filter.value}
-                  multiselect={filter.operator ===
-                    OperatorOptions.ContainsAny.value}
+                  multiselect={getSchema(filter).relationshipType ===
+                    RelationshipType.MANY_TO_MANY ||
+                    filter.operator === OperatorOptions.ContainsAny.value}
                   disabled={filter.noValue}
                 />
               {:else}

From c84d2449f2f306e7859bf868f0eda5178518f367 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 14:26:12 +0200
Subject: [PATCH 17/67] Smarter getValidOperatorsForType

---
 .../controls/FilterEditor/FilterDrawer.svelte | 26 ++++++++---------
 packages/shared-core/src/filters.ts           | 28 +++++++++++--------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index dca6cd9294..5d56b131b0 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -184,26 +184,22 @@
   }
 
   const getValidOperatorsForType = filter => {
+    const fieldSchema = getSchema(filter)
+    const type =
+      fieldSchema.type !== FieldType.BB_REFERENCE
+        ? field.type
+        : {
+            type: fieldSchema.type,
+            multiple:
+              fieldSchema.relationshipType === RelationshipType.MANY_TO_MANY,
+          }
+
     let operators = LuceneUtils.getValidOperatorsForType(
-      filter.type,
+      type,
       filter.field,
       datasource
     )
 
-    const fieldSchema = getSchema(filter)
-    if (
-      fieldSchema.type === FieldType.BB_REFERENCE &&
-      fieldSchema.relationshipType !== RelationshipType.MANY_TO_MANY
-    ) {
-      operators = operators.filter(
-        o =>
-          ![
-            OperatorOptions.Contains.value,
-            OperatorOptions.NotContains.value,
-          ].includes(o.value)
-      )
-    }
-
     return operators
   }
 </script>
diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index 57add48ebd..7ed2a9f49a 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -12,12 +12,22 @@ import { deepGet } from "./helpers"
 
 const HBS_REGEX = /{{([^{].*?)}}/g
 
+type RequestedFieldType =
+  | Exclude<FieldType, FieldType.BB_REFERENCE>
+  | { type: FieldType.BB_REFERENCE; multiple: boolean }
+
+export function isFieldType(
+  r: RequestedFieldType
+): r is Exclude<FieldType, FieldType.BB_REFERENCE> {
+  return typeof r === "string" && Object.values(FieldType).includes(r)
+}
+
 /**
  * Returns the valid operator options for a certain data type
  * @param type the data type
  */
 export const getValidOperatorsForType = (
-  type: FieldType,
+  type: RequestedFieldType,
   field: string,
   datasource: Datasource & { tableId: any } // TODO: is this table id ever populated?
 ) => {
@@ -60,16 +70,12 @@ export const getValidOperatorsForType = (
     ops = numOps
   } else if (type === FieldType.FORMULA) {
     ops = stringOps.concat([Op.MoreThan, Op.LessThan])
-  } else if (type === FieldType.BB_REFERENCE) {
-    ops = [
-      Op.Equals,
-      Op.NotEquals,
-      Op.Empty,
-      Op.NotEmpty,
-      Op.Contains,
-      Op.NotContains,
-      Op.ContainsAny,
-    ]
+  } else if (!isFieldType(type) && type.type === FieldType.BB_REFERENCE) {
+    if (type.multiple) {
+      ops = [Op.Contains, Op.NotContains, Op.ContainsAny, Op.Empty, Op.NotEmpty]
+    } else {
+      ops = [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.ContainsAny]
+    }
   }
 
   // Only allow equal/not equal for _id in SQL tables

From 28d5fe37deebcc47b32a8f1a5d9d909e736b7d56 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 15:26:41 +0200
Subject: [PATCH 18/67] Fix postgres docker-compose integration to 15

---
 .../server/scripts/integrations/postgres/docker-compose.yml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/scripts/integrations/postgres/docker-compose.yml b/packages/server/scripts/integrations/postgres/docker-compose.yml
index d682ad7361..88efd0301d 100644
--- a/packages/server/scripts/integrations/postgres/docker-compose.yml
+++ b/packages/server/scripts/integrations/postgres/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.8"
 services:
   db:
     container_name: postgres
-    image: postgres
+    image: postgres:15
     restart: unless-stopped
     environment:
       POSTGRES_USER: root
@@ -25,4 +25,4 @@ services:
       - "5050:80"
 
 volumes:
- pg_data:
+  pg_data:

From 0053103974e56416b8809ddb2285e40594ae5426 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 15:41:00 +0200
Subject: [PATCH 19/67] Fix external

---
 .../design/settings/controls/FilterEditor/FilterDrawer.svelte | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index 5d56b131b0..32409844be 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -185,6 +185,10 @@
 
   const getValidOperatorsForType = filter => {
     const fieldSchema = getSchema(filter)
+    if (!fieldSchema) {
+      return []
+    }
+
     const type =
       fieldSchema.type !== FieldType.BB_REFERENCE
         ? field.type

From dbd5f7a134eea3e2c95271fcc9e9ecb3de9a1262 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 16:58:39 +0200
Subject: [PATCH 20/67] In instead of ContainsAny

---
 packages/shared-core/src/filters.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index 7ed2a9f49a..c851d11079 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -74,7 +74,7 @@ export const getValidOperatorsForType = (
     if (type.multiple) {
       ops = [Op.Contains, Op.NotContains, Op.ContainsAny, Op.Empty, Op.NotEmpty]
     } else {
-      ops = [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.ContainsAny]
+      ops = [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.In]
     }
   }
 

From 8ebf473ab211800adb353cbd730c2ceecf07dc38 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 16:58:49 +0200
Subject: [PATCH 21/67] Disable multiple users for now

---
 .../backend/DataTable/modals/CreateEditColumn.svelte         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index c67ce67d57..8233278e58 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -660,7 +660,8 @@
       >Open schema editor</Button
     >
   {:else if editableColumn.type === USER_REFRENCE_TYPE}
-    <Toggle
+    <!-- Disabled temporally -->
+    <!-- <Toggle
       value={editableColumn.relationshipType === RelationshipType.MANY_TO_MANY}
       on:change={e =>
         (editableColumn.relationshipType = e.detail
@@ -669,7 +670,7 @@
       disabled={!isCreating}
       thin
       text="Allow multiple users"
-    />
+    /> -->
   {/if}
   {#if editableColumn.type === AUTO_TYPE || editableColumn.autocolumn}
     <Select

From da95c32a0c6a753472619d3bd541f1aa532f8400 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 17:06:17 +0200
Subject: [PATCH 22/67] Simplify code

---
 .../controls/FilterEditor/FilterDrawer.svelte      |  2 +-
 .../controls/FilterEditor/FilterUsers.svelte       | 14 +-------------
 packages/shared-core/src/filters.ts                |  3 ++-
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index 32409844be..cb1038a6db 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -308,7 +308,7 @@
                   bind:value={filter.value}
                   multiselect={getSchema(filter).relationshipType ===
                     RelationshipType.MANY_TO_MANY ||
-                    filter.operator === OperatorOptions.ContainsAny.value}
+                    filter.operator === OperatorOptions.In.value}
                   disabled={filter.noValue}
                 />
               {:else}
diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
index a25493fd0a..88383ba170 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
@@ -20,25 +20,13 @@
 
   $: options = $fetch.rows
 
-  function onChange(e) {
-    const val = e.detail
-    if (!val) {
-      value = val
-    } else {
-      value = Array.isArray(val) ? val : [val]
-    }
-  }
-
-  $: selectedValue = multiselect || !value ? value : value[0]
-
   $: component = multiselect ? Multiselect : Select
 </script>
 
 <svelte:component
   this={component}
-  value={selectedValue}
+  bind:value
   autocomplete
-  on:change={onChange}
   {options}
   getOptionLabel={option => option.email}
   getOptionValue={option => option._id}
diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index c851d11079..9f883d8f25 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -72,7 +72,8 @@ export const getValidOperatorsForType = (
     ops = stringOps.concat([Op.MoreThan, Op.LessThan])
   } else if (!isFieldType(type) && type.type === FieldType.BB_REFERENCE) {
     if (type.multiple) {
-      ops = [Op.Contains, Op.NotContains, Op.ContainsAny, Op.Empty, Op.NotEmpty]
+      // Temporally disabled
+      ops = []
     } else {
       ops = [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.In]
     }

From 83790bc3240655760dde4c93b548761a8b72be06 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 17:14:33 +0200
Subject: [PATCH 23/67] Lint

---
 .../design/settings/controls/FilterEditor/FilterDrawer.svelte   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index cb1038a6db..7c9b603069 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -198,7 +198,7 @@
               fieldSchema.relationshipType === RelationshipType.MANY_TO_MANY,
           }
 
-    let operators = LuceneUtils.getValidOperatorsForType(
+    const operators = LuceneUtils.getValidOperatorsForType(
       type,
       filter.field,
       datasource

From 0da029c8969bde4f7392fc2bc9d05a133598ef91 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 17:35:36 +0200
Subject: [PATCH 24/67] Sanitise field

---
 .../controls/FilterEditor/FilterDrawer.svelte | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index 7c9b603069..ab0c8d124e 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -146,7 +146,7 @@
     filter.noValue = noValueOptions.includes(filter.operator)
   }
 
-  const santizeValue = filter => {
+  const santizeValue = (filter, previousType) => {
     // Check if the operator allows a value at all
     if (filter.noValue) {
       filter.value = null
@@ -160,13 +160,20 @@
       }
     } else if (filter.type === "array" && filter.valueType === "Value") {
       filter.value = []
+    } else if (
+      previousType !== filter.type &&
+      previousType === FieldType.BB_REFERENCE &&
+      filter.type === FieldType.BB_REFERENCE
+    ) {
+      filter.value = filter.type === "array" ? [] : null
     }
   }
 
   const onFieldChange = filter => {
+    const previousType = filter.type
     santizeTypes(filter)
     santizeOperator(filter)
-    santizeValue(filter)
+    santizeValue(filter, previousType)
   }
 
   const onOperatorChange = filter => {
@@ -185,18 +192,21 @@
 
   const getValidOperatorsForType = filter => {
     const fieldSchema = getSchema(filter)
-    if (!fieldSchema) {
+    if (!filter) {
       return []
     }
 
-    const type =
-      fieldSchema.type !== FieldType.BB_REFERENCE
-        ? field.type
-        : {
-            type: fieldSchema.type,
-            multiple:
-              fieldSchema.relationshipType === RelationshipType.MANY_TO_MANY,
-          }
+    let type = filter.type
+    if (type === FieldType.BB_REFERENCE) {
+      const fieldSchema = getSchema(filter)
+      if (fieldSchema) {
+        type = {
+          type: fieldSchema.type,
+          multiple:
+            fieldSchema.relationshipType === RelationshipType.MANY_TO_MANY,
+        }
+      }
+    }
 
     const operators = LuceneUtils.getValidOperatorsForType(
       type,

From 3f37416016b0f9e84c50d29dfb8ca167d3a11724 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 17:35:40 +0200
Subject: [PATCH 25/67] Sanitise field

---
 .../design/settings/controls/FilterEditor/FilterDrawer.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index ab0c8d124e..939a56b769 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -162,8 +162,8 @@
       filter.value = []
     } else if (
       previousType !== filter.type &&
-      previousType === FieldType.BB_REFERENCE &&
-      filter.type === FieldType.BB_REFERENCE
+      (previousType === FieldType.BB_REFERENCE ||
+        filter.type === FieldType.BB_REFERENCE)
     ) {
       filter.value = filter.type === "array" ? [] : null
     }

From 2c4963876672a89f7d27aa1920cf2c5f2f0e9f83 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 17:37:14 +0200
Subject: [PATCH 26/67] Lint

---
 .../design/settings/controls/FilterEditor/FilterDrawer.svelte    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index 939a56b769..32211212d0 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -191,7 +191,6 @@
   }
 
   const getValidOperatorsForType = filter => {
-    const fieldSchema = getSchema(filter)
     if (!filter) {
       return []
     }

From 07dd0bc1ae5510957b63934c7ab74f149835e0aa Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 3 Oct 2023 15:47:48 +0000
Subject: [PATCH 27/67] Bump version to 2.11.7

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

diff --git a/lerna.json b/lerna.json
index ff74792a2d..ef2c878894 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.6",
+  "version": "2.11.7",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 02bfaa4378bcac6462ef1957a74a8276cfeeeb5f Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 18:29:35 +0200
Subject: [PATCH 28/67] Clean multiple user checks to simplify

---
 .../controls/FilterEditor/FilterDrawer.svelte | 14 +------------
 packages/shared-core/src/filters.ts           | 21 +++----------------
 2 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index 32211212d0..42a9d5773e 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -195,20 +195,8 @@
       return []
     }
 
-    let type = filter.type
-    if (type === FieldType.BB_REFERENCE) {
-      const fieldSchema = getSchema(filter)
-      if (fieldSchema) {
-        type = {
-          type: fieldSchema.type,
-          multiple:
-            fieldSchema.relationshipType === RelationshipType.MANY_TO_MANY,
-        }
-      }
-    }
-
     const operators = LuceneUtils.getValidOperatorsForType(
-      type,
+      filter.type,
       filter.field,
       datasource
     )
diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index 9f883d8f25..6ab8ce623e 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -12,22 +12,12 @@ import { deepGet } from "./helpers"
 
 const HBS_REGEX = /{{([^{].*?)}}/g
 
-type RequestedFieldType =
-  | Exclude<FieldType, FieldType.BB_REFERENCE>
-  | { type: FieldType.BB_REFERENCE; multiple: boolean }
-
-export function isFieldType(
-  r: RequestedFieldType
-): r is Exclude<FieldType, FieldType.BB_REFERENCE> {
-  return typeof r === "string" && Object.values(FieldType).includes(r)
-}
-
 /**
  * Returns the valid operator options for a certain data type
  * @param type the data type
  */
 export const getValidOperatorsForType = (
-  type: RequestedFieldType,
+  type: FieldType,
   field: string,
   datasource: Datasource & { tableId: any } // TODO: is this table id ever populated?
 ) => {
@@ -70,13 +60,8 @@ export const getValidOperatorsForType = (
     ops = numOps
   } else if (type === FieldType.FORMULA) {
     ops = stringOps.concat([Op.MoreThan, Op.LessThan])
-  } else if (!isFieldType(type) && type.type === FieldType.BB_REFERENCE) {
-    if (type.multiple) {
-      // Temporally disabled
-      ops = []
-    } else {
-      ops = [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.In]
-    }
+  } else if (type === FieldType.BB_REFERENCE) {
+    ops = [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.In]
   }
 
   // Only allow equal/not equal for _id in SQL tables

From 2c20d0b7381c522350ce637350228a458c87908c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 3 Oct 2023 17:33:58 +0100
Subject: [PATCH 29/67] Spelling fix.

---
 .../controls/FilterEditor/FilterDrawer.svelte | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index 42a9d5773e..a31b5be38e 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -3,24 +3,24 @@
     Body,
     Button,
     Combobox,
-    Multiselect,
     DatePicker,
     DrawerContent,
     Icon,
     Input,
-    Layout,
-    Select,
     Label,
+    Layout,
+    Multiselect,
+    Select,
   } from "@budibase/bbui"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
-  import { generate } from "shortid"
-  import { LuceneUtils, Constants } from "@budibase/frontend-core"
-  import { getFields } from "helpers/searchFields"
-  import { FieldType } from "@budibase/types"
-  import { createEventDispatcher, onMount } from "svelte"
+  import {generate} from "shortid"
+  import {Constants, LuceneUtils} from "@budibase/frontend-core"
+  import {getFields} from "helpers/searchFields"
+  import {FieldType} from "@budibase/types"
+  import {createEventDispatcher, onMount} from "svelte"
   import FilterUsers from "./FilterUsers.svelte"
-  import { RelationshipType } from "constants/backend"
+  import {RelationshipType} from "constants/backend"
 
   export let schemaFields
   export let filters = []
@@ -122,7 +122,7 @@
     return enrichedSchemaFields.find(field => field.name === filter.field)
   }
 
-  const santizeTypes = filter => {
+  const sanitizeTypes = filter => {
     // Update type based on field
     const fieldSchema = enrichedSchemaFields.find(x => x.name === filter.field)
     filter.type = fieldSchema?.type
@@ -131,7 +131,7 @@
     filter.externalType = getSchema(filter)?.externalType
   }
 
-  const santizeOperator = filter => {
+  const sanitizeOperator = filter => {
     // Ensure a valid operator is selected
     const operators = getValidOperatorsForType(filter).map(x => x.value)
     if (!operators.includes(filter.operator)) {
@@ -146,7 +146,7 @@
     filter.noValue = noValueOptions.includes(filter.operator)
   }
 
-  const santizeValue = (filter, previousType) => {
+  const sanitizeValue = (filter, previousType) => {
     // Check if the operator allows a value at all
     if (filter.noValue) {
       filter.value = null
@@ -171,18 +171,18 @@
 
   const onFieldChange = filter => {
     const previousType = filter.type
-    santizeTypes(filter)
-    santizeOperator(filter)
-    santizeValue(filter, previousType)
+    sanitizeTypes(filter)
+    sanitizeOperator(filter)
+    sanitizeValue(filter, previousType)
   }
 
   const onOperatorChange = filter => {
-    santizeOperator(filter)
-    santizeValue(filter)
+    sanitizeOperator(filter)
+    sanitizeValue(filter)
   }
 
   const onValueTypeChange = filter => {
-    santizeValue(filter)
+    sanitizeValue(filter)
   }
 
   const getFieldOptions = field => {
@@ -195,13 +195,11 @@
       return []
     }
 
-    const operators = LuceneUtils.getValidOperatorsForType(
+    return LuceneUtils.getValidOperatorsForType(
       filter.type,
       filter.field,
       datasource
     )
-
-    return operators
   }
 </script>
 

From 5eacc9d93e0f02498ca9b943bb6a4152c5eaab91 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 3 Oct 2023 17:34:20 +0100
Subject: [PATCH 30/67] Lint fix.

---
 .../controls/FilterEditor/FilterDrawer.svelte        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index a31b5be38e..8f8697d9e9 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -14,13 +14,13 @@
   } from "@budibase/bbui"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
-  import {generate} from "shortid"
-  import {Constants, LuceneUtils} from "@budibase/frontend-core"
-  import {getFields} from "helpers/searchFields"
-  import {FieldType} from "@budibase/types"
-  import {createEventDispatcher, onMount} from "svelte"
+  import { generate } from "shortid"
+  import { Constants, LuceneUtils } from "@budibase/frontend-core"
+  import { getFields } from "helpers/searchFields"
+  import { FieldType } from "@budibase/types"
+  import { createEventDispatcher, onMount } from "svelte"
   import FilterUsers from "./FilterUsers.svelte"
-  import {RelationshipType} from "constants/backend"
+  import { RelationshipType } from "constants/backend"
 
   export let schemaFields
   export let filters = []

From e7b47d08bb98a69f6ccdd76689587f9ab87dc05b Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Oct 2023 18:36:58 +0200
Subject: [PATCH 31/67] Do not sanitize on operator change

---
 .../design/settings/controls/FilterEditor/FilterDrawer.svelte   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index 8f8697d9e9..822442fcea 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -178,7 +178,7 @@
 
   const onOperatorChange = filter => {
     sanitizeOperator(filter)
-    sanitizeValue(filter)
+    sanitizeValue(filter, filter.type)
   }
 
   const onValueTypeChange = filter => {

From 76dfcf29bab43f76989af9107d23b92f2ca5c41b Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 3 Oct 2023 16:55:56 +0000
Subject: [PATCH 32/67] Bump version to 2.11.8

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

diff --git a/lerna.json b/lerna.json
index ef2c878894..a41c7cf2d9 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.7",
+  "version": "2.11.8",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 4df2f622db86400aa74735c82f198fb11439c2fe Mon Sep 17 00:00:00 2001
From: melohagan <101575380+melohagan@users.noreply.github.com>
Date: Tue, 3 Oct 2023 20:55:53 +0100
Subject: [PATCH 33/67] Do not re-initialise options if changed (#11964)

* Do not re-initialise options if changed

* Init options onMount
---
 .../bbui/src/OptionSelectDnD/OptionSelectDnD.svelte | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte b/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte
index f64a51ade4..8b13135b33 100644
--- a/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte
+++ b/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte
@@ -21,14 +21,6 @@
     "hsla(240, 90%, 75%, 0.3)",
     "hsla(320, 90%, 75%, 0.3)",
   ]
-  $: {
-    if (constraints.inclusion.length) {
-      options = constraints.inclusion.map(value => ({
-        name: value,
-        id: Math.random(),
-      }))
-    }
-  }
   const removeInput = idx => {
     delete optionColors[options[idx].name]
     constraints.inclusion = constraints.inclusion.filter((e, i) => i !== idx)
@@ -80,6 +72,11 @@
     // Initialize anchor arrays on mount, assuming 'options' is already populated
     colorPopovers = constraints.inclusion.map(() => undefined)
     anchors = constraints.inclusion.map(() => undefined)
+
+    options = constraints.inclusion.map(value => ({
+      name: value,
+      id: Math.random(),
+    }))
   })
 </script>
 

From 96b077f8a51ba95449924b2a06fe08412c091b5f Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 3 Oct 2023 19:56:13 +0000
Subject: [PATCH 34/67] Bump version to 2.11.9

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

diff --git a/lerna.json b/lerna.json
index a41c7cf2d9..8e9e1c548a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.8",
+  "version": "2.11.9",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 63306d350964e836af228654527b1e6af3d97ce6 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 4 Oct 2023 12:20:19 +0200
Subject: [PATCH 35/67] Fix filtering pg datasource

---
 .../backend/DataTable/buttons/TableFilterButton.svelte    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
index 23f6d1dea1..91456da655 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
@@ -13,7 +13,13 @@
   let modal
 
   $: tempValue = filters || []
-  $: schemaFields = Object.values(schema || {})
+  $: schemaFields = Object.entries(schema || {}).map(
+    ([fieldName, fieldSchema]) => ({
+      name: fieldName, // Using the key as name if not defined in the schema, for example in some autogenerated columns
+      ...fieldSchema,
+    })
+  )
+
   $: text = getText(filters)
   $: selected = tempValue.filter(x => !x.onEmptyFilter)?.length > 0
 

From 4bbd575cb0199236205923a0c4e41a0f6977c1a2 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 4 Oct 2023 15:00:11 +0000
Subject: [PATCH 36/67] Bump version to 2.11.10

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

diff --git a/lerna.json b/lerna.json
index 8e9e1c548a..aa2399aaab 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.9",
+  "version": "2.11.10",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 5810529350f6037fcd8bf5f9a84795ce91df9eae Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 5 Oct 2023 23:03:34 +0100
Subject: [PATCH 37/67] Quick fix for #11982 - check for both deprecated
 docker-compose and docker compose V2.

---
 packages/cli/src/hosting/utils.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/hosting/utils.ts b/packages/cli/src/hosting/utils.ts
index 93e31b8aea..a4b28539e9 100644
--- a/packages/cli/src/hosting/utils.ts
+++ b/packages/cli/src/hosting/utils.ts
@@ -57,7 +57,8 @@ export async function checkDockerConfigured() {
     "docker/docker-compose has not been installed, please follow instructions at: https://docs.budibase.com/docs/docker-compose"
   const docker = await lookpath("docker")
   const compose = await lookpath("docker-compose")
-  if (!docker || !compose) {
+  const composeV2 = await lookpath("docker compose")
+  if (!docker || (!compose && !composeV2)) {
     throw error
   }
 }

From 3de8c531667ab04725e3de114100fefde66bc368 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 6 Oct 2023 11:57:11 +0100
Subject: [PATCH 38/67] Adding a mapping layer to search queries so that we can
 map search inputs based on the table schema if desired - primarily for the
 user column.

---
 .../controls/FilterEditor/FilterDrawer.svelte |  2 +-
 .../src/sdk/app/rows/search/external.ts       |  5 +-
 .../src/sdk/app/rows/search/internal.ts       |  6 +--
 .../sdk/app/rows/search/tests/utils.spec.ts   | 49 +++++++++++++++++
 .../server/src/sdk/app/rows/search/utils.ts   | 53 +++++++++++++++++++
 packages/shared-core/src/filters.ts           |  1 -
 6 files changed, 110 insertions(+), 6 deletions(-)
 create mode 100644 packages/server/src/sdk/app/rows/search/tests/utils.spec.ts
 create mode 100644 packages/server/src/sdk/app/rows/search/utils.ts

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index 822442fcea..c03085e66f 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -191,7 +191,7 @@
   }
 
   const getValidOperatorsForType = filter => {
-    if (!filter) {
+    if (!filter.field) {
       return []
     }
 
diff --git a/packages/server/src/sdk/app/rows/search/external.ts b/packages/server/src/sdk/app/rows/search/external.ts
index f908be0b3c..8dd141f8ef 100644
--- a/packages/server/src/sdk/app/rows/search/external.ts
+++ b/packages/server/src/sdk/app/rows/search/external.ts
@@ -16,6 +16,7 @@ import { cleanExportRows } from "../utils"
 import { utils } from "@budibase/shared-core"
 import { ExportRowsParams, ExportRowsResult } from "../search"
 import { HTTPError, db } from "@budibase/backend-core"
+import { searchInputMapping } from "./utils"
 import pick from "lodash/pick"
 import { outputProcessing } from "../../../../utilities/rowProcessor"
 
@@ -50,7 +51,10 @@ export async function search(options: SearchParams) {
       [params.sort]: { direction },
     }
   }
+
   try {
+    const table = await sdk.tables.getTable(tableId)
+    options = searchInputMapping(table, options)
     let rows = (await handleRequest(Operation.READ, tableId, {
       filters: query,
       sort,
@@ -76,7 +80,6 @@ export async function search(options: SearchParams) {
       rows = rows.map((r: any) => pick(r, fields))
     }
 
-    const table = await sdk.tables.getTable(tableId)
     rows = await outputProcessing(table, rows, { preserveLinks: true })
 
     // need wrapper object for bookmarks etc when paginating
diff --git a/packages/server/src/sdk/app/rows/search/internal.ts b/packages/server/src/sdk/app/rows/search/internal.ts
index 4cdeca87f6..d78c0213b3 100644
--- a/packages/server/src/sdk/app/rows/search/internal.ts
+++ b/packages/server/src/sdk/app/rows/search/internal.ts
@@ -29,6 +29,7 @@ import {
 } from "../../../../api/controllers/view/utils"
 import sdk from "../../../../sdk"
 import { ExportRowsParams, ExportRowsResult } from "../search"
+import { searchInputMapping } from "./utils"
 import pick from "lodash/pick"
 
 export async function search(options: SearchParams) {
@@ -47,9 +48,9 @@ export async function search(options: SearchParams) {
     disableEscaping: options.disableEscaping,
   }
 
-  let table
+  let table = await sdk.tables.getTable(tableId)
+  options = searchInputMapping(table, options)
   if (params.sort && !params.sortType) {
-    table = await sdk.tables.getTable(tableId)
     const schema = table.schema
     const sortField = schema[params.sort]
     params.sortType = sortField.type === "number" ? "number" : "string"
@@ -68,7 +69,6 @@ export async function search(options: SearchParams) {
     if (tableId === InternalTables.USER_METADATA) {
       response.rows = await getGlobalUsersFromMetadata(response.rows)
     }
-    table = table || (await sdk.tables.getTable(tableId))
 
     if (options.fields) {
       const fields = [...options.fields, ...db.CONSTANT_INTERNAL_ROW_COLS]
diff --git a/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts b/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts
new file mode 100644
index 0000000000..01db0d421b
--- /dev/null
+++ b/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts
@@ -0,0 +1,49 @@
+import { searchInputMapping } from "../utils"
+import { db as dbCore } from "@budibase/backend-core"
+import {
+  FieldType,
+  FieldTypeSubtypes,
+  Table,
+  SearchParams,
+} from "@budibase/types"
+
+const tableId = "ta_a"
+const tableWithUserCol: Table = {
+  _id: tableId,
+  name: "table",
+  schema: {
+    user: {
+      name: "user",
+      type: FieldType.BB_REFERENCE,
+      subtype: FieldTypeSubtypes.BB_REFERENCE.USER,
+    },
+  },
+}
+
+describe("searchInputMapping", () => {
+  it("should be able to map ro_ to global user IDs", () => {
+    const globalUserId = dbCore.generateGlobalUserID()
+    const userMedataId = dbCore.generateUserMetadataID(globalUserId)
+    const params: SearchParams = {
+      tableId,
+      query: {
+        equal: {
+          "1:user": userMedataId,
+        },
+      },
+    }
+    const output = searchInputMapping(tableWithUserCol, params)
+    expect(output.query.equal!["1:user"]).toBe(globalUserId)
+  })
+
+  it("shouldn't change any other input", () => {
+    const params: SearchParams = {
+      tableId,
+      query: {
+        equal: {
+          "1:user": "test@test.com",
+        },
+      },
+    }
+  })
+})
diff --git a/packages/server/src/sdk/app/rows/search/utils.ts b/packages/server/src/sdk/app/rows/search/utils.ts
new file mode 100644
index 0000000000..c86df9bc0d
--- /dev/null
+++ b/packages/server/src/sdk/app/rows/search/utils.ts
@@ -0,0 +1,53 @@
+import {
+  FieldType,
+  FieldTypeSubtypes,
+  SearchParams,
+  Table,
+  DocumentType,
+  SEPARATOR,
+} from "@budibase/types"
+import { db as dbCore } from "@budibase/backend-core"
+
+function findColumnInQueries(
+  column: string,
+  options: SearchParams,
+  callback: <T>(filter: T) => T
+) {
+  for (let filterBlock of Object.values(options.query)) {
+    if (typeof filterBlock !== "object") {
+      continue
+    }
+    for (let [key, filter] of Object.entries(filterBlock)) {
+      if (key.endsWith(column)) {
+        filterBlock[key] = callback(filter)
+      }
+    }
+  }
+}
+
+function userColumnMapping(column: string, options: SearchParams) {
+  findColumnInQueries(column, options, (filterValue: any): string => {
+    if (typeof filterValue !== "string") {
+      return filterValue
+    }
+    const rowPrefix = DocumentType.ROW + SEPARATOR
+    // TODO: at some point in future might want to handle mapping emails to IDs
+    if (filterValue.startsWith(rowPrefix)) {
+      return dbCore.getGlobalIDFromUserMetadataID(filterValue)
+    }
+    return filterValue
+  })
+}
+
+export function searchInputMapping(table: Table, options: SearchParams) {
+  for (let [key, column] of Object.entries(table.schema)) {
+    switch (column.type) {
+      case FieldType.BB_REFERENCE:
+        if (column.subtype === FieldTypeSubtypes.BB_REFERENCE.USER) {
+          userColumnMapping(key, options)
+        }
+        break
+    }
+  }
+  return options
+}
diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index 6ab8ce623e..e443f35dbe 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -14,7 +14,6 @@ const HBS_REGEX = /{{([^{].*?)}}/g
 
 /**
  * Returns the valid operator options for a certain data type
- * @param type the data type
  */
 export const getValidOperatorsForType = (
   type: FieldType,

From 45b0251a1429a94585b597f85766c257bae9bdb3 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Fri, 6 Oct 2023 12:02:17 +0100
Subject: [PATCH 39/67] Update deploy-featurebranch.yml

---
 .github/workflows/deploy-featurebranch.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/deploy-featurebranch.yml b/.github/workflows/deploy-featurebranch.yml
index f06707ab2b..f843e222b0 100644
--- a/.github/workflows/deploy-featurebranch.yml
+++ b/.github/workflows/deploy-featurebranch.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - develop
+      - master
 
 jobs:
   release:

From 78bba266039830bbfbc472aaf54891678f3cad32 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 6 Oct 2023 11:02:37 +0000
Subject: [PATCH 40/67] Bump version to 2.11.11

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

diff --git a/lerna.json b/lerna.json
index aa2399aaab..2e41284df3 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.10",
+  "version": "2.11.11",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From dc50515bcc16ed0935fd8bd4a1c04feb729758d9 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 6 Oct 2023 12:16:37 +0100
Subject: [PATCH 41/67] Adding negative test case and fixing build issue.

---
 packages/server/src/sdk/app/rows/search/tests/utils.spec.ts | 5 ++++-
 packages/server/src/sdk/app/rows/search/utils.ts            | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts b/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts
index 01db0d421b..a1cb4fe48d 100644
--- a/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts
+++ b/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts
@@ -37,13 +37,16 @@ describe("searchInputMapping", () => {
   })
 
   it("shouldn't change any other input", () => {
+    const email = "test@test.com"
     const params: SearchParams = {
       tableId,
       query: {
         equal: {
-          "1:user": "test@test.com",
+          "1:user": email,
         },
       },
     }
+    const output = searchInputMapping(tableWithUserCol, params)
+    expect(output.query.equal!["1:user"]).toBe(email)
   })
 })
diff --git a/packages/server/src/sdk/app/rows/search/utils.ts b/packages/server/src/sdk/app/rows/search/utils.ts
index c86df9bc0d..5afa13c53d 100644
--- a/packages/server/src/sdk/app/rows/search/utils.ts
+++ b/packages/server/src/sdk/app/rows/search/utils.ts
@@ -11,7 +11,7 @@ import { db as dbCore } from "@budibase/backend-core"
 function findColumnInQueries(
   column: string,
   options: SearchParams,
-  callback: <T>(filter: T) => T
+  callback: (filter: any) => any
 ) {
   for (let filterBlock of Object.values(options.query)) {
     if (typeof filterBlock !== "object") {

From a19c5aed19db2455192d17fd893db9741faaa7e4 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 6 Oct 2023 11:17:04 +0000
Subject: [PATCH 42/67] Bump version to 2.11.12

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

diff --git a/lerna.json b/lerna.json
index 2e41284df3..6270454faa 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.11",
+  "version": "2.11.12",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 6e6c5bc776f0352ab5e81939ba57be64228dd6ae Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 6 Oct 2023 12:31:52 +0100
Subject: [PATCH 43/67] Handle arrays and fix issue brought up by REST
 testcase.

---
 .../sdk/app/rows/search/tests/utils.spec.ts   | 29 ++++++++++++++++--
 .../server/src/sdk/app/rows/search/utils.ts   | 30 +++++++++++++++----
 2 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts b/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts
index a1cb4fe48d..08d1f1b1cb 100644
--- a/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts
+++ b/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts
@@ -21,9 +21,10 @@ const tableWithUserCol: Table = {
 }
 
 describe("searchInputMapping", () => {
+  const globalUserId = dbCore.generateGlobalUserID()
+  const userMedataId = dbCore.generateUserMetadataID(globalUserId)
+
   it("should be able to map ro_ to global user IDs", () => {
-    const globalUserId = dbCore.generateGlobalUserID()
-    const userMedataId = dbCore.generateUserMetadataID(globalUserId)
     const params: SearchParams = {
       tableId,
       query: {
@@ -36,6 +37,22 @@ describe("searchInputMapping", () => {
     expect(output.query.equal!["1:user"]).toBe(globalUserId)
   })
 
+  it("should handle array of user IDs", () => {
+    const params: SearchParams = {
+      tableId,
+      query: {
+        oneOf: {
+          "1:user": [userMedataId, globalUserId],
+        },
+      },
+    }
+    const output = searchInputMapping(tableWithUserCol, params)
+    expect(output.query.oneOf!["1:user"]).toStrictEqual([
+      globalUserId,
+      globalUserId,
+    ])
+  })
+
   it("shouldn't change any other input", () => {
     const email = "test@test.com"
     const params: SearchParams = {
@@ -49,4 +66,12 @@ describe("searchInputMapping", () => {
     const output = searchInputMapping(tableWithUserCol, params)
     expect(output.query.equal!["1:user"]).toBe(email)
   })
+
+  it("shouldn't error if no query supplied", () => {
+    const params: any = {
+      tableId,
+    }
+    const output = searchInputMapping(tableWithUserCol, params)
+    expect(output.query).toBeUndefined()
+  })
 })
diff --git a/packages/server/src/sdk/app/rows/search/utils.ts b/packages/server/src/sdk/app/rows/search/utils.ts
index 5afa13c53d..f475296333 100644
--- a/packages/server/src/sdk/app/rows/search/utils.ts
+++ b/packages/server/src/sdk/app/rows/search/utils.ts
@@ -13,6 +13,9 @@ function findColumnInQueries(
   options: SearchParams,
   callback: (filter: any) => any
 ) {
+  if (!options.query) {
+    return
+  }
   for (let filterBlock of Object.values(options.query)) {
     if (typeof filterBlock !== "object") {
       continue
@@ -27,15 +30,30 @@ function findColumnInQueries(
 
 function userColumnMapping(column: string, options: SearchParams) {
   findColumnInQueries(column, options, (filterValue: any): string => {
-    if (typeof filterValue !== "string") {
+    const isArray = Array.isArray(filterValue),
+      isString = typeof filterValue === "string"
+    if (!isString && !isArray) {
       return filterValue
     }
-    const rowPrefix = DocumentType.ROW + SEPARATOR
-    // TODO: at some point in future might want to handle mapping emails to IDs
-    if (filterValue.startsWith(rowPrefix)) {
-      return dbCore.getGlobalIDFromUserMetadataID(filterValue)
+    const processString = (input: string) => {
+      const rowPrefix = DocumentType.ROW + SEPARATOR
+      if (input.startsWith(rowPrefix)) {
+        return dbCore.getGlobalIDFromUserMetadataID(input)
+      } else {
+        return input
+      }
+    }
+    if (isArray) {
+      return filterValue.map(el => {
+        if (typeof el === "string") {
+          return processString(el)
+        } else {
+          return el
+        }
+      })
+    } else {
+      return processString(filterValue)
     }
-    return filterValue
   })
 }
 

From 18cca671d49fcff4f84afe8b8d77c80e1178b7d5 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 6 Oct 2023 12:56:07 +0100
Subject: [PATCH 44/67] PR comments.

---
 .../design/settings/controls/FilterEditor/FilterDrawer.svelte   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index c03085e66f..0fd30b82bb 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -191,7 +191,7 @@
   }
 
   const getValidOperatorsForType = filter => {
-    if (!filter.field) {
+    if (!filter?.field) {
       return []
     }
 

From 017b522a3f6ac014c9188498dfcbcb8f9e0537b9 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 6 Oct 2023 12:56:55 +0100
Subject: [PATCH 45/67] Comment to explain function.

---
 packages/server/src/sdk/app/rows/search/utils.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/server/src/sdk/app/rows/search/utils.ts b/packages/server/src/sdk/app/rows/search/utils.ts
index f475296333..27964d2ad2 100644
--- a/packages/server/src/sdk/app/rows/search/utils.ts
+++ b/packages/server/src/sdk/app/rows/search/utils.ts
@@ -57,6 +57,8 @@ function userColumnMapping(column: string, options: SearchParams) {
   })
 }
 
+// maps through the search parameters to check if any of the inputs are invalid
+// based on the table schema, converts them to something that is valid.
 export function searchInputMapping(table: Table, options: SearchParams) {
   for (let [key, column] of Object.entries(table.schema)) {
     switch (column.type) {

From 7acc164e12a98c29d46df6d40126c33bdd7272e3 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 6 Oct 2023 13:28:27 +0100
Subject: [PATCH 46/67] Fix build.

---
 packages/server/src/sdk/app/rows/search/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/sdk/app/rows/search/utils.ts b/packages/server/src/sdk/app/rows/search/utils.ts
index 27964d2ad2..1b4f60f7da 100644
--- a/packages/server/src/sdk/app/rows/search/utils.ts
+++ b/packages/server/src/sdk/app/rows/search/utils.ts
@@ -29,7 +29,7 @@ function findColumnInQueries(
 }
 
 function userColumnMapping(column: string, options: SearchParams) {
-  findColumnInQueries(column, options, (filterValue: any): string => {
+  findColumnInQueries(column, options, (filterValue: any): any => {
     const isArray = Array.isArray(filterValue),
       isString = typeof filterValue === "string"
     if (!isString && !isArray) {

From bc17bc43fa7fb8716a8c7ee936dd6bfb2f42847d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 6 Oct 2023 13:32:12 +0100
Subject: [PATCH 47/67] Fixing issue brought up by some unit tests.

---
 packages/server/src/sdk/app/rows/search/utils.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/server/src/sdk/app/rows/search/utils.ts b/packages/server/src/sdk/app/rows/search/utils.ts
index 1b4f60f7da..14f7907e4f 100644
--- a/packages/server/src/sdk/app/rows/search/utils.ts
+++ b/packages/server/src/sdk/app/rows/search/utils.ts
@@ -60,6 +60,9 @@ function userColumnMapping(column: string, options: SearchParams) {
 // maps through the search parameters to check if any of the inputs are invalid
 // based on the table schema, converts them to something that is valid.
 export function searchInputMapping(table: Table, options: SearchParams) {
+  if (!table?.schema) {
+    return options
+  }
   for (let [key, column] of Object.entries(table.schema)) {
     switch (column.type) {
       case FieldType.BB_REFERENCE:

From 575693d69a1f3f404bafa991b5e5bd194037818d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 6 Oct 2023 14:07:12 +0100
Subject: [PATCH 48/67] Updating pro.

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 7040ae5282..044bec6447 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 7040ae5282cc23d7ae56ac1be8a369d1c32aab2f
+Subproject commit 044bec6447066b215932d6726c437e7ec5a9e42e

From 23b7a8de72b7637520359eaa8494a727078549f1 Mon Sep 17 00:00:00 2001
From: melohagan <101575380+melohagan@users.noreply.github.com>
Date: Fri, 6 Oct 2023 14:17:36 +0100
Subject: [PATCH 49/67] Allow relationship to be deleted even if missing
 (#11991)

* Allow relationship to be deleted even if missing

* Comment
---
 .../server/src/db/linkedRows/LinkController.ts  | 17 ++++++++++++-----
 .../server/src/db/tests/linkController.spec.js  | 15 +++++++++++++++
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/packages/server/src/db/linkedRows/LinkController.ts b/packages/server/src/db/linkedRows/LinkController.ts
index 5bfae49e8b..457819251a 100644
--- a/packages/server/src/db/linkedRows/LinkController.ts
+++ b/packages/server/src/db/linkedRows/LinkController.ts
@@ -308,12 +308,19 @@ class LinkController {
         }
       })
     )
-    // remove schema from other table
-    let linkedTable = await this._db.get<Table>(field.tableId)
-    if (field.fieldName) {
-      delete linkedTable.schema[field.fieldName]
+    try {
+      // remove schema from other table, if it exists
+      let linkedTable = await this._db.get<Table>(field.tableId)
+      if (field.fieldName) {
+        delete linkedTable.schema[field.fieldName]
+      }
+      await this._db.put(linkedTable)
+    } catch (error: any) {
+      // ignore missing to ensure broken relationship columns can be deleted
+      if (error.statusCode !== 404) {
+        throw error
+      }
     }
-    await this._db.put(linkedTable)
   }
 
   /**
diff --git a/packages/server/src/db/tests/linkController.spec.js b/packages/server/src/db/tests/linkController.spec.js
index 59d0f3f983..5caf35f61a 100644
--- a/packages/server/src/db/tests/linkController.spec.js
+++ b/packages/server/src/db/tests/linkController.spec.js
@@ -233,4 +233,19 @@ describe("test the link controller", () => {
     }
     await config.updateTable(table)
   })
+
+  it("should be able to remove a linked field from a table, even if the linked table does not exist", async () => {
+    await createLinkedRow()
+    await createLinkedRow("link2")
+    table1.schema["link"].tableId = "not_found"
+    const controller = await createLinkController(table1, null, table1)
+    await context.doInAppContext(appId, async () => {
+      let before = await controller.getTableLinkDocs()
+      await controller.removeFieldFromTable("link")
+      let after = await controller.getTableLinkDocs()
+      expect(before.length).toEqual(2)
+      // shouldn't delete the other field
+      expect(after.length).toEqual(1)
+    })
+  })
 })

From 9b52ae56282adcf1651fae4b693b679f5d6701fa Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 6 Oct 2023 13:17:58 +0000
Subject: [PATCH 50/67] Bump version to 2.11.13

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

diff --git a/lerna.json b/lerna.json
index 6270454faa..f42284a20d 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.12",
+  "version": "2.11.13",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 24b6d5d9ba319bceed541e01f760b5a7b0597152 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 6 Oct 2023 13:44:25 +0000
Subject: [PATCH 51/67] Bump version to 2.11.14

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

diff --git a/lerna.json b/lerna.json
index f42284a20d..6c50c0bc16 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.13",
+  "version": "2.11.14",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From d4335bca73b29ab0742b7c6aadd8a6c72de08482 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 6 Oct 2023 16:31:48 +0100
Subject: [PATCH 52/67] Quick fix for saving current user._id - make sure it is
 the correct format of ID.

---
 .../rowProcessor/bbReferenceProcessor.ts      | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts b/packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts
index 6f41d3d55f..5b7e852f50 100644
--- a/packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts
+++ b/packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts
@@ -1,13 +1,15 @@
-import { cache } from "@budibase/backend-core"
+import { cache, db as dbCore } from "@budibase/backend-core"
 import { utils } from "@budibase/shared-core"
-import { FieldSubtype } from "@budibase/types"
+import { FieldSubtype, DocumentType, SEPARATOR } from "@budibase/types"
 import { InvalidBBRefError } from "./errors"
 
+const ROW_PREFIX = DocumentType.ROW + SEPARATOR
+
 export async function processInputBBReferences(
   value: string | string[] | { _id: string } | { _id: string }[],
   subtype: FieldSubtype
 ): Promise<string | null> {
-  const referenceIds: string[] = []
+  let referenceIds: string[] = []
 
   if (Array.isArray(value)) {
     referenceIds.push(
@@ -26,6 +28,17 @@ export async function processInputBBReferences(
     )
   }
 
+  // make sure all reference IDs are correct global user IDs
+  // they may be user metadata references (start with row prefix)
+  // and these need to be converted to global IDs
+  referenceIds = referenceIds.map(id => {
+    if (id?.startsWith(ROW_PREFIX)) {
+      return dbCore.getGlobalIDFromUserMetadataID(id)
+    } else {
+      return id
+    }
+  })
+
   switch (subtype) {
     case FieldSubtype.USER:
       const { notFoundIds } = await cache.user.getUsers(referenceIds)

From 0dc28122fa5ffd04747aa7896b20f4b351bfa13c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 6 Oct 2023 16:38:36 +0100
Subject: [PATCH 53/67] Adding test case.

---
 .../rowProcessor/tests/bbReferenceProcessor.spec.ts      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/server/src/utilities/rowProcessor/tests/bbReferenceProcessor.spec.ts b/packages/server/src/utilities/rowProcessor/tests/bbReferenceProcessor.spec.ts
index d0932b399c..b6174861d4 100644
--- a/packages/server/src/utilities/rowProcessor/tests/bbReferenceProcessor.spec.ts
+++ b/packages/server/src/utilities/rowProcessor/tests/bbReferenceProcessor.spec.ts
@@ -154,6 +154,15 @@ describe("bbReferenceProcessor", () => {
 
         expect(result).toEqual(null)
       })
+
+      it("should convert user medata IDs to global IDs", async () => {
+        const userId = _.sample(users)!._id!
+        const userMetadataId = backendCore.db.generateUserMetadataID(userId)
+        const result = await config.doInTenant(() =>
+          processInputBBReferences(userMetadataId, FieldSubtype.USER)
+        )
+        expect(result).toBe(userId)
+      })
     })
   })
 

From d41f81bb45c52a59f35b8de3a311874e9a6f41dd Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 6 Oct 2023 15:54:26 +0000
Subject: [PATCH 54/67] Bump version to 2.11.15

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

diff --git a/lerna.json b/lerna.json
index 6c50c0bc16..7968b8999f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.14",
+  "version": "2.11.15",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From d8f1b7960e7e077c3f78b846743f2226a8425a91 Mon Sep 17 00:00:00 2001
From: melohagan <101575380+melohagan@users.noreply.github.com>
Date: Mon, 9 Oct 2023 08:22:19 +0100
Subject: [PATCH 55/67] Fix form block crash on no data tables (#11995)

* Fix form block crash on no data tables

* Refactor

* Refactor
---
 packages/builder/src/builderStore/dataBinding.js           | 7 +++++--
 .../controls/FieldConfiguration/FieldConfiguration.svelte  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index 386b47105d..8445bf9e6d 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -948,12 +948,15 @@ export const buildFormSchema = (component, asset) => {
 
   if (component._component.endsWith("formblock")) {
     let schema = {}
-
     const datasource = getDatasourceForProvider(asset, component)
     const info = getSchemaForDatasource(component, datasource)
 
+    if (!info?.schema) {
+      return schema
+    }
+
     if (!component.fields) {
-      Object.values(info?.schema)
+      Object.values(info.schema)
         .filter(
           ({ autocolumn, name }) =>
             !autocolumn && !["_rev", "_id"].includes(name)
diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
index 4c4fa0b7b7..4169cb7d3d 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
@@ -37,7 +37,7 @@
   }
 
   $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
-  $: resourceId = datasource.resourceId || datasource.tableId
+  $: resourceId = datasource?.resourceId || datasource?.tableId
 
   $: if (!isEqual(value, cachedValue)) {
     cachedValue = cloneDeep(value)

From 247d96b641f4d10f636ece20accccd161280cb04 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 9 Oct 2023 07:22:41 +0000
Subject: [PATCH 56/67] Bump version to 2.11.16

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

diff --git a/lerna.json b/lerna.json
index 7968b8999f..d7478a01e7 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.15",
+  "version": "2.11.16",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From a4e3cd72cc45bce271893ee676c73351a02da775 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 9 Oct 2023 15:01:16 +0100
Subject: [PATCH 57/67] Add new app feature flag to allow disable user metadata
 columns in new apps, but allow them in old apps

---
 .../src/builderStore/store/frontend.js        |  1 +
 .../backend/DataTable/TableDataTable.svelte   | 24 ++++++++++---------
 .../server/src/api/controllers/application.ts |  1 +
 packages/types/src/documents/app/app.ts       |  1 +
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 6c029ddff3..a567caf87f 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -64,6 +64,7 @@ const INITIAL_FRONTEND_STATE = {
   },
   features: {
     componentValidation: false,
+    disableUserMetadata: false,
   },
   errors: [],
   hasAppPackage: false,
diff --git a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
index 2b7cde9201..c3b1fea51d 100644
--- a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
@@ -4,6 +4,7 @@
   import { TableNames } from "constants"
   import { Grid } from "@budibase/frontend-core"
   import { API } from "api"
+  import { store } from "builderStore"
   import GridAddColumnModal from "components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte"
   import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
   import GridEditUserModal from "components/backend/DataTable/modals/grid/GridEditUserModal.svelte"
@@ -17,11 +18,11 @@
   import GridUsersTableButton from "components/backend/DataTable/modals/grid/GridUsersTableButton.svelte"
 
   const userSchemaOverrides = {
-    firstName: { displayName: "First name" },
-    lastName: { displayName: "Last name" },
-    email: { displayName: "Email" },
-    roleId: { displayName: "Role" },
-    status: { displayName: "Status" },
+    firstName: { displayName: "First name", disabled: true },
+    lastName: { displayName: "Last name", disabled: true },
+    email: { displayName: "Email", disabled: true },
+    roleId: { displayName: "Role", disabled: true },
+    status: { displayName: "Status", disabled: true },
   }
 
   $: id = $tables.selected?._id
@@ -35,6 +36,7 @@
     return datasource._id === $tables.selected?.sourceId
   })
   $: relationshipsEnabled = relationshipSupport(tableDatasource)
+  $: editable = !(isUsersTable && $store.features.disableUserMetadata)
 
   const relationshipSupport = datasource => {
     const integration = $integrations[datasource?.source]
@@ -58,22 +60,22 @@
   <Grid
     {API}
     datasource={gridDatasource}
-    canAddRows={!isUsersTable}
-    canDeleteRows={!isUsersTable}
-    canEditRows={!isUsersTable}
-    canEditColumns={!isUsersTable}
+    canAddRows={editable}
+    canDeleteRows={editable}
+    canEditRows={editable}
+    canEditColumns={editable}
     schemaOverrides={isUsersTable ? userSchemaOverrides : null}
     showAvatars={false}
     on:updatedatasource={handleGridTableUpdate}
   >
     <svelte:fragment slot="filter">
-      {#if isUsersTable}
+      {#if !editable}
         <GridUsersTableButton />
       {/if}
       <GridFilterButton />
     </svelte:fragment>
     <svelte:fragment slot="controls">
-      {#if !isUsersTable}
+      {#if editable}
         <GridCreateViewButton />
       {/if}
       <GridManageAccessButton />
diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts
index 11f6e6c249..3797d1e966 100644
--- a/packages/server/src/api/controllers/application.ts
+++ b/packages/server/src/api/controllers/application.ts
@@ -289,6 +289,7 @@ async function performAppCreate(ctx: UserCtx) {
       },
       features: {
         componentValidation: true,
+        disableUserMetadata: true,
       },
     }
 
diff --git a/packages/types/src/documents/app/app.ts b/packages/types/src/documents/app/app.ts
index f42422b557..5bbdd86515 100644
--- a/packages/types/src/documents/app/app.ts
+++ b/packages/types/src/documents/app/app.ts
@@ -66,4 +66,5 @@ export interface AppIcon {
 
 export interface AppFeatures {
   componentValidation?: boolean
+  disableUserMetadata?: boolean
 }

From 73e208292f048f6d88814907cc7b14ad429db8b7 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 9 Oct 2023 15:05:57 +0100
Subject: [PATCH 58/67] Simplify logic to be more readable

---
 .../backend/DataTable/TableDataTable.svelte         | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
index c3b1fea51d..5fee849afb 100644
--- a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
@@ -36,7 +36,6 @@
     return datasource._id === $tables.selected?.sourceId
   })
   $: relationshipsEnabled = relationshipSupport(tableDatasource)
-  $: editable = !(isUsersTable && $store.features.disableUserMetadata)
 
   const relationshipSupport = datasource => {
     const integration = $integrations[datasource?.source]
@@ -60,22 +59,22 @@
   <Grid
     {API}
     datasource={gridDatasource}
-    canAddRows={editable}
-    canDeleteRows={editable}
-    canEditRows={editable}
-    canEditColumns={editable}
+    canAddRows={!isUsersTable}
+    canDeleteRows={!isUsersTable}
+    canEditRows={!isUsersTable || !$store.features.disableUserMetadata}
+    canEditColumns={!isUsersTable || !$store.features.disableUserMetadata}
     schemaOverrides={isUsersTable ? userSchemaOverrides : null}
     showAvatars={false}
     on:updatedatasource={handleGridTableUpdate}
   >
     <svelte:fragment slot="filter">
-      {#if !editable}
+      {#if isUsersTable && $store.features.disableUserMetadata}
         <GridUsersTableButton />
       {/if}
       <GridFilterButton />
     </svelte:fragment>
     <svelte:fragment slot="controls">
-      {#if editable}
+      {#if !isUsersTable}
         <GridCreateViewButton />
       {/if}
       <GridManageAccessButton />

From b17ec630c1e85519a6fce46d575d66f9237ce685 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 9 Oct 2023 15:09:11 +0100
Subject: [PATCH 59/67] Ensure user table editing is still allowed for old apps
 that are imported

---
 packages/server/src/api/controllers/application.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts
index 3797d1e966..4afd7b23f9 100644
--- a/packages/server/src/api/controllers/application.ts
+++ b/packages/server/src/api/controllers/application.ts
@@ -311,10 +311,13 @@ async function performAppCreate(ctx: UserCtx) {
         }
       })
 
-      // Keep existing validation setting
+      // Keep existing feature flags
       if (!existing.features?.componentValidation) {
         newApplication.features!.componentValidation = false
       }
+      if (!existing.features?.disableUserMetadata) {
+        newApplication.features!.disableUserMetadata = false
+      }
 
       // Migrate navigation settings and screens if required
       if (existing) {

From 088ed1139c2214a1bee9a81282e2c3501f6185db Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 10 Oct 2023 07:08:08 +0000
Subject: [PATCH 60/67] Bump version to 2.11.17

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

diff --git a/lerna.json b/lerna.json
index d7478a01e7..c1de6a01b5 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.16",
+  "version": "2.11.17",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 66199b82c8b35dbec9bd3091072b1e2c55e18d0b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Wed, 11 Oct 2023 10:12:14 +0100
Subject: [PATCH 61/67] Update deploy-featurebranch.yml

---
 .github/workflows/deploy-featurebranch.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-featurebranch.yml b/.github/workflows/deploy-featurebranch.yml
index f843e222b0..2c6302b56a 100644
--- a/.github/workflows/deploy-featurebranch.yml
+++ b/.github/workflows/deploy-featurebranch.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: passeidireto/trigger-external-workflow-action@main
         env:
           PAYLOAD_BRANCH: ${{ github.head_ref }}
-          PAYLOAD_PR_NUMBER: ${{ github.ref }}
+          PAYLOAD_PR_NUMBER: ${{ github.event.pull_request.number }}
         with:
           repository: budibase/budibase-deploys
           event: featurebranch-qa-deploy

From e5de8a24b2d2481301e9a1c81a3ceb56c0577a17 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 11 Oct 2023 09:12:35 +0000
Subject: [PATCH 62/67] Bump version to 2.11.18

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

diff --git a/lerna.json b/lerna.json
index c1de6a01b5..bf82dd0c70 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.17",
+  "version": "2.11.18",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 31203c52c5abfe5781424beaf2ccd42f39d1f9d7 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 11 Oct 2023 11:38:47 +0200
Subject: [PATCH 63/67] Use nx cloud write token

---
 .github/workflows/budibase_ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 9d1131ed7f..14809c1118 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -20,6 +20,7 @@ env:
   PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
   NX_BASE_BRANCH: origin/${{ github.base_ref }}
   USE_NX_AFFECTED: ${{ github.event_name == 'pull_request' && github.base_ref != 'master'}}
+  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
 
 jobs:
   lint:

From cfa5f84cf18a161b6c6ace0b3194128cd6064103 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 11 Oct 2023 11:39:45 +0200
Subject: [PATCH 64/67] Removing unnecessary easimon/maximize-build-space

---
 .github/workflows/budibase_ci.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 14809c1118..93a342a1a1 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -26,13 +26,6 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - name: Maximize build space
-        uses: easimon/maximize-build-space@master
-        with:
-          root-reserve-mb: 35000
-          swap-size-mb: 1024
-          remove-android: "true"
-          remove-dotnet: "true"
       - name: Checkout repo and submodules
         uses: actions/checkout@v3
         if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'

From 18254125682be9a0893416a829fb3a5ffc359ad7 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 11 Oct 2023 09:54:49 +0000
Subject: [PATCH 65/67] Bump version to 2.11.19

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

diff --git a/lerna.json b/lerna.json
index bf82dd0c70..f56bd4e540 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.18",
+  "version": "2.11.19",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From c1b1220340f64c17c6b0f8d1c789c8601ec8bdcb Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 11 Oct 2023 10:45:07 +0000
Subject: [PATCH 66/67] Bump version to 2.11.15-alpha.3

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

diff --git a/lerna.json b/lerna.json
index 7302cd4555..720c3813ac 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.15-alpha.2",
+  "version": "2.11.15-alpha.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 53c309fe3934ec371866e21ceb554956f3d1a062 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 11 Oct 2023 13:18:07 +0000
Subject: [PATCH 67/67] Bump version to 2.11.20-alpha.0

---
 lerna.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lerna.json b/lerna.json
index 9298ac99ba..089e62dafb 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.19",
+  "version": "2.11.20-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
@@ -19,4 +19,4 @@
       "loadEnvFiles": false
     }
   }
-}
+}
\ No newline at end of file