From 40690293a86c203995c5a8cc61212d4ccb158223 Mon Sep 17 00:00:00 2001 From: Ari Date: Wed, 18 May 2022 22:23:57 -0400 Subject: [PATCH] added initial pre-validation per node --- .../AutomationEditor/index.stories.tsx | 2 +- .../AutomationList/AutomationList.stories.tsx | 2 +- .../ConnectedAutomationList.stories.tsx | 2 +- .../src/components/DAGFlow/DAGErrorNode.css | 53 ++++++++++++ .../DAGFlow/DAGErrorNode.stories.tsx | 46 +++++++++++ .../src/components/DAGFlow/DAGErrorNode.tsx | 34 ++++++++ .../components/DAGFlow/DAGNode.stories.tsx | 47 +++++++++++ webapp/src/components/DAGFlow/DAGNode.tsx | 20 ++--- .../{DAGSvgs => DAGFlow}/constants.ts | 0 webapp/src/components/DAGFlow/helpers.tsx | 9 ++ .../src/components/DAGFlow/index.stories.tsx | 23 +++++- webapp/src/components/DAGFlow/index.tsx | 8 +- .../components/DAGFlow/sequenceConvertor.ts | 49 ++++++++++- webapp/src/components/DAGFlow/types.ts | 4 +- webapp/src/components/DAGFlow/updater.ts | 11 +++ webapp/src/components/Inputs/InputBoolean.css | 4 + webapp/src/components/Inputs/InputBoolean.tsx | 6 +- webapp/src/components/Inputs/styles.ts | 5 +- .../NodeEditor/OptionManager/index.tsx | 51 ++++++++++-- webapp/src/components/NodeEditor/constants.ts | 76 ----------------- webapp/src/components/NodeEditor/index.css | 6 ++ webapp/src/components/NodeEditor/index.tsx | 8 +- webapp/src/routes/automation.tsx | 2 +- webapp/src/styles/root.css | 1 + webapp/src/types/automations/actions.ts | 32 ++------ webapp/src/types/automations/index.ts | 4 +- webapp/src/types/automations/triggers.ts | 1 - webapp/src/types/validators/actions.ts | 72 ++++++++++++---- webapp/src/types/validators/index.ts | 2 + webapp/src/types/validators/triggers.ts | 24 +++--- webapp/src/utils/automations.ts | 82 +++++++++++++++++++ 31 files changed, 519 insertions(+), 167 deletions(-) create mode 100644 webapp/src/components/DAGFlow/DAGErrorNode.css create mode 100644 webapp/src/components/DAGFlow/DAGErrorNode.stories.tsx create mode 100644 webapp/src/components/DAGFlow/DAGErrorNode.tsx create mode 100644 webapp/src/components/DAGFlow/DAGNode.stories.tsx rename webapp/src/components/{DAGSvgs => DAGFlow}/constants.ts (100%) create mode 100644 webapp/src/components/DAGFlow/helpers.tsx delete mode 100644 webapp/src/components/NodeEditor/constants.ts create mode 100644 webapp/src/types/validators/index.ts diff --git a/webapp/src/components/AutomationEditor/index.stories.tsx b/webapp/src/components/AutomationEditor/index.stories.tsx index c42fec2..efd2548 100644 --- a/webapp/src/components/AutomationEditor/index.stories.tsx +++ b/webapp/src/components/AutomationEditor/index.stories.tsx @@ -2,7 +2,7 @@ import React from "react"; import { ComponentMeta, ComponentStory } from '@storybook/react'; import { AutomationEditor } from './index'; import { useState } from 'react'; -import * as dgconst from 'components/DAGSvgs/constants'; +import * as dgconst from 'components/DAGFlow/constants'; export default { diff --git a/webapp/src/components/AutomationList/AutomationList.stories.tsx b/webapp/src/components/AutomationList/AutomationList.stories.tsx index 2d10527..a0e3b63 100644 --- a/webapp/src/components/AutomationList/AutomationList.stories.tsx +++ b/webapp/src/components/AutomationList/AutomationList.stories.tsx @@ -3,7 +3,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react"; import { useState } from "react"; import { AutomationList } from "."; import { createMockAuto } from "utils/mocks"; -import * as dgconst from 'components/DAGSvgs/constants'; +import * as dgconst from 'components/DAGFlow/constants'; export default { title: 'App/AutomationList', diff --git a/webapp/src/components/AutomationList/ConnectedAutomationList.stories.tsx b/webapp/src/components/AutomationList/ConnectedAutomationList.stories.tsx index 849ffea..69ca731 100644 --- a/webapp/src/components/AutomationList/ConnectedAutomationList.stories.tsx +++ b/webapp/src/components/AutomationList/ConnectedAutomationList.stories.tsx @@ -2,7 +2,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react"; import { ConnectedAutomationList } from "."; import { createMockAuto } from "utils/mocks"; import { useMockApiService } from "apiService"; -import { DEFAULT_DIMS } from 'components/DAGSvgs/constants'; +import { DEFAULT_DIMS } from 'components/DAGFlow/constants'; export default { title: 'App/AutomationList/Connected', diff --git a/webapp/src/components/DAGFlow/DAGErrorNode.css b/webapp/src/components/DAGFlow/DAGErrorNode.css new file mode 100644 index 0000000..db64078 --- /dev/null +++ b/webapp/src/components/DAGFlow/DAGErrorNode.css @@ -0,0 +1,53 @@ +.dagnode-error { + display: flex; + flex-direction: column; + justify-content: flex-end; + font-size: 0.85em; + z-index: 0; +} + +.dagnode-error.open .dagnode-error--inner { + align-items: flex-start; + padding-top: 1em; +} + +.dagnode-error--inner { + position: relative; + flex: 1; + + /* internal positioning */ + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + gap: 0.5em; + + /* shape */ + background-color: var(--error-dark); + border-radius: 1em; + height: 100%; + max-height: 100%; + max-width: 100%; + margin-top: 2.5px; + margin-bottom: 2.5px; + border-top-width: 1px; + border-top-style: solid; + border-top-left-radius: 10px; + border-top-right-radius: 10px; + border-top-color: var(--error); +} + +.dagnode-error--inner:hover { + background-color: var(--error-accent); + cursor: default; +} + +.dagnode-error--inner--edit-icon:hover { + transform: rotate(180deg); + cursor: pointer; + background-color: var(--error); + padding: 0.5em; + border-radius: 10px; + height: 0.25em; + width: 0.25em; +} \ No newline at end of file diff --git a/webapp/src/components/DAGFlow/DAGErrorNode.stories.tsx b/webapp/src/components/DAGFlow/DAGErrorNode.stories.tsx new file mode 100644 index 0000000..d674978 --- /dev/null +++ b/webapp/src/components/DAGFlow/DAGErrorNode.stories.tsx @@ -0,0 +1,46 @@ + + +import React from "react"; +import { ComponentMeta, ComponentStory } from '@storybook/react'; +import { DAGAutomationFlow } from '.'; +import * as dgconst from "components/DAGFlow/constants"; +import ReactFlow, { Controls } from 'react-flow-renderer'; +import { DAGErrorNode } from "./DAGErrorNode"; +import { convertToFlowNode } from "./helpers"; + + +export default { + title: 'DAGAutomationFlow/Viewer/DAGErrorNode', + component: DAGAutomationFlow, + parameters: { actions: { argTypesRegex: '^on.*' } }, + args: { + "height": dgconst.NODE_HEIGHT, + "width": dgconst.NODE_WIDTH, + } +} as ComponentMeta + +export const Examples: ComponentStory = args => { + const nodes = ["1", "2", "3", "4"].map((id, i) => ({ + "data": args, + "id": id, + "type": "mynode", + "position": { + "x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i, + "y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i + } + })); + return
+ + + +
+} diff --git a/webapp/src/components/DAGFlow/DAGErrorNode.tsx b/webapp/src/components/DAGFlow/DAGErrorNode.tsx new file mode 100644 index 0000000..e19cbfa --- /dev/null +++ b/webapp/src/components/DAGFlow/DAGErrorNode.tsx @@ -0,0 +1,34 @@ +import "./DAGErrorNode.css"; +import { Handle, Position } from 'react-flow-renderer'; +import { FC } from 'react'; +import { InfoIcon, PencilIcon } from 'components/Icons'; + + +export interface DAGErrorNodeProps { + height: number; + width: number; + hasInput?: boolean; + error?: any, + onEdit: () => void; +} +export const DAGErrorNode: FC = ({ + height, width, hasInput, error, onEdit +}) => { + // render + return <> + {hasInput && } + +
+
+ + Invalid Node + +
+
+ +} diff --git a/webapp/src/components/DAGFlow/DAGNode.stories.tsx b/webapp/src/components/DAGFlow/DAGNode.stories.tsx new file mode 100644 index 0000000..3b80408 --- /dev/null +++ b/webapp/src/components/DAGFlow/DAGNode.stories.tsx @@ -0,0 +1,47 @@ + + +import React from "react"; +import { ComponentMeta, ComponentStory } from '@storybook/react'; +import { DAGAutomationFlow } from '.'; +import { useState } from 'react'; +import * as dgconst from "components/DAGFlow/constants"; +import ReactFlow, { Controls } from 'react-flow-renderer'; +import { DAGNode } from "./DAGNode"; +import { convertToFlowNode } from "./helpers"; + + +export default { + title: 'DAGAutomationFlow/Viewer/DAGNode', + component: DAGAutomationFlow, + parameters: { actions: { argTypesRegex: '^on.*' } }, + args: { + "color": "lblue", + "height": dgconst.NODE_HEIGHT, + "width": dgconst.NODE_WIDTH, + "label": "test", + "hasInput": true, + } +} as ComponentMeta + +export const Colors: ComponentStory = args => { + const nodes = ["blue", "red", "green", "lblue"].map((color, i) => ({ + "data": { ...args, color }, + "id": color, + "type": "mynode", + "position": { "x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i, "y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i } + })); + return
+ + + +
+} diff --git a/webapp/src/components/DAGFlow/DAGNode.tsx b/webapp/src/components/DAGFlow/DAGNode.tsx index 5de4241..f81e669 100644 --- a/webapp/src/components/DAGFlow/DAGNode.tsx +++ b/webapp/src/components/DAGFlow/DAGNode.tsx @@ -15,17 +15,15 @@ export interface DAGNodeProps { hasInput?: boolean; accentBackground?: boolean; } -export const DAGNode: FC<{ data: DAGNodeProps }> = ({ - data: { - label, - height, - width, - onXClick, - onEditClick = () => { }, - color, - hasInput = false, - accentBackground = false, - }, +export const DAGNode: FC = ({ + label, + height, + width, + onXClick, + onEditClick = () => { }, + color, + hasInput = false, + accentBackground = false, }) => { const { classes, theme } = useNodeStyles({ color, diff --git a/webapp/src/components/DAGSvgs/constants.ts b/webapp/src/components/DAGFlow/constants.ts similarity index 100% rename from webapp/src/components/DAGSvgs/constants.ts rename to webapp/src/components/DAGFlow/constants.ts diff --git a/webapp/src/components/DAGFlow/helpers.tsx b/webapp/src/components/DAGFlow/helpers.tsx new file mode 100644 index 0000000..f655ead --- /dev/null +++ b/webapp/src/components/DAGFlow/helpers.tsx @@ -0,0 +1,9 @@ +import { FC } from 'react'; + + +export const convertToFlowNode = ( + Component: FC +): FC<{ data: D }> => + ({ data }) => { + return + } diff --git a/webapp/src/components/DAGFlow/index.stories.tsx b/webapp/src/components/DAGFlow/index.stories.tsx index c0c6c0f..89ff2bc 100644 --- a/webapp/src/components/DAGFlow/index.stories.tsx +++ b/webapp/src/components/DAGFlow/index.stories.tsx @@ -4,7 +4,7 @@ import React from "react"; import { ComponentMeta, ComponentStory } from '@storybook/react'; import { DAGAutomationFlow } from '.'; import { useState } from 'react'; -import * as dgconst from "components/DAGSvgs/constants"; +import * as dgconst from "components/DAGFlow/constants"; export default { @@ -210,3 +210,24 @@ EmptyStart.args = { trigger: [], sequence: [] } + + +export const Errors = Template.bind({}) +Errors.args = { + ...Errors.args, + condition: [ + { + "condition": "numeric_state", + } as any + ], + trigger: [ + { + "platform": "event", + } as any + ], + sequence: [ + { + "choose": {} + } as any + ] +} \ No newline at end of file diff --git a/webapp/src/components/DAGFlow/index.tsx b/webapp/src/components/DAGFlow/index.tsx index c48cd13..89701fc 100644 --- a/webapp/src/components/DAGFlow/index.tsx +++ b/webapp/src/components/DAGFlow/index.tsx @@ -14,9 +14,12 @@ import { MultiNodeEditor } from "components/MultiNodeEditors"; import { Modal } from "components/Modal"; import { AutomationCondition } from "types/automations/conditions"; import { makeConditionPoint } from "./flowDataMods"; +import { convertToFlowNode } from "./helpers"; +import { DAGErrorNode } from "./DAGErrorNode"; const nodeTypes = { - 'dagnode': DAGNode, + 'dagnode': convertToFlowNode(DAGNode), + 'errornode': convertToFlowNode(DAGErrorNode), 'dagcircle': DAGCircle, } @@ -61,6 +64,7 @@ export const DAGAutomationFlow: FC = ({ if (modalState.single) { modalBody = setModalState(null)} onSave={n => { modalState.update(n as any); setModalState(null); }} allowedTypes={modalState.allowedTypes} @@ -123,7 +127,7 @@ export const DAGAutomationFlow: FC = ({ }, makeSequenceUpdater(sequence, onSequenceUpdate, setModalState), ); - + console.log(flowData) // render return <> diff --git a/webapp/src/components/DAGFlow/sequenceConvertor.ts b/webapp/src/components/DAGFlow/sequenceConvertor.ts index e3dfff8..b241165 100644 --- a/webapp/src/components/DAGFlow/sequenceConvertor.ts +++ b/webapp/src/components/DAGFlow/sequenceConvertor.ts @@ -38,7 +38,16 @@ export const sequenceToFlow = ( // draw node if (getNodeType(node) === 'action') { if ('choose' in node) { - position = addChooseNode(flowData, node, position, nodeId, dims, updater, i) + try { + const out = addChooseNode(node, position, nodeId, dims, updater, i); + position = out.lastPos + console.log(out); + flowData = mergeFlowDatas(flowData, out.flowData); + console.log(flowData); + } catch (err) { + console.error(err) + addErrorNode(flowData, nodeId, position, dims, err, updater.makeOnEditForBadNode(i)); + } } else { addSingleNode(flowData, node, position, nodeId, dims, { onEditClick: updater.makeOnModalOpenForNode(i, node), @@ -56,6 +65,7 @@ export const sequenceToFlow = ( lastPointId = nodeId; lasPos = position; } + // add button const addCircle = makeAddButton( `${prefix}-+`, @@ -117,10 +127,33 @@ const addSingleNode = ( position, }); +const addErrorNode = ( + flowData: FlowData, + nodeId: string, + position: XYPosition, + { + nodeHeight, + nodeWidth, + }: DAGAutomationFlowDims, + error: any, + onEdit: () => void, + hasInput: boolean = true, +) => flowData.nodes.push({ + id: nodeId, + type: 'errornode', + position, + data: { + height: nodeHeight, + width: nodeWidth, + hasInput, + onEdit, + error, + } +}) + const addChooseNode = ( - flowData: FlowData, node: ChooseAction, position: XYPosition, nodeId: string, @@ -128,6 +161,10 @@ const addChooseNode = ( updater: SequenceUpdater, i: number, ) => { + const flowData: FlowData = { + nodes: [], + edges: [], + }; addSingleNode(flowData, node, position, nodeId, dims, { onEditClick: updater.makeOnModalOpenForNode(i, node), onXClick: () => updater.removeNode(i), @@ -221,5 +258,11 @@ const addChooseNode = ( } else { lastPos = xyApply(lastPos, elseCircle.position, Math.max) } - return lastPos + return { lastPos, flowData } +} + +export const mergeFlowDatas = (fd1: FlowData, fd2: FlowData): FlowData => { + fd1.edges = fd1.edges.concat(fd2.edges); + fd1.nodes = fd1.nodes.concat(fd2.nodes); + return fd1 } \ No newline at end of file diff --git a/webapp/src/components/DAGFlow/types.ts b/webapp/src/components/DAGFlow/types.ts index e9477a0..de992e8 100644 --- a/webapp/src/components/DAGFlow/types.ts +++ b/webapp/src/components/DAGFlow/types.ts @@ -4,6 +4,7 @@ import { DAGCircleProps } from './DAGCircle'; import { DAGNodeProps } from './DAGNode'; import { AutomationTrigger } from 'types/automations/triggers'; import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types'; +import { DAGErrorNodeProps } from './DAGErrorNode'; export type DAGAutomationFlowDims = { @@ -16,7 +17,7 @@ export type DAGAutomationFlowDims = { distanceFactor: number; } -export type DAGAutomationFlowNode = Node; +export type DAGAutomationFlowNode = Node; export type FlowData = { nodes: DAGAutomationFlowNode[], edges: Edge[], @@ -34,6 +35,7 @@ export type UpdateModalState = { single: true, + isError?: boolean, node: T update: (n: T) => void; saveBtnCreateText?: boolean; diff --git a/webapp/src/components/DAGFlow/updater.ts b/webapp/src/components/DAGFlow/updater.ts index 925c4f1..ad277c9 100644 --- a/webapp/src/components/DAGFlow/updater.ts +++ b/webapp/src/components/DAGFlow/updater.ts @@ -2,6 +2,7 @@ import { AutomationSequenceNode } from "types/automations"; import { ChooseAction } from "types/automations/actions"; import { AutomationCondition } from "types/automations/conditions"; import { UpdateModalState } from "./types"; +import { getNodeType } from '../../utils/automations'; export type SequenceUpdater = ReturnType; @@ -114,6 +115,16 @@ export const makeSequenceUpdater = ( }) } }, + makeOnEditForBadNode(i: number) { + const node = sequence[i]; + return () => openModal({ + single: true, + isError: true, + node, + allowedTypes: [getNodeType(node)], + update: n => this.updateNode(i, n), + }) + } }); diff --git a/webapp/src/components/Inputs/InputBoolean.css b/webapp/src/components/Inputs/InputBoolean.css index 266a185..2f86029 100644 --- a/webapp/src/components/Inputs/InputBoolean.css +++ b/webapp/src/components/Inputs/InputBoolean.css @@ -10,6 +10,10 @@ background-color: var(--secondary); } +.input-boolean.disabled:hover, .input-boolean.disabled:hover * { + cursor: not-allowed; +} + .input-boolean:hover, .input-boolean:hover * { cursor: pointer; background-color: var(--secondary-opaque); diff --git a/webapp/src/components/Inputs/InputBoolean.tsx b/webapp/src/components/Inputs/InputBoolean.tsx index 4482d6b..2de4fb9 100644 --- a/webapp/src/components/Inputs/InputBoolean.tsx +++ b/webapp/src/components/Inputs/InputBoolean.tsx @@ -4,14 +4,16 @@ export interface Props { label: string; value: boolean; onChange: (v: boolean) => void; + disabled?: boolean; } export default function InputBoolean({ label, value = false, onChange, + disabled = false, }: Props) { - return
onChange(!value)}> - { }} /> + return
onChange(!value)}> + { }} disabled={disabled} />
} diff --git a/webapp/src/components/Inputs/styles.ts b/webapp/src/components/Inputs/styles.ts index 8e01eab..0fe0621 100644 --- a/webapp/src/components/Inputs/styles.ts +++ b/webapp/src/components/Inputs/styles.ts @@ -229,7 +229,10 @@ export const useInputTextAreaStyles = createAppUseStyles<{ resizable: boolean }> return { input: ({ resizable }) => ({ ...styles.input, - resize: resizable ? 'both' : 'none' + resize: resizable ? 'both' : 'none', + minWidth: "calc(100% - 2em)", + maxWidth: "calc(100% - 2em)", + minHeight: "8em" }) } }); diff --git a/webapp/src/components/NodeEditor/OptionManager/index.tsx b/webapp/src/components/NodeEditor/OptionManager/index.tsx index d325523..be685ff 100644 --- a/webapp/src/components/NodeEditor/OptionManager/index.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/index.tsx @@ -2,18 +2,17 @@ import { Dispatch, SetStateAction, useEffect, useState } from 'react'; import { AutomationNode, AutomationNodeTypes } from 'types/automations'; import { AutomationNodeSubtype } from 'types/automations'; import { getOptionManager } from './getOptionManager'; -import { getNodeType, getSubTypeList } from 'utils/automations'; -import { getNodeSubType } from '../constants'; +import { getNodeType, getNodeSubType, getSubTypeList, validateNode } from 'utils/automations'; import InputYaml from 'components/Inputs/InputYaml'; type UseState = (s: S) => [S, Dispatch>] -export const useEditorNodeState = (originalNode: AutomationNode, uState: UseState = useState) => { +export const useEditorNodeState = (originalNode: AutomationNode, isErrored: boolean, uState: UseState = useState) => { const [allState, setAllState] = uState({ node: originalNode, yamlMode: false, isModified: false, - invalidManualYaml: "", + ...computeInvalidYaml(originalNode, isErrored) }); const { node: currentNode, isModified, yamlMode, invalidManualYaml } = allState; useEffect(() => { @@ -25,9 +24,20 @@ export const useEditorNodeState = (originalNode: AutomationNode, uState: UseStat const setStateForManualYaml = (yaml: any) => { try { createData(yaml, yaml) - setAllState({ ...allState, node: yaml, invalidManualYaml: '' }) + const errors = validateNode(yaml); + if (errors) { + setAllState({ + ...allState, invalidManualYaml:
    + {errors.map(({ message, path }, i) =>
  • + {path}: {message} +
  • )} +
+ }) + } else { + setAllState({ ...allState, node: yaml, invalidManualYaml: <> }) + } } catch (err) { - setAllState({ ...allState, invalidManualYaml: String(err) }) + setAllState({ ...allState, invalidManualYaml: <>{String(err)} }) } } const { @@ -42,15 +52,19 @@ export const useEditorNodeState = (originalNode: AutomationNode, uState: UseStat nodeType, subType, subTypes, - yamlMode, setYamlMode, invalidManualYaml, isModified, + isErrored: allState.isErrored, + get yamlMode() { + return allState.isErrored || yamlMode + }, get data() { return currentNode }, renderOptionList() { - if (yamlMode) { + if (yamlMode || allState.isErrored) { + return <> - {invalidManualYaml} +
{invalidManualYaml}
} return optionManager.renderOptionList(currentNode, setState); @@ -100,4 +114,23 @@ const createData = (originalNode: AutomationNode, currentNode: AutomationNode) = subTypes, optionManager, } +} + +const computeInvalidYaml = (node: AutomationNode, isErrored: boolean) => { + const errors = validateNode(node); + if (errors) { + return { + isErrored: true, + invalidManualYaml:
    + {errors.map(({ message, path }, i) =>
  • + {path}: {message} +
  • )} +
+ } + } else { + return { + isErrored, + invalidManualYaml: <> + } + } } \ No newline at end of file diff --git a/webapp/src/components/NodeEditor/constants.ts b/webapp/src/components/NodeEditor/constants.ts deleted file mode 100644 index b2ab365..0000000 --- a/webapp/src/components/NodeEditor/constants.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { AutomationNodeSubtype, AutomationNodeTypes } from "types/automations"; -import { AutomationNode } from '../../types/automations/index'; - - -const actionTypes = [ - 'choose', - 'device', - 'event', - 'repeat', - 'service', - 'wait', -] as AutomationNodeSubtype<'action'>[]; - -const conditionTypes = [ - 'and', - 'not', - 'numeric_state', - 'or', - 'state', - 'template', - 'time', - 'trigger', - 'zone', -] as AutomationNodeSubtype<'condition'>[]; - -const triggerTypes = [ - 'device', - 'event', - 'homeassistant', - 'mqtt', - 'numeric_state', - 'state', - 'tag', - 'template', - 'time', - 'time_pattern', - 'webhook', - 'zone', -] as AutomationNodeSubtype<'trigger'>[]; - -export const getSubTypeList = ( - nodeType: T -): Array | 'condition'> => { - if (nodeType === 'action') { - return actionTypes as any; - } else if (nodeType === 'condition') { - return conditionTypes as any; - } else if (nodeType === 'trigger') { - return triggerTypes as any; - } - return []; -} - -export const getNodeSubType = ( - node: AutomationNode -): AutomationNodeSubtype => { - if ('condition' in node) { - return node.condition as any; - } else if ('platform' in node) { - return node.platform as any; - } else if ('service' in node) { - return 'service' as any - } else if ('repeat' in node) { - return 'repeat' as any - } else if ('wait_template' in node) { - return 'wait' as any - } else if ('event' in node) { - return 'event' as any - } else if ('device_id' in node) { - return 'device' as any - } else if ('choose' in node) { - return 'choose' as any - } else { - throw new Error("Invalid node type!") - } -} diff --git a/webapp/src/components/NodeEditor/index.css b/webapp/src/components/NodeEditor/index.css index 2fac625..d95ee2f 100644 --- a/webapp/src/components/NodeEditor/index.css +++ b/webapp/src/components/NodeEditor/index.css @@ -51,4 +51,10 @@ width: 100%; min-height: 50px; min-width: 25vw; +} + +.node-editor--error { + max-width: 30em; + overflow: auto; + max-height: 10em; } \ No newline at end of file diff --git a/webapp/src/components/NodeEditor/index.tsx b/webapp/src/components/NodeEditor/index.tsx index 1368c7b..1916be8 100644 --- a/webapp/src/components/NodeEditor/index.tsx +++ b/webapp/src/components/NodeEditor/index.tsx @@ -14,6 +14,7 @@ export interface NodeEditorProps { onSave?: (n: AutomationNode) => void; onFlags?: (isReady: boolean, isModified: boolean) => void; saveBtnCreateText?: boolean; + isErrored?: boolean; } export const NodeEditor: FC = ({ @@ -23,10 +24,11 @@ export const NodeEditor: FC = ({ onSave = () => { }, onFlags = () => { }, saveBtnCreateText = false, - children + children, + isErrored = false, }) => { // state - const state = useEditorNodeState(node); + const state = useEditorNodeState(node, isErrored); // alias const isModified = state.isModified; @@ -53,7 +55,7 @@ export const NodeEditor: FC = ({ options={state.subTypes} onChange={state.setSubType} /> : <>} - +
{state.renderOptionList()} diff --git a/webapp/src/routes/automation.tsx b/webapp/src/routes/automation.tsx index 30e3237..1863ced 100644 --- a/webapp/src/routes/automation.tsx +++ b/webapp/src/routes/automation.tsx @@ -1,6 +1,6 @@ import { ApiService } from 'apiService/core'; import { ConnectedAutomationList } from "components/AutomationList"; -import { DEFAULT_DIMS } from "components/DAGSvgs/constants"; +import { DEFAULT_DIMS } from "components/DAGFlow/constants"; import { FC } from "react"; diff --git a/webapp/src/styles/root.css b/webapp/src/styles/root.css index 0769795..1e90c02 100644 --- a/webapp/src/styles/root.css +++ b/webapp/src/styles/root.css @@ -12,6 +12,7 @@ --green-light: #6f5; --error: #c55; --error-light: #f77; + --error-dark: #5c2323; --error-opaque: #c555; --error-accent: #9f3a3a; --change: #0f9; diff --git a/webapp/src/types/automations/actions.ts b/webapp/src/types/automations/actions.ts index 2123079..0268c28 100644 --- a/webapp/src/types/automations/actions.ts +++ b/webapp/src/types/automations/actions.ts @@ -1,38 +1,22 @@ import { AutomationSequenceNode } from "."; import { AutomationTime } from "./common"; import { AutomationCondition } from "./conditions"; +import * as v from "types/validators/actions"; +import * as st from 'superstruct'; -type AutomationActionNodeBase = Data & { - alias?: string; - variables?: Record; -} +type AutomationActionNodeBase = Data & + st.Infer; -export type ServiceAction = AutomationActionNodeBase<{ - service: string; - target?: any; - data: any; -}> +export type ServiceAction = st.Infer; export type RepeatAction = AutomationActionNodeBase<{ repeat: { count: number; sequence: AutomationAction[]; } }> -export type WaitAction = AutomationActionNodeBase<{ - wait_template: string; - timeout?: AutomationTime; - continue_on_timeout?: boolean; -}> -export type FireEventAction = AutomationActionNodeBase<{ - event: string; - event_data: any; -}> -export type DeviceAction = AutomationActionNodeBase<{ - type: string; - device_id: string; - entity_id?: string; - domain: string; -}> +export type WaitAction = st.Infer; +export type FireEventAction = st.Infer; +export type DeviceAction = st.Infer; export type ChooseAction = AutomationActionNodeBase<{ choose: Array<{ conditions: AutomationCondition[]; diff --git a/webapp/src/types/automations/index.ts b/webapp/src/types/automations/index.ts index fa781df..17d2048 100644 --- a/webapp/src/types/automations/index.ts +++ b/webapp/src/types/automations/index.ts @@ -19,15 +19,13 @@ export type AutomationNodeMapping = { "action": AutomationAction; "condition": AutomationCondition; } -export type AutomationNodeTypes = keyof AutomationNodeMapping | undefined; +export type AutomationNodeTypes = keyof AutomationNodeMapping; export type AutomationNode = - N extends undefined ? AutomationTrigger : N extends 'trigger' ? AutomationTrigger : N extends 'action' ? AutomationAction : N extends 'condition' ? AutomationCondition : never; export type AutomationNodeSubtype = - T extends undefined ? TriggerType : T extends 'trigger' ? TriggerType : T extends 'action' ? ActionType : T extends 'condition' ? ConditionType : diff --git a/webapp/src/types/automations/triggers.ts b/webapp/src/types/automations/triggers.ts index 02c865b..4656949 100644 --- a/webapp/src/types/automations/triggers.ts +++ b/webapp/src/types/automations/triggers.ts @@ -1,5 +1,4 @@ import * as st from 'superstruct' -import { AutomationTime } from "./common"; import * as v from "types/validators/triggers"; interface AutomationTriggerBase { diff --git a/webapp/src/types/validators/actions.ts b/webapp/src/types/validators/actions.ts index d1b5f10..1e5f0a9 100644 --- a/webapp/src/types/validators/actions.ts +++ b/webapp/src/types/validators/actions.ts @@ -1,24 +1,68 @@ import * as st from 'superstruct' +import { AutomationTime } from './common'; -const AutomationActionNodeBase = { +export const AutomationActionNodeBase = st.type({ alias: st.optional(st.string()), variables: st.optional(st.record(st.string(), st.any())), -} - -export const ServiceAction = st.object({ - ...AutomationActionNodeBase, - data: st.any(), - target: st.any(), - service: st.string(), }) -export const RepeatAction = st.object({ - ...AutomationActionNodeBase, - repeat: st.object({ - count: st.number(), - sequence: st.array(), +export const ServiceAction = st.intersection([ + AutomationActionNodeBase, + st.type({ + data: st.any(), + target: st.any(), + service: st.string(), }) -}) +]); + +export const RepeatAction = st.intersection([ + AutomationActionNodeBase, + st.type({ + repeat: st.object({ + count: st.number(), + sequence: st.array(st.object()), + }) + }) +]); + +export const WaitAction = st.intersection([ + AutomationActionNodeBase, + st.type({ + wait_template: st.string(), + timeout: st.optional(AutomationTime), + continue_on_timeout: st.optional(st.boolean()), + }) +]); + +export const FireEventAction = st.intersection([ + AutomationActionNodeBase, + st.type({ + event: st.string(), + event_data: st.any(), + }) +]); + +export const DeviceAction = st.intersection([ + AutomationActionNodeBase, + st.type({ + type: st.string(), + device_id: st.string(), + entity_id: st.optional(st.string()), + domain: st.string(), + }) +]); + +export const ChooseAction = st.intersection([ + AutomationActionNodeBase, + st.type({ + choose: st.array(st.type({ + conditions: st.array(st.object()), + sequence: st.array(st.object()), + })), + default: st.optional(st.array(st.object())), + }) +]); + diff --git a/webapp/src/types/validators/index.ts b/webapp/src/types/validators/index.ts new file mode 100644 index 0000000..c10c473 --- /dev/null +++ b/webapp/src/types/validators/index.ts @@ -0,0 +1,2 @@ +export * as actions from "./actions" +export * as triggers from "./triggers" \ No newline at end of file diff --git a/webapp/src/types/validators/triggers.ts b/webapp/src/types/validators/triggers.ts index 3400ebe..631a847 100644 --- a/webapp/src/types/validators/triggers.ts +++ b/webapp/src/types/validators/triggers.ts @@ -7,7 +7,7 @@ const AutomationTriggerBase = { id: st.optional(st.string()), } -export const AutomationTriggerEvent = st.object({ +export const AutomationTriggerEvent = st.type({ ...AutomationTriggerBase, platform: st.literal('event'), event_type: st.union([st.string(), st.array(st.string())]), @@ -15,13 +15,13 @@ export const AutomationTriggerEvent = st.object({ context: st.any(), }) -export const AutomationTriggerHA = st.object({ +export const AutomationTriggerHA = st.type({ ...AutomationTriggerBase, platform: st.literal('homeassistant'), event: st.enums(['start', 'shutdown']), }) -export const AutomationTriggerMQTT = st.object({ +export const AutomationTriggerMQTT = st.type({ ...AutomationTriggerBase, platform: st.literal('mqtt'), topic: st.string(), @@ -29,7 +29,7 @@ export const AutomationTriggerMQTT = st.object({ value_template: st.string(), }) -export const AutomationTriggerNumericState = st.object({ +export const AutomationTriggerNumericState = st.type({ ...AutomationTriggerBase, platform: st.literal('numeric_state'), entity_id: st.union([st.string(), st.array(st.string())]), @@ -40,7 +40,7 @@ export const AutomationTriggerNumericState = st.object({ for: st.optional(AutomationTime), }) -export const AutomationTriggerState = st.object({ +export const AutomationTriggerState = st.type({ ...AutomationTriggerBase, platform: st.literal('state'), entity_id: st.union([st.string(), st.array(st.string())]), @@ -50,27 +50,27 @@ export const AutomationTriggerState = st.object({ for: st.optional(AutomationTime), }) -export const AutomationTriggerTag = st.object({ +export const AutomationTriggerTag = st.type({ ...AutomationTriggerBase, platform: st.literal('tag'), tag_id: st.string(), device_id: st.union([st.string(), st.array(st.string())]), }) -export const AutomationTriggerTemplate = st.object({ +export const AutomationTriggerTemplate = st.type({ ...AutomationTriggerBase, platform: st.literal('template'), value_template: st.string(), for: st.optional(AutomationTime), }) -export const AutomationTriggerTime = st.object({ +export const AutomationTriggerTime = st.type({ ...AutomationTriggerBase, platform: st.literal('time'), at: AutomationTimeString, }) -export const AutomationTriggerTimePattern = st.object({ +export const AutomationTriggerTimePattern = st.type({ ...AutomationTriggerBase, platform: st.literal('time_pattern'), hours: st.optional(st.string()), @@ -78,13 +78,13 @@ export const AutomationTriggerTimePattern = st.object({ seconds: st.optional(st.string()), }) -export const AutomationTriggerWebhook = st.object({ +export const AutomationTriggerWebhook = st.type({ ...AutomationTriggerBase, platform: st.literal('webhook'), webhook_id: st.string(), }) -export const AutomationTriggerZone = st.object({ +export const AutomationTriggerZone = st.type({ ...AutomationTriggerBase, platform: st.literal('zone'), entity_id: st.union([st.string(), st.array(st.string())]), @@ -92,7 +92,7 @@ export const AutomationTriggerZone = st.object({ event: st.enums(['enter', 'leave']) }) -export const AutomationTriggerDevice = st.object({ +export const AutomationTriggerDevice = st.type({ ...AutomationTriggerBase, platform: st.literal('device'), entity_id: st.optional(st.string()), diff --git a/webapp/src/utils/automations.ts b/webapp/src/utils/automations.ts index 9a3312b..053d368 100644 --- a/webapp/src/utils/automations.ts +++ b/webapp/src/utils/automations.ts @@ -1,5 +1,8 @@ +import * as v from "types/validators"; import { AutomationNode, AutomationNodeMapping, AutomationNodeSubtype, AutomationNodeTypes } from "types/automations"; import { AutomationTrigger } from 'types/automations/triggers'; +import { MiniFailure } from "types/validators/helper"; +import { getFailures } from '../types/validators/helper'; export const getNodeType = (node: AutomationNode): AutomationNodeTypes => { @@ -78,3 +81,82 @@ export const makeDefault = (nodeType: keyof AutomationNodeMapping): AutomationNo } as AutomationTrigger } } + + +export const getNodeSubType = ( + node: AutomationNode +): AutomationNodeSubtype => { + if ('condition' in node) { + return node.condition as any; + } else if ('platform' in node) { + return node.platform as any; + } else if ('service' in node) { + return 'service' as any + } else if ('repeat' in node) { + return 'repeat' as any + } else if ('wait_template' in node) { + return 'wait' as any + } else if ('event' in node) { + return 'event' as any + } else if ('device_id' in node) { + return 'device' as any + } else if ('choose' in node) { + return 'choose' as any + } else { + throw new Error("Invalid node type!") + } +} + + +export const validateNode = (node: AutomationNode): MiniFailure[] | null => { + const nodeType = getNodeType(node); + try { + const nodeSubType = getNodeSubType(node); + if (nodeType === 'action') { + if (nodeSubType === 'service') { + return getFailures(node, v.actions.ServiceAction) + } else if (nodeSubType === 'repeat') { + return getFailures(node, v.actions.RepeatAction) + } else if (nodeSubType === 'wait') { + return getFailures(node, v.actions.WaitAction) + } else if (nodeSubType === 'event') { + return getFailures(node, v.actions.FireEventAction) + } else if (nodeSubType === 'device') { + return getFailures(node, v.actions.DeviceAction) + } else if (nodeSubType === 'choose') { + return getFailures(node, v.actions.ChooseAction) + } + } else if (nodeType === 'trigger') { + if (nodeSubType === 'event') { + return getFailures(node, v.triggers.AutomationTriggerEvent) + } else if (nodeSubType === 'homeassistant') { + return getFailures(node, v.triggers.AutomationTriggerHA) + } else if (nodeSubType === 'mqtt') { + return getFailures(node, v.triggers.AutomationTriggerMQTT) + } else if (nodeSubType === 'numeric_state') { + return getFailures(node, v.triggers.AutomationTriggerNumericState) + } else if (nodeSubType === 'state') { + return getFailures(node, v.triggers.AutomationTriggerState) + } else if (nodeSubType === 'tag') { + return getFailures(node, v.triggers.AutomationTriggerTag) + } else if (nodeSubType === 'template') { + return getFailures(node, v.triggers.AutomationTriggerTemplate) + } else if (nodeSubType === 'time') { + return getFailures(node, v.triggers.AutomationTriggerTime) + } else if (nodeSubType === 'time_pattern') { + return getFailures(node, v.triggers.AutomationTriggerTimePattern) + } else if (nodeSubType === 'webhook') { + return getFailures(node, v.triggers.AutomationTriggerWebhook) + } else if (nodeSubType === 'zone') { + return getFailures(node, v.triggers.AutomationTriggerZone) + } else if (nodeSubType === 'device') { + return getFailures(node, v.triggers.AutomationTriggerDevice) + } + } + } catch (err) { + console.warn(err) + } + return [ + { "message": ["Invalid or unknown " + nodeType], "path": "" }, + ] +} \ No newline at end of file