MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
mike12345567 2021-09-10 11:16:43 +01:00
parent b32bebf8c8 3f13aeb789
commit da9d78d1fb
13 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "0.9.123-alpha.3",
"version": "0.9.123-alpha.6",
"npmClient": "yarn",
"packages": [
"packages/*"

2
packages/auth/package.json
View File

@ -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",

6
packages/auth/src/redis/index.js
View File

@ -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)
}

12
packages/auth/src/redis/utils.js
View File

@ -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) => {

2
packages/bbui/package.json
View File

@ -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",

2
packages/bbui/src/ProgressCircle/ProgressCircle.svelte
View File

@ -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)}"
>

8
packages/builder/package.json
View File

@ -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",

12
packages/builder/src/stores/portal/admin.js
View File

@ -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) {

2
packages/cli/package.json
View File

@ -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": {

6
packages/client/package.json
View File

@ -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"

8
packages/server/package.json
View File

@ -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",

2
packages/string-templates/package.json
View File

@ -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",

6
packages/worker/package.json
View File

@ -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",