Merge branch 'develop' of github.com:Budibase/budibase into feature/automation-rework

5 years ago · 06d17827b6
13 changed files with 38 additions and 32 deletions
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "0.9.123-alpha.3",
+  "version": "0.9.123-alpha.6",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/auth",
-  "version": "0.9.123-alpha.3",
+  "version": "0.9.123-alpha.6",
  "description": "Authentication middlewares for budibase builder and apps",
  "main": "src/index.js",
  "author": "Budibase",
--- a/packages/auth/src/redis/index.js
+++ b/packages/auth/src/redis/index.js
@ -56,9 +56,13 @@ function init() {
  if (CLIENT) {
    CLIENT.disconnect()
  }
-  const { opts, host, port } = getRedisOptions(CLUSTERED)
+
+  const { redisProtocolUrl, opts, host, port } = getRedisOptions(CLUSTERED)
+
  if (CLUSTERED) {
    CLIENT = new Redis.Cluster([{ host, port }], opts)
+  } else if (redisProtocolUrl) {
+    CLIENT = new Redis(redisProtocolUrl)
  } else {
    CLIENT = new Redis(opts)
  }
--- a/packages/auth/src/redis/utils.js
+++ b/packages/auth/src/redis/utils.js
@ -18,7 +18,15 @@ exports.Databases = {
 exports.SEPARATOR = SEPARATOR

 exports.getRedisOptions = (clustered = false) => {
-  const [host, port] = REDIS_URL.split(":")
+  const [host, port, ...rest] = REDIS_URL.split(":")
+
+  let redisProtocolUrl
+
+  // fully qualified redis URL
+  if (rest.length && /rediss?/.test(host)) {
+    redisProtocolUrl = REDIS_URL
+  }
+
  const opts = {
    connectTimeout: CONNECT_TIMEOUT_MS,
  }
@ -33,7 +41,7 @@ exports.getRedisOptions = (clustered = false) => {
    opts.port = port
    opts.password = REDIS_PASSWORD
  }
-  return { opts, host, port }
+  return { opts, host, port, redisProtocolUrl }
 }

 exports.addDbPrefix = (db, key) => {
--- 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.123-alpha.3",
+  "version": "0.9.123-alpha.6",
  "license": "AGPL-3.0",
  "svelte": "src/index.js",
  "module": "dist/bbui.es.js",
--- a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte
+++ b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte
@ -42,7 +42,7 @@

 <div
  on:click
-  class:spectrum-ProgressCircle--indeterminate={!value}
+  class:spectrum-ProgressCircle--indeterminate={value == null}
  class:spectrum-ProgressCircle--overBackground={overBackground}
  class="spectrum-ProgressCircle spectrum-ProgressCircle--{convertSize(size)}"
 >
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/builder",
-  "version": "0.9.123-alpha.3",
+  "version": "0.9.123-alpha.6",
  "license": "AGPL-3.0",
  "private": true,
  "scripts": {
@ -65,10 +65,10 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "^0.9.123-alpha.3",
-    "@budibase/client": "^0.9.123-alpha.3",
+    "@budibase/bbui": "^0.9.123-alpha.6",
+    "@budibase/client": "^0.9.123-alpha.6",
    "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.123-alpha.3",
+    "@budibase/string-templates": "^0.9.123-alpha.6",
    "@sentry/browser": "5.19.1",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/vars": "^3.0.1",
--- a/packages/builder/src/stores/portal/admin.js
+++ b/packages/builder/src/stores/portal/admin.js
@ -25,20 +25,14 @@ export function createAdminStore() {
        `/api/global/configs/checklist?tenantId=${tenantId}`
      )
      const json = await response.json()
-
-      const onboardingSteps = Object.keys(json)
-
-      const stepsComplete = onboardingSteps.reduce(
-        (score, step) => (score + step.checked ? 1 : 0),
-        0
-      )
+      const totalSteps = Object.keys(json).length
+      const completedSteps = Object.values(json).filter(x => x?.checked).length

      await getFlags()
      admin.update(store => {
        store.loaded = true
        store.checklist = json
-        store.onboardingProgress =
-          (stepsComplete / onboardingSteps.length) * 100
+        store.onboardingProgress = (completedSteps / totalSteps) * 100
        return store
      })
    } catch (err) {
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/cli",
-  "version": "0.9.123-alpha.3",
+  "version": "0.9.123-alpha.6",
  "description": "Budibase CLI, for developers, self hosting and migrations.",
  "main": "src/index.js",
  "bin": {
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/client",
-  "version": "0.9.123-alpha.3",
+  "version": "0.9.123-alpha.6",
  "license": "MPL-2.0",
  "module": "dist/budibase-client.js",
  "main": "dist/budibase-client.js",
@ -19,8 +19,8 @@
    "dev:builder": "rollup -cw"
  },
  "dependencies": {
-    "@budibase/bbui": "^0.9.123-alpha.3",
-    "@budibase/string-templates": "^0.9.123-alpha.3",
+    "@budibase/bbui": "^0.9.123-alpha.6",
+    "@budibase/string-templates": "^0.9.123-alpha.6",
    "regexparam": "^1.3.0",
    "shortid": "^2.2.15",
    "svelte-spa-router": "^3.0.5"
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/server",
  "email": "hi@budibase.com",
-  "version": "0.9.123-alpha.3",
+  "version": "0.9.123-alpha.6",
  "description": "Budibase Web Server",
  "main": "src/index.js",
  "repository": {
@ -61,9 +61,9 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/auth": "^0.9.123-alpha.3",
-    "@budibase/client": "^0.9.123-alpha.3",
-    "@budibase/string-templates": "^0.9.123-alpha.3",
+    "@budibase/auth": "^0.9.123-alpha.6",
+    "@budibase/client": "^0.9.123-alpha.6",
+    "@budibase/string-templates": "^0.9.123-alpha.6",
    "@elastic/elasticsearch": "7.10.0",
    "@koa/router": "8.0.0",
    "@sendgrid/mail": "7.1.1",
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/string-templates",
-  "version": "0.9.123-alpha.3",
+  "version": "0.9.123-alpha.6",
  "description": "Handlebars wrapper for Budibase templating.",
  "main": "src/index.cjs",
  "module": "dist/bundle.mjs",
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/worker",
  "email": "hi@budibase.com",
-  "version": "0.9.123-alpha.3",
+  "version": "0.9.123-alpha.6",
  "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.123-alpha.3",
-    "@budibase/string-templates": "^0.9.123-alpha.3",
+    "@budibase/auth": "^0.9.123-alpha.6",
+    "@budibase/string-templates": "^0.9.123-alpha.6",
    "@koa/router": "^8.0.0",
    "@techpass/passport-openidconnect": "^0.3.0",
    "aws-sdk": "^2.811.0",