diff --git a/webapp/src/components/NodeEditor/OptionManager/index.tsx b/webapp/src/components/NodeEditor/OptionManager/index.tsx index 1453bc9..882d074 100644 --- a/webapp/src/components/NodeEditor/OptionManager/index.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/index.tsx @@ -4,15 +4,16 @@ import { AutomationNodeSubtype } from 'types/automations'; import { getOptionManager } from './getOptionManager'; import { getNodeType, getNodeSubType, getSubTypeList, validateNode } from 'utils/automations'; import InputYaml from 'components/Inputs/InputYaml'; +import InputText from 'components/Inputs/InputText'; +import { getDescriptionFromAutomationNode } from 'utils/formatting'; type UseState = (s: S) => [S, Dispatch>] export const useEditorNodeState = (originalNode: AutomationNode, isErrored: boolean, uState: UseState = useState) => { const [allState, setAllState] = uState({ - node: originalNode, yamlMode: false, isModified: false, - ...computeInvalidYaml(originalNode, isErrored) + ...computeInvalidYaml(originalNode) }); const { node: currentNode, isModified, yamlMode, invalidManualYaml } = allState; useEffect(() => { @@ -24,20 +25,12 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool const setStateForManualYaml = (yaml: any) => { try { createData(yaml, yaml) - const errors = validateNode(yaml); - if (errors) { - setAllState({ - ...allState, invalidManualYaml: - }) - } else { - setAllState({ ...allState, node: yaml, invalidManualYaml: <> }) - } + setAllState({ + ...allState, + ...computeInvalidYaml(yaml) + }) } catch (err) { - setAllState({ ...allState, invalidManualYaml: <>{String(err)} }) + setAllState({ ...allState, invalidManualYaml: <>{String(err)}, isErrored: true, }) } } const { @@ -63,9 +56,13 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool return currentNode }, renderOptionList() { + const aliasEditor = setState({ + ...allState.node, + alias + })} /> if (yamlMode || allState.isErrored) { - return <> + {aliasEditor} {invalidManualYaml} } - return optionManager.renderOptionList(currentNode, setState); + return <> + {aliasEditor} + {optionManager.renderOptionList(currentNode, setState)} + ; }, isReady() { return optionManager.isReady(currentNode); @@ -115,10 +115,11 @@ const createData = (originalNode: AutomationNode, currentNode: AutomationNode) = } } -const computeInvalidYaml = (node: AutomationNode, isErrored: boolean) => { +const computeInvalidYaml = (node: AutomationNode) => { const errors = validateNode(node); if (errors) { return { + node, isErrored: true, invalidManualYaml:
    {errors.map(({ message, path }, i) =>
  • @@ -128,7 +129,8 @@ const computeInvalidYaml = (node: AutomationNode, isErrored: boolean) => { } } else { return { - isErrored, + node, + isErrored: false, invalidManualYaml: <> } } diff --git a/webapp/src/components/NodeEditor/index.tsx b/webapp/src/components/NodeEditor/index.tsx index 1916be8..eb26ab9 100644 --- a/webapp/src/components/NodeEditor/index.tsx +++ b/webapp/src/components/NodeEditor/index.tsx @@ -35,7 +35,9 @@ export const NodeEditor: FC = ({ const isReady = state.isReady(); const areYouSureNotReady = (what: string) => !isReady ? window.confirm(`This node is missing some values, are you sure you want to ${what}?`) : - true; + state.isErrored ? + window.confirm(`This node contains errors, are you sure you want to ${what}?`) : + true; // events onFlags(isReady, isModified); diff --git a/webapp/src/utils/formatting.ts b/webapp/src/utils/formatting.ts index 2f43851..f2136e1 100644 --- a/webapp/src/utils/formatting.ts +++ b/webapp/src/utils/formatting.ts @@ -16,7 +16,6 @@ export const convertTimeToString = (t: AutomationTime) => { } } export const getDescriptionFromAutomationNode = (node: AutomationNode): string => { - console.log(node) if (node.alias) { return node.alias; }