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

Merge branch 'master' into develop

This commit is contained in:
Rory Powell 2023-05-03 16:06:42 +01:00
parent eb973386d8 778da79a57
commit e1a147e823
20 changed files with 63 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hosting/proxy/nginx.prod.conf
View File

@ -222,9 +222,9 @@ http {
rewrite ^/files/signed/(.*)$ /$1 break; rewrite ^/files/signed/(.*)$ /$1 break;
} }
client_header_timeout 60; client_header_timeout 120;
client_body_timeout 60; client_body_timeout 120;
keepalive_timeout 60; keepalive_timeout 120;
# gzip # gzip
gzip on; gzip on;

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.5.6-alpha.45", "version": "2.5.9",
"npmClient": "yarn", "npmClient": "yarn",
"useWorkspaces": true, "useWorkspaces": true,
"packages": ["packages/*"], "packages": ["packages/*"],

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

@ -1,6 +1,6 @@
{ {
"name": "@budibase/backend-core", "name": "@budibase/backend-core",
"version": "2.5.6-alpha.45", "version": "2.5.9",
"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",
@ -24,7 +24,7 @@
"dependencies": { "dependencies": {
"@budibase/nano": "10.1.2", "@budibase/nano": "10.1.2",
"@budibase/pouchdb-replication-stream": "1.2.10", "@budibase/pouchdb-replication-stream": "1.2.10",
"@budibase/types": "2.5.6-alpha.45", "@budibase/types": "^2.5.9",
"@shopify/jest-koa-mocks": "5.0.1", "@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2", "@techpass/passport-openidconnect": "0.3.2",
"aws-cloudfront-sign": "2.2.0", "aws-cloudfront-sign": "2.2.0",

3
packages/backend-core/src/cache/writethrough.ts vendored
View File

@ -47,7 +47,7 @@ async function put(
type: LockType.TRY_ONCE, type: LockType.TRY_ONCE,
name: LockName.PERSIST_WRITETHROUGH, name: LockName.PERSIST_WRITETHROUGH,
resource: key, resource: key,
ttl: 1000, ttl: 15000,
}, },
async () => { async () => {
const writeDb = async (toWrite: any) => { const writeDb = async (toWrite: any) => {
@ -71,6 +71,7 @@ async function put(
} }
} }
) )
if (!lockResponse.executed) { if (!lockResponse.executed) {
logWarn(`Ignoring redlock conflict in write-through cache`) logWarn(`Ignoring redlock conflict in write-through cache`)
} }

2
packages/backend-core/src/db/lucene.ts
View File

@ -434,7 +434,7 @@ export class QueryBuilder<T> {
}) })
} }
if (this.#query.empty) { if (this.#query.empty) {
build(this.#query.empty, (key: string) => `!${key}:["" TO *]`) build(this.#query.empty, (key: string) => `(*:* -${key}:["" TO *])`)
} }
if (this.#query.notEmpty) { if (this.#query.notEmpty) {
build(this.#query.notEmpty, (key: string) => `${key}:["" TO *]`) build(this.#query.notEmpty, (key: string) => `${key}:["" TO *]`)

6
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": "2.5.6-alpha.45", "version": "2.5.9",
"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,8 +38,8 @@
], ],
"dependencies": { "dependencies": {
"@adobe/spectrum-css-workflow-icons": "1.2.1", "@adobe/spectrum-css-workflow-icons": "1.2.1",
"@budibase/shared-core": "2.5.6-alpha.45", "@budibase/shared-core": "^2.5.9",
"@budibase/string-templates": "2.5.6-alpha.45", "@budibase/string-templates": "^2.5.9",
"@spectrum-css/accordion": "3.0.24", "@spectrum-css/accordion": "3.0.24",
"@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actionbutton": "1.0.1",
"@spectrum-css/actiongroup": "1.0.1", "@spectrum-css/actiongroup": "1.0.1",

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/builder", "name": "@budibase/builder",
"version": "2.5.6-alpha.45", "version": "2.5.9",
"license": "GPL-3.0", "license": "GPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -58,10 +58,10 @@
} }
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "2.5.6-alpha.45", "@budibase/bbui": "^2.5.9",
"@budibase/frontend-core": "2.5.6-alpha.45", "@budibase/frontend-core": "^2.5.9",
"@budibase/shared-core": "2.5.6-alpha.45", "@budibase/shared-core": "^2.5.9",
"@budibase/string-templates": "2.5.6-alpha.45", "@budibase/string-templates": "^2.5.9",
"@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/fontawesome-svg-core": "^6.2.1",
"@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1",
"@fortawesome/free-solid-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1",

19
packages/builder/src/components/backend/TableNavigator/utils.js
View File

@ -42,16 +42,7 @@ export const parseFile = e => {
reader.addEventListener("load", function (e) { reader.addEventListener("load", function (e) {
const fileData = e.target.result const fileData = e.target.result
if (file.type?.includes("json")) {
if (file.type === "text/csv") {
API.csvToJson(fileData)
.then(rows => {
resolveRows(rows)
})
.catch(() => {
reject("can't convert csv to json")
})
} else if (file.type === "application/json") {
const parsedFileData = JSON.parse(fileData) const parsedFileData = JSON.parse(fileData)
if (Array.isArray(parsedFileData)) { if (Array.isArray(parsedFileData)) {
@ -62,7 +53,13 @@ export const parseFile = e => {
reject("invalid json format") reject("invalid json format")
} }
} else { } else {
reject("invalid file type") API.csvToJson(fileData)
.then(rows => {
resolveRows(rows)
})
.catch(() => {
reject("cannot parse csv")
})
} }
}) })

2
packages/builder/src/stores/portal/users.js
View File

@ -41,7 +41,7 @@ export function createUsersStore() {
inviteCode, inviteCode,
password, password,
firstName, firstName,
lastName, lastName: !lastName?.trim() ? undefined : lastName,
}) })
} }

8
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/cli", "name": "@budibase/cli",
"version": "2.5.6-alpha.45", "version": "2.5.9",
"description": "Budibase CLI, for developers, self hosting and migrations.", "description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {
@ -29,9 +29,9 @@
"outputPath": "build" "outputPath": "build"
}, },
"dependencies": { "dependencies": {
"@budibase/backend-core": "2.5.6-alpha.45", "@budibase/backend-core": "^2.5.9",
"@budibase/string-templates": "2.5.6-alpha.45", "@budibase/string-templates": "^2.5.9",
"@budibase/types": "2.5.6-alpha.45", "@budibase/types": "^2.5.9",
"axios": "0.21.2", "axios": "0.21.2",
"chalk": "4.1.0", "chalk": "4.1.0",
"cli-progress": "3.11.2", "cli-progress": "3.11.2",

12
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "2.5.6-alpha.45", "version": "2.5.9",
"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,11 +19,11 @@
"dev:builder": "rollup -cw" "dev:builder": "rollup -cw"
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "2.5.6-alpha.45", "@budibase/bbui": "^2.5.9",
"@budibase/frontend-core": "2.5.6-alpha.45", "@budibase/frontend-core": "^2.5.9",
"@budibase/shared-core": "2.5.6-alpha.45", "@budibase/shared-core": "^2.5.9",
"@budibase/string-templates": "2.5.6-alpha.45", "@budibase/string-templates": "^2.5.9",
"@budibase/types": "2.5.6-alpha.45", "@budibase/types": "^2.5.9",
"@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",

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

@ -1,13 +1,13 @@
{ {
"name": "@budibase/frontend-core", "name": "@budibase/frontend-core",
"version": "2.5.6-alpha.45", "version": "2.5.9",
"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": "2.5.6-alpha.45", "@budibase/bbui": "^2.5.9",
"@budibase/shared-core": "2.5.6-alpha.45", "@budibase/shared-core": "^2.5.9",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"socket.io-client": "^4.6.1", "socket.io-client": "^4.6.1",

2
packages/sdk/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/sdk", "name": "@budibase/sdk",
"version": "2.5.6-alpha.45", "version": "2.5.9",
"description": "Budibase Public API SDK", "description": "Budibase Public API SDK",
"author": "Budibase", "author": "Budibase",
"license": "MPL-2.0", "license": "MPL-2.0",

14
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": "2.5.6-alpha.45", "version": "2.5.9",
"description": "Budibase Web Server", "description": "Budibase Web Server",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -45,12 +45,12 @@
"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": "2.5.6-alpha.45", "@budibase/backend-core": "^2.5.9",
"@budibase/client": "2.5.6-alpha.45", "@budibase/client": "^2.5.9",
"@budibase/pro": "2.5.6-alpha.45", "@budibase/pro": "2.5.9",
"@budibase/shared-core": "2.5.6-alpha.45", "@budibase/shared-core": "^2.5.9",
"@budibase/string-templates": "2.5.6-alpha.45", "@budibase/string-templates": "^2.5.9",
"@budibase/types": "2.5.6-alpha.45", "@budibase/types": "^2.5.9",
"@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/server/src/api/routes/tests/internalSearch.spec.js
View File

@ -105,7 +105,7 @@ describe("internal search", () => {
"column": "", "column": "",
}, },
}, PARAMS) }, PARAMS)
checkLucene(response, `*:* AND !column:["" TO *]`, PARAMS) checkLucene(response, `*:* AND (*:* -column:["" TO *])`, PARAMS)
}) })
it("test notEmpty query", async () => { it("test notEmpty query", async () => {

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

@ -1,6 +1,6 @@
{ {
"name": "@budibase/shared-core", "name": "@budibase/shared-core",
"version": "2.5.6-alpha.45", "version": "2.5.9",
"description": "Shared data utils", "description": "Shared data utils",
"main": "dist/cjs/src/index.js", "main": "dist/cjs/src/index.js",
"types": "dist/mjs/src/index.d.ts", "types": "dist/mjs/src/index.d.ts",
@ -20,7 +20,7 @@
"dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
}, },
"dependencies": { "dependencies": {
"@budibase/types": "2.5.6-alpha.45" "@budibase/types": "^2.5.9"
}, },
"devDependencies": { "devDependencies": {
"concurrently": "^7.6.0", "concurrently": "^7.6.0",

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

@ -1,6 +1,6 @@
{ {
"name": "@budibase/string-templates", "name": "@budibase/string-templates",
"version": "2.5.6-alpha.45", "version": "2.5.9",
"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": "2.5.6-alpha.45", "version": "2.5.9",
"description": "Budibase types", "description": "Budibase types",
"main": "dist/cjs/index.js", "main": "dist/cjs/index.js",
"types": "dist/mjs/index.d.ts", "types": "dist/mjs/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": "2.5.6-alpha.45", "version": "2.5.9",
"description": "Budibase background service", "description": "Budibase background service",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -37,10 +37,10 @@
"author": "Budibase", "author": "Budibase",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@budibase/backend-core": "2.5.6-alpha.45", "@budibase/backend-core": "^2.5.9",
"@budibase/pro": "2.5.6-alpha.45", "@budibase/pro": "2.5.9",
"@budibase/string-templates": "2.5.6-alpha.45", "@budibase/string-templates": "^2.5.9",
"@budibase/types": "2.5.6-alpha.45", "@budibase/types": "^2.5.9",
"@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",

12
yarn.lock
View File

@ -1486,15 +1486,15 @@
pouchdb-promise "^6.0.4" pouchdb-promise "^6.0.4"
through2 "^2.0.0" through2 "^2.0.0"
"@budibase/pro@2.5.6-alpha.44": "@budibase/pro@2.5.6-alpha.45":
version "2.5.6-alpha.44" version "2.5.6-alpha.45"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.44.tgz#f849e7bceb06144083cc4b1d406ffa195348c4f1" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.45.tgz#99b536f01a7f2bc291f305263fca0d42d0cf2c12"
integrity sha512-duU1w9OhnycNvdfJx941OwrI3siTL3bOF793/yp8GisqSH/76vEwpu1VsAV/pqRywkwpr1LkilPkPPufiNURLg== integrity sha512-R11iRHzEwseVIH10mf7knzML2SVxnLCyyNSoTJu/xLisgn4cBUs9S+swAx6mtZ1sx6bNd7ULYzOHHAw9ATy6dg==
dependencies: dependencies:
"@budibase/backend-core" "2.5.6-alpha.44" "@budibase/backend-core" "2.5.6-alpha.45"
"@budibase/shared-core" "2.4.44-alpha.1" "@budibase/shared-core" "2.4.44-alpha.1"
"@budibase/string-templates" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1"
"@budibase/types" "2.5.6-alpha.44" "@budibase/types" "2.5.6-alpha.45"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
bull "4.10.1" bull "4.10.1"
joi "17.6.0" joi "17.6.0"