From 56baef26626d32e1fd898badfc7194c3c90dd8ba Mon Sep 17 00:00:00 2001 From: Ari Date: Wed, 13 Apr 2022 13:52:25 -0400 Subject: [PATCH] more trigger editors --- .../components/Inputs/InputTime.stories.tsx | 4 +- .../OptionManager/TriggerNumericState.tsx | 63 +++++++++++++++++++ .../OptionManager/getOptionManager.ts | 61 +++++++++--------- webapp/src/types/automations/triggers.ts | 8 +-- 4 files changed, 100 insertions(+), 36 deletions(-) create mode 100644 webapp/src/components/NodeEditor/OptionManager/TriggerNumericState.tsx diff --git a/webapp/src/components/Inputs/InputTime.stories.tsx b/webapp/src/components/Inputs/InputTime.stories.tsx index cb2ba68..e9f9d79 100644 --- a/webapp/src/components/Inputs/InputTime.stories.tsx +++ b/webapp/src/components/Inputs/InputTime.stories.tsx @@ -13,9 +13,7 @@ export default { const Template: ComponentStory = args => { - const [value, setValue] = useState({ - - }) + const [value, setValue] = useState(undefined); return
diff --git a/webapp/src/components/NodeEditor/OptionManager/TriggerNumericState.tsx b/webapp/src/components/NodeEditor/OptionManager/TriggerNumericState.tsx new file mode 100644 index 0000000..0e3df91 --- /dev/null +++ b/webapp/src/components/NodeEditor/OptionManager/TriggerNumericState.tsx @@ -0,0 +1,63 @@ +import { OptionManager } from './OptionManager'; +import { AutomationTriggerNumericState } from 'types/automations/triggers'; +import InputText from 'components/Inputs/InputText'; +import { InputEntity } from 'components/Inputs/InputTextBubble'; +import InputNumber from 'components/Inputs/InputNumber'; +import InputTextArea from 'components/Inputs/InputTextArea'; +import InputTime from 'components/Inputs/InputTime'; + + +export const TriggerNumericState: OptionManager = { + defaultState: () => ({ + $smType: 'trigger', + "alias": "", + "platform": 'numeric_state', + "entity_id": "", + }), + isReady: ({ alias }) => { + return (alias !== '') + }, + renderOptionList: (state, setState) => { + return <> + setState({ + ...state, + entity_id + })} + /> + setState({ + ...state, + attribute + })} /> + setState({ + ...state, + above: above ? String(above) : undefined, + })} + /> + setState({ + ...state, + below: below ? String(below) : undefined, + })} + /> + setState({ + ...state, + value_template + })} resizable /> + setState({ + ...state, + for: _for, + })} + /> + + } +} diff --git a/webapp/src/components/NodeEditor/OptionManager/getOptionManager.ts b/webapp/src/components/NodeEditor/OptionManager/getOptionManager.ts index 25897f0..b703f36 100644 --- a/webapp/src/components/NodeEditor/OptionManager/getOptionManager.ts +++ b/webapp/src/components/NodeEditor/OptionManager/getOptionManager.ts @@ -11,41 +11,44 @@ import { ActionEventState } from "./ActionEvent"; import { TriggerEventState } from "./TriggerEvent"; import { TriggerHAState } from "./TriggerHA"; import { TriggerMQTTState } from "./TriggerMQTT"; +import { TriggerNumericState } from "./TriggerNumericState"; export const getOptionManager = ( - nodeType: T, - nodeSubtype: AutomationNodeSubtype, -) : OptionManager => { - if ( nodeType === 'action') { - switch (nodeSubtype) { - case "choose": - return ActionChooseState; - case "device": - return ActionDeviceState; - case 'event': - return ActionEventState; - case "repeat": - return ActionRepeatState; - case 'service': - return ActionCallServiceState; - case "wait": - return ActionWaitState; - } - } - if (nodeType === 'condition') { - return ConditionLogicState + nodeType: T, + nodeSubtype: AutomationNodeSubtype, +): OptionManager => { + if (nodeType === 'action') { + switch (nodeSubtype) { + case "choose": + return ActionChooseState; + case "device": + return ActionDeviceState; + case 'event': + return ActionEventState; + case "repeat": + return ActionRepeatState; + case 'service': + return ActionCallServiceState; + case "wait": + return ActionWaitState; } + } + if (nodeType === 'condition') { + return ConditionLogicState + } if (nodeType === "trigger") { - switch (nodeSubtype) { - case "event": - return TriggerEventState - case "homeassistant": - return TriggerHAState - case "mqtt": - return TriggerMQTTState - } + switch (nodeSubtype) { + case "event": + return TriggerEventState + case "homeassistant": + return TriggerHAState + case "mqtt": + return TriggerMQTTState + case "numeric_state": + return TriggerNumericState } + } return Generic } diff --git a/webapp/src/types/automations/triggers.ts b/webapp/src/types/automations/triggers.ts index 02e8e3e..670f792 100644 --- a/webapp/src/types/automations/triggers.ts +++ b/webapp/src/types/automations/triggers.ts @@ -1,8 +1,8 @@ import { AutomationTime } from "./common"; interface AutomationTriggerBase { - alias?: string; - $smType: undefined | 'trigger'; + alias?: string; + $smType: undefined | 'trigger'; } export interface AutomationTriggerEvent extends AutomationTriggerBase { @@ -75,7 +75,7 @@ export interface AutomationTriggerDevice extends AutomationTriggerBase { type: string; subtype: string; } -export type AutomationTrigger = +export type AutomationTrigger = | AutomationTriggerEvent | AutomationTriggerHA | AutomationTriggerMQTT @@ -88,5 +88,5 @@ export type AutomationTrigger = | AutomationTriggerWebhook | AutomationTriggerZone | AutomationTriggerDevice -; + ; export type TriggerType = AutomationTrigger['platform'];