diff --git a/webapp/src/components/ConditionEditor/ConditionNode.tsx b/webapp/src/components/ConditionEditor/ConditionNode.tsx index 6880438..34156d1 100644 --- a/webapp/src/components/ConditionEditor/ConditionNode.tsx +++ b/webapp/src/components/ConditionEditor/ConditionNode.tsx @@ -1,5 +1,5 @@ import { Classes } from "jss"; -import { FC, useState, useEffect } from 'react'; +import { FC, useState, useEffect } from "react"; import { getConditionDefaultValues } from "utils/defaults"; import { AutomationCondition } from "types/automations/conditions"; import { CheckMarkIcon, PencilIcon } from "components/Icons"; @@ -10,126 +10,151 @@ import { useStyles } from "./style"; import { getViewer } from "./viewRender"; import useWindowSize from "utils/useWindowSize"; import { useHA } from "haService"; - - +import { getSubTypeList } from "utils/automations"; export const ConditionNode: FC<{ condition: AutomationCondition; displayMode: boolean; showDelete?: boolean; - onDelete?: (which: 'root' | number) => void; + onDelete?: (which: "root" | number) => void; onUpdate?: (data: AutomationCondition) => void; - children?: (props: { - classes: Classes - }) => JSX.Element, + children?: (props: { classes: Classes }) => JSX.Element; }> = ({ condition, showDelete = false, displayMode = true, - onDelete = () => { }, - onUpdate = () => { }, - children = () => { }, + onDelete = () => {}, + onUpdate = () => {}, + children = () => {}, }) => { - // state - const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode); - const [yamlMode, setYamlMode] = useState(false); - const { isMobile } = useWindowSize(); - const { namer } = useHA(); - // alias - const effectiveDM = internalDisplayMode || yamlMode; - // effect - useEffect(() => { - setInternalDisplayMode(displayMode); - }, [displayMode]) - useEffect(() => { - if (yamlMode) { - setInternalDisplayMode(true); - } - }, [yamlMode]) - // alias - const onAddChild = () => { - if ( - (condition.condition === 'and') || - (condition.condition === 'or') || - (condition.condition === 'not') - ) { - onUpdate({ - ...condition, - conditions: condition.conditions.concat({ - condition: 'or', - conditions: [] - }) - }) - } + // state + const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode); + const [yamlMode, setYamlMode] = useState(false); + const { isMobile } = useWindowSize(); + const ha = useHA(); + // alias + const effectiveDM = internalDisplayMode || yamlMode; + // effect + useEffect(() => { + setInternalDisplayMode(displayMode); + }, [displayMode]); + useEffect(() => { + if (yamlMode) { + setInternalDisplayMode(true); } - // children - let childrenConditions: JSX.Element; - if (effectiveDM) { - const Viewer = getViewer(condition); - childrenConditions = - } else { - const Editor = getEditor(condition); - childrenConditions = + }, [yamlMode]); + // alias + const onAddChild = () => { + if ( + condition.condition === "and" || + condition.condition === "or" || + condition.condition === "not" + ) { + onUpdate({ + ...condition, + conditions: condition.conditions.concat({ + condition: "or", + conditions: [], + }), + }); } - // styles - let hasChildren = false; - if (condition.condition === "not") { - hasChildren = true - } else if (condition.condition === 'and') { - hasChildren = true - } else if (condition.condition === 'or') { - hasChildren = true - } - const { classes } = useStyles({ hasChildren, isMobile }); + }; + // children + let childrenConditions: JSX.Element; + if (effectiveDM) { + const Viewer = getViewer(condition); + childrenConditions = ( + + ); + } else { + const Editor = getEditor(condition); + childrenConditions = ( + + ); + } + // styles + let hasChildren = false; + if (condition.condition === "not") { + hasChildren = true; + } else if (condition.condition === "and") { + hasChildren = true; + } else if (condition.condition === "or") { + hasChildren = true; + } + const { classes } = useStyles({ hasChildren, isMobile }); - // components - const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) => - + // components + const DeleteButton = (p: { onClick?: () => void; isRoot?: boolean }) => ( + + ); - return
+ return ( +
<> - {(showDelete && !effectiveDM) && onDelete('root')} />} + {showDelete && !effectiveDM && ( + onDelete("root")} /> + )}
onUpdate({ - ...getConditionDefaultValues(n), - ...condition, - condition: n, - } as any)} + options={getSubTypeList("condition")} + onChange={(n: any) => + onUpdate({ + ...getConditionDefaultValues(n), + ...condition, + condition: n, + } as any) + } /> - {effectiveDM && } - {!yamlMode && } + {effectiveDM && ( + + )} + {!yamlMode && ( + + )}
- {yamlMode && onUpdate(update as any)} - />} + {yamlMode && ( + onUpdate(update as any)} + /> + )}
{!yamlMode && childrenConditions}
- {!yamlMode && hasChildren &&
- -
} + {!yamlMode && hasChildren && ( +
+ +
+ )}
{children({ classes })}
- } + ); +}; diff --git a/webapp/src/components/ConditionEditor/editorRender.tsx b/webapp/src/components/ConditionEditor/editorRender.tsx index 1dd85d1..5fda7b0 100644 --- a/webapp/src/components/ConditionEditor/editorRender.tsx +++ b/webapp/src/components/ConditionEditor/editorRender.tsx @@ -1,6 +1,7 @@ import { FC } from "react"; import { AutomationCondition, + DeviceCondition, LogicCondition, NumericCondition, StateCondition, @@ -16,11 +17,14 @@ import { ConditionNode } from "./ConditionNode"; import { genUpdateMethods } from "./nestedUpdater"; import { InputTime } from "components/Inputs/InputTime"; import InputYaml from "components/Inputs/InputYaml"; +import { HAService } from "haService"; +import { DeviceEditor } from "components/DeviceEditor"; interface Editor extends FC<{ condition: C; onChange: (condition: C) => void; + ha: HAService; }> {} export const getEditor = (condition: AutomationCondition): Editor => { @@ -33,6 +37,8 @@ export const getEditor = (condition: AutomationCondition): Editor => { return LogicViewer; case "not": return LogicViewer; + case "device": + return DeviceConditionEditor; case "numeric_state": return NumericStateEditor; case "state": @@ -68,6 +74,35 @@ export const TemplateEditor: Editor = ({ ); }; +export const DeviceConditionEditor: Editor = ({ + onChange, + condition, + ha: { + deviceExtras: { useDeviceConditionCapalities, useDeviceConditions }, + }, +}) => { + return ( + + onChange({ + condition: "device", + ...data, + } as any) + } + options={useDeviceConditions( + condition.device_id + ? { + deviceId: condition.device_id, + } + : undefined + )} + caps={useDeviceConditionCapalities(condition as any)} + /> + ); +}; + export const NumericStateEditor: Editor = ({ onChange, condition, diff --git a/webapp/src/haService/extras.ts b/webapp/src/haService/extras.ts index 582b4a8..4f7ac01 100644 --- a/webapp/src/haService/extras.ts +++ b/webapp/src/haService/extras.ts @@ -3,6 +3,7 @@ import { MessageBase } from "home-assistant-js-websocket"; import { useEffect, useRef, useState } from "react"; import { prettyName } from "utils/formatting"; import { + DeviceConditionType, DeviceTriggerType, DeviceTypeAction, DeviceTypeCapability, @@ -114,5 +115,29 @@ export const getDeviceExtraWsCalls = (callHA: HASendMessage) => { reduceDeviceThings, {} ), + useDeviceConditionCapalities: createUseThing< + DeviceTypeAction, + DeviceTypeCapability, + Partial + >( + (condition) => ({ + type: "device_automation/condition/capabilities", + condition, + }), + (data) => data, + {} + ), + useDeviceConditions: createUseThing< + { deviceId: string }, + DeviceConditionType[], + Record> + >( + ({ deviceId }) => ({ + type: "device_automation/condition/list", + device_id: deviceId, + }), + reduceDeviceThings, + {} + ), }; }; diff --git a/webapp/src/haService/types.ts b/webapp/src/haService/types.ts index 47d933e..da4983a 100644 --- a/webapp/src/haService/types.ts +++ b/webapp/src/haService/types.ts @@ -33,7 +33,10 @@ export type DeviceBaseType = AutomationDeviceState & { } & Record; export type DeviceTypeAction = DeviceBaseType; export type DeviceTriggerType = DeviceBaseType & { - platform: string; + platform: "device"; +}; +export type DeviceConditionType = DeviceBaseType & { + condition: "device"; }; export type DeviceTypeCapability = { extra_fields: Array<{ diff --git a/webapp/src/types/automations/conditions.ts b/webapp/src/types/automations/conditions.ts index e45b680..eb7f956 100644 --- a/webapp/src/types/automations/conditions.ts +++ b/webapp/src/types/automations/conditions.ts @@ -1,26 +1,29 @@ -import { AutomationTime } from "./common"; -import * as st from 'superstruct'; +import * as st from "superstruct"; import * as v from "types/validators/conditions"; type AutomationConditionNodeBase = { - condition: Name; - enabled?: boolean; + condition: Name; + enabled?: boolean; } & Data; -export type LogicCondition = AutomationConditionNodeBase<'and' | 'or' | 'not', { +export type LogicCondition = AutomationConditionNodeBase< + "and" | "or" | "not", + { conditions: AutomationCondition[]; -}>; + } +>; export type NumericCondition = st.Infer; +export type DeviceCondition = st.Infer; export type StateCondition = st.Infer; export type TemplateCondition = st.Infer; export type TimeCondition = st.Infer; export type TriggerCondition = st.Infer; export type ZoneCondition = st.Infer; export type AutomationCondition = - | LogicCondition - | NumericCondition - | StateCondition - | TemplateCondition - | TimeCondition - | TriggerCondition - | ZoneCondition - ; -export type ConditionType = AutomationCondition['condition']; + | LogicCondition + | DeviceCondition + | NumericCondition + | StateCondition + | TemplateCondition + | TimeCondition + | TriggerCondition + | ZoneCondition; +export type ConditionType = AutomationCondition["condition"]; diff --git a/webapp/src/types/validators/conditions.ts b/webapp/src/types/validators/conditions.ts index 2ab66bc..d870c2f 100644 --- a/webapp/src/types/validators/conditions.ts +++ b/webapp/src/types/validators/conditions.ts @@ -1,71 +1,75 @@ -import * as st from 'superstruct' -import { AutomationTime, EntityId } from './common'; - +import * as st from "superstruct"; +import { AutomationDeviceState, AutomationTime, EntityId } from "./common"; export const AutomationConditionNodeBase = st.type({ - enabled: st.optional(st.boolean()) + enabled: st.optional(st.boolean()), }); -export const LogicCondition = st.intersection([ - AutomationConditionNodeBase, - st.type({ - condition: st.enums(['and', 'or', 'not']), - conditions: st.array(st.object()) - }) -]) -export const NumericCondition = st.intersection([ - AutomationConditionNodeBase, - st.type({ - condition: st.literal('numeric_state'), - entity_id: EntityId, - above: st.optional(st.string()), - below: st.optional(st.string()), - attribute: st.optional(st.string()), - value_template: st.optional(st.string()), - }) -]); -export const StateCondition = st.intersection([ - AutomationConditionNodeBase, - st.type({ - condition: st.literal('state'), - entity_id: EntityId, - state: st.union([st.array(st.string()), st.string()]), - for: st.optional(AutomationTime), - attribute: st.optional(st.string()), - }) -]); -export const TemplateCondition = st.intersection([ - AutomationConditionNodeBase, - st.type({ - condition: st.literal('template'), - value_template: st.string(), - }) -]); -export const TriggerCondition = st.intersection([ - AutomationConditionNodeBase, - st.type({ - condition: st.literal('trigger'), - id: st.string(), - }) -]); -export const TimeCondition = st.intersection([ - AutomationConditionNodeBase, - st.type({ - condition: st.literal('time'), - after: st.optional(AutomationTime), - before: st.optional(AutomationTime), - weekday: st.optional(st.enums([ - 'mon', 'tue', 'wed', - 'thu', 'fri', 'sat', - 'sun', - ])) - }) -]); -export const ZoneCondition = st.intersection([ - AutomationConditionNodeBase, - st.type({ - condition: st.literal('zone'), - zone: st.string(), - entity_id: EntityId, - state: st.union([st.array(st.string()), st.string()]), - }) -]); \ No newline at end of file +export const LogicCondition = st.assign( + AutomationConditionNodeBase, + st.type({ + condition: st.enums(["and", "or", "not"]), + conditions: st.array(st.object()), + }) +); +export const NumericCondition = st.assign( + AutomationConditionNodeBase, + st.type({ + condition: st.literal("numeric_state"), + entity_id: EntityId, + above: st.optional(st.string()), + below: st.optional(st.string()), + attribute: st.optional(st.string()), + value_template: st.optional(st.string()), + }) +); +export const StateCondition = st.assign( + AutomationConditionNodeBase, + st.type({ + condition: st.literal("state"), + entity_id: EntityId, + state: st.union([st.array(st.string()), st.string()]), + for: st.optional(AutomationTime), + attribute: st.optional(st.string()), + }) +); +export const DeviceCondition = st.assign( + AutomationConditionNodeBase, + st.type({ + condition: st.literal("device"), + }), + AutomationDeviceState +); +export const TemplateCondition = st.assign( + AutomationConditionNodeBase, + st.type({ + condition: st.literal("template"), + value_template: st.string(), + }) +); +export const TriggerCondition = st.assign( + AutomationConditionNodeBase, + st.type({ + condition: st.literal("trigger"), + id: st.string(), + }) +); +export const TimeCondition = st.assign( + AutomationConditionNodeBase, + st.type({ + condition: st.literal("time"), + after: st.optional(AutomationTime), + before: st.optional(AutomationTime), + weekday: st.optional( + st.enums(["mon", "tue", "wed", "thu", "fri", "sat", "sun"]) + ), + }) +); +export const ZoneCondition = st.assign( + AutomationConditionNodeBase, + st.type({ + condition: st.literal("zone"), + zone: st.string(), + entity_id: EntityId, + state: st.union([st.array(st.string()), st.string()]), + }) +); diff --git a/webapp/src/utils/automations.ts b/webapp/src/utils/automations.ts index 3e156a8..5c65245 100644 --- a/webapp/src/utils/automations.ts +++ b/webapp/src/utils/automations.ts @@ -46,8 +46,9 @@ export const getSubTypeList = ( "or", "and", "not", - "numeric_state", "state", + "device", + "numeric_state", "template", "time", "trigger", @@ -125,7 +126,7 @@ export const getNodeSubType = ( } }; -const TriggerValidators: Record = { +export const TriggerValidators: Record = { homeassistant: v.triggers.AutomationTriggerHA, device: v.triggers.AutomationTriggerDevice, event: v.triggers.AutomationTriggerEvent, @@ -140,7 +141,7 @@ const TriggerValidators: Record = { zone: v.triggers.AutomationTriggerZone, }; -const ActionValidators: Record = { +export const ActionValidators: Record = { choose: v.actions.ChooseAction, device: v.actions.DeviceAction, event: v.actions.FireEventAction, @@ -149,10 +150,11 @@ const ActionValidators: Record = { wait: st.union([v.actions.DelayAction, v.actions.WaitAction]), }; -const ConditionValidators: Record = { +export const ConditionValidators: Record = { and: v.conditions.LogicCondition, or: v.conditions.LogicCondition, not: v.conditions.LogicCondition, + device: v.conditions.DeviceCondition, numeric_state: v.conditions.NumericCondition, state: v.conditions.StateCondition, template: v.conditions.TemplateCondition, @@ -161,7 +163,7 @@ const ConditionValidators: Record = { zone: v.conditions.ZoneCondition, }; -const AllValidators: Record = { +export const AllValidators: Record = { action: ActionValidators, condition: ConditionValidators, trigger: TriggerValidators, diff --git a/webapp/src/utils/defaults.ts b/webapp/src/utils/defaults.ts index 8db7868..a4c6502 100644 --- a/webapp/src/utils/defaults.ts +++ b/webapp/src/utils/defaults.ts @@ -1,62 +1,77 @@ -import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from "types/automations/conditions"; -import { AutomationData } from 'types/automations'; +import { + AutomationCondition, + LogicCondition, + NumericCondition, + StateCondition, + TemplateCondition, + TimeCondition, + TriggerCondition, + ZoneCondition, +} from "types/automations/conditions"; +import { AutomationData } from "types/automations"; - -export const getConditionDefaultValues = (condition: AutomationCondition['condition']): AutomationCondition => { - if ( - (condition === 'or') || - (condition === 'and') || - (condition === 'not') - ) { - return { - condition, - conditions: [] - } as LogicCondition - } else if (condition === 'template') { - return { - condition, - value_template: "" - } as TemplateCondition - } else if (condition === 'numeric_state') { - return { - condition, - entity_id: [] - } as NumericCondition - } else if (condition === 'state') { - return { - condition, - entity_id: [], - state: [], - } as StateCondition - } else if (condition === 'time') { - return { - condition, - } as TimeCondition - } else if (condition === 'trigger') { - return { - condition, - id: "" - } as TriggerCondition - } else if (condition === 'zone') { - return { - condition, - zone: "", - entity_id: [], - state: [], - } as ZoneCondition - } - throw new Error("NOT IMPLEMENTED!") -} +export const getConditionDefaultValues = ( + condition: AutomationCondition["condition"] +): AutomationCondition => { + if (condition === "or" || condition === "and" || condition === "not") { + return { + condition, + conditions: [], + } as LogicCondition; + } else if (condition === "template") { + return { + condition, + value_template: "", + } as TemplateCondition; + } else if (condition === "numeric_state") { + return { + condition, + entity_id: [], + } as NumericCondition; + } else if (condition === "state") { + return { + condition, + entity_id: [], + state: [], + } as StateCondition; + } else if (condition === "time") { + return { + condition, + } as TimeCondition; + } else if (condition === "trigger") { + return { + condition, + id: "", + } as TriggerCondition; + } else if (condition === "zone") { + return { + condition, + zone: "", + entity_id: [], + state: [], + } as ZoneCondition; + } else if (condition === "device") { + return { + condition, + device_id: "", + domain: "", + type: "", + }; + } + return { + condition, + } as any; +}; export const defaultAutomation = (id: string): AutomationData => ({ - metadata: { - id, - alias: "New Automation", - description: "", - mode: "single", - }, - tags: {}, - trigger: [], - sequence: [], - condition: [], -}) + metadata: { + id, + alias: "New Automation", + description: "", + mode: "single", + }, + tags: {}, + trigger: [], + sequence: [], + condition: [], +}); diff --git a/webapp/src/utils/formatting.ts b/webapp/src/utils/formatting.ts index 3c81f46..e89cbd9 100644 --- a/webapp/src/utils/formatting.ts +++ b/webapp/src/utils/formatting.ts @@ -1,5 +1,8 @@ import { AutomationNode, AutomationNodeTypes } from "types/automations"; -import { AutomationTime } from "types/automations/common"; +import { + AutomationDeviceState, + AutomationTime, +} from "types/automations/common"; export interface Namer { getEntityName(entity_id: string | string[], maxEntities?: number): string; @@ -106,8 +109,10 @@ export const getDescriptionFromAutomationNode = ( return `${namer.getEntityName(node.entity_id)} is '${node.state}'`; case "template": return node.value_template; + case "device": + return getDescriptionForDeviceType(node, namer, true); default: - return "n/a"; + return JSON.stringify(node); } } } @@ -131,19 +136,7 @@ export const getDescriptionFromAutomationNode = ( return `Trigger ${node.event}`; } if ("device_id" in node) { - let out = ""; - if (node.type) { - out += `${prettyName(node.type ?? "")} `; - } - if (node.subtype) { - out += node.subtype + " "; - } - if (node.entity_id) { - out += namer.getEntityName(node.entity_id); - } else if (node.device_id) { - out += namer.getDeviceName(node.device_id); - } - return out; + return getDescriptionForDeviceType(node, namer); } if ("choose" in node) { return "Choose"; @@ -151,6 +144,32 @@ export const getDescriptionFromAutomationNode = ( return "n/a"; }; +const getDescriptionForDeviceType = ( + node: AutomationDeviceState, + namer: Namer, + actionToEnd: boolean = false +) => { + let out = ""; + let actionPort = ""; + if (node.type) { + actionPort += `${prettyName(node.type ?? "")} `; + } + if (node.subtype) { + actionPort += node.subtype; + } + actionPort = actionPort.trim(); + if (node.entity_id) { + out += namer.getEntityName(node.entity_id); + } else if (node.device_id) { + out += namer.getDeviceName(node.device_id); + } + out = out.trim(); + if (actionToEnd) { + return out + " " + actionPort; + } + return actionPort + " " + out; +}; + export const prettyName = (n: string) => { const clean = n.replaceAll(/[.\-_]/g, " "); return clean