working trigger editor

This commit is contained in:
ari committed 2021-12-21 22:46:16 -05:00
1 parent 3cfb8151eb
commit 24f7c3c3af
14 files changed
+250 -66

No files matched your search

@@ -48,7 +48,16 @@ Simple.args = {
mode: 'single',
},
trigger: [
{
"$smType": undefined,
"platform": "numeric_state",
"entity_id": "test",
},
{
"$smType": undefined,
"platform": "homeassistant",
"event": "start",
}
],
sequence: [
{
@@ -1,14 +1,21 @@
import { DAGBoardElmDims } from "components/DAGSvgs/DAGBoard";
import { InfoIcon } from "components/Icons";
import { Button } from "components/Inputs/Button";
import { SequenceNodes } from "components/SequenceNodes";
import { FC, useState } from "react";
import { AutomationData, AutomationSequenceNode } from "types/automations";
import useWindowSize from "utils/useWindowSize";
import { AutoInfoBox } from "./AutoInfoBox";
import { useEditorStyles } from "./styles";
import { computeTriggerPos, computeExtraField } from './positions';
import { chain } from "utils/iter";
import { AutomationTrigger } from 'types/automations/triggers';
import { Modal } from "components/Modal";
import { NodeEditor } from "components/NodeEditor";
interface TriggerEditorModalState {
trigger: AutomationTrigger;
onSave: (node: AutomationTrigger) => void;
}
interface Props {
automation: AutomationData;
dims: DAGBoardElmDims;
@@ -22,6 +29,7 @@ export const AutomationEditor: FC<Props> = ({
// state
const { ratioWbh } = useWindowSize();
const [closeInfo, setCloseInfo] = useState(false);
const [modalState, setModalState] = useState<null | TriggerEditorModalState>(null);
const { classes } = useEditorStyles({
closeInfo,
horizontalMode: ratioWbh < 0.75
@@ -32,9 +40,21 @@ export const AutomationEditor: FC<Props> = ({
...automation,
sequence,
});
const updateTriggers = (trigger: AutomationTrigger[]) => onUpdate({
...automation,
trigger,
});
// render
return <div className={classes.root}>
<Modal open={!!modalState}>
{!!modalState && <NodeEditor
node={modalState.trigger}
onClose={() => setModalState(null)}
onSave={modalState.onSave as any}
allowedTypes={['trigger']}
/>}
</Modal>
<AutoInfoBox
className={classes.infoBox}
metadata={automation.metadata}
@@ -48,10 +68,23 @@ export const AutomationEditor: FC<Props> = ({
<SequenceNodes
zoomLevel={1.5}
startPoint={[0.5, 0.5]}
startPoint={[2, 0.5]}
dims={dims}
sequence={automation.sequence}
onChange={updateSequence}
additionalElements={chain([
computeExtraField([1, 0.5], [2, 0.5]),
computeTriggerPos(
[0.5, 0.5],
automation.trigger,
[1.5, 0.5],
updateTriggers,
(trigger, onSave) => setModalState({
trigger,
onSave,
})
),
])}
/>
</div>
}
@@ -0,0 +1,71 @@
import { DAGElement } from "components/DAGSvgs/DAGBoard";
import { Point } from "types/graphs";
import { AutomationTrigger } from 'types/automations/triggers';
import { avgPoints } from "utils/graph";
export function* computeTriggerPos(
startPoint: Point,
triggers: AutomationTrigger[],
toPath: Point,
onUpdate: (ts: AutomationTrigger[]) => void,
onEdit: (nt: AutomationTrigger, onSave: (ts: AutomationTrigger) => void) => void,
): Generator<DAGElement> {
// functions
const makeRemoveNode = (i: number) => () => onUpdate([
...triggers.slice(0, i),
...triggers.slice(i + 1),
]);
const updateNode = (n: AutomationTrigger, i: number) => onUpdate([
...triggers.slice(0, i),
n,
...triggers.slice(i + 1),
])
// main loop
for (let i = 0; i < triggers.length; i++) {
const node = triggers[i];
const nodeLoc: Point = [startPoint[0], startPoint[1] + i];
yield {
type: "node",
node,
loc: nodeLoc,
onRemove: makeRemoveNode(i),
onOpen: () => onEdit(node, up => updateNode(up, i))
}
yield {
type: "edge",
p1: nodeLoc,
p2: toPath,
direction: "1->2",
}
}
yield {
type: 'circle',
icon: 'add',
loc: [startPoint[0] + 0.25, startPoint[1] + triggers.length],
onAdd: () => onUpdate(triggers.concat({
$smType: 'trigger',
platform: 'state',
entity_id: "",
}))
}
}
export function* computeExtraField(
triggerEndPos: Point,
sequenceStartPos: Point,
): Generator<DAGElement> {
yield {
type: 'circle',
loc: avgPoints(triggerEndPos, sequenceStartPos),
icon: 'color',
color: 'blue',
}
yield {
type: 'edge',
p1: triggerEndPos,
p2: sequenceStartPos,
direction: '1->2',
}
}
+8 -1
View File
@@ -26,6 +26,10 @@ export type DAGCircleElm = {
{
icon: 'blank',
onRemove?: () => void;
} |
{
icon: 'color',
color: string,
}
)
export interface DAGNodeElm {
@@ -157,8 +161,10 @@ export function* mapDataToElements({
} else if (elm.icon === 'edit') {
clickProps.onEdit = elm.onEdit
clickProps.onRemove = elm.onRemove
} else {
} else if (elm.icon === 'blank') {
clickProps.onRemove = elm.onRemove
} else {
clickProps.backgroundColor = elm.color
}
yield <DAGCircle
key={`(${elm.loc})-o`}
@@ -187,5 +193,6 @@ export const DAGBoard: FC<Props & { zoomLevel: number }> = props => {
zoomLevel={props.zoomLevel}
>
{el}
{props.children}
</SVGBoard>
}
+15 -10
View File
@@ -11,6 +11,7 @@ export interface AddProps {
onRemove?: () => void;
loc: Point,
size: number,
backgroundColor?: string;
}
export const DAGCircle = ({
loc: [x, y],
@@ -18,27 +19,31 @@ export const DAGCircle = ({
onEdit,
onAdd,
onRemove,
backgroundColor,
}: AddProps) => {
const { classes } = useCircleStyles({
size: size * 0.9,
hasOnFunction: !!onEdit || !!onAdd,
hasRemoveFunction: !!onRemove,
backgroundColor,
});
return <>
<foreignObject x={x} y={y} width={size} height={size}>
<div className={classes.root}>
{onEdit ?
<PencilIcon
size={70} units="%"
className={classes.icon}
onClick={onEdit}
/> : onAdd ?
<AddIcon
{
onEdit ?
<PencilIcon
size={70} units="%"
className={classes.icon}
onClick={onAdd}
/>
: "else"}
onClick={onEdit}
/> : onAdd ?
<AddIcon
size={70} units="%"
className={classes.icon}
onClick={onAdd}
/>
: backgroundColor ? "" : "else"
}
{onRemove ? <TrashIcon className={classes.trashIcon} onClick={onRemove} /> : <></>}
</div>
</foreignObject>
+19 -16
View File
@@ -146,23 +146,26 @@ export const useCircleStyles = createAppUseStyles<{
size: number,
hasOnFunction: boolean,
hasRemoveFunction: boolean,
backgroundColor?: string,
}>(theme => ({
root: ({size, hasOnFunction, hasRemoveFunction}) => ({
backgroundColor: Color(theme.primary).set('rgb.g', 100).hex(),
borderRadius: hasRemoveFunction ? 10 : 500,
height: size,
width: size,
cursor: hasOnFunction ? "pointer" : 'default',
"&:hover": {
backgroundColor: (hasOnFunction && !hasRemoveFunction) ?
Color(theme.primary).set('rgb.g', 150).hex() :
Color(theme.primary).set('rgb.g', 100).hex(),
},
fontSize: `${size * 0.4}px`,
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
}),
root: ({ size, hasOnFunction, hasRemoveFunction, backgroundColor }) => {
const baseColor = backgroundColor ? backgroundColor : Color(theme.primary).set('rgb.g', 100).hex();
const hoverColor = (hasOnFunction && !hasRemoveFunction) ? Color(theme.primary).set('rgb.g', 150).hex() : baseColor
return {
backgroundColor: baseColor,
borderRadius: hasRemoveFunction ? 10 : 500,
height: size,
width: size,
cursor: hasOnFunction ? "pointer" : 'default',
"&:hover": {
backgroundColor: hoverColor,
},
fontSize: `${size * 0.4}px`,
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
}
},
icon: {
"&:hover": {
borderRadius: 500,
@@ -3,6 +3,7 @@ import { ComponentMeta, ComponentStory } from '@storybook/react';
import { SequenceNodes } from './index';
import { NODE_HEIGHT, NODE_WIDTH, DISTANCE_FACTOR, ADD_HEIGHT, ADD_WIDTH, CIRCLE_SIZE } from '../DAGSvgs/constants';
import { useState } from 'react';
import { DAGElement } from "components/DAGSvgs/DAGBoard";
export default {
@@ -77,6 +78,26 @@ Simple.args = {
]
}
export const AdditionalElemets = Template.bind({})
AdditionalElemets.args = {
...Simple.args,
additionalElements: (function* (): Generator<DAGElement> {
yield {
type: 'circle',
loc: [1, 0],
icon: "blank"
}
yield {
type: 'edge',
p1: [0, 0],
p2: [1, 0],
direction: '1->2'
}
}()),
}
export const Multinode = Template.bind({})
Multinode.args = {
...Multinode.args,
+13 -6
View File
@@ -7,6 +7,7 @@ import { computeNodesEdgesPos } from './positions';
import { Modal } from 'components/Modal';
import { NodeEditor } from 'components/NodeEditor';
import { MultiNodeEditor } from "components/MultiNodeEditors";
import { chain } from "utils/iter";
export const SequenceNodes: FC<SequenceNodeProps & { zoomLevel: number }> = (props) => {
// state
@@ -50,16 +51,22 @@ export const SequenceNodes: FC<SequenceNodeProps & { zoomLevel: number }> = (pro
}
}
// compute elemets
let elmIter = computeNodesEdgesPos(
props.startPoint,
props.sequence,
props.onChange,
s => setModalState(s)
);
if (props.additionalElements) {
elmIter = chain([elmIter, props.additionalElements]);
}
// render
return <>
<DAGBoard
zoomLevel={props.zoomLevel}
elements={computeNodesEdgesPos(
props.startPoint,
props.sequence,
props.onChange,
s => setModalState(s)
)}
elements={elmIter}
settings={{
...props.dims,
edgeNextColor: theme.secondaryAccent,
@@ -5,38 +5,14 @@ import { makeUpdater, Updater } from './updater';
import { ChooseAction } from 'types/automations/actions';
import { AutomationCondition } from "types/automations/conditions";
import { ModalState } from "./types";
import { offsetPoint, makeOffsetMaintainer} from "utils/graph";
export type UpdateModalState = (
s: ModalState
) => void;
const offsetPoint = (
[x, y]: Point,
[ox, oy]: Point = [0, 0],
): Point => [x + ox, y + oy];
const makeOffsetMaintainer = (startPoint: Point) => {
let offset: Point = [0, 0];
let i = 0;
return {
setI(newI: number) {
i = newI;
},
resetY() {
offset[1] = 0;
},
update(p: Point, innerStartLoc: Point) {
offset[0] = Math.max(offset[0], p[0] - i - 0.5 - startPoint[0])
offset[1] = Math.max(offset[1], p[1] - innerStartLoc[1] + 1)
},
get x() {
return offset[0]
},
get y() {
return offset[1]
}
}
}
function* dealWithNested(
nodeLoc: Point,
+2 -1
View File
@@ -1,4 +1,4 @@
import { DAGBoardElmDims } from "components/DAGSvgs/DAGBoard";
import { DAGBoardElmDims, DAGElement } from "components/DAGSvgs/DAGBoard";
import { AutomationSequenceNode } from "types/automations";
import { Point } from "types/graphs";
@@ -7,6 +7,7 @@ export interface SequenceNodeProps {
dims: DAGBoardElmDims;
sequence: AutomationSequenceNode[],
onChange: (s: AutomationSequenceNode[]) => void;
additionalElements?: Generator<DAGElement>;
}
export type ModalState = {
+1 -1
View File
@@ -2,7 +2,7 @@ import { AutomationTime } from "./common";
interface AutomationTriggerBase {
alias?: string;
$smType: undefined;
$smType: undefined | 'trigger';
}
export interface AutomationTriggerEvent extends AutomationTriggerBase {
+34
View File
@@ -0,0 +1,34 @@
import { Point } from "types/graphs";
export const offsetPoint = (
[x, y]: Point,
[ox, oy]: Point = [0, 0],
): Point => [x + ox, y + oy];
export const avgPoints = (
[x1, y1]: Point,
[x2, y2]: Point,
): Point => [(x1 + x2)/2, (y1 + y2)/2];
export const makeOffsetMaintainer = (startPoint: Point) => {
let offset: Point = [0, 0];
let i = 0;
return {
setI(newI: number) {
i = newI;
},
resetY() {
offset[1] = 0;
},
update(p: Point, innerStartLoc: Point) {
offset[0] = Math.max(offset[0], p[0] - i - 0.5 - startPoint[0])
offset[1] = Math.max(offset[1], p[1] - innerStartLoc[1] + 1)
},
get x() {
return offset[0]
},
get y() {
return offset[1]
}
}
}
+12 -1
View File
@@ -1,4 +1,4 @@
import { IteratorWrap } from "./iter"
import { chain, IteratorWrap } from "./iter"
test('it wraps a simple iter', () => {
@@ -23,3 +23,14 @@ test('it wraps a simple iter while being nested', () => {
expect(data).toEqual(['2'])
expect(wit.returnValue).toEqual(true)
})
test('chain multiple iterators', () => {
function* makeIt1() {
yield "one"
}
function* makeIt2() {
yield "two"
}
const data = Array.from(chain([makeIt1(), makeIt2()]));
expect(data).toEqual(['one', 'two']);
})
+6
View File
@@ -17,3 +17,9 @@ export class IteratorWrap<T, TReturn, TNext> {
return Array.from(this.iter())
}
}
export function* chain<T>(genArray: Generator<T>[]): Generator<T> {
for (const gen of genArray) {
yield * gen
}
}