From 41a9bf8e8214c02a3174d7e596126bc36e1db8af Mon Sep 17 00:00:00 2001 From: FlaminWrap Date: Sat, 5 Nov 2022 00:05:15 +0000 Subject: [PATCH 1/2] Commit for enhancement #7138 *Added automation steps *Added steps for testing panel *Changed a testing panel error message as it didn't seem accurate --- .../AutomationBuilder/FlowChart/FlowChart.svelte | 2 +- .../automation/AutomationBuilder/FlowChart/FlowItem.svelte | 3 ++- .../AutomationBuilder/FlowChart/FlowItemHeader.svelte | 7 ++++++- .../AutomationBuilder/FlowChart/TestDataModal.svelte | 2 +- .../automation/AutomationBuilder/TestDisplay.svelte | 1 + 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte index 05cae46cfc..4b01616b54 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte @@ -84,7 +84,7 @@ out:fly|local={{ x: 500, duration: 500 }} > {#if block.stepId !== ActionStepID.LOOP} - + {/if} {/each} diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte index dd8fa7df46..2d0a86d95c 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte @@ -22,6 +22,7 @@ export let block export let testDataModal + export let idx let selected let webhookModal let actionModal @@ -208,7 +209,7 @@ {/if} {/if} - + {#if !blockComplete}
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte index 4e2185c792..2f8dbce67e 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte @@ -9,6 +9,7 @@ export let showParameters = {} export let testResult export let isTrigger + export let idx $: { if (!testResult) { @@ -71,12 +72,16 @@ {/if}
+ {#if idx === 0} + Trigger + {:else} + Step {idx} + {/if} {#if isTrigger} When this happens: {:else} Do this: {/if} - {block?.name?.toUpperCase() || ""}
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte index 9bbca16802..3beb6cd79b 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte @@ -57,7 +57,7 @@ ) $automationStore.showTestPanel = true } catch (error) { - notifications.error("Error testing notification") + notifications.error("Error testing automation") } } diff --git a/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte b/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte index 3f01dbeebd..bd46c70df5 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte @@ -52,6 +52,7 @@ bind:showParameters {block} isTrigger={idx === 0} + {idx} testResult={filteredResults?.[idx]} /> {#if showParameters && showParameters[block.id]} From fe135fc6d7af76416e2bce6c1d3003c94e0495d8 Mon Sep 17 00:00:00 2001 From: FlaminWrap Date: Sat, 5 Nov 2022 00:20:38 +0000 Subject: [PATCH 2/2] Afterthought Remembered that idx === 0 is the same as isTrigger --- .../AutomationBuilder/FlowChart/FlowItemHeader.svelte | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte index 2f8dbce67e..bc40b7bf85 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte @@ -72,14 +72,11 @@ {/if}
- {#if idx === 0} - Trigger - {:else} - Step {idx} - {/if} {#if isTrigger} + Trigger When this happens: {:else} + Step {idx} Do this: {/if} {block?.name?.toUpperCase() || ""}