diff --git a/webapp/src/components/AutomationList/index.tsx b/webapp/src/components/AutomationList/index.tsx index f04d19a..3fd8892 100644 --- a/webapp/src/components/AutomationList/index.tsx +++ b/webapp/src/components/AutomationList/index.tsx @@ -67,7 +67,10 @@ export const AutomationList: FC = ({ {currentAuto ? onUpdate(current, a)} - dims={dims} + dims={{ + ...dims, + flipped: isMobile + }} tagDB={tagDB} /> : <>} diff --git a/webapp/src/components/DAGFlow/flowDataMods.ts b/webapp/src/components/DAGFlow/flowDataMods.ts index a0e0742..162002d 100644 --- a/webapp/src/components/DAGFlow/flowDataMods.ts +++ b/webapp/src/components/DAGFlow/flowDataMods.ts @@ -1,6 +1,7 @@ -import { makeFlowCircle } from "./DAGCircle" +import { DAGCircleProps, makeFlowCircle } from "./DAGCircle" import { DAGAutomationFlowDims } from "./types" -import { XYPosition } from 'react-flow-renderer'; +import { Node, XYPosition } from 'react-flow-renderer'; +import { DAGNodeProps } from "./DAGNode"; export const makeAddButton = ( id: string, @@ -11,7 +12,7 @@ export const makeAddButton = ( }: DAGAutomationFlowDims, onAdd: () => void, disableTarget: boolean = true, -) => makeFlowCircle( +): Node => makeFlowCircle( id, position, { @@ -27,22 +28,17 @@ export const makeConditionPoint = ( id: string, position: XYPosition, { - padding, conditionWidth, conditionHeight, - nodeWidth, - nodeHeight, - circleSize, - distanceFactor, + flipped, }: DAGAutomationFlowDims, totalConditions: number, onEditClick: () => void, -) => ({ +): Node => ({ id, type: 'dagnode', position, data: { - size: circleSize, color: 'lblue', accentBackground: true, label: `${totalConditions} Condition${totalConditions !== 1 ? 's' : ''}`, @@ -50,5 +46,6 @@ export const makeConditionPoint = ( width: conditionWidth, hasInput: true, onEditClick, + flipped, } }) \ No newline at end of file diff --git a/webapp/src/components/DAGFlow/index.stories.tsx b/webapp/src/components/DAGFlow/index.stories.tsx index f221734..d872329 100644 --- a/webapp/src/components/DAGFlow/index.stories.tsx +++ b/webapp/src/components/DAGFlow/index.stories.tsx @@ -249,4 +249,15 @@ ComplexFlipped.args = { ...Complex.args.dims, flipped: true, } +} + +export const SimpleFlipped = Simple.bind({}) + +SimpleFlipped.args = { + ...Simple.args, + dims: { + ...dgconst.DEFAULT_DIMS, + ...Complex.args.dims, + flipped: true, + } } \ No newline at end of file diff --git a/webapp/src/components/DAGFlow/index.tsx b/webapp/src/components/DAGFlow/index.tsx index fd6891c..c72844f 100644 --- a/webapp/src/components/DAGFlow/index.tsx +++ b/webapp/src/components/DAGFlow/index.tsx @@ -85,7 +85,11 @@ export const DAGAutomationFlow: FC = ({ } // convert automation to flow data - const condPoint = makeConditionPoint('c', { + const condPoint = makeConditionPoint( + 'c', dims.flipped ? { + y: dims.padding.y + dims.nodeHeight * dims.distanceFactor, + x: dims.padding.x + dims.nodeWidth * 0.25 + } : { x: dims.padding.x + dims.nodeWidth * dims.distanceFactor, y: dims.padding.y + dims.nodeHeight * 0.25 }, dims, condition.length, makeOnEditAutomationConditions( @@ -124,7 +128,10 @@ export const DAGAutomationFlow: FC = ({ sequence, condPoint.id, { - ...dims, padding: { + ...dims, padding: dims.flipped ? { + y: condPoint.position.y - dims.nodeHeight - dims.conditionHeight, + x: dims.padding.x, + } : { x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth, y: dims.padding.y, } diff --git a/webapp/src/components/DAGFlow/sequenceConvertor.ts b/webapp/src/components/DAGFlow/sequenceConvertor.ts index f3bf2d6..68ed966 100644 --- a/webapp/src/components/DAGFlow/sequenceConvertor.ts +++ b/webapp/src/components/DAGFlow/sequenceConvertor.ts @@ -25,12 +25,18 @@ export const sequenceToFlow = ( const nodeId = `${prefix}n-${i}`; let position: XYPosition; if (lasPos) { - position = { + position = dims.flipped ? { + y: lasPos.y + dims.nodeHeight * dims.distanceFactor, + x: dims.padding.x + } : { x: lasPos.x + dims.nodeWidth * dims.distanceFactor, y: dims.padding.y } } else { - position = { + position = dims.flipped ? { + y: dims.padding.y + dims.nodeHeight * dims.distanceFactor * (i + 2), + x: dims.padding.x + } : { x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2), y: dims.padding.y }; @@ -67,7 +73,14 @@ export const sequenceToFlow = ( // add button const addCircle = makeAddButton( `${prefix}-+`, - { + dims.flipped ? { + y: ( + lasPos === null ? + dims.padding.y + dims.nodeHeight * dims.distanceFactor * (sequence.length + 1) : + lasPos.y + ) + dims.nodeHeight * dims.distanceFactor, + x: dims.padding.x + dims.circleSize * 1.5 + } : { x: ( lasPos === null ? dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) : @@ -104,6 +117,7 @@ const addSingleNode = ( position: XYPosition, nodeId: string, { + flipped, nodeHeight, nodeWidth, }: DAGAutomationFlowDims, @@ -120,6 +134,7 @@ const addSingleNode = ( width: nodeWidth, color: getNodeType(node) === 'action' ? 'green' : 'blue', hasInput: true, + flipped, ...opts, }, position, @@ -172,7 +187,10 @@ const addChooseNode = ( node.choose.forEach(({ sequence, conditions }, j) => { const sequenceId = `${nodeId}.${j}`; // edit/delete circle - const circle = makeFlowCircle(`${sequenceId}>delete`, { + const circle = makeFlowCircle(`${sequenceId}>delete`, dims.flipped ? { + y: position.y + dims.nodeHeight * dims.distanceFactor, + x: lastPos.x + dims.nodeWidth * dims.distanceFactor, + } : { x: position.x + dims.nodeWidth * dims.distanceFactor, y: lastPos.y + dims.nodeHeight * dims.distanceFactor, }, { @@ -188,7 +206,10 @@ const addChooseNode = ( addEdge(flowData, nodeId, circle.id, true) const condNode = makeConditionPoint( `${sequenceId}>cond`, - { + dims.flipped ? { + y: circle.position.y + dims.circleSize * dims.distanceFactor, + x: circle.position.x - dims.circleSize, + } : { x: circle.position.x + dims.circleSize * dims.distanceFactor, y: circle.position.y + dims.circleSize / 8, }, @@ -202,7 +223,10 @@ const addChooseNode = ( // actual sub sequence const lastPoint = sequenceToFlow(flowData, sequence, condNode.id, { ...dims, - padding: { + padding: dims.flipped ? { + y: condNode.position.y - dims.nodeHeight * dims.distanceFactor, + x: condNode.position.x - dims.conditionHeight / 2, + } : { x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth), y: condNode.position.y - dims.conditionHeight / 2, }, @@ -210,7 +234,13 @@ const addChooseNode = ( if (lastPoint.position) { lastPos = xyApply(lastPos, lastPoint.position, Math.max) } else { - lastPos = xyApply(lastPos, { x: lastPos.x, y: lastPos.y + dims.nodeHeight * dims.distanceFactor }, Math.max) + lastPos = xyApply(lastPos, dims.flipped ? { + y: lastPos.y, + x: lastPos.x + dims.nodeWidth * dims.distanceFactor + } : { + x: lastPos.x, + y: lastPos.y + dims.nodeHeight * dims.distanceFactor + }, Math.max) } }) const totalChildren = node.choose.length; @@ -218,7 +248,10 @@ const addChooseNode = ( // add button const addCirlce = makeAddButton( `${nodeId}>add`, - { + dims.flipped ? { + y: position.y + dims.nodeHeight * dims.distanceFactor, + x: lastPos.x + dims.nodeWidth * dims.distanceFactor, + } : { x: position.x + dims.nodeWidth * dims.distanceFactor, y: lastPos.y + dims.nodeHeight * dims.distanceFactor, }, @@ -239,7 +272,10 @@ const addChooseNode = ( addEdge(flowData, nodeId, addCirlce.id, true) // else - const elseCircle = makeFlowCircle(`${nodeId}>else`, { + const elseCircle = makeFlowCircle(`${nodeId}>else`, dims.flipped ? { + y: position.y + dims.nodeHeight * dims.distanceFactor, + x: lastPos.x + dims.nodeWidth * dims.distanceFactor * 2, + } : { x: position.x + dims.nodeWidth * dims.distanceFactor, y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2, }, { size: dims.circleSize, flipped: dims.flipped }) @@ -247,7 +283,10 @@ const addChooseNode = ( addEdge(flowData, nodeId, elseCircle.id, true) const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, { ...dims, - padding: { + padding: dims.flipped ? { + y: position.y, + x: elseCircle.position.x - 1.4 * dims.circleSize, + } : { x: position.x - dims.nodeWidth, y: elseCircle.position.y - dims.circleSize / 4, }, diff --git a/webapp/src/components/DAGFlow/triggerConvertor.ts b/webapp/src/components/DAGFlow/triggerConvertor.ts index 625cb94..b419583 100644 --- a/webapp/src/components/DAGFlow/triggerConvertor.ts +++ b/webapp/src/components/DAGFlow/triggerConvertor.ts @@ -16,6 +16,9 @@ export const triggerToFlow = ( nodeWidth, padding, conditionHeight, + conditionWidth, + circleSize, + flipped, } = dims; // convert all triggers to dag nodes trigger.forEach((t, i) => { @@ -27,11 +30,18 @@ export const triggerToFlow = ( label: getDescriptionFromAutomationNode(t), height: nodeHeight, width: nodeWidth, + flipped, color: 'red', onEditClick: () => opts.onEdit(i), onXClick: () => opts.onDelete(i), }, - position: { x: padding.x, y: padding.y + nodeHeight * distanceFactor * i } + position: flipped ? { + y: padding.y, + x: padding.x + nodeWidth * distanceFactor * i + } : { + x: padding.x, + y: padding.y + nodeHeight * distanceFactor * i + } }) flowData.edges.push({ id: `e(${flowId})-(${toPoint})`, @@ -43,7 +53,10 @@ export const triggerToFlow = ( // create a 'add button' flowData.nodes.push(makeAddButton( 'trigger-add', - { + flipped ? { + y: padding.y + circleSize / 4, + x: padding.x + nodeWidth * distanceFactor * trigger.length, + } : { x: padding.x + nodeWidth * 0.4, y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length, },