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

Merge remote-tracking branch 'origin/develop' into feature/app-action-ui-updates

This commit is contained in:
Dean 2022-07-11 09:03:39 +01:00
parent 0627bb9370 9a76a44290
commit 794e47c766
14 changed files with 37 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": "1.0.219-alpha.16", "version": "1.0.219-alpha.17",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

1
packages/backend-core/cache.js
View File

@ -5,4 +5,5 @@ module.exports = {
app: require("./src/cache/appMetadata"), app: require("./src/cache/appMetadata"),
writethrough: require("./src/cache/writethrough"), writethrough: require("./src/cache/writethrough"),
...generic, ...generic,
cache: generic,
} }

4
packages/backend-core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/backend-core", "name": "@budibase/backend-core",
"version": "1.0.219-alpha.16", "version": "1.0.219-alpha.17",
"description": "Budibase backend core libraries used in server and worker", "description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js", "main": "dist/src/index.js",
"types": "dist/src/index.d.ts", "types": "dist/src/index.d.ts",
@ -20,7 +20,7 @@
"test:watch": "jest --watchAll" "test:watch": "jest --watchAll"
}, },
"dependencies": { "dependencies": {
"@budibase/types": "^1.0.219-alpha.16", "@budibase/types": "^1.0.219-alpha.17",
"@techpass/passport-openidconnect": "0.3.2", "@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0", "aws-sdk": "2.1030.0",
"bcrypt": "5.0.1", "bcrypt": "5.0.1",

4
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/bbui", "name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.", "description": "A UI solution used in the different Budibase projects.",
"version": "1.0.219-alpha.16", "version": "1.0.219-alpha.17",
"license": "MPL-2.0", "license": "MPL-2.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"module": "dist/bbui.es.js", "module": "dist/bbui.es.js",
@ -38,7 +38,7 @@
], ],
"dependencies": { "dependencies": {
"@adobe/spectrum-css-workflow-icons": "^1.2.1", "@adobe/spectrum-css-workflow-icons": "^1.2.1",
"@budibase/string-templates": "^1.0.219-alpha.16", "@budibase/string-templates": "^1.0.219-alpha.17",
"@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2", "@spectrum-css/avatar": "^3.0.2",

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/builder", "name": "@budibase/builder",
"version": "1.0.219-alpha.16", "version": "1.0.219-alpha.17",
"license": "GPL-3.0", "license": "GPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -69,10 +69,10 @@
} }
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.0.219-alpha.16", "@budibase/bbui": "^1.0.219-alpha.17",
"@budibase/client": "^1.0.219-alpha.16", "@budibase/client": "^1.0.219-alpha.17",
"@budibase/frontend-core": "^1.0.219-alpha.16", "@budibase/frontend-core": "^1.0.219-alpha.17",
"@budibase/string-templates": "^1.0.219-alpha.16", "@budibase/string-templates": "^1.0.219-alpha.17",
"@sentry/browser": "5.19.1", "@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1", "@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1", "@spectrum-css/vars": "^3.0.1",

5
packages/builder/src/pages/builder/portal/manage/email/index.svelte
View File

@ -74,7 +74,10 @@
rev: smtpConfig._rev, rev: smtpConfig._rev,
}) })
smtpConfig = { smtpConfig = {
config: {}, type: ConfigTypes.SMTP,
config: {
secure: true,
},
} }
await admin.getChecklist() await admin.getChecklist()
notifications.success(`Settings cleared`) notifications.success(`Settings cleared`)

2
packages/cli/package.json
View File

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

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "1.0.219-alpha.16", "version": "1.0.219-alpha.17",
"license": "MPL-2.0", "license": "MPL-2.0",
"module": "dist/budibase-client.js", "module": "dist/budibase-client.js",
"main": "dist/budibase-client.js", "main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
"dev:builder": "rollup -cw" "dev:builder": "rollup -cw"
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.0.219-alpha.16", "@budibase/bbui": "^1.0.219-alpha.17",
"@budibase/frontend-core": "^1.0.219-alpha.16", "@budibase/frontend-core": "^1.0.219-alpha.17",
"@budibase/string-templates": "^1.0.219-alpha.16", "@budibase/string-templates": "^1.0.219-alpha.17",
"@spectrum-css/button": "^3.0.3", "@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3", "@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3", "@spectrum-css/divider": "^1.0.3",

4
packages/frontend-core/package.json
View File

@ -1,12 +1,12 @@
{ {
"name": "@budibase/frontend-core", "name": "@budibase/frontend-core",
"version": "1.0.219-alpha.16", "version": "1.0.219-alpha.17",
"description": "Budibase frontend core libraries used in builder and client", "description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase", "author": "Budibase",
"license": "MPL-2.0", "license": "MPL-2.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.0.219-alpha.16", "@budibase/bbui": "^1.0.219-alpha.17",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"svelte": "^3.46.2" "svelte": "^3.46.2"
} }

12
packages/server/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/server", "name": "@budibase/server",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "1.0.219-alpha.16", "version": "1.0.219-alpha.17",
"description": "Budibase Web Server", "description": "Budibase Web Server",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -77,11 +77,11 @@
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@apidevtools/swagger-parser": "10.0.3", "@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "^1.0.219-alpha.16", "@budibase/backend-core": "^1.0.219-alpha.17",
"@budibase/client": "^1.0.219-alpha.16", "@budibase/client": "^1.0.219-alpha.17",
"@budibase/pro": "1.0.219-alpha.16", "@budibase/pro": "1.0.219-alpha.17",
"@budibase/string-templates": "^1.0.219-alpha.16", "@budibase/string-templates": "^1.0.219-alpha.17",
"@budibase/types": "^1.0.219-alpha.16", "@budibase/types": "^1.0.219-alpha.17",
"@bull-board/api": "3.7.0", "@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4", "@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0", "@elastic/elasticsearch": "7.10.0",

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

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

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/types", "name": "@budibase/types",
"version": "1.0.219-alpha.16", "version": "1.0.219-alpha.17",
"description": "Budibase types", "description": "Budibase types",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

10
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/worker", "name": "@budibase/worker",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "1.0.219-alpha.16", "version": "1.0.219-alpha.17",
"description": "Budibase background service", "description": "Budibase background service",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -34,10 +34,10 @@
"author": "Budibase", "author": "Budibase",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@budibase/backend-core": "^1.0.219-alpha.16", "@budibase/backend-core": "^1.0.219-alpha.17",
"@budibase/pro": "1.0.219-alpha.16", "@budibase/pro": "1.0.219-alpha.17",
"@budibase/string-templates": "^1.0.219-alpha.16", "@budibase/string-templates": "^1.0.219-alpha.17",
"@budibase/types": "^1.0.219-alpha.16", "@budibase/types": "^1.0.219-alpha.17",
"@koa/router": "8.0.8", "@koa/router": "8.0.8",
"@sentry/node": "6.17.7", "@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2", "@techpass/passport-openidconnect": "0.3.2",

3
packages/worker/src/api/controllers/global/configs.js
View File

@ -17,6 +17,7 @@ const {
withCache, withCache,
CacheKeys, CacheKeys,
bustCache, bustCache,
cache,
} = require("@budibase/backend-core/cache") } = require("@budibase/backend-core/cache")
const { events } = require("@budibase/backend-core") const { events } = require("@budibase/backend-core")
const { checkAnyUserExists } = require("../../../utilities/users") const { checkAnyUserExists } = require("../../../utilities/users")
@ -365,9 +366,9 @@ exports.upload = async function (ctx) {
exports.destroy = async function (ctx) { exports.destroy = async function (ctx) {
const db = getGlobalDB() const db = getGlobalDB()
const { id, rev } = ctx.params const { id, rev } = ctx.params
try { try {
await db.remove(id, rev) await db.remove(id, rev)
await cache.delete(CacheKeys.CHECKLIST)
ctx.body = { message: "Config deleted successfully" } ctx.body = { message: "Config deleted successfully" }
} catch (err) { } catch (err) {
ctx.throw(err.status, err) ctx.throw(err.status, err)