From 27da6ea4ab766b0f215956a840730812b464e5a2 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 8 Dec 2021 10:14:30 +0000 Subject: [PATCH 1/4] account for integer type from JSON schema --- .../automation/SetupPanel/AutomationBlockSetup.svelte | 2 +- packages/server/src/api/controllers/webhook.js | 4 ++++ packages/server/src/integrations/oracle.ts | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index e7208518d5..6c4f84936b 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -241,7 +241,7 @@ value={inputData[key]} /> - {:else if value.type === "string" || value.type === "number"} + {:else if value.type === "string" || value.type === "number" || value.type === "integer"} {#if isTestModal} { let automation = await db.get(webhook.action.target) const autoOutputs = automation.definition.trigger.schema.outputs let properties = webhook.bodySchema.properties + // reset webhook outputs + autoOutputs.properties = { + body: autoOutputs.properties.body, + } for (let prop of Object.keys(properties)) { autoOutputs.properties[prop] = { type: properties[prop].type, diff --git a/packages/server/src/integrations/oracle.ts b/packages/server/src/integrations/oracle.ts index afaa902655..f602a97591 100644 --- a/packages/server/src/integrations/oracle.ts +++ b/packages/server/src/integrations/oracle.ts @@ -450,7 +450,7 @@ module OracleModule { }) return lastRow.rows } else { - return [{ [ operation.toLowerCase() ]: true }] + return [{ [operation.toLowerCase()]: true }] } } } From cd5d4a5df4d7a5e8401a064437d3e14c32319c1a Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 8 Dec 2021 11:32:28 +0000 Subject: [PATCH 2/4] updating cypress test to cover automation creation --- .../cypress/integration/createAutomation.spec.js | 10 +++++++--- .../AutomationBuilder/FlowChart/TestDataModal.svelte | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/builder/cypress/integration/createAutomation.spec.js b/packages/builder/cypress/integration/createAutomation.spec.js index 6ff013cd7a..efd3c7d023 100644 --- a/packages/builder/cypress/integration/createAutomation.spec.js +++ b/packages/builder/cypress/integration/createAutomation.spec.js @@ -35,19 +35,20 @@ context("Create a automation", () => { cy.contains("dog").click() cy.get(".spectrum-Textfield-input") .first() - .type("goodboy") + .type("{{ trigger.row.name }}", { parseSpecialCharSequences: false }) cy.get(".spectrum-Textfield-input") .eq(1) .type("11") + cy.contains("Finish and test automation").click() - cy.contains("Run test").click() cy.get(".modal-inner-wrapper").within(() => { cy.wait(1000) cy.get(".spectrum-Picker-label").click() cy.contains("dog").click() + cy.wait(1000) cy.get(".spectrum-Textfield-input") .first() - .type("goodboy") + .type("automationGoodboy") cy.get(".spectrum-Textfield-input") .eq(1) .type("11") @@ -57,6 +58,9 @@ context("Create a automation", () => { cy.get(".spectrum-Textfield-input") .eq(3) .type("123456") + cy.contains("Test").click() }) + cy.contains("Data").click() + cy.contains("automationGoodboy") }) }) diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte index 3c75c9963d..e43729edbe 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte @@ -25,7 +25,7 @@ // Check the schema to see if required fields have been entered $: isError = !trigger.schema.outputs.required.every( - required => testData[required] + required => testData[required] || required !== "row" ) function parseTestJSON(e) { From 0aa87c9fc737fcdbecaf16e0bbce13df4165f481 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 8 Dec 2021 14:06:32 +0000 Subject: [PATCH 3/4] v1.0.9-alpha.0 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 6 +++--- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index d19745b11c..dbc85162be 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.8", + "version": "1.0.9-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index aa41d93782..e3339f0245 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "1.0.8", + "version": "1.0.9-alpha.0", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 826c833602..2611c78dc6 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.8", + "version": "1.0.9-alpha.0", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 8bef61384f..4b574d5252 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.8", + "version": "1.0.9-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.8", - "@budibase/client": "^1.0.8", + "@budibase/bbui": "^1.0.9-alpha.0", + "@budibase/client": "^1.0.9-alpha.0", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^1.0.8", + "@budibase/string-templates": "^1.0.9-alpha.0", "@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 ad050235fe..75a7362184 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.8", + "version": "1.0.9-alpha.0", "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 3b831055d0..389b614f0b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.8", + "version": "1.0.9-alpha.0", "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.8", + "@budibase/bbui": "^1.0.9-alpha.0", "@budibase/standard-components": "^0.9.139", - "@budibase/string-templates": "^1.0.8", + "@budibase/string-templates": "^1.0.9-alpha.0", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index df15113e98..3285b07d6e 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.8", + "version": "1.0.9-alpha.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,9 +70,9 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/auth": "^1.0.8", - "@budibase/client": "^1.0.8", - "@budibase/string-templates": "^1.0.8", + "@budibase/auth": "^1.0.9-alpha.0", + "@budibase/client": "^1.0.9-alpha.0", + "@budibase/string-templates": "^1.0.9-alpha.0", "@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 53d94f91e7..1116c949c0 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.8", + "version": "1.0.9-alpha.0", "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 34986cef6a..6552b4f1b5 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.8", + "version": "1.0.9-alpha.0", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -29,8 +29,8 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/auth": "^1.0.8", - "@budibase/string-templates": "^1.0.8", + "@budibase/auth": "^1.0.9-alpha.0", + "@budibase/string-templates": "^1.0.9-alpha.0", "@koa/router": "^8.0.0", "@sentry/node": "^6.0.0", "@techpass/passport-openidconnect": "^0.3.0", From db6714c4f087499c8d2d4402fb7771b392c865d3 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 8 Dec 2021 17:21:37 +0000 Subject: [PATCH 4/4] v1.0.9-alpha.1 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 6 +++--- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index dbc85162be..2582e41098 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.9-alpha.0", + "version": "1.0.9-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index e3339f0245..489543a544 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "1.0.9-alpha.0", + "version": "1.0.9-alpha.1", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 2611c78dc6..b0f36d4aef 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.9-alpha.0", + "version": "1.0.9-alpha.1", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 4b574d5252..5f473e086f 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.9-alpha.0", + "version": "1.0.9-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.9-alpha.0", - "@budibase/client": "^1.0.9-alpha.0", + "@budibase/bbui": "^1.0.9-alpha.1", + "@budibase/client": "^1.0.9-alpha.1", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^1.0.9-alpha.0", + "@budibase/string-templates": "^1.0.9-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 75a7362184..b264d574fd 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.9-alpha.0", + "version": "1.0.9-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 389b614f0b..9d37066647 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.9-alpha.0", + "version": "1.0.9-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.9-alpha.0", + "@budibase/bbui": "^1.0.9-alpha.1", "@budibase/standard-components": "^0.9.139", - "@budibase/string-templates": "^1.0.9-alpha.0", + "@budibase/string-templates": "^1.0.9-alpha.1", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index 3285b07d6e..3cbf8183e4 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.9-alpha.0", + "version": "1.0.9-alpha.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,9 +70,9 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/auth": "^1.0.9-alpha.0", - "@budibase/client": "^1.0.9-alpha.0", - "@budibase/string-templates": "^1.0.9-alpha.0", + "@budibase/auth": "^1.0.9-alpha.1", + "@budibase/client": "^1.0.9-alpha.1", + "@budibase/string-templates": "^1.0.9-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 1116c949c0..36dc24ca22 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.9-alpha.0", + "version": "1.0.9-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 6552b4f1b5..9f0bda3c77 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.9-alpha.0", + "version": "1.0.9-alpha.1", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -29,8 +29,8 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/auth": "^1.0.9-alpha.0", - "@budibase/string-templates": "^1.0.9-alpha.0", + "@budibase/auth": "^1.0.9-alpha.1", + "@budibase/string-templates": "^1.0.9-alpha.1", "@koa/router": "^8.0.0", "@sentry/node": "^6.0.0", "@techpass/passport-openidconnect": "^0.3.0",