diff --git a/hosting/proxy/nginx.prod.conf b/hosting/proxy/nginx.prod.conf index 8954106feb..dce1a71918 100644 --- a/hosting/proxy/nginx.prod.conf +++ b/hosting/proxy/nginx.prod.conf @@ -222,9 +222,9 @@ http { rewrite ^/files/signed/(.*)$ /$1 break; } - client_header_timeout 60; - client_body_timeout 60; - keepalive_timeout 60; + client_header_timeout 120; + client_body_timeout 120; + keepalive_timeout 120; # gzip gzip on; diff --git a/lerna.json b/lerna.json index cd9b1d8e1d..a6fe00fe5d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.45", + "version": "2.5.9", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index cba87923db..633677f617 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.45", + "version": "2.5.9", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@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", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/backend-core/src/cache/writethrough.ts b/packages/backend-core/src/cache/writethrough.ts index a3b1ecc08d..e64c116663 100644 --- a/packages/backend-core/src/cache/writethrough.ts +++ b/packages/backend-core/src/cache/writethrough.ts @@ -47,7 +47,7 @@ async function put( type: LockType.TRY_ONCE, name: LockName.PERSIST_WRITETHROUGH, resource: key, - ttl: 1000, + ttl: 15000, }, async () => { const writeDb = async (toWrite: any) => { @@ -71,6 +71,7 @@ async function put( } } ) + if (!lockResponse.executed) { logWarn(`Ignoring redlock conflict in write-through cache`) } diff --git a/packages/backend-core/src/db/lucene.ts b/packages/backend-core/src/db/lucene.ts index 5d21d4f4e4..4660be81aa 100644 --- a/packages/backend-core/src/db/lucene.ts +++ b/packages/backend-core/src/db/lucene.ts @@ -434,7 +434,7 @@ export class QueryBuilder { }) } if (this.#query.empty) { - build(this.#query.empty, (key: string) => `!${key}:["" TO *]`) + build(this.#query.empty, (key: string) => `(*:* -${key}:["" TO *])`) } if (this.#query.notEmpty) { build(this.#query.notEmpty, (key: string) => `${key}:["" TO *]`) diff --git a/packages/bbui/package.json b/packages/bbui/package.json index c375a1fa27..4d50d0cdcc 100644 --- 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": "2.5.6-alpha.45", + "version": "2.5.9", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.45", - "@budibase/string-templates": "2.5.6-alpha.45", + "@budibase/shared-core": "^2.5.9", + "@budibase/string-templates": "^2.5.9", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index ad0856a418..a773b4a160 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.45", + "version": "2.5.9", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.45", - "@budibase/frontend-core": "2.5.6-alpha.45", - "@budibase/shared-core": "2.5.6-alpha.45", - "@budibase/string-templates": "2.5.6-alpha.45", + "@budibase/bbui": "^2.5.9", + "@budibase/frontend-core": "^2.5.9", + "@budibase/shared-core": "^2.5.9", + "@budibase/string-templates": "^2.5.9", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/builder/src/components/backend/TableNavigator/utils.js b/packages/builder/src/components/backend/TableNavigator/utils.js index 658f037912..b7e46042be 100644 --- a/packages/builder/src/components/backend/TableNavigator/utils.js +++ b/packages/builder/src/components/backend/TableNavigator/utils.js @@ -42,16 +42,7 @@ export const parseFile = e => { reader.addEventListener("load", function (e) { const fileData = e.target.result - - 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") { + if (file.type?.includes("json")) { const parsedFileData = JSON.parse(fileData) if (Array.isArray(parsedFileData)) { @@ -62,7 +53,13 @@ export const parseFile = e => { reject("invalid json format") } } else { - reject("invalid file type") + API.csvToJson(fileData) + .then(rows => { + resolveRows(rows) + }) + .catch(() => { + reject("cannot parse csv") + }) } }) diff --git a/packages/builder/src/stores/portal/users.js b/packages/builder/src/stores/portal/users.js index 898d47c0e2..e522cd7958 100644 --- a/packages/builder/src/stores/portal/users.js +++ b/packages/builder/src/stores/portal/users.js @@ -41,7 +41,7 @@ export function createUsersStore() { inviteCode, password, firstName, - lastName, + lastName: !lastName?.trim() ? undefined : lastName, }) } diff --git a/packages/cli/package.json b/packages/cli/package.json index e21f09f233..1b264de603 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.45", + "version": "2.5.9", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.45", - "@budibase/string-templates": "2.5.6-alpha.45", - "@budibase/types": "2.5.6-alpha.45", + "@budibase/backend-core": "^2.5.9", + "@budibase/string-templates": "^2.5.9", + "@budibase/types": "^2.5.9", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 00c9268d74..faaf16138a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.45", + "version": "2.5.9", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.45", - "@budibase/frontend-core": "2.5.6-alpha.45", - "@budibase/shared-core": "2.5.6-alpha.45", - "@budibase/string-templates": "2.5.6-alpha.45", - "@budibase/types": "2.5.6-alpha.45", + "@budibase/bbui": "^2.5.9", + "@budibase/frontend-core": "^2.5.9", + "@budibase/shared-core": "^2.5.9", + "@budibase/string-templates": "^2.5.9", + "@budibase/types": "^2.5.9", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 878528f75e..2d34142771 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.45", + "version": "2.5.9", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.45", - "@budibase/shared-core": "2.5.6-alpha.45", + "@budibase/bbui": "^2.5.9", + "@budibase/shared-core": "^2.5.9", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index d253b9d491..75a6bc5235 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.45", + "version": "2.5.9", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index b41116b86c..1929d64826 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.45", + "version": "2.5.9", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.45", - "@budibase/client": "2.5.6-alpha.45", - "@budibase/pro": "2.5.6-alpha.45", - "@budibase/shared-core": "2.5.6-alpha.45", - "@budibase/string-templates": "2.5.6-alpha.45", - "@budibase/types": "2.5.6-alpha.45", + "@budibase/backend-core": "^2.5.9", + "@budibase/client": "^2.5.9", + "@budibase/pro": "2.5.9", + "@budibase/shared-core": "^2.5.9", + "@budibase/string-templates": "^2.5.9", + "@budibase/types": "^2.5.9", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/server/src/api/routes/tests/internalSearch.spec.js b/packages/server/src/api/routes/tests/internalSearch.spec.js index 6ad333b87a..8d57d2ee1c 100644 --- a/packages/server/src/api/routes/tests/internalSearch.spec.js +++ b/packages/server/src/api/routes/tests/internalSearch.spec.js @@ -105,7 +105,7 @@ describe("internal search", () => { "column": "", }, }, PARAMS) - checkLucene(response, `*:* AND !column:["" TO *]`, PARAMS) + checkLucene(response, `*:* AND (*:* -column:["" TO *])`, PARAMS) }) it("test notEmpty query", async () => { diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index f78dd95c19..332d8b6f60 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.45", + "version": "2.5.9", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "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\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.45" + "@budibase/types": "^2.5.9" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 0226884986..624ee36f03 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.45", + "version": "2.5.9", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 099237d2da..aed792b67c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.45", + "version": "2.5.9", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 9a1f38214f..31a0ea1d4c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.45", + "version": "2.5.9", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.45", - "@budibase/pro": "2.5.6-alpha.45", - "@budibase/string-templates": "2.5.6-alpha.45", - "@budibase/types": "2.5.6-alpha.45", + "@budibase/backend-core": "^2.5.9", + "@budibase/pro": "2.5.9", + "@budibase/string-templates": "^2.5.9", + "@budibase/types": "^2.5.9", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", diff --git a/yarn.lock b/yarn.lock index 3da316081c..90f1a20d88 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.44": - version "2.5.6-alpha.44" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.44.tgz#f849e7bceb06144083cc4b1d406ffa195348c4f1" - integrity sha512-duU1w9OhnycNvdfJx941OwrI3siTL3bOF793/yp8GisqSH/76vEwpu1VsAV/pqRywkwpr1LkilPkPPufiNURLg== +"@budibase/pro@2.5.6-alpha.45": + version "2.5.6-alpha.45" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.45.tgz#99b536f01a7f2bc291f305263fca0d42d0cf2c12" + integrity sha512-R11iRHzEwseVIH10mf7knzML2SVxnLCyyNSoTJu/xLisgn4cBUs9S+swAx6mtZ1sx6bNd7ULYzOHHAw9ATy6dg== 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/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" bull "4.10.1" joi "17.6.0"