From a06b1b4310860efba76d9f932208c9e8d7c5ed36 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 15 Dec 2021 14:32:26 +0000
Subject: [PATCH 01/14] fixing issue 3489 where default role wasn't saving
 correctly

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

diff --git a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
index 588a3a8486..7fa9482fbe 100644
--- a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
@@ -6,7 +6,7 @@
   import ErrorsBox from "components/common/ErrorsBox.svelte"
   import { roles } from "stores/backend"
 
-  const BASE_ROLE = { _id: "", inherits: "BASIC", permissionId: "Read/Write" }
+  const BASE_ROLE = { _id: "", inherits: "BASIC", permissionId: "write" }
 
   let basePermissions = []
   let selectedRole = BASE_ROLE

From 18671d24b7c0216c6bfaa339c66fc1082b6230d3 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 15 Dec 2021 16:32:04 +0000
Subject: [PATCH 02/14] fix issue with 0 evaluating to false in query builder

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

diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js
index 793454e601..d8ae77156a 100644
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@@ -191,7 +191,8 @@ class QueryBuilder {
     }
     if (this.query.equal) {
       build(this.query.equal, (key, value) => {
-        if (!value) {
+        // 0 evaluates to false, which means we would return all rows if we don't check it
+        if (!value && value !== 0) {
           return null
         }
         return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`

From 3c0b783b55a45f789efdbbcab9201e07fb0d69fc Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 20 Dec 2021 10:50:58 -0500
Subject: [PATCH 03/14] Fix dynamic variable deletion and move utils

---
 packages/builder/src/helpers/data/utils.js    | 60 ------------------
 .../rest/[query]/index.svelte                 | 63 +++++++++++++++----
 2 files changed, 52 insertions(+), 71 deletions(-)

diff --git a/packages/builder/src/helpers/data/utils.js b/packages/builder/src/helpers/data/utils.js
index 6d7843e0e5..b6478680ec 100644
--- a/packages/builder/src/helpers/data/utils.js
+++ b/packages/builder/src/helpers/data/utils.js
@@ -120,62 +120,6 @@ export function flipHeaderState(headersActivity) {
   return enabled
 }
 
-// convert dynamic variables list to simple key/val object
-export function getDynamicVariables(datasource, queryId) {
-  const variablesList = datasource?.config?.dynamicVariables
-  if (variablesList && variablesList.length > 0) {
-    const filtered = queryId
-      ? variablesList.filter(variable => variable.queryId === queryId)
-      : variablesList
-    return filtered.reduce(
-      (acc, next) => ({ ...acc, [next.name]: next.value }),
-      {}
-    )
-  }
-  return {}
-}
-
-// convert dynamic variables object back to a list, enrich with query id
-export function rebuildVariables(datasource, queryId, variables) {
-  let newVariables = []
-  if (variables) {
-    newVariables = Object.entries(variables).map(entry => {
-      return {
-        name: entry[0],
-        value: entry[1],
-        queryId,
-      }
-    })
-  }
-  let existing = datasource?.config?.dynamicVariables || []
-  // filter out any by same name
-  existing = existing.filter(
-    variable =>
-      !newVariables.find(
-        newVar => newVar.name.toLowerCase() === variable.name.toLowerCase()
-      )
-  )
-  return [...existing, ...newVariables]
-}
-
-export function shouldShowVariables(dynamicVariables, variablesReadOnly) {
-  return !!(
-    dynamicVariables &&
-    // show when editable or when read only and not empty
-    (!variablesReadOnly || Object.keys(dynamicVariables).length > 0)
-  )
-}
-
-export function buildAuthConfigs(datasource) {
-  if (datasource?.config?.authConfigs) {
-    return datasource.config.authConfigs.map(c => ({
-      label: c.name,
-      value: c._id,
-    }))
-  }
-  return []
-}
-
 export default {
   breakQueryString,
   buildQueryString,
@@ -184,8 +128,4 @@ export default {
   keyValueToQueryParameters,
   queryParametersToKeyValue,
   schemaToFields,
-  getDynamicVariables,
-  rebuildVariables,
-  shouldShowVariables,
-  buildAuthConfigs,
 }
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
index a54a4f205a..1d53b64c2d 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
@@ -52,13 +52,10 @@
   $: checkQueryName(url)
   $: responseSuccess = response?.info?.code >= 200 && response?.info?.code < 400
   $: isGet = query?.queryVerb === "read"
-  $: authConfigs = restUtils.buildAuthConfigs(datasource)
+  $: authConfigs = buildAuthConfigs(datasource)
   $: schemaReadOnly = !responseSuccess
   $: variablesReadOnly = !responseSuccess
-  $: showVariablesTab = restUtils.shouldShowVariables(
-    dynamicVariables,
-    variablesReadOnly
-  )
+  $: showVariablesTab = shouldShowVariables(dynamicVariables, variablesReadOnly)
 
   function getSelectedQuery() {
     return cloneDeep(
@@ -115,11 +112,7 @@
       notifications.success(`Request saved successfully.`)
 
       if (dynamicVariables) {
-        datasource.config.dynamicVariables = restUtils.rebuildVariables(
-          datasource,
-          saveId,
-          dynamicVariables
-        )
+        datasource.config.dynamicVariables = rebuildVariables(saveId)
         datasource = await datasources.save(datasource)
       }
     } catch (err) {
@@ -158,6 +151,16 @@
     return id
   }
 
+  const buildAuthConfigs = datasource => {
+    if (datasource?.config?.authConfigs) {
+      return datasource.config.authConfigs.map(c => ({
+        label: c.name,
+        value: c._id,
+      }))
+    }
+    return []
+  }
+
   const schemaMenuItems = [
     {
       text: "Create dynamic variable",
@@ -177,6 +180,44 @@
     },
   ]
 
+  // convert dynamic variables list to simple key/val object
+  const getDynamicVariables = (datasource, queryId) => {
+    const variablesList = datasource?.config?.dynamicVariables
+    if (variablesList && variablesList.length > 0) {
+      const filtered = queryId
+        ? variablesList.filter(variable => variable.queryId === queryId)
+        : variablesList
+      return filtered.reduce(
+        (acc, next) => ({ ...acc, [next.name]: next.value }),
+        {}
+      )
+    }
+    return {}
+  }
+
+  // convert dynamic variables object back to a list, enrich with query id
+  const rebuildVariables = queryId => {
+    let variables = []
+    if (dynamicVariables) {
+      variables = Object.entries(dynamicVariables).map(entry => {
+        return {
+          name: entry[0],
+          value: entry[1],
+          queryId,
+        }
+      })
+    }
+    return variables
+  }
+
+  const shouldShowVariables = (dynamicVariables, variablesReadOnly) => {
+    return !!(
+      dynamicVariables &&
+      // show when editable or when read only and not empty
+      (!variablesReadOnly || Object.keys(dynamicVariables).length > 0)
+    )
+  }
+
   onMount(async () => {
     query = getSelectedQuery()
     // clear any unsaved changes to the datasource
@@ -214,7 +255,7 @@
     if (query && !query.fields.bodyType) {
       query.fields.bodyType = "none"
     }
-    dynamicVariables = restUtils.getDynamicVariables(datasource, query._id)
+    dynamicVariables = getDynamicVariables(datasource, query._id)
   })
 </script>
 

From 9bd41a3284cb41b18b7cf165d79a2a04b1cba141 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 20 Dec 2021 11:46:01 -0500
Subject: [PATCH 04/14] Default rest body type to json when there is an
 existing body

---
 .../[selectedDatasource]/rest/[query]/index.svelte         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
index 1d53b64c2d..15b2b574a6 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
@@ -36,6 +36,7 @@
   import DynamicVariableModal from "../../_components/DynamicVariableModal.svelte"
   import Placeholder from "assets/bb-spaceship.svg"
   import { cloneDeep } from "lodash/fp"
+  import { RawRestBodyTypes } from "constants/backend"
 
   let query, datasource
   let breakQs = {},
@@ -253,7 +254,11 @@
       }
     }
     if (query && !query.fields.bodyType) {
-      query.fields.bodyType = "none"
+      if (query.fields.requestBody) {
+        query.fields.bodyType = RawRestBodyTypes.JSON
+      } else {
+        query.fields.bodyType = RawRestBodyTypes.NONE
+      }
     }
     dynamicVariables = getDynamicVariables(datasource, query._id)
   })

From 90eac00aa095022af285ab5f235c36219dfdcc5f Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 21 Dec 2021 12:25:37 +0000
Subject: [PATCH 05/14] Allowing switching between body types without losing
 state in REST UI.

---
 .../_components/RestBodyInput.svelte          | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_components/RestBodyInput.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_components/RestBodyInput.svelte
index c387f0b492..4e3b645373 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_components/RestBodyInput.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_components/RestBodyInput.svelte
@@ -16,17 +16,33 @@
   export let query
   export let bodyType
 
+  let text = ""
+  let json = ""
+
   $: checkRequestBody(bodyType)
+  $: updateRequestBody(bodyType, text, json)
 
   function checkRequestBody(type) {
     if (!bodyType || !query) {
       return
     }
     const currentType = typeof query?.fields.requestBody
-    if (objectTypes.includes(type) && currentType !== "object") {
-      query.fields.requestBody = {}
-    } else if (textTypes.includes(type) && currentType !== "string") {
-      query.fields.requestBody = ""
+    const isObject = objectTypes.includes(type)
+    const isText = textTypes.includes(type)
+    if (isText && currentType === "string") {
+      text = query.fields.requestBody
+    } else if (isObject && currentType === "object") {
+      json = query.fields.requestBody
+    }
+  }
+
+  function updateRequestBody(type, text, json) {
+    if (type === RawRestBodyTypes.NONE) {
+      query.fields.requestBody = null
+    } else if (objectTypes.includes(type)) {
+      query.fields.requestBody = json
+    } else {
+      query.fields.requestBody = text
     }
   }
 
@@ -49,16 +65,12 @@
       <Body size="S" weight="800">THE REQUEST DOES NOT HAVE A BODY</Body>
     </div>
   {:else if objectTypes.includes(bodyType)}
-    <KeyValueBuilder
-      bind:object={query.fields.requestBody}
-      name="param"
-      headings
-    />
+    <KeyValueBuilder bind:object={json} name="param" headings />
   {:else if textTypes.includes(bodyType)}
     <CodeMirrorEditor
       height={200}
       mode={editorMode(bodyType)}
-      value={query.fields.requestBody}
+      value={text}
       resize="vertical"
       on:change={e => (query.fields.requestBody = e.detail)}
     />

From 006df467cdbd426988cd527e7cd9b03a2bf7a649 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 21 Dec 2021 09:39:34 -0500
Subject: [PATCH 06/14] Update curl import to support encoded characters in
 request body

---
 .../server/src/api/controllers/query/import/sources/curl.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/api/controllers/query/import/sources/curl.ts b/packages/server/src/api/controllers/query/import/sources/curl.ts
index 61e1ae0215..b55d24403b 100644
--- a/packages/server/src/api/controllers/query/import/sources/curl.ts
+++ b/packages/server/src/api/controllers/query/import/sources/curl.ts
@@ -17,8 +17,12 @@ const parseBody = (curl: any) => {
   if (curl.data) {
     const keys = Object.keys(curl.data)
     if (keys.length) {
-      const key = keys[0]
+      let key = keys[0]
       try {
+        // filter out the dollar syntax used by curl for shell support
+        if (key.startsWith("$")) {
+          key = key.substring(1)
+        }
         return JSON.parse(key)
       } catch (e) {
         // do nothing

From 70e19d40bcbdaf82c06f6e5f8e8291e5123886ff Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 21 Dec 2021 11:26:45 -0500
Subject: [PATCH 07/14] Further fix for dynamic variable deletion across
 different queries

---
 .../[selectedDatasource]/rest/[query]/index.svelte         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
index 15b2b574a6..43037242f3 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
@@ -208,7 +208,12 @@
         }
       })
     }
-    return variables
+
+    let existing = datasource?.config?.dynamicVariables || []
+    // remove existing query variables (for changes and deletions)
+    existing = existing.filter(variable => variable.queryId !== queryId)
+    // re-add the new query variables
+    return [...existing, ...variables]
   }
 
   const shouldShowVariables = (dynamicVariables, variablesReadOnly) => {

From e6d8b81ac4610094e694a1c88b8906a16662cfb8 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 21 Dec 2021 13:48:54 -0500
Subject: [PATCH 08/14] Prevent escaping in query parameter bindings

---
 packages/server/src/integrations/rest.ts |  7 +++++--
 packages/server/src/threads/utils.js     | 10 +++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/integrations/rest.ts b/packages/server/src/integrations/rest.ts
index 1817f780d3..63d7795a6d 100644
--- a/packages/server/src/integrations/rest.ts
+++ b/packages/server/src/integrations/rest.ts
@@ -48,7 +48,10 @@ module RestModule {
   const { performance } = require("perf_hooks")
   const FormData = require("form-data")
   const { URLSearchParams } = require("url")
-  const { parseStringPromise: xmlParser, Builder: XmlBuilder } = require("xml2js")
+  const {
+    parseStringPromise: xmlParser,
+    Builder: XmlBuilder,
+  } = require("xml2js")
 
   const SCHEMA: Integration = {
     docs: "https://github.com/node-fetch/node-fetch",
@@ -211,7 +214,7 @@ module RestModule {
           break
         case BodyTypes.XML:
           if (object != null) {
-            string = (new XmlBuilder()).buildObject(object)
+            string = new XmlBuilder().buildObject(object)
           }
           input.body = string
           input.headers["Content-Type"] = "application/xml"
diff --git a/packages/server/src/threads/utils.js b/packages/server/src/threads/utils.js
index fee1e19b67..ffea596abd 100644
--- a/packages/server/src/threads/utils.js
+++ b/packages/server/src/threads/utils.js
@@ -8,6 +8,9 @@ const { processStringSync } = require("@budibase/string-templates")
 const VARIABLE_TTL_SECONDS = 3600
 let client
 
+const IS_TRIPLE_BRACE = new RegExp(/^{{3}.*}{3}$/)
+const IS_HANDLEBARS = new RegExp(/^{{2}.*}{2}$/)
+
 async function getClient() {
   if (!client) {
     client = await new redis.Client(redis.utils.Databases.QUERY_VARS).init()
@@ -90,7 +93,12 @@ exports.enrichQueryFields = (fields, parameters = {}) => {
       enrichedQuery[key] = this.enrichQueryFields(fields[key], parameters)
     } else if (typeof fields[key] === "string") {
       // enrich string value as normal
-      enrichedQuery[key] = processStringSync(fields[key], parameters, {
+      let value = fields[key]
+      // add triple brace to avoid escaping e.g. '=' in cookie header
+      if (IS_HANDLEBARS.test(value) && !IS_TRIPLE_BRACE.test(value)) {
+        value = `{${value}}`
+      }
+      enrichedQuery[key] = processStringSync(value, parameters, {
         noHelpers: true,
       })
     } else {

From 2af1a6e116c4f419282f5316f52b99d736bf4222 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 21 Dec 2021 14:08:09 -0500
Subject: [PATCH 09/14] Add bold and code cell renderers

---
 packages/bbui/src/Table/BoldRenderer.svelte           | 11 +++++++++++
 packages/bbui/src/Table/CodeRenderer.svelte           |  5 +++++
 packages/bbui/src/index.js                            |  4 ++++
 .../rest/variables/ViewDynamicVariables.svelte        |  8 ++++++--
 4 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 packages/bbui/src/Table/BoldRenderer.svelte
 create mode 100644 packages/bbui/src/Table/CodeRenderer.svelte

diff --git a/packages/bbui/src/Table/BoldRenderer.svelte b/packages/bbui/src/Table/BoldRenderer.svelte
new file mode 100644
index 0000000000..ea882d538e
--- /dev/null
+++ b/packages/bbui/src/Table/BoldRenderer.svelte
@@ -0,0 +1,11 @@
+<script>
+  export let value
+</script>
+
+<div class="bold">{value}</div>
+
+<style>
+  .bold {
+    font-weight: bold;
+  }
+</style>
diff --git a/packages/bbui/src/Table/CodeRenderer.svelte b/packages/bbui/src/Table/CodeRenderer.svelte
new file mode 100644
index 0000000000..a75bec663c
--- /dev/null
+++ b/packages/bbui/src/Table/CodeRenderer.svelte
@@ -0,0 +1,5 @@
+<script>
+  export let value
+</script>
+
+<code>{value}</code>
diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js
index c30047f73f..3e86d01a0d 100644
--- a/packages/bbui/src/index.js
+++ b/packages/bbui/src/index.js
@@ -61,6 +61,10 @@ export { default as ColorPicker } from "./ColorPicker/ColorPicker.svelte"
 export { default as InlineAlert } from "./InlineAlert/InlineAlert.svelte"
 export { default as Banner } from "./Banner/Banner.svelte"
 
+// Renderers
+export { default as BoldRenderer } from "./Table/BoldRenderer.svelte"
+export { default as CodeRenderer } from "./Table/CodeRenderer.svelte"
+
 // Typography
 export { default as Body } from "./Typography/Body.svelte"
 export { default as Heading } from "./Typography/Heading.svelte"
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/variables/ViewDynamicVariables.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/variables/ViewDynamicVariables.svelte
index b000258399..a1e209f846 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/variables/ViewDynamicVariables.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/variables/ViewDynamicVariables.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Body, Table } from "@budibase/bbui"
+  import { Body, Table, BoldRenderer, CodeRenderer } from "@budibase/bbui"
   import { queries as queriesStore } from "stores/backend"
   import { goto } from "@roxi/routify"
 
@@ -12,8 +12,8 @@
 
   const dynamicVariableSchema = {
     name: "",
-    value: "",
     query: "",
+    value: "",
   }
 
   const onClick = dynamicVariable => {
@@ -43,5 +43,9 @@
   allowEditColumns={false}
   allowEditRows={false}
   allowSelectRows={false}
+  customRenderers={[
+    { column: "name", component: BoldRenderer },
+    { column: "value", component: CodeRenderer },
+  ]}
 />
 <Body size="S" />

From 0c5de8cf6518f05e4b497857c23e551d293049c1 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 4 Jan 2022 11:52:12 +0000
Subject: [PATCH 10/14] v1.0.27-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           | 6 +++---
 packages/server/package.json           | 8 ++++----
 packages/string-templates/package.json | 2 +-
 packages/worker/package.json           | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index de5f6bf3a5..c31d90ba46 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.27-alpha.1",
+  "version": "1.0.27-alpha.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index d0d082ecbe..1113c60d7e 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "1.0.27-alpha.1",
+  "version": "1.0.27-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 4a775e3a67..7b0e150c91 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": "1.0.27-alpha.1",
+  "version": "1.0.27-alpha.2",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index cb9aa0397b..69ef82cb24 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.27-alpha.1",
+  "version": "1.0.27-alpha.2",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.27-alpha.1",
-    "@budibase/client": "^1.0.27-alpha.1",
+    "@budibase/bbui": "^1.0.27-alpha.2",
+    "@budibase/client": "^1.0.27-alpha.2",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.27-alpha.1",
+    "@budibase/string-templates": "^1.0.27-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 f71c65aca6..67d857d57c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.27-alpha.1",
+  "version": "1.0.27-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 2fbf4192a9..41d9850339 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.27-alpha.1",
+  "version": "1.0.27-alpha.2",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.27-alpha.1",
+    "@budibase/bbui": "^1.0.27-alpha.2",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.27-alpha.1",
+    "@budibase/string-templates": "^1.0.27-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 8923a88a8b..1117f3a8e0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.27-alpha.1",
+  "version": "1.0.27-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/auth": "^1.0.27-alpha.1",
-    "@budibase/client": "^1.0.27-alpha.1",
-    "@budibase/string-templates": "^1.0.27-alpha.1",
+    "@budibase/auth": "^1.0.27-alpha.2",
+    "@budibase/client": "^1.0.27-alpha.2",
+    "@budibase/string-templates": "^1.0.27-alpha.2",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index d9dd0655bd..ce1da2cb67 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.27-alpha.1",
+  "version": "1.0.27-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 18cf155259..f0a32afb09 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.27-alpha.1",
+  "version": "1.0.27-alpha.2",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -29,8 +29,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/auth": "^1.0.27-alpha.1",
-    "@budibase/string-templates": "^1.0.27-alpha.1",
+    "@budibase/auth": "^1.0.27-alpha.2",
+    "@budibase/string-templates": "^1.0.27-alpha.2",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From 46a271c073f38b8f42bddf3bc843f87de9486f0b Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 4 Jan 2022 14:41:11 +0000
Subject: [PATCH 11/14] Fixing issue discovered by cypress test case and
 updating dynamic variable view to hide table when there are none.

---
 .../variables/ViewDynamicVariables.svelte     | 29 ++++++++++---------
 .../src/components/app/DataProvider.svelte    |  2 +-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/variables/ViewDynamicVariables.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/variables/ViewDynamicVariables.svelte
index a1e209f846..b97cd1f5b6 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/variables/ViewDynamicVariables.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/variables/ViewDynamicVariables.svelte
@@ -36,16 +36,19 @@
   }
 </script>
 
-<Table
-  on:click={({ detail }) => onClick(detail)}
-  schema={dynamicVariableSchema}
-  data={dynamicVariables}
-  allowEditColumns={false}
-  allowEditRows={false}
-  allowSelectRows={false}
-  customRenderers={[
-    { column: "name", component: BoldRenderer },
-    { column: "value", component: CodeRenderer },
-  ]}
-/>
-<Body size="S" />
+{#if dynamicVariables.length > 0}
+  <Table
+    on:click={({ detail }) => onClick(detail)}
+    schema={dynamicVariableSchema}
+    data={dynamicVariables}
+    allowEditColumns={false}
+    allowEditRows={false}
+    allowSelectRows={false}
+    customRenderers={[
+      { column: "name", component: BoldRenderer },
+      { column: "value", component: CodeRenderer },
+    ]}
+  />
+{:else}
+  <Body size="S"><i>No dynamic variables specified.</i></Body>
+{/if}
diff --git a/packages/client/src/components/app/DataProvider.svelte b/packages/client/src/components/app/DataProvider.svelte
index 9c35de7870..ec328c60c6 100644
--- a/packages/client/src/components/app/DataProvider.svelte
+++ b/packages/client/src/components/app/DataProvider.svelte
@@ -123,7 +123,7 @@
     rows,
     info,
     schema,
-    rowsLength: rows.length,
+    rowsLength: rows?.length,
 
     // Undocumented properties. These aren't supposed to be used in builder
     // bindings, but are used internally by other components

From 8b6875aa9909c5e93fe3621072152156c4491604 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 4 Jan 2022 14:46:10 +0000
Subject: [PATCH 12/14] Hiding all tables from data sources when there is no
 data for them (no placeholder table).

---
 .../PlusConfigForm.svelte                     | 42 +++++++++++--------
 .../variables/ViewDynamicVariables.svelte     |  2 +-
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte
index f736d29bee..b97f23d7a3 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte
@@ -175,15 +175,19 @@
     onConfirm={datasources.removeSchemaError}
   />
 {/if}
-<Table
-  on:click={({ detail }) => onClickTable(detail)}
-  schema={tableSchema}
-  data={Object.values(plusTables)}
-  allowEditColumns={false}
-  allowEditRows={false}
-  allowSelectRows={false}
-  customRenderers={[{ column: "primary", component: ArrayRenderer }]}
-/>
+{#if plusTables && Object.values(plusTables).length > 0}
+  <Table
+    on:click={({ detail }) => onClickTable(detail)}
+    schema={tableSchema}
+    data={Object.values(plusTables)}
+    allowEditColumns={false}
+    allowEditRows={false}
+    allowSelectRows={false}
+    customRenderers={[{ column: "primary", component: ArrayRenderer }]}
+  />
+{:else}
+  <Body size="S"><i>No tables found.</i></Body>
+{/if}
 {#if plusTables?.length !== 0}
   <Divider size="S" />
   <div class="query-header">
@@ -196,14 +200,18 @@
     Tell budibase how your tables are related to get even more smart features.
   </Body>
 {/if}
-<Table
-  on:click={({ detail }) => openRelationshipModal(detail.from, detail.to)}
-  schema={relationshipSchema}
-  data={relationshipInfo}
-  allowEditColumns={false}
-  allowEditRows={false}
-  allowSelectRows={false}
-/>
+{#if relationshipInfo && relationshipInfo.length > 0}
+  <Table
+    on:click={({ detail }) => openRelationshipModal(detail.from, detail.to)}
+    schema={relationshipSchema}
+    data={relationshipInfo}
+    allowEditColumns={false}
+    allowEditRows={false}
+    allowSelectRows={false}
+  />
+{:else}
+  <Body size="S"><i>No relationships configured.</i></Body>
+{/if}
 
 <style>
   .query-header {
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/variables/ViewDynamicVariables.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/variables/ViewDynamicVariables.svelte
index b97cd1f5b6..13037384f2 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/variables/ViewDynamicVariables.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/variables/ViewDynamicVariables.svelte
@@ -36,7 +36,7 @@
   }
 </script>
 
-{#if dynamicVariables.length > 0}
+{#if dynamicVariables && dynamicVariables.length > 0}
   <Table
     on:click={({ detail }) => onClick(detail)}
     schema={dynamicVariableSchema}

From a7bb952dbf55017ff2fc6336466f0aca53136b7e Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 4 Jan 2022 15:50:18 +0000
Subject: [PATCH 13/14] Fixing issue discovered where parameters weren't
 selected correctly.

---
 packages/server/src/api/controllers/query/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/api/controllers/query/index.js b/packages/server/src/api/controllers/query/index.js
index 4c7c7398be..6001b81aa9 100644
--- a/packages/server/src/api/controllers/query/index.js
+++ b/packages/server/src/api/controllers/query/index.js
@@ -144,7 +144,7 @@ async function execute(ctx, opts = { rowsOnly: false }) {
       datasource,
       queryVerb: query.queryVerb,
       fields: query.fields,
-      parameters: ctx.request.body.parameter,
+      parameters: ctx.request.body.parameters,
       transformer: query.transformer,
       queryId: ctx.params.queryId,
     })

From de243c933a077b49786f5a01ad0e8bf7347cd253 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 4 Jan 2022 18:23:45 +0000
Subject: [PATCH 14/14] Adding basic test cases for static and dynamic
 variables (backend).

---
 packages/server/__mocks__/node-fetch.ts       |  6 ++
 .../server/src/api/routes/tests/query.spec.js | 73 +++++++++++++++++++
 packages/server/src/definitions/datasource.ts | 10 +++
 .../src/tests/utilities/TestConfiguration.js  | 10 +++
 4 files changed, 99 insertions(+)

diff --git a/packages/server/__mocks__/node-fetch.ts b/packages/server/__mocks__/node-fetch.ts
index 8badbd0156..6bd55186b5 100644
--- a/packages/server/__mocks__/node-fetch.ts
+++ b/packages/server/__mocks__/node-fetch.ts
@@ -57,6 +57,12 @@ module FetchMock {
         ],
         bookmark: "test",
       })
+    } else if (url.includes("google.com")) {
+      return json({
+        url,
+        opts,
+        value: "<!doctype html><html itemscope=\"\" itemtype=\"http://schema.org/WebPage\" lang=\"en-GB\"></html>",
+      })
     }
     return fetch(url, opts)
   }
diff --git a/packages/server/src/api/routes/tests/query.spec.js b/packages/server/src/api/routes/tests/query.spec.js
index 37c969aba8..8589f4ded6 100644
--- a/packages/server/src/api/routes/tests/query.spec.js
+++ b/packages/server/src/api/routes/tests/query.spec.js
@@ -1,5 +1,6 @@
 // Mock out postgres for this
 jest.mock("pg")
+jest.mock("node-fetch")
 
 // Mock isProdAppID to we can later mock the implementation and pretend we are
 // using prod app IDs
@@ -226,4 +227,76 @@ describe("/queries", () => {
         .expect(400)
     })
   })
+
+  describe("test variables", () => {
+    async function restDatasource(cfg) {
+      return await config.createDatasource({
+        datasource: {
+          ...basicDatasource().datasource,
+          source: "REST",
+          config: cfg || {},
+        },
+      })
+    }
+
+    it("should work with static variables", async () => {
+      const datasource = await restDatasource({
+        staticVariables: {
+          variable: "google",
+          variable2: "1",
+        },
+      })
+      const res = await request
+        .post(`/api/queries/preview`)
+        .send({
+          datasourceId: datasource._id,
+          parameters: {},
+          fields: {
+            path: "www.{{ variable }}.com",
+            queryString: "test={{ variable2 }}",
+          },
+          queryVerb: "read",
+        })
+        .set(config.defaultHeaders())
+        .expect("Content-Type", /json/)
+        .expect(200)
+      // these responses come from the mock
+      expect(res.body.schemaFields).toEqual(["url", "opts", "value"])
+      expect(res.body.rows[0].url).toEqual("http://www.google.com?test=1")
+    })
+
+    it("should work with dynamic variables", async () => {
+      const datasource = await restDatasource()
+      const basedOnQuery = await config.createQuery({
+        ...basicQuery(datasource._id),
+        fields: {
+          path: "www.google.com",
+        },
+      })
+      await config.updateDatasource({
+        ...datasource,
+        config: {
+          dynamicVariables: [
+            { queryId: basedOnQuery._id, name: "variable3", value: "{{ data.0.[value] }}" }
+          ]
+        }
+      })
+      const res = await request
+        .post(`/api/queries/preview`)
+        .send({
+          datasourceId: datasource._id,
+          parameters: {},
+          fields: {
+            path: "www.google.com",
+            queryString: "test={{ variable3 }}",
+          },
+          queryVerb: "read",
+        })
+        .set(config.defaultHeaders())
+        .expect("Content-Type", /json/)
+        .expect(200)
+      expect(res.body.schemaFields).toEqual(["url", "opts", "value"])
+      expect(res.body.rows[0].url).toContain("doctype html")
+    })
+  })
 })
diff --git a/packages/server/src/definitions/datasource.ts b/packages/server/src/definitions/datasource.ts
index 148d8f2875..d281f94c8b 100644
--- a/packages/server/src/definitions/datasource.ts
+++ b/packages/server/src/definitions/datasource.ts
@@ -240,6 +240,16 @@ export interface RestConfig {
     [key: string]: any
   }
   authConfigs: AuthConfig[]
+  staticVariables: {
+    [key: string]: string
+  }
+  dynamicVariables: [
+    {
+      name: string
+      queryId: string
+      value: string
+    }
+  ]
 }
 
 export interface Query {
diff --git a/packages/server/src/tests/utilities/TestConfiguration.js b/packages/server/src/tests/utilities/TestConfiguration.js
index 8f3583443c..f003a8a78d 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.js
+++ b/packages/server/src/tests/utilities/TestConfiguration.js
@@ -316,6 +316,16 @@ class TestConfiguration {
     return this.datasource
   }
 
+  async updateDatasource(datasource) {
+    const response = await this._req(
+      datasource,
+      { datasourceId: datasource._id },
+      controllers.datasource.update
+    )
+    this.datasource = response.datasource
+    return this.datasource
+  }
+
   async createQuery(config = null) {
     if (!this.datasource && !config) {
       throw "No data source created for query."