From ef268014c1bbad6203c5b7215c571c1ed7f0ef37 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 19 Apr 2021 10:39:27 +0100
Subject: [PATCH 01/19] v0.8.17

---
 lerna.json                                | 2 +-
 packages/builder/package.json             | 6 +++---
 packages/client/package.json              | 6 +++---
 packages/server/package.json              | 8 ++++----
 packages/standard-components/package.json | 2 +-
 packages/string-templates/package.json    | 2 +-
 packages/worker/package.json              | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lerna.json b/lerna.json
index bf193f9a81..76a41df08c 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.8.16",
+  "version": "0.8.17",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/package.json b/packages/builder/package.json
index df83d69095..3c1afc1bb6 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.8.16",
+  "version": "0.8.17",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,9 +64,9 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.58.13",
-    "@budibase/client": "^0.8.16",
+    "@budibase/client": "^0.8.17",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.8.16",
+    "@budibase/string-templates": "^0.8.17",
     "@budibase/svelte-ag-grid": "^1.0.4",
     "@sentry/browser": "5.19.1",
     "@svelteschool/svelte-forms": "0.7.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index fc68546dea..f4a535d72e 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.8.16",
+  "version": "0.8.17",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -9,13 +9,13 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.8.16",
+    "@budibase/string-templates": "^0.8.17",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.16",
+    "@budibase/standard-components": "^0.8.17",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "fs-extra": "^8.1.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 245bb01fbf..fae63a97e0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.8.16",
+  "version": "0.8.17",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -71,8 +71,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.8.16",
-    "@budibase/string-templates": "^0.8.16",
+    "@budibase/client": "^0.8.17",
+    "@budibase/string-templates": "^0.8.17",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -126,7 +126,7 @@
     "zlib": "1.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.16",
+    "@budibase/standard-components": "^0.8.17",
     "@jest/test-sequencer": "^24.8.0",
     "cross-env": "^7.0.3",
     "electron": "10.1.3",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index b5d013943e..c7d765422f 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -35,7 +35,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.8.16",
+  "version": "0.8.17",
   "license": "MIT",
   "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321",
   "dependencies": {
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 53d5ab27fa..d7c053c570 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.8.16",
+  "version": "0.8.17",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.js",
   "module": "src/index.js",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 5576da31fe..3c8179d629 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.8.16",
+  "version": "0.8.17",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {

From 806bd4e06b5c6333ba5c2a0bfa3967e0353df710 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 19 Apr 2021 22:24:13 +0100
Subject: [PATCH 02/19] Fixing an issue with the DynamoDB integration, didn't
 specify the correct terms for the AWS credentials.

---
 packages/server/src/integrations/dynamodb.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/integrations/dynamodb.js b/packages/server/src/integrations/dynamodb.js
index 668e11e263..da95411b2b 100644
--- a/packages/server/src/integrations/dynamodb.js
+++ b/packages/server/src/integrations/dynamodb.js
@@ -16,7 +16,7 @@ const SCHEMA = {
       type: FIELD_TYPES.PASSWORD,
       required: true,
     },
-    secretKey: {
+    secretAccessKey: {
       type: FIELD_TYPES.PASSWORD,
       required: true,
     },
@@ -114,7 +114,7 @@ class DynamoDBIntegration {
     })
   }
 
-  async connect() {
+  connect() {
     AWS.config.update(this.config)
   }
 

From 2ef1586d4d520d8edc01527686045b7ce5249ce8 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 19 Apr 2021 22:36:14 +0100
Subject: [PATCH 03/19] Adding cleanup operation to dynamo client.

---
 packages/server/src/api/controllers/query.js | 18 ++++++++++++------
 packages/server/src/db/dynamoClient.js       |  1 +
 packages/server/src/integrations/dynamodb.js | 13 +++++++++++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/api/controllers/query.js b/packages/server/src/api/controllers/query.js
index a2badb0d0d..45dc4e0d86 100644
--- a/packages/server/src/api/controllers/query.js
+++ b/packages/server/src/api/controllers/query.js
@@ -116,9 +116,8 @@ exports.preview = async function(ctx) {
 
   const enrichedQuery = await enrichQueryFields(fields, parameters)
 
-  const rows = formatResponse(
-    await new Integration(datasource.config)[queryVerb](enrichedQuery)
-  )
+  const integration = new Integration(datasource.config)
+  const rows = formatResponse(await integration[queryVerb](enrichedQuery))
 
   // get all the potential fields in the schema
   const keys = rows.flatMap(Object.keys)
@@ -127,6 +126,10 @@ exports.preview = async function(ctx) {
     rows,
     schemaFields: [...new Set(keys)],
   }
+  // cleanup
+  if (integration.end) {
+    integration.end()
+  }
 }
 
 exports.execute = async function(ctx) {
@@ -146,10 +149,13 @@ exports.execute = async function(ctx) {
     ctx.request.body.parameters
   )
 
+  const integration = new Integration(datasource.config)
   // call the relevant CRUD method on the integration class
-  ctx.body = formatResponse(
-    await new Integration(datasource.config)[query.queryVerb](enrichedQuery)
-  )
+  ctx.body = formatResponse(await integration[query.queryVerb](enrichedQuery))
+  // cleanup
+  if (integration.end) {
+    integration.end()
+  }
 }
 
 exports.destroy = async function(ctx) {
diff --git a/packages/server/src/db/dynamoClient.js b/packages/server/src/db/dynamoClient.js
index fcba726f84..3e9c8ced14 100644
--- a/packages/server/src/db/dynamoClient.js
+++ b/packages/server/src/db/dynamoClient.js
@@ -2,6 +2,7 @@ let _ = require("lodash")
 let env = require("../environment")
 
 const AWS_REGION = env.AWS_REGION ? env.AWS_REGION : "eu-west-1"
+exports.AWS_REGION = AWS_REGION
 
 const TableInfo = {
   API_KEYS: {
diff --git a/packages/server/src/integrations/dynamodb.js b/packages/server/src/integrations/dynamodb.js
index da95411b2b..aa77d6d4f0 100644
--- a/packages/server/src/integrations/dynamodb.js
+++ b/packages/server/src/integrations/dynamodb.js
@@ -1,5 +1,6 @@
 const AWS = require("aws-sdk")
 const { FIELD_TYPES, QUERY_TYPES } = require("./Integration")
+const { AWS_REGION } = require("../db/dynamoClient")
 
 const SCHEMA = {
   docs: "https://github.com/dabit3/dynamodb-documentclient-cheat-sheet",
@@ -114,10 +115,22 @@ class DynamoDBIntegration {
     })
   }
 
+  end() {
+    this.disconnect()
+  }
+
   connect() {
     AWS.config.update(this.config)
   }
 
+  disconnect() {
+    AWS.config.update({
+      secretAccessKey: undefined,
+      accessKeyId: undefined,
+      region: AWS_REGION,
+    })
+  }
+
   async create(query) {
     const params = {
       TableName: query.table,

From 93596311bb5d4a1bc60d05fc892d957fdd6b5f21 Mon Sep 17 00:00:00 2001
From: Mike Shanks <mike@budibase.com>
Date: Wed, 12 May 2021 10:17:47 +0100
Subject: [PATCH 04/19] fix - rest api datasource not accepting parameters

---
 .../PropertyControls/EventsEditor/actions/ExecuteQuery.svelte  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
index e18336fab5..d760d65d1e 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
@@ -55,5 +55,6 @@
     height={200}
     {query}
     schema={fetchQueryDefinition(query)}
-    editable={false} />
+    editable={false}
+    {datasource} />
 {/if}

From 787d39759328187af4befea042173ba02843be47 Mon Sep 17 00:00:00 2001
From: Mike Shanks <mike@budibase.com>
Date: Wed, 12 May 2021 17:17:08 +0100
Subject: [PATCH 05/19] desktop deprecation banner

---
 packages/builder/src/pages/_layout.svelte | 52 ++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/_layout.svelte b/packages/builder/src/pages/_layout.svelte
index ac45ff8372..169675ae98 100644
--- a/packages/builder/src/pages/_layout.svelte
+++ b/packages/builder/src/pages/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Home as Link } from "@budibase/bbui"
+  import { Home as Link, Button } from "@budibase/bbui"
   import {
     AppsIcon,
     HostingIcon,
@@ -10,8 +10,28 @@
   import BuilderSettingsButton from "components/start/BuilderSettingsButton.svelte"
 
   let modal
+  $: deprecationWarning = true
 </script>
 
+{#if deprecationWarning}
+<div class="deprecation-root">
+  
+  <div class="deprecation-inner">
+    <div class="deprecation-text">
+      From the 25th of May, Budibase is moving to a self-hosted web experience in the browser. We will cease development on the current Electron based desktop builder.
+    </div>
+
+    <div class="deprecation-close">
+      <a href="https://github.com/Budibase/budibase/discussions/1487" target="_blank">read more</a>
+      <Button secondary small on:click={() => deprecationWarning = false}>
+        Close
+      </Button>
+    </div>
+  </div>
+  
+</div>
+{/if}
+
 <div class="root">
   <div class="ui-nav">
     <div class="home-logo">
@@ -49,6 +69,36 @@
 </div>
 
 <style>
+
+  .deprecation-root {
+    padding: 20px;
+    background-color: var(--red);
+    display: flex;
+    justify-content: center;
+  }
+
+  .deprecation-inner {
+    display: flex;
+    max-width: 900px;
+    align-items: center;
+  }
+
+  .deprecation-text {
+    flex: 1 1 auto;
+    color: white;
+    font-size: 1.1em;
+    text-align: center;
+  }
+
+  .deprecation-close {
+    padding-left: 20px;
+    flex: 0 0 auto;
+  }
+
+  .deprecation-close > a {
+    margin-right: 20px;
+  }
+
   .root {
     display: grid;
     grid-template-columns: 260px 1fr;

From 209f0ad2fd1882149f096a69892d4dcb6536e26e Mon Sep 17 00:00:00 2001
From: Mike Shanks <mike@budibase.com>
Date: Thu, 13 May 2021 09:41:40 +0100
Subject: [PATCH 06/19] deprecation warning styling

---
 packages/builder/src/pages/_layout.svelte | 66 +++++++++++++++++++----
 1 file changed, 55 insertions(+), 11 deletions(-)

diff --git a/packages/builder/src/pages/_layout.svelte b/packages/builder/src/pages/_layout.svelte
index 169675ae98..1b7ac55556 100644
--- a/packages/builder/src/pages/_layout.svelte
+++ b/packages/builder/src/pages/_layout.svelte
@@ -18,14 +18,17 @@
   
   <div class="deprecation-inner">
     <div class="deprecation-text">
-      From the 25th of May, Budibase is moving to a self-hosted web experience in the browser. We will cease development on the current Electron based desktop builder.
+      From the 25th of May, Budibase is moving to a self-hosted web experience in the browser.<br/> 
+      We will cease development on the current Electron based desktop builder.
     </div>
 
-    <div class="deprecation-close">
+    <div class="deprecation-actions">
+
       <a href="https://github.com/Budibase/budibase/discussions/1487" target="_blank">read more</a>
-      <Button secondary small on:click={() => deprecationWarning = false}>
+
+      <button on:click={() => deprecationWarning = false}>
         Close
-      </Button>
+      </button>
     </div>
   </div>
   
@@ -72,7 +75,7 @@
 
   .deprecation-root {
     padding: 20px;
-    background-color: var(--red);
+    background-color: var(--yellow-light);
     display: flex;
     justify-content: center;
   }
@@ -85,18 +88,59 @@
 
   .deprecation-text {
     flex: 1 1 auto;
-    color: white;
-    font-size: 1.1em;
+    color: black;
     text-align: center;
   }
 
-  .deprecation-close {
-    padding-left: 20px;
+  .deprecation-actions {
     flex: 0 0 auto;
+    padding-left: 40px;
   }
 
-  .deprecation-close > a {
-    margin-right: 20px;
+  .deprecation-actions > a {
+    color: white;
+    border-color: black;
+    background-color: black;
+    font-size: var(--font-size-xs);
+    padding: var(--spacing-xs) var(--spacing-m);
+    font-family: var(--font-sans);
+    cursor: pointer;
+    font-weight: 600;
+    box-sizing: border-box;
+    overflow: hidden;
+    border-radius: var(--border-radius-s);
+    transition: all 0.2s ease 0s;
+    display: inline-flex;
+    text-rendering: optimizeLegibility;
+    text-decoration: none;
+    min-width: auto;
+    outline: none;
+    font-feature-settings: "case" 1, "rlig" 1, "calt" 0;
+    -webkit-box-align: center;
+    user-select: none;
+    flex-shrink: 0;
+    align-items: center;
+    justify-content: center;
+    margin: 0;
+    border-width: 2px;
+    border-style: solid;
+  }
+
+  .deprecation-actions > a:hover {
+    background-color: white;
+    color: black;
+  }
+
+  .deprecation-actions > button {
+    border-style: none;
+    background-color: rgba(0,0,0,0);
+    color: rgb(117, 117, 117);
+    cursor: pointer;
+    margin-left: 10px;
+  }
+
+  .deprecation-actions > button:hover {
+    color: black;
   }
 
   .root {

From 04a159986ef835cb2841680c775b72f20792008f Mon Sep 17 00:00:00 2001
From: Mike Shanks <mike@budibase.com>
Date: Thu, 13 May 2021 11:17:08 +0100
Subject: [PATCH 07/19] v0.8.18

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

diff --git a/lerna.json b/lerna.json
index 76a41df08c..90690dbf98 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.8.17",
+  "version": "0.8.18",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 3c1afc1bb6..122d9c8a50 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.8.17",
+  "version": "0.8.18",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,9 +64,9 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.58.13",
-    "@budibase/client": "^0.8.17",
+    "@budibase/client": "^0.8.18",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.8.17",
+    "@budibase/string-templates": "^0.8.18",
     "@budibase/svelte-ag-grid": "^1.0.4",
     "@sentry/browser": "5.19.1",
     "@svelteschool/svelte-forms": "0.7.0",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5784f5db0d..e1f313f8b3 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cli",
-  "version": "0.8.15",
+  "version": "0.8.18",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": "src/index.js",
diff --git a/packages/client/package.json b/packages/client/package.json
index f4a535d72e..ff77e9089d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.8.17",
+  "version": "0.8.18",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -9,13 +9,13 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.8.17",
+    "@budibase/string-templates": "^0.8.18",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.17",
+    "@budibase/standard-components": "^0.8.18",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "fs-extra": "^8.1.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index fae63a97e0..98e3643e02 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.8.17",
+  "version": "0.8.18",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -71,8 +71,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.8.17",
-    "@budibase/string-templates": "^0.8.17",
+    "@budibase/client": "^0.8.18",
+    "@budibase/string-templates": "^0.8.18",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -126,7 +126,7 @@
     "zlib": "1.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.17",
+    "@budibase/standard-components": "^0.8.18",
     "@jest/test-sequencer": "^24.8.0",
     "cross-env": "^7.0.3",
     "electron": "10.1.3",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index c7d765422f..87212db40e 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -35,7 +35,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.8.17",
+  "version": "0.8.18",
   "license": "MIT",
   "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321",
   "dependencies": {
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index d7c053c570..ff351a1e81 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.8.17",
+  "version": "0.8.18",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.js",
   "module": "src/index.js",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 3c8179d629..1d50930d38 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.8.17",
+  "version": "0.8.18",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {

From 6817ceb3f61db3f9ba69779f3519e13c8d1f373a Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 19 May 2021 21:41:56 +0100
Subject: [PATCH 08/19] hard coding posthog api key

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

diff --git a/packages/cli/src/constants.js b/packages/cli/src/constants.js
index a5d24514b8..fe7c61f4fa 100644
--- a/packages/cli/src/constants.js
+++ b/packages/cli/src/constants.js
@@ -16,4 +16,4 @@ exports.AnalyticsEvents = {
 }
 
 exports.BUDIBASE_POSTHOG_URL = "https://posthog.budi.live"
-exports.BUDIBASE_POSTHOG_TOKEN = process.env.BUDIBASE_POSTHOG_TOKEN
+exports.BUDIBASE_POSTHOG_TOKEN = "Oeq9KzIpZYaNsXIvHw5QTZWNpfiG_EOjAOpjTyAiitY"

From aed083ee95c51d70c51f8b44d56cbeb01443c526 Mon Sep 17 00:00:00 2001
From: Mike Shanks <mike@budibase.com>
Date: Thu, 20 May 2021 09:07:51 +0100
Subject: [PATCH 09/19] Fix: Unable to use parameters with Rest conenctor

---
 .../PropertyControls/EventsEditor/actions/ExecuteQuery.svelte    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
index a8b90a52d6..1c0c133cc3 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
@@ -56,6 +56,7 @@
       {query}
       schema={fetchQueryDefinition(query)}
       editable={false}
+      {datasource}
     />
   {/if}
 </Layout>

From e6aa34afb5ea503212b0302dd8557fd77a75061b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 20 May 2021 10:26:23 +0100
Subject: [PATCH 10/19] fix analytics code

---
 packages/cli/src/analytics/Client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/src/analytics/Client.js b/packages/cli/src/analytics/Client.js
index d97fb1abfa..a3b43b5ea1 100644
--- a/packages/cli/src/analytics/Client.js
+++ b/packages/cli/src/analytics/Client.js
@@ -15,7 +15,7 @@ class AnalyticsClient {
   }
 
   capture(event) {
-    if (this.manager.config.analyticsDisabled) return
+    if (this.configManager.config.analyticsDisabled) return
 
     this.client.capture(event)
   }

From 3437f620d6ffc95f88cac373da76aa79ce4328ab Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 20 May 2021 12:07:07 +0100
Subject: [PATCH 11/19] Fixing automation test case.

---
 packages/server/src/utilities/queue/inMemoryQueue.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/server/src/utilities/queue/inMemoryQueue.js b/packages/server/src/utilities/queue/inMemoryQueue.js
index 6c1d73801d..1a9fc90d5c 100644
--- a/packages/server/src/utilities/queue/inMemoryQueue.js
+++ b/packages/server/src/utilities/queue/inMemoryQueue.js
@@ -73,6 +73,14 @@ class InMemoryQueue {
     this._messages.push(newJob(this._name, msg))
     this._emitter.emit("message")
   }
+
+  /**
+   * This removes a cron which has been implemented, this is part of Bull API.
+   * @param {string} cronJobId The cron which is to be removed.
+   */
+  removeRepeatableByKey(cronJobId) {
+    // TODO: implement for testing
+  }
 }
 
 module.exports = InMemoryQueue

From 148cf87224bddd0e6b6d617e7b17fbdcedcd36aa Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 20 May 2021 12:21:58 +0100
Subject: [PATCH 12/19] Cleanup after testing/looking through hosting files.

---
 hosting/bootstrap.sh                | 20 --------------------
 hosting/docker-compose.yaml         |  1 +
 hosting/start.sh                    |  2 --
 hosting/update.sh                   |  1 -
 packages/cli/src/analytics/index.js | 16 ++++++++--------
 5 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100755 hosting/bootstrap.sh
 delete mode 100755 hosting/start.sh
 delete mode 100644 hosting/update.sh

diff --git a/hosting/bootstrap.sh b/hosting/bootstrap.sh
deleted file mode 100755
index 4e15481e64..0000000000
--- a/hosting/bootstrap.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-GITHUB_BASE_URL=https://raw.githubusercontent.com/Budibase/budibase/master/hosting
-
-if ! [ -x "$(command -v wget)" ]; then
-  echo 'Error: wget is not installed. Please install it for your operating system.' >&2
-  exit 1
-fi
-
-fetch_config_files() {
-  wget $GITHUB_BASE_URL/docker-compose.yaml
-  wget $GITHUB_BASE_URL/envoy.yaml
-  wget $GITHUB_BASE_URL/hosting.properties
-  wget $GITHUB_BASE_URL/start.sh
-}
-
-fetch_config_files
-
-# Start budibase
-docker-compose --env-file hosting.properties up -d
diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml
index 00c93ca1c6..73bbcfc39b 100644
--- a/hosting/docker-compose.yaml
+++ b/hosting/docker-compose.yaml
@@ -48,6 +48,7 @@ services:
       REDIS_URL: redis-service:6379
       REDIS_PASSWORD: ${REDIS_PASSWORD}
     depends_on:
+      - redis-service
       - minio-service
       - couch-init
 
diff --git a/hosting/start.sh b/hosting/start.sh
deleted file mode 100755
index b32098a3b7..0000000000
--- a/hosting/start.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker-compose --env-file hosting.properties up
diff --git a/hosting/update.sh b/hosting/update.sh
deleted file mode 100644
index 3ccd5e59d0..0000000000
--- a/hosting/update.sh
+++ /dev/null
@@ -1 +0,0 @@
-docker-compose --env-file hosting.properties pull && ./start.sh
diff --git a/packages/cli/src/analytics/index.js b/packages/cli/src/analytics/index.js
index 3d8ea8c5a7..d85323d1d0 100644
--- a/packages/cli/src/analytics/index.js
+++ b/packages/cli/src/analytics/index.js
@@ -11,13 +11,13 @@ async function optOut() {
     client.disable()
     console.log(
       success(
-        "Successfully opted out of budibase analytics. You can opt in at any time by running 'budi analytics opt-in'"
+        "Successfully opted out of Budibase analytics. You can opt in at any time by running 'budi analytics opt-in'"
       )
     )
   } catch (err) {
     console.log(
       error(
-        "Error opting out of budibase analytics. Please try again later.",
+        "Error opting out of Budibase analytics. Please try again later.",
         err
       )
     )
@@ -30,12 +30,12 @@ async function optIn() {
     client.enable()
     console.log(
       success(
-        "Successfully opted in to budibase analytics. Thank you for helping us make budibase better!"
+        "Successfully opted in to Budibase analytics. Thank you for helping us make Budibase better!"
       )
     )
   } catch (err) {
     console.log(
-      error("Error opting in to budibase analytics. Please try again later.")
+      error("Error opting in to Budibase analytics. Please try again later.")
     )
   }
 }
@@ -51,12 +51,12 @@ async function status() {
 }
 
 const command = new Command(`${CommandWords.ANALYTICS}`)
-  .addHelp("Control the analytics you send to budibase.")
-  .addSubOption("--optin", "Opt in to sending analytics to budibase", optIn)
-  .addSubOption("--optout", "Opt out of sending analytics to budibase.", optOut)
+  .addHelp("Control the analytics you send to Budibase.")
+  .addSubOption("--optin", "Opt in to sending analytics to Budibase", optIn)
+  .addSubOption("--optout", "Opt out of sending analytics to Budibase.", optOut)
   .addSubOption(
     "--status",
-    "Check whether you are currently opted in to budibase analytics.",
+    "Check whether you are currently opted in to Budibase analytics.",
     status
   )
 

From bb9d209a36a89d4a0d9dd0b3da82f118f68599cf Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 20 May 2021 12:38:12 +0100
Subject: [PATCH 13/19] pipeline work

---
 .github/workflows/budibase_ci.yml             |  2 -
 .github/workflows/release.yml                 | 61 +++----------------
 .../scripts/linux/release-to-docker-hub.sh    |  7 +++
 package.json                                  |  1 +
 4 files changed, 17 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 96db14b77a..0380f92253 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -7,12 +7,10 @@ on:
     branches:
       - master
       - develop 
-      - next
  pull_request:
     branches:
       - master
       - develop 
-      - next
 
 jobs:
   build:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1f2cb80d1d..44b5c0a65b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,34 +1,19 @@
 name: Budibase Release
 
 on: 
- workflow_dispatch:
-  inputs:
-      name:
-        description: 'Version'
-        required: false
-        default: '0.8'
-        
- # Trigger the workflow on push with tags,
- # but only for the master branch
  push:
-  tags:
-    - 'v*'
+  branches:
+    - master
 
 jobs:
   release:
-    runs-on: ${{ matrix.os }}
-
-    # Platforms to build on/for
-    strategy:
-      matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
-        node-version: [12.x]
+    runs-on: ubuntu-latest 
     
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 12.x
       - run: yarn 
       - run: yarn lint 
       - run: yarn bootstrap 
@@ -39,42 +24,14 @@ jobs:
           SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
       - run: yarn test
 
-      - name: Prepare for app notarization (macOS)
-        if: startsWith(matrix.os, 'macos')
-        # Import Apple API key for app notarization on macOS
-        run: |
-          xattr -cr *
-          mkdir -p ~/private_keys/
-          echo '${{ secrets.api_key }}' > ~/private_keys/AuthKey_${{ secrets.api_key_id }}.p8
-
-
-      - name: Build/release Electron app
-        uses: samuelmeuli/action-electron-builder@v1
-        with:
-          package_root: packages/server
-
-          # GitHub token, automatically provided to the action
-          # (No need to define this secret in the repo settings)
-          github_token: ${{ secrets.github_token }}
-
-          mac_certs: ${{ secrets.mac_certs }}
-          mac_certs_password: ${{ secrets.mac_certs_password }}
-          windows_certs: ${{ secrets.windows_certs }}
-          windows_certs_password: ${{ secrets.windows_certs_password }}
-
-          # release the app after building
-          release: ${{ startsWith(github.ref, 'refs/tags/v') }}
+      - name: Publish budibase packages to NPM
         env:
-            # macOS notarization API key
-            API_KEY_ID: ${{ secrets.api_key_id }}
-            API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: yarn release
 
       - name: Build/release Docker images
-        # only run the docker image build on linux, easiest way
-        if: startsWith(matrix.os, 'ubuntu')
         env:
           DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
-        run: |
-          docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-          yarn build:docker
+        run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+        run: yarn build:docker
\ No newline at end of file
diff --git a/hosting/scripts/linux/release-to-docker-hub.sh b/hosting/scripts/linux/release-to-docker-hub.sh
index 1661fed9f0..106793fd82 100755
--- a/hosting/scripts/linux/release-to-docker-hub.sh
+++ b/hosting/scripts/linux/release-to-docker-hub.sh
@@ -3,13 +3,20 @@
 tag=$1
 tag=${tag:-latest}
 
+
 pushd ../../build
 docker-compose build --force app-service
 docker-compose build --force worker-service
 
+echo "Tagging images with SHA: $GITHUB_SHA and version: $BUDIBASE_VERSION"
+
 docker tag build_app-service budibase/budibase-apps:$tag
 docker tag build_worker-service budibase/budibase-worker:$tag
 
+# Tag with git sha
+docker tag build_app-service budibase/budibase-apps:$GITHUB_SHA
+docker tag build_worker-service budibase/budibase-worker:$GITHUB_SHA
+
 docker push budibase/budibase-apps
 docker push budibase/budibase-worker
 popd
diff --git a/package.json b/package.json
index 4d26be9941..e2ca53a5dc 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "initialise": "lerna run initialise",
     "publishdev": "lerna run publishdev",
     "publishnpm": "yarn build && lerna publish --force-publish",
+    "release": "lerna publish --force-publish --yes",
     "restore": "yarn run clean && yarn run bootstrap && yarn run build",
     "nuke": "yarn run nuke:packages && yarn run nuke:docker",
     "nuke:packages": "yarn run restore",

From 58f40da0368a2b6817e3de2a84d093d46f97c37e Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 20 May 2021 12:39:33 +0100
Subject: [PATCH 14/19] Fixing an issue with checkAuth function not checking
 response status before attempting to get JSON.

---
 packages/builder/src/stores/portal/auth.js | 8 ++++----
 packages/server/src/api/controllers/dev.js | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/stores/portal/auth.js b/packages/builder/src/stores/portal/auth.js
index baf5f1bfb4..c642a5708d 100644
--- a/packages/builder/src/stores/portal/auth.js
+++ b/packages/builder/src/stores/portal/auth.js
@@ -8,11 +8,11 @@ export function createAuthStore() {
     subscribe: store.subscribe,
     checkAuth: async () => {
       const response = await api.get("/api/admin/users/self")
-      const user = await response.json()
-      if (response.status === 200) {
-        store.update(state => ({ ...state, user }))
-      } else {
+      if (response.status !== 200) {
         store.update(state => ({ ...state, user: null }))
+      } else {
+        const user = await response.json()
+        store.update(state => ({ ...state, user }))
       }
     },
     login: async creds => {
diff --git a/packages/server/src/api/controllers/dev.js b/packages/server/src/api/controllers/dev.js
index 86b9a11c23..2e90fb83e7 100644
--- a/packages/server/src/api/controllers/dev.js
+++ b/packages/server/src/api/controllers/dev.js
@@ -16,7 +16,9 @@ async function redirect(ctx, method) {
       body: ctx.request.body,
     })
   )
-  ctx.body = await response.json()
+  if (response.status !== 200) {
+    ctx.throw(response.status, response.statusText)
+  }
   const cookie = response.headers.get("set-cookie")
   if (cookie) {
     ctx.set("set-cookie", cookie)

From f6f32b98ba919a5dd0cf093db4698d18fe3c097c Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 20 May 2021 12:46:31 +0100
Subject: [PATCH 15/19] testing CI pipeline

---
 .github/workflows/release.yml                  |  3 +++
 hosting/scripts/linux/release-to-docker-hub.sh | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 44b5c0a65b..0a827c907c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,6 +4,9 @@ on:
  push:
   branches:
     - master
+ pull_request:
+    branches:
+      - master
 
 jobs:
   release:
diff --git a/hosting/scripts/linux/release-to-docker-hub.sh b/hosting/scripts/linux/release-to-docker-hub.sh
index 106793fd82..c66faf1b89 100755
--- a/hosting/scripts/linux/release-to-docker-hub.sh
+++ b/hosting/scripts/linux/release-to-docker-hub.sh
@@ -10,13 +10,13 @@ docker-compose build --force worker-service
 
 echo "Tagging images with SHA: $GITHUB_SHA and version: $BUDIBASE_VERSION"
 
-docker tag build_app-service budibase/budibase-apps:$tag
-docker tag build_worker-service budibase/budibase-worker:$tag
+docker tag build_app-service budibase/apps:$tag
+docker tag build_worker-service budibase/worker:$tag
 
 # Tag with git sha
-docker tag build_app-service budibase/budibase-apps:$GITHUB_SHA
-docker tag build_worker-service budibase/budibase-worker:$GITHUB_SHA
+docker tag build_app-service budibase/apps:$GITHUB_SHA
+docker tag build_worker-service budibase/worker:$GITHUB_SHA
 
-docker push budibase/budibase-apps
-docker push budibase/budibase-worker
+docker push budibase/apps
+docker push budibase/worker
 popd

From 23007a8597d1e74ee2aabacdadf2305a266c0b5d Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 20 May 2021 12:46:49 +0100
Subject: [PATCH 16/19] prevent NPM publish in CI

---
 .github/workflows/release.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0a827c907c..fa06e31a72 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,10 +27,10 @@ jobs:
           SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
       - run: yarn test
 
-      - name: Publish budibase packages to NPM
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: yarn release
+      # - name: Publish budibase packages to NPM
+      #   env:
+      #     NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      #   run: yarn release
 
       - name: Build/release Docker images
         env:

From 64e3b2a173903cca29c3d44de4b68c30f8368fa6 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Thu, 20 May 2021 12:57:29 +0100
Subject: [PATCH 17/19] Update release.yml

---
 .github/workflows/release.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fa06e31a72..da4eb4161c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,12 +2,13 @@ name: Budibase Release
 
 on: 
  push:
-  branches:
-    - master
+    branches:
+      - master
  pull_request:
     branches:
       - master
 
+
 jobs:
   release:
     runs-on: ubuntu-latest 
@@ -37,4 +38,4 @@ jobs:
           DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
         run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-        run: yarn build:docker
\ No newline at end of file
+        run: yarn build:docker

From 98496b4a01e3bfff21d5e9e49933bd0bccc3afad Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Thu, 20 May 2021 13:00:07 +0100
Subject: [PATCH 18/19] Update release.yml

---
 .github/workflows/release.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index da4eb4161c..dc1bfc3f4e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,8 +34,9 @@ jobs:
       #   run: yarn release
 
       - name: Build/release Docker images
+        run: | 
+          docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+          yarn build:docker
         env:
           DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
-        run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-        run: yarn build:docker

From e28a5e98ab92f9e246e7a2e104cceaaad56e9e58 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 20 May 2021 13:09:02 +0100
Subject: [PATCH 19/19] fix lint

---
 packages/server/src/utilities/queue/inMemoryQueue.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/server/src/utilities/queue/inMemoryQueue.js b/packages/server/src/utilities/queue/inMemoryQueue.js
index 1a9fc90d5c..d4b1d297d8 100644
--- a/packages/server/src/utilities/queue/inMemoryQueue.js
+++ b/packages/server/src/utilities/queue/inMemoryQueue.js
@@ -80,6 +80,7 @@ class InMemoryQueue {
    */
   removeRepeatableByKey(cronJobId) {
     // TODO: implement for testing
+    console.log(cronJobId)
   }
 }