From d22bba8c4d92e34d6e114d06b8bba83e99e9549b Mon Sep 17 00:00:00 2001 From: Ari Date: Tue, 2 Aug 2022 17:24:58 -0400 Subject: [PATCH] moving things around --- .../AutomationEditor/AutoInfoBox.tsx | 2 +- .../src/components/AutomationEditor/index.tsx | 2 +- .../AutomationManager/Sidebar/index.tsx | 2 +- .../ConditionEditor/ConditionNodeBase.tsx | 2 +- .../ConditionEditor/editorRender.tsx | 8 +- .../SequenceNode/SequenceNodeElement.tsx | 2 +- .../AutoComplete/InputDeviceCapabilties.tsx | 8 +- .../Inputs/AutoComplete/InputTimeEntity.tsx | 2 +- .../{ => Base}/InputBoolean.stories.tsx | 0 .../Inputs/{ => Base}/InputBoolean.tsx | 0 .../Inputs/{ => Base}/InputNumber.css | 0 .../Inputs/{ => Base}/InputNumber.stories.tsx | 0 .../Inputs/{ => Base}/InputNumber.tsx | 0 .../Inputs/{ => Base}/InputText.stories.tsx | 0 .../Inputs/{ => Base}/InputText.tsx | 0 .../Inputs/{ => Base}/InputTime.css | 0 .../Inputs/{ => Base}/InputTime.stories.tsx | 0 .../Inputs/{ => Base}/InputTime.tsx | 1 + .../Inputs/{ => Base}/InputYaml.css | 0 .../Inputs/{ => Base}/InputYaml.stories.tsx | 0 .../Inputs/{ => Base}/InputYaml.tsx | 0 webapp/src/components/Inputs/InputDayTime.tsx | 150 ----------------- .../Inputs/InputTextView.stories.tsx | 2 +- .../NodeEditor/OptionManager/ActionEvent.tsx | 42 +++-- .../NodeEditor/OptionManager/ActionRepeat.tsx | 2 +- .../NodeEditor/OptionManager/ActionStop.tsx | 2 +- .../NodeEditor/OptionManager/ActionWait.tsx | 156 +++++++++++------- .../NodeEditor/OptionManager/TriggerEvent.tsx | 4 +- .../NodeEditor/OptionManager/TriggerMQTT.tsx | 55 +++--- .../OptionManager/TriggerNumericState.tsx | 8 +- .../NodeEditor/OptionManager/TriggerState.tsx | 4 +- .../OptionManager/TriggerTemplate.tsx | 51 +++--- .../NodeEditor/OptionManager/TriggerTime.tsx | 2 +- .../OptionManager/TriggerWebhook.tsx | 35 ++-- .../NodeEditor/OptionManager/index.tsx | 4 +- webapp/src/components/NodeEditor/index.tsx | 2 +- .../ServiceEditor/ServiceEditorField.tsx | 8 +- .../ServiceEditor/index.stories.tsx | 2 +- webapp/src/haService/automation.stories.tsx | 2 +- webapp/src/haService/dr.stories.tsx | 2 +- webapp/src/haService/services.stories.tsx | 2 +- 41 files changed, 227 insertions(+), 337 deletions(-) rename webapp/src/components/Inputs/{ => Base}/InputBoolean.stories.tsx (100%) rename webapp/src/components/Inputs/{ => Base}/InputBoolean.tsx (100%) rename webapp/src/components/Inputs/{ => Base}/InputNumber.css (100%) rename webapp/src/components/Inputs/{ => Base}/InputNumber.stories.tsx (100%) rename webapp/src/components/Inputs/{ => Base}/InputNumber.tsx (100%) rename webapp/src/components/Inputs/{ => Base}/InputText.stories.tsx (100%) rename webapp/src/components/Inputs/{ => Base}/InputText.tsx (100%) rename webapp/src/components/Inputs/{ => Base}/InputTime.css (100%) rename webapp/src/components/Inputs/{ => Base}/InputTime.stories.tsx (100%) rename webapp/src/components/Inputs/{ => Base}/InputTime.tsx (99%) rename webapp/src/components/Inputs/{ => Base}/InputYaml.css (100%) rename webapp/src/components/Inputs/{ => Base}/InputYaml.stories.tsx (100%) rename webapp/src/components/Inputs/{ => Base}/InputYaml.tsx (100%) delete mode 100644 webapp/src/components/Inputs/InputDayTime.tsx diff --git a/webapp/src/components/AutomationEditor/AutoInfoBox.tsx b/webapp/src/components/AutomationEditor/AutoInfoBox.tsx index a580c89..8ba5be7 100644 --- a/webapp/src/components/AutomationEditor/AutoInfoBox.tsx +++ b/webapp/src/components/AutomationEditor/AutoInfoBox.tsx @@ -1,7 +1,7 @@ import "./AutoInfoBox.css"; import { AutomationMetadata } from "types/automations"; import { InputList } from "components/Inputs/InputList"; -import InputText from "components/Inputs/InputText"; +import InputText from "components/Inputs/Base/InputText"; import { FC, ReactNode, useRef, useState } from "react"; import { AddIcon, TrashIcon } from "components/Icons"; import InputAutoText from "components/Inputs/InputAutoText"; diff --git a/webapp/src/components/AutomationEditor/index.tsx b/webapp/src/components/AutomationEditor/index.tsx index 4160f99..26f2ede 100644 --- a/webapp/src/components/AutomationEditor/index.tsx +++ b/webapp/src/components/AutomationEditor/index.tsx @@ -15,7 +15,7 @@ import { CheckMarkIcon } from "components/Icons"; import { Modal } from "components/Modal"; import { Button } from "components/Inputs/Buttons/Button"; -import InputYaml from "components/Inputs/InputYaml"; +import InputYaml from "components/Inputs/Base/InputYaml"; import { TagDB } from "components/AutomationManager/TagDB"; import { DAGDims } from "components/DAGGraph/elements/types"; import { DAGAutomationGraph } from "components/DAGGraph"; diff --git a/webapp/src/components/AutomationManager/Sidebar/index.tsx b/webapp/src/components/AutomationManager/Sidebar/index.tsx index b94785a..4d2b98e 100644 --- a/webapp/src/components/AutomationManager/Sidebar/index.tsx +++ b/webapp/src/components/AutomationManager/Sidebar/index.tsx @@ -5,7 +5,7 @@ import { FC, useState } from "react"; import ArrowIcon from "@mui/icons-material/ArrowBackIosNewOutlined"; -import InputText from "components/Inputs/InputText"; +import InputText from "components/Inputs/Base/InputText"; import InputMultiSelect from "components/Inputs/InputMultiSelect"; import { ListBoxGroup } from "../ListBoxGroup"; diff --git a/webapp/src/components/ConditionEditor/ConditionNodeBase.tsx b/webapp/src/components/ConditionEditor/ConditionNodeBase.tsx index fb4c2a6..7b0e906 100644 --- a/webapp/src/components/ConditionEditor/ConditionNodeBase.tsx +++ b/webapp/src/components/ConditionEditor/ConditionNodeBase.tsx @@ -7,7 +7,7 @@ import { AutomationCondition } from "types/automations/conditions"; import { getSubTypeList } from "utils/automations"; import { getConditionDefaultValues } from "utils/defaults"; import { useHA } from "haService"; -import InputYaml from "components/Inputs/InputYaml"; +import InputYaml from "components/Inputs/Base/InputYaml"; import { getViewer } from "./viewRender"; import { getEditor } from "./editorRender"; import useWindowSize from "utils/useWindowSize"; diff --git a/webapp/src/components/ConditionEditor/editorRender.tsx b/webapp/src/components/ConditionEditor/editorRender.tsx index 1b3989d..232f89c 100644 --- a/webapp/src/components/ConditionEditor/editorRender.tsx +++ b/webapp/src/components/ConditionEditor/editorRender.tsx @@ -10,16 +10,16 @@ import { TriggerCondition, ZoneCondition, } from "types/automations/conditions"; -import InputNumber from "components/Inputs/InputNumber"; -import InputText from "components/Inputs/InputText"; +import InputNumber from "components/Inputs/Base/InputNumber"; +import InputText from "components/Inputs/Base/InputText"; import { InputEntity } from "components/Inputs/AutoComplete/InputEntities"; import { ConditionNodeBase, ConditionNodeBaseViewMode, } from "./ConditionNodeBase"; import { genUpdateMethods } from "./nestedUpdater"; -import { InputTime } from "components/Inputs/InputTime"; -import InputYaml from "components/Inputs/InputYaml"; +import { InputTime } from "components/Inputs/Base/InputTime"; +import InputYaml from "components/Inputs/Base/InputYaml"; import { HAService } from "haService"; import { DeviceEditor } from "components/DeviceEditor"; import { ButtonIcon } from "components/Icons/ButtonIcons"; diff --git a/webapp/src/components/DAGGraph/nodes/SequenceNode/SequenceNodeElement.tsx b/webapp/src/components/DAGGraph/nodes/SequenceNode/SequenceNodeElement.tsx index 212fb7f..0419e69 100644 --- a/webapp/src/components/DAGGraph/nodes/SequenceNode/SequenceNodeElement.tsx +++ b/webapp/src/components/DAGGraph/nodes/SequenceNode/SequenceNodeElement.tsx @@ -12,7 +12,7 @@ import Edit from "@mui/icons-material/Edit"; import KeyboardArrowDownSharpIcon from "@mui/icons-material/KeyboardArrowDownSharp"; import AddOutlined from "@mui/icons-material/AddOutlined"; -import InputBoolean from "components/Inputs/InputBoolean"; +import InputBoolean from "components/Inputs/Base/InputBoolean"; import { SpeedDial } from "components/SpeedDial"; import { SequenceNodeElementProps } from "./types"; import { useSequenceNodeColor } from "./util"; diff --git a/webapp/src/components/Inputs/AutoComplete/InputDeviceCapabilties.tsx b/webapp/src/components/Inputs/AutoComplete/InputDeviceCapabilties.tsx index daf7caa..bb0edd5 100644 --- a/webapp/src/components/Inputs/AutoComplete/InputDeviceCapabilties.tsx +++ b/webapp/src/components/Inputs/AutoComplete/InputDeviceCapabilties.tsx @@ -4,10 +4,10 @@ import { useSnackbar } from "notistack"; import { useRef } from "react"; import { prettyName } from "utils/formatting"; import { InputAutoComplete, Option } from "./InputAutoComplete"; -import InputBoolean from "../InputBoolean"; -import { InputTime } from "../InputDayTime"; -import InputNumber from "../InputNumber"; -import InputText from "../InputText"; +import InputBoolean from "components/Inputs/Base/InputBoolean"; +import { InputTime } from "../Base/InputTime"; +import InputNumber from "components/Inputs/Base/InputNumber"; +import InputText from "components/Inputs/Base/InputText"; export type InputDeviceCapabiltiesProps> = { defn: HaFormSchema[]; diff --git a/webapp/src/components/Inputs/AutoComplete/InputTimeEntity.tsx b/webapp/src/components/Inputs/AutoComplete/InputTimeEntity.tsx index 12053fc..ccd5430 100644 --- a/webapp/src/components/Inputs/AutoComplete/InputTimeEntity.tsx +++ b/webapp/src/components/Inputs/AutoComplete/InputTimeEntity.tsx @@ -11,7 +11,7 @@ import { isAutomationTimeString24Hours, } from "utils/time"; import { InputEntity } from "./InputEntities"; -import { InputTime } from "../InputTime"; +import { InputTime } from "components/Inputs/Base/InputTime"; export type InputTimeEntityProps = { value: string; diff --git a/webapp/src/components/Inputs/InputBoolean.stories.tsx b/webapp/src/components/Inputs/Base/InputBoolean.stories.tsx similarity index 100% rename from webapp/src/components/Inputs/InputBoolean.stories.tsx rename to webapp/src/components/Inputs/Base/InputBoolean.stories.tsx diff --git a/webapp/src/components/Inputs/InputBoolean.tsx b/webapp/src/components/Inputs/Base/InputBoolean.tsx similarity index 100% rename from webapp/src/components/Inputs/InputBoolean.tsx rename to webapp/src/components/Inputs/Base/InputBoolean.tsx diff --git a/webapp/src/components/Inputs/InputNumber.css b/webapp/src/components/Inputs/Base/InputNumber.css similarity index 100% rename from webapp/src/components/Inputs/InputNumber.css rename to webapp/src/components/Inputs/Base/InputNumber.css diff --git a/webapp/src/components/Inputs/InputNumber.stories.tsx b/webapp/src/components/Inputs/Base/InputNumber.stories.tsx similarity index 100% rename from webapp/src/components/Inputs/InputNumber.stories.tsx rename to webapp/src/components/Inputs/Base/InputNumber.stories.tsx diff --git a/webapp/src/components/Inputs/InputNumber.tsx b/webapp/src/components/Inputs/Base/InputNumber.tsx similarity index 100% rename from webapp/src/components/Inputs/InputNumber.tsx rename to webapp/src/components/Inputs/Base/InputNumber.tsx diff --git a/webapp/src/components/Inputs/InputText.stories.tsx b/webapp/src/components/Inputs/Base/InputText.stories.tsx similarity index 100% rename from webapp/src/components/Inputs/InputText.stories.tsx rename to webapp/src/components/Inputs/Base/InputText.stories.tsx diff --git a/webapp/src/components/Inputs/InputText.tsx b/webapp/src/components/Inputs/Base/InputText.tsx similarity index 100% rename from webapp/src/components/Inputs/InputText.tsx rename to webapp/src/components/Inputs/Base/InputText.tsx diff --git a/webapp/src/components/Inputs/InputTime.css b/webapp/src/components/Inputs/Base/InputTime.css similarity index 100% rename from webapp/src/components/Inputs/InputTime.css rename to webapp/src/components/Inputs/Base/InputTime.css diff --git a/webapp/src/components/Inputs/InputTime.stories.tsx b/webapp/src/components/Inputs/Base/InputTime.stories.tsx similarity index 100% rename from webapp/src/components/Inputs/InputTime.stories.tsx rename to webapp/src/components/Inputs/Base/InputTime.stories.tsx diff --git a/webapp/src/components/Inputs/InputTime.tsx b/webapp/src/components/Inputs/Base/InputTime.tsx similarity index 99% rename from webapp/src/components/Inputs/InputTime.tsx rename to webapp/src/components/Inputs/Base/InputTime.tsx index a217ccc..9025ebf 100644 --- a/webapp/src/components/Inputs/InputTime.tsx +++ b/webapp/src/components/Inputs/Base/InputTime.tsx @@ -1,4 +1,5 @@ import "./InputTime.css"; + import { useState, useEffect, FC } from "react"; import TextField from "@mui/material/TextField"; import EditIcon from "@mui/icons-material/Edit"; diff --git a/webapp/src/components/Inputs/InputYaml.css b/webapp/src/components/Inputs/Base/InputYaml.css similarity index 100% rename from webapp/src/components/Inputs/InputYaml.css rename to webapp/src/components/Inputs/Base/InputYaml.css diff --git a/webapp/src/components/Inputs/InputYaml.stories.tsx b/webapp/src/components/Inputs/Base/InputYaml.stories.tsx similarity index 100% rename from webapp/src/components/Inputs/InputYaml.stories.tsx rename to webapp/src/components/Inputs/Base/InputYaml.stories.tsx diff --git a/webapp/src/components/Inputs/InputYaml.tsx b/webapp/src/components/Inputs/Base/InputYaml.tsx similarity index 100% rename from webapp/src/components/Inputs/InputYaml.tsx rename to webapp/src/components/Inputs/Base/InputYaml.tsx diff --git a/webapp/src/components/Inputs/InputDayTime.tsx b/webapp/src/components/Inputs/InputDayTime.tsx deleted file mode 100644 index 2a896b7..0000000 --- a/webapp/src/components/Inputs/InputDayTime.tsx +++ /dev/null @@ -1,150 +0,0 @@ -import "./InputTime.css"; -import { useState, useEffect, FC } from "react"; -import TextField from "@mui/material/TextField"; -import EditIcon from "@mui/icons-material/Edit"; -import CloseIcon from "@mui/icons-material/Close"; -import { AutomationTime, AutomationTimeObject } from "types/automations/common"; -import { - convertAutomationTimeToTimeObject, - convertObjectToAutomationTimeString, -} from "utils/time"; -import { convertAutomationTimeToTimeString } from "utils/time"; -import { prettyName } from "utils/formatting"; -import InputLabel from "@mui/material/InputLabel"; -import { ButtonIcon } from "components/Icons/ButtonIcons"; - -// constants -const fields: Array = [ - "hours", - "minutes", - "seconds", - "milliseconds", -]; -export interface Props { - label: string; - value?: AutomationTime; - onChange: (v?: AutomationTimeObject) => void; -} -export const InputTime: FC = (props) => { - // state - const [disabled, setDisabled] = useState(!props.value); - const [displayValue, setDisplayValue] = useState( - convertAutomationTimeToTimeObject(props.value) - ); - - // process display input - const updateOne = (k: keyof AutomationTimeObject) => (v: string) => { - if (Number(v) < 0) { - setDisplayValue({ - ...displayValue, - [k]: 0, - }); - } else if (k === "hours") { - setDisplayValue({ - ...displayValue, - [k]: Number(v), - }); - } else if (k === "minutes") { - let minutes = Number(v); - let { hours = 0 } = displayValue; - if (minutes > 59) { - const additonalHours = Math.floor(minutes / 60); - hours += additonalHours; - minutes = minutes - additonalHours * 60; - } - setDisplayValue({ - ...displayValue, - minutes, - hours, - }); - } else if (k === "seconds") { - let seconds = Number(v); - let { hours = 0, minutes = 0 } = displayValue; - if (seconds > 59) { - const additonalHours = Math.floor(seconds / (60 * 60)); - hours += additonalHours; - seconds = seconds - additonalHours * 60; - } - if (seconds > 59) { - const additionalMinutes = Math.floor(seconds / 60); - minutes += additionalMinutes; - seconds = seconds - additionalMinutes * 60; - } - setDisplayValue({ - ...displayValue, - minutes, - hours, - seconds, - }); - } else if (k === "milliseconds") { - let milliseconds = Number(v); - let { hours = 0, minutes = 0, seconds = 0 } = displayValue; - if (milliseconds > 1000) { - const additonalHours = Math.floor(milliseconds / (60 * 60 * 1000)); - hours += additonalHours; - milliseconds = milliseconds - additonalHours * 60 * 60 * 1000; - } - if (milliseconds > 1000) { - const additionalMinutes = Math.floor(milliseconds / (60 * 1000)); - minutes += additionalMinutes; - milliseconds = milliseconds - additionalMinutes * 60 * 1000; - } - if (milliseconds > 1000) { - const additionalSeconds = Math.floor(milliseconds / 1000); - seconds += additionalSeconds; - milliseconds = milliseconds - additionalSeconds * 1000; - } - setDisplayValue({ - ...displayValue, - minutes, - hours, - seconds, - milliseconds, - }); - } - }; - - // effect - useEffect(() => { - if (disabled && !props.value) { - return; - } - if (disabled) { - props.onChange(undefined); - } else { - const pVal = convertAutomationTimeToTimeString(props.value); - const cVal = convertObjectToAutomationTimeString(displayValue); - if (pVal !== cVal) { - props.onChange(displayValue); - } - } - // eslint-disable-next-line - }, [disabled, displayValue]); - - return ( -
- {props.label} -
- {fields.map((name) => ( - updateOne(name)(e.target.value)} - /> - ))} - setDisabled(!disabled)} - icon={disabled ? : } - /> -
-
- ); -}; diff --git a/webapp/src/components/Inputs/InputTextView.stories.tsx b/webapp/src/components/Inputs/InputTextView.stories.tsx index ae04289..d998de8 100644 --- a/webapp/src/components/Inputs/InputTextView.stories.tsx +++ b/webapp/src/components/Inputs/InputTextView.stories.tsx @@ -1,6 +1,6 @@ import { ComponentMeta, ComponentStory } from "@storybook/react"; import { Page } from "components/Page"; -import InputText from "./InputText"; +import InputText from "./Base/InputText"; import { InputTextView } from "./InputTextView"; diff --git a/webapp/src/components/NodeEditor/OptionManager/ActionEvent.tsx b/webapp/src/components/NodeEditor/OptionManager/ActionEvent.tsx index 275900a..d411895 100644 --- a/webapp/src/components/NodeEditor/OptionManager/ActionEvent.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/ActionEvent.tsx @@ -1,33 +1,31 @@ -import InputYaml from "components/Inputs/InputYaml"; -import InputText from "components/Inputs/InputText"; +import InputYaml from "components/Inputs/Base/InputYaml"; +import InputText from "components/Inputs/Base/InputText"; import { FireEventAction } from "types/automations/actions"; import { OptionManager, updateActionData } from "./OptionManager"; - export const ActionEventState: OptionManager = { defaultState: () => ({ alias: "Fire Event", event: "", event_data: {}, }), - isReady: ({ alias, event }) => ( - alias !== '' && - event !== "" - ), + isReady: ({ alias, event }) => alias !== "" && event !== "", renderOptionList: (state, setState) => { const update = updateActionData(state, setState); - return <> - update({ event })} - /> - update({ event_data })} - /> - - } -} + return ( + <> + update({ event })} + /> + update({ event_data })} + /> + + ); + }, +}; diff --git a/webapp/src/components/NodeEditor/OptionManager/ActionRepeat.tsx b/webapp/src/components/NodeEditor/OptionManager/ActionRepeat.tsx index 461ff9f..b29c989 100644 --- a/webapp/src/components/NodeEditor/OptionManager/ActionRepeat.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/ActionRepeat.tsx @@ -1,4 +1,4 @@ -import InputNumber from "components/Inputs/InputNumber"; +import InputNumber from "components/Inputs/Base/InputNumber"; import { RepeatAction } from "types/automations/actions"; import { OptionManager } from "./OptionManager"; import { InputAutoComplete } from "components/Inputs/AutoComplete/InputAutoComplete"; diff --git a/webapp/src/components/NodeEditor/OptionManager/ActionStop.tsx b/webapp/src/components/NodeEditor/OptionManager/ActionStop.tsx index c7799a6..5e176aa 100644 --- a/webapp/src/components/NodeEditor/OptionManager/ActionStop.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/ActionStop.tsx @@ -1,4 +1,4 @@ -import InputText from "components/Inputs/InputText"; +import InputText from "components/Inputs/Base/InputText"; import { StopAction } from "types/automations/actions"; import { OptionManager } from "./OptionManager"; diff --git a/webapp/src/components/NodeEditor/OptionManager/ActionWait.tsx b/webapp/src/components/NodeEditor/OptionManager/ActionWait.tsx index 3a75868..0ac5c46 100644 --- a/webapp/src/components/NodeEditor/OptionManager/ActionWait.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/ActionWait.tsx @@ -1,23 +1,23 @@ import "./ActionWait.css"; -import InputBoolean from "components/Inputs/InputBoolean"; +import InputBoolean from "components/Inputs/Base/InputBoolean"; import { InputList } from "components/Inputs/InputList"; -import InputNumber from "components/Inputs/InputNumber"; -import InputText from "components/Inputs/InputText"; -import { InputTime } from "components/Inputs/InputTime"; +import InputNumber from "components/Inputs/Base/InputNumber"; +import InputText from "components/Inputs/Base/InputText"; +import { InputTime } from "components/Inputs/Base/InputTime"; import { useState } from "react"; import { DelayAction, WaitAction } from "types/automations/actions"; -import { OptionManager, updateActionData } from './OptionManager'; -import InputYaml from "components/Inputs/InputYaml"; +import { OptionManager, updateActionData } from "./OptionManager"; +import InputYaml from "components/Inputs/Base/InputYaml"; type ThisAction = WaitAction | DelayAction; -type Option = 'delay' | 'template' | 'trigger' +type Option = "delay" | "template" | "trigger"; const getCurrentOption = (node: ThisAction): Option => { - if ('delay' in node) { - return 'delay' + if ("delay" in node) { + return "delay"; } else { - return 'template' + return "template"; } -} +}; export const ActionWaitState: OptionManager = { defaultState: () => ({ @@ -32,78 +32,108 @@ export const ActionWaitState: OptionManager = { const base: any = { alias: state.alias, variables: state.variables, - } - if (opt === 'delay') { + }; + if (opt === "delay") { setState({ ...base, delay: (state as any).delay ?? "", - }) + }); } else { - base.timeout = (state as any).timeout - base.continue_on_timeout = (state as any).continue_on_timeout - if (opt === 'template') { + base.timeout = (state as any).timeout; + base.continue_on_timeout = (state as any).continue_on_timeout; + if (opt === "template") { setState({ ...base, wait_template: (state as any).wait_template ?? "", - }) + }); } else { setState({ ...base, wait_for_trigger: (state as any).wait_for_trigger ?? "", - }) + }); } } - _setCurrent(opt) - } + _setCurrent(opt); + }; // determine options let option: JSX.Element = <>; if (current === "delay") { - option = <> - update({ delay })} /> - - } else if (current === 'template') { + option = ( + <> + update({ delay })} + /> + + ); + } else if (current === "template") { state = state as WaitAction; - option = <> - update({ wait_template })} - /> - - } else if (current === 'trigger') { + option = ( + <> + update({ wait_template })} + /> + + ); + } else if (current === "trigger") { state = state as WaitAction; - option = <> - update({ wait_for_trigger })} - /> - + option = ( + <> + update({ wait_for_trigger })} + /> + + ); } // render - return
- - {option} - {current !== 'delay' ?
- update({ timeout: timeout === undefined ? undefined : String(timeout) })} + return ( +
+ - update({ continue_on_timeout })} - /> -
: <>} -
- } -} + {option} + {current !== "delay" ? ( +
+ + update({ + timeout: timeout === undefined ? undefined : String(timeout), + }) + } + /> + + update({ continue_on_timeout }) + } + /> +
+ ) : ( + <> + )} +
+ ); + }, +}; diff --git a/webapp/src/components/NodeEditor/OptionManager/TriggerEvent.tsx b/webapp/src/components/NodeEditor/OptionManager/TriggerEvent.tsx index f2e4003..22a1361 100644 --- a/webapp/src/components/NodeEditor/OptionManager/TriggerEvent.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/TriggerEvent.tsx @@ -1,7 +1,7 @@ -import InputText from "components/Inputs/InputText"; +import InputText from "components/Inputs/Base/InputText"; import { OptionManager } from "./OptionManager"; import { AutomationTriggerEvent } from "../../../types/automations/triggers"; -import InputYaml from "components/Inputs/InputYaml"; +import InputYaml from "components/Inputs/Base/InputYaml"; export const TriggerEventState: OptionManager = { defaultState: () => ({ diff --git a/webapp/src/components/NodeEditor/OptionManager/TriggerMQTT.tsx b/webapp/src/components/NodeEditor/OptionManager/TriggerMQTT.tsx index 7b3a6f6..9fd4583 100644 --- a/webapp/src/components/NodeEditor/OptionManager/TriggerMQTT.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/TriggerMQTT.tsx @@ -1,33 +1,34 @@ -import { OptionManager } from './OptionManager'; -import { AutomationTriggerMQTT } from 'types/automations/triggers'; -import InputText from 'components/Inputs/InputText'; - +import { OptionManager } from "./OptionManager"; +import { AutomationTriggerMQTT } from "types/automations/triggers"; +import InputText from "components/Inputs/Base/InputText"; export const TriggerMQTTState: OptionManager = { defaultState: () => ({ - "platform": "mqtt", - "payload": "", - "topic": "", - "value_template": "" + platform: "mqtt", + payload: "", + topic: "", + value_template: "", }), isReady: () => true, renderOptionList: (state, setState) => { - return <> - setState({ ...state, payload })} - /> - setState({ ...state, topic })} - /> - setState({ ...state, value_template })} - /> - - } -} + return ( + <> + setState({ ...state, payload })} + /> + setState({ ...state, topic })} + /> + setState({ ...state, value_template })} + /> + + ); + }, +}; diff --git a/webapp/src/components/NodeEditor/OptionManager/TriggerNumericState.tsx b/webapp/src/components/NodeEditor/OptionManager/TriggerNumericState.tsx index 963ec11..c851422 100644 --- a/webapp/src/components/NodeEditor/OptionManager/TriggerNumericState.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/TriggerNumericState.tsx @@ -1,10 +1,10 @@ import { OptionManager } from "./OptionManager"; import { AutomationTriggerNumericState } from "types/automations/triggers"; -import InputText from "components/Inputs/InputText"; +import InputText from "components/Inputs/Base/InputText"; import { InputEntity } from "components/Inputs/AutoComplete/InputEntities"; -import InputNumber from "components/Inputs/InputNumber"; -import { InputTime } from "components/Inputs/InputTime"; -import InputYaml from "components/Inputs/InputYaml"; +import InputNumber from "components/Inputs/Base/InputNumber"; +import { InputTime } from "components/Inputs/Base/InputTime"; +import InputYaml from "components/Inputs/Base/InputYaml"; export const TriggerNumericState: OptionManager = { diff --git a/webapp/src/components/NodeEditor/OptionManager/TriggerState.tsx b/webapp/src/components/NodeEditor/OptionManager/TriggerState.tsx index 18440d8..a917d5e 100644 --- a/webapp/src/components/NodeEditor/OptionManager/TriggerState.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/TriggerState.tsx @@ -1,8 +1,8 @@ import { OptionManager } from "./OptionManager"; import { AutomationTriggerState } from "types/automations/triggers"; -import InputText from "components/Inputs/InputText"; +import InputText from "components/Inputs/Base/InputText"; import { InputEntity } from "components/Inputs/AutoComplete/InputEntities"; -import { InputTime } from "components/Inputs/InputTime"; +import { InputTime } from "components/Inputs/Base/InputTime"; import { InputAutoComplete } from "components/Inputs/AutoComplete/InputAutoComplete"; import { FC } from "react"; import { getEntityDomains } from "utils/automations"; diff --git a/webapp/src/components/NodeEditor/OptionManager/TriggerTemplate.tsx b/webapp/src/components/NodeEditor/OptionManager/TriggerTemplate.tsx index 51134bc..742cb4b 100644 --- a/webapp/src/components/NodeEditor/OptionManager/TriggerTemplate.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/TriggerTemplate.tsx @@ -1,30 +1,33 @@ -import { OptionManager } from './OptionManager'; -import { AutomationTriggerTemplate } from 'types/automations/triggers'; -import InputText from 'components/Inputs/InputText'; -import { InputTime } from 'components/Inputs/InputTime'; - +import { OptionManager } from "./OptionManager"; +import { AutomationTriggerTemplate } from "types/automations/triggers"; +import InputText from "components/Inputs/Base/InputText"; +import { InputTime } from "components/Inputs/Base/InputTime"; export const TriggerTemplate: OptionManager = { defaultState: () => ({ - "platform": 'template', - "value_template": "", + platform: "template", + value_template: "", }), isReady: () => true, renderOptionList: (state, setState) => { - return <> - setState({ ...state, value_template })} - /> - setState({ - ...state, - for: _for, - })} - /> - - } -} + return ( + <> + setState({ ...state, value_template })} + /> + + setState({ + ...state, + for: _for, + }) + } + /> + + ); + }, +}; diff --git a/webapp/src/components/NodeEditor/OptionManager/TriggerTime.tsx b/webapp/src/components/NodeEditor/OptionManager/TriggerTime.tsx index 5025017..036e421 100644 --- a/webapp/src/components/NodeEditor/OptionManager/TriggerTime.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/TriggerTime.tsx @@ -8,7 +8,7 @@ import { AutomationTriggerExactTime, AutomationTriggerTimePattern, } from "types/automations/triggers"; -import InputText from "components/Inputs/InputText"; +import InputText from "components/Inputs/Base/InputText"; import { FC } from "react"; import { InputList } from "components/Inputs/InputList"; import { Button } from "components/Inputs/Buttons/Button"; diff --git a/webapp/src/components/NodeEditor/OptionManager/TriggerWebhook.tsx b/webapp/src/components/NodeEditor/OptionManager/TriggerWebhook.tsx index a95d521..f88a749 100644 --- a/webapp/src/components/NodeEditor/OptionManager/TriggerWebhook.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/TriggerWebhook.tsx @@ -1,20 +1,27 @@ -import { OptionManager } from './OptionManager'; -import { AutomationTriggerWebhook } from 'types/automations/triggers'; -import InputText from 'components/Inputs/InputText'; - +import { OptionManager } from "./OptionManager"; +import { AutomationTriggerWebhook } from "types/automations/triggers"; +import InputText from "components/Inputs/Base/InputText"; export const TriggerWebhook: OptionManager = { defaultState: () => ({ - "platform": 'webhook', - "webhook_id": "", + platform: "webhook", + webhook_id: "", }), isReady: () => true, renderOptionList: (state, setState) => { - return <> - setState({ - ...state, - webhook_id - })} /> - - } -} + return ( + <> + + setState({ + ...state, + webhook_id, + }) + } + /> + + ); + }, +}; diff --git a/webapp/src/components/NodeEditor/OptionManager/index.tsx b/webapp/src/components/NodeEditor/OptionManager/index.tsx index dfd0126..3484943 100644 --- a/webapp/src/components/NodeEditor/OptionManager/index.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/index.tsx @@ -7,8 +7,8 @@ import { getSubTypeList, validateNode, } from "utils/automations"; -import InputYaml from "components/Inputs/InputYaml"; -import InputText from "components/Inputs/InputText"; +import InputYaml from "components/Inputs/Base/InputYaml"; +import InputText from "components/Inputs/Base/InputText"; import { getDescriptionFromAutomationNode } from "utils/formatting"; import { useHA } from "haService"; import { Generic } from "./Generic"; diff --git a/webapp/src/components/NodeEditor/index.tsx b/webapp/src/components/NodeEditor/index.tsx index 1a96e89..94143d7 100644 --- a/webapp/src/components/NodeEditor/index.tsx +++ b/webapp/src/components/NodeEditor/index.tsx @@ -5,7 +5,7 @@ import { AutomationNode, AutomationNodeMapping } from "types/automations/index"; import { useEditorNodeState } from "./OptionManager"; import { InputList } from "components/Inputs/InputList"; import { Button } from "components/Inputs/Buttons/Button"; -import InputBoolean from "components/Inputs/InputBoolean"; +import InputBoolean from "components/Inputs/Base/InputBoolean"; import { useConfirm } from "material-ui-confirm"; import { getNodeSubTypeDescription } from "./utils"; diff --git a/webapp/src/components/ServiceEditor/ServiceEditorField.tsx b/webapp/src/components/ServiceEditor/ServiceEditorField.tsx index b8f601f..ab39141 100644 --- a/webapp/src/components/ServiceEditor/ServiceEditorField.tsx +++ b/webapp/src/components/ServiceEditor/ServiceEditorField.tsx @@ -1,17 +1,17 @@ import "./ServiceEditorField.css"; import { FC, useRef } from "react"; import { ServiceEditorOption } from "./options"; -import InputText from "components/Inputs/InputText"; -import InputNumber from "components/Inputs/InputNumber"; +import InputText from "components/Inputs/Base/InputText"; +import InputNumber from "components/Inputs/Base/InputNumber"; import { RemoveCircle } from "@mui/icons-material"; import { InputAutoComplete, Option, } from "components/Inputs/AutoComplete/InputAutoComplete"; import { prettyName } from "utils/formatting"; -import InputBoolean from "components/Inputs/InputBoolean"; +import InputBoolean from "components/Inputs/Base/InputBoolean"; import { SelectorNumber, SelectorText } from "haService/fieldTypes"; -import InputYaml from "components/Inputs/InputYaml"; +import InputYaml from "components/Inputs/Base/InputYaml"; import { useSnackbar } from "notistack"; import { InputEntity } from "components/Inputs/AutoComplete/InputEntities"; import { ButtonIcon } from "components/Icons/ButtonIcons"; diff --git a/webapp/src/components/ServiceEditor/index.stories.tsx b/webapp/src/components/ServiceEditor/index.stories.tsx index 1495d37..fc9f281 100644 --- a/webapp/src/components/ServiceEditor/index.stories.tsx +++ b/webapp/src/components/ServiceEditor/index.stories.tsx @@ -3,7 +3,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react"; import { Page } from "components/Page"; import { ServiceEditor } from "."; import { TypedHassService } from "haService/fieldTypes"; -import InputYaml from "components/Inputs/InputYaml"; +import InputYaml from "components/Inputs/Base/InputYaml"; export default { title: "Services/ServiceEditor", diff --git a/webapp/src/haService/automation.stories.tsx b/webapp/src/haService/automation.stories.tsx index 9d052bb..fe0a123 100644 --- a/webapp/src/haService/automation.stories.tsx +++ b/webapp/src/haService/automation.stories.tsx @@ -2,7 +2,7 @@ import React, { FC, useEffect, useState } from "react"; import { ComponentMeta, ComponentStory } from "@storybook/react"; import { Page } from "components/Page"; import { useHA } from "haService"; -import InputYaml from "components/Inputs/InputYaml"; +import InputYaml from "components/Inputs/Base/InputYaml"; import { InputList } from "components/Inputs/InputList"; import { Button } from "components/Inputs/Buttons/Button"; import { ServiceEditor } from "components/ServiceEditor"; diff --git a/webapp/src/haService/dr.stories.tsx b/webapp/src/haService/dr.stories.tsx index d8a6ad7..4dac319 100644 --- a/webapp/src/haService/dr.stories.tsx +++ b/webapp/src/haService/dr.stories.tsx @@ -2,7 +2,7 @@ import React, { FC } from "react"; import { ComponentMeta, ComponentStory } from "@storybook/react"; import { Page } from "components/Page"; import { useHADeviceRegistry } from "haService"; -import InputYaml from "components/Inputs/InputYaml"; +import InputYaml from "components/Inputs/Base/InputYaml"; const Test: FC<{ onRender: () => void }> = ({ onRender }) => { const conn = useHADeviceRegistry(); diff --git a/webapp/src/haService/services.stories.tsx b/webapp/src/haService/services.stories.tsx index 6b4def1..8fb83cb 100644 --- a/webapp/src/haService/services.stories.tsx +++ b/webapp/src/haService/services.stories.tsx @@ -2,7 +2,7 @@ import React, { FC, useEffect, useState } from "react"; import { ComponentMeta, ComponentStory } from "@storybook/react"; import { Page } from "components/Page"; import { useHA } from "haService"; -import InputYaml from "components/Inputs/InputYaml"; +import InputYaml from "components/Inputs/Base/InputYaml"; import { InputList } from "components/Inputs/InputList"; import { Button } from "components/Inputs/Buttons/Button"; import { ServiceEditor } from "components/ServiceEditor";