added initial pre-validation per node

This commit is contained in:
ari committed 2022-05-18 22:23:57 -04:00
1 parent 621f43e5c8
commit 40690293a8
31 files changed
+519 -167

No files matched your search

@@ -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) => [S, Dispatch<SetStateAction<S>>]
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: <ul key={'error'}>
{errors.map(({ message, path }, i) => <li key={i}>
<b>{path}</b>: {message}
</li>)}
</ul>
})
} 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 <>
<InputYaml
label=''
@@ -58,7 +72,7 @@ export const useEditorNodeState = (originalNode: AutomationNode, uState: UseStat
onChange={setStateForManualYaml}
resizable
/>
<span className="node-editor--error">{invalidManualYaml}</span>
<div className="node-editor--error">{invalidManualYaml}</div>
</>
}
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: <ul key={'error'}>
{errors.map(({ message, path }, i) => <li key={i}>
<b>{path}</b>: {message}
</li>)}
</ul>
}
} else {
return {
isErrored,
invalidManualYaml: <></>
}
}
}
@@ -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 = <T extends AutomationNodeTypes>(
nodeType: T
): Array<AutomationNodeSubtype<T> | '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 = <T extends AutomationNodeTypes>(
node: AutomationNode<T>
): AutomationNodeSubtype<T> => {
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!")
}
}
@@ -51,4 +51,10 @@
width: 100%;
min-height: 50px;
min-width: 25vw;
}
.node-editor--error {
max-width: 30em;
overflow: auto;
max-height: 10em;
}
+5 -3
View File
@@ -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<NodeEditorProps> = ({
@@ -23,10 +24,11 @@ export const NodeEditor: FC<NodeEditorProps> = ({
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<NodeEditorProps> = ({
options={state.subTypes}
onChange={state.setSubType}
/> : <></>}
<InputBoolean label="Yaml" onChange={state.setYamlMode} value={state.yamlMode} />
<InputBoolean label="Yaml" onChange={state.setYamlMode} value={state.yamlMode} disabled={state.isErrored} />
</div>
{state.renderOptionList()}
</div>