From 6c4cf24a9466a402d9714ff600806e42deecaea5 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 17 Sep 2020 17:49:57 +0100 Subject: [PATCH 1/2] Fix filter workflow block tagline --- packages/server/src/workflows/steps/filter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/workflows/steps/filter.js b/packages/server/src/workflows/steps/filter.js index bed79553b5..fd2e57282e 100644 --- a/packages/server/src/workflows/steps/filter.js +++ b/packages/server/src/workflows/steps/filter.js @@ -14,7 +14,7 @@ const PrettyLogicConditions = { module.exports.definition = { name: "Filter", - tagline: "{{inputs.filter}} {{inputs.condition}} {{inputs.value}}", + tagline: "{{inputs.field}} {{inputs.condition}} {{inputs.value}}", icon: "ri-git-branch-line", description: "Filter any workflows which do not meet certain conditions", type: "LOGIC", From 15cc7a2e6c2eac712005f8d31efdce8de67172fe Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 17 Sep 2020 17:50:54 +0100 Subject: [PATCH 2/2] Add component for rendering workflow mustache taglines --- .../userInterface/MustacheStringViewer.svelte | 12 -------- .../WorkflowBuilder/flowchart/FlowItem.svelte | 9 +++--- .../flowchart/WorkflowBlockTagline.svelte | 30 +++++++++++++++++++ 3 files changed, 34 insertions(+), 17 deletions(-) delete mode 100644 packages/builder/src/components/userInterface/MustacheStringViewer.svelte create mode 100644 packages/builder/src/components/workflow/WorkflowBuilder/flowchart/WorkflowBlockTagline.svelte diff --git a/packages/builder/src/components/userInterface/MustacheStringViewer.svelte b/packages/builder/src/components/userInterface/MustacheStringViewer.svelte deleted file mode 100644 index 78f65dda0b..0000000000 --- a/packages/builder/src/components/userInterface/MustacheStringViewer.svelte +++ /dev/null @@ -1,12 +0,0 @@ - - -
- -
- - diff --git a/packages/builder/src/components/workflow/WorkflowBuilder/flowchart/FlowItem.svelte b/packages/builder/src/components/workflow/WorkflowBuilder/flowchart/FlowItem.svelte index 01b0792aea..a67b15cd8a 100644 --- a/packages/builder/src/components/workflow/WorkflowBuilder/flowchart/FlowItem.svelte +++ b/packages/builder/src/components/workflow/WorkflowBuilder/flowchart/FlowItem.svelte @@ -1,6 +1,6 @@
Do this... {:else if block.type === 'LOGIC'} - + Only continue if... {/if}
@@ -50,7 +49,7 @@

- {@html mustache.render(tagline, { inputs })} +

@@ -87,7 +86,7 @@ padding: var(--spacing-s); color: var(--grey-8); border-radius: var(--border-radius-m); - background-color: var(--grey-2); + background-color: rgba(0, 0, 0, 0.05); } header i { font-size: 20px; diff --git a/packages/builder/src/components/workflow/WorkflowBuilder/flowchart/WorkflowBlockTagline.svelte b/packages/builder/src/components/workflow/WorkflowBuilder/flowchart/WorkflowBlockTagline.svelte new file mode 100644 index 0000000000..5603b07fab --- /dev/null +++ b/packages/builder/src/components/workflow/WorkflowBuilder/flowchart/WorkflowBlockTagline.svelte @@ -0,0 +1,30 @@ + + +
+ {@html html} +
+ +