Merge branch 'develop' into cypress-testing

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.9.160-alpha.0",
+  "version": "0.9.160-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.160-alpha.0",
+  "version": "0.9.160-alpha.1",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.160-alpha.0",
+  "version": "0.9.160-alpha.1",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/builder/cypress/support/commands.js

@@ -5,7 +5,7 @@
 // ***********************************************
 //
 
-Cypress.on('uncaught:exception', (err, runnable) => {
+Cypress.on("uncaught:exception", () => {
   return false
 })
 

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.160-alpha.0",
+  "version": "0.9.160-alpha.1",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.160-alpha.0",
-    "@budibase/client": "^0.9.160-alpha.0",
+    "@budibase/bbui": "^0.9.160-alpha.1",
+    "@budibase/client": "^0.9.160-alpha.1",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.160-alpha.0",
+    "@budibase/string-templates": "^0.9.160-alpha.1",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte

@@ -4,10 +4,11 @@
   import { externalActions } from "./ExternalActions"
 
   export let blockIdx
+  export let blockComplete
+
   let selectedAction
   let actionVal
   let actions = Object.entries($automationStore.blockDefinitions.ACTION)
-  export let blockComplete
 
   const external = actions.reduce((acc, elm) => {
     const [k, v] = elm
@@ -36,10 +37,9 @@
       actionVal.stepId,
       actionVal
     )
-    automationStore.actions.addBlockToAutomation(newBlock)
+    automationStore.actions.addBlockToAutomation(newBlock, blockIdx + 1)
     await automationStore.actions.save(
-      $automationStore.selectedAutomation?.automation,
-      blockIdx
+      $automationStore.selectedAutomation?.automation
     )
   }
 </script>

packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte

@@ -151,7 +151,7 @@
             >
           {/if}
           <Button
-            disabled={disableAddButton ? true : !hasCompletedInputs}
+            disabled={!hasCompletedInputs}
             on:click={() => {
               setupToggled = false
               actionModal.show()

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.160-alpha.0",
+  "version": "0.9.160-alpha.1",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.160-alpha.0",
+  "version": "0.9.160-alpha.1",
   "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": "^0.9.160-alpha.0",
+    "@budibase/bbui": "^0.9.160-alpha.1",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.160-alpha.0",
+    "@budibase/string-templates": "^0.9.160-alpha.1",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.160-alpha.0",
+  "version": "0.9.160-alpha.1",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -66,9 +66,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.160-alpha.0",
-    "@budibase/client": "^0.9.160-alpha.0",
-    "@budibase/string-templates": "^0.9.160-alpha.0",
+    "@budibase/auth": "^0.9.160-alpha.1",
+    "@budibase/client": "^0.9.160-alpha.1",
+    "@budibase/string-templates": "^0.9.160-alpha.1",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.160-alpha.0",
+  "version": "0.9.160-alpha.1",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.160-alpha.0",
+  "version": "0.9.160-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -27,8 +27,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.160-alpha.0",
-    "@budibase/string-templates": "^0.9.160-alpha.0",
+    "@budibase/auth": "^0.9.160-alpha.1",
+    "@budibase/string-templates": "^0.9.160-alpha.1",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",