From af9b9b692124464a5a7f3e93ba76e93e319a252a Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 4 May 2022 10:24:28 +0100
Subject: [PATCH 1/3] Some foreach block fixes

---
 .../FlowChart/FlowItem.svelte                 | 16 ++++++++---
 packages/server/src/threads/automation.js     | 27 ++++++++++---------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index 0829b85a90..532e0ff068 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -53,6 +53,18 @@
       x => x.blockToLoop === block.id
     )
 
+  async function removeLooping() {
+    loopingSelected = false
+    let loopBlock =
+      $automationStore.selectedAutomation?.automation.definition.steps.find(
+        x => x.blockToLoop === block.id
+      )
+    automationStore.actions.deleteAutomationBlock(loopBlock)
+    await automationStore.actions.save(
+      $automationStore.selectedAutomation?.automation
+    )
+  }
+
   async function deleteStep() {
     let loopBlock =
       $automationStore.selectedAutomation?.automation.definition.steps.find(
@@ -151,9 +163,7 @@
     {#if !showLooping}
       <div class="blockSection">
         <div class="block-options">
-          <div class="delete-padding" on:click={() => deleteStep()}>
-            <Icon name="DeleteOutline" />
-          </div>
+          <ActionButton on:click={() => removeLooping()} icon="DeleteOutline" />
         </div>
         <Layout noPadding gap="S">
           <AutomationBlockSetup
diff --git a/packages/server/src/threads/automation.js b/packages/server/src/threads/automation.js
index a7ce84d614..a95d3fac3c 100644
--- a/packages/server/src/threads/automation.js
+++ b/packages/server/src/threads/automation.js
@@ -107,7 +107,6 @@ class Orchestrator {
     let loopSteps = []
     for (let step of automation.definition.steps) {
       stepCount++
-      let input
       if (step.stepId === LOOP_STEP_ID) {
         loopStep = step
         loopStepNumber = stepCount
@@ -115,17 +114,21 @@ class Orchestrator {
       }
 
       if (loopStep) {
-        input = await processObject(loopStep.inputs, this._context)
+        // lets first of all handle the input
+        if (
+          typeof loopStep.inputs.binding === "string" &&
+          loopStep.inputs.option === "String"
+        ) {
+          loopStep.inputs.binding = loopStep.inputs.binding.split("\n")
+        }
       }
-      let iterations = loopStep ? input.binding.length : 1
+      let iterations = loopStep ? loopStep.inputs.binding.length : 1
       let iterationCount = 0
       for (let index = 0; index < iterations; index++) {
         let originalStepInput = cloneDeep(step.inputs)
 
         // Handle if the user has set a max iteration count or if it reaches the max limit set by us
         if (loopStep) {
-          // lets first of all handle the input
-          // if the input is array then use it, if it is a string then split it on every new line
           let newInput = await processObject(
             loopStep.inputs,
             cloneDeep(this._context)
@@ -134,16 +137,13 @@ class Orchestrator {
             newInput,
             loopStep.schema.inputs
           )
-          this._context.steps[loopStepNumber] = {
-            currentItem: newInput.binding[index],
-          }
 
           let tempOutput = { items: loopSteps, iterations: iterationCount }
           if (
-            (loopStep.inputs.option === "Array" &&
-              !Array.isArray(newInput.binding)) ||
-            (loopStep.inputs.option === "String" &&
-              typeof newInput.binding !== "string")
+            (originalStepInput.option === "Array" &&
+              !Array.isArray(originalStepInput.binding)) ||
+            (originalStepInput.option === "String" &&
+              typeof originalStepInput.binding !== "string")
           ) {
             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
               status: AutomationErrors.INCORRECT_TYPE,
@@ -153,6 +153,9 @@ class Orchestrator {
             loopStep = null
             break
           }
+          this._context.steps[loopStepNumber] = {
+            currentItem: newInput.binding[index],
+          }
 
           // The "Loop" binding in the front end is "fake", so replace it here so the context can understand it
           // Pretty hacky because we need to account for the row object

From 45fd19583c3345771cc2fa60c67d9cc207242f5a Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 4 May 2022 11:55:26 +0100
Subject: [PATCH 2/3] linting

---
 .../SetupPanel/AutomationBlockSetup.svelte    |  8 ++++-
 .../server/src/automations/automationUtils.js | 12 +++++++
 packages/server/src/threads/automation.js     | 36 ++++++++++++-------
 3 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 68afc04886..416a1ecace 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -177,12 +177,18 @@
     onChange({ detail: tempFilters }, defKey)
     drawer.hide()
   }
+  console.log(schemaProperties)
+  console.log(inputData)
 </script>
 
 <div class="fields">
   {#each schemaProperties as [key, value]}
     <div class="block-field">
-      <Label>{value.title || (key === "row" ? "Table" : key)}</Label>
+      <Label
+        tooltip={value.title === "Binding / Value"
+          ? "If using the String input type, please use a comma or newline separated string"
+          : null}>{value.title || (key === "row" ? "Table" : key)}</Label
+      >
       {#if value.type === "string" && value.enum}
         <Select
           on:change={e => onChange(e, key)}
diff --git a/packages/server/src/automations/automationUtils.js b/packages/server/src/automations/automationUtils.js
index 0d858741dd..a3bcae0cee 100644
--- a/packages/server/src/automations/automationUtils.js
+++ b/packages/server/src/automations/automationUtils.js
@@ -86,3 +86,15 @@ exports.substituteLoopStep = (hbsString, substitute) => {
 
   return hbsString
 }
+
+exports.stringSplit = value => {
+  if (value == null) {
+    return []
+  }
+  if (value.split("\n").length > 1) {
+    value = value.split("\n")
+  } else {
+    value = value.split(",")
+  }
+  return value
+}
diff --git a/packages/server/src/threads/automation.js b/packages/server/src/threads/automation.js
index a95d3fac3c..63a3ea8bf3 100644
--- a/packages/server/src/threads/automation.js
+++ b/packages/server/src/threads/automation.js
@@ -107,6 +107,7 @@ class Orchestrator {
     let loopSteps = []
     for (let step of automation.definition.steps) {
       stepCount++
+      let input
       if (step.stepId === LOOP_STEP_ID) {
         loopStep = step
         loopStepNumber = stepCount
@@ -114,15 +115,13 @@ class Orchestrator {
       }
 
       if (loopStep) {
-        // lets first of all handle the input
-        if (
-          typeof loopStep.inputs.binding === "string" &&
-          loopStep.inputs.option === "String"
-        ) {
-          loopStep.inputs.binding = loopStep.inputs.binding.split("\n")
-        }
+        input = await processObject(loopStep.inputs, this._context)
       }
-      let iterations = loopStep ? loopStep.inputs.binding.length : 1
+      let iterations = loopStep
+        ? Array.isArray(input.binding)
+          ? input.binding.length
+          : automationUtils.stringSplit(input.binding).length
+        : 1
       let iterationCount = 0
       for (let index = 0; index < iterations; index++) {
         let originalStepInput = cloneDeep(step.inputs)
@@ -140,10 +139,10 @@ class Orchestrator {
 
           let tempOutput = { items: loopSteps, iterations: iterationCount }
           if (
-            (originalStepInput.option === "Array" &&
-              !Array.isArray(originalStepInput.binding)) ||
-            (originalStepInput.option === "String" &&
-              typeof originalStepInput.binding !== "string")
+            (loopStep.inputs.option === "Array" &&
+              !Array.isArray(newInput.binding)) ||
+            (loopStep.inputs.option === "String" &&
+              typeof newInput.binding !== "string")
           ) {
             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
               status: AutomationErrors.INCORRECT_TYPE,
@@ -153,8 +152,19 @@ class Orchestrator {
             loopStep = null
             break
           }
+
+          let item
+          if (
+            typeof loopStep.inputs.binding === "string" &&
+            loopStep.inputs.option === "String"
+          ) {
+            item = automationUtils.stringSplit(newInput.binding)
+          } else {
+            item = loopStep.inputs.binding
+          }
+
           this._context.steps[loopStepNumber] = {
-            currentItem: newInput.binding[index],
+            currentItem: item[index],
           }
 
           // The "Loop" binding in the front end is "fake", so replace it here so the context can understand it

From 118b9bbd979c3e3ea9f5f2867062128f7cd43a5e Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 4 May 2022 11:56:54 +0100
Subject: [PATCH 3/3] remove log

---
 .../automation/SetupPanel/AutomationBlockSetup.svelte           | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 416a1ecace..1af40694a3 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -177,8 +177,6 @@
     onChange({ detail: tempFilters }, defKey)
     drawer.hide()
   }
-  console.log(schemaProperties)
-  console.log(inputData)
 </script>
 
 <div class="fields">