stable flow

This commit is contained in:
ari committed 2022-05-01 20:55:04 -04:00
1 parent 1ed1e63330
commit 1620d04624
3 files changed
+82 -27

No files matched your search

+14 -2
View File
@@ -1,7 +1,8 @@
import { FC } from "react";
import { AddIcon, PencilIcon, TrashIcon } from '../Icons/index';
import { useCircleStyles } from './styles';
import { Handle, Position } from 'react-flow-renderer';
import { Handle, Position, XYPosition } from 'react-flow-renderer';
import { FlowData } from "./types";
@@ -14,6 +15,17 @@ export interface DAGCircleProps {
disableSource?: boolean;
disableTarget?: boolean;
}
export const makeFlowCircle = (
circleId: string,
position: XYPosition,
data: DAGCircleProps,
) => ({
id: circleId,
type: 'dagcircle',
position,
data
})
export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
data: {
size,
@@ -26,7 +38,7 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
}
}) => {
const { classes } = useCircleStyles({
size: size * 0.9,
size,
hasOnFunction: !!onEdit || !!onAdd,
hasRemoveFunction: !!onRemove,
backgroundColor,
@@ -3,6 +3,7 @@ import { DAGFlowDims, FlowData } from './types';
import { getDescriptionFromAutomationNode } from 'utils/formatting';
import { XYPosition } from 'react-flow-renderer';
import { ChooseAction } from 'types/automations/actions';
import { DAGCircleProps, makeFlowCircle } from './DAGCircle';
export const sequenceToFlow = (
@@ -19,13 +20,19 @@ export const sequenceToFlow = (
const nodeId = `${prefix}n-${i}`;
let position: XYPosition;
if (lasPos) {
position = { x: lasPos.x + dims.nodeWidth * dims.distanceFactor, y: dims.padding.y }
position = {
x: lasPos.x + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y
}
} else {
position = computeNodePos(i, dims);
position = {
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2),
y: dims.padding.y
};
}
if (node.$smType === 'action') {
if (node.action === 'choose') {
position = addChooseNode(flowData, node, position, nodeId, lastPointId, dims)
position = addChooseNode(flowData, node, position, nodeId, dims)
} else {
addSingleNode(flowData, node, position, nodeId, dims);
}
@@ -33,11 +40,7 @@ export const sequenceToFlow = (
addSingleNode(flowData, node, position, nodeId, dims);
}
flowData.edges.push({
id: `${lastPointId}-${nodeId}`,
source: lastPointId,
target: nodeId,
});
addEdge(flowData, lastPointId, nodeId, false)
lastPointId = nodeId;
lasPos = position;
}
@@ -47,9 +50,15 @@ export const sequenceToFlow = (
};
}
const computeNodePos = (i: number, { padding, distanceFactor, nodeWidth }: DAGFlowDims): XYPosition => ({
x: padding.x + nodeWidth * distanceFactor * (i + 2),
y: padding.y
const xyApply = (p1: XYPosition, p2: XYPosition, fcn: (a: number, b: number) => number): XYPosition => ({
x: fcn(p1.x, p2.x), y: fcn(p1.y, p2.y)
})
const addEdge = (flowData: FlowData, source: string, target: string, animated: boolean = false) => flowData.edges.push({
id: `${source}-${target}`,
source,
target,
animated,
})
const addSingleNode = (
@@ -79,36 +88,69 @@ const addSingleNode = (
});
const addChooseNode = (
flowData: FlowData,
node: ChooseAction,
position: XYPosition,
nodeId: string,
lastPointId: string,
dims: DAGFlowDims,
) => {
addSingleNode(flowData, node, position, nodeId, dims);
let lastPos: XYPosition = position;
// conditions
node.action_data.choose.forEach(({ sequence, conditions }, j) => {
const { y } = lastPos;
const lastPoint = sequenceToFlow(flowData, sequence, nodeId, {
const sequenceId = `${nodeId}.${j}`;
const circle = makeFlowCircle(`${sequenceId}>cond`, {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
}, { size: dims.circleSize * dims.distanceFactor, onEdit: () => { }, onRemove: () => { } })
flowData.nodes.push(circle)
addEdge(flowData, nodeId, circle.id, true)
const lastPoint = sequenceToFlow(flowData, sequence, circle.id, {
...dims,
padding: {
x: position.x - dims.nodeWidth,
y: y + dims.nodeHeight * dims.distanceFactor,
y: circle.position.y,
},
}, `${nodeId}.${j}.`);
}, `${sequenceId}.`);
if (lastPoint.position) {
lastPos = lastPoint.position;
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
}
})
const totalChildren = node.action_data.choose.length;
sequenceToFlow(flowData, node.action_data.default, nodeId, {
// add button
const addCirlce = makeFlowCircle(
`${nodeId}>add`, {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * (totalChildren + 0.25) * dims.distanceFactor,
},
{
size: dims.circleSize * dims.distanceFactor,
onAdd: () => { },
disableSource: true,
disableTarget: true,
}
);
flowData.nodes.push(addCirlce)
addEdge(flowData, nodeId, addCirlce.id, true)
// default
const elseCircle = makeFlowCircle(`${nodeId}>else`, {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * (totalChildren + 0.25 + 1) * dims.distanceFactor,
}, { size: dims.circleSize * dims.distanceFactor })
flowData.nodes.push(elseCircle)
addEdge(flowData, nodeId, elseCircle.id, true)
const lastPoint = sequenceToFlow(flowData, node.action_data.default, elseCircle.id, {
...dims,
padding: {
x: position.x - dims.nodeWidth,
y: lastPos.y + dims.nodeHeight * (totalChildren + 0.25) * dims.distanceFactor,
y: elseCircle.position.y,
},
}, `${nodeId}.${totalChildren}.`)
if (lastPoint.position) {
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
}
return lastPos
}
@@ -1,5 +1,6 @@
import { AutomationTrigger } from 'types/automations/triggers';
import { DAGFlowDims, FlowData, TriggerMakerOptions } from './types';
import { makeFlowCircle } from './DAGCircle';
export const triggerToFlow = (
@@ -39,19 +40,19 @@ export const triggerToFlow = (
});
// create a 'add button'
flowData.nodes.push({
id: `trigger-add`,
type: 'dagcircle',
position: {
flowData.nodes.push(makeFlowCircle(
'trigger-add',
{
x: padding.x + nodeWidth * 0.4,
y: padding.y + nodeHeight * distanceFactor * trigger.length,
},
data: {
{
size: circleSize,
backgroundColor: 'green',
onAdd: opts.onAdd,
disableSource: true,
disableTarget: true,
}
})
))
}