From a45cc1df73aa2aba03def1b59e21536f9a0c9216 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Mon, 6 Mar 2023 11:19:56 +0100 Subject: [PATCH] make default branch non removable for branchone --- frontend/src/lib/components/graph/FlowGraph.svelte | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/src/lib/components/graph/FlowGraph.svelte b/frontend/src/lib/components/graph/FlowGraph.svelte index 5b8a4ed7eb..c85f25a5f9 100644 --- a/frontend/src/lib/components/graph/FlowGraph.svelte +++ b/frontend/src/lib/components/graph/FlowGraph.svelte @@ -140,10 +140,11 @@ return flowModuleToLoop(modules, module, parent, loopDepth) } else if (type === 'branchone') { const branches = [ - { summary: 'Default branch', modules: module.value.default }, + { summary: 'Default Branch', modules: module.value.default, removable: false }, ...module.value.branches.map((b, i) => ({ summary: defaultIfEmptyString(b.summary, 'Branch ' + (i + 1)), - modules: b.modules + modules: b.modules, + removable: true })) ] return flowModuleToBranch( @@ -158,7 +159,8 @@ } else if (type === 'branchall') { const branches = module.value.branches.map((b, i) => ({ summary: defaultIfEmptyString(b.summary, `Branch ${i + 1}`), - modules: b.modules + modules: b.modules, + removable: true })) return flowModuleToBranch(module, modules, branches, [], parent, loopDepth, true) } @@ -345,7 +347,7 @@ function flowModuleToBranch( module: FlowModule, modules: FlowModule[], - branches: { summary: string; modules: FlowModule[] }[], + branches: { summary: string; modules: FlowModule[]; removable: boolean }[], edgesLabel: string[], parent: string | NestedNodes | undefined = undefined, loopDepth: number, @@ -380,7 +382,7 @@ ]) } - branches.forEach(({ summary, modules }, i) => { + branches.forEach(({ summary, modules, removable }, i) => { const items: NestedNodes = [] items.push( createVirtualNode( @@ -393,7 +395,7 @@ loopDepth, 0, false, - { module, index: i } + removable ? { module, index: i } : undefined ) ) if (modules.length) {