From 8718488aeef908385a312d1d0bd227cbc8fc4397 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 16 Aug 2021 15:58:04 +0100
Subject: [PATCH 01/58] couchdb direct auth

---
 packages/auth/src/db/utils.js         | 8 +++++++-
 packages/server/scripts/dev/manage.js | 2 +-
 packages/server/src/db/client.js      | 4 ++++
 packages/server/src/environment.js    | 2 ++
 packages/worker/scripts/dev/manage.js | 2 +-
 packages/worker/src/db/index.js       | 4 ++++
 packages/worker/src/environment.js    | 3 +--
 7 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/packages/auth/src/db/utils.js b/packages/auth/src/db/utils.js
index 1fc78f418..e3a86f8ae 100644
--- a/packages/auth/src/db/utils.js
+++ b/packages/auth/src/db/utils.js
@@ -168,7 +168,13 @@ exports.getAllDbs = async () => {
   if (env.isTest()) {
     return getCouch().allDbs()
   }
-  const response = await fetch(`${env.COUCH_DB_URL}/_all_dbs`)
+  const response = await fetch(`${env.COUCH_DB_URL}/_all_dbs`, {
+    method: "POST",
+    body: JSON.stringify({
+      name: env.COUCH_DB_USERNAME, 
+      password: env.COUCH_DB_PASSWORD, 
+    }),
+  })
   if (response.status === 200) {
     return response.json()
   } else {
diff --git a/packages/server/scripts/dev/manage.js b/packages/server/scripts/dev/manage.js
index ffd8c6b9e..7e9d7f6a0 100644
--- a/packages/server/scripts/dev/manage.js
+++ b/packages/server/scripts/dev/manage.js
@@ -36,7 +36,7 @@ async function init() {
   const envFileJson = {
     PORT: 4001,
     MINIO_URL: "http://localhost:10000/",
-    COUCH_DB_URL: "http://budibase:budibase@localhost:10000/db/",
+    COUCH_DB_URL: "http://localhost:10000/db/",
     REDIS_URL: "localhost:6379",
     WORKER_URL: "http://localhost:4002",
     INTERNAL_API_KEY: "budibase",
diff --git a/packages/server/src/db/client.js b/packages/server/src/db/client.js
index d50d72b18..887b287c8 100644
--- a/packages/server/src/db/client.js
+++ b/packages/server/src/db/client.js
@@ -12,6 +12,10 @@ PouchDB.adapter("writableStream", replicationStream.adapters.writableStream)
 
 let POUCH_DB_DEFAULTS = {
   prefix: COUCH_DB_URL,
+  auth: {
+    username: env.COUCH_DB_USERNAME,
+    password: env.COUCH_DB_PASSWORD,
+  }
 }
 
 if (env.isTest()) {
diff --git a/packages/server/src/environment.js b/packages/server/src/environment.js
index 52c680f65..45c767385 100644
--- a/packages/server/src/environment.js
+++ b/packages/server/src/environment.js
@@ -23,6 +23,8 @@ module.exports = {
   // important
   PORT: process.env.PORT,
   JWT_SECRET: process.env.JWT_SECRET,
+  COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
+  COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
   COUCH_DB_URL: process.env.COUCH_DB_URL,
   MINIO_URL: process.env.MINIO_URL,
   WORKER_URL: process.env.WORKER_URL,
diff --git a/packages/worker/scripts/dev/manage.js b/packages/worker/scripts/dev/manage.js
index b9d28b627..d7eb76fc7 100644
--- a/packages/worker/scripts/dev/manage.js
+++ b/packages/worker/scripts/dev/manage.js
@@ -17,7 +17,7 @@ async function init() {
     REDIS_URL: "localhost:6379",
     REDIS_PASSWORD: "budibase",
     MINIO_URL: "http://localhost:10000/",
-    COUCH_DB_URL: "http://budibase:budibase@localhost:10000/db/",
+    COUCH_DB_URL: "http://localhost:10000/db/",
   }
   let envFile = ""
   Object.keys(envFileJson).forEach(key => {
diff --git a/packages/worker/src/db/index.js b/packages/worker/src/db/index.js
index d6d035cff..d09ddf065 100644
--- a/packages/worker/src/db/index.js
+++ b/packages/worker/src/db/index.js
@@ -7,6 +7,10 @@ const COUCH_DB_URL = env.COUCH_DB_URL || "http://localhost:10000/db/"
 
 let POUCH_DB_DEFAULTS = {
   prefix: COUCH_DB_URL,
+  auth: {
+    username: env.COUCH_DB_USERNAME,
+    password: env.COUCH_DB_PASSWORD,
+  }
 }
 
 if (env.isTest()) {
diff --git a/packages/worker/src/environment.js b/packages/worker/src/environment.js
index 384230b9b..e8666e6b8 100644
--- a/packages/worker/src/environment.js
+++ b/packages/worker/src/environment.js
@@ -23,7 +23,6 @@ module.exports = {
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
   MINIO_URL: process.env.MINIO_URL,
-  COUCH_DB_URL: process.env.COUCH_DB_URL,
   LOG_LEVEL: process.env.LOG_LEVEL,
   JWT_SECRET: process.env.JWT_SECRET,
   SALT_ROUNDS: process.env.SALT_ROUNDS,
@@ -31,7 +30,7 @@ module.exports = {
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
   INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
   /* TODO: to remove - once deployment removed */
-  COUCH_DB_USERNAME: process.env.COUCH_DB_USERNAME,
+  COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
   COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
   _set(key, value) {
     process.env[key] = value

From 884b36730b2b5f19b4d24d13c89b0323a6e19b8b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 16 Aug 2021 16:38:00 +0100
Subject: [PATCH 02/58] utility helper for determining correct couchDB URL

---
 packages/auth/src/db/utils.js                 | 21 ++++++++++++-------
 packages/auth/src/environment.js              |  2 ++
 .../src/api/controllers/row/internalSearch.js |  3 ++-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/auth/src/db/utils.js b/packages/auth/src/db/utils.js
index e3a86f8ae..7c44664a6 100644
--- a/packages/auth/src/db/utils.js
+++ b/packages/auth/src/db/utils.js
@@ -159,6 +159,17 @@ exports.getDeployedAppID = appId => {
   return appId
 }
 
+exports.getCouchUrl = () => {
+  // username and password already exist in URL
+  if (env.COUCH_DB_URL.includes("@")) {
+    return env.COUCH_DB_URL
+  }
+
+  const [protocol, ...rest] = env.COUCH_DB_URL.split("://")
+
+  return `${protocol}://${env.COUCH_DB_USERNAME}:${env.COUCH_DB_PASSWORD}@${rest}`
+}
+
 /**
  * if in production this will use the CouchDB _all_dbs call to retrieve a list of databases. If testing
  * when using Pouch it will use the pouchdb-all-dbs package.
@@ -168,13 +179,7 @@ exports.getAllDbs = async () => {
   if (env.isTest()) {
     return getCouch().allDbs()
   }
-  const response = await fetch(`${env.COUCH_DB_URL}/_all_dbs`, {
-    method: "POST",
-    body: JSON.stringify({
-      name: env.COUCH_DB_USERNAME, 
-      password: env.COUCH_DB_PASSWORD, 
-    }),
-  })
+  const response = await fetch(`${exports.getCouchUrl()}/_all_dbs`)
   if (response.status === 200) {
     return response.json()
   } else {
@@ -309,4 +314,4 @@ exports.Replication = Replication
 exports.getScopedConfig = getScopedConfig
 exports.generateConfigID = generateConfigID
 exports.getConfigParams = getConfigParams
-exports.getScopedFullConfig = getScopedFullConfig
+exports.getScopedFullConfig = getScopedFullConfig
\ No newline at end of file
diff --git a/packages/auth/src/environment.js b/packages/auth/src/environment.js
index 355843d02..e64a1c75f 100644
--- a/packages/auth/src/environment.js
+++ b/packages/auth/src/environment.js
@@ -9,6 +9,8 @@ function isTest() {
 module.exports = {
   JWT_SECRET: process.env.JWT_SECRET,
   COUCH_DB_URL: process.env.COUCH_DB_URL,
+  COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
+  COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
   SALT_ROUNDS: process.env.SALT_ROUNDS,
   REDIS_URL: process.env.REDIS_URL,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js
index c13091d6e..20147a785 100644
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@@ -1,6 +1,7 @@
 const { SearchIndexes } = require("../../../db/utils")
 const env = require("../../../environment")
 const fetch = require("node-fetch")
+const { getCouchUrl } = require("@budibase/auth/db")
 
 /**
  * Class to build lucene query URLs.
@@ -233,7 +234,7 @@ class QueryBuilder {
   }
 
   async run() {
-    const url = `${env.COUCH_DB_URL}/${this.appId}/_design/database/_search/${SearchIndexes.ROWS}`
+    const url = `${getCouchUrl()}/${this.appId}/_design/database/_search/${SearchIndexes.ROWS}`
     const body = this.buildSearchBody()
     return await runQuery(url, body)
   }

From 5f2fc47a168a26b5d151f8693c6af666ee91beb1 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 16 Aug 2021 16:39:10 +0100
Subject: [PATCH 03/58] readd couchDB url to env

---
 packages/worker/src/environment.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/worker/src/environment.js b/packages/worker/src/environment.js
index e8666e6b8..1fc68ccc7 100644
--- a/packages/worker/src/environment.js
+++ b/packages/worker/src/environment.js
@@ -23,6 +23,7 @@ module.exports = {
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
   MINIO_URL: process.env.MINIO_URL,
+  COUCH_DB_URL: process.env.COUCH_DB_URL,
   LOG_LEVEL: process.env.LOG_LEVEL,
   JWT_SECRET: process.env.JWT_SECRET,
   SALT_ROUNDS: process.env.SALT_ROUNDS,

From 9ad19092af5c73833439848127b42afa90976008 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 16 Aug 2021 16:44:46 +0100
Subject: [PATCH 04/58] match up env var in worker

---
 packages/worker/src/environment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/worker/src/environment.js b/packages/worker/src/environment.js
index 1fc68ccc7..384230b9b 100644
--- a/packages/worker/src/environment.js
+++ b/packages/worker/src/environment.js
@@ -31,7 +31,7 @@ module.exports = {
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
   INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
   /* TODO: to remove - once deployment removed */
-  COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
+  COUCH_DB_USERNAME: process.env.COUCH_DB_USERNAME,
   COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
   _set(key, value) {
     process.env[key] = value

From 3b20f5ba4d504f6cc67840b6a4f47c6d9f6e5a9a Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 16 Aug 2021 16:47:26 +0100
Subject: [PATCH 05/58] lint

---
 packages/server/src/api/controllers/row/internalSearch.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js
index 20147a785..c5bd01b38 100644
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@@ -1,5 +1,4 @@
 const { SearchIndexes } = require("../../../db/utils")
-const env = require("../../../environment")
 const fetch = require("node-fetch")
 const { getCouchUrl } = require("@budibase/auth/db")
 

From 16220dbf118eb47999288eb13a71b2c555de5eb0 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 16 Aug 2021 17:17:48 +0100
Subject: [PATCH 06/58] lint :sparkles:

---
 packages/auth/src/db/utils.js                             | 2 +-
 packages/server/src/api/controllers/row/internalSearch.js | 4 +++-
 packages/server/src/db/client.js                          | 2 +-
 packages/worker/src/db/index.js                           | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/auth/src/db/utils.js b/packages/auth/src/db/utils.js
index 7c44664a6..2ac23d02a 100644
--- a/packages/auth/src/db/utils.js
+++ b/packages/auth/src/db/utils.js
@@ -314,4 +314,4 @@ exports.Replication = Replication
 exports.getScopedConfig = getScopedConfig
 exports.generateConfigID = generateConfigID
 exports.getConfigParams = getConfigParams
-exports.getScopedFullConfig = getScopedFullConfig
\ No newline at end of file
+exports.getScopedFullConfig = getScopedFullConfig
diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js
index c5bd01b38..cc35da40e 100644
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@@ -233,7 +233,9 @@ class QueryBuilder {
   }
 
   async run() {
-    const url = `${getCouchUrl()}/${this.appId}/_design/database/_search/${SearchIndexes.ROWS}`
+    const url = `${getCouchUrl()}/${this.appId}/_design/database/_search/${
+      SearchIndexes.ROWS
+    }`
     const body = this.buildSearchBody()
     return await runQuery(url, body)
   }
diff --git a/packages/server/src/db/client.js b/packages/server/src/db/client.js
index 887b287c8..9a244fee1 100644
--- a/packages/server/src/db/client.js
+++ b/packages/server/src/db/client.js
@@ -15,7 +15,7 @@ let POUCH_DB_DEFAULTS = {
   auth: {
     username: env.COUCH_DB_USERNAME,
     password: env.COUCH_DB_PASSWORD,
-  }
+  },
 }
 
 if (env.isTest()) {
diff --git a/packages/worker/src/db/index.js b/packages/worker/src/db/index.js
index d09ddf065..c0676634f 100644
--- a/packages/worker/src/db/index.js
+++ b/packages/worker/src/db/index.js
@@ -10,7 +10,7 @@ let POUCH_DB_DEFAULTS = {
   auth: {
     username: env.COUCH_DB_USERNAME,
     password: env.COUCH_DB_PASSWORD,
-  }
+  },
 }
 
 if (env.isTest()) {

From 85b4cc0d82671765f4f4255e6629f4d5f7caceb7 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 16 Aug 2021 16:35:51 +0000
Subject: [PATCH 07/58] v0.9.106

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index 825ab2f1f..30b42fc1e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.105",
+  "version": "0.9.106",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index ea638f859..db542205f 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.105",
+  "version": "0.9.106",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index c8f93c9df..b1951d987 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.105",
+  "version": "0.9.106",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index a7ed98b63..9595ad603 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.105",
+  "version": "0.9.106",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.105",
-    "@budibase/client": "^0.9.105",
+    "@budibase/bbui": "^0.9.106",
+    "@budibase/client": "^0.9.106",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.105",
+    "@budibase/string-templates": "^0.9.106",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 0dc653a29..aa5b558bd 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.105",
+  "version": "0.9.106",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 6fe0e6b3b..4fe16bc42 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.105",
+  "version": "0.9.106",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.105",
-    "@budibase/standard-components": "^0.9.105",
-    "@budibase/string-templates": "^0.9.105",
+    "@budibase/bbui": "^0.9.106",
+    "@budibase/standard-components": "^0.9.106",
+    "@budibase/string-templates": "^0.9.106",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 7ca543743..ad9a14682 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.105",
+  "version": "0.9.106",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -60,9 +60,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.105",
-    "@budibase/client": "^0.9.105",
-    "@budibase/string-templates": "^0.9.105",
+    "@budibase/auth": "^0.9.106",
+    "@budibase/client": "^0.9.106",
+    "@budibase/string-templates": "^0.9.106",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -115,7 +115,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.105",
+    "@budibase/standard-components": "^0.9.106",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index a9bdbf642..2b017c90a 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.105",
+  "version": "0.9.106",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.105",
+    "@budibase/bbui": "^0.9.106",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index d980f2b36..f124d5764 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.105",
+  "version": "0.9.106",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 9e33e6ac6..8b504aa44 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.105",
+  "version": "0.9.106",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.105",
-    "@budibase/string-templates": "^0.9.105",
+    "@budibase/auth": "^0.9.106",
+    "@budibase/string-templates": "^0.9.106",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From 7efe4581208e1f5efee5059641e0dd792a68a461 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 17 Aug 2021 07:16:43 +0100
Subject: [PATCH 08/58] Revert "Feature/couchdb auth"

---
 packages/auth/src/db/utils.js                       | 13 +------------
 packages/auth/src/environment.js                    |  2 --
 packages/server/scripts/dev/manage.js               |  2 +-
 .../src/api/controllers/row/internalSearch.js       |  6 ++----
 packages/server/src/db/client.js                    |  4 ----
 packages/server/src/environment.js                  |  2 --
 packages/worker/scripts/dev/manage.js               |  2 +-
 packages/worker/src/db/index.js                     |  4 ----
 8 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/packages/auth/src/db/utils.js b/packages/auth/src/db/utils.js
index 2ac23d02a..1fc78f418 100644
--- a/packages/auth/src/db/utils.js
+++ b/packages/auth/src/db/utils.js
@@ -159,17 +159,6 @@ exports.getDeployedAppID = appId => {
   return appId
 }
 
-exports.getCouchUrl = () => {
-  // username and password already exist in URL
-  if (env.COUCH_DB_URL.includes("@")) {
-    return env.COUCH_DB_URL
-  }
-
-  const [protocol, ...rest] = env.COUCH_DB_URL.split("://")
-
-  return `${protocol}://${env.COUCH_DB_USERNAME}:${env.COUCH_DB_PASSWORD}@${rest}`
-}
-
 /**
  * if in production this will use the CouchDB _all_dbs call to retrieve a list of databases. If testing
  * when using Pouch it will use the pouchdb-all-dbs package.
@@ -179,7 +168,7 @@ exports.getAllDbs = async () => {
   if (env.isTest()) {
     return getCouch().allDbs()
   }
-  const response = await fetch(`${exports.getCouchUrl()}/_all_dbs`)
+  const response = await fetch(`${env.COUCH_DB_URL}/_all_dbs`)
   if (response.status === 200) {
     return response.json()
   } else {
diff --git a/packages/auth/src/environment.js b/packages/auth/src/environment.js
index e64a1c75f..355843d02 100644
--- a/packages/auth/src/environment.js
+++ b/packages/auth/src/environment.js
@@ -9,8 +9,6 @@ function isTest() {
 module.exports = {
   JWT_SECRET: process.env.JWT_SECRET,
   COUCH_DB_URL: process.env.COUCH_DB_URL,
-  COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
-  COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
   SALT_ROUNDS: process.env.SALT_ROUNDS,
   REDIS_URL: process.env.REDIS_URL,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
diff --git a/packages/server/scripts/dev/manage.js b/packages/server/scripts/dev/manage.js
index 7e9d7f6a0..ffd8c6b9e 100644
--- a/packages/server/scripts/dev/manage.js
+++ b/packages/server/scripts/dev/manage.js
@@ -36,7 +36,7 @@ async function init() {
   const envFileJson = {
     PORT: 4001,
     MINIO_URL: "http://localhost:10000/",
-    COUCH_DB_URL: "http://localhost:10000/db/",
+    COUCH_DB_URL: "http://budibase:budibase@localhost:10000/db/",
     REDIS_URL: "localhost:6379",
     WORKER_URL: "http://localhost:4002",
     INTERNAL_API_KEY: "budibase",
diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js
index cc35da40e..c13091d6e 100644
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@@ -1,6 +1,6 @@
 const { SearchIndexes } = require("../../../db/utils")
+const env = require("../../../environment")
 const fetch = require("node-fetch")
-const { getCouchUrl } = require("@budibase/auth/db")
 
 /**
  * Class to build lucene query URLs.
@@ -233,9 +233,7 @@ class QueryBuilder {
   }
 
   async run() {
-    const url = `${getCouchUrl()}/${this.appId}/_design/database/_search/${
-      SearchIndexes.ROWS
-    }`
+    const url = `${env.COUCH_DB_URL}/${this.appId}/_design/database/_search/${SearchIndexes.ROWS}`
     const body = this.buildSearchBody()
     return await runQuery(url, body)
   }
diff --git a/packages/server/src/db/client.js b/packages/server/src/db/client.js
index 9a244fee1..d50d72b18 100644
--- a/packages/server/src/db/client.js
+++ b/packages/server/src/db/client.js
@@ -12,10 +12,6 @@ PouchDB.adapter("writableStream", replicationStream.adapters.writableStream)
 
 let POUCH_DB_DEFAULTS = {
   prefix: COUCH_DB_URL,
-  auth: {
-    username: env.COUCH_DB_USERNAME,
-    password: env.COUCH_DB_PASSWORD,
-  },
 }
 
 if (env.isTest()) {
diff --git a/packages/server/src/environment.js b/packages/server/src/environment.js
index 45c767385..52c680f65 100644
--- a/packages/server/src/environment.js
+++ b/packages/server/src/environment.js
@@ -23,8 +23,6 @@ module.exports = {
   // important
   PORT: process.env.PORT,
   JWT_SECRET: process.env.JWT_SECRET,
-  COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
-  COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
   COUCH_DB_URL: process.env.COUCH_DB_URL,
   MINIO_URL: process.env.MINIO_URL,
   WORKER_URL: process.env.WORKER_URL,
diff --git a/packages/worker/scripts/dev/manage.js b/packages/worker/scripts/dev/manage.js
index d7eb76fc7..b9d28b627 100644
--- a/packages/worker/scripts/dev/manage.js
+++ b/packages/worker/scripts/dev/manage.js
@@ -17,7 +17,7 @@ async function init() {
     REDIS_URL: "localhost:6379",
     REDIS_PASSWORD: "budibase",
     MINIO_URL: "http://localhost:10000/",
-    COUCH_DB_URL: "http://localhost:10000/db/",
+    COUCH_DB_URL: "http://budibase:budibase@localhost:10000/db/",
   }
   let envFile = ""
   Object.keys(envFileJson).forEach(key => {
diff --git a/packages/worker/src/db/index.js b/packages/worker/src/db/index.js
index c0676634f..d6d035cff 100644
--- a/packages/worker/src/db/index.js
+++ b/packages/worker/src/db/index.js
@@ -7,10 +7,6 @@ const COUCH_DB_URL = env.COUCH_DB_URL || "http://localhost:10000/db/"
 
 let POUCH_DB_DEFAULTS = {
   prefix: COUCH_DB_URL,
-  auth: {
-    username: env.COUCH_DB_USERNAME,
-    password: env.COUCH_DB_PASSWORD,
-  },
 }
 
 if (env.isTest()) {

From fe752951adb77da385480a97d1134444dbf51109 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 17 Aug 2021 06:25:14 +0000
Subject: [PATCH 09/58] v0.9.107

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index 30b42fc1e..1b2dfb6bb 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.106",
+  "version": "0.9.107",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index db542205f..8e8395b21 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.106",
+  "version": "0.9.107",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index b1951d987..7ea6d15a5 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.106",
+  "version": "0.9.107",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 9595ad603..2aa61c79b 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.106",
+  "version": "0.9.107",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.106",
-    "@budibase/client": "^0.9.106",
+    "@budibase/bbui": "^0.9.107",
+    "@budibase/client": "^0.9.107",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.106",
+    "@budibase/string-templates": "^0.9.107",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index aa5b558bd..c328df69c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.106",
+  "version": "0.9.107",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 4fe16bc42..897217186 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.106",
+  "version": "0.9.107",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.106",
-    "@budibase/standard-components": "^0.9.106",
-    "@budibase/string-templates": "^0.9.106",
+    "@budibase/bbui": "^0.9.107",
+    "@budibase/standard-components": "^0.9.107",
+    "@budibase/string-templates": "^0.9.107",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index ad9a14682..5daca5d40 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.106",
+  "version": "0.9.107",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -60,9 +60,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.106",
-    "@budibase/client": "^0.9.106",
-    "@budibase/string-templates": "^0.9.106",
+    "@budibase/auth": "^0.9.107",
+    "@budibase/client": "^0.9.107",
+    "@budibase/string-templates": "^0.9.107",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -115,7 +115,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.106",
+    "@budibase/standard-components": "^0.9.107",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 2b017c90a..96b2deff0 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.106",
+  "version": "0.9.107",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.106",
+    "@budibase/bbui": "^0.9.107",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index f124d5764..b64b19bb9 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.106",
+  "version": "0.9.107",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 8b504aa44..9d6b98aa6 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.106",
+  "version": "0.9.107",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.106",
-    "@budibase/string-templates": "^0.9.106",
+    "@budibase/auth": "^0.9.107",
+    "@budibase/string-templates": "^0.9.107",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From 295e36f576bb37af4a5555cdf137e64bd61d0fd0 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 19 Aug 2021 16:54:44 +0100
Subject: [PATCH 10/58] Add ability for user to select 'List' data type for a
 column

---
 packages/bbui/src/Table/ArrayRenderer.svelte    | 17 +++++++++++++++++
 packages/bbui/src/Table/CellRenderer.svelte     |  3 ++-
 .../backend/DataTable/RowFieldControl.svelte    | 14 +++++++++++++-
 .../DataTable/modals/CreateEditColumn.svelte    | 13 +++++++++++++
 .../TableNavigator/TableDataImport.svelte       |  4 ++++
 packages/builder/src/constants/backend/index.js |  9 +++++++++
 .../server/src/api/controllers/row/utils.js     | 16 ++++++++++++++--
 packages/server/src/constants/index.js          |  1 +
 packages/server/src/utilities/rowProcessor.js   |  5 +++++
 9 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 packages/bbui/src/Table/ArrayRenderer.svelte

diff --git a/packages/bbui/src/Table/ArrayRenderer.svelte b/packages/bbui/src/Table/ArrayRenderer.svelte
new file mode 100644
index 000000000..8281fce78
--- /dev/null
+++ b/packages/bbui/src/Table/ArrayRenderer.svelte
@@ -0,0 +1,17 @@
+<script>
+  import "@spectrum-css/label/dist/index-vars.css"
+  import { Badge } from "@budibase/bbui"
+  export let value
+
+  const displayLimit = 5
+
+  $: badges = value?.slice(0, displayLimit) ?? []
+  $: leftover = (value?.length ?? 0) - badges.length
+</script>
+
+{#each badges as badge}
+  <Badge size="S" grey>{badge}</Badge>
+{/each}
+{#if leftover}
+  <div>+{leftover} more</div>
+{/if}
diff --git a/packages/bbui/src/Table/CellRenderer.svelte b/packages/bbui/src/Table/CellRenderer.svelte
index 2d073b778..d6a2f3196 100644
--- a/packages/bbui/src/Table/CellRenderer.svelte
+++ b/packages/bbui/src/Table/CellRenderer.svelte
@@ -4,7 +4,7 @@
   import DateTimeRenderer from "./DateTimeRenderer.svelte"
   import RelationshipRenderer from "./RelationshipRenderer.svelte"
   import AttachmentRenderer from "./AttachmentRenderer.svelte"
-
+  import ArrayRenderer from "./ArrayRenderer.svelte"
   export let row
   export let schema
   export let value
@@ -19,6 +19,7 @@
     options: StringRenderer,
     number: StringRenderer,
     longform: StringRenderer,
+    array: ArrayRenderer,
   }
   $: type = schema?.type ?? "string"
   $: customRenderer = customRenderers?.find(x => x.column === schema?.name)
diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index 078dbf25b..66879b83c 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -1,5 +1,12 @@
 <script>
-  import { Input, Select, DatePicker, Toggle, TextArea } from "@budibase/bbui"
+  import {
+    Input,
+    Select,
+    DatePicker,
+    Toggle,
+    TextArea,
+    Multiselect,
+  } from "@budibase/bbui"
   import Dropzone from "components/common/Dropzone.svelte"
   import { capitalise } from "helpers"
   import LinkedRowSelector from "components/common/LinkedRowSelector.svelte"
@@ -26,6 +33,11 @@
   <Dropzone {label} bind:value />
 {:else if type === "boolean"}
   <Toggle text={label} bind:value data-cy="{meta.name}-input" />
+{:else if type === "array"}
+  <Multiselect
+    bind:value
+    options={meta.constraints.inclusion.reduce((p, n) => p.concat(n), [])}
+  />
 {:else if type === "link"}
   <LinkedRowSelector bind:linkedRows={value} schema={meta} />
 {:else if type === "longform"}
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 35722481d..3f3d28bf8 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -29,6 +29,7 @@
 
   const AUTO_TYPE = "auto"
   const FORMULA_TYPE = FIELDS.FORMULA.type
+  const ARRAY_TYPE = FIELDS.ARRAY.type
   const LINK_TYPE = FIELDS.LINK.type
   let fieldDefinitions = cloneDeep(FIELDS)
   const { hide } = getContext(Context.Modal)
@@ -81,6 +82,13 @@
     if (field.type === AUTO_TYPE) {
       field = buildAutoColumn($tables.draft.name, field.name, field.subtype)
     }
+    if (field.type === ARRAY_TYPE) {
+      let arr = field.constraints.inclusion
+      let newArr = []
+      newArr.push(arr)
+      console.log(newArr)
+      field.constraints.inclusion = newArr
+    }
     tables.saveField({
       originalName,
       field,
@@ -262,6 +270,11 @@
       label="Options (one per line)"
       bind:values={field.constraints.inclusion}
     />
+  {:else if field.type === "array"}
+    <ValuesList
+      label="Options (one per line)"
+      bind:values={field.constraints.inclusion}
+    />
   {:else if field.type === "datetime"}
     <DatePicker
       label="Earliest"
diff --git a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
index 8ce2ebe7f..57150b229 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
@@ -113,6 +113,10 @@
       label: "Options",
       value: FIELDS.OPTIONS.type,
     },
+    {
+      label: "List",
+      value: FIELDS.ARRAY.type,
+    },
   ]
 </script>
 
diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js
index 88152deb0..2ce88c964 100644
--- a/packages/builder/src/constants/backend/index.js
+++ b/packages/builder/src/constants/backend/index.js
@@ -26,6 +26,15 @@ export const FIELDS = {
       inclusion: [],
     },
   },
+  ARRAY: {
+    name: "List",
+    type: "array",
+    constraints: {
+      type: "array",
+      presence: false,
+      inclusion: [],
+    },
+  },
   NUMBER: {
     name: "Number",
     type: "number",
diff --git a/packages/server/src/api/controllers/row/utils.js b/packages/server/src/api/controllers/row/utils.js
index 16c48181d..bdb7e0378 100644
--- a/packages/server/src/api/controllers/row/utils.js
+++ b/packages/server/src/api/controllers/row/utils.js
@@ -58,12 +58,24 @@ exports.validate = async ({ appId, tableId, row, table }) => {
     const constraints = cloneDeep(table.schema[fieldName].constraints)
     // special case for options, need to always allow unselected (null)
     if (
-      table.schema[fieldName].type === FieldTypes.OPTIONS &&
+      table.schema[fieldName].type ===
+        (FieldTypes.OPTIONS || FieldTypes.ARRAY) &&
       constraints.inclusion
     ) {
       constraints.inclusion.push(null)
     }
-    const res = validateJs.single(row[fieldName], constraints)
+    let res
+
+    // Validate.js doesn't seem to handle array of array very well
+    if (table.schema[fieldName].type === FieldTypes.ARRAY) {
+      row[fieldName].map(val => {
+        if (constraints.inclusion.includes(val)) {
+          errors[fieldName] = "Field not in list"
+        }
+      })
+    } else {
+      res = validateJs.single(row[fieldName], constraints)
+    }
     if (res) errors[fieldName] = res
   }
   return { valid: Object.keys(errors).length === 0, errors }
diff --git a/packages/server/src/constants/index.js b/packages/server/src/constants/index.js
index 703b33deb..bc7b5b368 100644
--- a/packages/server/src/constants/index.js
+++ b/packages/server/src/constants/index.js
@@ -12,6 +12,7 @@ exports.FieldTypes = {
   OPTIONS: "options",
   NUMBER: "number",
   BOOLEAN: "boolean",
+  ARRAY: "array",
   DATETIME: "datetime",
   ATTACHMENT: "attachment",
   LINK: "link",
diff --git a/packages/server/src/utilities/rowProcessor.js b/packages/server/src/utilities/rowProcessor.js
index c067d4de8..3c43a2040 100644
--- a/packages/server/src/utilities/rowProcessor.js
+++ b/packages/server/src/utilities/rowProcessor.js
@@ -29,6 +29,11 @@ const TYPE_TRANSFORM_MAP = {
     [null]: null,
     [undefined]: undefined,
   },
+  [FieldTypes.ARRAY]: {
+    "": [],
+    [null]: [],
+    [undefined]: undefined,
+  },
   [FieldTypes.STRING]: {
     "": "",
     [null]: "",

From dc62434f8554a06d57321c410ef3affe2f54bf62 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 19 Aug 2021 17:18:41 +0100
Subject: [PATCH 11/58] Remove schema validation when inheriting initial values
 in forms

---
 packages/standard-components/src/forms/Form.svelte | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/standard-components/src/forms/Form.svelte b/packages/standard-components/src/forms/Form.svelte
index 2514232eb..b08a85343 100644
--- a/packages/standard-components/src/forms/Form.svelte
+++ b/packages/standard-components/src/forms/Form.svelte
@@ -24,12 +24,9 @@
     if (["user", "url"].includes(context.closestComponentId)) {
       return {}
     }
-    // Only inherit values if the table ID matches
+    // Always inherit the closest data source
     const closestContext = context[`${context.closestComponentId}`] || {}
-    if (dataSource.tableId !== closestContext?.tableId) {
-      return {}
-    }
-    return closestContext
+    return closestContext || {}
   }
 
   $: initialValues = getInitialValues(actionType, dataSource, $context)

From a371c77579a4dc0eec8c7504f10bbb37004d7aee Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 19 Aug 2021 16:28:01 +0000
Subject: [PATCH 12/58] v0.9.108

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index 1b2dfb6bb..f77edaab1 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.107",
+  "version": "0.9.108",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 8e8395b21..1ef8877eb 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.107",
+  "version": "0.9.108",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 7ea6d15a5..9fc53e0f5 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.107",
+  "version": "0.9.108",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 2aa61c79b..07ad4c935 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.107",
+  "version": "0.9.108",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.107",
-    "@budibase/client": "^0.9.107",
+    "@budibase/bbui": "^0.9.108",
+    "@budibase/client": "^0.9.108",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.107",
+    "@budibase/string-templates": "^0.9.108",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index c328df69c..68934a0c7 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.107",
+  "version": "0.9.108",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 897217186..08d98ac4b 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.107",
+  "version": "0.9.108",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.107",
-    "@budibase/standard-components": "^0.9.107",
-    "@budibase/string-templates": "^0.9.107",
+    "@budibase/bbui": "^0.9.108",
+    "@budibase/standard-components": "^0.9.108",
+    "@budibase/string-templates": "^0.9.108",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 5daca5d40..a2cf814e1 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.107",
+  "version": "0.9.108",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -60,9 +60,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.107",
-    "@budibase/client": "^0.9.107",
-    "@budibase/string-templates": "^0.9.107",
+    "@budibase/auth": "^0.9.108",
+    "@budibase/client": "^0.9.108",
+    "@budibase/string-templates": "^0.9.108",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -115,7 +115,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.107",
+    "@budibase/standard-components": "^0.9.108",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 96b2deff0..cb29853a3 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.107",
+  "version": "0.9.108",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.107",
+    "@budibase/bbui": "^0.9.108",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index b64b19bb9..13626d1b9 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.107",
+  "version": "0.9.108",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 9d6b98aa6..5be0d4f92 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.107",
+  "version": "0.9.108",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.107",
-    "@budibase/string-templates": "^0.9.107",
+    "@budibase/auth": "^0.9.108",
+    "@budibase/string-templates": "^0.9.108",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From f5254f41d12d5b5e0d877acb5a6a7784468da0a9 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Fri, 20 Aug 2021 09:47:08 +0100
Subject: [PATCH 13/58] allow users to override watchtower port

---
 hosting/docker-compose.yaml         | 2 ++
 hosting/hosting.properties          | 1 +
 packages/cli/src/hosting/makeEnv.js | 1 +
 3 files changed, 4 insertions(+)

diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml
index 9cdf2b211..fffadae24 100644
--- a/hosting/docker-compose.yaml
+++ b/hosting/docker-compose.yaml
@@ -119,6 +119,8 @@ services:
   
   watchtower-service:
     image: containrrr/watchtower
+    ports:
+      - "${WATCHTOWER_PORT}:8080"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     command: --debug --http-api-update bbapps bbworker
diff --git a/hosting/hosting.properties b/hosting/hosting.properties
index d11972bc4..6382bf2f0 100644
--- a/hosting/hosting.properties
+++ b/hosting/hosting.properties
@@ -17,4 +17,5 @@ WORKER_PORT=4003
 MINIO_PORT=4004
 COUCH_DB_PORT=4005
 REDIS_PORT=6379
+WATCHTOWER_PORT=8080
 BUDIBASE_ENVIRONMENT=PRODUCTION
diff --git a/packages/cli/src/hosting/makeEnv.js b/packages/cli/src/hosting/makeEnv.js
index 8806c2e1e..ff59e6057 100644
--- a/packages/cli/src/hosting/makeEnv.js
+++ b/packages/cli/src/hosting/makeEnv.js
@@ -26,6 +26,7 @@ WORKER_PORT=4003
 MINIO_PORT=4004
 COUCH_DB_PORT=4005
 REDIS_PORT=6379
+WATCHTOWER_PORT=8080
 BUDIBASE_ENVIRONMENT=PRODUCTION`
 }
 

From b588b9a1944c350d6d00772b5e77062f8c66dd56 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 16 Aug 2021 09:44:15 +0100
Subject: [PATCH 14/58] Bug fix for unable to navigate from sql screen

---
 .../[selectedDatasource]/index.svelte          | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
index b0377d2f2..0cd667a82 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
@@ -9,7 +9,6 @@
   import ICONS from "components/backend/DatasourceNavigator/icons"
   import { capitalise } from "helpers"
 
-  let unsaved = false
   let relationshipModal
   let displayColumnModal
   let selectedFromRelationship, selectedToRelationship
@@ -71,7 +70,6 @@
       // Create datasource
       await datasources.save(datasource)
       notifications.success(`Datasource ${name} updated successfully.`)
-      unsaved = false
     } catch (err) {
       notifications.error(`Error saving datasource: ${err}`)
     }
@@ -81,7 +79,6 @@
     try {
       await datasources.updateSchema(datasource)
       notifications.success(`Datasource ${name} tables updated successfully.`)
-      unsaved = false
       await tables.fetch()
     } catch (err) {
       notifications.error(`Error updating datasource schema: ${err}`)
@@ -98,10 +95,6 @@
     $goto(`../../table/${table._id}`)
   }
 
-  function setUnsaved() {
-    unsaved = true
-  }
-
   function openRelationshipModal(fromRelationship, toRelationship) {
     selectedFromRelationship = fromRelationship || {}
     selectedToRelationship = toRelationship || {}
@@ -111,16 +104,6 @@
   function openDisplayColumnModal() {
     displayColumnModal.show()
   }
-
-  $beforeUrlChange(() => {
-    if (unsaved) {
-      notifications.error(
-        "Unsaved changes. Please save your datasource configuration before leaving."
-      )
-      return false
-    }
-    return true
-  })
 </script>
 
 <Modal bind:this={relationshipModal}>
@@ -164,7 +147,6 @@
         <IntegrationConfigForm
           schema={integration.datasource}
           integration={datasource.config}
-          on:change={setUnsaved}
         />
       </div>
       {#if datasource.plus}

From 778dbf0cdbe91865f666bd0d5f41daa8e6ae7b84 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 18 Aug 2021 00:02:17 +0100
Subject: [PATCH 15/58] fixes organisation logo not showing

---
 .../data/datasource/[selectedDatasource]/index.svelte       | 2 +-
 .../src/pages/builder/portal/settings/organisation.svelte   | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
index 0cd667a82..fc82e3a11 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto, beforeUrlChange } from "@roxi/routify"
+  import { goto } from "@roxi/routify"
   import { Button, Heading, Body, Divider, Layout, Modal } from "@budibase/bbui"
   import { datasources, integrations, queries, tables } from "stores/backend"
   import { notifications } from "@budibase/bbui"
diff --git a/packages/builder/src/pages/builder/portal/settings/organisation.svelte b/packages/builder/src/pages/builder/portal/settings/organisation.svelte
index 682b0c4ee..b036585e2 100644
--- a/packages/builder/src/pages/builder/portal/settings/organisation.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/organisation.svelte
@@ -37,7 +37,11 @@
   async function uploadLogo(file) {
     let data = new FormData()
     data.append("file", file)
-    const res = await post("/api/admin/configs/upload/settings/logo", data, {})
+    const res = await post(
+      "/api/admin/configs/upload/settings/logoUrl",
+      data,
+      {}
+    )
     return await res.json()
   }
 

From 579231dca9c2827c6b3f54517a9d163a08a73098 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 20 Aug 2021 10:40:44 +0000
Subject: [PATCH 16/58] v0.9.109

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index f77edaab1..865e6adb2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.108",
+  "version": "0.9.109",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 1ef8877eb..5b083b9de 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.108",
+  "version": "0.9.109",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 9fc53e0f5..a35f3bc3c 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.108",
+  "version": "0.9.109",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 07ad4c935..8241f876f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.108",
+  "version": "0.9.109",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.108",
-    "@budibase/client": "^0.9.108",
+    "@budibase/bbui": "^0.9.109",
+    "@budibase/client": "^0.9.109",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.108",
+    "@budibase/string-templates": "^0.9.109",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 68934a0c7..09f2144a9 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.108",
+  "version": "0.9.109",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 08d98ac4b..8f1e857fd 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.108",
+  "version": "0.9.109",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.108",
-    "@budibase/standard-components": "^0.9.108",
-    "@budibase/string-templates": "^0.9.108",
+    "@budibase/bbui": "^0.9.109",
+    "@budibase/standard-components": "^0.9.109",
+    "@budibase/string-templates": "^0.9.109",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index a2cf814e1..ec63958e5 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.108",
+  "version": "0.9.109",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -60,9 +60,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.108",
-    "@budibase/client": "^0.9.108",
-    "@budibase/string-templates": "^0.9.108",
+    "@budibase/auth": "^0.9.109",
+    "@budibase/client": "^0.9.109",
+    "@budibase/string-templates": "^0.9.109",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -115,7 +115,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.108",
+    "@budibase/standard-components": "^0.9.109",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index cb29853a3..833f95979 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.108",
+  "version": "0.9.109",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.108",
+    "@budibase/bbui": "^0.9.109",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 13626d1b9..db878387e 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.108",
+  "version": "0.9.109",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 5be0d4f92..1e647ec20 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.108",
+  "version": "0.9.109",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.108",
-    "@budibase/string-templates": "^0.9.108",
+    "@budibase/auth": "^0.9.109",
+    "@budibase/string-templates": "^0.9.109",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From de071a163ce8f7832e053d6a3c7fd147d065fc8e Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 20 Aug 2021 11:57:47 +0000
Subject: [PATCH 17/58] v0.9.110

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index 865e6adb2..a92ad5f70 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.109",
+  "version": "0.9.110",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 5b083b9de..7ddaae512 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.109",
+  "version": "0.9.110",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index a35f3bc3c..26b0f890c 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.109",
+  "version": "0.9.110",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 8241f876f..24a6375e3 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.109",
+  "version": "0.9.110",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.109",
-    "@budibase/client": "^0.9.109",
+    "@budibase/bbui": "^0.9.110",
+    "@budibase/client": "^0.9.110",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.109",
+    "@budibase/string-templates": "^0.9.110",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 09f2144a9..e7ed90071 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.109",
+  "version": "0.9.110",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 8f1e857fd..5a4ba95a2 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.109",
+  "version": "0.9.110",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.109",
-    "@budibase/standard-components": "^0.9.109",
-    "@budibase/string-templates": "^0.9.109",
+    "@budibase/bbui": "^0.9.110",
+    "@budibase/standard-components": "^0.9.110",
+    "@budibase/string-templates": "^0.9.110",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index ec63958e5..95bd90eb6 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.109",
+  "version": "0.9.110",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -60,9 +60,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.109",
-    "@budibase/client": "^0.9.109",
-    "@budibase/string-templates": "^0.9.109",
+    "@budibase/auth": "^0.9.110",
+    "@budibase/client": "^0.9.110",
+    "@budibase/string-templates": "^0.9.110",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -115,7 +115,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.109",
+    "@budibase/standard-components": "^0.9.110",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 833f95979..840a17cda 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.109",
+  "version": "0.9.110",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.109",
+    "@budibase/bbui": "^0.9.110",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index db878387e..eae217553 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.109",
+  "version": "0.9.110",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 1e647ec20..dce64c1a8 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.109",
+  "version": "0.9.110",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.109",
-    "@budibase/string-templates": "^0.9.109",
+    "@budibase/auth": "^0.9.110",
+    "@budibase/string-templates": "^0.9.110",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From 641a9c8a34fe63889413853c95829289ae960d12 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Fri, 20 Aug 2021 15:20:52 +0100
Subject: [PATCH 18/58] make SQL startsWith queries case insensitive

---
 packages/server/src/integrations/base/sql.ts       | 2 +-
 packages/server/src/integrations/tests/sql.spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts
index ca6dcb15f..f03c0dbd3 100644
--- a/packages/server/src/integrations/base/sql.ts
+++ b/packages/server/src/integrations/base/sql.ts
@@ -52,7 +52,7 @@ function addFilters(
   if (filters.string) {
     iterate(filters.string, (key, value) => {
       const fnc = allOr ? "orWhere" : "where"
-      query = query[fnc](key, "like", `${value}%`)
+      query = query[fnc](key, "ilike", `${value}%`)
     })
   }
   if (filters.range) {
diff --git a/packages/server/src/integrations/tests/sql.spec.js b/packages/server/src/integrations/tests/sql.spec.js
index a02a7e819..fa8bcd1d8 100644
--- a/packages/server/src/integrations/tests/sql.spec.js
+++ b/packages/server/src/integrations/tests/sql.spec.js
@@ -82,7 +82,7 @@ describe("SQL query builder", () => {
     }))
     expect(query).toEqual({
       bindings: ["John%", limit],
-      sql: `select * from "${TABLE_NAME}" where "${TABLE_NAME}"."name" like $1 limit $2`
+      sql: `select * from "${TABLE_NAME}" where "${TABLE_NAME}"."name" ilike $1 limit $2`
     })
   })
 

From dbd0d766130f08facdf814322a6b5056b38d5979 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 20 Aug 2021 15:56:11 +0100
Subject: [PATCH 19/58] add multiselect component as option for form design

---
 .../screenTemplates/utils/commonComponents.js |   1 +
 .../backend/DataTable/RowFieldControl.svelte  |   1 +
 .../design/AppPreview/componentStructure.json |   3 +-
 .../PropertyControls/componentSettings.js     |   1 +
 packages/standard-components/manifest.json    | 106 ++++++++++++++++++
 .../src/forms/MultiFieldSelect.svelte         |  73 ++++++++++++
 .../standard-components/src/forms/index.js    |   1 +
 7 files changed, 185 insertions(+), 1 deletion(-)
 create mode 100644 packages/standard-components/src/forms/MultiFieldSelect.svelte

diff --git a/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js b/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
index 1a64a8958..7d4099592 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
@@ -131,6 +131,7 @@ const fieldTypeToComponentMap = {
   string: "stringfield",
   number: "numberfield",
   options: "optionsfield",
+  array: "multifieldselect",
   boolean: "booleanfield",
   longform: "longformfield",
   datetime: "datetimefield",
diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index 66879b83c..f2f7a6c68 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -36,6 +36,7 @@
 {:else if type === "array"}
   <Multiselect
     bind:value
+    {label}
     options={meta.constraints.inclusion.reduce((p, n) => p.concat(n), [])}
   />
 {:else if type === "link"}
diff --git a/packages/builder/src/components/design/AppPreview/componentStructure.json b/packages/builder/src/components/design/AppPreview/componentStructure.json
index c83686158..881b6baa7 100644
--- a/packages/builder/src/components/design/AppPreview/componentStructure.json
+++ b/packages/builder/src/components/design/AppPreview/componentStructure.json
@@ -20,7 +20,8 @@
       "datetimefield",
       "attachmentfield",
       "relationshipfield",
-      "daterangepicker"
+      "daterangepicker",
+      "multifieldselect"
     ]
   },
   {
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/componentSettings.js b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/componentSettings.js
index 64668d05c..3ca3f7f5c 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/componentSettings.js
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/componentSettings.js
@@ -43,6 +43,7 @@ const componentMap = {
   "field/datetime": FormFieldSelect,
   "field/attachment": FormFieldSelect,
   "field/link": FormFieldSelect,
+  "field/array": FormFieldSelect,
   // Some validation types are the same as others, so not all types are
   // explicitly listed here. e.g. options uses string validation
   "validation/string": ValidationEditor,
diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json
index 95f41a85e..8b2bb863a 100644
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@@ -2005,6 +2005,112 @@
       }
     ]
   },
+  "multifieldselect": {
+    "name": "MultiField Picker",
+    "icon": "ViewList",
+    "styles": ["size"],
+    "illegalChildren": ["section"],
+    "settings": [
+      {
+        "type": "field/array",
+        "label": "Field",
+        "key": "field"
+      },
+      {
+        "type": "text",
+        "label": "Label",
+        "key": "label"
+      },
+      {
+        "type": "text",
+        "label": "Placeholder",
+        "key": "placeholder",
+        "placeholder": "Choose an option"
+      },
+      {
+        "type": "text",
+        "label": "Default value",
+        "key": "defaultValue"
+      },
+      {
+        "type": "boolean",
+        "label": "Autocomplete",
+        "key": "autocomplete",
+        "defaultValue": false,
+        "dependsOn": {
+          "setting": "optionsType",
+          "value": "select"
+        }
+      },
+      {
+        "type": "boolean",
+        "label": "Disabled",
+        "key": "disabled",
+        "defaultValue": false
+      },
+      {
+        "type": "select",
+        "label": "Options source",
+        "key": "optionsSource",
+        "defaultValue": "schema",
+        "placeholder": "Pick an options source",
+        "options": [
+          {
+            "label": "Schema",
+            "value": "schema"
+          },
+          {
+            "label": "Data provider",
+            "value": "provider"
+          },
+          {
+            "label": "Custom",
+            "value": "custom"
+          }
+        ]
+      },
+      {
+        "type": "dataProvider",
+        "label": "Options Provider",
+        "key": "dataProvider",
+        "dependsOn": {
+          "setting": "optionsSource",
+          "value": "provider"
+        }
+      },
+      {
+        "type": "field",
+        "label": "Label Column",
+        "key": "labelColumn",
+        "dependsOn": {
+          "setting": "optionsSource",
+          "value": "provider"
+        }
+      },
+      {
+        "type": "field",
+        "label": "Value Column",
+        "key": "valueColumn",
+        "dependsOn": {
+          "setting": "optionsSource",
+          "value": "provider"
+        }
+      }, 
+      {
+        "type": "options",
+        "key": "customOptions",
+        "dependsOn": {
+          "setting": "optionsSource",
+          "value": "custom"
+        }
+      },
+      {
+        "type": "validation/string",
+        "label": "Validation",
+        "key": "validation"
+      }
+    ]
+  },
   "booleanfield": {
     "name": "Checkbox",
     "icon": "Checkmark",
diff --git a/packages/standard-components/src/forms/MultiFieldSelect.svelte b/packages/standard-components/src/forms/MultiFieldSelect.svelte
new file mode 100644
index 000000000..d44f47130
--- /dev/null
+++ b/packages/standard-components/src/forms/MultiFieldSelect.svelte
@@ -0,0 +1,73 @@
+<script>
+  import { Multiselect } from "@budibase/bbui"
+  import Field from "./Field.svelte"
+
+  export let field
+  export let label
+  export let placeholder
+  export let disabled = false
+  export let validation
+  export let defaultValue
+  export let optionsSource = "schema"
+  export let dataProvider
+  export let labelColumn
+  export let valueColumn
+  export let customOptions
+  console.log(defaultValue)
+  let fieldState
+  let fieldApi
+  let fieldSchema
+  $: options = getOptions(
+    optionsSource,
+    fieldSchema,
+    dataProvider,
+    labelColumn,
+    valueColumn
+  )
+  const getOptions = (
+    optionsSource,
+    fieldSchema,
+    dataProvider,
+    labelColumn,
+    valueColumn
+  ) => {
+    // Take options from schema
+    if (optionsSource == null || optionsSource === "schema") {
+      return fieldSchema?.constraints?.inclusion ?? []
+    }
+
+    // Extract options from data provider
+    if (optionsSource === "provider" && valueColumn) {
+      let optionsSet = {}
+      dataProvider?.rows?.forEach(row => {
+        const value = row?.[valueColumn]
+        if (value) {
+          const label = row[labelColumn] || value
+          optionsSet[value] = { value, label }
+        }
+      })
+      return Object.values(optionsSet)
+    }
+
+    // Extract custom options
+    if (optionsSource === "custom" && customOptions) {
+      return customOptions
+    }
+
+    return []
+  }
+</script>
+
+<Field
+  {field}
+  {label}
+  {disabled}
+  {validation}
+  {defaultValue}
+  type="array"
+  bind:fieldState
+  bind:fieldApi
+  bind:fieldSchema
+>
+  <Multiselect {placeholder} options={options[0]} />
+</Field>
diff --git a/packages/standard-components/src/forms/index.js b/packages/standard-components/src/forms/index.js
index fed371278..cbc278aa0 100644
--- a/packages/standard-components/src/forms/index.js
+++ b/packages/standard-components/src/forms/index.js
@@ -3,6 +3,7 @@ export { default as fieldgroup } from "./FieldGroup.svelte"
 export { default as stringfield } from "./StringField.svelte"
 export { default as numberfield } from "./NumberField.svelte"
 export { default as optionsfield } from "./OptionsField.svelte"
+export { default as multifieldselect } from "./MultiFieldSelect.svelte"
 export { default as booleanfield } from "./BooleanField.svelte"
 export { default as longformfield } from "./LongFormField.svelte"
 export { default as datetimefield } from "./DateTimeField.svelte"

From 003689fa8a46ed7b634e695967ae26b550b45a5d Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Fri, 20 Aug 2021 16:21:08 +0100
Subject: [PATCH 20/58] fix test

---
 packages/server/src/api/routes/tests/datasource.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/api/routes/tests/datasource.spec.js b/packages/server/src/api/routes/tests/datasource.spec.js
index 7387dd3c4..98a99717f 100644
--- a/packages/server/src/api/routes/tests/datasource.spec.js
+++ b/packages/server/src/api/routes/tests/datasource.spec.js
@@ -94,7 +94,7 @@ describe("/datasources", () => {
         .expect(200)
       // this is mock data, can't test it
       expect(res.body).toBeDefined()
-      expect(pg.queryMock).toHaveBeenCalledWith(`select "users"."name" as "users.name", "users"."age" as "users.age" from "users" where "users"."name" like $1 limit $2`, ["John%", 5000])
+      expect(pg.queryMock).toHaveBeenCalledWith(`select "users"."name" as "users.name", "users"."age" as "users.age" from "users" where "users"."name" ilike $1 limit $2`, ["John%", 5000])
     })
   })
 

From 9ad8b676ca1ec2ddc6dbb6d71874cdf19df81cad Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 20 Aug 2021 16:43:42 +0000
Subject: [PATCH 21/58] v0.9.111

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index a92ad5f70..d818043b3 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.110",
+  "version": "0.9.111",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 7ddaae512..510521384 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.110",
+  "version": "0.9.111",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 26b0f890c..16a4106a5 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.110",
+  "version": "0.9.111",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 24a6375e3..1631a98ae 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.110",
+  "version": "0.9.111",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.110",
-    "@budibase/client": "^0.9.110",
+    "@budibase/bbui": "^0.9.111",
+    "@budibase/client": "^0.9.111",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.110",
+    "@budibase/string-templates": "^0.9.111",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index e7ed90071..9f8e91d8b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.110",
+  "version": "0.9.111",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 5a4ba95a2..1023dbc86 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.110",
+  "version": "0.9.111",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.110",
-    "@budibase/standard-components": "^0.9.110",
-    "@budibase/string-templates": "^0.9.110",
+    "@budibase/bbui": "^0.9.111",
+    "@budibase/standard-components": "^0.9.111",
+    "@budibase/string-templates": "^0.9.111",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 95bd90eb6..f25cb470a 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.110",
+  "version": "0.9.111",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -60,9 +60,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.110",
-    "@budibase/client": "^0.9.110",
-    "@budibase/string-templates": "^0.9.110",
+    "@budibase/auth": "^0.9.111",
+    "@budibase/client": "^0.9.111",
+    "@budibase/string-templates": "^0.9.111",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -115,7 +115,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.110",
+    "@budibase/standard-components": "^0.9.111",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 840a17cda..b90276c85 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.110",
+  "version": "0.9.111",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.110",
+    "@budibase/bbui": "^0.9.111",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index eae217553..a587d8839 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.110",
+  "version": "0.9.111",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index dce64c1a8..602487e4e 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.110",
+  "version": "0.9.111",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.110",
-    "@budibase/string-templates": "^0.9.110",
+    "@budibase/auth": "^0.9.111",
+    "@budibase/string-templates": "^0.9.111",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From 003e941cc35e4e2898b54173d094c87372d093a3 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 23 Aug 2021 15:42:00 +0100
Subject: [PATCH 22/58] posthog cloud config

---
 packages/cli/src/constants.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/constants.js b/packages/cli/src/constants.js
index fe7c61f4f..8b9cad88a 100644
--- a/packages/cli/src/constants.js
+++ b/packages/cli/src/constants.js
@@ -15,5 +15,5 @@ exports.AnalyticsEvents = {
   SelfHostInit: "hosting_init",
 }
 
-exports.BUDIBASE_POSTHOG_URL = "https://posthog.budi.live"
-exports.BUDIBASE_POSTHOG_TOKEN = "Oeq9KzIpZYaNsXIvHw5QTZWNpfiG_EOjAOpjTyAiitY"
+exports.BUDIBASE_POSTHOG_URL = "https://app.posthog.com"
+exports.BUDIBASE_POSTHOG_TOKEN = "phc_yGOn4i7jWKaCTapdGR6lfA4AvmuEQ2ijn5zAVSFYPlS"

From 33338a9254f9480a58218060ef42f3d4e82d0d89 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 23 Aug 2021 15:56:54 +0100
Subject: [PATCH 23/58] spacing in analytics

---
 packages/builder/src/analytics.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/builder/src/analytics.js b/packages/builder/src/analytics.js
index bcc59eb31..7442816aa 100644
--- a/packages/builder/src/analytics.js
+++ b/packages/builder/src/analytics.js
@@ -79,6 +79,7 @@ const isFeedbackTimeElapsed = sinceDateStr => {
   const feedbackMilliseconds = feedbackHours * 60 * 60 * 1000
   return Date.now() > sinceDate + feedbackMilliseconds
 }
+
 function submitFeedback(values) {
   if (!analyticsEnabled || !process.env.POSTHOG_TOKEN) return
   localStorage.setItem(FEEDBACK_SUBMITTED_KEY, Date.now())

From c5311c405469a85a0640186646ad9a262552707a Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Mon, 23 Aug 2021 17:32:27 +0200
Subject: [PATCH 24/58] limit the width of the preview component

---
 packages/builder/src/components/integration/QueryViewer.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte
index 5c2523d51..e642494ce 100644
--- a/packages/builder/src/components/integration/QueryViewer.svelte
+++ b/packages/builder/src/components/integration/QueryViewer.svelte
@@ -218,6 +218,7 @@
 
   .viewer {
     min-height: 200px;
+    width: 640px;
   }
 
   .preview {

From 24515775f04172257e6022ae07775839b7750509 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 23 Aug 2021 16:38:09 +0100
Subject: [PATCH 25/58] lint

---
 packages/cli/src/constants.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/constants.js b/packages/cli/src/constants.js
index 8b9cad88a..7a3b1463c 100644
--- a/packages/cli/src/constants.js
+++ b/packages/cli/src/constants.js
@@ -16,4 +16,5 @@ exports.AnalyticsEvents = {
 }
 
 exports.BUDIBASE_POSTHOG_URL = "https://app.posthog.com"
-exports.BUDIBASE_POSTHOG_TOKEN = "phc_yGOn4i7jWKaCTapdGR6lfA4AvmuEQ2ijn5zAVSFYPlS"
+exports.BUDIBASE_POSTHOG_TOKEN =
+  "phc_yGOn4i7jWKaCTapdGR6lfA4AvmuEQ2ijn5zAVSFYPlS"

From 78b00c7ceac24724b0d7f996f188f7e8aa85953e Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 23 Aug 2021 16:29:12 +0000
Subject: [PATCH 26/58] v0.9.112

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index d818043b3..3431f5ff3 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.111",
+  "version": "0.9.112",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 510521384..dd0690afc 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.111",
+  "version": "0.9.112",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 16a4106a5..16c79e8c7 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.111",
+  "version": "0.9.112",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 1631a98ae..59b7f3d3e 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.111",
+  "version": "0.9.112",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.111",
-    "@budibase/client": "^0.9.111",
+    "@budibase/bbui": "^0.9.112",
+    "@budibase/client": "^0.9.112",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.111",
+    "@budibase/string-templates": "^0.9.112",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 9f8e91d8b..008aa4ea5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.111",
+  "version": "0.9.112",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 1023dbc86..a158d4216 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.111",
+  "version": "0.9.112",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.111",
-    "@budibase/standard-components": "^0.9.111",
-    "@budibase/string-templates": "^0.9.111",
+    "@budibase/bbui": "^0.9.112",
+    "@budibase/standard-components": "^0.9.112",
+    "@budibase/string-templates": "^0.9.112",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index f25cb470a..5c6e31562 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.111",
+  "version": "0.9.112",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -60,9 +60,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.111",
-    "@budibase/client": "^0.9.111",
-    "@budibase/string-templates": "^0.9.111",
+    "@budibase/auth": "^0.9.112",
+    "@budibase/client": "^0.9.112",
+    "@budibase/string-templates": "^0.9.112",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -115,7 +115,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.111",
+    "@budibase/standard-components": "^0.9.112",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index b90276c85..3605eee30 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.111",
+  "version": "0.9.112",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.111",
+    "@budibase/bbui": "^0.9.112",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index a587d8839..8769d0e33 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.111",
+  "version": "0.9.112",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 602487e4e..fdb5f2792 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.111",
+  "version": "0.9.112",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.111",
-    "@budibase/string-templates": "^0.9.111",
+    "@budibase/auth": "^0.9.112",
+    "@budibase/string-templates": "^0.9.112",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From e7d784787de6e1f356ce4345830e22ad6f8c530e Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 23 Aug 2021 21:48:03 +0100
Subject: [PATCH 27/58] update watchtower port to 6161

---
 hosting/docker-compose.yaml         | 2 --
 hosting/hosting.properties          | 2 +-
 packages/cli/src/hosting/makeEnv.js | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml
index fffadae24..560b27366 100644
--- a/hosting/docker-compose.yaml
+++ b/hosting/docker-compose.yaml
@@ -130,8 +130,6 @@ services:
       - WATCHTOWER_CLEANUP=true
     labels:
       - "com.centurylinklabs.watchtower.enable=false"
-    ports:
-      - 6161:8080
 
 
 volumes:
diff --git a/hosting/hosting.properties b/hosting/hosting.properties
index 6382bf2f0..c8e2f5c60 100644
--- a/hosting/hosting.properties
+++ b/hosting/hosting.properties
@@ -17,5 +17,5 @@ WORKER_PORT=4003
 MINIO_PORT=4004
 COUCH_DB_PORT=4005
 REDIS_PORT=6379
-WATCHTOWER_PORT=8080
+WATCHTOWER_PORT=6161
 BUDIBASE_ENVIRONMENT=PRODUCTION
diff --git a/packages/cli/src/hosting/makeEnv.js b/packages/cli/src/hosting/makeEnv.js
index ff59e6057..d1d23999f 100644
--- a/packages/cli/src/hosting/makeEnv.js
+++ b/packages/cli/src/hosting/makeEnv.js
@@ -26,7 +26,7 @@ WORKER_PORT=4003
 MINIO_PORT=4004
 COUCH_DB_PORT=4005
 REDIS_PORT=6379
-WATCHTOWER_PORT=8080
+WATCHTOWER_PORT=6161
 BUDIBASE_ENVIRONMENT=PRODUCTION`
 }
 

From 985ae54c9fa111d86b6ae05725d8985fd4ee6dd1 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 23 Aug 2021 20:59:56 +0000
Subject: [PATCH 28/58] v0.9.113

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index 3431f5ff3..1754992fc 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.112",
+  "version": "0.9.113",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index dd0690afc..43379c6ed 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.112",
+  "version": "0.9.113",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 16c79e8c7..e90c6c821 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.112",
+  "version": "0.9.113",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 59b7f3d3e..b703aeef2 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.112",
+  "version": "0.9.113",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.112",
-    "@budibase/client": "^0.9.112",
+    "@budibase/bbui": "^0.9.113",
+    "@budibase/client": "^0.9.113",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.112",
+    "@budibase/string-templates": "^0.9.113",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 008aa4ea5..6f64ce69c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.112",
+  "version": "0.9.113",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index a158d4216..120afdc5a 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.112",
+  "version": "0.9.113",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.112",
-    "@budibase/standard-components": "^0.9.112",
-    "@budibase/string-templates": "^0.9.112",
+    "@budibase/bbui": "^0.9.113",
+    "@budibase/standard-components": "^0.9.113",
+    "@budibase/string-templates": "^0.9.113",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 5c6e31562..4b8b38377 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.112",
+  "version": "0.9.113",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -60,9 +60,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.112",
-    "@budibase/client": "^0.9.112",
-    "@budibase/string-templates": "^0.9.112",
+    "@budibase/auth": "^0.9.113",
+    "@budibase/client": "^0.9.113",
+    "@budibase/string-templates": "^0.9.113",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -115,7 +115,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.112",
+    "@budibase/standard-components": "^0.9.113",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 3605eee30..17ccf0aec 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.112",
+  "version": "0.9.113",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.112",
+    "@budibase/bbui": "^0.9.113",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 8769d0e33..28c921610 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.112",
+  "version": "0.9.113",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index fdb5f2792..cac8ec7d3 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.112",
+  "version": "0.9.113",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.112",
-    "@budibase/string-templates": "^0.9.112",
+    "@budibase/auth": "^0.9.113",
+    "@budibase/string-templates": "^0.9.113",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From 614603a14658cd1e4c1026238b1a7befbace557a Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 24 Aug 2021 10:42:22 +0100
Subject: [PATCH 29/58] remove pageviews from PH

---
 packages/builder/src/analytics.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/builder/src/analytics.js b/packages/builder/src/analytics.js
index 7442816aa..5b130a8e6 100644
--- a/packages/builder/src/analytics.js
+++ b/packages/builder/src/analytics.js
@@ -23,6 +23,7 @@ async function activate() {
   if (posthogConfigured) {
     posthog.init(process.env.POSTHOG_TOKEN, {
       autocapture: false,
+      capture_pageview: false,
       api_host: process.env.POSTHOG_URL,
     })
     posthog.set_config({ persistence: "cookie" })

From ad7383a57bc153025f50ea6455d16cd6175ca9b0 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 24 Aug 2021 09:55:51 +0000
Subject: [PATCH 30/58] v0.9.114

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index 1754992fc..d190a75cf 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.113",
+  "version": "0.9.114",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 43379c6ed..8b6b3434b 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.113",
+  "version": "0.9.114",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index e90c6c821..e41d95563 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.113",
+  "version": "0.9.114",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index b703aeef2..d0a765f20 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.113",
+  "version": "0.9.114",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.113",
-    "@budibase/client": "^0.9.113",
+    "@budibase/bbui": "^0.9.114",
+    "@budibase/client": "^0.9.114",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.113",
+    "@budibase/string-templates": "^0.9.114",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 6f64ce69c..8676c915b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.113",
+  "version": "0.9.114",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 120afdc5a..c7976cc9c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.113",
+  "version": "0.9.114",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.113",
-    "@budibase/standard-components": "^0.9.113",
-    "@budibase/string-templates": "^0.9.113",
+    "@budibase/bbui": "^0.9.114",
+    "@budibase/standard-components": "^0.9.114",
+    "@budibase/string-templates": "^0.9.114",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 4b8b38377..dacbbbc10 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.113",
+  "version": "0.9.114",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -60,9 +60,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.113",
-    "@budibase/client": "^0.9.113",
-    "@budibase/string-templates": "^0.9.113",
+    "@budibase/auth": "^0.9.114",
+    "@budibase/client": "^0.9.114",
+    "@budibase/string-templates": "^0.9.114",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -115,7 +115,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.113",
+    "@budibase/standard-components": "^0.9.114",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 17ccf0aec..d586988f5 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.113",
+  "version": "0.9.114",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.113",
+    "@budibase/bbui": "^0.9.114",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 28c921610..a3b692023 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.113",
+  "version": "0.9.114",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index cac8ec7d3..65fb92ecc 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.113",
+  "version": "0.9.114",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.113",
-    "@budibase/string-templates": "^0.9.113",
+    "@budibase/auth": "^0.9.114",
+    "@budibase/string-templates": "^0.9.114",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From d55218e8135268fda091e6b2d3681f3d8e32e375 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 24 Aug 2021 16:14:38 +0100
Subject: [PATCH 31/58] Add contains option to lucene query builder

---
 .../screenTemplates/utils/commonComponents.js |  7 +++
 .../FilterEditor/FilterDrawer.svelte          | 24 ++++++++-
 packages/builder/src/helpers/lucene.js        |  7 +++
 .../src/api/controllers/row/internalSearch.js | 23 +++++++-
 packages/server/src/db/views/staticViews.js   | 10 +++-
 packages/standard-components/manifest.json    |  6 +--
 .../src/forms/MultiFieldSelect.svelte         | 48 +++++------------
 .../src/forms/OptionsField.svelte             | 38 ++------------
 .../src/forms/optionsParser.js                | 52 +++++++++++++++++++
 packages/standard-components/src/lucene.js    |  1 +
 10 files changed, 136 insertions(+), 80 deletions(-)
 create mode 100644 packages/standard-components/src/forms/optionsParser.js

diff --git a/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js b/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
index 7d4099592..5b3bc041f 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
@@ -168,6 +168,13 @@ export function makeDatasourceFormComponents(datasource) {
           optionsSource: "schema",
         })
       }
+      if (fieldType === "array") {
+        component.customProps({
+          placeholder: "Choose an option",
+          optionsSource: "schema",
+        })
+      }
+
       if (fieldType === "link") {
         let placeholder =
           fieldSchema.relationshipType === "one-to-many"
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
index d41d28e4e..cd5cc1661 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
@@ -9,6 +9,7 @@
     DrawerContent,
     Layout,
     Body,
+    Multiselect,
   } from "@budibase/bbui"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { generate } from "shortid"
@@ -59,6 +60,14 @@
       expression.operator = validOperators[0] ?? OperatorOptions.Equals.value
       onOperatorChange(expression, expression.operator)
     }
+
+    // if changed to an array, change default value to empty array
+    const idx = filters.findIndex(x => (x.field = field))
+    if (expression.type === "array") {
+      filters[idx].value = []
+    } else {
+      filters[idx].value = null
+    }
   }
 
   const onOperatorChange = (expression, operator) => {
@@ -74,7 +83,12 @@
 
   const getFieldOptions = field => {
     const schema = schemaFields.find(x => x.name === field)
-    return schema?.constraints?.inclusion || []
+    const opt =
+      schema.type == "array"
+        ? schema?.constraints?.inclusion[0]
+        : schema?.constraints?.inclusion || []
+
+    return opt
   }
 </script>
 
@@ -128,6 +142,14 @@
                 options={getFieldOptions(filter.field)}
                 bind:value={filter.value}
               />
+            {:else if filter.type === "array"}
+              <Multiselect
+                disabled={filter.noValue}
+                options={getFieldOptions(filter.field)}
+                bind:value={filter.value}
+                getOptionLabel={x => x}
+                getOptionValue={x => x}
+              />
             {:else if filter.type === "boolean"}
               <Combobox
                 disabled={filter.noValue}
diff --git a/packages/builder/src/helpers/lucene.js b/packages/builder/src/helpers/lucene.js
index 43fb155e1..c9890d8d7 100644
--- a/packages/builder/src/helpers/lucene.js
+++ b/packages/builder/src/helpers/lucene.js
@@ -31,6 +31,11 @@ export const OperatorOptions = {
     value: "rangeHigh",
     label: "Less than",
   },
+  Contains: {
+    value: "contains",
+    label: "Contains",
+  },
+
 }
 
 export const getValidOperatorsForType = type => {
@@ -55,6 +60,8 @@ export const getValidOperatorsForType = type => {
     ]
   } else if (type === "options") {
     return [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty]
+  } else if (type === "array") {
+    return [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.Contains]
   } else if (type === "boolean") {
     return [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty]
   } else if (type === "longform") {
diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js
index cc35da40e..e2e7beee2 100644
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@@ -17,6 +17,7 @@ class QueryBuilder {
       notEqual: {},
       empty: {},
       notEmpty: {},
+      contains: {},
       ...base,
     }
     this.limit = 50
@@ -104,6 +105,12 @@ class QueryBuilder {
     return this
   }
 
+  addContains(key, value) {
+    this.query.contains[key] = value
+    return this
+  }
+
+
   /**
    * Preprocesses a value before going into a lucene search.
    * Transforms strings to lowercase and wraps strings and bools in quotes.
@@ -121,7 +128,7 @@ class QueryBuilder {
     }
     // Escape characters
     if (escape && originalType === "string") {
-      value = `${value}`.replace(/[ #+\-&|!(){}\]^"~*?:\\]/g, "\\$&")
+      value = `${value}`.replace(/[ #+\-&|!{}\]^"~*?:\\]/g, "\\$&")
     }
     // Wrap in quotes
     if (hasVersion && wrap) {
@@ -212,6 +219,19 @@ class QueryBuilder {
       build(this.query.notEmpty, key => `${key}:["" TO *]`)
     }
 
+    if (this.query.contains) {
+      build(this.query.contains, (key, value) => {
+        if (!value) {
+          return null
+        }
+        let opts = []
+        value.forEach(val => opts.push(`${key}.${val}:${builder.preprocess(val, allPreProcessingOpts)}`))
+        const joined = opts.join(' AND ')
+        return joined
+      })
+
+    }
+
     return query
   }
 
@@ -253,6 +273,7 @@ const runQuery = async (url, body) => {
     method: "POST",
   })
   const json = await response.json()
+  console.log(json)
   let output = {
     rows: [],
   }
diff --git a/packages/server/src/db/views/staticViews.js b/packages/server/src/db/views/staticViews.js
index 23f320d7e..35ccbd21b 100644
--- a/packages/server/src/db/views/staticViews.js
+++ b/packages/server/src/db/views/staticViews.js
@@ -94,12 +94,18 @@ exports.createAllSearchIndex = async appId => {
   await searchIndex(
     appId,
     SearchIndexes.ROWS,
-    function (doc) {
+    function (doc) {      
       function idx(input, prev) {
         for (let key of Object.keys(input)) {
           let idxKey = prev != null ? `${prev}.${key}` : key
           idxKey = idxKey.replace(/ /, "_")
-          if (key === "_id" || key === "_rev" || input[key] == null) {
+
+        
+          if (Array.isArray(input[key])) {
+            for (val in input[key]) {
+              index(`${idxKey}.${input[key][v]}`, input[key][v], { store: true });
+            }
+          } else if (key === "_id" || key === "_rev" || input[key] == null) {
             continue
           }
           if (typeof input[key] === "string") {
diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json
index 8b2bb863a..948ebc91d 100644
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@@ -2036,11 +2036,7 @@
         "type": "boolean",
         "label": "Autocomplete",
         "key": "autocomplete",
-        "defaultValue": false,
-        "dependsOn": {
-          "setting": "optionsType",
-          "value": "select"
-        }
+        "defaultValue": false
       },
       {
         "type": "boolean",
diff --git a/packages/standard-components/src/forms/MultiFieldSelect.svelte b/packages/standard-components/src/forms/MultiFieldSelect.svelte
index d44f47130..4e6777d96 100644
--- a/packages/standard-components/src/forms/MultiFieldSelect.svelte
+++ b/packages/standard-components/src/forms/MultiFieldSelect.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Multiselect } from "@budibase/bbui"
   import Field from "./Field.svelte"
-
+  import { getOptions } from "./optionsParser"
   export let field
   export let label
   export let placeholder
@@ -13,49 +13,20 @@
   export let labelColumn
   export let valueColumn
   export let customOptions
-  console.log(defaultValue)
+
   let fieldState
   let fieldApi
   let fieldSchema
+
+  $: flatOptions = optionsSource == null || optionsSource === "schema"
   $: options = getOptions(
     optionsSource,
     fieldSchema,
     dataProvider,
     labelColumn,
-    valueColumn
+    valueColumn,
+    customOptions
   )
-  const getOptions = (
-    optionsSource,
-    fieldSchema,
-    dataProvider,
-    labelColumn,
-    valueColumn
-  ) => {
-    // Take options from schema
-    if (optionsSource == null || optionsSource === "schema") {
-      return fieldSchema?.constraints?.inclusion ?? []
-    }
-
-    // Extract options from data provider
-    if (optionsSource === "provider" && valueColumn) {
-      let optionsSet = {}
-      dataProvider?.rows?.forEach(row => {
-        const value = row?.[valueColumn]
-        if (value) {
-          const label = row[labelColumn] || value
-          optionsSet[value] = { value, label }
-        }
-      })
-      return Object.values(optionsSet)
-    }
-
-    // Extract custom options
-    if (optionsSource === "custom" && customOptions) {
-      return customOptions
-    }
-
-    return []
-  }
 </script>
 
 <Field
@@ -69,5 +40,10 @@
   bind:fieldApi
   bind:fieldSchema
 >
-  <Multiselect {placeholder} options={options[0]} />
+  <Multiselect
+    getOptionLabel={flatOptions ? x => x : x => x.label}
+    getOptionValue={flatOptions ? x => x : x => x.value}
+    {placeholder}
+    {options}
+  />
 </Field>
diff --git a/packages/standard-components/src/forms/OptionsField.svelte b/packages/standard-components/src/forms/OptionsField.svelte
index b43ddb9f3..e240c8f23 100644
--- a/packages/standard-components/src/forms/OptionsField.svelte
+++ b/packages/standard-components/src/forms/OptionsField.svelte
@@ -1,7 +1,7 @@
 <script>
   import { CoreSelect, CoreRadioGroup } from "@budibase/bbui"
   import Field from "./Field.svelte"
-
+  import { getOptions } from "./optionsParser"
   export let field
   export let label
   export let placeholder
@@ -26,41 +26,9 @@
     fieldSchema,
     dataProvider,
     labelColumn,
-    valueColumn
+    valueColumn,
+    customOptions
   )
-
-  const getOptions = (
-    optionsSource,
-    fieldSchema,
-    dataProvider,
-    labelColumn,
-    valueColumn
-  ) => {
-    // Take options from schema
-    if (optionsSource == null || optionsSource === "schema") {
-      return fieldSchema?.constraints?.inclusion ?? []
-    }
-
-    // Extract options from data provider
-    if (optionsSource === "provider" && valueColumn) {
-      let optionsSet = {}
-      dataProvider?.rows?.forEach(row => {
-        const value = row?.[valueColumn]
-        if (value) {
-          const label = row[labelColumn] || value
-          optionsSet[value] = { value, label }
-        }
-      })
-      return Object.values(optionsSet)
-    }
-
-    // Extract custom options
-    if (optionsSource === "custom" && customOptions) {
-      return customOptions
-    }
-
-    return []
-  }
 </script>
 
 <Field
diff --git a/packages/standard-components/src/forms/optionsParser.js b/packages/standard-components/src/forms/optionsParser.js
new file mode 100644
index 000000000..7df00c342
--- /dev/null
+++ b/packages/standard-components/src/forms/optionsParser.js
@@ -0,0 +1,52 @@
+export const getOptions = (
+    optionsSource,
+    fieldSchema,
+    dataProvider,
+    labelColumn,
+    valueColumn,
+    customOptions
+  ) => {
+      const isArray = fieldSchema?.type === "array"
+    // Take options from schema
+    if (optionsSource == null || optionsSource === "schema") {
+      if (isArray) {
+        return fieldSchema?.constraints?.inclusion[0] ?? []
+      }
+      return fieldSchema?.constraints?.inclusion ?? []
+    }
+
+    if (optionsSource === "provider" && isArray) {
+        let optionsSet = {}
+
+        dataProvider?.rows?.forEach(row => {
+        const value = row?.[valueColumn]
+            if (value) {
+              const label = row[labelColumn] || value
+              optionsSet[value] = { value, label }
+            }
+        })
+        return Object.values(optionsSet)
+        }
+    
+    
+
+    // Extract options from data provider
+    if (optionsSource === "provider" && valueColumn) {
+      let optionsSet = {}
+      dataProvider?.rows?.forEach(row => {
+        const value = row?.[valueColumn]
+        if (value) {
+          const label = row[labelColumn] || value
+          optionsSet[value] = { value, label }
+        }
+      })
+      return Object.values(optionsSet)
+    }
+
+    // Extract custom options
+    if (optionsSource === "custom" && customOptions) {
+      return customOptions
+    }
+
+    return []
+  }
diff --git a/packages/standard-components/src/lucene.js b/packages/standard-components/src/lucene.js
index 50aae1f32..f132086aa 100644
--- a/packages/standard-components/src/lucene.js
+++ b/packages/standard-components/src/lucene.js
@@ -11,6 +11,7 @@ export const buildLuceneQuery = filter => {
     notEqual: {},
     empty: {},
     notEmpty: {},
+    contains: {}
   }
   if (Array.isArray(filter)) {
     filter.forEach(expression => {

From 0a8c6e1ef9a85ac122ea092a5aa7e6ae2a63156f Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 24 Aug 2021 20:04:28 +0100
Subject: [PATCH 32/58] making sure relationships for autocolumns are created
 when uploading a CSV

---
 packages/server/src/api/controllers/table/utils.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/server/src/api/controllers/table/utils.js b/packages/server/src/api/controllers/table/utils.js
index 78dae60ab..70e423ca8 100644
--- a/packages/server/src/api/controllers/table/utils.js
+++ b/packages/server/src/api/controllers/table/utils.js
@@ -1,4 +1,5 @@
 const CouchDB = require("../../../db")
+const linkRows = require("../../../db/linkedRows")
 const csvParser = require("../../../utilities/csvParser")
 const {
   getRowParams,
@@ -74,6 +75,15 @@ exports.handleDataImport = async (appId, user, table, dataImport) => {
       const processed = inputProcessing(user, table, row)
       table = processed.table
       row = processed.row
+      // make sure link rows are up to date
+      row = await linkRows.updateLinks({
+        appId,
+        eventType: linkRows.EventType.ROW_SAVE,
+        row,
+        tableId: row.tableId,
+        table,
+      })
+
       for (let [fieldName, schema] of Object.entries(table.schema)) {
         // check whether the options need to be updated for inclusion as part of the data import
         if (

From c8382596eb4f4b295c232a57875c3aac01e177c8 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 25 Aug 2021 09:53:43 +0100
Subject: [PATCH 33/58] Add size option back to forms

---
 packages/standard-components/manifest.json        | 15 +++++++++++++++
 .../src/forms/InnerForm.svelte                    |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json
index 95f41a85e..f6eb99a02 100644
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@@ -1725,6 +1725,21 @@
           "label": "Custom"
         }
       },
+      {
+        "type": "select",
+        "label": "Size",
+        "key": "size",
+        "options": [
+          {
+            "label": "Medium",
+            "value": "spectrum--medium"
+          }, {
+            "label": "Large",
+            "value": "spectrum--large"
+          }
+        ],
+        "defaultValue": "spectrum--medium"
+      },
       {
         "type": "boolean",
         "label": "Disabled",
diff --git a/packages/standard-components/src/forms/InnerForm.svelte b/packages/standard-components/src/forms/InnerForm.svelte
index eea2e6ebf..b35b5bfcf 100644
--- a/packages/standard-components/src/forms/InnerForm.svelte
+++ b/packages/standard-components/src/forms/InnerForm.svelte
@@ -7,6 +7,7 @@
   export let dataSource
   export let disabled = false
   export let initialValues
+  export let size
 
   const component = getContext("component")
   const { styleable, API, Provider, ActionTypes } = getContext("sdk")
@@ -231,7 +232,7 @@
   {actions}
   data={{ ...$formState.values, tableId: dataSource?.tableId }}
 >
-  <div use:styleable={$component.styles}>
+  <div use:styleable={$component.styles} class={size}>
     {#if loaded}
       <slot />
     {/if}

From 1733e54a25a78056ec6c7b40f97bdd8d1e319a29 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 25 Aug 2021 09:56:42 +0100
Subject: [PATCH 34/58] Add size setting back to table

---
 packages/standard-components/manifest.json       | 16 ++++++++++++++++
 .../standard-components/src/table/Table.svelte   |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json
index f6eb99a02..1a8bbf5f9 100644
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@@ -2325,6 +2325,22 @@
         "dependsOn": "dataProvider",
         "placeholder": "All columns"
       },
+      {
+        "type": "select",
+        "label": "Size",
+        "key": "size",
+        "defaultValue": "spectrum--medium",
+        "options": [
+          {
+            "label": "Medium",
+            "value": "spectrum--medium"
+          },
+          {
+            "label": "Large",
+            "value": "spectrum--large"
+          }
+        ]
+      },
       {
         "type": "boolean",
         "label": "Quiet",
diff --git a/packages/standard-components/src/table/Table.svelte b/packages/standard-components/src/table/Table.svelte
index 3620146ce..ba9f3aae9 100644
--- a/packages/standard-components/src/table/Table.svelte
+++ b/packages/standard-components/src/table/Table.svelte
@@ -8,6 +8,7 @@
   export let showAutoColumns
   export let rowCount
   export let quiet
+  export let size
 
   const component = getContext("component")
   const { styleable } = getContext("sdk")
@@ -71,7 +72,7 @@
   }
 </script>
 
-<div use:styleable={$component.styles}>
+<div use:styleable={$component.styles} class={size}>
   <Table
     {data}
     {schema}

From 7dc4a8785b419e53583e0bfeb7f106a1780aa978 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 25 Aug 2021 09:57:53 +0100
Subject: [PATCH 35/58] Update autoscreens to have size settings again

---
 .../src/builderStore/store/screenTemplates/newRowScreen.js       | 1 +
 .../src/builderStore/store/screenTemplates/rowDetailScreen.js    | 1 -
 .../src/builderStore/store/screenTemplates/rowListScreen.js      | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/builderStore/store/screenTemplates/newRowScreen.js b/packages/builder/src/builderStore/store/screenTemplates/newRowScreen.js
index b890d42d5..c2dffef4b 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/newRowScreen.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/newRowScreen.js
@@ -43,6 +43,7 @@ const createScreen = table => {
         tableId: table._id,
         type: "table",
       },
+      size: "spectrum--medium",
     })
 
   const fieldGroup = new Component("@budibase/standard-components/fieldgroup")
diff --git a/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js b/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js
index a1a1e17fd..6065d938f 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js
@@ -100,7 +100,6 @@ const createScreen = table => {
     .instanceName("Form")
     .customProps({
       actionType: "Update",
-      theme: "spectrum--lightest",
       size: "spectrum--medium",
       dataSource: {
         label: table.name,
diff --git a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
index ccf1fceb2..188682ed3 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
@@ -65,6 +65,7 @@ const createScreen = table => {
         tableId: table._id,
         type: "table",
       },
+      size: "spectrum--medium",
       paginate: true,
       limit: 8,
     })

From 5ce7d9c9b08d9555b7ee4abbc4d3702a0aa7274b Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 25 Aug 2021 12:05:49 +0000
Subject: [PATCH 36/58] v0.9.115

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index d190a75cf..b00fa15ba 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.114",
+  "version": "0.9.115",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 8b6b3434b..fa56e927f 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.114",
+  "version": "0.9.115",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index e41d95563..c80e7ed34 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.114",
+  "version": "0.9.115",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index d0a765f20..fc2a50e8d 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.114",
+  "version": "0.9.115",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.114",
-    "@budibase/client": "^0.9.114",
+    "@budibase/bbui": "^0.9.115",
+    "@budibase/client": "^0.9.115",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.114",
+    "@budibase/string-templates": "^0.9.115",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8676c915b..49473b8d8 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.114",
+  "version": "0.9.115",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index c7976cc9c..37c562368 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.114",
+  "version": "0.9.115",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.114",
-    "@budibase/standard-components": "^0.9.114",
-    "@budibase/string-templates": "^0.9.114",
+    "@budibase/bbui": "^0.9.115",
+    "@budibase/standard-components": "^0.9.115",
+    "@budibase/string-templates": "^0.9.115",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index dacbbbc10..cd92eaabf 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.114",
+  "version": "0.9.115",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -60,9 +60,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.114",
-    "@budibase/client": "^0.9.114",
-    "@budibase/string-templates": "^0.9.114",
+    "@budibase/auth": "^0.9.115",
+    "@budibase/client": "^0.9.115",
+    "@budibase/string-templates": "^0.9.115",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -115,7 +115,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.114",
+    "@budibase/standard-components": "^0.9.115",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index d586988f5..7f3780e12 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.114",
+  "version": "0.9.115",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.114",
+    "@budibase/bbui": "^0.9.115",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index a3b692023..7685401b7 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.114",
+  "version": "0.9.115",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 65fb92ecc..720ceb30a 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.114",
+  "version": "0.9.115",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.114",
-    "@budibase/string-templates": "^0.9.114",
+    "@budibase/auth": "^0.9.115",
+    "@budibase/string-templates": "^0.9.115",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From 04ce0abd462b1c5b2a52c114d882f23dfee3aab5 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 25 Aug 2021 14:05:00 +0100
Subject: [PATCH 37/58] Add not contains option to lucene query builder

---
 .../DataTable/modals/CreateEditColumn.svelte  |  1 -
 packages/builder/src/helpers/lucene.js        |  7 +++++--
 .../src/api/controllers/row/internalSearch.js | 21 ++++++++++++++++++-
 packages/standard-components/src/lucene.js    |  3 ++-
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 3f3d28bf8..92edca2a0 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -86,7 +86,6 @@
       let arr = field.constraints.inclusion
       let newArr = []
       newArr.push(arr)
-      console.log(newArr)
       field.constraints.inclusion = newArr
     }
     tables.saveField({
diff --git a/packages/builder/src/helpers/lucene.js b/packages/builder/src/helpers/lucene.js
index c9890d8d7..5488919c6 100644
--- a/packages/builder/src/helpers/lucene.js
+++ b/packages/builder/src/helpers/lucene.js
@@ -35,7 +35,10 @@ export const OperatorOptions = {
     value: "contains",
     label: "Contains",
   },
-
+  NotContains: {
+    value: "notContains",
+    label: "Does Not Contain",
+  }
 }
 
 export const getValidOperatorsForType = type => {
@@ -61,7 +64,7 @@ export const getValidOperatorsForType = type => {
   } else if (type === "options") {
     return [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty]
   } else if (type === "array") {
-    return [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.Contains]
+    return [Op.Contains, Op.NotContains]
   } else if (type === "boolean") {
     return [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty]
   } else if (type === "longform") {
diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js
index e2e7beee2..e4552ccab 100644
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@@ -18,6 +18,7 @@ class QueryBuilder {
       empty: {},
       notEmpty: {},
       contains: {},
+      notContains: {},
       ...base,
     }
     this.limit = 50
@@ -110,6 +111,10 @@ class QueryBuilder {
     return this
   }
 
+  addNotContains(key, value) {
+    this.query.notContains[key] = value
+    return this
+  }
 
   /**
    * Preprocesses a value before going into a lucene search.
@@ -232,6 +237,20 @@ class QueryBuilder {
 
     }
 
+    if (this.query.notContains) {
+      build(this.query.notContains, (key, value) => {
+        if (!value) {
+          return null
+        }
+        let opts = []
+        value.forEach(val => opts.push(`!${key}.${val}:${builder.preprocess(val, allPreProcessingOpts)}`))
+        const joined = opts.join(' AND ')
+        return joined
+      })
+
+    }
+
+
     return query
   }
 
@@ -273,7 +292,7 @@ const runQuery = async (url, body) => {
     method: "POST",
   })
   const json = await response.json()
-  console.log(json)
+
   let output = {
     rows: [],
   }
diff --git a/packages/standard-components/src/lucene.js b/packages/standard-components/src/lucene.js
index f132086aa..36f6026a0 100644
--- a/packages/standard-components/src/lucene.js
+++ b/packages/standard-components/src/lucene.js
@@ -11,7 +11,8 @@ export const buildLuceneQuery = filter => {
     notEqual: {},
     empty: {},
     notEmpty: {},
-    contains: {}
+    contains: {},
+    notContains: {},
   }
   if (Array.isArray(filter)) {
     filter.forEach(expression => {

From 84d85664efc345454876fc6303a75e07464aff2a Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 25 Aug 2021 14:05:23 +0100
Subject: [PATCH 38/58] Add validation for array field

---
 .../ValidationEditor/ValidationDrawer.svelte  |  9 +++++--
 .../PropertyControls/componentSettings.js     |  1 +
 packages/standard-components/manifest.json    |  2 +-
 .../src/forms/MultiFieldSelect.svelte         | 17 +++++++-----
 .../src/forms/validation.js                   | 27 ++++++++++++++++---
 5 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte
index b4da2e8e6..e24a779b6 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte
@@ -9,6 +9,7 @@
     Body,
     Input,
     DatePicker,
+    Multiselect,
   } from "@budibase/bbui"
   import { currentAsset, selectedComponent } from "builderStore"
   import { findClosestMatchingComponent } from "builderStore/storeUtils"
@@ -102,6 +103,11 @@
       Constraints.MinLength,
       Constraints.MaxLength,
     ],
+    ["array"]: [
+      Constraints.Required,
+      Constraints.MinLength,
+      Constraints.MaxLength,
+    ],
   }
 
   $: dataSourceSchema = getDataSourceSchema($currentAsset, $selectedComponent)
@@ -109,7 +115,6 @@
   $: schemaRules = parseRulesFromSchema(field, dataSourceSchema || {})
   $: fieldType = type?.split("/")[1] || "string"
   $: constraintOptions = getConstraintsForType(fieldType)
-
   const getConstraintsForType = type => {
     return ConstraintMap[type]
   }
@@ -283,7 +288,7 @@
                   />
                 {:else}
                   <!-- Otherwise we render a component based on the type -->
-                  {#if ["string", "number", "options", "longform"].includes(rule.type)}
+                  {#if ["string", "number", "options", "longform", "array"].includes(rule.type)}
                     <Input
                       disabled={rule.constraint === "required"}
                       bind:value={rule.value}
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/componentSettings.js b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/componentSettings.js
index 3ca3f7f5c..ae7fe9252 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/componentSettings.js
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/componentSettings.js
@@ -47,6 +47,7 @@ const componentMap = {
   // Some validation types are the same as others, so not all types are
   // explicitly listed here. e.g. options uses string validation
   "validation/string": ValidationEditor,
+  "validation/array": ValidationEditor,
   "validation/number": ValidationEditor,
   "validation/boolean": ValidationEditor,
   "validation/datetime": ValidationEditor,
diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json
index 948ebc91d..a16fe9efc 100644
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@@ -2101,7 +2101,7 @@
         }
       },
       {
-        "type": "validation/string",
+        "type": "validation/array",
         "label": "Validation",
         "key": "validation"
       }
diff --git a/packages/standard-components/src/forms/MultiFieldSelect.svelte b/packages/standard-components/src/forms/MultiFieldSelect.svelte
index 4e6777d96..293a29976 100644
--- a/packages/standard-components/src/forms/MultiFieldSelect.svelte
+++ b/packages/standard-components/src/forms/MultiFieldSelect.svelte
@@ -40,10 +40,15 @@
   bind:fieldApi
   bind:fieldSchema
 >
-  <Multiselect
-    getOptionLabel={flatOptions ? x => x : x => x.label}
-    getOptionValue={flatOptions ? x => x : x => x.value}
-    {placeholder}
-    {options}
-  />
+  {#if fieldState}
+    <Multiselect
+      getOptionLabel={flatOptions ? x => x : x => x.label}
+      getOptionValue={flatOptions ? x => x : x => x.value}
+      id={$fieldState.fieldId}
+      disabled={$fieldState.disabled}
+      on:change={e => fieldApi.setValue(e.detail)}
+      {placeholder}
+      {options}
+    />
+  {/if}
 </Field>
diff --git a/packages/standard-components/src/forms/validation.js b/packages/standard-components/src/forms/validation.js
index 30b6fd7ca..6109d7e2c 100644
--- a/packages/standard-components/src/forms/validation.js
+++ b/packages/standard-components/src/forms/validation.js
@@ -25,7 +25,7 @@ export const createValidatorFromConstraints = (
       schemaConstraints.presence?.allowEmpty === false
     ) {
       rules.push({
-        type: "string",
+        type: schemaConstraints.type == "array" ? "array" : "string",
         constraint: "required",
         error: "Required",
       })
@@ -63,7 +63,7 @@ export const createValidatorFromConstraints = (
     }
 
     // Inclusion constraint
-    if (exists(schemaConstraints.inclusion)) {
+    if (!schemaConstraints.type == "array" ? exists(schemaConstraints.inclusion) : false) {
       const options = schemaConstraints.inclusion || []
       rules.push({
         type: "string",
@@ -73,6 +73,18 @@ export const createValidatorFromConstraints = (
       })
     }
 
+    // Inclusion constraint
+    if (schemaConstraints.type == "array" ? exists(schemaConstraints.inclusion[0]) : false ) {
+      const options = schemaConstraints.inclusion[0] || []
+      rules.push({
+        type: "array",
+        constraint: "inclusion",
+        value: options,
+        error: "Invalid value",
+      })
+    }
+    
+
     // Date constraint
     if (exists(schemaConstraints.datetime?.earliest)) {
       const limit = schemaConstraints.datetime.earliest
@@ -142,7 +154,7 @@ const evaluateRule = (rule, value) => {
  * in the same format.
  * @param value the value to parse
  * @param type the type to parse
- * @returns {boolean|string|*|number|null} the parsed value, or null if invalid
+ * @returns {boolean|string|*|number|null|array} the parsed value, or null if invalid
  */
 const parseType = (value, type) => {
   // Treat nulls or empty strings as null
@@ -202,6 +214,13 @@ const parseType = (value, type) => {
     return value
   }
 
+  if (type === "array") {
+    if (!Array.isArray(value) || !value.length) {
+      return null
+    }
+    return value
+    }
+
   // If some unknown type, treat as null to avoid breaking validators
   return null
 }
@@ -239,7 +258,7 @@ const maxValueHandler = (value, rule) => {
 
 // Evaluates an inclusion constraint
 const inclusionHandler = (value, rule) => {
-  return value == null || rule.value.includes(value)
+  return value == null || rule.type == "array" ? rule.value.map(val => val === value) : rule.value.includes(value)
 }
 
 // Evaluates an equal constraint

From c681330793e764ad25697b56d0e899a422357300 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 25 Aug 2021 15:49:04 +0100
Subject: [PATCH 39/58] Add more validation options for array field

---
 .../ValidationEditor/ValidationDrawer.svelte  | 35 ++++++--
 packages/builder/src/helpers/lucene.js        |  2 +-
 .../src/api/controllers/row/internalSearch.js | 19 ++--
 packages/server/src/db/views/staticViews.js   | 11 +--
 .../src/forms/MultiFieldSelect.svelte         |  8 +-
 .../src/forms/optionsParser.js                | 88 +++++++++----------
 .../src/forms/validation.js                   | 39 ++++++--
 7 files changed, 127 insertions(+), 75 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte
index e24a779b6..64938fe75 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte
@@ -9,13 +9,13 @@
     Body,
     Input,
     DatePicker,
-    Multiselect,
   } from "@budibase/bbui"
   import { currentAsset, selectedComponent } from "builderStore"
   import { findClosestMatchingComponent } from "builderStore/storeUtils"
   import { getSchemaForDatasource } from "builderStore/dataBinding"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { generate } from "shortid"
+  import Multiselect from "../../../../../../../bbui/src/Form/Core/Multiselect.svelte"
 
   export let rules = []
   export let bindings = []
@@ -58,14 +58,22 @@
       label: "Must not match regex",
       value: "notRegex",
     },
-    Contains: {
+    ContainsRowID: {
       label: "Must contain row ID",
       value: "contains",
     },
-    NotContains: {
+    NotContainsRowID: {
       label: "Must not contain row ID",
       value: "notContains",
     },
+    Contains: {
+      label: "Must contain one of",
+      value: "contains",
+    },
+    NotContains: {
+      label: "Must not contain one of",
+      value: "notContains",
+    },
   }
   const ConstraintMap = {
     ["string"]: [
@@ -98,8 +106,8 @@
     ["attachment"]: [Constraints.Required],
     ["link"]: [
       Constraints.Required,
-      Constraints.Contains,
-      Constraints.NotContains,
+      Constraints.ContainsRowID,
+      Constraints.NotContainsRowID,
       Constraints.MinLength,
       Constraints.MaxLength,
     ],
@@ -107,6 +115,8 @@
       Constraints.Required,
       Constraints.MinLength,
       Constraints.MaxLength,
+      Constraints.Contains,
+      Constraints.NotContains,
     ],
   }
 
@@ -195,6 +205,7 @@
         valueType: "Binding",
         type: fieldType,
         id: generate(),
+        value: fieldType == "array" ? [] : null,
       },
     ]
   }
@@ -280,7 +291,7 @@
                     disabled={rule.constraint === "required"}
                     on:change={e => (rule.value = e.detail)}
                   />
-                {:else if ["maxLength", "minLength", "regex", "notRegex", "contains", "notContains"].includes(rule.constraint)}
+                {:else if ["maxLength", "minLength", "regex", "notRegex", "containsRowID", "notContainsRowID"].includes(rule.constraint)}
                   <!-- Certain constraints always need string values-->
                   <Input
                     bind:value={rule.value}
@@ -288,12 +299,22 @@
                   />
                 {:else}
                   <!-- Otherwise we render a component based on the type -->
-                  {#if ["string", "number", "options", "longform", "array"].includes(rule.type)}
+                  {#if ["string", "number", "options", "longform"].includes(rule.type)}
                     <Input
                       disabled={rule.constraint === "required"}
                       bind:value={rule.value}
                       placeholder="Constraint value"
                     />
+                  {:else if rule.type === "array" && ["contains", "notContains"].includes(rule.constraint)}
+                    <Multiselect
+                      disabled={rule.constraint === "required"}
+                      options={dataSourceSchema.schema[field].constraints
+                        .inclusion[0]}
+                      getOptionLabel={x => x}
+                      getOptionValue={x => x}
+                      on:change={e => (rule.value = e.detail)}
+                      bind:value={rule.value}
+                    />
                   {:else if rule.type === "boolean"}
                     <Select
                       disabled={rule.constraint === "required"}
diff --git a/packages/builder/src/helpers/lucene.js b/packages/builder/src/helpers/lucene.js
index 5488919c6..556edf92a 100644
--- a/packages/builder/src/helpers/lucene.js
+++ b/packages/builder/src/helpers/lucene.js
@@ -38,7 +38,7 @@ export const OperatorOptions = {
   NotContains: {
     value: "notContains",
     label: "Does Not Contain",
-  }
+  },
 }
 
 export const getValidOperatorsForType = type => {
diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js
index e4552ccab..77f684009 100644
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@@ -230,11 +230,14 @@ class QueryBuilder {
           return null
         }
         let opts = []
-        value.forEach(val => opts.push(`${key}.${val}:${builder.preprocess(val, allPreProcessingOpts)}`))
-        const joined = opts.join(' AND ')
+        value.forEach(val =>
+          opts.push(
+            `${key}.${val}:${builder.preprocess(val, allPreProcessingOpts)}`
+          )
+        )
+        const joined = opts.join(" AND ")
         return joined
       })
-
     }
 
     if (this.query.notContains) {
@@ -243,14 +246,16 @@ class QueryBuilder {
           return null
         }
         let opts = []
-        value.forEach(val => opts.push(`!${key}.${val}:${builder.preprocess(val, allPreProcessingOpts)}`))
-        const joined = opts.join(' AND ')
+        value.forEach(val =>
+          opts.push(
+            `!${key}.${val}:${builder.preprocess(val, allPreProcessingOpts)}`
+          )
+        )
+        const joined = opts.join(" AND ")
         return joined
       })
-
     }
 
-
     return query
   }
 
diff --git a/packages/server/src/db/views/staticViews.js b/packages/server/src/db/views/staticViews.js
index 35ccbd21b..b04fa4537 100644
--- a/packages/server/src/db/views/staticViews.js
+++ b/packages/server/src/db/views/staticViews.js
@@ -94,16 +94,17 @@ exports.createAllSearchIndex = async appId => {
   await searchIndex(
     appId,
     SearchIndexes.ROWS,
-    function (doc) {      
+    function (doc) {
       function idx(input, prev) {
         for (let key of Object.keys(input)) {
           let idxKey = prev != null ? `${prev}.${key}` : key
           idxKey = idxKey.replace(/ /, "_")
-
-        
           if (Array.isArray(input[key])) {
-            for (val in input[key]) {
-              index(`${idxKey}.${input[key][v]}`, input[key][v], { store: true });
+            for (let val in input[key]) {
+              // eslint-disable-next-line no-undef
+              index(`${idxKey}.${input[key][val]}`, input[key][val], {
+                store: true,
+              })
             }
           } else if (key === "_id" || key === "_rev" || input[key] == null) {
             continue
diff --git a/packages/standard-components/src/forms/MultiFieldSelect.svelte b/packages/standard-components/src/forms/MultiFieldSelect.svelte
index 293a29976..ad53fbd2b 100644
--- a/packages/standard-components/src/forms/MultiFieldSelect.svelte
+++ b/packages/standard-components/src/forms/MultiFieldSelect.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Multiselect } from "@budibase/bbui"
+  import { CoreMultiselect } from "@budibase/bbui"
   import Field from "./Field.svelte"
   import { getOptions } from "./optionsParser"
   export let field
@@ -13,6 +13,7 @@
   export let labelColumn
   export let valueColumn
   export let customOptions
+  export let autocomplete = false
 
   let fieldState
   let fieldApi
@@ -41,7 +42,9 @@
   bind:fieldSchema
 >
   {#if fieldState}
-    <Multiselect
+    <CoreMultiselect
+      value={$fieldState.value}
+      error={$fieldState.error}
       getOptionLabel={flatOptions ? x => x : x => x.label}
       getOptionValue={flatOptions ? x => x : x => x.value}
       id={$fieldState.fieldId}
@@ -49,6 +52,7 @@
       on:change={e => fieldApi.setValue(e.detail)}
       {placeholder}
       {options}
+      {autocomplete}
     />
   {/if}
 </Field>
diff --git a/packages/standard-components/src/forms/optionsParser.js b/packages/standard-components/src/forms/optionsParser.js
index 7df00c342..c79b2a477 100644
--- a/packages/standard-components/src/forms/optionsParser.js
+++ b/packages/standard-components/src/forms/optionsParser.js
@@ -1,52 +1,50 @@
 export const getOptions = (
-    optionsSource,
-    fieldSchema,
-    dataProvider,
-    labelColumn,
-    valueColumn,
-    customOptions
-  ) => {
-      const isArray = fieldSchema?.type === "array"
-    // Take options from schema
-    if (optionsSource == null || optionsSource === "schema") {
-      if (isArray) {
-        return fieldSchema?.constraints?.inclusion[0] ?? []
-      }
-      return fieldSchema?.constraints?.inclusion ?? []
+  optionsSource,
+  fieldSchema,
+  dataProvider,
+  labelColumn,
+  valueColumn,
+  customOptions
+) => {
+  const isArray = fieldSchema?.type === "array"
+  // Take options from schema
+  if (optionsSource == null || optionsSource === "schema") {
+    if (isArray) {
+      return fieldSchema?.constraints?.inclusion[0] ?? []
     }
+    return fieldSchema?.constraints?.inclusion ?? []
+  }
 
-    if (optionsSource === "provider" && isArray) {
-        let optionsSet = {}
-
-        dataProvider?.rows?.forEach(row => {
-        const value = row?.[valueColumn]
-            if (value) {
-              const label = row[labelColumn] || value
-              optionsSet[value] = { value, label }
-            }
-        })
-        return Object.values(optionsSet)
-        }
-    
-    
+  if (optionsSource === "provider" && isArray) {
+    let optionsSet = {}
 
-    // Extract options from data provider
-    if (optionsSource === "provider" && valueColumn) {
-      let optionsSet = {}
-      dataProvider?.rows?.forEach(row => {
-        const value = row?.[valueColumn]
-        if (value) {
-          const label = row[labelColumn] || value
-          optionsSet[value] = { value, label }
-        }
-      })
-      return Object.values(optionsSet)
-    }
+    dataProvider?.rows?.forEach(row => {
+      const value = row?.[valueColumn]
+      if (value) {
+        const label = row[labelColumn] || value
+        optionsSet[value] = { value, label }
+      }
+    })
+    return Object.values(optionsSet)
+  }
 
-    // Extract custom options
-    if (optionsSource === "custom" && customOptions) {
-      return customOptions
-    }
+  // Extract options from data provider
+  if (optionsSource === "provider" && valueColumn) {
+    let optionsSet = {}
+    dataProvider?.rows?.forEach(row => {
+      const value = row?.[valueColumn]
+      if (value) {
+        const label = row[labelColumn] || value
+        optionsSet[value] = { value, label }
+      }
+    })
+    return Object.values(optionsSet)
+  }
 
-    return []
+  // Extract custom options
+  if (optionsSource === "custom" && customOptions) {
+    return customOptions
   }
+
+  return []
+}
diff --git a/packages/standard-components/src/forms/validation.js b/packages/standard-components/src/forms/validation.js
index 6109d7e2c..2505e032d 100644
--- a/packages/standard-components/src/forms/validation.js
+++ b/packages/standard-components/src/forms/validation.js
@@ -63,7 +63,11 @@ export const createValidatorFromConstraints = (
     }
 
     // Inclusion constraint
-    if (!schemaConstraints.type == "array" ? exists(schemaConstraints.inclusion) : false) {
+    if (
+      !schemaConstraints.type == "array"
+        ? exists(schemaConstraints.inclusion)
+        : false
+    ) {
       const options = schemaConstraints.inclusion || []
       rules.push({
         type: "string",
@@ -73,8 +77,12 @@ export const createValidatorFromConstraints = (
       })
     }
 
-    // Inclusion constraint
-    if (schemaConstraints.type == "array" ? exists(schemaConstraints.inclusion[0]) : false ) {
+    // Handle the array type but link also returns as an array, so handle via the inclusion check
+    if (
+      schemaConstraints.type == "array" && schemaConstraints.inclusion
+        ? exists(schemaConstraints.inclusion[0])
+        : false
+    ) {
       const options = schemaConstraints.inclusion[0] || []
       rules.push({
         type: "array",
@@ -83,7 +91,6 @@ export const createValidatorFromConstraints = (
         error: "Invalid value",
       })
     }
-    
 
     // Date constraint
     if (exists(schemaConstraints.datetime?.earliest)) {
@@ -219,7 +226,7 @@ const parseType = (value, type) => {
       return null
     }
     return value
-    }
+  }
 
   // If some unknown type, treat as null to avoid breaking validators
   return null
@@ -258,7 +265,9 @@ const maxValueHandler = (value, rule) => {
 
 // Evaluates an inclusion constraint
 const inclusionHandler = (value, rule) => {
-  return value == null || rule.type == "array" ? rule.value.map(val => val === value) : rule.value.includes(value)
+  return value == null || rule.type == "array"
+    ? rule.value.map(val => val === value)
+    : rule.value.includes(value)
 }
 
 // Evaluates an equal constraint
@@ -288,16 +297,28 @@ const notRegexHandler = (value, rule) => {
 }
 
 // Evaluates a contains constraint
-const containsHandler = (value, rule) => {
+const containsRowIDHandler = (value, rule) => {
   const expectedValue = parseType(rule.value, "string")
   return value && value.includes(expectedValue)
 }
 
 // Evaluates a not contains constraint
-const notContainsHandler = (value, rule) => {
+const notContainsRowIDHandler = (value, rule) => {
   return !containsHandler(value, rule)
 }
 
+// Evaluates a contains constraint
+const containsHandler = (value, rule) => {
+  const ruleValue = parseType(rule.value, "array")
+  return value && value.some(val => ruleValue.includes(val))
+}
+
+// Evaluates a not contains constraint
+const notContainsHandler = (value, rule) => {
+  const ruleValue = parseType(rule.value, "array")
+  return value && !value.some(val => ruleValue.includes(val))
+}
+
 /**
  * Map of constraint types to handlers.
  */
@@ -312,6 +333,8 @@ const handlerMap = {
   notEqual: notEqualHandler,
   regex: regexHandler,
   notRegex: notRegexHandler,
+  containsRowID: containsRowIDHandler,
+  notContainsRowID: notContainsRowIDHandler,
   contains: containsHandler,
   notContains: notContainsHandler,
 }

From 5b23ea1dc9bf030d8b6db3e3a12680c91f6b9fc5 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 25 Aug 2021 17:00:15 +0100
Subject: [PATCH 40/58] fix issue with options not being displayed on new line

---
 .../components/backend/DataTable/modals/CreateEditColumn.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 92edca2a0..52393e566 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -272,7 +272,7 @@
   {:else if field.type === "array"}
     <ValuesList
       label="Options (one per line)"
-      bind:values={field.constraints.inclusion}
+      bind:values={field.constraints.inclusion[0]}
     />
   {:else if field.type === "datetime"}
     <DatePicker

From 3ce5b96b0c9d5e8464728a8cef3a2db096e0d02d Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 25 Aug 2021 17:00:42 +0100
Subject: [PATCH 41/58] use normal combobox for filtering array columns

---
 .../FilterEditor/FilterDrawer.svelte           |  2 +-
 .../src/api/controllers/row/internalSearch.js  | 18 ++----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
index cd5cc1661..b89fe693f 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
@@ -136,7 +136,7 @@
               />
             {:else if ["string", "longform", "number"].includes(filter.type)}
               <Input disabled={filter.noValue} bind:value={filter.value} />
-            {:else if filter.type === "options"}
+            {:else if filter.type === "options" || filter.type === "array"}
               <Combobox
                 disabled={filter.noValue}
                 options={getFieldOptions(filter.field)}
diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js
index 77f684009..6fe96feae 100644
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@@ -229,14 +229,7 @@ class QueryBuilder {
         if (!value) {
           return null
         }
-        let opts = []
-        value.forEach(val =>
-          opts.push(
-            `${key}.${val}:${builder.preprocess(val, allPreProcessingOpts)}`
-          )
-        )
-        const joined = opts.join(" AND ")
-        return joined
+        return `${key}.${value}:${builder.preprocess(value, allPreProcessingOpts)}`
       })
     }
 
@@ -245,14 +238,7 @@ class QueryBuilder {
         if (!value) {
           return null
         }
-        let opts = []
-        value.forEach(val =>
-          opts.push(
-            `!${key}.${val}:${builder.preprocess(val, allPreProcessingOpts)}`
-          )
-        )
-        const joined = opts.join(" AND ")
-        return joined
+        return `!${key}.${value}:${builder.preprocess(value, allPreProcessingOpts)}`
       })
     }
 

From c28d0ef1ea276c2c12b0775234f500aca8ec8965 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 25 Aug 2021 19:25:57 +0100
Subject: [PATCH 42/58] linting

---
 .../server/src/api/controllers/row/internalSearch.js   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js
index 6fe96feae..cb4e27365 100644
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@@ -229,7 +229,10 @@ class QueryBuilder {
         if (!value) {
           return null
         }
-        return `${key}.${value}:${builder.preprocess(value, allPreProcessingOpts)}`
+        return `${key}.${value}:${builder.preprocess(
+          value,
+          allPreProcessingOpts
+        )}`
       })
     }
 
@@ -238,7 +241,10 @@ class QueryBuilder {
         if (!value) {
           return null
         }
-        return `!${key}.${value}:${builder.preprocess(value, allPreProcessingOpts)}`
+        return `!${key}.${value}:${builder.preprocess(
+          value,
+          allPreProcessingOpts
+        )}`
       })
     }
 

From 7217bb3ccd613371b27861299c020d87e4140d96 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 26 Aug 2021 08:50:36 +0100
Subject: [PATCH 43/58] fix build

---
 packages/bbui/src/Table/ArrayRenderer.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bbui/src/Table/ArrayRenderer.svelte b/packages/bbui/src/Table/ArrayRenderer.svelte
index 8281fce78..679973a03 100644
--- a/packages/bbui/src/Table/ArrayRenderer.svelte
+++ b/packages/bbui/src/Table/ArrayRenderer.svelte
@@ -1,6 +1,6 @@
 <script>
   import "@spectrum-css/label/dist/index-vars.css"
-  import { Badge } from "@budibase/bbui"
+  import Badge from "../Badge/Badge.svelte"
   export let value
 
   const displayLimit = 5

From f0bebb036a6a6be94ef41b8454124f3da62db563 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Thu, 26 Aug 2021 10:11:48 +0100
Subject: [PATCH 44/58] Revert "Filter users table out of DataSource component
 and NewScreenModal"

---
 .../components/design/NavigationPanel/NewScreenModal.svelte  | 5 +++--
 .../PropertiesPanel/PropertyControls/DataSourceSelect.svelte | 2 +-
 packages/builder/src/stores/backend/tables.js                | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte b/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
index 3b16d2ba7..ed0c76495 100644
--- a/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
@@ -1,6 +1,7 @@
 <script>
   import { store, allScreens, selectedAccessRole } from "builderStore"
-  import { tables, roles } from "stores/backend"
+  import { tables } from "stores/backend"
+  import { roles } from "stores/backend"
   import { Input, Select, ModalContent, Toggle } from "@budibase/bbui"
   import getTemplates from "builderStore/store/screenTemplates"
   import analytics from "analytics"
@@ -15,7 +16,7 @@
   let createLink = true
   let roleId = $selectedAccessRole || "BASIC"
 
-  $: templates = getTemplates($store, tables.getDataSources())
+  $: templates = getTemplates($store, $tables.list)
   $: route = !route && $allScreens.length === 0 ? "*" : route
   $: {
     if (templates && templateIndex === undefined) {
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
index a16358d8f..d86f13e10 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
@@ -31,7 +31,7 @@
   export let bindings = []
 
   $: text = value?.label ?? "Choose an option"
-  $: tables = tablesStore.getDataSources().map(m => ({
+  $: tables = $tablesStore.list.map(m => ({
     label: m.name,
     tableId: m._id,
     type: "table",
diff --git a/packages/builder/src/stores/backend/tables.js b/packages/builder/src/stores/backend/tables.js
index 11a1e2de1..e0b614a63 100644
--- a/packages/builder/src/stores/backend/tables.js
+++ b/packages/builder/src/stores/backend/tables.js
@@ -87,7 +87,6 @@ export function createTablesStore() {
         draft: {},
       })
     },
-    getDataSources: () => get(store).list.filter(t => t.name !== "Users"),
     delete: async table => {
       await api.delete(`/api/tables/${table._id}/${table._rev}`)
       update(state => ({

From e220a7fa69b5fb7087369ea7577dd7e006c9d764 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 26 Aug 2021 10:03:39 +0000
Subject: [PATCH 45/58] v0.9.105-alpha.33

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index 57277a07a..c22342eeb 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.105-alpha.32",
+  "version": "0.9.105-alpha.33",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 9cfa8e880..03737c6a7 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.105-alpha.32",
+  "version": "0.9.105-alpha.33",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 4650c988d..14291fae3 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.105-alpha.32",
+  "version": "0.9.105-alpha.33",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index a4ad8f770..d9c8c8676 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.105-alpha.32",
+  "version": "0.9.105-alpha.33",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.105-alpha.32",
-    "@budibase/client": "^0.9.105-alpha.32",
+    "@budibase/bbui": "^0.9.105-alpha.33",
+    "@budibase/client": "^0.9.105-alpha.33",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.105-alpha.32",
+    "@budibase/string-templates": "^0.9.105-alpha.33",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 74a28976c..61dba51cf 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.105-alpha.32",
+  "version": "0.9.105-alpha.33",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 45d3b44a6..9a2037b8c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.105-alpha.32",
+  "version": "0.9.105-alpha.33",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.105-alpha.32",
-    "@budibase/standard-components": "^0.9.105-alpha.32",
-    "@budibase/string-templates": "^0.9.105-alpha.32",
+    "@budibase/bbui": "^0.9.105-alpha.33",
+    "@budibase/standard-components": "^0.9.105-alpha.33",
+    "@budibase/string-templates": "^0.9.105-alpha.33",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 09ad3acdd..75d2df436 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.105-alpha.32",
+  "version": "0.9.105-alpha.33",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -62,9 +62,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.105-alpha.32",
-    "@budibase/client": "^0.9.105-alpha.32",
-    "@budibase/string-templates": "^0.9.105-alpha.32",
+    "@budibase/auth": "^0.9.105-alpha.33",
+    "@budibase/client": "^0.9.105-alpha.33",
+    "@budibase/string-templates": "^0.9.105-alpha.33",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -117,7 +117,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.105-alpha.32",
+    "@budibase/standard-components": "^0.9.105-alpha.33",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index d38fe6ff4..89fc86ef8 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.105-alpha.32",
+  "version": "0.9.105-alpha.33",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.105-alpha.32",
+    "@budibase/bbui": "^0.9.105-alpha.33",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index b724a1656..52da0337c 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.105-alpha.32",
+  "version": "0.9.105-alpha.33",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index e99f66d2c..f2f58aa2b 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.105-alpha.32",
+  "version": "0.9.105-alpha.33",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -23,8 +23,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.105-alpha.32",
-    "@budibase/string-templates": "^0.9.105-alpha.32",
+    "@budibase/auth": "^0.9.105-alpha.33",
+    "@budibase/string-templates": "^0.9.105-alpha.33",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From cc2f4433b50fa8f9a69bcc0c675b0017c13a77d7 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 26 Aug 2021 11:36:05 +0100
Subject: [PATCH 46/58] Rename list to Multi-select

---
 .../components/backend/TableNavigator/TableDataImport.svelte    | 2 +-
 packages/standard-components/manifest.json                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
index 57150b229..4bde5b0c3 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
@@ -114,7 +114,7 @@
       value: FIELDS.OPTIONS.type,
     },
     {
-      label: "List",
+      label: "Multi-select",
       value: FIELDS.ARRAY.type,
     },
   ]
diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json
index a16fe9efc..31312ea82 100644
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@@ -2006,7 +2006,7 @@
     ]
   },
   "multifieldselect": {
-    "name": "MultiField Picker",
+    "name": "Multi-select Picker",
     "icon": "ViewList",
     "styles": ["size"],
     "illegalChildren": ["section"],

From 624080800f449a83638138e2d093d681ea678aa0 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 26 Aug 2021 11:39:42 +0100
Subject: [PATCH 47/58] Fix lucene not allowed characters

---
 .../src/components/backend/DataTable/RowFieldControl.svelte | 6 +-----
 .../PropertyControls/FilterEditor/FilterDrawer.svelte       | 2 +-
 packages/server/src/api/controllers/row/internalSearch.js   | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index f2f7a6c68..5b3a3689b 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -34,11 +34,7 @@
 {:else if type === "boolean"}
   <Toggle text={label} bind:value data-cy="{meta.name}-input" />
 {:else if type === "array"}
-  <Multiselect
-    bind:value
-    {label}
-    options={meta.constraints.inclusion.reduce((p, n) => p.concat(n), [])}
-  />
+  <Multiselect bind:value {label} options={meta.constraints.inclusion.flat()} />
 {:else if type === "link"}
   <LinkedRowSelector bind:linkedRows={value} schema={meta} />
 {:else if type === "longform"}
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
index b89fe693f..df56f994b 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
@@ -62,7 +62,7 @@
     }
 
     // if changed to an array, change default value to empty array
-    const idx = filters.findIndex(x => (x.field = field))
+    const idx = filters.findIndex(x => x.field === field)
     if (expression.type === "array") {
       filters[idx].value = []
     } else {
diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js
index cb4e27365..9b7cb7145 100644
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@@ -133,7 +133,7 @@ class QueryBuilder {
     }
     // Escape characters
     if (escape && originalType === "string") {
-      value = `${value}`.replace(/[ #+\-&|!{}\]^"~*?:\\]/g, "\\$&")
+      value = `${value}`.replace(/[ #+\-&|!(){}\]^"~*?:\\]/g, "\\$&")
     }
     // Wrap in quotes
     if (hasVersion && wrap) {

From 16270b46cf9d510491b8f00e8120edc8f0c37f25 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 26 Aug 2021 14:04:18 +0100
Subject: [PATCH 48/58] Update validation for array type

---
 .../backend/DataTable/RowFieldControl.svelte  |  2 +-
 .../DataTable/modals/CreateEditColumn.svelte  |  9 +----
 .../FilterEditor/FilterDrawer.svelte          |  7 ++--
 .../ValidationEditor/ValidationDrawer.svelte  | 16 +++------
 .../builder/src/constants/backend/index.js    |  2 +-
 .../server/src/api/controllers/row/utils.js   |  2 +-
 .../src/forms/optionsParser.js                |  3 --
 .../src/forms/validation.js                   | 35 ++++++-------------
 8 files changed, 21 insertions(+), 55 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index 5b3a3689b..1fa8b1ac0 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -34,7 +34,7 @@
 {:else if type === "boolean"}
   <Toggle text={label} bind:value data-cy="{meta.name}-input" />
 {:else if type === "array"}
-  <Multiselect bind:value {label} options={meta.constraints.inclusion.flat()} />
+  <Multiselect bind:value {label} options={meta.constraints.inclusion} />
 {:else if type === "link"}
   <LinkedRowSelector bind:linkedRows={value} schema={meta} />
 {:else if type === "longform"}
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 52393e566..1a7d75f28 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -29,7 +29,6 @@
 
   const AUTO_TYPE = "auto"
   const FORMULA_TYPE = FIELDS.FORMULA.type
-  const ARRAY_TYPE = FIELDS.ARRAY.type
   const LINK_TYPE = FIELDS.LINK.type
   let fieldDefinitions = cloneDeep(FIELDS)
   const { hide } = getContext(Context.Modal)
@@ -82,12 +81,6 @@
     if (field.type === AUTO_TYPE) {
       field = buildAutoColumn($tables.draft.name, field.name, field.subtype)
     }
-    if (field.type === ARRAY_TYPE) {
-      let arr = field.constraints.inclusion
-      let newArr = []
-      newArr.push(arr)
-      field.constraints.inclusion = newArr
-    }
     tables.saveField({
       originalName,
       field,
@@ -272,7 +265,7 @@
   {:else if field.type === "array"}
     <ValuesList
       label="Options (one per line)"
-      bind:values={field.constraints.inclusion[0]}
+      bind:values={field.constraints.inclusion}
     />
   {:else if field.type === "datetime"}
     <DatePicker
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
index df56f994b..836f19a00 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
@@ -83,10 +83,7 @@
 
   const getFieldOptions = field => {
     const schema = schemaFields.find(x => x.name === field)
-    const opt =
-      schema.type == "array"
-        ? schema?.constraints?.inclusion[0]
-        : schema?.constraints?.inclusion || []
+    const opt = schema?.constraints?.inclusion || []
 
     return opt
   }
@@ -136,7 +133,7 @@
               />
             {:else if ["string", "longform", "number"].includes(filter.type)}
               <Input disabled={filter.noValue} bind:value={filter.value} />
-            {:else if filter.type === "options" || filter.type === "array"}
+            {:else if filter.type === "options"}
               <Combobox
                 disabled={filter.noValue}
                 options={getFieldOptions(filter.field)}
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte
index 64938fe75..073ad1879 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte
@@ -58,20 +58,12 @@
       label: "Must not match regex",
       value: "notRegex",
     },
-    ContainsRowID: {
-      label: "Must contain row ID",
-      value: "contains",
-    },
-    NotContainsRowID: {
-      label: "Must not contain row ID",
-      value: "notContains",
-    },
     Contains: {
-      label: "Must contain one of",
+      label: "Must contain one",
       value: "contains",
     },
     NotContains: {
-      label: "Must not contain one of",
+      label: "Must not contain ",
       value: "notContains",
     },
   }
@@ -291,7 +283,7 @@
                     disabled={rule.constraint === "required"}
                     on:change={e => (rule.value = e.detail)}
                   />
-                {:else if ["maxLength", "minLength", "regex", "notRegex", "containsRowID", "notContainsRowID"].includes(rule.constraint)}
+                {:else if ["maxLength", "minLength", "regex", "notRegex"].includes(rule.constraint)}
                   <!-- Certain constraints always need string values-->
                   <Input
                     bind:value={rule.value}
@@ -309,7 +301,7 @@
                     <Multiselect
                       disabled={rule.constraint === "required"}
                       options={dataSourceSchema.schema[field].constraints
-                        .inclusion[0]}
+                        .inclusion}
                       getOptionLabel={x => x}
                       getOptionValue={x => x}
                       on:change={e => (rule.value = e.detail)}
diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js
index 2ce88c964..088db024a 100644
--- a/packages/builder/src/constants/backend/index.js
+++ b/packages/builder/src/constants/backend/index.js
@@ -27,7 +27,7 @@ export const FIELDS = {
     },
   },
   ARRAY: {
-    name: "List",
+    name: "Multi-select",
     type: "array",
     constraints: {
       type: "array",
diff --git a/packages/server/src/api/controllers/row/utils.js b/packages/server/src/api/controllers/row/utils.js
index bdb7e0378..9a518ff02 100644
--- a/packages/server/src/api/controllers/row/utils.js
+++ b/packages/server/src/api/controllers/row/utils.js
@@ -69,7 +69,7 @@ exports.validate = async ({ appId, tableId, row, table }) => {
     // Validate.js doesn't seem to handle array of array very well
     if (table.schema[fieldName].type === FieldTypes.ARRAY) {
       row[fieldName].map(val => {
-        if (constraints.inclusion.includes(val)) {
+        if (!constraints.inclusion.includes(val)) {
           errors[fieldName] = "Field not in list"
         }
       })
diff --git a/packages/standard-components/src/forms/optionsParser.js b/packages/standard-components/src/forms/optionsParser.js
index c79b2a477..dd37989be 100644
--- a/packages/standard-components/src/forms/optionsParser.js
+++ b/packages/standard-components/src/forms/optionsParser.js
@@ -9,9 +9,6 @@ export const getOptions = (
   const isArray = fieldSchema?.type === "array"
   // Take options from schema
   if (optionsSource == null || optionsSource === "schema") {
-    if (isArray) {
-      return fieldSchema?.constraints?.inclusion[0] ?? []
-    }
     return fieldSchema?.constraints?.inclusion ?? []
   }
 
diff --git a/packages/standard-components/src/forms/validation.js b/packages/standard-components/src/forms/validation.js
index 2505e032d..2e3b9390f 100644
--- a/packages/standard-components/src/forms/validation.js
+++ b/packages/standard-components/src/forms/validation.js
@@ -64,9 +64,8 @@ export const createValidatorFromConstraints = (
 
     // Inclusion constraint
     if (
-      !schemaConstraints.type == "array"
-        ? exists(schemaConstraints.inclusion)
-        : false
+      exists(schemaConstraints.inclusion) &&
+      schemaConstraints.type !== "array"
     ) {
       const options = schemaConstraints.inclusion || []
       rules.push({
@@ -77,13 +76,11 @@ export const createValidatorFromConstraints = (
       })
     }
 
-    // Handle the array type but link also returns as an array, so handle via the inclusion check
     if (
-      schemaConstraints.type == "array" && schemaConstraints.inclusion
-        ? exists(schemaConstraints.inclusion[0])
-        : false
+      schemaConstraints.type === "array" &&
+      exists(schemaConstraints.inclusion)
     ) {
-      const options = schemaConstraints.inclusion[0] || []
+      const options = schemaConstraints.inclusion || []
       rules.push({
         type: "array",
         constraint: "inclusion",
@@ -297,26 +294,18 @@ const notRegexHandler = (value, rule) => {
 }
 
 // Evaluates a contains constraint
-const containsRowIDHandler = (value, rule) => {
+const containsHandler = (value, rule) => {
+  if (rule.type == "array") {
+    const expectedValue = parseType(rule.value, "array")
+    return value && value.some(val => expectedValue.includes(val))
+  }
   const expectedValue = parseType(rule.value, "string")
   return value && value.includes(expectedValue)
 }
 
-// Evaluates a not contains constraint
-const notContainsRowIDHandler = (value, rule) => {
-  return !containsHandler(value, rule)
-}
-
-// Evaluates a contains constraint
-const containsHandler = (value, rule) => {
-  const ruleValue = parseType(rule.value, "array")
-  return value && value.some(val => ruleValue.includes(val))
-}
-
 // Evaluates a not contains constraint
 const notContainsHandler = (value, rule) => {
-  const ruleValue = parseType(rule.value, "array")
-  return value && !value.some(val => ruleValue.includes(val))
+  return !containsHandler(value, rule)
 }
 
 /**
@@ -333,8 +322,6 @@ const handlerMap = {
   notEqual: notEqualHandler,
   regex: regexHandler,
   notRegex: notRegexHandler,
-  containsRowID: containsRowIDHandler,
-  notContainsRowID: notContainsRowIDHandler,
   contains: containsHandler,
   notContains: notContainsHandler,
 }

From 974e264f5024cbc586647703b8c05a1d1f678200 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 26 Aug 2021 14:22:52 +0100
Subject: [PATCH 49/58] fix indexing of arrays

---
 .../PropertyControls/FilterEditor/FilterDrawer.svelte  | 10 +---------
 .../server/src/api/controllers/row/internalSearch.js   |  5 +----
 packages/server/src/db/views/staticViews.js            |  2 +-
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
index 836f19a00..669ebe458 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
@@ -133,20 +133,12 @@
               />
             {:else if ["string", "longform", "number"].includes(filter.type)}
               <Input disabled={filter.noValue} bind:value={filter.value} />
-            {:else if filter.type === "options"}
+            {:else if filter.type === "options" || "array"}
               <Combobox
                 disabled={filter.noValue}
                 options={getFieldOptions(filter.field)}
                 bind:value={filter.value}
               />
-            {:else if filter.type === "array"}
-              <Multiselect
-                disabled={filter.noValue}
-                options={getFieldOptions(filter.field)}
-                bind:value={filter.value}
-                getOptionLabel={x => x}
-                getOptionValue={x => x}
-              />
             {:else if filter.type === "boolean"}
               <Combobox
                 disabled={filter.noValue}
diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js
index 9b7cb7145..12a2252b9 100644
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@@ -229,10 +229,7 @@ class QueryBuilder {
         if (!value) {
           return null
         }
-        return `${key}.${value}:${builder.preprocess(
-          value,
-          allPreProcessingOpts
-        )}`
+        return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`
       })
     }
 
diff --git a/packages/server/src/db/views/staticViews.js b/packages/server/src/db/views/staticViews.js
index b04fa4537..764b8f03c 100644
--- a/packages/server/src/db/views/staticViews.js
+++ b/packages/server/src/db/views/staticViews.js
@@ -102,7 +102,7 @@ exports.createAllSearchIndex = async appId => {
           if (Array.isArray(input[key])) {
             for (let val in input[key]) {
               // eslint-disable-next-line no-undef
-              index(`${idxKey}.${input[key][val]}`, input[key][val], {
+              index(`${idxKey}`, input[key][val], {
                 store: true,
               })
             }

From a7b7a8f13a11216564f1ae136e86db9c8bd6ab81 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 26 Aug 2021 14:27:40 +0100
Subject: [PATCH 50/58] linting

---
 .../PropertyControls/FilterEditor/FilterDrawer.svelte            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
index 669ebe458..ad647d155 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
@@ -9,7 +9,6 @@
     DrawerContent,
     Layout,
     Body,
-    Multiselect,
   } from "@budibase/bbui"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { generate } from "shortid"

From 7dae653b72dfc0beae703fb1c711fb9988a98569 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 26 Aug 2021 14:30:21 +0100
Subject: [PATCH 51/58] fixing funky dependency

---
 packages/standard-components/package.json |   1 +
 packages/standard-components/yarn.lock    | 233 +++++++++++++++++++++-
 2 files changed, 229 insertions(+), 5 deletions(-)

diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 964ef1a00..6cb621706 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -34,6 +34,7 @@
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
     "@budibase/bbui": "^0.9.115",
+    "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
     "@spectrum-css/link": "^3.1.3",
diff --git a/packages/standard-components/yarn.lock b/packages/standard-components/yarn.lock
index cdac73632..02f8e21f0 100644
--- a/packages/standard-components/yarn.lock
+++ b/packages/standard-components/yarn.lock
@@ -2,6 +2,59 @@
 # yarn lockfile v1
 
 
+"@adobe/spectrum-css-workflow-icons@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.2.1.tgz#7e2cb3fcfb5c8b12d7275afafbb6ec44913551b4"
+  integrity sha512-uVgekyBXnOVkxp+CUssjN/gefARtudZC8duEn1vm0lBQFwGRZFlDEzU1QC+aIRWCrD1Z8OgRpmBYlSZ7QS003w==
+
+"@budibase/bbui@^0.9.115":
+  version "0.9.115"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.115.tgz#6aa0226908812052cd02628d6d604b95a3d55b92"
+  integrity sha512-HysxPp8POetLWj1pucrhn4Na+KllKvHRmBV7qU9XE1BVL9B2pLa6rPoZeLYrdMQmBW070bmXSdUuYDWZqEYYog==
+  dependencies:
+    "@adobe/spectrum-css-workflow-icons" "^1.2.1"
+    "@spectrum-css/actionbutton" "^1.0.1"
+    "@spectrum-css/actiongroup" "^1.0.1"
+    "@spectrum-css/avatar" "^3.0.2"
+    "@spectrum-css/button" "^3.0.1"
+    "@spectrum-css/buttongroup" "^3.0.2"
+    "@spectrum-css/checkbox" "^3.0.2"
+    "@spectrum-css/dialog" "^3.0.1"
+    "@spectrum-css/divider" "^1.0.1"
+    "@spectrum-css/dropzone" "^3.0.2"
+    "@spectrum-css/fieldgroup" "^3.0.2"
+    "@spectrum-css/fieldlabel" "^3.0.1"
+    "@spectrum-css/icon" "^3.0.1"
+    "@spectrum-css/illustratedmessage" "^3.0.2"
+    "@spectrum-css/inputgroup" "^3.0.2"
+    "@spectrum-css/label" "^2.0.10"
+    "@spectrum-css/link" "^3.1.1"
+    "@spectrum-css/menu" "^3.0.1"
+    "@spectrum-css/modal" "^3.0.1"
+    "@spectrum-css/pagination" "^3.0.3"
+    "@spectrum-css/picker" "^1.0.1"
+    "@spectrum-css/popover" "^3.0.1"
+    "@spectrum-css/progressbar" "^1.0.2"
+    "@spectrum-css/progresscircle" "^1.0.2"
+    "@spectrum-css/radio" "^3.0.2"
+    "@spectrum-css/search" "^3.0.2"
+    "@spectrum-css/sidenav" "^3.0.2"
+    "@spectrum-css/statuslight" "^3.0.2"
+    "@spectrum-css/switch" "^1.0.2"
+    "@spectrum-css/table" "^3.0.1"
+    "@spectrum-css/tabs" "^3.0.1"
+    "@spectrum-css/tags" "^3.0.2"
+    "@spectrum-css/textfield" "^3.0.1"
+    "@spectrum-css/toast" "^3.0.1"
+    "@spectrum-css/tooltip" "^3.0.3"
+    "@spectrum-css/treeview" "^3.0.2"
+    "@spectrum-css/typography" "^3.0.1"
+    "@spectrum-css/underlay" "^2.0.9"
+    "@spectrum-css/vars" "^3.0.1"
+    dayjs "^1.10.4"
+    svelte-flatpickr "^3.1.0"
+    svelte-portal "^1.0.0"
+
 "@rollup/pluginutils@^4.1.1":
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.1.1.tgz#1d4da86dd4eded15656a57d933fda2b9a08d47ec"
@@ -10,28 +63,103 @@
     estree-walker "^2.0.1"
     picomatch "^2.2.2"
 
-"@spectrum-css/button@^3.0.3":
+"@spectrum-css/actionbutton@^1.0.1":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.3.tgz#8f7342a69b303c5acdcfa0a59f5e9267b9f3cb30"
+  integrity sha512-P9qoCPSiZ1SB6ZYqK5hub0vGty00YYqonQE0KTjtb1i+T1nYR/87vWqVPERx9j63uhgZncjwFYaThTvRqye7eQ==
+
+"@spectrum-css/actiongroup@^1.0.1":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.3.tgz#4713ce65e6f5c72c404a7b638fbc3b4fd7e3874f"
+  integrity sha512-NlB9Q4ZlWixXxymoPIYG6g2hkwAGKFodHWPFfxHD8ddkjXWRB9G2akUP7cfsJ4DcYn4VisUORCOYQwqDiSmboQ==
+
+"@spectrum-css/avatar@^3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/avatar/-/avatar-3.0.2.tgz#4f1826223eae330e64b6d3cc899e9bc2e98dac95"
+  integrity sha512-wEczvSqxttTWSiL3cOvXV/RmGRwSkw2w6+slcHhnf0kb7ovymMM+9oz8vvEpEsSeo5u598bc+7ktrKFpAd6soQ==
+
+"@spectrum-css/button@^3.0.1", "@spectrum-css/button@^3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.3.tgz#2df1efaab6c7e0b3b06cb4b59e1eae59c7f1fc84"
   integrity sha512-6CnLPqqtaU/PcSSIGeGRi0iFIIxIUByYLKFO6zn5NEUc12KQ28dJ4PLwB6WBa0L8vRoAGlnWWH2ZZweTijbXgg==
 
+"@spectrum-css/buttongroup@^3.0.2":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.3.tgz#719d868845ac9d2c4f939c1b9f6044507902d5aa"
+  integrity sha512-eXl8U4QWMWXqyTu654FdQdEGnmczgOYlpIFSHyCMVjhtPqZp2xwnLFiGh6LKw+bLio6eeOZ0L+vpk1GcoYqgkw==
+
 "@spectrum-css/card@^3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/card/-/card-3.0.3.tgz#56b2e2da6b80c1583228baa279de7407383bfb6b"
   integrity sha512-+oKLUI2a0QmQP9EzySeq/G4FpUkkdaDNbuEbqCj2IkPMc/2v/nwzsPhh1fj2UIghGAiiUwXfPpzax1e8fyhQUg==
 
-"@spectrum-css/divider@^1.0.3":
+"@spectrum-css/checkbox@^3.0.2":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.0.3.tgz#8577067fc8b97e4609f92bd242364937a533a7bb"
+  integrity sha512-QVG9uMHq+lh70Dh6mDNnY+vEvNz2p7VC6xgLfDYfijp2qeiqYPq72fQK6p/SiyqPk96ZACzNRwgeROU6Xf6Wgg==
+
+"@spectrum-css/dialog@^3.0.1":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.3.tgz#7715a4ea435e753afb623d99ca5917ed1bcd6f34"
+  integrity sha512-AhmKgfRIVyTe3ABiJ8lLUQL34VB/H6fN16na2LlbDRJvyRMzkdN1Xf2i6U3f4OMd3qQ8Gm5xat4BvMxIQPBAUQ==
+
+"@spectrum-css/divider@^1.0.1", "@spectrum-css/divider@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.3.tgz#639e2ebaa0834efa40f42397668bbd5c153ea385"
   integrity sha512-Zy4Rn40w8UtzMh3wx/U9+CepSCpm1aOCGftHgWDub0XZuVTzh0c1WwyzTuLCx2Hf21z5VRGNiDh8bGEEzSbtNA==
   dependencies:
     "@spectrum-css/vars" "^3.0.2"
 
-"@spectrum-css/link@^3.1.3":
+"@spectrum-css/dropzone@^3.0.2":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.3.tgz#aee71697a2c195947599d7541b858c3c198741dc"
+  integrity sha512-ujrswdtB6bHigklyHsm6zomFd6rUnKJ3xVVRjroVF4+ouK4DxK5tX0iVd0EW6AOfOjx4Cc28uyFot3fpxp+MQw==
+
+"@spectrum-css/fieldgroup@^3.0.2":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.0.3.tgz#85d85da048d08200f25ceab378026dd2b11e0bb2"
+  integrity sha512-wXUXTXN1CPnR7M4Ltd+3uh7BfcNGUV1+Xe0/h0tCpq/j+S2Sd4xo7/pUMdU19sIDrAAtpEFp1tt+nouHcU5HGQ==
+
+"@spectrum-css/fieldlabel@^3.0.1":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.3.tgz#f73c04d20734d4718ffb620dc46458904685b449"
+  integrity sha512-nEvIkEXCD5n4fW67Unq6Iu7VXoauEd/JGpfTY02VsC5p4FJLnwKfPDbJUuUsqClAxqw7nAsmXVKtn4zQFf5yPQ==
+
+"@spectrum-css/icon@^3.0.1":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.3.tgz#5c612822380927087aebd526855d82ed2c3e2cba"
+  integrity sha512-hyloKOejPCXhP3MBNsm3SjR9j8xT1R1S19p32KW/0Qhj+VMUtfyEPmevyFptpn7wcovQccdl/vZVIVDuML/imw==
+
+"@spectrum-css/illustratedmessage@^3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.2.tgz#6a480be98b027e050b086e7899e40d87adb0a8c0"
+  integrity sha512-dqnE8X27bGcO0HN8+dYx8O4o0dNNIAqeivOzDHhe2El+V4dTzMrNIerF6G0NLm3GjVf6XliwmitsZK+K6FmbtA==
+
+"@spectrum-css/inputgroup@^3.0.2":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.3.tgz#00c9a370ddc2c55cf0f37dd6069faa9501fd7eb5"
+  integrity sha512-FqRJTiLL7jiGfzDVXWUGVLqHryJjCcqQIrqAi+Tq0oenapzsBe2qc/zIrKgh2wtMI+NTIBLXTECvij3L1HlqAg==
+
+"@spectrum-css/label@^2.0.10":
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/label/-/label-2.0.10.tgz#2368651d7636a19385b5d300cdf6272db1916001"
+  integrity sha512-xCbtEiQkZIlLdWFikuw7ifDCC21DOC/KMgVrrVJHXFc4KRQe9LTZSqmGF3tovm+CSq1adE59mYoTbojVQ9YuEQ==
+
+"@spectrum-css/link@^3.1.1", "@spectrum-css/link@^3.1.3":
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.3.tgz#b0e560a7e0acdb4a2b329b6669696aa3438f5993"
   integrity sha512-8Pmy5d73MwKcATTPaj+fSrZYnIw7GmfX40AvpC1xx5LauOxsbUb4AVNp1kn2H8rrOBmxF7czyhoBBhEiv66QUg==
 
+"@spectrum-css/menu@^3.0.1":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.3.tgz#46a9b221bb5f470a2f8a934bdfd512d84d2fdc4d"
+  integrity sha512-qKA9J/MrikNKIpCEHsAazG2vY3im5tjGCmo6p9Pdnu8/aQMsiuZDHZayukeCttJUZkrb9guDVL9OIHlK5RZvcQ==
+
+"@spectrum-css/modal@^3.0.1":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.2.tgz#58b6621cab65f90788d310374f40df1f7090473f"
+  integrity sha512-YnIivJhoaao7Otu+HV7sgebPyFbO6sd/oMvTN/Rb2wwgnaMnIIuIRdGandSrcgotN2uNgs+P0knG6mv/xA1/dg==
+
 "@spectrum-css/page@^3.0.1":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@spectrum-css/page/-/page-3.0.2.tgz#8f0c03d25f5565fb13115541a8fcaf0e1d3a8ee0"
@@ -39,11 +167,101 @@
   dependencies:
     "@spectrum-css/vars" "^3.0.2"
 
-"@spectrum-css/typography@^3.0.2":
+"@spectrum-css/pagination@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.3.tgz#b204c3ada384c4af751a354bc428346d82eeea65"
+  integrity sha512-OJ/v9GeNXJOZ9Yr9LDBYPrR2NCiLOWP9wANT/a5sqFuugRnQbn/HYMnRp9TBxwpDY6ihaPo0T/wi7kLiAJFdDw==
+
+"@spectrum-css/picker@^1.0.1":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.0.3.tgz#21379bcf8ae94277deeb6ad65dcd9e2bbfacb487"
+  integrity sha512-oHLGxBx5BwVCSGo7/T1C9PTHX1+/5AmVjyLiTJ4UoIdSJmOERw9YcRZbcGZgBJNWbxcjr4TyGtwj1EcSjEy97w==
+
+"@spectrum-css/popover@^3.0.1":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.3.tgz#6fb69873474fb968afb738eacb9e121f93e83a09"
+  integrity sha512-KvmXv4TV19FBx39KfmgVlDYtvtBqv/8RRK7RRLDDHGViTxZtShjVsVpwIgfkfgn4iJztCnXpWzFqRXWUu2XCpQ==
+
+"@spectrum-css/progressbar@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.3.tgz#f70bcc38a2a21cff2f422ec825724ebbb9455e67"
+  integrity sha512-vJHplefUuy8+NjCw1X7fLbqHVGNVBpvGFXNAeaIj4SFf4ygxiUq/5c9iRhhsCQixEsJlfD/b7BnGXU7BUDkr6Q==
+
+"@spectrum-css/progresscircle@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.2.tgz#258ea9170fb70f795edda03e38a61d93bef4487c"
+  integrity sha512-JLULpyzjIY95lzlWR1yE1gv4l1K6p+scQ+edmuZZUHBzwM3pUtkvHJmUlA9TYdResUYW6Uka60VRdY6lZ8gnFQ==
+
+"@spectrum-css/radio@^3.0.2":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.3.tgz#25c3bc5e9c30a8a8ae728717b7c7fb736cdae640"
+  integrity sha512-LaLGfz/eGNR2iyqouXYILIA+pKRqF769iPdwM0REm5RpWvMQDD7rPZ/kWlg18owjaFsyllEp25gEjmhRJIIVOw==
+
+"@spectrum-css/search@^3.0.2":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.0.3.tgz#3415dc106aca0d5dd996e87084a1b47c2b95a882"
+  integrity sha512-kdLpKTt0obljuhS1q1tukujRlvSs8sBwij76D4Qp8KpMzwePfZyvv1kYzuWPNZfTeISxWsmyZ6Wxd1uvzjn+UA==
+
+"@spectrum-css/sidenav@^3.0.2":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.3.tgz#132141fbd2500a927c312fa4e1d712c438b3d597"
+  integrity sha512-cQ+CgwjxGftrcc79i1XnGd66QTl7H7zopSU0UTV4Qq7hvqfrjjWxfZ6b+3tezrrhNlDope1ff9o8sm67PsPXtg==
+
+"@spectrum-css/statuslight@^3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.2.tgz#dc54b6cd113413dcdb909c486b5d7bae60db65c5"
+  integrity sha512-xodB8g8vGJH20XmUj9ZsPlM1jHrGeRbvmVXkz0q7YvQrYAhim8pP3W+XKKZAletPFAuu8cmUOc6SWn6i4X4z6w==
+
+"@spectrum-css/switch@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.2.tgz#f0b4c69271964573e02b08e90998096e49e1de44"
+  integrity sha512-zqmHpgWPNg1gEwdUNFYV3CBX5JaeALfIqcJIxE0FLZqr9d1C4+oLE0ItIFzt1bwr4bFAOmkEpvtiY+amluzGxQ==
+
+"@spectrum-css/table@^3.0.1":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.3.tgz#7f7f19905ef3275cbf907ce3a5818e63c30b2caf"
+  integrity sha512-nxwzVjLPsXoY/v4sdxOVYLcC+cEbGgJyLcLclT5LT9MGSbngFeUMJzzVR4EvehzuN4dH7hrATG7Mbuq29Mf0Hg==
+
+"@spectrum-css/tabs@^3.0.1":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.0.3.tgz#51dd6f168c897b0fdc3a7e9f901df7bd2288b4fc"
+  integrity sha512-iLP1I72bJWz9APdQB1jiw+pOv5a7N+hYOCJvRoc56Us/hJKVzowkyGRe3uH+8v36nCG9bHxiAQNLoU8eXisVrg==
+
+"@spectrum-css/tags@^3.0.2":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.3.tgz#fc76d2735cdc442de91b7eb3bee49a928c0767ac"
+  integrity sha512-SL8vPxVDfWcY5VdIuyl0TImEXcOU1I7yCyXkk7MudMwfnYs81FaIyY32hFV9OHj0Tz/36UzRzc7AVMSuRQ53pw==
+
+"@spectrum-css/textfield@^3.0.1":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.0.2.tgz#907f62d2dc82852dd6236a820be99e252b531631"
+  integrity sha512-nkFgAb0cP4jUodkUBErMNfyF78jJLtgL1Mrr9/rvGpGobo10IAbb8zZY4CkZ64o8XmMy/85+wZTKcx+KHatqpg==
+
+"@spectrum-css/toast@^3.0.1":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.3.tgz#97c1527384707600832ecda35643ed304615250f"
+  integrity sha512-CjLeaMs+cjUXojCCRtbj0YkD2BoZW16kjj2o5omkEpUTjA34IJ8xJ1a+CCtDILWekhXvN0MBN4sbumcnwcnx8w==
+
+"@spectrum-css/tooltip@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.0.3.tgz#26b8ca3b3d30e29630244d85eb4fc11d0c841281"
+  integrity sha512-ztRF7WW1FzyNavXBRc+80z67UoOrY9wl3cMYsVD3MpDnyxdzP8cjza1pCcolKBaFqRTcQKkxKw3GWtGICRKR5A==
+
+"@spectrum-css/treeview@^3.0.2":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.3.tgz#aeda5175158b9f8d7529cb2b394428eb2a428046"
+  integrity sha512-D5gGzZC/KtRArdx86Mesc9+99W9nTbUOeyYGqoJoAfJSOttoT6Tk5CrDvlCmAqjKf5rajemAkGri1ChqvUIwkw==
+
+"@spectrum-css/typography@^3.0.1", "@spectrum-css/typography@^3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.2.tgz#ea3ca0a60e18064527819d48c8c4364cab4fcd38"
   integrity sha512-5ZOLmQe0edzsDMyhghUd4hBb5uxGsFrxzf+WasfcUw9klSfTsRZ09n1BsaaWbgrLjlMQ+EEHS46v5VNo0Ms2CA==
 
+"@spectrum-css/underlay@^2.0.9":
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.10.tgz#8b75b646605a311850f6620caa18d4996cd64ed7"
+  integrity sha512-PmsmkzeGD/rY4pp3ILXHt9w8BW7uaEqXe08hQRS7rGki7wqCpG4mE0/8N3yEcA3QxWQclmG9gdkg5uz6wMmYzA==
+
 "@spectrum-css/vars@^3.0.1", "@spectrum-css/vars@^3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.2.tgz#ea9062c3c98dfc6ba59e5df14a03025ad8969999"
@@ -78,7 +296,7 @@ colorette@^1.2.2:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
   integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
 
-dayjs@^1.10.5:
+dayjs@^1.10.4, dayjs@^1.10.5:
   version "1.10.6"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63"
   integrity sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw==
@@ -219,6 +437,11 @@ svelte-hmr@^0.14.7:
   resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.14.7.tgz#7fa8261c7b225d9409f0a86f3b9ea5c3ca6f6607"
   integrity sha512-pDrzgcWSoMaK6AJkBWkmgIsecW0GChxYZSZieIYfCP0v2oPyx2CYU/zm7TBIcjLVUPP714WxmViE9Thht4etog==
 
+svelte-portal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3"
+  integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q==
+
 svelte@^3.38.2:
   version "3.42.1"
   resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.42.1.tgz#d4b4d9068cce911835f7c6b8ff1d290e1a0b5657"

From a24afb7e23f5b32ef82904dd84b624e6c05220c5 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 26 Aug 2021 13:38:17 +0000
Subject: [PATCH 52/58] v0.9.116-alpha.0

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index b00fa15ba..eff6f67e6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.115",
+  "version": "0.9.116-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 898a20917..beb1cf751 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.115",
+  "version": "0.9.116-alpha.0",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 47b3ece07..6ed8013d3 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.115",
+  "version": "0.9.116-alpha.0",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index fc2a50e8d..3b397c681 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.115",
+  "version": "0.9.116-alpha.0",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.115",
-    "@budibase/client": "^0.9.115",
+    "@budibase/bbui": "^0.9.116-alpha.0",
+    "@budibase/client": "^0.9.116-alpha.0",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.115",
+    "@budibase/string-templates": "^0.9.116-alpha.0",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 49473b8d8..771526873 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.115",
+  "version": "0.9.116-alpha.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 37c562368..9141a5dfc 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.115",
+  "version": "0.9.116-alpha.0",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.115",
-    "@budibase/standard-components": "^0.9.115",
-    "@budibase/string-templates": "^0.9.115",
+    "@budibase/bbui": "^0.9.116-alpha.0",
+    "@budibase/standard-components": "^0.9.116-alpha.0",
+    "@budibase/string-templates": "^0.9.116-alpha.0",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 92985b30b..d16deeb9b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.115",
+  "version": "0.9.116-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -62,9 +62,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.115",
-    "@budibase/client": "^0.9.115",
-    "@budibase/string-templates": "^0.9.115",
+    "@budibase/auth": "^0.9.116-alpha.0",
+    "@budibase/client": "^0.9.116-alpha.0",
+    "@budibase/string-templates": "^0.9.116-alpha.0",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -117,7 +117,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.115",
+    "@budibase/standard-components": "^0.9.116-alpha.0",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 6cb621706..321b4d762 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.115",
+  "version": "0.9.116-alpha.0",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.115",
+    "@budibase/bbui": "^0.9.116-alpha.0",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 7685401b7..64631a554 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.115",
+  "version": "0.9.116-alpha.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 709122ef7..7a37301b4 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.115",
+  "version": "0.9.116-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -23,8 +23,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.115",
-    "@budibase/string-templates": "^0.9.115",
+    "@budibase/auth": "^0.9.116-alpha.0",
+    "@budibase/string-templates": "^0.9.116-alpha.0",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From ab7793587898e5c0d7c670c2a26d2a8cc3089850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= <kevin.aberg@gmail.com>
Date: Thu, 26 Aug 2021 22:01:24 +0200
Subject: [PATCH 53/58] fix datasources not getting updated correctly

---
 packages/server/src/api/controllers/datasource.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/api/controllers/datasource.js b/packages/server/src/api/controllers/datasource.js
index df1cf7b40..38b6e6893 100644
--- a/packages/server/src/api/controllers/datasource.js
+++ b/packages/server/src/api/controllers/datasource.js
@@ -60,8 +60,8 @@ exports.buildSchemaFromDb = async function (ctx) {
 exports.update = async function (ctx) {
   const db = new CouchDB(ctx.appId)
   const datasourceId = ctx.params.datasourceId
-  const datasource = await db.get(datasourceId)
-  datasource.name = ctx.request.body.name
+  let datasource = await db.get(datasourceId)
+  datasource = { ...datasource, ...ctx.request.body }
 
   const response = await db.put(datasource)
   datasource._rev = response.rev

From 24d611b6536e080fa49e77054474b7b212520ec3 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 27 Aug 2021 08:05:22 +0100
Subject: [PATCH 54/58] refactor of multi-option filtering and validation

---
 .../ValidationEditor/ValidationDrawer.svelte  | 18 +++++-----
 packages/builder/src/helpers/lucene.js        |  6 ++--
 .../src/api/controllers/row/internalSearch.js | 34 -------------------
 .../src/forms/MultiFieldSelect.svelte         |  8 ++---
 .../src/forms/validation.js                   | 21 +-----------
 5 files changed, 16 insertions(+), 71 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte
index 073ad1879..8ab9d61e3 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte
@@ -15,7 +15,6 @@
   import { getSchemaForDatasource } from "builderStore/dataBinding"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { generate } from "shortid"
-  import Multiselect from "../../../../../../../bbui/src/Form/Core/Multiselect.svelte"
 
   export let rules = []
   export let bindings = []
@@ -59,11 +58,11 @@
       value: "notRegex",
     },
     Contains: {
-      label: "Must contain one",
+      label: "Must contain",
       value: "contains",
     },
     NotContains: {
-      label: "Must not contain ",
+      label: "Must not contain",
       value: "notContains",
     },
   }
@@ -98,8 +97,8 @@
     ["attachment"]: [Constraints.Required],
     ["link"]: [
       Constraints.Required,
-      Constraints.ContainsRowID,
-      Constraints.NotContainsRowID,
+      Constraints.Contains,
+      Constraints.NotContains,
       Constraints.MinLength,
       Constraints.MaxLength,
     ],
@@ -283,7 +282,7 @@
                     disabled={rule.constraint === "required"}
                     on:change={e => (rule.value = e.detail)}
                   />
-                {:else if ["maxLength", "minLength", "regex", "notRegex"].includes(rule.constraint)}
+                {:else if rule.type !== "array" && ["maxLength", "minLength", "regex", "notRegex", "contains", "notContains"].includes(rule.constraint)}
                   <!-- Certain constraints always need string values-->
                   <Input
                     bind:value={rule.value}
@@ -297,15 +296,14 @@
                       bind:value={rule.value}
                       placeholder="Constraint value"
                     />
-                  {:else if rule.type === "array" && ["contains", "notContains"].includes(rule.constraint)}
-                    <Multiselect
+                  {:else if rule.type === "array"}
+                    <Select
                       disabled={rule.constraint === "required"}
                       options={dataSourceSchema.schema[field].constraints
                         .inclusion}
                       getOptionLabel={x => x}
                       getOptionValue={x => x}
-                      on:change={e => (rule.value = e.detail)}
-                      bind:value={rule.value}
+                      value={rule.value}
                     />
                   {:else if rule.type === "boolean"}
                     <Select
diff --git a/packages/builder/src/helpers/lucene.js b/packages/builder/src/helpers/lucene.js
index 556edf92a..18692359e 100644
--- a/packages/builder/src/helpers/lucene.js
+++ b/packages/builder/src/helpers/lucene.js
@@ -32,11 +32,11 @@ export const OperatorOptions = {
     label: "Less than",
   },
   Contains: {
-    value: "contains",
+    value: "equal",
     label: "Contains",
   },
   NotContains: {
-    value: "notContains",
+    value: "notEqual",
     label: "Does Not Contain",
   },
 }
@@ -64,7 +64,7 @@ export const getValidOperatorsForType = type => {
   } else if (type === "options") {
     return [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty]
   } else if (type === "array") {
-    return [Op.Contains, Op.NotContains]
+    return [Op.Contains, Op.NotContains, Op.Empty, Op.NotEmpty]
   } else if (type === "boolean") {
     return [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty]
   } else if (type === "longform") {
diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js
index 12a2252b9..793454e60 100644
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@@ -17,8 +17,6 @@ class QueryBuilder {
       notEqual: {},
       empty: {},
       notEmpty: {},
-      contains: {},
-      notContains: {},
       ...base,
     }
     this.limit = 50
@@ -106,16 +104,6 @@ class QueryBuilder {
     return this
   }
 
-  addContains(key, value) {
-    this.query.contains[key] = value
-    return this
-  }
-
-  addNotContains(key, value) {
-    this.query.notContains[key] = value
-    return this
-  }
-
   /**
    * Preprocesses a value before going into a lucene search.
    * Transforms strings to lowercase and wraps strings and bools in quotes.
@@ -223,28 +211,6 @@ class QueryBuilder {
     if (this.query.notEmpty) {
       build(this.query.notEmpty, key => `${key}:["" TO *]`)
     }
-
-    if (this.query.contains) {
-      build(this.query.contains, (key, value) => {
-        if (!value) {
-          return null
-        }
-        return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`
-      })
-    }
-
-    if (this.query.notContains) {
-      build(this.query.notContains, (key, value) => {
-        if (!value) {
-          return null
-        }
-        return `!${key}.${value}:${builder.preprocess(
-          value,
-          allPreProcessingOpts
-        )}`
-      })
-    }
-
     return query
   }
 
diff --git a/packages/standard-components/src/forms/MultiFieldSelect.svelte b/packages/standard-components/src/forms/MultiFieldSelect.svelte
index ad53fbd2b..cecc569b6 100644
--- a/packages/standard-components/src/forms/MultiFieldSelect.svelte
+++ b/packages/standard-components/src/forms/MultiFieldSelect.svelte
@@ -43,12 +43,12 @@
 >
   {#if fieldState}
     <CoreMultiselect
-      value={$fieldState.value}
-      error={$fieldState.error}
+      value={fieldState.value || []}
+      error={fieldState.error}
       getOptionLabel={flatOptions ? x => x : x => x.label}
       getOptionValue={flatOptions ? x => x : x => x.value}
-      id={$fieldState.fieldId}
-      disabled={$fieldState.disabled}
+      id={fieldState.fieldId}
+      disabled={fieldState.disabled}
       on:change={e => fieldApi.setValue(e.detail)}
       {placeholder}
       {options}
diff --git a/packages/standard-components/src/forms/validation.js b/packages/standard-components/src/forms/validation.js
index 2e3b9390f..deb228c4c 100644
--- a/packages/standard-components/src/forms/validation.js
+++ b/packages/standard-components/src/forms/validation.js
@@ -76,19 +76,6 @@ export const createValidatorFromConstraints = (
       })
     }
 
-    if (
-      schemaConstraints.type === "array" &&
-      exists(schemaConstraints.inclusion)
-    ) {
-      const options = schemaConstraints.inclusion || []
-      rules.push({
-        type: "array",
-        constraint: "inclusion",
-        value: options,
-        error: "Invalid value",
-      })
-    }
-
     // Date constraint
     if (exists(schemaConstraints.datetime?.earliest)) {
       const limit = schemaConstraints.datetime.earliest
@@ -262,9 +249,7 @@ const maxValueHandler = (value, rule) => {
 
 // Evaluates an inclusion constraint
 const inclusionHandler = (value, rule) => {
-  return value == null || rule.type == "array"
-    ? rule.value.map(val => val === value)
-    : rule.value.includes(value)
+  return value == null || rule.value.includes(value)
 }
 
 // Evaluates an equal constraint
@@ -295,10 +280,6 @@ const notRegexHandler = (value, rule) => {
 
 // Evaluates a contains constraint
 const containsHandler = (value, rule) => {
-  if (rule.type == "array") {
-    const expectedValue = parseType(rule.value, "array")
-    return value && value.some(val => expectedValue.includes(val))
-  }
   const expectedValue = parseType(rule.value, "string")
   return value && value.includes(expectedValue)
 }

From 57f6a32e9febfef5aebacae743f31c13e68bc117 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 27 Aug 2021 07:47:19 +0000
Subject: [PATCH 55/58] v0.9.116-alpha.1

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index eff6f67e6..daf310ba1 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.116-alpha.0",
+  "version": "0.9.116-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index beb1cf751..abe428f99 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.116-alpha.0",
+  "version": "0.9.116-alpha.1",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 6ed8013d3..c0a1dc426 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.116-alpha.0",
+  "version": "0.9.116-alpha.1",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 3b397c681..135c053fb 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.116-alpha.0",
+  "version": "0.9.116-alpha.1",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.116-alpha.0",
-    "@budibase/client": "^0.9.116-alpha.0",
+    "@budibase/bbui": "^0.9.116-alpha.1",
+    "@budibase/client": "^0.9.116-alpha.1",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.116-alpha.0",
+    "@budibase/string-templates": "^0.9.116-alpha.1",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 771526873..7329ff759 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.116-alpha.0",
+  "version": "0.9.116-alpha.1",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 9141a5dfc..480cafff3 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.116-alpha.0",
+  "version": "0.9.116-alpha.1",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.116-alpha.0",
-    "@budibase/standard-components": "^0.9.116-alpha.0",
-    "@budibase/string-templates": "^0.9.116-alpha.0",
+    "@budibase/bbui": "^0.9.116-alpha.1",
+    "@budibase/standard-components": "^0.9.116-alpha.1",
+    "@budibase/string-templates": "^0.9.116-alpha.1",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index d16deeb9b..5a9bdcb94 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.116-alpha.0",
+  "version": "0.9.116-alpha.1",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -62,9 +62,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.116-alpha.0",
-    "@budibase/client": "^0.9.116-alpha.0",
-    "@budibase/string-templates": "^0.9.116-alpha.0",
+    "@budibase/auth": "^0.9.116-alpha.1",
+    "@budibase/client": "^0.9.116-alpha.1",
+    "@budibase/string-templates": "^0.9.116-alpha.1",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -117,7 +117,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.116-alpha.0",
+    "@budibase/standard-components": "^0.9.116-alpha.1",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 321b4d762..e136e5199 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.116-alpha.0",
+  "version": "0.9.116-alpha.1",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.116-alpha.0",
+    "@budibase/bbui": "^0.9.116-alpha.1",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 64631a554..16102071c 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.116-alpha.0",
+  "version": "0.9.116-alpha.1",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 7a37301b4..72ba5488b 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.116-alpha.0",
+  "version": "0.9.116-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -23,8 +23,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.116-alpha.0",
-    "@budibase/string-templates": "^0.9.116-alpha.0",
+    "@budibase/auth": "^0.9.116-alpha.1",
+    "@budibase/string-templates": "^0.9.116-alpha.1",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From bb5971bd827026daa06e2988d4b1d58c6c35c28f Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 27 Aug 2021 14:10:19 +0100
Subject: [PATCH 56/58] change index definition

---
 packages/server/src/api/controllers/row/utils.js | 2 +-
 packages/server/src/db/views/staticViews.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/api/controllers/row/utils.js b/packages/server/src/api/controllers/row/utils.js
index 9a518ff02..cb9a5e166 100644
--- a/packages/server/src/api/controllers/row/utils.js
+++ b/packages/server/src/api/controllers/row/utils.js
@@ -66,7 +66,7 @@ exports.validate = async ({ appId, tableId, row, table }) => {
     }
     let res
 
-    // Validate.js doesn't seem to handle array of array very well
+    // Validate.js doesn't seem to handle array
     if (table.schema[fieldName].type === FieldTypes.ARRAY) {
       row[fieldName].map(val => {
         if (!constraints.inclusion.includes(val)) {
diff --git a/packages/server/src/db/views/staticViews.js b/packages/server/src/db/views/staticViews.js
index 764b8f03c..6e52e9699 100644
--- a/packages/server/src/db/views/staticViews.js
+++ b/packages/server/src/db/views/staticViews.js
@@ -102,7 +102,7 @@ exports.createAllSearchIndex = async appId => {
           if (Array.isArray(input[key])) {
             for (let val in input[key]) {
               // eslint-disable-next-line no-undef
-              index(`${idxKey}`, input[key][val], {
+              index(idxKey, input[key][val], {
                 store: true,
               })
             }

From 1e3a78d02d4fb1c580c91f7b40ce70e1cbcfb119 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 27 Aug 2021 13:51:03 +0000
Subject: [PATCH 57/58] v0.9.116-alpha.2

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index daf310ba1..ea7ba1c5a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.116-alpha.1",
+  "version": "0.9.116-alpha.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index abe428f99..363f06904 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.116-alpha.1",
+  "version": "0.9.116-alpha.2",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index c0a1dc426..1a22918db 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.116-alpha.1",
+  "version": "0.9.116-alpha.2",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 135c053fb..c57baa4ca 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.116-alpha.1",
+  "version": "0.9.116-alpha.2",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.116-alpha.1",
-    "@budibase/client": "^0.9.116-alpha.1",
+    "@budibase/bbui": "^0.9.116-alpha.2",
+    "@budibase/client": "^0.9.116-alpha.2",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.116-alpha.1",
+    "@budibase/string-templates": "^0.9.116-alpha.2",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 7329ff759..a7485e1ea 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.116-alpha.1",
+  "version": "0.9.116-alpha.2",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 480cafff3..f362d86fb 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.116-alpha.1",
+  "version": "0.9.116-alpha.2",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.116-alpha.1",
-    "@budibase/standard-components": "^0.9.116-alpha.1",
-    "@budibase/string-templates": "^0.9.116-alpha.1",
+    "@budibase/bbui": "^0.9.116-alpha.2",
+    "@budibase/standard-components": "^0.9.116-alpha.2",
+    "@budibase/string-templates": "^0.9.116-alpha.2",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 5a9bdcb94..78aff44a6 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.116-alpha.1",
+  "version": "0.9.116-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -62,9 +62,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.116-alpha.1",
-    "@budibase/client": "^0.9.116-alpha.1",
-    "@budibase/string-templates": "^0.9.116-alpha.1",
+    "@budibase/auth": "^0.9.116-alpha.2",
+    "@budibase/client": "^0.9.116-alpha.2",
+    "@budibase/string-templates": "^0.9.116-alpha.2",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -117,7 +117,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.116-alpha.1",
+    "@budibase/standard-components": "^0.9.116-alpha.2",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index e136e5199..4779da414 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.116-alpha.1",
+  "version": "0.9.116-alpha.2",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.116-alpha.1",
+    "@budibase/bbui": "^0.9.116-alpha.2",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 16102071c..79f8303ed 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.116-alpha.1",
+  "version": "0.9.116-alpha.2",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 72ba5488b..c61709f14 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.116-alpha.1",
+  "version": "0.9.116-alpha.2",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -23,8 +23,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.116-alpha.1",
-    "@budibase/string-templates": "^0.9.116-alpha.1",
+    "@budibase/auth": "^0.9.116-alpha.2",
+    "@budibase/string-templates": "^0.9.116-alpha.2",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From 51e48f343f0c58e3abbb63c465486de74cd9fe35 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 30 Aug 2021 22:01:09 +0000
Subject: [PATCH 58/58] v0.9.116-alpha.3

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index ea7ba1c5a..67abcbf62 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.116-alpha.2",
+  "version": "0.9.116-alpha.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 363f06904..239265b9f 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.116-alpha.2",
+  "version": "0.9.116-alpha.3",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 1a22918db..c8b5e1430 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.116-alpha.2",
+  "version": "0.9.116-alpha.3",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index c57baa4ca..e98706a22 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.116-alpha.2",
+  "version": "0.9.116-alpha.3",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.116-alpha.2",
-    "@budibase/client": "^0.9.116-alpha.2",
+    "@budibase/bbui": "^0.9.116-alpha.3",
+    "@budibase/client": "^0.9.116-alpha.3",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.116-alpha.2",
+    "@budibase/string-templates": "^0.9.116-alpha.3",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index a7485e1ea..6d55d1cbe 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.116-alpha.2",
+  "version": "0.9.116-alpha.3",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index f362d86fb..cb6e95fe8 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.116-alpha.2",
+  "version": "0.9.116-alpha.3",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.116-alpha.2",
-    "@budibase/standard-components": "^0.9.116-alpha.2",
-    "@budibase/string-templates": "^0.9.116-alpha.2",
+    "@budibase/bbui": "^0.9.116-alpha.3",
+    "@budibase/standard-components": "^0.9.116-alpha.3",
+    "@budibase/string-templates": "^0.9.116-alpha.3",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 78aff44a6..418ac4017 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.116-alpha.2",
+  "version": "0.9.116-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -62,9 +62,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.116-alpha.2",
-    "@budibase/client": "^0.9.116-alpha.2",
-    "@budibase/string-templates": "^0.9.116-alpha.2",
+    "@budibase/auth": "^0.9.116-alpha.3",
+    "@budibase/client": "^0.9.116-alpha.3",
+    "@budibase/string-templates": "^0.9.116-alpha.3",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -117,7 +117,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.116-alpha.2",
+    "@budibase/standard-components": "^0.9.116-alpha.3",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 4779da414..47eaba6be 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.116-alpha.2",
+  "version": "0.9.116-alpha.3",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.116-alpha.2",
+    "@budibase/bbui": "^0.9.116-alpha.3",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 79f8303ed..9252c0a86 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.116-alpha.2",
+  "version": "0.9.116-alpha.3",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index c61709f14..2ec64d3e0 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.116-alpha.2",
+  "version": "0.9.116-alpha.3",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -23,8 +23,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.116-alpha.2",
-    "@budibase/string-templates": "^0.9.116-alpha.2",
+    "@budibase/auth": "^0.9.116-alpha.3",
+    "@budibase/string-templates": "^0.9.116-alpha.3",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",