diff --git a/web/src/components/ConditionEditor/editorRender.tsx b/web/src/components/ConditionEditor/editorRender.tsx index 6914830..a7eb950 100644 --- a/web/src/components/ConditionEditor/editorRender.tsx +++ b/web/src/components/ConditionEditor/editorRender.tsx @@ -1,6 +1,7 @@ import { FC } from "react"; import { AutomationCondition, LogicCondition, NumericCondition, TemplateCondition } from "~/automations/types/conditions"; import { getDescriptionFromAutomationNode } from "~/automations/utils"; +import InputNumber from "../Inputs/InputNumber"; import InputText from "../Inputs/InputText"; import InputTextArea from "../Inputs/InputTextArea"; import { InputEntity } from "../Inputs/InputTextBubble"; @@ -75,6 +76,35 @@ export const NumericStateEditor: Editor = ({ } })} /> + onChange({ + ...condition, + condition_data: { + ...condition.condition_data, + attribute + } + })}/> + onChange({ + ...condition, + condition_data: { + ...condition.condition_data, + above: above ? String(above) : undefined, + } + })} + /> + onChange({ + ...condition, + condition_data: { + ...condition.condition_data, + below: below ? String(below) : undefined, + } + })} + /> onChange({ ...condition, condition_data: { diff --git a/web/src/components/ConditionEditor/index.stories.tsx b/web/src/components/ConditionEditor/index.stories.tsx index 29d58cc..637f64f 100644 --- a/web/src/components/ConditionEditor/index.stories.tsx +++ b/web/src/components/ConditionEditor/index.stories.tsx @@ -29,7 +29,20 @@ TemplateViewer.args = { condition_data: { value_template: "states('switch.light_kitchen') == 'on'" } - }, + } as AutomationCondition, +} + + +export const NumericStateViewer = Template.bind({}) +NumericStateViewer.args = { + condition: { + $smType: 'condition', + condition: "numeric_state", + condition_data: { + entity_id: "sensor.humidity_kitchen", + above: "10", + } + } as AutomationCondition, } export const LogicCondition = Template.bind({}) diff --git a/web/src/components/Inputs/InputNumber.stories.tsx b/web/src/components/Inputs/InputNumber.stories.tsx index d749e10..c46534a 100644 --- a/web/src/components/Inputs/InputNumber.stories.tsx +++ b/web/src/components/Inputs/InputNumber.stories.tsx @@ -25,7 +25,6 @@ return
export const SomeStuffAtStart: ComponentStory = args => { const {classes} = usePageTheme({}); const [value, setValue] = useState(10) - console.log('root', value) return
diff --git a/web/src/components/Inputs/InputNumber.tsx b/web/src/components/Inputs/InputNumber.tsx index c6860d5..8e76a74 100644 --- a/web/src/components/Inputs/InputNumber.tsx +++ b/web/src/components/Inputs/InputNumber.tsx @@ -13,7 +13,6 @@ export default function InputNumber({ onChange, }: Props) { const {classes} = useInputNumberStyles({}); - console.log({value}) return (theme => { }, deleteIcon: { position: "absolute", - right: 40, - top: 16, + left: 30, + top: 17, color: theme.secondaryAccent, backgroundColor: theme.secondary, borderWidth: 1,