diff --git a/webapp/src/components/AutomationEditor/index.stories.tsx b/webapp/src/components/AutomationEditor/index.stories.tsx index 2051ead..bce1f26 100644 --- a/webapp/src/components/AutomationEditor/index.stories.tsx +++ b/webapp/src/components/AutomationEditor/index.stories.tsx @@ -48,7 +48,16 @@ Simple.args = { mode: 'single', }, trigger: [ - + { + "$smType": undefined, + "platform": "numeric_state", + "entity_id": "test", + }, + { + "$smType": undefined, + "platform": "homeassistant", + "event": "start", + } ], sequence: [ { diff --git a/webapp/src/components/AutomationEditor/index.tsx b/webapp/src/components/AutomationEditor/index.tsx index 73dd7bc..8bd29c4 100644 --- a/webapp/src/components/AutomationEditor/index.tsx +++ b/webapp/src/components/AutomationEditor/index.tsx @@ -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 = ({ // state const { ratioWbh } = useWindowSize(); const [closeInfo, setCloseInfo] = useState(false); + const [modalState, setModalState] = useState(null); const { classes } = useEditorStyles({ closeInfo, horizontalMode: ratioWbh < 0.75 @@ -32,9 +40,21 @@ export const AutomationEditor: FC = ({ ...automation, sequence, }); + const updateTriggers = (trigger: AutomationTrigger[]) => onUpdate({ + ...automation, + trigger, + }); // render return
+ + {!!modalState && setModalState(null)} + onSave={modalState.onSave as any} + allowedTypes={['trigger']} + />} + = ({ setModalState({ + trigger, + onSave, + }) + ), + ])} />
} diff --git a/webapp/src/components/AutomationEditor/positions.ts b/webapp/src/components/AutomationEditor/positions.ts new file mode 100644 index 0000000..9125d94 --- /dev/null +++ b/webapp/src/components/AutomationEditor/positions.ts @@ -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 { + // 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 { + yield { + type: 'circle', + loc: avgPoints(triggerEndPos, sequenceStartPos), + icon: 'color', + color: 'blue', + } + yield { + type: 'edge', + p1: triggerEndPos, + p2: sequenceStartPos, + direction: '1->2', + } +} diff --git a/webapp/src/components/DAGSvgs/DAGBoard.tsx b/webapp/src/components/DAGSvgs/DAGBoard.tsx index 0aa8585..1d1667d 100644 --- a/webapp/src/components/DAGSvgs/DAGBoard.tsx +++ b/webapp/src/components/DAGSvgs/DAGBoard.tsx @@ -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 = props => { zoomLevel={props.zoomLevel} > {el} + {props.children} } diff --git a/webapp/src/components/DAGSvgs/DAGCircle.tsx b/webapp/src/components/DAGSvgs/DAGCircle.tsx index 7c4d11d..4a87a2c 100644 --- a/webapp/src/components/DAGSvgs/DAGCircle.tsx +++ b/webapp/src/components/DAGSvgs/DAGCircle.tsx @@ -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 <>
- {onEdit ? - : onAdd ? - - : "else"} + onClick={onEdit} + /> : onAdd ? + + : backgroundColor ? "" : "else" + } {onRemove ? : <>}
diff --git a/webapp/src/components/DAGSvgs/styles.ts b/webapp/src/components/DAGSvgs/styles.ts index eb050f1..79e2fcb 100644 --- a/webapp/src/components/DAGSvgs/styles.ts +++ b/webapp/src/components/DAGSvgs/styles.ts @@ -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, diff --git a/webapp/src/components/SequenceNodes/index.stories.tsx b/webapp/src/components/SequenceNodes/index.stories.tsx index a543b54..847e94a 100644 --- a/webapp/src/components/SequenceNodes/index.stories.tsx +++ b/webapp/src/components/SequenceNodes/index.stories.tsx @@ -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 { + 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, diff --git a/webapp/src/components/SequenceNodes/index.tsx b/webapp/src/components/SequenceNodes/index.tsx index 46d0f84..7a5d851 100644 --- a/webapp/src/components/SequenceNodes/index.tsx +++ b/webapp/src/components/SequenceNodes/index.tsx @@ -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 = (props) => { // state @@ -50,16 +51,22 @@ export const SequenceNodes: FC = (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 <> setModalState(s) - )} + elements={elmIter} settings={{ ...props.dims, edgeNextColor: theme.secondaryAccent, diff --git a/webapp/src/components/SequenceNodes/positions.ts b/webapp/src/components/SequenceNodes/positions.ts index 9e714f1..905150f 100644 --- a/webapp/src/components/SequenceNodes/positions.ts +++ b/webapp/src/components/SequenceNodes/positions.ts @@ -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, diff --git a/webapp/src/components/SequenceNodes/types.ts b/webapp/src/components/SequenceNodes/types.ts index 40c1d88..7701e89 100644 --- a/webapp/src/components/SequenceNodes/types.ts +++ b/webapp/src/components/SequenceNodes/types.ts @@ -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; } export type ModalState = { diff --git a/webapp/src/types/automations/triggers.ts b/webapp/src/types/automations/triggers.ts index 88ec3b0..02e8e3e 100644 --- a/webapp/src/types/automations/triggers.ts +++ b/webapp/src/types/automations/triggers.ts @@ -2,7 +2,7 @@ import { AutomationTime } from "./common"; interface AutomationTriggerBase { alias?: string; - $smType: undefined; + $smType: undefined | 'trigger'; } export interface AutomationTriggerEvent extends AutomationTriggerBase { diff --git a/webapp/src/utils/graph.ts b/webapp/src/utils/graph.ts new file mode 100644 index 0000000..7726fdd --- /dev/null +++ b/webapp/src/utils/graph.ts @@ -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] + } + } +} diff --git a/webapp/src/utils/iter.test.ts b/webapp/src/utils/iter.test.ts index 7d35b60..b55d70a 100644 --- a/webapp/src/utils/iter.test.ts +++ b/webapp/src/utils/iter.test.ts @@ -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']); +}) diff --git a/webapp/src/utils/iter.ts b/webapp/src/utils/iter.ts index e98020c..5917e40 100644 --- a/webapp/src/utils/iter.ts +++ b/webapp/src/utils/iter.ts @@ -17,3 +17,9 @@ export class IteratorWrap { return Array.from(this.iter()) } } + +export function* chain(genArray: Generator[]): Generator { + for (const gen of genArray) { + yield * gen + } +}