From f66895d0ebe6bb404a95d60ea879dd1687c154a0 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 3 Nov 2021 09:27:21 -0400 Subject: [PATCH] added more state managers --- web/package.json | 2 + .../StateManager/ConditionLogic.tsx | 40 +++++++++++++++ .../automation/StateManager/ScriptChoose.tsx | 37 ++++++++++++++ .../automation/StateManager/ScriptDevice.tsx | 51 +++++++++++++++++++ .../automation/StateManager/ScriptEvent.tsx | 39 ++++++++++++++ .../automation/StateManager/ScriptRepeat.tsx | 9 ++-- .../automation/StateManager/ScriptWait.tsx | 2 +- .../automation/StateManager/getBaseState.ts | 16 ++++++ web/src/automation/types/condition.ts | 4 +- web/src/automation/utils.ts | 6 +-- web/src/components/InputList.tsx | 11 ++-- web/src/components/InputYaml.tsx | 39 ++++++++++++++ web/src/styles/common.scss | 7 +++ web/yarn.lock | 17 +++++++ 14 files changed, 266 insertions(+), 14 deletions(-) create mode 100644 web/src/automation/StateManager/ConditionLogic.tsx create mode 100644 web/src/automation/StateManager/ScriptChoose.tsx create mode 100644 web/src/automation/StateManager/ScriptDevice.tsx create mode 100644 web/src/automation/StateManager/ScriptEvent.tsx create mode 100644 web/src/components/InputYaml.tsx diff --git a/web/package.json b/web/package.json index 3746eef..fcd5b68 100644 --- a/web/package.json +++ b/web/package.json @@ -1,5 +1,6 @@ { "dependencies": { + "js-yaml": "^4.1.0", "parcel": "^2.0.0", "react": "^17.0.2", "react-dom": "^17.0.2", @@ -9,6 +10,7 @@ "@parcel/transformer-sass": "^2.0.0", "@parcel/transformer-yaml": "^2.0.0", "@types/jest": "^27.0.2", + "@types/js-yaml": "^4.0.4", "@types/node": "^16.11.6", "@types/react": "^17.0.33", "@types/react-dom": "^17.0.10", diff --git a/web/src/automation/StateManager/ConditionLogic.tsx b/web/src/automation/StateManager/ConditionLogic.tsx new file mode 100644 index 0000000..a825795 --- /dev/null +++ b/web/src/automation/StateManager/ConditionLogic.tsx @@ -0,0 +1,40 @@ +import InputBoolean from "../../components/InputBoolean"; +import InputYaml from "../../components/InputYaml"; +import InputNumber from "../../components/InputNumber"; +import InputText from "../../components/InputText"; +import { BaseState } from "./BaseState"; +import { LogicCondition } from "../types/condition"; +import InputList from "../../components/InputList"; + + +export default class ConditionLogicState extends BaseState { + defaultState = () => ({ + alias: "", + condition: 'and', + conditions: [], + } as LogicCondition) + isReady(state: LogicCondition): boolean { + return state.alias !== '' && + (state?.conditions)?.length > 0 + } + renderOptionList(state: LogicCondition): JSX.Element { + return
+ this.setState({...state, alias})} + /> + this.setState({...state, condition})} + /> + this.setState({...state, conditions})} + /> +
+ } +} \ No newline at end of file diff --git a/web/src/automation/StateManager/ScriptChoose.tsx b/web/src/automation/StateManager/ScriptChoose.tsx new file mode 100644 index 0000000..f065794 --- /dev/null +++ b/web/src/automation/StateManager/ScriptChoose.tsx @@ -0,0 +1,37 @@ +import InputBoolean from "../../components/InputBoolean"; +import InputYaml from "../../components/InputYaml"; +import InputNumber from "../../components/InputNumber"; +import InputText from "../../components/InputText"; +import { ChooseScript } from "../types/script"; +import { BaseState } from "./BaseState"; + + +export default class ScriptChooseState extends BaseState { + defaultState = () => ({ + alias: "Choose", + default: [], + choose: [], + }) + isReady(state: ChooseScript): boolean { + return state.alias !== '' + } + renderOptionList(state: ChooseScript): JSX.Element { + return
+ this.setState({...state, alias})} + /> + this.setState({...state, choose})} + /> + this.setState({...state, default: d})} + /> +
+ } +} \ No newline at end of file diff --git a/web/src/automation/StateManager/ScriptDevice.tsx b/web/src/automation/StateManager/ScriptDevice.tsx new file mode 100644 index 0000000..368bcd8 --- /dev/null +++ b/web/src/automation/StateManager/ScriptDevice.tsx @@ -0,0 +1,51 @@ +import InputBoolean from "../../components/InputBoolean"; +import InputYaml from "../../components/InputYaml"; +import InputNumber from "../../components/InputNumber"; +import InputText from "../../components/InputText"; +import { DeviceScript } from "../types/script"; +import { BaseState } from "./BaseState"; + + +export default class ScriptDeviceState extends BaseState { + defaultState = () => ({ + alias: "Device", + type: "", + entity_id: "", + device_id: "", + domain: "", + }) + isReady(state: DeviceScript): boolean { + return state.alias !== '' && + state.type !== "" && + state.entity_id !== "" && + state.device_id !== "" && + state.domain !== "" + } + renderOptionList(state: DeviceScript): JSX.Element { + return
+ this.setState({...state, alias})} + /> + this.setState({...state, device_id})} + /> + this.setState({...state, type})} + /> + this.setState({...state, entity_id, domain: entity_id.split('.')[0]})} + /> +
+ } +} \ No newline at end of file diff --git a/web/src/automation/StateManager/ScriptEvent.tsx b/web/src/automation/StateManager/ScriptEvent.tsx new file mode 100644 index 0000000..243780c --- /dev/null +++ b/web/src/automation/StateManager/ScriptEvent.tsx @@ -0,0 +1,39 @@ +import InputBoolean from "../../components/InputBoolean"; +import InputYaml from "../../components/InputYaml"; +import InputNumber from "../../components/InputNumber"; +import InputText from "../../components/InputText"; +import { FireEventScript } from "../types/script"; +import { BaseState } from "./BaseState"; + + +export default class ScriptEventState extends BaseState { + defaultState = () => ({ + alias: "Fire Event", + event: "", + event_data: {}, + }) + isReady(state: FireEventScript): boolean { + return state.alias !== '' && + state.event !== "" + } + renderOptionList(state: FireEventScript): JSX.Element { + return
+ this.setState({...state, alias})} + /> + this.setState({...state, event})} + /> + this.setState({...state, event_data})} + /> +
+ } +} \ No newline at end of file diff --git a/web/src/automation/StateManager/ScriptRepeat.tsx b/web/src/automation/StateManager/ScriptRepeat.tsx index 803b856..b84a483 100644 --- a/web/src/automation/StateManager/ScriptRepeat.tsx +++ b/web/src/automation/StateManager/ScriptRepeat.tsx @@ -1,5 +1,6 @@ import InputNumber from "../../components/InputNumber"; import InputText from "../../components/InputText"; +import InputYaml from "../../components/InputYaml"; import { RepeatScript } from "../types/script"; import { BaseState } from "./BaseState"; @@ -28,9 +29,11 @@ export default class ScriptRepeatState extends BaseState { value={state?.repeat?.count} onChange={count => this.setState({...state, repeat: {...state.repeat, count}})} /> -
- {JSON.stringify(state?.repeat?.sequence)} -
+ this.setState({...state, repeat: {...state.repeat, sequence}})} + /> } } \ No newline at end of file diff --git a/web/src/automation/StateManager/ScriptWait.tsx b/web/src/automation/StateManager/ScriptWait.tsx index 446995e..c5c9bf3 100644 --- a/web/src/automation/StateManager/ScriptWait.tsx +++ b/web/src/automation/StateManager/ScriptWait.tsx @@ -25,7 +25,7 @@ export default class ScriptWaitState extends BaseState { /> this.setState({...state, wait_template})} /> diff --git a/web/src/automation/StateManager/getBaseState.ts b/web/src/automation/StateManager/getBaseState.ts index 4b95cee..5d572c8 100644 --- a/web/src/automation/StateManager/getBaseState.ts +++ b/web/src/automation/StateManager/getBaseState.ts @@ -1,4 +1,8 @@ import { AutomationNodeType, NodeSubType } from "../types" +import ConditionLogicState from "./ConditionLogic" +import ScriptChooseState from "./ScriptChoose" +import ScriptDeviceState from "./ScriptDevice" +import ScriptEventState from "./ScriptEvent" import ScriptRepeatState from "./ScriptRepeat" import ScriptCallServiceState from "./ScriptService" import ScriptWaitState from "./ScriptWait" @@ -16,6 +20,18 @@ export const getBaseState = ( return ScriptRepeatState; case "Wait": return ScriptWaitState; + case "Event": + return ScriptEventState; + case "Device": + return ScriptDeviceState; + case "Choose": + return ScriptChooseState; + } + } + if (node_type === 'condition') { + switch (node_subtype) { + case 'Logic': + return ConditionLogicState } } throw new Error(`Invalid or Not implemented node type ${node_type} -> ${node_subtype}`) diff --git a/web/src/automation/types/condition.ts b/web/src/automation/types/condition.ts index 0876b2f..376df33 100644 --- a/web/src/automation/types/condition.ts +++ b/web/src/automation/types/condition.ts @@ -57,9 +57,7 @@ export type AutomationCondition = | GenericCondition ; export const conditionTypes = [ - 'And' , - 'Or' , - 'Not', + 'Logic', 'Numeric State', 'State', 'Template', diff --git a/web/src/automation/utils.ts b/web/src/automation/utils.ts index c579a75..0196633 100644 --- a/web/src/automation/utils.ts +++ b/web/src/automation/utils.ts @@ -33,11 +33,11 @@ export const determineNodeTypes = (action: AutomationNode) : [AutomationNod if ('condition' in action) { switch (action.condition) { case 'and': - return ['condition', 'And'] + return ['condition', 'Logic'] case 'or': - return ['condition', 'Or'] + return ['condition', 'Logic'] case 'not': - return ['condition', 'Not'] + return ['condition', 'Logic'] case 'numeric_state': return ['condition', 'Numeric State'] case 'state': diff --git a/web/src/components/InputList.tsx b/web/src/components/InputList.tsx index 8b261c4..fa555bc 100644 --- a/web/src/components/InputList.tsx +++ b/web/src/components/InputList.tsx @@ -2,15 +2,18 @@ import { SelectHTMLAttributes } from "react"; import InputWrapper from "./InputWrapper"; -export interface Props { - current: string; - options: readonly string[]; +export interface Props { + current: T; + options: readonly T[]; onChange: (n: string) => void; id?: string; className?: string; label: string; } -export default function InputList({current, options, onChange, label, ...selattr}: Props) { +export default function InputList({ + current, options, onChange, label, + ...selattr +}: Props) { return