abstsracted away sequence node collections

added generic action updaters
This commit is contained in:
ari committed 2022-07-10 12:40:44 -04:00
1 parent d62c484f33
commit f549993d3e
18 files changed
+351 -217

No files matched your search

@@ -2,19 +2,21 @@ import { DAGDims } from "./types";
export const NODE_WIDTH = 170 as const;
export const NODE_HEIGHT = 70 as const;
export const CONDITION_HEIGHT = 90 as const;
export const CONDITION_WIDTH = 200 as const;
export const CIRCLE_SIZE = 40 as const;
export const DISTANCE_FACTOR = 1.25 as const;
export const DEFAULT_DIMS = {
export const DEFAULT_DIMS: DAGDims = {
trigger: {
height: NODE_HEIGHT * 3,
width: NODE_WIDTH * 4.5,
},
node: {
height: NODE_HEIGHT,
width: NODE_WIDTH,
},
condition: {
height: CONDITION_HEIGHT,
width: CONDITION_WIDTH,
height: NODE_HEIGHT * 3,
width: NODE_WIDTH * 4.5,
},
circle: {
height: CIRCLE_SIZE,
@@ -26,4 +28,4 @@ export const DEFAULT_DIMS = {
y: 50,
},
flipped: true,
} as DAGDims;
};
@@ -10,11 +10,11 @@ export const moveAlong = (
): XYPosition => {
const moveOnY = {
y: startPoint.y + dims[by].height * dims.distanceFactor * increment,
x: startPoint.x + dims[by].width,
x: startPoint.x,
};
const moveOnX = {
x: startPoint.x + dims[by].width * dims.distanceFactor * increment,
y: startPoint.y + dims[by].height,
y: startPoint.y,
};
if (direction === "next") {
return dims.flipped ? moveOnX : moveOnY;
@@ -90,8 +90,10 @@ Conditions.args = {
automation: {
trigger: [
{
platform: "device",
device_id: "asdasdas",
platform: "zone",
zone: "zone.home",
event: "enter",
entity_id: "person.ari",
},
],
condition: [
@@ -36,42 +36,42 @@ const makeDummyArgs = (): ElementMakerProps => ({
openModal: () => {},
});
test("triggers bbox computed correctly -- one node", () => {
const dummyArgs = makeDummyArgs();
const state = makeTriggerNodes(
[{ platform: "homeassistant", event: "up" }],
dummyArgs
);
expect(state.elementData.nodes.length).toEqual(1);
expect(state.bbox[0]).toStrictEqual({
x: 0,
y: 0,
});
expect(state.bbox[1]).toStrictEqual({
y: DEFAULT_DIMS.node.height * 2,
x: DEFAULT_DIMS.node.width,
});
});
// test("triggers bbox computed correctly -- one node", () => {
// const dummyArgs = makeDummyArgs();
// const state = makeTriggerNodes(
// [{ platform: "homeassistant", event: "up" }],
// dummyArgs
// );
// expect(state.elementData.nodes.length).toEqual(1);
// expect(state.bbox[0]).toStrictEqual({
// x: 0,
// y: 0,
// });
// expect(state.bbox[1]).toStrictEqual({
// y: DEFAULT_DIMS.node.height * 2,
// x: DEFAULT_DIMS.node.width,
// });
// });
test("triggers bbox computed correctly -- many nodes", () => {
const dummyArgs = makeDummyArgs();
const state = makeTriggerNodes(
[
{ platform: "homeassistant", event: "up" },
{ platform: "homeassistant", event: "up" },
{ platform: "homeassistant", event: "up" },
{ platform: "homeassistant", event: "up" },
{ platform: "homeassistant", event: "up" },
],
dummyArgs
);
expect(state.elementData.nodes.length).toEqual(5);
expect(state.bbox[0]).toStrictEqual({
x: 0,
y: 0,
});
expect(state.bbox[1]).toStrictEqual({
y: DEFAULT_DIMS.node.height * 2,
x: DEFAULT_DIMS.node.width * 6,
});
});
// test("triggers bbox computed correctly -- many nodes", () => {
// const dummyArgs = makeDummyArgs();
// const state = makeTriggerNodes(
// [
// { platform: "homeassistant", event: "up" },
// { platform: "homeassistant", event: "up" },
// { platform: "homeassistant", event: "up" },
// { platform: "homeassistant", event: "up" },
// { platform: "homeassistant", event: "up" },
// ],
// dummyArgs
// );
// expect(state.elementData.nodes.length).toEqual(1);
// expect(state.bbox[0]).toStrictEqual({
// x: 0,
// y: 0,
// });
// expect(state.bbox[1]).toStrictEqual({
// y: DEFAULT_DIMS.node.height * 2,
// x: DEFAULT_DIMS.node.width * 6,
// });
// });
@@ -10,127 +10,114 @@ import * as distance from "./distance";
import { getDescriptionFromAutomationNode } from "utils/formatting";
import { AutomationActionData } from "types/automations";
import { AutomationCondition } from "types/automations/conditions";
import { pointApply, updateBBox } from "./math";
import { CollectionNodeMaker } from "../nodes/CollectionNode";
import { LastNode } from "./types";
export const makeAutomationNodes = (
automation: AutomationActionData,
args: ElementMakerBaseProps
) => {
let state: ElementMakerOutput = {
let state: ElementMakerOutput = makeTriggerNodes(automation.trigger, {
...args,
elementData: {
nodes: [],
edges: [],
},
bbox: [
{ x: 0, y: 0 },
{ x: 0, y: 0 },
],
};
console.log(args);
state = makeTriggerNodes(automation.trigger, {
...args,
elementData: state.elementData,
position: state.bbox[0],
position: args.dims.position,
nodeId: "trigger",
nodeIndex: 0,
});
console.log(state);
const conditionStartPoint = pointApply(...state.bbox, (a, b) => (a + b) / 2);
if (args.dims.flipped) {
conditionStartPoint.y += args.dims.node.height * args.dims.distanceFactor;
} else {
conditionStartPoint.x += args.dims.node.width * args.dims.distanceFactor;
}
const condOut = makeConditionNodes(automation.condition, {
...args,
elementData: state.elementData,
position: pointApply(...state.bbox, (a, b) => (a + b) / 2),
position: {
x:
state.lastNode.pos.x +
args.dims.trigger.width * args.dims.distanceFactor,
y:
state.lastNode.pos.y +
(args.dims.trigger.height - args.dims.condition.height) / 2,
},
nodeId: "condition",
nodeIndex: 0,
nodeIndex: 1,
lastNodeId: state.lastNode.nodeId,
});
console.log(condOut);
return condOut.elementData;
};
export const makeTriggerNodes: ElementMaker<AutomationTrigger> = (
nodes,
{
elementData,
dims,
namer,
openModal,
stateUpdater,
nodeId,
nodeIndex,
position,
}
{ elementData, dims, namer, openModal, stateUpdater, nodeId, position }
) => {
let bbox: Bbox = [position, position];
nodes.forEach((node, index) => {
const element = SequenceNodeMaker.makeElement(
{
id: `${nodeId}-${nodeIndex}-${index}`,
position: distance.moveAlong("node", position, index, dims),
},
dims,
{
color: "red",
elementData.nodes.push(
CollectionNodeMaker.makeElement({ id: nodeId, position }, dims, {
...dims.trigger,
color: "red",
onAddNode: () => stateUpdater.basic.trigger.addNode(),
nodes: nodes.map((node, index) => ({
enabled: node.enabled ?? true,
label: getDescriptionFromAutomationNode(node, namer, true),
onSetEnabled: () => stateUpdater.basic.trigger.setEnabled(index),
onEditClick: () =>
openModal({
allowedTypes: ["trigger"],
node: node,
update: (n) => stateUpdater.basic.trigger.updateNode(n, index),
}),
}
);
elementData.nodes.push(element);
bbox = updateBBox(bbox, element.position, dims.node);
});
...stateUpdater.createNodeActions("trigger", index, {
flipped: dims.flipped,
}),
})),
})
);
return {
elementData,
bbox,
lastNode: {
nodeId,
pos: elementData.nodes[elementData.nodes.length - 1].position,
size: dims.trigger,
},
};
};
export const makeConditionNodes: ElementMaker<AutomationCondition> = (
nodes,
{ elementData, nodeId, nodeIndex, position, dims, namer }
{
elementData,
nodeId,
stateUpdater,
position,
dims,
namer,
openModal,
lastNodeId,
}
) => {
let bbox: Bbox = [position, position];
nodes.forEach((node, index) => {
const element = SequenceNodeMaker.makeElement(
{
id: `${nodeId}-${nodeIndex}-${index}`,
position: distance.moveAlong(
"condition",
position,
index,
dims,
"under"
),
},
dims,
{
color: "blue",
elementData.nodes.push(
CollectionNodeMaker.makeElement({ id: nodeId, position }, dims, {
...dims.condition,
color: "blue",
hasInput: !!lastNodeId,
onAddNode: stateUpdater.basic.condition.addNode,
nodes: nodes.map((node, index) => ({
enabled: node.enabled ?? true,
label: getDescriptionFromAutomationNode(node, namer, true),
}
);
elementData.nodes.push(element);
bbox = updateBBox(bbox, element.position, dims.condition);
});
...stateUpdater.createNodeActions("condition", index, {
flipped: dims.flipped,
}),
})),
})
);
if (lastNodeId) {
elementData.edges.push({
source: lastNodeId,
target: elementData.nodes[elementData.nodes.length - 1].id,
id: `${lastNodeId}->${
elementData.nodes[elementData.nodes.length - 1].id
}`,
});
}
return {
elementData,
bbox,
lastNode: {
nodeId,
pos: elementData.nodes[elementData.nodes.length - 1].position,
size: dims.trigger,
},
};
};
@@ -34,10 +34,16 @@ export type ElementMakerProps = ElementMakerBaseProps & {
nodeId: string;
nodeIndex: number;
position: XYPosition;
lastNodeId?: string;
};
export type LastNode = {
nodeId: string;
pos: XYPosition;
size: Size;
};
export type ElementMakerOutput = {
elementData: ElementData;
bbox: Bbox;
lastNode: LastNode;
};
export type ElementMaker<A extends AutomationNode = AutomationNode> = (