From b29596fe781a19854b960b3b35e96ebc2e9382a4 Mon Sep 17 00:00:00 2001 From: Ari Date: Sun, 1 May 2022 21:14:24 -0400 Subject: [PATCH] added add node to end of flow --- .../components/DAGFlow/sequenceConvertor.ts | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/webapp/src/components/DAGFlow/sequenceConvertor.ts b/webapp/src/components/DAGFlow/sequenceConvertor.ts index 7d96504..96e8469 100644 --- a/webapp/src/components/DAGFlow/sequenceConvertor.ts +++ b/webapp/src/components/DAGFlow/sequenceConvertor.ts @@ -44,6 +44,16 @@ export const sequenceToFlow = ( lastPointId = nodeId; lasPos = position; } + const addCircle = makeFlowCircle( + `${prefix}-+`, + { + x: (lasPos === null ? dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) : lasPos.x) + dims.nodeWidth * dims.distanceFactor, + y: dims.padding.y + dims.circleSize / 2 + }, + { onAdd: () => { }, size: dims.circleSize, disableSource: true, } + ) + flowData.nodes.push(addCircle) + addEdge(flowData, lastPointId, addCircle.id, false) return { position: lasPos, pointId: lastPointId, @@ -119,17 +129,17 @@ const addChooseNode = ( } }) const totalChildren = node.action_data.choose.length; + // add button const addCirlce = makeFlowCircle( `${nodeId}>add`, { x: position.x + dims.nodeWidth * dims.distanceFactor, - y: lastPos.y + dims.nodeHeight * (totalChildren + 0.25) * dims.distanceFactor, + y: lastPos.y + dims.nodeHeight * dims.distanceFactor, }, { size: dims.circleSize * dims.distanceFactor, onAdd: () => { }, disableSource: true, - disableTarget: true, } ); flowData.nodes.push(addCirlce) @@ -138,7 +148,7 @@ const addChooseNode = ( // default const elseCircle = makeFlowCircle(`${nodeId}>else`, { x: position.x + dims.nodeWidth * dims.distanceFactor, - y: lastPos.y + dims.nodeHeight * (totalChildren + 0.25 + 1) * dims.distanceFactor, + y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2, }, { size: dims.circleSize * dims.distanceFactor }) flowData.nodes.push(elseCircle) addEdge(flowData, nodeId, elseCircle.id, true) @@ -151,6 +161,8 @@ const addChooseNode = ( }, `${nodeId}.${totalChildren}.`) if (lastPoint.position) { lastPos = xyApply(lastPos, lastPoint.position, Math.max) + } else { + lastPos = xyApply(lastPos, elseCircle.position, Math.max) } return lastPos } \ No newline at end of file