From 9cc931acc4e12d8ef85d543080cb281a8fb7276e Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Wed, 21 Sep 2022 09:10:31 +0100 Subject: [PATCH 01/39] Do not allow non-match type primary foreign keys --- .../Datasources/CreateEditRelationship.svelte | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte index 990aa736f6..eb78975b8b 100644 --- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte +++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte @@ -90,6 +90,19 @@ if (inSchema(toTable, toRelate.name, originalToName)) { errObj.toCol = colError } + if ( + fromPrimary && + fromRelate.fieldName && + plusTables.filter(table => table.name === fromTable?.name)[0]?.schema[ + fromPrimary + ]?.type !== + plusTables.filter(table => table.name === toTable?.name)[0]?.schema[ + fromRelate.fieldName + ]?.type + ) { + errObj.foreign = + "Column type of the foreign key must match the primary key" + } errors = errObj } From b1797627ce391ea9f4078d2cbec12e4d4368cba4 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 21 Sep 2022 14:11:04 +0100 Subject: [PATCH 02/39] Hide the file attachment dropzone when the picker is disabled --- packages/bbui/src/Form/Core/Dropzone.svelte | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/bbui/src/Form/Core/Dropzone.svelte b/packages/bbui/src/Form/Core/Dropzone.svelte index 3102972d1e..51f6eef6f9 100644 --- a/packages/bbui/src/Form/Core/Dropzone.svelte +++ b/packages/bbui/src/Form/Core/Dropzone.svelte @@ -65,6 +65,9 @@ } } + $: showDropzone = + (!maximum || (maximum && value?.length < maximum)) && !disabled + async function processFileList(fileList) { if ( handleFileTooLarge && @@ -211,7 +214,7 @@ {/each} {/if} {/if} - {#if !maximum || (maximum && value?.length < maximum)} + {#if showDropzone}
Date: Wed, 21 Sep 2022 16:01:18 +0100 Subject: [PATCH 03/39] Stop click propagation on attachment links in tables --- packages/bbui/src/Table/AttachmentRenderer.svelte | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/bbui/src/Table/AttachmentRenderer.svelte b/packages/bbui/src/Table/AttachmentRenderer.svelte index 3017aac9b7..b4de8672ae 100644 --- a/packages/bbui/src/Table/AttachmentRenderer.svelte +++ b/packages/bbui/src/Table/AttachmentRenderer.svelte @@ -20,6 +20,9 @@ target="_blank" download={attachment.name} href={attachment.url} + on:click={e => { + e.stopPropagation() + }} >
{attachment.extension} @@ -32,6 +35,9 @@ target="_blank" download={attachment.name} href={attachment.url} + on:click={e => { + e.stopPropagation() + }} > {attachment.extension} From 860d7e15d3641fc7bfc85b59c493991aaa7330f4 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 22 Sep 2022 08:15:50 +0000 Subject: [PATCH 04/39] v1.4.8 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lerna.json b/lerna.json index 0f142617e3..1ebe56e48a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.4.7", + "version": "1.4.8", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ce102afca6..43fe551bc3 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.4.7", + "version": "1.4.8", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.4.7", + "@budibase/types": "^1.4.8", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 5ecab3ce5c..d575904f74 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": "1.4.7", + "version": "1.4.8", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.4.7", + "@budibase/string-templates": "^1.4.8", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index dc38640641..4e45e0829b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.4.7", + "version": "1.4.8", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.4.7", - "@budibase/client": "^1.4.7", - "@budibase/frontend-core": "^1.4.7", - "@budibase/string-templates": "^1.4.7", + "@budibase/bbui": "^1.4.8", + "@budibase/client": "^1.4.8", + "@budibase/frontend-core": "^1.4.8", + "@budibase/string-templates": "^1.4.8", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 0e7c70bec7..8b9ac0e010 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.4.7", + "version": "1.4.8", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^1.4.7", - "@budibase/string-templates": "^1.4.7", - "@budibase/types": "^1.4.7", + "@budibase/backend-core": "^1.4.8", + "@budibase/string-templates": "^1.4.8", + "@budibase/types": "^1.4.8", "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 79f2ecc34e..f3d408a2ab 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.4.7", + "version": "1.4.8", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.4.7", - "@budibase/frontend-core": "^1.4.7", - "@budibase/string-templates": "^1.4.7", + "@budibase/bbui": "^1.4.8", + "@budibase/frontend-core": "^1.4.8", + "@budibase/string-templates": "^1.4.8", "@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 d1571dd3d8..5a61e4b475 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.4.7", + "version": "1.4.8", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.4.7", + "@budibase/bbui": "^1.4.8", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index e5bf8650cb..8ca661c020 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.4.7", + "version": "1.4.8", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.4.7", - "@budibase/client": "^1.4.7", + "@budibase/backend-core": "^1.4.8", + "@budibase/client": "^1.4.8", "@budibase/pro": "1.4.7", - "@budibase/string-templates": "^1.4.7", - "@budibase/types": "^1.4.7", + "@budibase/string-templates": "^1.4.8", + "@budibase/types": "^1.4.8", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 7b26d65efa..3cb99c3c7b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.4.7", + "version": "1.4.8", "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 5395c1ce24..fa4dbb9284 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.4.7", + "version": "1.4.8", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 42c30eba50..4307d5b78c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.4.7", + "version": "1.4.8", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.4.7", + "@budibase/backend-core": "^1.4.8", "@budibase/pro": "1.4.7", - "@budibase/string-templates": "^1.4.7", - "@budibase/types": "^1.4.7", + "@budibase/string-templates": "^1.4.8", + "@budibase/types": "^1.4.8", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From c1f4947816dc4ff10429ba4084246ee4eb70098e Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 22 Sep 2022 08:19:42 +0000 Subject: [PATCH 05/39] Update pro version to 1.4.8 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 8ca661c020..12ef88d04d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.4.8", "@budibase/client": "^1.4.8", - "@budibase/pro": "1.4.7", + "@budibase/pro": "1.4.8", "@budibase/string-templates": "^1.4.8", "@budibase/types": "^1.4.8", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index ee16029c07..ad11cf4306 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.4.7": - version "1.4.7" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.7.tgz#964019383fd3d7e0acc98cc025dbb85d060c4288" - integrity sha512-2o3WYFssVFCnSTx8JyEGRGEqGwExrKm5Ab+z44sREjFHIv3NgFXbde65D66U1tzi5vWD+gB3SfDKxNeyg+xqLQ== +"@budibase/backend-core@1.4.8": + version "1.4.8" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8.tgz#56ffb3358f6eba6480b24918529c9f840035b275" + integrity sha512-Yp6pGrCnfHJ6x+YOJKEbRTmrYscBdydWap6OYjispqswORH57FneyH0UTZ8ZgX8NDv+QzbqVyfGW7VxRvAakgg== dependencies: - "@budibase/types" "^1.4.7" + "@budibase/types" "^1.4.8" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1180,13 +1180,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.4.7": - version "1.4.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.7.tgz#05d0aac81a7a5e57226e6d7c80db83a3f1095ec1" - integrity sha512-a/l+Dfs8AlLWjVZ9MN7f5HzeczWZbiPJGjzeLHEjPdbjXZ/52RZfz1M8oR1FVo/Ph+XpJALck+B1ai9rDzOyXg== +"@budibase/pro@1.4.8": + version "1.4.8" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8.tgz#ff3c2fc07ce9efe399d9f0fa1e665f645df6bb10" + integrity sha512-MdPtuOp8UbRsB2eZ0i7n1/+cyJL6eKuVVQrCHzF2Pz93w2M/9SVBZVpuSmu4seXEwnYxHL/OLc7MnLKnSqsszg== dependencies: - "@budibase/backend-core" "1.4.7" - "@budibase/types" "1.4.7" + "@budibase/backend-core" "1.4.8" + "@budibase/types" "1.4.8" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1209,10 +1209,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.4.7", "@budibase/types@^1.4.7": - version "1.4.7" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.7.tgz#6d352516e26c416a47bcf82915c9f92af3f6fce7" - integrity sha512-lBU0gfRwZCwssKJKo3rCq4kyfW/BAed8zrH40j/KJIrdcw28Jh0WSrr/wOynOgMdCBoh1oHZsRJr1SfZp/wh4g== +"@budibase/types@1.4.8", "@budibase/types@^1.4.8": + version "1.4.8" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8.tgz#df683b1bdf42d95b7ffc256981c3ff87e76859ce" + integrity sha512-LsIX/HtTKf9V1dGoDzdnSmhxDeF995L7YGbBlS9+Df4+U1x7NXlh+2A7+91bQDVZvvqTUw1hjYN/tW+qbeHrMw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 4307d5b78c..6aee296926 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.4.8", - "@budibase/pro": "1.4.7", + "@budibase/pro": "1.4.8", "@budibase/string-templates": "^1.4.8", "@budibase/types": "^1.4.8", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 85db07e95f..fb19cc77e0 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.4.7": - version "1.4.7" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.7.tgz#964019383fd3d7e0acc98cc025dbb85d060c4288" - integrity sha512-2o3WYFssVFCnSTx8JyEGRGEqGwExrKm5Ab+z44sREjFHIv3NgFXbde65D66U1tzi5vWD+gB3SfDKxNeyg+xqLQ== +"@budibase/backend-core@1.4.8": + version "1.4.8" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8.tgz#56ffb3358f6eba6480b24918529c9f840035b275" + integrity sha512-Yp6pGrCnfHJ6x+YOJKEbRTmrYscBdydWap6OYjispqswORH57FneyH0UTZ8ZgX8NDv+QzbqVyfGW7VxRvAakgg== dependencies: - "@budibase/types" "^1.4.7" + "@budibase/types" "^1.4.8" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -327,21 +327,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.4.7": - version "1.4.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.7.tgz#05d0aac81a7a5e57226e6d7c80db83a3f1095ec1" - integrity sha512-a/l+Dfs8AlLWjVZ9MN7f5HzeczWZbiPJGjzeLHEjPdbjXZ/52RZfz1M8oR1FVo/Ph+XpJALck+B1ai9rDzOyXg== +"@budibase/pro@1.4.8": + version "1.4.8" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8.tgz#ff3c2fc07ce9efe399d9f0fa1e665f645df6bb10" + integrity sha512-MdPtuOp8UbRsB2eZ0i7n1/+cyJL6eKuVVQrCHzF2Pz93w2M/9SVBZVpuSmu4seXEwnYxHL/OLc7MnLKnSqsszg== dependencies: - "@budibase/backend-core" "1.4.7" - "@budibase/types" "1.4.7" + "@budibase/backend-core" "1.4.8" + "@budibase/types" "1.4.8" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.4.7", "@budibase/types@^1.4.7": - version "1.4.7" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.7.tgz#6d352516e26c416a47bcf82915c9f92af3f6fce7" - integrity sha512-lBU0gfRwZCwssKJKo3rCq4kyfW/BAed8zrH40j/KJIrdcw28Jh0WSrr/wOynOgMdCBoh1oHZsRJr1SfZp/wh4g== +"@budibase/types@1.4.8", "@budibase/types@^1.4.8": + version "1.4.8" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8.tgz#df683b1bdf42d95b7ffc256981c3ff87e76859ce" + integrity sha512-LsIX/HtTKf9V1dGoDzdnSmhxDeF995L7YGbBlS9+Df4+U1x7NXlh+2A7+91bQDVZvvqTUw1hjYN/tW+qbeHrMw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 6f7b661cdf0a4324ae2d927a1d3d1d4a84d7c52f Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 22 Sep 2022 15:04:20 +0100 Subject: [PATCH 06/39] turn off websockets in client lib in cloud --- packages/client/src/websocket.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/client/src/websocket.js b/packages/client/src/websocket.js index eb859933f7..b9f9668fde 100644 --- a/packages/client/src/websocket.js +++ b/packages/client/src/websocket.js @@ -1,12 +1,13 @@ -import { builderStore } from "./stores/index.js" +import { builderStore, environmentStore } from "./stores/index.js" import { get } from "svelte/store" import { io } from "socket.io-client" export const initWebsocket = () => { const { inBuilder, location } = get(builderStore) + const { cloud } = get(environmentStore) // Only connect when we're inside the builder preview, for now - if (!inBuilder || !location) { + if (!inBuilder || !location || cloud) { return } From e15f0834451ad122fe2bb09e8924a7bd50886f68 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 22 Sep 2022 14:28:02 +0000 Subject: [PATCH 07/39] v1.4.9 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lerna.json b/lerna.json index 1ebe56e48a..f1247bb513 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.4.8", + "version": "1.4.9", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 43fe551bc3..5d7142e54c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.4.8", + "version": "1.4.9", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.4.8", + "@budibase/types": "^1.4.9", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index d575904f74..15dcdf6a0b 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": "1.4.8", + "version": "1.4.9", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.4.8", + "@budibase/string-templates": "^1.4.9", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 4e45e0829b..ae7154d77e 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.4.8", + "version": "1.4.9", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.4.8", - "@budibase/client": "^1.4.8", - "@budibase/frontend-core": "^1.4.8", - "@budibase/string-templates": "^1.4.8", + "@budibase/bbui": "^1.4.9", + "@budibase/client": "^1.4.9", + "@budibase/frontend-core": "^1.4.9", + "@budibase/string-templates": "^1.4.9", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 8b9ac0e010..4a4d1f4250 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.4.8", + "version": "1.4.9", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^1.4.8", - "@budibase/string-templates": "^1.4.8", - "@budibase/types": "^1.4.8", + "@budibase/backend-core": "^1.4.9", + "@budibase/string-templates": "^1.4.9", + "@budibase/types": "^1.4.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 f3d408a2ab..58f329431f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.4.8", + "version": "1.4.9", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.4.8", - "@budibase/frontend-core": "^1.4.8", - "@budibase/string-templates": "^1.4.8", + "@budibase/bbui": "^1.4.9", + "@budibase/frontend-core": "^1.4.9", + "@budibase/string-templates": "^1.4.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 5a61e4b475..4ed6c65211 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.4.8", + "version": "1.4.9", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.4.8", + "@budibase/bbui": "^1.4.9", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 12ef88d04d..62e6b6ac5f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.4.8", + "version": "1.4.9", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.4.8", - "@budibase/client": "^1.4.8", + "@budibase/backend-core": "^1.4.9", + "@budibase/client": "^1.4.9", "@budibase/pro": "1.4.8", - "@budibase/string-templates": "^1.4.8", - "@budibase/types": "^1.4.8", + "@budibase/string-templates": "^1.4.9", + "@budibase/types": "^1.4.9", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 3cb99c3c7b..dd8cc4be49 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.4.8", + "version": "1.4.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 fa4dbb9284..1adf5b9331 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.4.8", + "version": "1.4.9", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 6aee296926..8416775344 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.4.8", + "version": "1.4.9", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.4.8", + "@budibase/backend-core": "^1.4.9", "@budibase/pro": "1.4.8", - "@budibase/string-templates": "^1.4.8", - "@budibase/types": "^1.4.8", + "@budibase/string-templates": "^1.4.9", + "@budibase/types": "^1.4.9", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From aebcea3bea14136836e58d9a46f9167109b03ac5 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 22 Sep 2022 14:31:55 +0000 Subject: [PATCH 08/39] Update pro version to 1.4.9 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 62e6b6ac5f..d4850fa92d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.4.9", "@budibase/client": "^1.4.9", - "@budibase/pro": "1.4.8", + "@budibase/pro": "1.4.9", "@budibase/string-templates": "^1.4.9", "@budibase/types": "^1.4.9", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index ad11cf4306..dcc55969d8 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.4.8": - version "1.4.8" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8.tgz#56ffb3358f6eba6480b24918529c9f840035b275" - integrity sha512-Yp6pGrCnfHJ6x+YOJKEbRTmrYscBdydWap6OYjispqswORH57FneyH0UTZ8ZgX8NDv+QzbqVyfGW7VxRvAakgg== +"@budibase/backend-core@1.4.9": + version "1.4.9" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.9.tgz#60cdf8370e5931652d4096b10b529e8f492b66c6" + integrity sha512-Ea1wEHu2zeDlYbeP39/EyCHJZqM1hhteikRAK5bp/E0s1PDZqVK9cjLUmxP33jAgDlzZE7wueI+zs2bJrf/6qw== dependencies: - "@budibase/types" "^1.4.8" + "@budibase/types" "^1.4.9" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1180,13 +1180,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.4.8": - version "1.4.8" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8.tgz#ff3c2fc07ce9efe399d9f0fa1e665f645df6bb10" - integrity sha512-MdPtuOp8UbRsB2eZ0i7n1/+cyJL6eKuVVQrCHzF2Pz93w2M/9SVBZVpuSmu4seXEwnYxHL/OLc7MnLKnSqsszg== +"@budibase/pro@1.4.9": + version "1.4.9" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.9.tgz#e6b6d682b697b80f06ff53e3d97a61908b967681" + integrity sha512-wOOWDaItOSlqNricMYXbCeitN3y+bhMy7MPLXPuFTrrHq5YPJYkbQcp+sA2zfgRgVMKDj4ZMUKDZUzh93s2nSw== dependencies: - "@budibase/backend-core" "1.4.8" - "@budibase/types" "1.4.8" + "@budibase/backend-core" "1.4.9" + "@budibase/types" "1.4.9" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1209,10 +1209,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.4.8", "@budibase/types@^1.4.8": - version "1.4.8" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8.tgz#df683b1bdf42d95b7ffc256981c3ff87e76859ce" - integrity sha512-LsIX/HtTKf9V1dGoDzdnSmhxDeF995L7YGbBlS9+Df4+U1x7NXlh+2A7+91bQDVZvvqTUw1hjYN/tW+qbeHrMw== +"@budibase/types@1.4.9", "@budibase/types@^1.4.9": + version "1.4.9" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.9.tgz#6b8dc04a57c6886826796462006278ac441478b0" + integrity sha512-HBQRRaBntdXOXMlOHNdsASiUHAgHJ0nX8Zzjgbbj1zw3O9U6azlmKyTCSKTEd3cdrRYxXrYTp1YoOsrzqxNf7Q== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 8416775344..950f799b03 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.4.9", - "@budibase/pro": "1.4.8", + "@budibase/pro": "1.4.9", "@budibase/string-templates": "^1.4.9", "@budibase/types": "^1.4.9", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index fb19cc77e0..917548c109 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.4.8": - version "1.4.8" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8.tgz#56ffb3358f6eba6480b24918529c9f840035b275" - integrity sha512-Yp6pGrCnfHJ6x+YOJKEbRTmrYscBdydWap6OYjispqswORH57FneyH0UTZ8ZgX8NDv+QzbqVyfGW7VxRvAakgg== +"@budibase/backend-core@1.4.9": + version "1.4.9" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.9.tgz#60cdf8370e5931652d4096b10b529e8f492b66c6" + integrity sha512-Ea1wEHu2zeDlYbeP39/EyCHJZqM1hhteikRAK5bp/E0s1PDZqVK9cjLUmxP33jAgDlzZE7wueI+zs2bJrf/6qw== dependencies: - "@budibase/types" "^1.4.8" + "@budibase/types" "^1.4.9" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -327,21 +327,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.4.8": - version "1.4.8" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8.tgz#ff3c2fc07ce9efe399d9f0fa1e665f645df6bb10" - integrity sha512-MdPtuOp8UbRsB2eZ0i7n1/+cyJL6eKuVVQrCHzF2Pz93w2M/9SVBZVpuSmu4seXEwnYxHL/OLc7MnLKnSqsszg== +"@budibase/pro@1.4.9": + version "1.4.9" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.9.tgz#e6b6d682b697b80f06ff53e3d97a61908b967681" + integrity sha512-wOOWDaItOSlqNricMYXbCeitN3y+bhMy7MPLXPuFTrrHq5YPJYkbQcp+sA2zfgRgVMKDj4ZMUKDZUzh93s2nSw== dependencies: - "@budibase/backend-core" "1.4.8" - "@budibase/types" "1.4.8" + "@budibase/backend-core" "1.4.9" + "@budibase/types" "1.4.9" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.4.8", "@budibase/types@^1.4.8": - version "1.4.8" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8.tgz#df683b1bdf42d95b7ffc256981c3ff87e76859ce" - integrity sha512-LsIX/HtTKf9V1dGoDzdnSmhxDeF995L7YGbBlS9+Df4+U1x7NXlh+2A7+91bQDVZvvqTUw1hjYN/tW+qbeHrMw== +"@budibase/types@1.4.9", "@budibase/types@^1.4.9": + version "1.4.9" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.9.tgz#6b8dc04a57c6886826796462006278ac441478b0" + integrity sha512-HBQRRaBntdXOXMlOHNdsASiUHAgHJ0nX8Zzjgbbj1zw3O9U6azlmKyTCSKTEd3cdrRYxXrYTp1YoOsrzqxNf7Q== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 249c673a5e013c71863c81967e4f35d54e19c242 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 22 Sep 2022 15:52:46 +0100 Subject: [PATCH 09/39] Reduce websocket polling frequency and cap reconnection attemps --- packages/client/src/websocket.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/client/src/websocket.js b/packages/client/src/websocket.js index b9f9668fde..827453fad6 100644 --- a/packages/client/src/websocket.js +++ b/packages/client/src/websocket.js @@ -18,6 +18,14 @@ export const initWebsocket = () => { const port = location.port || (tls ? 443 : 80) const socket = io(`${proto}//${host}:${port}`, { path: "/socket/client", + // Cap reconnection attempts to 10 (total of 95 seconds before giving up) + reconnectionAttempts: 10, + // Delay initial reconnection attempt by 5 seconds + reconnectionDelay: 5000, + // Then decrease to 10 second intervals + reconnectionDelayMax: 10000, + // Timeout after 5 seconds so we never stack requests + timeout: 5000, }) // Event handlers From 76f6f9e9b941551aa3c168beaee1cdf7e664639a Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 22 Sep 2022 16:36:19 +0100 Subject: [PATCH 10/39] Support multiple statements --- packages/server/src/integrations/mysql.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/server/src/integrations/mysql.ts b/packages/server/src/integrations/mysql.ts index 0f236935c8..69dbb40480 100644 --- a/packages/server/src/integrations/mysql.ts +++ b/packages/server/src/integrations/mysql.ts @@ -30,6 +30,7 @@ interface MySQLConfig { ssl?: { [key: string]: any } rejectUnauthorized: boolean typeCast: Function + multipleStatements: boolean } const SCHEMA: Integration = { @@ -136,6 +137,7 @@ class MySQLIntegration extends Sql implements DatasourcePlus { delete config.rejectUnauthorized this.config = { ...config, + multipleStatements: true, typeCast: function (field: any, next: any) { if ( field.type == "DATETIME" || From f30a679669c2c7d36fadf11ff92a0b65b57ed9a2 Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 22 Sep 2022 17:04:58 +0100 Subject: [PATCH 11/39] Added category and icon for table configuration binding drawer --- .../design/settings/controls/ColumnEditor/CellDrawer.svelte | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte index 4443ff09ed..a03d22386d 100644 --- a/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte @@ -32,6 +32,8 @@ { readableBinding: "Value", runtimeBinding: "[value]", + category: `Column: ${column.name}`, + icon: "TableColumnMerge", }, ]} /> From f0325eb54af577d976fd31b1f160e6d07e16ee11 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 22 Sep 2022 16:06:01 +0000 Subject: [PATCH 12/39] v1.4.10 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lerna.json b/lerna.json index f1247bb513..1d6f80de5c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.4.9", + "version": "1.4.10", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 5d7142e54c..1fba9192a5 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.4.9", + "version": "1.4.10", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.4.9", + "@budibase/types": "^1.4.10", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 15dcdf6a0b..dc6fd21603 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": "1.4.9", + "version": "1.4.10", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.4.9", + "@budibase/string-templates": "^1.4.10", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index ae7154d77e..87558860f6 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.4.9", + "version": "1.4.10", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.4.9", - "@budibase/client": "^1.4.9", - "@budibase/frontend-core": "^1.4.9", - "@budibase/string-templates": "^1.4.9", + "@budibase/bbui": "^1.4.10", + "@budibase/client": "^1.4.10", + "@budibase/frontend-core": "^1.4.10", + "@budibase/string-templates": "^1.4.10", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 4a4d1f4250..de89881ffe 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.4.9", + "version": "1.4.10", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^1.4.9", - "@budibase/string-templates": "^1.4.9", - "@budibase/types": "^1.4.9", + "@budibase/backend-core": "^1.4.10", + "@budibase/string-templates": "^1.4.10", + "@budibase/types": "^1.4.10", "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 58f329431f..5d083f06e1 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.4.9", + "version": "1.4.10", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.4.9", - "@budibase/frontend-core": "^1.4.9", - "@budibase/string-templates": "^1.4.9", + "@budibase/bbui": "^1.4.10", + "@budibase/frontend-core": "^1.4.10", + "@budibase/string-templates": "^1.4.10", "@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 4ed6c65211..465f6017e0 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.4.9", + "version": "1.4.10", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.4.9", + "@budibase/bbui": "^1.4.10", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index d4850fa92d..18046b287a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.4.9", + "version": "1.4.10", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.4.9", - "@budibase/client": "^1.4.9", + "@budibase/backend-core": "^1.4.10", + "@budibase/client": "^1.4.10", "@budibase/pro": "1.4.9", - "@budibase/string-templates": "^1.4.9", - "@budibase/types": "^1.4.9", + "@budibase/string-templates": "^1.4.10", + "@budibase/types": "^1.4.10", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index dd8cc4be49..095c2df4eb 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.4.9", + "version": "1.4.10", "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 1adf5b9331..b224fbb4ad 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.4.9", + "version": "1.4.10", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 950f799b03..fb2a37545b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.4.9", + "version": "1.4.10", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.4.9", + "@budibase/backend-core": "^1.4.10", "@budibase/pro": "1.4.9", - "@budibase/string-templates": "^1.4.9", - "@budibase/types": "^1.4.9", + "@budibase/string-templates": "^1.4.10", + "@budibase/types": "^1.4.10", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 1959acd4c1a8570fbf75e39cb21c3f6a6a9d2e92 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 22 Sep 2022 16:09:28 +0000 Subject: [PATCH 13/39] Update pro version to 1.4.10 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 18046b287a..47f28443c8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.4.10", "@budibase/client": "^1.4.10", - "@budibase/pro": "1.4.9", + "@budibase/pro": "1.4.10", "@budibase/string-templates": "^1.4.10", "@budibase/types": "^1.4.10", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index dcc55969d8..1a847365d6 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.4.9": - version "1.4.9" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.9.tgz#60cdf8370e5931652d4096b10b529e8f492b66c6" - integrity sha512-Ea1wEHu2zeDlYbeP39/EyCHJZqM1hhteikRAK5bp/E0s1PDZqVK9cjLUmxP33jAgDlzZE7wueI+zs2bJrf/6qw== +"@budibase/backend-core@1.4.10": + version "1.4.10" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.10.tgz#880b58ebfb8a0489fb15266bd8e2930ac097d8d1" + integrity sha512-w18Gwjp9IqIf6W1bAKG7FcVjUfq76yv0DGebK2FFYDEKIijhxGU7+URyHiqQi5Cdve8PRJ13+krPir38kUKH9w== dependencies: - "@budibase/types" "^1.4.9" + "@budibase/types" "^1.4.10" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1180,13 +1180,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.4.9": - version "1.4.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.9.tgz#e6b6d682b697b80f06ff53e3d97a61908b967681" - integrity sha512-wOOWDaItOSlqNricMYXbCeitN3y+bhMy7MPLXPuFTrrHq5YPJYkbQcp+sA2zfgRgVMKDj4ZMUKDZUzh93s2nSw== +"@budibase/pro@1.4.10": + version "1.4.10" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.10.tgz#676d81472df8d600b91a9c4dd25b826ea3adde06" + integrity sha512-vTr37tf6T0FEZOngCI9vJBxvxfmMgpsRP8+HmncVswgxIk3RbRWYF2Th1enemMe/X+lohWqhreTTy1RPQ6dzeA== dependencies: - "@budibase/backend-core" "1.4.9" - "@budibase/types" "1.4.9" + "@budibase/backend-core" "1.4.10" + "@budibase/types" "1.4.10" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1209,10 +1209,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.4.9", "@budibase/types@^1.4.9": - version "1.4.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.9.tgz#6b8dc04a57c6886826796462006278ac441478b0" - integrity sha512-HBQRRaBntdXOXMlOHNdsASiUHAgHJ0nX8Zzjgbbj1zw3O9U6azlmKyTCSKTEd3cdrRYxXrYTp1YoOsrzqxNf7Q== +"@budibase/types@1.4.10", "@budibase/types@^1.4.10": + version "1.4.10" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.10.tgz#6c1ba3859f3d9452f21cea3bffa51541d76afaa0" + integrity sha512-MtHT1GHEMV+fE2Kd64Y21Ut9+HPhE1ScyGTMeNciFEFhSODOy7VEoRXcbEZSk39N5vj3w8lfXGRYNb7zTzrUZw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index fb2a37545b..7868c41824 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.4.10", - "@budibase/pro": "1.4.9", + "@budibase/pro": "1.4.10", "@budibase/string-templates": "^1.4.10", "@budibase/types": "^1.4.10", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 917548c109..cc0ed42643 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.4.9": - version "1.4.9" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.9.tgz#60cdf8370e5931652d4096b10b529e8f492b66c6" - integrity sha512-Ea1wEHu2zeDlYbeP39/EyCHJZqM1hhteikRAK5bp/E0s1PDZqVK9cjLUmxP33jAgDlzZE7wueI+zs2bJrf/6qw== +"@budibase/backend-core@1.4.10": + version "1.4.10" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.10.tgz#880b58ebfb8a0489fb15266bd8e2930ac097d8d1" + integrity sha512-w18Gwjp9IqIf6W1bAKG7FcVjUfq76yv0DGebK2FFYDEKIijhxGU7+URyHiqQi5Cdve8PRJ13+krPir38kUKH9w== dependencies: - "@budibase/types" "^1.4.9" + "@budibase/types" "^1.4.10" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -327,21 +327,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.4.9": - version "1.4.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.9.tgz#e6b6d682b697b80f06ff53e3d97a61908b967681" - integrity sha512-wOOWDaItOSlqNricMYXbCeitN3y+bhMy7MPLXPuFTrrHq5YPJYkbQcp+sA2zfgRgVMKDj4ZMUKDZUzh93s2nSw== +"@budibase/pro@1.4.10": + version "1.4.10" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.10.tgz#676d81472df8d600b91a9c4dd25b826ea3adde06" + integrity sha512-vTr37tf6T0FEZOngCI9vJBxvxfmMgpsRP8+HmncVswgxIk3RbRWYF2Th1enemMe/X+lohWqhreTTy1RPQ6dzeA== dependencies: - "@budibase/backend-core" "1.4.9" - "@budibase/types" "1.4.9" + "@budibase/backend-core" "1.4.10" + "@budibase/types" "1.4.10" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.4.9", "@budibase/types@^1.4.9": - version "1.4.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.9.tgz#6b8dc04a57c6886826796462006278ac441478b0" - integrity sha512-HBQRRaBntdXOXMlOHNdsASiUHAgHJ0nX8Zzjgbbj1zw3O9U6azlmKyTCSKTEd3cdrRYxXrYTp1YoOsrzqxNf7Q== +"@budibase/types@1.4.10", "@budibase/types@^1.4.10": + version "1.4.10" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.10.tgz#6c1ba3859f3d9452f21cea3bffa51541d76afaa0" + integrity sha512-MtHT1GHEMV+fE2Kd64Y21Ut9+HPhE1ScyGTMeNciFEFhSODOy7VEoRXcbEZSk39N5vj3w8lfXGRYNb7zTzrUZw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 900050fe55bc102425909e357e2a106f52bbe726 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Fri, 23 Sep 2022 09:30:05 +0100 Subject: [PATCH 14/39] Sort type can change. Removed falsey check. --- packages/frontend-core/src/fetch/DataFetch.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/frontend-core/src/fetch/DataFetch.js b/packages/frontend-core/src/fetch/DataFetch.js index 338e6e0405..345e58ac42 100644 --- a/packages/frontend-core/src/fetch/DataFetch.js +++ b/packages/frontend-core/src/fetch/DataFetch.js @@ -136,14 +136,12 @@ export default class DataFetch { } // Determine what sort type to use - if (!this.options.sortType) { - let sortType = "string" - if (sortColumn) { - const type = schema?.[sortColumn]?.type - sortType = type === "number" ? "number" : "string" - } - this.options.sortType = sortType + let sortType = "string" + if (sortColumn) { + const type = schema?.[sortColumn]?.type + sortType = type === "number" ? "number" : "string" } + this.options.sortType = sortType // Build the lucene query let query = this.options.query From 3c04dc82b376af02622cc3612b4a2269aaf81a04 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 23 Sep 2022 10:40:55 +0100 Subject: [PATCH 15/39] Minor fix to ensure the app name neatly truncates and a general layout fix for apps in smaller resolutions --- packages/builder/src/components/start/AppRow.svelte | 7 ++++++- .../builder/src/pages/builder/portal/apps/index.svelte | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte index 91920073bb..eee8aa19b2 100644 --- a/packages/builder/src/components/start/AppRow.svelte +++ b/packages/builder/src/components/start/AppRow.svelte @@ -9,7 +9,7 @@
-
+
@@ -61,6 +61,11 @@