diff --git a/webapp/src/components/ConditionEditor/editorRender.tsx b/webapp/src/components/ConditionEditor/editorRender.tsx index 39403de..5cb0088 100644 --- a/webapp/src/components/ConditionEditor/editorRender.tsx +++ b/webapp/src/components/ConditionEditor/editorRender.tsx @@ -1,5 +1,5 @@ import { FC } from "react"; -import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition } from "types/automations/conditions"; +import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions'; import { getDescriptionFromAutomationNode } from "utils/formatting"; import InputNumber from "components/Inputs/InputNumber"; import InputText from "components/Inputs/InputText"; @@ -32,6 +32,10 @@ export const getEditor = (condition: AutomationCondition): Editor => { return StateEditor; case 'time': return TimeEditor; + case 'trigger': + return TriggerEditor; + case 'zone': + return ZoneEditor; default: return () =>
Not Ready
} @@ -232,4 +236,69 @@ export const TimeEditor: Editor = ({ /> Weekday not support for no, use yaml for now {condition.condition_data.weekday} +} + +export const TriggerEditor: Editor = ({ + onChange, + condition, +}) => { + return
+ onChange({ + ...condition, + condition_data: { + ...condition.condition_data, + alias + } + })} /> + onChange({ + ...condition, + condition_data: { + ...condition.condition_data, + id + } + })} /> +
+} + +export const ZoneEditor: Editor = ({ + onChange, + condition, +}) => { + return
+ onChange({ + ...condition, + condition_data: { + ...condition.condition_data, + alias + } + })} /> + onChange({ + ...condition, + condition_data: { + ...condition.condition_data, + zone + } + })} /> + onChange({ + ...condition, + condition_data: { + ...condition.condition_data, + entity_id + } + })} + /> + onChange({ + ...condition, + condition_data: { + ...condition.condition_data, + state, + } + })} + /> +
} \ No newline at end of file diff --git a/webapp/src/types/automations/conditions.ts b/webapp/src/types/automations/conditions.ts index f4c86a0..cea1791 100644 --- a/webapp/src/types/automations/conditions.ts +++ b/webapp/src/types/automations/conditions.ts @@ -1,45 +1,45 @@ import { AutomationTime } from "./common"; -interface AutomationConditionNodeBase { +interface AutomationConditionNodeBase { $smType: 'condition'; condition: Name; condition_data: Data & { alias?: string; }; } -export interface LogicCondition extends AutomationConditionNodeBase<'and' | 'or' | 'not',{ +export interface LogicCondition extends AutomationConditionNodeBase<'and' | 'or' | 'not', { conditions: AutomationCondition[]; -}> {} +}> { } export interface NumericCondition extends AutomationConditionNodeBase<'numeric_state', { entity_id: string | string[]; above?: string; below?: string; attribute?: string; value_template?: string; -}> {} -export interface StateCondition extends AutomationConditionNodeBase<'state',{ +}> { } +export interface StateCondition extends AutomationConditionNodeBase<'state', { entity_id: string | string[]; state: string | string[]; for?: AutomationTime; attribute?: string; -}>{} -export interface TemplateCondition extends AutomationConditionNodeBase<'template',{ +}> { } +export interface TemplateCondition extends AutomationConditionNodeBase<'template', { value_template: string; -}> {} +}> { } export interface TimeCondition extends AutomationConditionNodeBase<'time', { after?: AutomationTime; before?: AutomationTime; weekday?: Array<'mon' | 'tue' | 'wed' | 'thu' | 'fri' | 'sat' | 'sun'>; -}> {} -export interface TriggerCondition extends AutomationConditionNodeBase <'trigger', { - id: string | string[]; -}>{} -export interface ZoneCondition extends AutomationConditionNodeBase <'zone', { +}> { } +export interface TriggerCondition extends AutomationConditionNodeBase<'trigger', { + id: string; +}> { } +export interface ZoneCondition extends AutomationConditionNodeBase<'zone', { zone: string; entity_id: string | string[]; state: string | string[]; -}>{} -export type AutomationCondition = +}> { } +export type AutomationCondition = | LogicCondition | NumericCondition | StateCondition @@ -47,5 +47,5 @@ export type AutomationCondition = | TimeCondition | TriggerCondition | ZoneCondition -; + ; export type ConditionType = AutomationCondition['condition'];