From 530c8ce8d77159e1663590362964cd66f199033e Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 10 May 2023 13:43:51 +0000 Subject: [PATCH 1/5] v2.6.9 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 202e1c6f49..bb1246fb5e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.8", + "version": "2.6.9", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 03dae9feca..2ed8f8914c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.8", + "version": "2.6.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.6.8", + "@budibase/types": "^2.6.9", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index f0fe559705..96e7bc9dc8 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.6.8", + "version": "2.6.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.6.8", - "@budibase/string-templates": "^2.6.8", + "@budibase/shared-core": "^2.6.9", + "@budibase/string-templates": "^2.6.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 1b69c7aaac..7ac642f560 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.8", + "version": "2.6.9", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.8", - "@budibase/frontend-core": "^2.6.8", - "@budibase/shared-core": "^2.6.8", - "@budibase/string-templates": "^2.6.8", + "@budibase/bbui": "^2.6.9", + "@budibase/frontend-core": "^2.6.9", + "@budibase/shared-core": "^2.6.9", + "@budibase/string-templates": "^2.6.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/cli/package.json b/packages/cli/package.json index a28c66fe65..4a964821de 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.8", + "version": "2.6.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.6.8", - "@budibase/string-templates": "^2.6.8", - "@budibase/types": "^2.6.8", + "@budibase/backend-core": "^2.6.9", + "@budibase/string-templates": "^2.6.9", + "@budibase/types": "^2.6.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 46f365de5d..9bc4194095 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.8", + "version": "2.6.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.6.8", - "@budibase/frontend-core": "^2.6.8", - "@budibase/shared-core": "^2.6.8", - "@budibase/string-templates": "^2.6.8", - "@budibase/types": "^2.6.8", + "@budibase/bbui": "^2.6.9", + "@budibase/frontend-core": "^2.6.9", + "@budibase/shared-core": "^2.6.9", + "@budibase/string-templates": "^2.6.9", + "@budibase/types": "^2.6.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 e701687d10..c322f0a84d 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.8", + "version": "2.6.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.6.8", - "@budibase/shared-core": "^2.6.8", + "@budibase/bbui": "^2.6.9", + "@budibase/shared-core": "^2.6.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 5b528a145a..3e96f57328 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.8", + "version": "2.6.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 7be437535e..352feb6ac8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.8", + "version": "2.6.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.6.8", - "@budibase/client": "^2.6.8", + "@budibase/backend-core": "^2.6.9", + "@budibase/client": "^2.6.9", "@budibase/pro": "2.6.8", - "@budibase/shared-core": "^2.6.8", - "@budibase/string-templates": "^2.6.8", - "@budibase/types": "^2.6.8", + "@budibase/shared-core": "^2.6.9", + "@budibase/string-templates": "^2.6.9", + "@budibase/types": "^2.6.9", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 68d9824126..f659aaea9d 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.8", + "version": "2.6.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.6.8" + "@budibase/types": "^2.6.9" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 105cb98472..c97b5f8fe3 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.8", + "version": "2.6.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 1e8e46c44d..034f6562c7 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.8", + "version": "2.6.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 ebbe5d62bd..1a12ceb889 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.8", + "version": "2.6.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.6.8", + "@budibase/backend-core": "^2.6.9", "@budibase/pro": "2.6.8", - "@budibase/string-templates": "^2.6.8", - "@budibase/types": "^2.6.8", + "@budibase/string-templates": "^2.6.9", + "@budibase/types": "^2.6.9", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 70705a8519d490b1b613dd2a36fc2e824b29055c Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 10 May 2023 13:45:43 +0000 Subject: [PATCH 2/5] Update pro version to 2.6.9 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 352feb6ac8..ca8d00311b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.6.9", "@budibase/client": "^2.6.9", - "@budibase/pro": "2.6.8", + "@budibase/pro": "2.6.9", "@budibase/shared-core": "^2.6.9", "@budibase/string-templates": "^2.6.9", "@budibase/types": "^2.6.9", diff --git a/packages/worker/package.json b/packages/worker/package.json index 1a12ceb889..86804e5326 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.9", - "@budibase/pro": "2.6.8", + "@budibase/pro": "2.6.9", "@budibase/string-templates": "^2.6.9", "@budibase/types": "^2.6.9", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 4b2bab4ec2..3792431ed0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.6.7": - version "2.6.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.7.tgz#884b33f3a3e3f2e548fd7519d32b40dc98803400" - integrity sha512-f7g+0So7hr7tHHEF28cz550imYpq/CqRNzhMQpUwmzgbdTlOdVej3PWPNK9+MuBlNea3J9b2WQsjS9TkGZfTlA== +"@budibase/pro@2.6.8": + version "2.6.8" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.8.tgz#739938cdee6afa138383708401d20eadd3a15555" + integrity sha512-nYpD+B9wGLonzOzeOs1Ym9PLgPsQrzui56TmkPPBJpFOAfCo8GLb8fwqDHGuZiEo5e+M96BgcJTAfpOzFQ7wgw== dependencies: - "@budibase/backend-core" "2.6.7" + "@budibase/backend-core" "2.6.8" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.6.7" + "@budibase/types" "2.6.8" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From f7fbce344461145d795302343320dd670d281b0c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 11 May 2023 17:11:13 +0100 Subject: [PATCH 3/5] Fix multiple issues with first app onboarding --- .../portal/apps/onboarding/index.svelte | 147 ++++++++++-------- 1 file changed, 83 insertions(+), 64 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte index 8e018ae907..546f5f57ba 100644 --- a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte @@ -107,8 +107,9 @@ useSampleData, isGoogle, }) => { + let app try { - const app = await createApp(useSampleData) + app = await createApp(useSampleData) let datasource if (datasourceConfig) { @@ -134,6 +135,17 @@ console.log(e) creationLoading = false notifications.error("There was a problem creating your app") + + // Reset the store so that we don't send up stale headers + store.actions.reset() + + // If we successfully created an app, delete it again so that we + // can try again once the error has been corrected. + // This also ensures onboarding can't be skipped by entering invalid + // data credentials. + if (app?.appId) { + await API.deleteApp(app.appId) + } } } @@ -146,80 +158,87 @@ /> - - {#if stage === "name"} - (stage = "data")} /> - {:else if googleComplete} -
- Please login to your Google account in the new tab which as opened to - continue. -
- {:else if integrationsLoading || creationLoading} -
- -
- {:else if stage === "data"} - (stage = "name")}> -
- handleCreateApp({ useSampleData: true })}> -
-
- -
- Budibase Sample data -
- +
+ + {#if stage === "name"} + (stage = "data")} /> + {:else if googleComplete} +
+ Please login to your Google account in the new tab which as opened to + continue.
-
- -
-
- -
- Upload data (CSV or JSON) -
- + {:else if integrationsLoading || creationLoading} +
+
- {#each Object.entries(plusIntegrations) as [integrationType, schema]} + {:else if stage === "data"} + (stage = "name")}>
- (stage = integrationType)}> + handleCreateApp({ useSampleData: true })} + >
- +
- {schema.friendlyName} + Budibase Sample data
- {/each} - - {:else if stage in plusIntegrations} - (stage = "data")} - onNext={data => { - const isGoogle = data.isGoogle - delete data.isGoogle - return handleCreateApp({ datasourceConfig: data, isGoogle }) - }} - /> - {:else} -

There was an problem. Please refresh the page and try again.

- {/if} -
- -
- +
+ +
+
+ +
+ Upload data (CSV or JSON) +
+ +
+ {#each Object.entries(plusIntegrations) as [integrationType, schema]} +
+ (stage = integrationType)}> +
+
+ +
+ {schema.friendlyName} +
+ +
+ {/each} + + {:else if stage in plusIntegrations} + (stage = "data")} + onNext={data => { + const isGoogle = data.isGoogle + delete data.isGoogle + return handleCreateApp({ datasourceConfig: data, isGoogle }) + }} + /> + {:else} +

There was an problem. Please refresh the page and try again.

+ {/if} +
+ +
+ +