diff --git a/webapp/src/components/AutomationList/AutomationList.stories.tsx b/webapp/src/components/AutomationList/AutomationList.stories.tsx index 0a98f97..2e231f5 100644 --- a/webapp/src/components/AutomationList/AutomationList.stories.tsx +++ b/webapp/src/components/AutomationList/AutomationList.stories.tsx @@ -253,6 +253,201 @@ FewAutos.args = { } ], "tags": {} + }, + { + "metadata": { + "id": "1649726828269", + "alias": "Climate Heat Mode Settings", + "description": "Ensures that the climate is always in sync with the house settings", + "trigger_variables": null, + "mode": "single" + }, + "trigger": [ + { + "platform": "state", + "entity_id": "climate.main_floor", + "id": "main" + }, + { + "platform": "state", + "entity_id": "climate.second_floor", + "id": "second" + }, + { + "platform": "state", + "entity_id": "input_boolean.thermostats_house_is_heating", + "id": "setting" + } + ], + "condition": [], + "sequence": [ + { + "choose": [ + { + "conditions": [ + { + "condition": "trigger", + "id": "setting" + } + ], + "sequence": [ + { + "service": "climate.turn_off", + "data": {}, + "target": { + "device_id": [ + "d88dcfe82bc9a1c0f2b77b871848155e", + "ef2d47fdeef19f8984b85f92f2597f73" + ] + } + } + ] + }, + { + "conditions": [ + { + "condition": "state", + "entity_id": "input_boolean.thermostats_house_is_heating", + "state": "on" + } + ], + "sequence": [ + { + "choose": [ + { + "conditions": [ + { + "condition": "and", + "conditions": [ + { + "condition": "template", + "value_template": "{{ trigger.to_state.state != 'heat' }}" + }, + { + "condition": "template", + "value_template": "{{ trigger.to_state.state != 'off' }}" + } + ] + } + ], + "sequence": [ + { + "service": "climate.set_hvac_mode", + "data": { + "hvac_mode": "heat" + }, + "target": { + "entity_id": "{{ trigger.entity_id }}" + } + } + ] + } + ] + } + ] + } + ], + "default": [ + { + "choose": [ + { + "conditions": [ + { + "condition": "and", + "conditions": [ + { + "condition": "template", + "value_template": "{{ trigger.to_state.state != 'cool' }}" + }, + { + "condition": "template", + "value_template": "{{ trigger.to_state.state != 'off' }}" + } + ] + } + ], + "sequence": [ + { + "service": "climate.set_hvac_mode", + "data": { + "hvac_mode": "cool" + }, + "target": { + "entity_id": "{{ trigger.entity_id }}" + } + } + ] + } + ] + } + ] + } + ], + "tags": {} + }, + { + "metadata": { + "id": "1628024070687", + "alias": "Baby Light Setting", + "description": "Configures max/min light settings for the baby ", + "trigger_variables": null, + "mode": "single" + }, + "trigger": [ + { + "platform": "time", + "at": "21:00:00", + "id": "night" + }, + { + "platform": "time", + "at": "07:30:00", + "id": "day" + } + ], + "condition": [], + "sequence": [ + { + "choose": [ + { + "conditions": [ + { + "condition": "trigger", + "id": "night" + } + ], + "sequence": [ + { + "service": "zwave_js.set_config_parameter", + "data": { + "parameter": "5", + "value": "15" + } + } + ] + }, + { + "conditions": [ + { + "condition": "trigger", + "id": "day" + } + ], + "sequence": [ + { + "service": "zwave_js.set_config_parameter", + "data": { + "parameter": "5", + "value": 100 + } + } + ] + } + ], + "default": [] + } + ], + "tags": {} } ], } diff --git a/webapp/src/components/DAGFlow/sequenceConvertor.ts b/webapp/src/components/DAGFlow/sequenceConvertor.ts index 55c2913..e3dfff8 100644 --- a/webapp/src/components/DAGFlow/sequenceConvertor.ts +++ b/webapp/src/components/DAGFlow/sequenceConvertor.ts @@ -209,7 +209,7 @@ const addChooseNode = ( }, { size: dims.circleSize }) flowData.nodes.push(elseCircle) addEdge(flowData, nodeId, elseCircle.id, true) - const lastPoint = sequenceToFlow(flowData, node.default, elseCircle.id, { + const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, { ...dims, padding: { x: position.x - dims.nodeWidth, diff --git a/webapp/src/components/DAGFlow/updater.ts b/webapp/src/components/DAGFlow/updater.ts index 306a013..925c4f1 100644 --- a/webapp/src/components/DAGFlow/updater.ts +++ b/webapp/src/components/DAGFlow/updater.ts @@ -68,7 +68,7 @@ export const makeSequenceUpdater = ( ) } else { return makeSequenceUpdater( - node.default, + node.default ?? [], seq => this.updateNode(i, { ...node, default: seq diff --git a/webapp/src/components/Inputs/InputTime.tsx b/webapp/src/components/Inputs/InputTime.tsx index 1c1542c..26b7d60 100644 --- a/webapp/src/components/Inputs/InputTime.tsx +++ b/webapp/src/components/Inputs/InputTime.tsx @@ -1,14 +1,15 @@ import { PropsWithChildren, useState } from "react"; -import { AutomationTime } from "types/automations/common"; +import { AutomationTime, AutomationTimeObject } from "types/automations/common"; import { milisecondsToObject } from "utils/time"; import InputWrapper from "./InputWrapper"; import { useInputTimeStyles } from "./styles"; +import { convertStringToAutomationTimeObject } from 'utils/time'; export interface Props { textBoxFor?: string; label: string; value?: AutomationTime; - onChange: (v?: AutomationTime) => void; + onChange: (v?: AutomationTimeObject) => void; onEnter?: () => void; } export default function InputTime({ @@ -21,11 +22,14 @@ export default function InputTime({ }: PropsWithChildren) { let cleanValue = ''; if (value) { + if (typeof value === 'string') { + value = convertStringToAutomationTimeObject(value); + } const { - hours, - minutes, - seconds, - milliseconds, + hours = 0, + minutes = 0, + seconds = 0, + milliseconds = 0, } = value; cleanValue = [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':') + `.${String(milliseconds).padStart(3, '0')}`; } diff --git a/webapp/src/components/NodeEditor/OptionManager/TriggerTime.tsx b/webapp/src/components/NodeEditor/OptionManager/TriggerTime.tsx index be8b3f6..630013f 100644 --- a/webapp/src/components/NodeEditor/OptionManager/TriggerTime.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/TriggerTime.tsx @@ -1,13 +1,14 @@ import { OptionManager } from './OptionManager'; import { AutomationTriggerTime } from 'types/automations/triggers'; import InputTime from 'components/Inputs/InputTime'; +import { convertObjectToAutomationTimeString } from 'utils/time'; export const TriggerTime: OptionManager = { defaultState: () => ({ "alias": "", "platform": 'time', - "at": {}, + "at": "", }), isReady: ({ alias }) => { return (alias !== '') @@ -19,7 +20,7 @@ export const TriggerTime: OptionManager = { value={state.at} onChange={_at => setState({ ...state, - at: _at ?? {}, + at: _at ? convertObjectToAutomationTimeString(_at) : "00:00:00", })} /> diff --git a/webapp/src/types/automations/actions.ts b/webapp/src/types/automations/actions.ts index 2d2e8cc..2123079 100644 --- a/webapp/src/types/automations/actions.ts +++ b/webapp/src/types/automations/actions.ts @@ -9,7 +9,7 @@ type AutomationActionNodeBase = Data & { export type ServiceAction = AutomationActionNodeBase<{ service: string; - target: any; + target?: any; data: any; }> export type RepeatAction = AutomationActionNodeBase<{ @@ -38,7 +38,7 @@ export type ChooseAction = AutomationActionNodeBase<{ conditions: AutomationCondition[]; sequence: AutomationSequenceNode[]; }>; - default: AutomationSequenceNode[]; + default?: AutomationSequenceNode[]; }> export type AutomationAction = | ServiceAction diff --git a/webapp/src/types/automations/common.ts b/webapp/src/types/automations/common.ts index da7fa54..34c8e15 100644 --- a/webapp/src/types/automations/common.ts +++ b/webapp/src/types/automations/common.ts @@ -1,6 +1,6 @@ -export interface AutomationTime { - hours?: number; - minutes?: number; - seconds?: number; - milliseconds?: number; -} +import * as st from 'superstruct' +import * as v from "types/validators/common"; + +export type AutomationTime = st.Infer +export type AutomationTimeObject = st.Infer +export type AutomationTimeString = st.Infer diff --git a/webapp/src/types/validators/autmation.ts b/webapp/src/types/validators/autmation.ts index 7258b38..99bf6de 100644 --- a/webapp/src/types/validators/autmation.ts +++ b/webapp/src/types/validators/autmation.ts @@ -1,11 +1,10 @@ import * as st from 'superstruct' import { AutomationMetadata } from './metadata' -import { AutomationTrigger } from './triggers'; export const AutomationData = st.object({ metadata: AutomationMetadata, - trigger: st.array(AutomationTrigger), + trigger: st.array(st.object()), condition: st.array(st.object()), sequence: st.array(st.object()), tags: st.record(st.string(), st.string()), diff --git a/webapp/src/types/validators/common.ts b/webapp/src/types/validators/common.ts index aae2c6c..1314319 100644 --- a/webapp/src/types/validators/common.ts +++ b/webapp/src/types/validators/common.ts @@ -1,9 +1,35 @@ import * as st from 'superstruct' -export const AutomationTime = st.object({ +export const AutomationTimeString = st.refine(st.string(), 'TimeString', (v, c) => { + // https://www.home-assistant.io/docs/automation/trigger/#time-string + const bits: string[] = v.split(':') + if ((bits.length !== 2) && (bits.length !== 3)) { + return { + "branch": c.branch, + "message": "Time string should be either in the form 'HH:MM' or 'HH:MM:SS' as specified in https://www.home-assistant.io/docs/automation/trigger/#time-string", + "path": c.path, + } + } + for (let i = 0; i < bits.length; i++) { + const b = bits[i]; + const num = Number(b); + if (!Number.isInteger(num) || (num < 0) || (num > 23)) { + return { + "branch": c.branch, + "message": "Time string should contain only positive numbers between 0-23 as specified in https://www.home-assistant.io/docs/automation/trigger/#time-string", + "path": c.path.concat( + bits.slice(0, i) + ).concat([`<<${b}>>`]) + } + } + } + return true +}) +export const AutomationTimeObject = st.object({ hours: st.optional(st.number()), minutes: st.optional(st.number()), seconds: st.optional(st.number()), milliseconds: st.optional(st.number()), -}) +}); +export const AutomationTime = st.union([st.string(), AutomationTimeObject]) diff --git a/webapp/src/types/validators/index.test.ts b/webapp/src/types/validators/index.test.ts index 3bbc702..7e348ae 100644 --- a/webapp/src/types/validators/index.test.ts +++ b/webapp/src/types/validators/index.test.ts @@ -2,6 +2,7 @@ import * as st from "superstruct"; import { AutomationMetadata } from "./metadata"; import { AutomationData } from './autmation'; import { getFailures } from './helper'; +import { AutomationTimeString } from "./common"; test('superstructure is', () => { const badCheck = st.is({}, AutomationMetadata); @@ -21,4 +22,34 @@ test('getFailures returns null', () => { mode: "single", }, AutomationMetadata); expect(failures).toBeNull() +}) + +test('AutomationTimeString is valid', () => { + for (const c of [ + '10:23', + '15:02', + '13:00:1', + '23:00:23' + ]) { + const failures = getFailures(c, AutomationTimeString) + expect(failures).toBeNull() + } +}) + + +test('AutomationTimeString is invalid', () => { + for (const c of [ + 'xx:23', + '1x:02', + '13:0a:1c', + '25:00:23', + '11' + ]) { + const failures = getFailures({ + "time": c + }, st.object({ + time: AutomationTimeString, + })) + expect(failures).toHaveLength(1) + } }) \ No newline at end of file diff --git a/webapp/src/types/validators/triggers.ts b/webapp/src/types/validators/triggers.ts index 451112d..3400ebe 100644 --- a/webapp/src/types/validators/triggers.ts +++ b/webapp/src/types/validators/triggers.ts @@ -1,5 +1,5 @@ import * as st from 'superstruct' -import { AutomationTime } from './common' +import { AutomationTimeString, AutomationTime } from './common' const AutomationTriggerBase = { @@ -67,7 +67,7 @@ export const AutomationTriggerTemplate = st.object({ export const AutomationTriggerTime = st.object({ ...AutomationTriggerBase, platform: st.literal('time'), - at: AutomationTime, + at: AutomationTimeString, }) export const AutomationTriggerTimePattern = st.object({ diff --git a/webapp/src/utils/formatting.ts b/webapp/src/utils/formatting.ts index 691152f..f4dd051 100644 --- a/webapp/src/utils/formatting.ts +++ b/webapp/src/utils/formatting.ts @@ -2,13 +2,19 @@ import { AutomationNode, AutomationNodeTypes } from "types/automations"; import { AutomationTime } from "types/automations/common"; -export const convertTimeToString = ({ - hours = 0, - minutes = 0, - seconds = 0, - milliseconds = 0, -}: AutomationTime) => [hours, minutes, seconds, milliseconds].map(n => String(n).padStart(2, '0')).join(':') - +export const convertTimeToString = (t: AutomationTime) => { + if (typeof t === 'string') { + return t + } else { + const { + hours = 0, + minutes = 0, + seconds = 0, + milliseconds = 0, + } = t + return [hours, minutes, seconds, milliseconds].map(n => String(n).padStart(2, '0')).join(':') + } +} export const getDescriptionFromAutomationNode = (node: AutomationNode): string => { if (node.alias) { return node.alias; diff --git a/webapp/src/utils/time.ts b/webapp/src/utils/time.ts index be77e29..0129435 100644 --- a/webapp/src/utils/time.ts +++ b/webapp/src/utils/time.ts @@ -1,8 +1,8 @@ -import { AutomationTime } from "types/automations/common"; +import { AutomationTimeObject, AutomationTimeString } from "types/automations/common"; const cleanTime = (t: number) => Math.max(0, Math.floor(t)) -export const milisecondsToObject = (total_miliseconds: number): AutomationTime => { +export const milisecondsToObject = (total_miliseconds: number): AutomationTimeObject => { const hours = cleanTime(total_miliseconds / (60 * 60 * 1000)); const minutes = cleanTime((total_miliseconds - hours * 60 * 60 * 1000) / (60 * 1000)); const seconds = cleanTime((total_miliseconds - hours * 60 * 60 * 1000 - minutes * 60 * 1000) / 1000); @@ -10,4 +10,22 @@ export const milisecondsToObject = (total_miliseconds: number): AutomationTime = return { hours, minutes, seconds, milliseconds, } +} + +export const convertStringToAutomationTimeObject = (t: AutomationTimeString): AutomationTimeObject => { + const bits = t.split(':') + return { + hours: Number(bits[0]), + minutes: Number(bits[1]), + seconds: bits.length === 3 ? Number(bits[2]) : 0, + } +} + +export const convertObjectToAutomationTimeString = (t: AutomationTimeObject): AutomationTimeString => { + const { + hours = 0, + minutes = 0, + seconds = 0 + } = t + return [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':') } \ No newline at end of file