diff --git a/web/src/components/AutomationEditor/DAGEdge.tsx b/web/src/components/AutomationEditor/DAGEdge.tsx index 84ee926..ffb2175 100644 --- a/web/src/components/AutomationEditor/DAGEdge.tsx +++ b/web/src/components/AutomationEditor/DAGEdge.tsx @@ -14,7 +14,6 @@ export default ({ }: EdgeProp) => { const [_,my] = [(x1+x2)/2, (y1+y2)/2] const theta = Math.atan2(y2 -y1, x2-x1) - Math.PI / 2 - console.log({theta}, Math.sin(theta)) const cx1 = x1 - 45 * Math.sin(theta) const cy1 = my - 30 * Math.cos(theta) const cx2 = x2 + 45 * Math.sin(theta) diff --git a/web/src/components/ConditionEditor/ConditionNode.tsx b/web/src/components/ConditionEditor/ConditionNode.tsx index dd35d67..a5ec662 100644 --- a/web/src/components/ConditionEditor/ConditionNode.tsx +++ b/web/src/components/ConditionEditor/ConditionNode.tsx @@ -34,7 +34,6 @@ export const ConditionNode: FC<{ } else { const Editor = getEditor(condition); childrenConditions = { - console.log({data}) onUpdate(data) }}/> } diff --git a/web/src/components/ConditionEditor/editorRender.tsx b/web/src/components/ConditionEditor/editorRender.tsx index c967cf3..0f3f5f8 100644 --- a/web/src/components/ConditionEditor/editorRender.tsx +++ b/web/src/components/ConditionEditor/editorRender.tsx @@ -1,8 +1,9 @@ import { FC } from "react"; -import { AutomationCondition, TemplateCondition } from "~/automations/types/conditions"; +import { AutomationCondition, LogicCondition, TemplateCondition } from "~/automations/types/conditions"; import { getDescriptionFromAutomationNode } from "~/automations/utils"; import InputText from "../Inputs/InputText"; import InputTextArea from "../Inputs/InputTextArea"; +import { ConditionNode } from "./ConditionNode"; interface Editor extends FC<{ @@ -15,6 +16,12 @@ export const getEditor = (condition: AutomationCondition): Editor => { switch (condition.condition) { case 'template': return TemplateEditor; + case 'and': + return LogicViewer; + case 'or': + return LogicViewer; + case 'not': + return LogicViewer; default: return () =>
Not Ready
} @@ -40,4 +47,65 @@ export const TemplateEditor: Editor = ({ } })} resizable/> +} + + +export const LogicViewer: Editor = ({ + condition, + onChange, +}) => { + + return <> + {condition.condition_data.conditions.map( (c, i) => { + return onChange({ + ...condition, + condition_data: { + ...condition.condition_data, + conditions: [ + ...condition.condition_data.conditions.slice(0, i), + update, + ...condition.condition_data.conditions.slice(i+1) + ] + } + })} + onDelete={which => { + if (which === 'root') { + onChange({ + ...condition, + condition_data: { + ...condition.condition_data, + conditions: condition.condition_data.conditions.slice(0, i).concat( + condition.condition_data.conditions.slice(i+1) + ) + } + }) + } else { + const data = (c as LogicCondition).condition_data; + const update = { + ...condition.condition_data, + conditions: [ + ...condition.condition_data.conditions.slice(0, i), + { + ...c, + condition_data: { + ...data, + conditions: data.conditions.slice(0, which).concat(data.conditions.concat(which+1)) + } + }, + ...condition.condition_data.conditions.slice(i+1) + ] + } + onChange({ + ...condition, + condition_data: update as any + }) + } + }} + /> + } )} + } \ No newline at end of file diff --git a/web/src/components/ConditionEditor/index.stories.tsx b/web/src/components/ConditionEditor/index.stories.tsx index 948c6cf..29d58cc 100644 --- a/web/src/components/ConditionEditor/index.stories.tsx +++ b/web/src/components/ConditionEditor/index.stories.tsx @@ -15,7 +15,9 @@ const Template: ComponentStory = ({condition, ...args}) const {classes} = usePageTheme({}); const [data, setData] = useState(condition); return
- + { + setData(data) + }} />
} diff --git a/web/src/components/ConditionEditor/index.tsx b/web/src/components/ConditionEditor/index.tsx index 530d086..24ade54 100644 --- a/web/src/components/ConditionEditor/index.tsx +++ b/web/src/components/ConditionEditor/index.tsx @@ -27,7 +27,9 @@ export const ConditionEditor: FC<{ displayMode={displayMode} condition={condition} onDelete={onDelete} - onUpdate={onUpdate} + onUpdate={update => { + onUpdate(update) + }} onAddChild={onAddChild} showDelete > diff --git a/web/src/components/Inputs/InputViewEdit.tsx b/web/src/components/Inputs/InputViewEdit.tsx index fb6e754..dc4e6ef 100644 --- a/web/src/components/Inputs/InputViewEdit.tsx +++ b/web/src/components/Inputs/InputViewEdit.tsx @@ -31,7 +31,6 @@ export default function InputViewEdit({ const inputRef = useRef(null); useEffect(() => { if (isEditing && inputRef.current) { - console.log('focusing...') inputRef.current.focus() } }, [inputRef.current, isEditing]);