From 2a6c775fa0849d00ee578ccb495737c566e8b250 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 27 Apr 2022 14:50:30 +0100 Subject: [PATCH 1/5] Add a default screen to newly created apps not using templates --- .../components/start/CreateAppModal.svelte | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte index e75d7c4d09..0a2d226e55 100644 --- a/packages/builder/src/components/start/CreateAppModal.svelte +++ b/packages/builder/src/components/start/CreateAppModal.svelte @@ -10,6 +10,8 @@ import { createValidationStore } from "helpers/validation/yup" import * as appValidation from "helpers/validation/yup/app" import TemplateCard from "components/common/TemplateCard.svelte" + import createFromScratchScreen from "builderStore/store/screenTemplates/createFromScratchScreen" + import { Roles } from "constants/backend" export let template @@ -81,7 +83,7 @@ } data.append("useTemplate", template != null) if (template) { - data.append("templateName", template.name) + data.append("templateName", template.name) //or here? data.append("templateKey", template.key) data.append("templateFile", $values.file) } @@ -104,6 +106,22 @@ // Create user await API.updateOwnMetadata({ roleId: $values.roleId }) await auth.setInitInfo({}) + + // Create a default home screen if no template was selected + if (template == null) { + let defaultScreenTemplate = createFromScratchScreen.create() + defaultScreenTemplate.routing.route = "/home" + defaultScreenTemplate.routing.roldId = Roles.BASIC + try { + await store.actions.screens.save(defaultScreenTemplate) + } catch (err) { + console.error("Could not create a default application screen", err) + notifications.warn( + "Encountered an issue creating the default screen." + ) + } + } + $goto(`/builder/app/${createdApp.instance._id}`) } catch (error) { creating = false From eb8b086d2cdb6a91ae00c1a64bb4eb12028e57bc Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 10 May 2022 17:18:25 +0100 Subject: [PATCH 2/5] packages/builder/src/components/start/CreateAppModal.svelte --- packages/builder/src/components/start/CreateAppModal.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte index 0a2d226e55..74d2e7675e 100644 --- a/packages/builder/src/components/start/CreateAppModal.svelte +++ b/packages/builder/src/components/start/CreateAppModal.svelte @@ -116,7 +116,7 @@ await store.actions.screens.save(defaultScreenTemplate) } catch (err) { console.error("Could not create a default application screen", err) - notifications.warn( + notifications.warning( "Encountered an issue creating the default screen." ) } From d9524ba3b6b04bb67cd780f40e672bc07f9863c6 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 10 May 2022 22:40:27 +0100 Subject: [PATCH 3/5] Cypress test fixes --- packages/builder/cypress/integration/createScreen.js | 2 +- packages/builder/cypress/integration/revertApp.spec.js | 3 +++ packages/builder/cypress/support/commands.js | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/builder/cypress/integration/createScreen.js b/packages/builder/cypress/integration/createScreen.js index ae10577ff0..94a827f26f 100644 --- a/packages/builder/cypress/integration/createScreen.js +++ b/packages/builder/cypress/integration/createScreen.js @@ -9,7 +9,7 @@ filterTests(["smoke", "all"], () => { }) it("Should successfully create a screen", () => { - cy.createScreen("/test") + cy.createScreen("test") cy.get(".nav-items-container").within(() => { cy.contains("/test").should("exist") }) diff --git a/packages/builder/cypress/integration/revertApp.spec.js b/packages/builder/cypress/integration/revertApp.spec.js index 9d5e4f0f63..01d5a04981 100644 --- a/packages/builder/cypress/integration/revertApp.spec.js +++ b/packages/builder/cypress/integration/revertApp.spec.js @@ -26,6 +26,8 @@ filterTests(['smoke', 'all'], () => { }) it("should revert a published app", () => { + cy.navigateToFrontend() + // Add initial component - Paragraph cy.addComponent("Elements", "Paragraph") // Publish app @@ -37,6 +39,7 @@ filterTests(['smoke', 'all'], () => { cy.get(".spectrum-ButtonGroup").within(() => { cy.get(".spectrum-Button").contains("Done").click({ force: true }) }) + // Add second component - Button cy.addComponent("Elements", "Button") // Click Revert diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js index ce1fe2ec50..9f3b14a413 100644 --- a/packages/builder/cypress/support/commands.js +++ b/packages/builder/cypress/support/commands.js @@ -145,7 +145,6 @@ Cypress.Commands.add("createTestApp", () => { const appName = "Cypress Tests" cy.deleteApp(appName) cy.createApp(appName, "This app is used for Cypress testing.") - cy.createScreen("home") }) Cypress.Commands.add("createTestTableWithData", () => { From 090905a5ca7c6cc685ff18d8111d98693afe8cb8 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 11 May 2022 08:01:11 +0000 Subject: [PATCH 4/5] v1.0.148-alpha.1 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 0b0dae59bb..12a3de8166 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.148-alpha.0", + "version": "1.0.148-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index eda57e22ef..3ef5607e96 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.148-alpha.0", + "version": "1.0.148-alpha.1", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index df3a503b2d..3acf509550 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.0.148-alpha.0", + "version": "1.0.148-alpha.1", "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.0.148-alpha.0", + "@budibase/string-templates": "^1.0.148-alpha.1", "@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 924e0c9db1..f5cb896c7a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.148-alpha.0", + "version": "1.0.148-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.148-alpha.0", - "@budibase/client": "^1.0.148-alpha.0", - "@budibase/frontend-core": "^1.0.148-alpha.0", - "@budibase/string-templates": "^1.0.148-alpha.0", + "@budibase/bbui": "^1.0.148-alpha.1", + "@budibase/client": "^1.0.148-alpha.1", + "@budibase/frontend-core": "^1.0.148-alpha.1", + "@budibase/string-templates": "^1.0.148-alpha.1", "@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 3a9a9db663..408b723621 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.148-alpha.0", + "version": "1.0.148-alpha.1", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 00cc0894da..e1bdc57aa0 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.148-alpha.0", + "version": "1.0.148-alpha.1", "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.0.148-alpha.0", - "@budibase/frontend-core": "^1.0.148-alpha.0", - "@budibase/string-templates": "^1.0.148-alpha.0", + "@budibase/bbui": "^1.0.148-alpha.1", + "@budibase/frontend-core": "^1.0.148-alpha.1", + "@budibase/string-templates": "^1.0.148-alpha.1", "@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 4ee38a0730..0981f010fc 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.148-alpha.0", + "version": "1.0.148-alpha.1", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.148-alpha.0", + "@budibase/bbui": "^1.0.148-alpha.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index dcbd7bfed1..f7f7696b04 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.148-alpha.0", + "version": "1.0.148-alpha.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -68,10 +68,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.148-alpha.0", - "@budibase/client": "^1.0.148-alpha.0", + "@budibase/backend-core": "^1.0.148-alpha.1", + "@budibase/client": "^1.0.148-alpha.1", "@budibase/pro": "1.0.148-alpha.0", - "@budibase/string-templates": "^1.0.148-alpha.0", + "@budibase/string-templates": "^1.0.148-alpha.1", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 6970474c12..30cd8dbba7 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.148-alpha.0", + "version": "1.0.148-alpha.1", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 5cb3f800ee..91a5ca5373 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.148-alpha.0", + "version": "1.0.148-alpha.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -31,9 +31,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.148-alpha.0", + "@budibase/backend-core": "^1.0.148-alpha.1", "@budibase/pro": "1.0.148-alpha.0", - "@budibase/string-templates": "^1.0.148-alpha.0", + "@budibase/string-templates": "^1.0.148-alpha.1", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From ef3d110db681481f5a2b8d142204823e59ab5001 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 11 May 2022 08:02:29 +0000 Subject: [PATCH 5/5] Update pro version to 1.0.148-alpha.1 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index f7f7696b04..addf9d87d6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -70,7 +70,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.148-alpha.1", "@budibase/client": "^1.0.148-alpha.1", - "@budibase/pro": "1.0.148-alpha.0", + "@budibase/pro": "1.0.148-alpha.1", "@budibase/string-templates": "^1.0.148-alpha.1", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 91a5ca5373..066009589e 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -32,7 +32,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.148-alpha.1", - "@budibase/pro": "1.0.148-alpha.0", + "@budibase/pro": "1.0.148-alpha.1", "@budibase/string-templates": "^1.0.148-alpha.1", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7",