From ef9c5d9e1b3ee0077239df1489953f808be2e03a Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 9 Sep 2020 11:19:20 +0100 Subject: [PATCH 01/43] Remove 1px border causing overflow and scrollbar in workflow page layout --- packages/builder/src/pages/[application]/workflow/_layout.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/builder/src/pages/[application]/workflow/_layout.svelte b/packages/builder/src/pages/[application]/workflow/_layout.svelte index c56d6e4a1a..182abd388e 100644 --- a/packages/builder/src/pages/[application]/workflow/_layout.svelte +++ b/packages/builder/src/pages/[application]/workflow/_layout.svelte @@ -41,7 +41,6 @@ .nav { overflow: auto; width: 300px; - border-right: 1px solid var(--grey-2); background: var(--white); } From 3897852d4cd0a667615d797987a3c3a4a001fec2 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 9 Sep 2020 12:36:19 +0100 Subject: [PATCH 02/43] Improve layout and consistency of workflow block configuration --- .../workflow/SetupPanel/ParamInputs/ModelSelector.svelte | 2 +- .../workflow/SetupPanel/WorkflowBlockSetup.svelte | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte index db10b8f3b0..6041701d52 100644 --- a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte +++ b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte @@ -4,7 +4,7 @@ export let value -
+
+ @@ -57,9 +57,12 @@ } label { - text-transform: capitalize; font-size: 14px; + font-family: sans-serif; font-weight: 500; + color: var(--ink); + margin-bottom: 12px; + text-transform: capitalize; margin-top: 20px; } From 0b056bf46987c84ccfba5520894993069039784d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 9 Sep 2020 12:40:44 +0100 Subject: [PATCH 03/43] Improve workflow block list design and UI consistency --- .../WorkflowPanel/BlockList/BlockList.svelte | 70 ++++--------------- .../BlockList/WorkflowBlock.svelte | 9 +-- .../WorkflowPanel/WorkflowPanel.svelte | 3 +- 3 files changed, 22 insertions(+), 60 deletions(-) diff --git a/packages/builder/src/components/workflow/WorkflowPanel/BlockList/BlockList.svelte b/packages/builder/src/components/workflow/WorkflowPanel/BlockList/BlockList.svelte index 3a071ad00f..3851e1a204 100644 --- a/packages/builder/src/components/workflow/WorkflowPanel/BlockList/BlockList.svelte +++ b/packages/builder/src/components/workflow/WorkflowPanel/BlockList/BlockList.svelte @@ -1,15 +1,23 @@
-
- {#if !$workflowStore.currentWorkflow.hasTrigger()} - (selectedTab = 'TRIGGER')}> - Triggers - - {/if} - (selectedTab = 'ACTION')}> - Actions - - (selectedTab = 'LOGIC')}> - Logic - -
+
{#each definitions as [actionId, blockDefinition]} {/each}
- - diff --git a/packages/builder/src/components/workflow/WorkflowPanel/BlockList/WorkflowBlock.svelte b/packages/builder/src/components/workflow/WorkflowPanel/BlockList/WorkflowBlock.svelte index 1882f91b7a..5ba08648c9 100644 --- a/packages/builder/src/components/workflow/WorkflowPanel/BlockList/WorkflowBlock.svelte +++ b/packages/builder/src/components/workflow/WorkflowPanel/BlockList/WorkflowBlock.svelte @@ -31,11 +31,11 @@ From 3f0fb2f25844b325008e3dfb692d752ba67653e0 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 10 Sep 2020 07:46:01 +0100 Subject: [PATCH 05/43] Make workflow builder scrollable and improve UX around selecting and editing worflow blocks --- .../ParamInputs/RecordSelector.svelte | 2 +- .../SetupPanel/WorkflowBlockSetup.svelte | 77 ++++++++++--------- .../WorkflowBuilder/WorkflowBuilder.svelte | 54 ++++++++----- .../flowchart/FlowChart.svelte | 7 +- .../WorkflowBuilder/flowchart/FlowItem.svelte | 23 +++++- .../[application]/workflow/_layout.svelte | 1 - 6 files changed, 100 insertions(+), 64 deletions(-) diff --git a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte index ffa2a9c1b6..cc177888d1 100644 --- a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte +++ b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte @@ -15,7 +15,7 @@ } -
+
- {#each type as option} - - {/each} - - {:else if type === 'component'} - - {:else if type === 'accessLevel'} - - {:else if type === 'password'} - - {:else if type === 'number'} - - {:else if type === 'longText'} -