From d034800c76cdac40d350f41bc3e8a53cb5c3f56c Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 2 Nov 2022 09:58:38 +0000 Subject: [PATCH 01/10] Email onboarding not respecting group selection --- packages/frontend-core/src/api/user.js | 2 +- packages/worker/src/sdk/users/users.ts | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/packages/frontend-core/src/api/user.js b/packages/frontend-core/src/api/user.js index 39d9359e91..5c4f070802 100644 --- a/packages/frontend-core/src/api/user.js +++ b/packages/frontend-core/src/api/user.js @@ -158,7 +158,7 @@ export const buildUserEndpoints = API => ({ userInfo: { admin: user.admin ? { global: true } : undefined, builder: user.admin || user.builder ? { global: true } : undefined, - groups: user.groups, + userGroups: user.groups, }, })), }) diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts index 775514ea5e..8afd398d91 100644 --- a/packages/worker/src/sdk/users/users.ts +++ b/packages/worker/src/sdk/users/users.ts @@ -184,7 +184,9 @@ export const save = async ( ): Promise => { const tenantId = tenancy.getTenantId() const db = tenancy.getGlobalDB() - let { email, _id } = user + + let { email, _id, userGroups = [] } = user + if (!email && !_id) { throw new Error("_id or email is required") } @@ -220,8 +222,16 @@ export const save = async ( let builtUser = await buildUser(user, opts, tenantId, dbUser) // make sure we set the _id field for a new user + // Also if this is a new user, associate groups with them + let groupPromises = [] if (!_id) { _id = builtUser._id! + + if (userGroups.length > 0) { + for (let groupId of userGroups) { + groupPromises.push(groupsSdk.addUsers(groupId, [_id])) + } + } } try { @@ -235,6 +245,8 @@ export const save = async ( // let server know to sync user await apps.syncUserInApps(_id) + await Promise.all(groupPromises) + return { _id: response.id, _rev: response.rev, @@ -557,12 +569,13 @@ export const invite = async ( successful: [], unsuccessful: [], } - + console.log(users) const matchedEmails = await searchExistingEmails(users.map(u => u.email)) const newUsers = [] // separate duplicates from new users for (let user of users) { + console.log(user) if (matchedEmails.includes(user.email)) { response.unsuccessful.push({ email: user.email, reason: "Unavailable" }) } else { From d1f9b8048c3070186191ad372a3fe4daeef47ca5 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 2 Nov 2022 10:35:04 +0000 Subject: [PATCH 02/10] remove log --- packages/worker/src/sdk/users/users.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts index 8afd398d91..f47a5216d6 100644 --- a/packages/worker/src/sdk/users/users.ts +++ b/packages/worker/src/sdk/users/users.ts @@ -569,13 +569,12 @@ export const invite = async ( successful: [], unsuccessful: [], } - console.log(users) + const matchedEmails = await searchExistingEmails(users.map(u => u.email)) const newUsers = [] // separate duplicates from new users for (let user of users) { - console.log(user) if (matchedEmails.includes(user.email)) { response.unsuccessful.push({ email: user.email, reason: "Unavailable" }) } else { From df72037eaceb8613f434cf7754869fe2f7f164fd Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 2 Nov 2022 12:15:03 +0000 Subject: [PATCH 03/10] fix issue with datepicker --- packages/bbui/src/Form/Core/DatePicker.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bbui/src/Form/Core/DatePicker.svelte b/packages/bbui/src/Form/Core/DatePicker.svelte index 9e7d44dbc3..379f41b284 100644 --- a/packages/bbui/src/Form/Core/DatePicker.svelte +++ b/packages/bbui/src/Form/Core/DatePicker.svelte @@ -41,7 +41,7 @@ time_24hr: time24hr || false, altFormat: timeOnly ? "H:i" : enableTime ? "F j Y, H:i" : "F j, Y", wrap: true, - mode: range ? "range" : null, + mode: range ? "range" : "single", appendTo, disableMobile: "true", onReady: () => { From d79fc356ea70224c3e5f90cfe86cf0564c7277c2 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 3 Nov 2022 12:50:52 +0000 Subject: [PATCH 04/10] Fix for #8491 - auto generated screens use the form block now which had an issue with the close screen event not providing a URL. --- packages/client/src/components/app/blocks/FormBlock.svelte | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/client/src/components/app/blocks/FormBlock.svelte b/packages/client/src/components/app/blocks/FormBlock.svelte index 3311ddd7bb..d1d1a0a22f 100644 --- a/packages/client/src/components/app/blocks/FormBlock.svelte +++ b/packages/client/src/components/app/blocks/FormBlock.svelte @@ -48,6 +48,9 @@ }, { "##eventHandlerType": "Close Screen Modal", + parameters: { + url: actionUrl, + }, }, { "##eventHandlerType": "Navigate To", @@ -68,6 +71,9 @@ }, { "##eventHandlerType": "Close Screen Modal", + parameters: { + url: actionUrl, + }, }, { "##eventHandlerType": "Navigate To", From 04f1f983e4b22c8d47923a9f40f3df0ab54c32da Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 3 Nov 2022 13:23:29 +0000 Subject: [PATCH 05/10] Fix to allow close screen modal without navigating to a new page. --- packages/client/src/components/app/blocks/FormBlock.svelte | 6 ------ packages/client/src/utils/buttonActions.js | 5 ++++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/client/src/components/app/blocks/FormBlock.svelte b/packages/client/src/components/app/blocks/FormBlock.svelte index d1d1a0a22f..3311ddd7bb 100644 --- a/packages/client/src/components/app/blocks/FormBlock.svelte +++ b/packages/client/src/components/app/blocks/FormBlock.svelte @@ -48,9 +48,6 @@ }, { "##eventHandlerType": "Close Screen Modal", - parameters: { - url: actionUrl, - }, }, { "##eventHandlerType": "Navigate To", @@ -71,9 +68,6 @@ }, { "##eventHandlerType": "Close Screen Modal", - parameters: { - url: actionUrl, - }, }, { "##eventHandlerType": "Navigate To", diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js index e44ed2451c..6fcef37182 100644 --- a/packages/client/src/utils/buttonActions.js +++ b/packages/client/src/utils/buttonActions.js @@ -225,7 +225,10 @@ const changeFormStepHandler = async (action, context) => { } const closeScreenModalHandler = action => { - let { url } = action.parameters + let url + if (action?.parameters) { + url = action.parameters.url + } // Emit this as a window event, so parent screens which are iframing us in // can close the modal window.parent.postMessage({ type: "close-screen-modal", url }) From f75c0cd304e8949d49b56b86d585ccfd9a6ac058 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 3 Nov 2022 14:04:02 +0000 Subject: [PATCH 06/10] v2.1.12 --- 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/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 1c116117f0..815d37888a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.11", + "version": "2.1.12", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 941b4f3154..eb0960faad 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.11", + "version": "2.1.12", "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": "^2.1.11", + "@budibase/types": "^2.1.12", "@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 ab0e065c64..47eb147b39 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.1.11", + "version": "2.1.12", "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": "^2.1.11", + "@budibase/string-templates": "^2.1.12", "@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 4c777ebde8..5376091e2e 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.11", + "version": "2.1.12", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.11", - "@budibase/client": "^2.1.11", - "@budibase/frontend-core": "^2.1.11", - "@budibase/string-templates": "^2.1.11", + "@budibase/bbui": "^2.1.12", + "@budibase/client": "^2.1.12", + "@budibase/frontend-core": "^2.1.12", + "@budibase/string-templates": "^2.1.12", "@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 ba1d937be5..8797c8878f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.11", + "version": "2.1.12", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.11", - "@budibase/string-templates": "^2.1.11", - "@budibase/types": "^2.1.11", + "@budibase/backend-core": "^2.1.12", + "@budibase/string-templates": "^2.1.12", + "@budibase/types": "^2.1.12", "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 73513b45c8..02cd5d4e81 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.11", + "version": "2.1.12", "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": "^2.1.11", - "@budibase/frontend-core": "^2.1.11", - "@budibase/string-templates": "^2.1.11", + "@budibase/bbui": "^2.1.12", + "@budibase/frontend-core": "^2.1.12", + "@budibase/string-templates": "^2.1.12", "@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 f7c02b45db..51e77e4a51 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.11", + "version": "2.1.12", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.1.11", + "@budibase/bbui": "^2.1.12", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 441cadb353..525f847fac 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.11", + "version": "2.1.12", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 9414da1a9e..a41ea61f39 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.11", + "version": "2.1.12", "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": "^2.1.11", - "@budibase/client": "^2.1.11", + "@budibase/backend-core": "^2.1.12", + "@budibase/client": "^2.1.12", "@budibase/pro": "2.1.11", - "@budibase/string-templates": "^2.1.11", - "@budibase/types": "^2.1.11", + "@budibase/string-templates": "^2.1.12", + "@budibase/types": "^2.1.12", "@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 9b3144c5b9..b60ae3ca81 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.11", + "version": "2.1.12", "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 31c2799b64..8b10bcfd8c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.11", + "version": "2.1.12", "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 d91df714e1..54d7956da9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.11", + "version": "2.1.12", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.1.11", + "@budibase/backend-core": "^2.1.12", "@budibase/pro": "2.1.11", - "@budibase/string-templates": "^2.1.11", - "@budibase/types": "^2.1.11", + "@budibase/string-templates": "^2.1.12", + "@budibase/types": "^2.1.12", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 18d5272ad24fa44af0b2579baba7a1a63fbd0893 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 3 Nov 2022 14:07:34 +0000 Subject: [PATCH 07/10] Update pro version to 2.1.12 --- 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 a41ea61f39..b9d817da1b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.12", "@budibase/client": "^2.1.12", - "@budibase/pro": "2.1.11", + "@budibase/pro": "2.1.12", "@budibase/string-templates": "^2.1.12", "@budibase/types": "^2.1.12", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index faf80e44a6..2ffc95cfec 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@2.1.11": - version "2.1.11" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.11.tgz#fa7554cacbaceac84a9ded293fe516f1305d040d" - integrity sha512-FDJtsm6ao4NGpDipxRHnRXw46T0suKeUqlgUXDGo9evzo6IxsXnzrDEskxzdDPCxPvH8u8xvAQWnRpneS0FOWA== +"@budibase/backend-core@2.1.12": + version "2.1.12" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.12.tgz#bdc2553480d1ece8d1d5407256e2fbe6d4e1ce2b" + integrity sha512-RcV/XdGMGFzdw8kSaNwEks9E1dZp0P05X0liJ7KhGnLsJICraTiHyNPajEqKEkUw+aUl8zCXIiypxJ9+RVBkXA== dependencies: - "@budibase/types" "^2.1.11" + "@budibase/types" "^2.1.12" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.11": - version "2.1.11" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.11.tgz#9f4f0615a42e9c829c4357fd3e3db7009c888516" - integrity sha512-FLI6g8uMzr2mAmlVzvdG80j/FVNYtvaSof8WQgmkckogmrFTucswnuYp3bTcA9ttX8T1EQX3+s+4mgX5+AN7sw== +"@budibase/pro@2.1.12": + version "2.1.12" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.12.tgz#0f77fbfb825b62324cb47461d4adb5c67c33072c" + integrity sha512-3VSnxWqPHe06RXdwDN7hI4NCpxu3WIO6bMU19X67v2p+5j88tUMiYpwVYpe4gbbKxJL7SE16tLKiL2KQKJ9kzA== dependencies: - "@budibase/backend-core" "2.1.11" - "@budibase/types" "2.1.11" + "@budibase/backend-core" "2.1.12" + "@budibase/types" "2.1.12" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.11", "@budibase/types@^2.1.11": - version "2.1.11" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.11.tgz#0ff84abdc10322c8d615a1e453b3f2bbff008ae2" - integrity sha512-xFWFWzSdepjbhxY20MRQuu7nF9Qja7u8soKwzDKGZWf1A/TcZvTqzT3bovOV86FuAiRqZQle57gKYsWqGE+Wog== +"@budibase/types@2.1.12", "@budibase/types@^2.1.12": + version "2.1.12" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.12.tgz#07af59b0eae99fe5e831456a16106ba127de635f" + integrity sha512-RL1Qb+x1MDICXDBRkQUdB5MAt02lTJ5O8WNOCXsDHuVkNfxXuxzzh9oQVq4i86OEH6Km/kfGN1QZ4nPApF5/TQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 54d7956da9..0949a637f5 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.12", - "@budibase/pro": "2.1.11", + "@budibase/pro": "2.1.12", "@budibase/string-templates": "^2.1.12", "@budibase/types": "^2.1.12", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 9324db5d24..66834face5 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@2.1.11": - version "2.1.11" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.11.tgz#fa7554cacbaceac84a9ded293fe516f1305d040d" - integrity sha512-FDJtsm6ao4NGpDipxRHnRXw46T0suKeUqlgUXDGo9evzo6IxsXnzrDEskxzdDPCxPvH8u8xvAQWnRpneS0FOWA== +"@budibase/backend-core@2.1.12": + version "2.1.12" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.12.tgz#bdc2553480d1ece8d1d5407256e2fbe6d4e1ce2b" + integrity sha512-RcV/XdGMGFzdw8kSaNwEks9E1dZp0P05X0liJ7KhGnLsJICraTiHyNPajEqKEkUw+aUl8zCXIiypxJ9+RVBkXA== dependencies: - "@budibase/types" "^2.1.11" + "@budibase/types" "^2.1.12" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.11": - version "2.1.11" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.11.tgz#9f4f0615a42e9c829c4357fd3e3db7009c888516" - integrity sha512-FLI6g8uMzr2mAmlVzvdG80j/FVNYtvaSof8WQgmkckogmrFTucswnuYp3bTcA9ttX8T1EQX3+s+4mgX5+AN7sw== +"@budibase/pro@2.1.12": + version "2.1.12" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.12.tgz#0f77fbfb825b62324cb47461d4adb5c67c33072c" + integrity sha512-3VSnxWqPHe06RXdwDN7hI4NCpxu3WIO6bMU19X67v2p+5j88tUMiYpwVYpe4gbbKxJL7SE16tLKiL2KQKJ9kzA== dependencies: - "@budibase/backend-core" "2.1.11" - "@budibase/types" "2.1.11" + "@budibase/backend-core" "2.1.12" + "@budibase/types" "2.1.12" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.11", "@budibase/types@^2.1.11": - version "2.1.11" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.11.tgz#0ff84abdc10322c8d615a1e453b3f2bbff008ae2" - integrity sha512-xFWFWzSdepjbhxY20MRQuu7nF9Qja7u8soKwzDKGZWf1A/TcZvTqzT3bovOV86FuAiRqZQle57gKYsWqGE+Wog== +"@budibase/types@2.1.12", "@budibase/types@^2.1.12": + version "2.1.12" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.12.tgz#07af59b0eae99fe5e831456a16106ba127de635f" + integrity sha512-RL1Qb+x1MDICXDBRkQUdB5MAt02lTJ5O8WNOCXsDHuVkNfxXuxzzh9oQVq4i86OEH6Km/kfGN1QZ4nPApF5/TQ== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From e92d8c6b90439a7cc035bc4ebb466a13e3bd1dee Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 3 Nov 2022 14:27:47 +0000 Subject: [PATCH 08/10] Temporarily disable screen component validation --- packages/builder/src/builderStore/store/frontend.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index fc8b1b8427..1291f81294 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -245,7 +245,10 @@ export const getFrontendStore = () => { } }, save: async screen => { - store.actions.screens.validate(screen) + /* + Temporarily disabled to accomodate migration issues. + store.actions.screens.validate(screen) + */ const state = get(store) const creatingNewScreen = screen._id === undefined const savedScreen = await API.saveScreen(screen) From aae4e87f3615d439ca6521261cb936c63bdbec81 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 3 Nov 2022 14:55:54 +0000 Subject: [PATCH 09/10] v2.1.13 --- 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/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 815d37888a..c1993aa774 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.12", + "version": "2.1.13", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index eb0960faad..29eaa2aeaf 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.12", + "version": "2.1.13", "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": "^2.1.12", + "@budibase/types": "^2.1.13", "@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 47eb147b39..025f71911d 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.1.12", + "version": "2.1.13", "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": "^2.1.12", + "@budibase/string-templates": "^2.1.13", "@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 5376091e2e..267a130f08 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.12", + "version": "2.1.13", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.12", - "@budibase/client": "^2.1.12", - "@budibase/frontend-core": "^2.1.12", - "@budibase/string-templates": "^2.1.12", + "@budibase/bbui": "^2.1.13", + "@budibase/client": "^2.1.13", + "@budibase/frontend-core": "^2.1.13", + "@budibase/string-templates": "^2.1.13", "@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 8797c8878f..cd932beb05 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.12", + "version": "2.1.13", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.12", - "@budibase/string-templates": "^2.1.12", - "@budibase/types": "^2.1.12", + "@budibase/backend-core": "^2.1.13", + "@budibase/string-templates": "^2.1.13", + "@budibase/types": "^2.1.13", "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 02cd5d4e81..aad893a625 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.12", + "version": "2.1.13", "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": "^2.1.12", - "@budibase/frontend-core": "^2.1.12", - "@budibase/string-templates": "^2.1.12", + "@budibase/bbui": "^2.1.13", + "@budibase/frontend-core": "^2.1.13", + "@budibase/string-templates": "^2.1.13", "@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 51e77e4a51..913da674bd 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.12", + "version": "2.1.13", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.1.12", + "@budibase/bbui": "^2.1.13", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 525f847fac..afee578675 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.12", + "version": "2.1.13", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index b9d817da1b..8625784420 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.12", + "version": "2.1.13", "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": "^2.1.12", - "@budibase/client": "^2.1.12", + "@budibase/backend-core": "^2.1.13", + "@budibase/client": "^2.1.13", "@budibase/pro": "2.1.12", - "@budibase/string-templates": "^2.1.12", - "@budibase/types": "^2.1.12", + "@budibase/string-templates": "^2.1.13", + "@budibase/types": "^2.1.13", "@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 b60ae3ca81..db0930541a 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.12", + "version": "2.1.13", "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 8b10bcfd8c..0015a9fb3d 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.12", + "version": "2.1.13", "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 0949a637f5..0aaff3422b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.12", + "version": "2.1.13", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.1.12", + "@budibase/backend-core": "^2.1.13", "@budibase/pro": "2.1.12", - "@budibase/string-templates": "^2.1.12", - "@budibase/types": "^2.1.12", + "@budibase/string-templates": "^2.1.13", + "@budibase/types": "^2.1.13", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 21bf12a21cad621260bb01cd4900588524f1fa07 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 3 Nov 2022 14:59:20 +0000 Subject: [PATCH 10/10] Update pro version to 2.1.13 --- 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 8625784420..3b403afd62 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.13", "@budibase/client": "^2.1.13", - "@budibase/pro": "2.1.12", + "@budibase/pro": "2.1.13", "@budibase/string-templates": "^2.1.13", "@budibase/types": "^2.1.13", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 2ffc95cfec..ea3db6c79c 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@2.1.12": - version "2.1.12" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.12.tgz#bdc2553480d1ece8d1d5407256e2fbe6d4e1ce2b" - integrity sha512-RcV/XdGMGFzdw8kSaNwEks9E1dZp0P05X0liJ7KhGnLsJICraTiHyNPajEqKEkUw+aUl8zCXIiypxJ9+RVBkXA== +"@budibase/backend-core@2.1.13": + version "2.1.13" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.13.tgz#d0c4b126c87aa7e48864821bd40ba6523cfcca1f" + integrity sha512-6dxl1tdndO+Zj3uacTY33cXbfve90q5AvOjyZihkkh4e/MEZwLU81BD8Be7rAwaPM94hHu7VvHYkGqs9QnGG9Q== dependencies: - "@budibase/types" "^2.1.12" + "@budibase/types" "^2.1.13" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.12": - version "2.1.12" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.12.tgz#0f77fbfb825b62324cb47461d4adb5c67c33072c" - integrity sha512-3VSnxWqPHe06RXdwDN7hI4NCpxu3WIO6bMU19X67v2p+5j88tUMiYpwVYpe4gbbKxJL7SE16tLKiL2KQKJ9kzA== +"@budibase/pro@2.1.13": + version "2.1.13" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.13.tgz#c1f6264493652fa7372a97d0c034104ccec25f23" + integrity sha512-/1Niv6ywTG3W6zC6cWFqvb5Mup8UR7YKqVCMVzFaQwV2eR+QBSlsTZKHneFpJuFFA/tlQsOpnVYKvpVZCYbViA== dependencies: - "@budibase/backend-core" "2.1.12" - "@budibase/types" "2.1.12" + "@budibase/backend-core" "2.1.13" + "@budibase/types" "2.1.13" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.12", "@budibase/types@^2.1.12": - version "2.1.12" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.12.tgz#07af59b0eae99fe5e831456a16106ba127de635f" - integrity sha512-RL1Qb+x1MDICXDBRkQUdB5MAt02lTJ5O8WNOCXsDHuVkNfxXuxzzh9oQVq4i86OEH6Km/kfGN1QZ4nPApF5/TQ== +"@budibase/types@2.1.13", "@budibase/types@^2.1.13": + version "2.1.13" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.13.tgz#d65adfe0e9fb645701be63bc9b728d5e2b7bb726" + integrity sha512-kBUoUxPaVh7YW+0OS5pJ56Rar35n6uct1sEsA14uXErOQ33VssHJjIiYZL1DnlE+4PT5xpmW8fAUQiTz4PYBnw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 0aaff3422b..03dfdfb233 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.13", - "@budibase/pro": "2.1.12", + "@budibase/pro": "2.1.13", "@budibase/string-templates": "^2.1.13", "@budibase/types": "^2.1.13", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 66834face5..221eb9050a 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@2.1.12": - version "2.1.12" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.12.tgz#bdc2553480d1ece8d1d5407256e2fbe6d4e1ce2b" - integrity sha512-RcV/XdGMGFzdw8kSaNwEks9E1dZp0P05X0liJ7KhGnLsJICraTiHyNPajEqKEkUw+aUl8zCXIiypxJ9+RVBkXA== +"@budibase/backend-core@2.1.13": + version "2.1.13" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.13.tgz#d0c4b126c87aa7e48864821bd40ba6523cfcca1f" + integrity sha512-6dxl1tdndO+Zj3uacTY33cXbfve90q5AvOjyZihkkh4e/MEZwLU81BD8Be7rAwaPM94hHu7VvHYkGqs9QnGG9Q== dependencies: - "@budibase/types" "^2.1.12" + "@budibase/types" "^2.1.13" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.12": - version "2.1.12" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.12.tgz#0f77fbfb825b62324cb47461d4adb5c67c33072c" - integrity sha512-3VSnxWqPHe06RXdwDN7hI4NCpxu3WIO6bMU19X67v2p+5j88tUMiYpwVYpe4gbbKxJL7SE16tLKiL2KQKJ9kzA== +"@budibase/pro@2.1.13": + version "2.1.13" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.13.tgz#c1f6264493652fa7372a97d0c034104ccec25f23" + integrity sha512-/1Niv6ywTG3W6zC6cWFqvb5Mup8UR7YKqVCMVzFaQwV2eR+QBSlsTZKHneFpJuFFA/tlQsOpnVYKvpVZCYbViA== dependencies: - "@budibase/backend-core" "2.1.12" - "@budibase/types" "2.1.12" + "@budibase/backend-core" "2.1.13" + "@budibase/types" "2.1.13" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.12", "@budibase/types@^2.1.12": - version "2.1.12" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.12.tgz#07af59b0eae99fe5e831456a16106ba127de635f" - integrity sha512-RL1Qb+x1MDICXDBRkQUdB5MAt02lTJ5O8WNOCXsDHuVkNfxXuxzzh9oQVq4i86OEH6Km/kfGN1QZ4nPApF5/TQ== +"@budibase/types@2.1.13", "@budibase/types@^2.1.13": + version "2.1.13" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.13.tgz#d65adfe0e9fb645701be63bc9b728d5e2b7bb726" + integrity sha512-kBUoUxPaVh7YW+0OS5pJ56Rar35n6uct1sEsA14uXErOQ33VssHJjIiYZL1DnlE+4PT5xpmW8fAUQiTz4PYBnw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0"