fixed up automation time

This commit is contained in:
ari committed 2022-05-18 10:37:41 -04:00
1 parent 5192c09681
commit ea47b3e1eb
13 files changed
+313 -33

No files matched your search

@@ -253,6 +253,201 @@ FewAutos.args = {
} }
], ],
"tags": {} "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": {}
} }
], ],
} }
@@ -209,7 +209,7 @@ const addChooseNode = (
}, { size: dims.circleSize }) }, { size: dims.circleSize })
flowData.nodes.push(elseCircle) flowData.nodes.push(elseCircle)
addEdge(flowData, nodeId, elseCircle.id, true) addEdge(flowData, nodeId, elseCircle.id, true)
const lastPoint = sequenceToFlow(flowData, node.default, elseCircle.id, { const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, {
...dims, ...dims,
padding: { padding: {
x: position.x - dims.nodeWidth, x: position.x - dims.nodeWidth,
+1 -1
View File
@@ -68,7 +68,7 @@ export const makeSequenceUpdater = (
) )
} else { } else {
return makeSequenceUpdater( return makeSequenceUpdater(
node.default, node.default ?? [],
seq => this.updateNode(i, { seq => this.updateNode(i, {
...node, ...node,
default: seq default: seq
+10 -6
View File
@@ -1,14 +1,15 @@
import { PropsWithChildren, useState } from "react"; import { PropsWithChildren, useState } from "react";
import { AutomationTime } from "types/automations/common"; import { AutomationTime, AutomationTimeObject } from "types/automations/common";
import { milisecondsToObject } from "utils/time"; import { milisecondsToObject } from "utils/time";
import InputWrapper from "./InputWrapper"; import InputWrapper from "./InputWrapper";
import { useInputTimeStyles } from "./styles"; import { useInputTimeStyles } from "./styles";
import { convertStringToAutomationTimeObject } from 'utils/time';
export interface Props { export interface Props {
textBoxFor?: string; textBoxFor?: string;
label: string; label: string;
value?: AutomationTime; value?: AutomationTime;
onChange: (v?: AutomationTime) => void; onChange: (v?: AutomationTimeObject) => void;
onEnter?: () => void; onEnter?: () => void;
} }
export default function InputTime({ export default function InputTime({
@@ -21,11 +22,14 @@ export default function InputTime({
}: PropsWithChildren<Props>) { }: PropsWithChildren<Props>) {
let cleanValue = ''; let cleanValue = '';
if (value) { if (value) {
if (typeof value === 'string') {
value = convertStringToAutomationTimeObject(value);
}
const { const {
hours, hours = 0,
minutes, minutes = 0,
seconds, seconds = 0,
milliseconds, milliseconds = 0,
} = value; } = value;
cleanValue = [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':') + `.${String(milliseconds).padStart(3, '0')}`; cleanValue = [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':') + `.${String(milliseconds).padStart(3, '0')}`;
} }
@@ -1,13 +1,14 @@
import { OptionManager } from './OptionManager'; import { OptionManager } from './OptionManager';
import { AutomationTriggerTime } from 'types/automations/triggers'; import { AutomationTriggerTime } from 'types/automations/triggers';
import InputTime from 'components/Inputs/InputTime'; import InputTime from 'components/Inputs/InputTime';
import { convertObjectToAutomationTimeString } from 'utils/time';
export const TriggerTime: OptionManager<AutomationTriggerTime> = { export const TriggerTime: OptionManager<AutomationTriggerTime> = {
defaultState: () => ({ defaultState: () => ({
"alias": "", "alias": "",
"platform": 'time', "platform": 'time',
"at": {}, "at": "",
}), }),
isReady: ({ alias }) => { isReady: ({ alias }) => {
return (alias !== '') return (alias !== '')
@@ -19,7 +20,7 @@ export const TriggerTime: OptionManager<AutomationTriggerTime> = {
value={state.at} value={state.at}
onChange={_at => setState({ onChange={_at => setState({
...state, ...state,
at: _at ?? {}, at: _at ? convertObjectToAutomationTimeString(_at) : "00:00:00",
})} })}
/> />
</> </>
+2 -2
View File
@@ -9,7 +9,7 @@ type AutomationActionNodeBase<Data extends Object> = Data & {
export type ServiceAction = AutomationActionNodeBase<{ export type ServiceAction = AutomationActionNodeBase<{
service: string; service: string;
target: any; target?: any;
data: any; data: any;
}> }>
export type RepeatAction = AutomationActionNodeBase<{ export type RepeatAction = AutomationActionNodeBase<{
@@ -38,7 +38,7 @@ export type ChooseAction = AutomationActionNodeBase<{
conditions: AutomationCondition[]; conditions: AutomationCondition[];
sequence: AutomationSequenceNode[]; sequence: AutomationSequenceNode[];
}>; }>;
default: AutomationSequenceNode[]; default?: AutomationSequenceNode[];
}> }>
export type AutomationAction = export type AutomationAction =
| ServiceAction | ServiceAction
+6 -6
View File
@@ -1,6 +1,6 @@
export interface AutomationTime { import * as st from 'superstruct'
hours?: number; import * as v from "types/validators/common";
minutes?: number;
seconds?: number; export type AutomationTime = st.Infer<typeof v.AutomationTime>
milliseconds?: number; export type AutomationTimeObject = st.Infer<typeof v.AutomationTimeObject>
} export type AutomationTimeString = st.Infer<typeof v.AutomationTimeString>
+1 -2
View File
@@ -1,11 +1,10 @@
import * as st from 'superstruct' import * as st from 'superstruct'
import { AutomationMetadata } from './metadata' import { AutomationMetadata } from './metadata'
import { AutomationTrigger } from './triggers';
export const AutomationData = st.object({ export const AutomationData = st.object({
metadata: AutomationMetadata, metadata: AutomationMetadata,
trigger: st.array(AutomationTrigger), trigger: st.array(st.object()),
condition: st.array(st.object()), condition: st.array(st.object()),
sequence: st.array(st.object()), sequence: st.array(st.object()),
tags: st.record(st.string(), st.string()), tags: st.record(st.string(), st.string()),
+28 -2
View File
@@ -1,9 +1,35 @@
import * as st from 'superstruct' 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()), hours: st.optional(st.number()),
minutes: st.optional(st.number()), minutes: st.optional(st.number()),
seconds: st.optional(st.number()), seconds: st.optional(st.number()),
milliseconds: st.optional(st.number()), milliseconds: st.optional(st.number()),
}) });
export const AutomationTime = st.union([st.string(), AutomationTimeObject])
+31
View File
@@ -2,6 +2,7 @@ import * as st from "superstruct";
import { AutomationMetadata } from "./metadata"; import { AutomationMetadata } from "./metadata";
import { AutomationData } from './autmation'; import { AutomationData } from './autmation';
import { getFailures } from './helper'; import { getFailures } from './helper';
import { AutomationTimeString } from "./common";
test('superstructure is', () => { test('superstructure is', () => {
const badCheck = st.is({}, AutomationMetadata); const badCheck = st.is({}, AutomationMetadata);
@@ -22,3 +23,33 @@ test('getFailures returns null', () => {
}, AutomationMetadata); }, AutomationMetadata);
expect(failures).toBeNull() 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)
}
})
+2 -2
View File
@@ -1,5 +1,5 @@
import * as st from 'superstruct' import * as st from 'superstruct'
import { AutomationTime } from './common' import { AutomationTimeString, AutomationTime } from './common'
const AutomationTriggerBase = { const AutomationTriggerBase = {
@@ -67,7 +67,7 @@ export const AutomationTriggerTemplate = st.object({
export const AutomationTriggerTime = st.object({ export const AutomationTriggerTime = st.object({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('time'), platform: st.literal('time'),
at: AutomationTime, at: AutomationTimeString,
}) })
export const AutomationTriggerTimePattern = st.object({ export const AutomationTriggerTimePattern = st.object({
+13 -7
View File
@@ -2,13 +2,19 @@ import { AutomationNode, AutomationNodeTypes } from "types/automations";
import { AutomationTime } from "types/automations/common"; import { AutomationTime } from "types/automations/common";
export const convertTimeToString = ({ export const convertTimeToString = (t: AutomationTime) => {
hours = 0, if (typeof t === 'string') {
minutes = 0, return t
seconds = 0, } else {
milliseconds = 0, const {
}: AutomationTime) => [hours, minutes, seconds, milliseconds].map(n => String(n).padStart(2, '0')).join(':') 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 = <N extends AutomationNodeTypes>(node: AutomationNode<N>): string => { export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(node: AutomationNode<N>): string => {
if (node.alias) { if (node.alias) {
return node.alias; return node.alias;
+20 -2
View File
@@ -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)) 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 hours = cleanTime(total_miliseconds / (60 * 60 * 1000));
const minutes = cleanTime((total_miliseconds - hours * 60 * 60 * 1000) / (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); const seconds = cleanTime((total_miliseconds - hours * 60 * 60 * 1000 - minutes * 60 * 1000) / 1000);
@@ -11,3 +11,21 @@ export const milisecondsToObject = (total_miliseconds: number): AutomationTime =
hours, minutes, seconds, milliseconds, 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(':')
}