This commit is contained in:
Peter Clement 2022-05-04 11:55:26 +01:00
parent af9b9b6921
commit 45fd19583c
3 changed files with 42 additions and 14 deletions

View File

@ -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)}

View File

@ -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
}

View File

@ -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