From 355792b5a3aed3f4ed57a687b60e1432f5a47200 Mon Sep 17 00:00:00 2001 From: Faton Ramadani Date: Mon, 12 Aug 2024 15:32:38 +0200 Subject: [PATCH] feat(frontend): Fix insert --- .../components/flows/map/FlowModuleSchemaMap.svelte | 2 ++ frontend/src/lib/components/graph/graphBuilder.ts | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte index 0608985720..48475dd86c 100644 --- a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte +++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte @@ -306,6 +306,8 @@ $selectedId = $moving.module.id $moving = undefined } else { + console.log('inserting', detail.detail, detail.index, detail.modules) + await insertNewModuleAtIndex( detail.modules, detail.index ?? 0, diff --git a/frontend/src/lib/components/graph/graphBuilder.ts b/frontend/src/lib/components/graph/graphBuilder.ts index ca4b485c1e..b04b60b129 100644 --- a/frontend/src/lib/components/graph/graphBuilder.ts +++ b/frontend/src/lib/components/graph/graphBuilder.ts @@ -62,7 +62,7 @@ export default function graphBuilder( customId?: string type?: string offset?: number - index?: number + subModules?: FlowModule[] } ) { parents[targetId] = [...(parents[targetId] ?? []), sourceId] @@ -74,13 +74,13 @@ export default function graphBuilder( type: options?.type ?? 'edge', data: { insertable: extra.insertable, - modules, + modules: options?.subModules ?? modules, sourceId, targetId, offset: options?.offset, moving, eventHandlers, - index: options?.index + index: options?.subModules?.length ?? modules?.length } }) } @@ -122,7 +122,7 @@ export default function graphBuilder( modules.forEach((module, index) => { // Add the edge between the previous node and the current one if (index > 0 && previousId) { - addEdge(previousId, module.id, { index }) + addEdge(previousId, module.id) } if (module.value.type === 'rawscript') { @@ -217,7 +217,7 @@ export default function graphBuilder( if (module.value.modules.length > 0) { processModules(module.value.modules, startNode, endNode, currentOffset + 50) } else { - addEdge(startNode.id, endNode.id) + addEdge(startNode.id, endNode.id, { subModules: module.value.modules }) } previousId = endNode.id } else if (module.value.type === 'whileloopflow') {