diff --git a/lerna.json b/lerna.json index d19745b11c..2582e41098 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.8", + "version": "1.0.9-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index aa41d93782..489543a544 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.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 826c833602..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.8", + "version": "1.0.9-alpha.1", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", 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/package.json b/packages/builder/package.json index 8bef61384f..5f473e086f 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.1", "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.1", + "@budibase/client": "^1.0.9-alpha.1", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^1.0.8", + "@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/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) { diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index acda9b89e0..d648b3f989 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -244,7 +244,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/string-templates/package.json b/packages/string-templates/package.json index 53d94f91e7..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.8", + "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 34986cef6a..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.8", + "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.8", - "@budibase/string-templates": "^1.0.8", + "@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",