From d9f2bd2caabf3c7e4816be7f157851e6deb34a43 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 15 Sep 2021 16:55:17 +0100
Subject: [PATCH 1/2] update reactivity of test data modal

---
 .../integration/createAutomation.spec.js      | 59 +++++++++++--------
 .../FlowChart/TestDataModal.svelte            |  5 +-
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/packages/builder/cypress/integration/createAutomation.spec.js b/packages/builder/cypress/integration/createAutomation.spec.js
index e5040c3c45..0620a15e25 100644
--- a/packages/builder/cypress/integration/createAutomation.spec.js
+++ b/packages/builder/cypress/integration/createAutomation.spec.js
@@ -7,26 +7,42 @@ context("Create a automation", () => {
   // https://on.cypress.io/interacting-with-elements
   it("should create a automation", () => {
     cy.createTestTableWithData()
-
+    cy.wait(2000)
     cy.contains("Automate").click()
     cy.get("[data-cy='new-screen'] > .spectrum-Icon").click()
-    cy.get(".spectrum-Dialog-grid").within(() => {
+    cy.get(".modal-inner-wrapper").within(() => {
       cy.get("input").type("Add Row")
+      cy.contains("Row Created").click()
+      cy.wait(500)
       cy.get(".spectrum-Button--cta").click()
     })
 
-    // Add trigger
-    cy.contains("Trigger").click()
-    cy.contains("Row Created").click()
-    cy.get(".setup").within(() => {
-      cy.get(".spectrum-Picker-label").click()
-      cy.contains("dog").click()
-    })
+    // Setup trigger
+    cy.contains("Setup").click()
+    cy.get(".spectrum-Picker-label").click()
+    cy.wait(500)
+    cy.contains("dog").click()
 
     // Create action
-    cy.contains("Internal").click()
-    cy.contains("Create Row").click()
-    cy.get(".setup").within(() => {
+    cy.contains("Add Action").click()
+    cy.get(".modal-inner-wrapper").within(() => {
+      cy.wait(1000)
+      cy.contains("Create Row").trigger('mouseover').click().click()
+      cy.get(".spectrum-Button--cta").click()
+    })
+    cy.contains("Setup").click()
+    cy.get(".spectrum-Picker-label").click()
+    cy.contains("dog").click()
+    cy.get(".spectrum-Textfield-input")
+    .first()
+    .type("goodboy")
+    cy.get(".spectrum-Textfield-input")
+      .eq(1)
+      .type("11")
+
+    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.get(".spectrum-Textfield-input")
@@ -35,19 +51,12 @@ context("Create a automation", () => {
       cy.get(".spectrum-Textfield-input")
         .eq(1)
         .type("11")
+      cy.get(".spectrum-Textfield-input")
+        .eq(2)
+        .type("123456")
+      cy.get(".spectrum-Textfield-input")
+        .eq(3)
+        .type("123456")
     })
-
-    // Save
-    cy.contains("Save Automation").click()
-
-    // Activate Automation
-    cy.get("[data-cy=activate-automation]").click()
-  })
-
-  it("should add row when a new row is added", () => {
-    cy.contains("Data").click()
-    cy.addRow(["Rover", 15])
-    cy.reload()
-    cy.contains("goodboy").should("have.text", "goodboy")
   })
 })
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
index 3031246a70..14ed1ef378 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@@ -18,13 +18,12 @@
   // get the outputs so we can define the fields
 
   // check to see if there is existing test data in the store
-  $: testData = $automationStore.selectedAutomation.automation.testData
+  let testData = $automationStore.selectedAutomation.automation.testData
 
-  // Checj the schema to see if required fields have been entered
+  // Check the schema to see if required fields have been entered
   $: isError = !trigger.schema.outputs.required.every(
     required => testData[required]
   )
-
   function parseTestJSON(e) {
     try {
       const obj = JSON.parse(e.detail)

From 1dfb69db7e677f2c9b863f001bf6c3cfa4ee6b6d Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 15 Sep 2021 16:59:15 +0100
Subject: [PATCH 2/2] change naming within blocks

---
 .../automation/AutomationBuilder/FlowChart/FlowItem.svelte  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index 3da2788fc9..5898537dae 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -93,7 +93,11 @@
           </svg>
         {/if}
         <div class="iconAlign">
-          <Body size="XS">When this happens:</Body>
+          {#if isTrigger}
+            <Body size="XS">When this happens:</Body>
+          {:else}
+            <Body size="XS">Do this:</Body>
+          {/if}
 
           <Detail size="S">{block?.name?.toUpperCase() || ""}</Detail>
         </div>