From ecacc72cdc62ccef53c24cc5f9b9a8449afd5cc4 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Mon, 25 Apr 2022 16:25:42 +0100 Subject: [PATCH 1/3] Update Commands.js Updating addDatasourceConfig Small change for getting the HOST_IP value --- packages/builder/cypress/support/commands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js index e4a7f44bac..de2b989d86 100644 --- a/packages/builder/cypress/support/commands.js +++ b/packages/builder/cypress/support/commands.js @@ -495,7 +495,7 @@ Cypress.Commands.add("addDatasourceConfig", (datasource, skipFetch) => { } else { cy.get("input") .clear({ force: true }) - .type(Cypress.env("mysql").HOST, { force: true }) + .type(Cypress.env("HOST_IP"), { force: true }) } }) }) From 61dbcb780a50a74a848cdb0e89a21d0b6229c7e6 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Tue, 26 Apr 2022 15:56:11 +0100 Subject: [PATCH 2/3] Updated commands.js createScreen command now uses a specific data-cy id also added 1 second wait within selectExternalDatasource - assists with timing for smoke build --- packages/builder/cypress/support/commands.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js index de2b989d86..6c2cac5b31 100644 --- a/packages/builder/cypress/support/commands.js +++ b/packages/builder/cypress/support/commands.js @@ -292,7 +292,7 @@ Cypress.Commands.add("createScreen", (route, accessLevelLabel) => { cy.contains("Design").click() cy.get("[aria-label=AddCircle]").click() cy.get(".spectrum-Modal").within(() => { - cy.get(".item").contains("Blank screen").click() + cy.get("[data-cy='blank-screen']").click() cy.get(".spectrum-Button").contains("Continue").click({ force: true }) cy.wait(500) }) @@ -473,6 +473,7 @@ Cypress.Commands.add("selectExternalDatasource", datasourceName => { cy.get(".add-button").click() }) // Clicks specified datasource & continue + cy.wait(1000) cy.get(".item-list").contains(datasourceName).click() cy.get(".spectrum-Dialog-grid").within(() => { cy.get(".spectrum-Button").contains("Continue").click({ force: true }) From ca260b68cc32135d03a3cc994d456bf5df95e414 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 26 Apr 2022 15:29:35 +0000 Subject: [PATCH 3/3] v1.0.105-alpha.44 --- 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 846d8ecbc7..fdb28f4cb8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.105-alpha.43", + "version": "1.0.105-alpha.44", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 5c71fc1f7b..c4409104aa 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.105-alpha.43", + "version": "1.0.105-alpha.44", "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 bdd7635679..b988b43a3a 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.105-alpha.43", + "version": "1.0.105-alpha.44", "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.105-alpha.43", + "@budibase/string-templates": "^1.0.105-alpha.44", "@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 87128a7e4d..bd8c5ae1e1 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.105-alpha.43", + "version": "1.0.105-alpha.44", "license": "GPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.105-alpha.43", - "@budibase/client": "^1.0.105-alpha.43", - "@budibase/frontend-core": "^1.0.105-alpha.43", - "@budibase/string-templates": "^1.0.105-alpha.43", + "@budibase/bbui": "^1.0.105-alpha.44", + "@budibase/client": "^1.0.105-alpha.44", + "@budibase/frontend-core": "^1.0.105-alpha.44", + "@budibase/string-templates": "^1.0.105-alpha.44", "@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 8a87fa6ac2..42e4e44f97 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.105-alpha.43", + "version": "1.0.105-alpha.44", "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 a992222cb5..bf921b5741 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.105-alpha.43", + "version": "1.0.105-alpha.44", "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.105-alpha.43", - "@budibase/frontend-core": "^1.0.105-alpha.43", - "@budibase/string-templates": "^1.0.105-alpha.43", + "@budibase/bbui": "^1.0.105-alpha.44", + "@budibase/frontend-core": "^1.0.105-alpha.44", + "@budibase/string-templates": "^1.0.105-alpha.44", "@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 2fe4603eed..6e272fed17 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.105-alpha.43", + "version": "1.0.105-alpha.44", "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.105-alpha.43", + "@budibase/bbui": "^1.0.105-alpha.44", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index aab93955da..f7477d5906 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.105-alpha.43", + "version": "1.0.105-alpha.44", "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.105-alpha.43", - "@budibase/client": "^1.0.105-alpha.43", + "@budibase/backend-core": "^1.0.105-alpha.44", + "@budibase/client": "^1.0.105-alpha.44", "@budibase/pro": "1.0.105-alpha.43", - "@budibase/string-templates": "^1.0.105-alpha.43", + "@budibase/string-templates": "^1.0.105-alpha.44", "@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 e16f6b8bfb..67519273dd 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.105-alpha.43", + "version": "1.0.105-alpha.44", "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 8f5aeff33a..afe8c614c9 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.105-alpha.43", + "version": "1.0.105-alpha.44", "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.105-alpha.43", + "@budibase/backend-core": "^1.0.105-alpha.44", "@budibase/pro": "1.0.105-alpha.43", - "@budibase/string-templates": "^1.0.105-alpha.43", + "@budibase/string-templates": "^1.0.105-alpha.44", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0",