Compare commits

...
16 Commits
Author SHA1 Message Date
ari 25770e1c1d v0.1.12 2022-05-18 23:09:19 -04:00
ari 029a2dac9f better formatting 2022-05-18 22:57:51 -04:00
ari 8732ab8dda not populating changelog 2022-05-18 22:42:56 -04:00
ari 42ab6e5913 improper save for conditions 2022-05-18 22:41:24 -04:00
ari c28796872f condition validation 2022-05-18 22:37:25 -04:00
ari 40690293a8 added initial pre-validation per node 2022-05-18 22:23:57 -04:00
ari 621f43e5c8 v0.1.10 2022-05-18 11:57:34 -04:00
ari f3496f9d32 fixed nodejs test 2022-05-18 11:04:15 -04:00
ari 409cf2b21a simpler names 2022-05-18 11:03:07 -04:00
ari ef92261666 reverting something stupid 2022-05-18 11:01:29 -04:00
ari 83edaf9bf8 tagged names 2022-05-18 11:00:41 -04:00
ari f8efd895a9 not building 2022-05-18 10:59:35 -04:00
ari da0d153b81 fixed up linting 2022-05-18 10:58:26 -04:00
ari bcd262dd46 - fixed up optional metadata + + desc
- using timestamp for default new ids
'
2022-05-18 10:54:53 -04:00
ari ea47b3e1eb fixed up automation time 2022-05-18 10:37:41 -04:00
ari 5192c09681 trying to provide test 2022-05-18 09:50:08 -04:00
55 changed files with 1102 additions and 275 deletions

No files matched your search

+3 -3
View File
@@ -1,15 +1,15 @@
name: Manual Build name: "Manual Build"
on: on:
workflow_dispatch: workflow_dispatch:
inputs: inputs:
version: version:
type: string type: string
description: "Version Number"
required: true required: true
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Build & Publish ${{ github.event.inputs.version }} / ${{ matrix.arch }} name: "${{ github.event.inputs.version }} / ${{ matrix.arch }}"
strategy: strategy:
matrix: matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"] arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
+23 -26
View File
@@ -6,9 +6,8 @@ on:
push: push:
branch: [main] branch: [main]
paths: paths:
- 'config.yaml' - "config.yaml"
jobs: jobs:
metadata: metadata:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Metadata name: Metadata
@@ -29,37 +28,36 @@ jobs:
run: | run: |
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md) echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
build: # build:
runs-on: ubuntu-latest # runs-on: ubuntu-latest
name: Build & Publish ${{ matrix.arch }} # name: Build & Publish ${{ matrix.arch }}
needs: # needs:
- metadata # - metadata
strategy: # strategy:
matrix: # matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"] # arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps: # steps:
- name: Check out repository # - name: Check out repository
uses: actions/checkout@v3 # uses: actions/checkout@v3
- name: Login to DockerHub # - name: Login to DockerHub
uses: docker/login-action@v2.0.0 # uses: docker/login-action@v2.0.0
with: # with:
username: ${{ secrets.DOCKERHUB_USERNAME }} # username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} # password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }} # - name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
uses: home-assistant/builder@2022.03.1 # uses: home-assistant/builder@2022.03.1
with: # with:
args: | # args: |
--${{ matrix.arch }} \ # --${{ matrix.arch }} \
--target . # --target .
publish: publish:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: needs:
- metadata - metadata
- build
name: Publish Github Release name: Publish Github Release
steps: steps:
- name: Publish Release ${{ needs.metadata.outputs.version }} - name: Publish Release ${{ needs.metadata.outputs.version }}
@@ -73,5 +71,4 @@ jobs:
owner: context.repo.owner, owner: context.repo.owner,
repo: context.repo.repo, repo: context.repo.repo,
tag_name: process.env.VERSION, tag_name: process.env.VERSION,
body: process.env.CHANGELOG,
}); });
+4 -1
View File
@@ -63,7 +63,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
action: [test:ci, tsc:ci, build] action:
- "test:ci"
- "tsc:ci"
- "build"
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
+12
View File
@@ -1,5 +1,17 @@
# Changelog # Changelog
## [0.1.12] - Less Intense Error Messages
- Added more node-based errors (this way it's easier to see where validations failed)
- Made the validators less strict in order to capture more edge cases that HA supports
- Nicer auto-generated descriptions for some trigger nodes
## [0.1.10] - More Bug Fixes
- Allowing null or undefined values for metadata fields
- Trigger.platform==time will now have the .at property better supported
## [0.1.9] - Fixed up invalid types for various triggers ## [0.1.9] - Fixed up invalid types for various triggers
- Some triggers had invalid types and were causing a false-positive validation - Some triggers had invalid types and were causing a false-positive validation
+1 -1
View File
@@ -1,4 +1,4 @@
from typing import Dict, List, Literal, Optional, Union from typing import Dict, List, Optional, Union
from pydantic import BaseModel from pydantic import BaseModel
from pydantic.fields import Field from pydantic.fields import Field
+1 -1
View File
@@ -1,5 +1,5 @@
name: Shortumation name: Shortumation
version: 0.1.9 version: 0.1.12
slug: shortumation slug: shortumation
image: asosnovsky/shortumation-{arch} image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation" url: "https://github.com/asosnovsky/Shortumation"
@@ -80,8 +80,8 @@ export const AutoInfoBox: FC<Props> = ({
return <div className={`automation-editor--info-box ${className}`}> return <div className={`automation-editor--info-box ${className}`}>
<div className="automation-editor--info-box-inner"> <div className="automation-editor--info-box-inner">
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} /> <InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} />
<InputText label="Name" value={metadata.alias} onChange={onUpdateMetadata('alias')} /> <InputText label="Name" value={metadata.alias ?? ""} onChange={onUpdateMetadata('alias')} />
<InputTextArea label="Description" value={metadata.description} onChange={onUpdateMetadata('description')} /> <InputTextArea label="Description" value={metadata.description ?? ""} onChange={onUpdateMetadata('description')} />
<InputList <InputList
label="Mode" label="Mode"
current={metadata.mode} current={metadata.mode}
@@ -2,7 +2,7 @@ import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react'; import { ComponentMeta, ComponentStory } from '@storybook/react';
import { AutomationEditor } from './index'; import { AutomationEditor } from './index';
import { useState } from 'react'; import { useState } from 'react';
import * as dgconst from 'components/DAGSvgs/constants'; import * as dgconst from 'components/DAGFlow/constants';
export default { export default {
@@ -3,7 +3,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react"; import { useState } from "react";
import { AutomationList } from "."; import { AutomationList } from ".";
import { createMockAuto } from "utils/mocks"; import { createMockAuto } from "utils/mocks";
import * as dgconst from 'components/DAGSvgs/constants'; import * as dgconst from 'components/DAGFlow/constants';
export default { export default {
title: 'App/AutomationList', title: 'App/AutomationList',
@@ -253,6 +253,253 @@ 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": {}
},
{
"metadata": {
"id": "alarmanlage_an",
"alias": "alarmanlage_an (Uhrzeit)",
"mode": "single"
},
tags: {},
"trigger": [
{
"entity_id": "sensor.time",
"platform": "state",
"to": "23:30"
}
],
"condition": [
{
"condition": "or",
"conditions": [
{
"condition": "state",
"entity_id": "person.simon",
"state": "home"
},
{
"condition": "state",
"entity_id": "person.leni",
"state": "home"
}
]
}
],
"sequence": [
{
"service": "alarm_control_panel.alarm_arm_night",
"target": {
"entity_id": [
"alarm_control_panel.alarmo"
]
},
"data": {
"code": "xxx"
}
},
{
"service": "alarm_control_panel.alarm_arm_away",
"data": {},
"target": {
"entity_id": "alarm_control_panel.blink_home"
}
}
],
} }
], ],
} }
@@ -263,6 +510,38 @@ export const BadAutmations = Template.bind({})
BadAutmations.args = { BadAutmations.args = {
...BadAutmations.args, ...BadAutmations.args,
automations: [ automations: [
{
"metadata": {
"alias": "Set Thermostat to 76 at 8am",
"description": "",
"mode": "single",
} as any,
"trigger": [
{
"at": "08:00:00",
"platform": "time"
}
],
"condition": [
{
"condition": "state",
"entity_id": "climate.thermostat",
"state": "cool"
}
],
"sequence": [
{
"data": {
"temperature": 76
},
"service": "climate.set_temperature",
"target": {
"entity_id": "climate.thermostat"
}
}
],
"tags": {},
},
{ {
condition: [], condition: [],
tags: {}, tags: {},
@@ -71,8 +71,8 @@ const filterAutomations = (autos: AutomationData[], searchText: string, selected
if (searchText.length > 0) { if (searchText.length > 0) {
if ( if (
!( !(
a.metadata.description.toLocaleLowerCase().includes(searchText) || (a.metadata.description ?? "").toLocaleLowerCase().includes(searchText) ||
a.metadata.alias.toLocaleLowerCase().includes(searchText) (a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
) )
) { ) {
return false return false
@@ -169,8 +169,8 @@ export const MetadataBox: FC<{
let title = <span>{"BadAuto<<Missing Metadata>>"}</span> let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
if (auto.metadata) { if (auto.metadata) {
title = <> title = <>
<b>{String(auto.metadata.alias).slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b> <b>{String(auto.metadata.alias ?? "").slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
<span>{String(auto.metadata.description).slice(0, 25)}</span> <span>{String(auto.metadata.description ?? "").slice(0, 25)}</span>
</> </>
} }
return <div return <div
@@ -2,7 +2,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { ConnectedAutomationList } from "."; import { ConnectedAutomationList } from ".";
import { createMockAuto } from "utils/mocks"; import { createMockAuto } from "utils/mocks";
import { useMockApiService } from "apiService"; import { useMockApiService } from "apiService";
import { DEFAULT_DIMS } from 'components/DAGSvgs/constants'; import { DEFAULT_DIMS } from 'components/DAGFlow/constants';
export default { export default {
title: 'App/AutomationList/Connected', title: 'App/AutomationList/Connected',
@@ -40,7 +40,7 @@ export const AutomationList: FC<AutomationListParams> = ({
<AutomationListBox <AutomationListBox
automations={automations} automations={automations}
onAdd={() => { onAdd={() => {
onAdd(defaultAutomation(`shortu-${automations.length}`)); onAdd(defaultAutomation(String(Date.now())));
setCurrent(automations.length) setCurrent(automations.length)
}} }}
onSelectAutomation={i => { onSelectAutomation={i => {
@@ -0,0 +1,53 @@
.dagnode-error {
display: flex;
flex-direction: column;
justify-content: flex-end;
font-size: 0.85em;
z-index: 0;
}
.dagnode-error.open .dagnode-error--inner {
align-items: flex-start;
padding-top: 1em;
}
.dagnode-error--inner {
position: relative;
flex: 1;
/* internal positioning */
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
gap: 0.5em;
/* shape */
background-color: var(--error-dark);
border-radius: 1em;
height: 100%;
max-height: 100%;
max-width: 100%;
margin-top: 2.5px;
margin-bottom: 2.5px;
border-top-width: 1px;
border-top-style: solid;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
border-top-color: var(--error);
}
.dagnode-error--inner:hover {
background-color: var(--error-accent);
cursor: default;
}
.dagnode-error--inner--edit-icon:hover {
transform: rotate(180deg);
cursor: pointer;
background-color: var(--error);
padding: 0.5em;
border-radius: 10px;
height: 0.25em;
width: 0.25em;
}
@@ -0,0 +1,46 @@
import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { DAGAutomationFlow } from '.';
import * as dgconst from "components/DAGFlow/constants";
import ReactFlow, { Controls } from 'react-flow-renderer';
import { DAGErrorNode } from "./DAGErrorNode";
import { convertToFlowNode } from "./helpers";
export default {
title: 'DAGAutomationFlow/Viewer/DAGErrorNode',
component: DAGAutomationFlow,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
"height": dgconst.NODE_HEIGHT,
"width": dgconst.NODE_WIDTH,
}
} as ComponentMeta<typeof DAGErrorNode>
export const Examples: ComponentStory<typeof DAGErrorNode> = args => {
const nodes = ["1", "2", "3", "4"].map((id, i) => ({
"data": args,
"id": id,
"type": "mynode",
"position": {
"x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i,
"y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i
}
}));
return <div className="page">
<ReactFlow
defaultNodes={nodes}
nodeTypes={{
"mynode": convertToFlowNode(DAGErrorNode)
}}
snapToGrid
onlyRenderVisibleElements
nodesConnectable={false}
nodesDraggable={false}
>
<Controls />
</ReactFlow>
</div>
}
@@ -0,0 +1,34 @@
import "./DAGErrorNode.css";
import { Handle, Position } from 'react-flow-renderer';
import { FC } from 'react';
import { InfoIcon, PencilIcon } from 'components/Icons';
export interface DAGErrorNodeProps {
height: number;
width: number;
hasInput?: boolean;
error?: any,
onEdit: () => void;
}
export const DAGErrorNode: FC<DAGErrorNodeProps> = ({
height, width, hasInput, error, onEdit
}) => {
// render
return <>
{hasInput && <Handle type="target" position={Position.Left} />}
<Handle type="source" position={Position.Right} />
<div className={["dagnode-error"].join(' ')} style={{
height,
width,
maxHeight: height,
maxWidth: width,
}}>
<div className={"dagnode-error--inner"} title={String(error)}>
<InfoIcon color="var(--error-light)" size={1.25} />
Invalid Node
<PencilIcon className="dagnode-error--inner--edit-icon" size={1.25} onClick={onEdit} />
</div>
</div>
</>
}
@@ -0,0 +1,47 @@
import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { DAGAutomationFlow } from '.';
import { useState } from 'react';
import * as dgconst from "components/DAGFlow/constants";
import ReactFlow, { Controls } from 'react-flow-renderer';
import { DAGNode } from "./DAGNode";
import { convertToFlowNode } from "./helpers";
export default {
title: 'DAGAutomationFlow/Viewer/DAGNode',
component: DAGAutomationFlow,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
"color": "lblue",
"height": dgconst.NODE_HEIGHT,
"width": dgconst.NODE_WIDTH,
"label": "test",
"hasInput": true,
}
} as ComponentMeta<typeof DAGNode>
export const Colors: ComponentStory<typeof DAGNode> = args => {
const nodes = ["blue", "red", "green", "lblue"].map((color, i) => ({
"data": { ...args, color },
"id": color,
"type": "mynode",
"position": { "x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i, "y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i }
}));
return <div className="page">
<ReactFlow
defaultNodes={nodes}
nodeTypes={{
"mynode": convertToFlowNode(DAGNode)
}}
snapToGrid
onlyRenderVisibleElements
nodesConnectable={false}
nodesDraggable={false}
>
<Controls />
</ReactFlow>
</div>
}
+9 -11
View File
@@ -15,17 +15,15 @@ export interface DAGNodeProps {
hasInput?: boolean; hasInput?: boolean;
accentBackground?: boolean; accentBackground?: boolean;
} }
export const DAGNode: FC<{ data: DAGNodeProps }> = ({ export const DAGNode: FC<DAGNodeProps> = ({
data: { label,
label, height,
height, width,
width, onXClick,
onXClick, onEditClick = () => { },
onEditClick = () => { }, color,
color, hasInput = false,
hasInput = false, accentBackground = false,
accentBackground = false,
},
}) => { }) => {
const { classes, theme } = useNodeStyles({ const { classes, theme } = useNodeStyles({
color, color,
@@ -0,0 +1,9 @@
import { FC } from 'react';
export const convertToFlowNode = <D extends {}>(
Component: FC<D>
): FC<{ data: D }> =>
({ data }) => {
return <Component {...data} />
}
@@ -4,7 +4,7 @@ import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react'; import { ComponentMeta, ComponentStory } from '@storybook/react';
import { DAGAutomationFlow } from '.'; import { DAGAutomationFlow } from '.';
import { useState } from 'react'; import { useState } from 'react';
import * as dgconst from "components/DAGSvgs/constants"; import * as dgconst from "components/DAGFlow/constants";
export default { export default {
@@ -210,3 +210,24 @@ EmptyStart.args = {
trigger: [], trigger: [],
sequence: [] sequence: []
} }
export const Errors = Template.bind({})
Errors.args = {
...Errors.args,
condition: [
{
"condition": "numeric_state",
} as any
],
trigger: [
{
"platform": "event",
} as any
],
sequence: [
{
"choose": {}
} as any
]
}
+5 -2
View File
@@ -14,9 +14,12 @@ import { MultiNodeEditor } from "components/MultiNodeEditors";
import { Modal } from "components/Modal"; import { Modal } from "components/Modal";
import { AutomationCondition } from "types/automations/conditions"; import { AutomationCondition } from "types/automations/conditions";
import { makeConditionPoint } from "./flowDataMods"; import { makeConditionPoint } from "./flowDataMods";
import { convertToFlowNode } from "./helpers";
import { DAGErrorNode } from "./DAGErrorNode";
const nodeTypes = { const nodeTypes = {
'dagnode': DAGNode, 'dagnode': convertToFlowNode(DAGNode),
'errornode': convertToFlowNode(DAGErrorNode),
'dagcircle': DAGCircle, 'dagcircle': DAGCircle,
} }
@@ -61,6 +64,7 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
if (modalState.single) { if (modalState.single) {
modalBody = <NodeEditor modalBody = <NodeEditor
node={modalState.node} node={modalState.node}
isErrored={modalState.isError}
onClose={() => setModalState(null)} onClose={() => setModalState(null)}
onSave={n => { modalState.update(n as any); setModalState(null); }} onSave={n => { modalState.update(n as any); setModalState(null); }}
allowedTypes={modalState.allowedTypes} allowedTypes={modalState.allowedTypes}
@@ -123,7 +127,6 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
}, },
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState), makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
); );
// render // render
return <> return <>
<Modal open={!!modalState}> <Modal open={!!modalState}>
@@ -38,7 +38,14 @@ export const sequenceToFlow = (
// draw node // draw node
if (getNodeType(node) === 'action') { if (getNodeType(node) === 'action') {
if ('choose' in node) { if ('choose' in node) {
position = addChooseNode(flowData, node, position, nodeId, dims, updater, i) try {
const out = addChooseNode(node, position, nodeId, dims, updater, i);
position = out.lastPos
flowData = mergeFlowDatas(flowData, out.flowData);
} catch (err) {
console.error(err)
addErrorNode(flowData, nodeId, position, dims, err, updater.makeOnEditForBadNode(i));
}
} else { } else {
addSingleNode(flowData, node, position, nodeId, dims, { addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node), onEditClick: updater.makeOnModalOpenForNode(i, node),
@@ -56,6 +63,7 @@ export const sequenceToFlow = (
lastPointId = nodeId; lastPointId = nodeId;
lasPos = position; lasPos = position;
} }
// add button // add button
const addCircle = makeAddButton( const addCircle = makeAddButton(
`${prefix}-+`, `${prefix}-+`,
@@ -117,10 +125,33 @@ const addSingleNode = (
position, position,
}); });
const addErrorNode = (
flowData: FlowData,
nodeId: string,
position: XYPosition,
{
nodeHeight,
nodeWidth,
}: DAGAutomationFlowDims,
error: any,
onEdit: () => void,
hasInput: boolean = true,
) => flowData.nodes.push({
id: nodeId,
type: 'errornode',
position,
data: {
height: nodeHeight,
width: nodeWidth,
hasInput,
onEdit,
error,
}
})
const addChooseNode = ( const addChooseNode = (
flowData: FlowData,
node: ChooseAction, node: ChooseAction,
position: XYPosition, position: XYPosition,
nodeId: string, nodeId: string,
@@ -128,6 +159,10 @@ const addChooseNode = (
updater: SequenceUpdater, updater: SequenceUpdater,
i: number, i: number,
) => { ) => {
const flowData: FlowData = {
nodes: [],
edges: [],
};
addSingleNode(flowData, node, position, nodeId, dims, { addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node), onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i), onXClick: () => updater.removeNode(i),
@@ -209,7 +244,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,
@@ -221,5 +256,11 @@ const addChooseNode = (
} else { } else {
lastPos = xyApply(lastPos, elseCircle.position, Math.max) lastPos = xyApply(lastPos, elseCircle.position, Math.max)
} }
return lastPos return { lastPos, flowData }
}
export const mergeFlowDatas = (fd1: FlowData, fd2: FlowData): FlowData => {
fd1.edges = fd1.edges.concat(fd2.edges);
fd1.nodes = fd1.nodes.concat(fd2.nodes);
return fd1
} }
+1
View File
@@ -78,6 +78,7 @@ export const useNodeStyles = createAppUseStyles<{
textOverflow: 'ellipsis', textOverflow: 'ellipsis',
overflow: "hidden", overflow: "hidden",
whiteSpace: "break-spaces", whiteSpace: "break-spaces",
lineBreak: "anywhere",
cursor: 'default', cursor: 'default',
}, },
buttonDelete: { buttonDelete: {
@@ -1,6 +1,7 @@
import { AutomationTrigger } from 'types/automations/triggers'; import { AutomationTrigger } from 'types/automations/triggers';
import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from './types'; import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from './types';
import { makeAddButton } from './flowDataMods'; import { makeAddButton } from './flowDataMods';
import { getDescriptionFromAutomationNode } from 'utils/formatting';
export const triggerToFlow = ( export const triggerToFlow = (
flowData: FlowData, flowData: FlowData,
@@ -23,7 +24,7 @@ export const triggerToFlow = (
id: flowId, id: flowId,
type: 'dagnode', type: 'dagnode',
data: { data: {
label: t.alias ?? t.platform, label: getDescriptionFromAutomationNode(t),
height: nodeHeight, height: nodeHeight,
width: nodeWidth, width: nodeWidth,
color: 'red', color: 'red',
+3 -1
View File
@@ -4,6 +4,7 @@ import { DAGCircleProps } from './DAGCircle';
import { DAGNodeProps } from './DAGNode'; import { DAGNodeProps } from './DAGNode';
import { AutomationTrigger } from 'types/automations/triggers'; import { AutomationTrigger } from 'types/automations/triggers';
import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types'; import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
import { DAGErrorNodeProps } from './DAGErrorNode';
export type DAGAutomationFlowDims = { export type DAGAutomationFlowDims = {
@@ -16,7 +17,7 @@ export type DAGAutomationFlowDims = {
distanceFactor: number; distanceFactor: number;
} }
export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | any>; export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | DAGErrorNodeProps | any>;
export type FlowData = { export type FlowData = {
nodes: DAGAutomationFlowNode[], nodes: DAGAutomationFlowNode[],
edges: Edge[], edges: Edge[],
@@ -34,6 +35,7 @@ export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigge
export type ModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = { export type ModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = {
single: true, single: true,
isError?: boolean,
node: T node: T
update: (n: T) => void; update: (n: T) => void;
saveBtnCreateText?: boolean; saveBtnCreateText?: boolean;
+12 -1
View File
@@ -2,6 +2,7 @@ import { AutomationSequenceNode } from "types/automations";
import { ChooseAction } from "types/automations/actions"; import { ChooseAction } from "types/automations/actions";
import { AutomationCondition } from "types/automations/conditions"; import { AutomationCondition } from "types/automations/conditions";
import { UpdateModalState } from "./types"; import { UpdateModalState } from "./types";
import { getNodeType } from '../../utils/automations';
export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>; export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>;
@@ -68,7 +69,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
@@ -114,6 +115,16 @@ export const makeSequenceUpdater = (
}) })
} }
}, },
makeOnEditForBadNode(i: number) {
const node = sequence[i];
return () => openModal({
single: true,
isError: true,
node,
allowedTypes: [getNodeType(node)],
update: n => this.updateNode(i, n),
})
}
}); });
@@ -10,6 +10,10 @@
background-color: var(--secondary); background-color: var(--secondary);
} }
.input-boolean.disabled:hover, .input-boolean.disabled:hover * {
cursor: not-allowed;
}
.input-boolean:hover, .input-boolean:hover * { .input-boolean:hover, .input-boolean:hover * {
cursor: pointer; cursor: pointer;
background-color: var(--secondary-opaque); background-color: var(--secondary-opaque);
@@ -4,14 +4,16 @@ export interface Props {
label: string; label: string;
value: boolean; value: boolean;
onChange: (v: boolean) => void; onChange: (v: boolean) => void;
disabled?: boolean;
} }
export default function InputBoolean({ export default function InputBoolean({
label, label,
value = false, value = false,
onChange, onChange,
disabled = false,
}: Props) { }: Props) {
return <div className="input-boolean" onClick={() => onChange(!value)}> return <div className={["input-boolean", disabled ? 'disabled' : ''].join(' ')} onClick={() => onChange(!value)}>
<input type="checkbox" checked={value} onChange={() => { }} /> <input type="checkbox" checked={value} onChange={() => { }} disabled={disabled} />
<label>{label}</label> <label>{label}</label>
</div> </div>
} }
+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')}`;
} }
+4 -1
View File
@@ -229,7 +229,10 @@ export const useInputTextAreaStyles = createAppUseStyles<{ resizable: boolean }>
return { return {
input: ({ resizable }) => ({ input: ({ resizable }) => ({
...styles.input, ...styles.input,
resize: resizable ? 'both' : 'none' resize: resizable ? 'both' : 'none',
minWidth: "calc(100% - 2em)",
maxWidth: "calc(100% - 2em)",
minHeight: "8em"
}) })
} }
}); });
@@ -130,12 +130,12 @@ export const useMultiNodeEditorState = (props: MultiNodeEditorProps) => {
}) })
}, },
onClose() { onClose() {
if (!multiNode.isSaved) { if (!multiNode.isSaved && multiNode.isModified) {
if (!window.confirm("You haven't saved your work, are you ok with losing it?")) { if (!window.confirm("You haven't saved your work, are you ok with losing it?")) {
return return
} }
props.onSave && props.onSave(slides)
} }
props.onSave && props.onSave(slides)
props.onClose && props.onClose() props.onClose && props.onClose()
} }
} }
@@ -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,31 +2,42 @@ import { Dispatch, SetStateAction, useEffect, useState } from 'react';
import { AutomationNode, AutomationNodeTypes } from 'types/automations'; import { AutomationNode, AutomationNodeTypes } from 'types/automations';
import { AutomationNodeSubtype } from 'types/automations'; import { AutomationNodeSubtype } from 'types/automations';
import { getOptionManager } from './getOptionManager'; import { getOptionManager } from './getOptionManager';
import { getNodeType, getSubTypeList } from 'utils/automations'; import { getNodeType, getNodeSubType, getSubTypeList, validateNode } from 'utils/automations';
import { getNodeSubType } from '../constants';
import InputYaml from 'components/Inputs/InputYaml'; import InputYaml from 'components/Inputs/InputYaml';
type UseState = <S>(s: S) => [S, Dispatch<SetStateAction<S>>] type UseState = <S>(s: S) => [S, Dispatch<SetStateAction<S>>]
export const useEditorNodeState = (originalNode: AutomationNode, uState: UseState = useState) => { export const useEditorNodeState = (originalNode: AutomationNode, isErrored: boolean, uState: UseState = useState) => {
const [allState, setAllState] = uState({ const [allState, setAllState] = uState({
node: originalNode, node: originalNode,
yamlMode: false, yamlMode: false,
isModified: false, isModified: false,
invalidManualYaml: "", ...computeInvalidYaml(originalNode, isErrored)
}); });
const { node: currentNode, isModified, yamlMode, invalidManualYaml } = allState; const { node: currentNode, isModified, yamlMode, invalidManualYaml } = allState;
useEffect(() => { useEffect(() => {
setAllState({ ...allState, node: originalNode, isModified: false, }) setAllState({ ...allState, node: originalNode, isModified: false, })
// eslint-disable-next-line
}, [originalNode]) }, [originalNode])
const setState = (node: AutomationNode) => setAllState(({ ...allState, node, isModified: true, })); const setState = (node: AutomationNode) => setAllState(({ ...allState, node, isModified: true, }));
const setYamlMode = (yamlMode: boolean) => setAllState({ ...allState, yamlMode, }); const setYamlMode = (yamlMode: boolean) => setAllState({ ...allState, yamlMode, });
const setStateForManualYaml = (yaml: any) => { const setStateForManualYaml = (yaml: any) => {
try { try {
createData(yaml, yaml) createData(yaml, yaml)
setAllState({ ...allState, node: yaml, invalidManualYaml: '' }) const errors = validateNode(yaml);
if (errors) {
setAllState({
...allState, invalidManualYaml: <ul key={'error'}>
{errors.map(({ message, path }, i) => <li key={i}>
<b>{path}</b>: {message}
</li>)}
</ul>
})
} else {
setAllState({ ...allState, node: yaml, invalidManualYaml: <></> })
}
} catch (err) { } catch (err) {
setAllState({ ...allState, invalidManualYaml: String(err) }) setAllState({ ...allState, invalidManualYaml: <>{String(err)}</> })
} }
} }
const { const {
@@ -41,15 +52,19 @@ export const useEditorNodeState = (originalNode: AutomationNode, uState: UseStat
nodeType, nodeType,
subType, subType,
subTypes, subTypes,
yamlMode,
setYamlMode, setYamlMode,
invalidManualYaml, invalidManualYaml,
isModified, isModified,
isErrored: allState.isErrored,
get yamlMode() {
return allState.isErrored || yamlMode
},
get data() { get data() {
return currentNode return currentNode
}, },
renderOptionList() { renderOptionList() {
if (yamlMode) { if (yamlMode || allState.isErrored) {
return <> return <>
<InputYaml <InputYaml
label='' label=''
@@ -57,7 +72,7 @@ export const useEditorNodeState = (originalNode: AutomationNode, uState: UseStat
onChange={setStateForManualYaml} onChange={setStateForManualYaml}
resizable resizable
/> />
<span className="node-editor--error">{invalidManualYaml}</span> <div className="node-editor--error">{invalidManualYaml}</div>
</> </>
} }
return optionManager.renderOptionList(currentNode, setState); return optionManager.renderOptionList(currentNode, setState);
@@ -100,3 +115,22 @@ const createData = (originalNode: AutomationNode, currentNode: AutomationNode) =
optionManager, optionManager,
} }
} }
const computeInvalidYaml = (node: AutomationNode, isErrored: boolean) => {
const errors = validateNode(node);
if (errors) {
return {
isErrored: true,
invalidManualYaml: <ul key={'error'}>
{errors.map(({ message, path }, i) => <li key={i}>
<b>{path}</b>: {message}
</li>)}
</ul>
}
} else {
return {
isErrored,
invalidManualYaml: <></>
}
}
}
@@ -1,76 +0,0 @@
import { AutomationNodeSubtype, AutomationNodeTypes } from "types/automations";
import { AutomationNode } from '../../types/automations/index';
const actionTypes = [
'choose',
'device',
'event',
'repeat',
'service',
'wait',
] as AutomationNodeSubtype<'action'>[];
const conditionTypes = [
'and',
'not',
'numeric_state',
'or',
'state',
'template',
'time',
'trigger',
'zone',
] as AutomationNodeSubtype<'condition'>[];
const triggerTypes = [
'device',
'event',
'homeassistant',
'mqtt',
'numeric_state',
'state',
'tag',
'template',
'time',
'time_pattern',
'webhook',
'zone',
] as AutomationNodeSubtype<'trigger'>[];
export const getSubTypeList = <T extends AutomationNodeTypes>(
nodeType: T
): Array<AutomationNodeSubtype<T> | 'condition'> => {
if (nodeType === 'action') {
return actionTypes as any;
} else if (nodeType === 'condition') {
return conditionTypes as any;
} else if (nodeType === 'trigger') {
return triggerTypes as any;
}
return [];
}
export const getNodeSubType = <T extends AutomationNodeTypes>(
node: AutomationNode<T>
): AutomationNodeSubtype<T> => {
if ('condition' in node) {
return node.condition as any;
} else if ('platform' in node) {
return node.platform as any;
} else if ('service' in node) {
return 'service' as any
} else if ('repeat' in node) {
return 'repeat' as any
} else if ('wait_template' in node) {
return 'wait' as any
} else if ('event' in node) {
return 'event' as any
} else if ('device_id' in node) {
return 'device' as any
} else if ('choose' in node) {
return 'choose' as any
} else {
throw new Error("Invalid node type!")
}
}
@@ -52,3 +52,9 @@
min-height: 50px; min-height: 50px;
min-width: 25vw; min-width: 25vw;
} }
.node-editor--error {
max-width: 30em;
overflow: auto;
max-height: 10em;
}
+5 -3
View File
@@ -14,6 +14,7 @@ export interface NodeEditorProps {
onSave?: (n: AutomationNode) => void; onSave?: (n: AutomationNode) => void;
onFlags?: (isReady: boolean, isModified: boolean) => void; onFlags?: (isReady: boolean, isModified: boolean) => void;
saveBtnCreateText?: boolean; saveBtnCreateText?: boolean;
isErrored?: boolean;
} }
export const NodeEditor: FC<NodeEditorProps> = ({ export const NodeEditor: FC<NodeEditorProps> = ({
@@ -23,10 +24,11 @@ export const NodeEditor: FC<NodeEditorProps> = ({
onSave = () => { }, onSave = () => { },
onFlags = () => { }, onFlags = () => { },
saveBtnCreateText = false, saveBtnCreateText = false,
children children,
isErrored = false,
}) => { }) => {
// state // state
const state = useEditorNodeState(node); const state = useEditorNodeState(node, isErrored);
// alias // alias
const isModified = state.isModified; const isModified = state.isModified;
@@ -53,7 +55,7 @@ export const NodeEditor: FC<NodeEditorProps> = ({
options={state.subTypes} options={state.subTypes}
onChange={state.setSubType} onChange={state.setSubType}
/> : <></>} /> : <></>}
<InputBoolean label="Yaml" onChange={state.setYamlMode} value={state.yamlMode} /> <InputBoolean label="Yaml" onChange={state.setYamlMode} value={state.yamlMode} disabled={state.isErrored} />
</div> </div>
{state.renderOptionList()} {state.renderOptionList()}
</div> </div>
+1 -1
View File
@@ -1,6 +1,6 @@
import { ApiService } from 'apiService/core'; import { ApiService } from 'apiService/core';
import { ConnectedAutomationList } from "components/AutomationList"; import { ConnectedAutomationList } from "components/AutomationList";
import { DEFAULT_DIMS } from "components/DAGSvgs/constants"; import { DEFAULT_DIMS } from "components/DAGFlow/constants";
import { FC } from "react"; import { FC } from "react";
+1
View File
@@ -12,6 +12,7 @@
--green-light: #6f5; --green-light: #6f5;
--error: #c55; --error: #c55;
--error-light: #f77; --error-light: #f77;
--error-dark: #5c2323;
--error-opaque: #c555; --error-opaque: #c555;
--error-accent: #9f3a3a; --error-accent: #9f3a3a;
--change: #0f9; --change: #0f9;
+9 -25
View File
@@ -1,44 +1,28 @@
import { AutomationSequenceNode } from "."; import { AutomationSequenceNode } from ".";
import { AutomationTime } from "./common"; import { AutomationTime } from "./common";
import { AutomationCondition } from "./conditions"; import { AutomationCondition } from "./conditions";
import * as v from "types/validators/actions";
import * as st from 'superstruct';
type AutomationActionNodeBase<Data extends Object> = Data & { type AutomationActionNodeBase<Data extends Object> = Data &
alias?: string; st.Infer<typeof v.AutomationActionNodeBase>;
variables?: Record<string, any>;
}
export type ServiceAction = AutomationActionNodeBase<{ export type ServiceAction = st.Infer<typeof v.ServiceAction>;
service: string;
target: any;
data: any;
}>
export type RepeatAction = AutomationActionNodeBase<{ export type RepeatAction = AutomationActionNodeBase<{
repeat: { repeat: {
count: number; count: number;
sequence: AutomationAction[]; sequence: AutomationAction[];
} }
}> }>
export type WaitAction = AutomationActionNodeBase<{ export type WaitAction = st.Infer<typeof v.WaitAction>;
wait_template: string; export type FireEventAction = st.Infer<typeof v.FireEventAction>;
timeout?: AutomationTime; export type DeviceAction = st.Infer<typeof v.DeviceAction>;
continue_on_timeout?: boolean;
}>
export type FireEventAction = AutomationActionNodeBase<{
event: string;
event_data: any;
}>
export type DeviceAction = AutomationActionNodeBase<{
type: string;
device_id: string;
entity_id?: string;
domain: string;
}>
export type ChooseAction = AutomationActionNodeBase<{ export type ChooseAction = AutomationActionNodeBase<{
choose: Array<{ choose: Array<{
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>
+8 -30
View File
@@ -1,5 +1,6 @@
import { AutomationTime } from "./common"; import { AutomationTime } from "./common";
import * as st from 'superstruct';
import * as v from "types/validators/conditions";
type AutomationConditionNodeBase<Name extends String, Data extends Object> = { type AutomationConditionNodeBase<Name extends String, Data extends Object> = {
condition: Name; condition: Name;
alias?: string; alias?: string;
@@ -7,35 +8,12 @@ type AutomationConditionNodeBase<Name extends String, Data extends Object> = {
export type LogicCondition = AutomationConditionNodeBase<'and' | 'or' | 'not', { export type LogicCondition = AutomationConditionNodeBase<'and' | 'or' | 'not', {
conditions: AutomationCondition[]; conditions: AutomationCondition[];
}>; }>;
export type NumericCondition = AutomationConditionNodeBase<'numeric_state', { export type NumericCondition = st.Infer<typeof v.NumericCondition>;
entity_id: string | string[]; export type StateCondition = st.Infer<typeof v.StateCondition>;
above?: string; export type TemplateCondition = st.Infer<typeof v.TemplateCondition>;
below?: string; export type TimeCondition = st.Infer<typeof v.TimeCondition>;
attribute?: string; export type TriggerCondition = st.Infer<typeof v.TriggerCondition>;
value_template?: string; export type ZoneCondition = st.Infer<typeof v.ZoneCondition>;
}>;
export type StateCondition = AutomationConditionNodeBase<'state', {
entity_id: string | string[];
state: string | string[];
for?: AutomationTime;
attribute?: string;
}>;
export type TemplateCondition = AutomationConditionNodeBase<'template', {
value_template: string;
}>;
export type TimeCondition = AutomationConditionNodeBase<'time', {
after?: AutomationTime;
before?: AutomationTime;
weekday?: Array<'mon' | 'tue' | 'wed' | 'thu' | 'fri' | 'sat' | 'sun'>;
}>;
export type TriggerCondition = AutomationConditionNodeBase<'trigger', {
id: string;
}>;
export type ZoneCondition = AutomationConditionNodeBase<'zone', {
zone: string;
entity_id: string | string[];
state: string | string[];
}>;
export type AutomationCondition = export type AutomationCondition =
| LogicCondition | LogicCondition
| NumericCondition | NumericCondition
+1 -3
View File
@@ -19,15 +19,13 @@ export type AutomationNodeMapping = {
"action": AutomationAction; "action": AutomationAction;
"condition": AutomationCondition; "condition": AutomationCondition;
} }
export type AutomationNodeTypes = keyof AutomationNodeMapping | undefined; export type AutomationNodeTypes = keyof AutomationNodeMapping;
export type AutomationNode<N extends AutomationNodeTypes = any> = export type AutomationNode<N extends AutomationNodeTypes = any> =
N extends undefined ? AutomationTrigger :
N extends 'trigger' ? AutomationTrigger : N extends 'trigger' ? AutomationTrigger :
N extends 'action' ? AutomationAction : N extends 'action' ? AutomationAction :
N extends 'condition' ? AutomationCondition : N extends 'condition' ? AutomationCondition :
never; never;
export type AutomationNodeSubtype<T extends AutomationNodeTypes = any> = export type AutomationNodeSubtype<T extends AutomationNodeTypes = any> =
T extends undefined ? TriggerType :
T extends 'trigger' ? TriggerType : T extends 'trigger' ? TriggerType :
T extends 'action' ? ActionType : T extends 'action' ? ActionType :
T extends 'condition' ? ConditionType : T extends 'condition' ? ConditionType :
-1
View File
@@ -1,5 +1,4 @@
import * as st from 'superstruct' import * as st from 'superstruct'
import { AutomationTime } from "./common";
import * as v from "types/validators/triggers"; import * as v from "types/validators/triggers";
interface AutomationTriggerBase { interface AutomationTriggerBase {
+58 -14
View File
@@ -1,24 +1,68 @@
import * as st from 'superstruct' import * as st from 'superstruct'
import { AutomationTime } from './common';
const AutomationActionNodeBase = { export const AutomationActionNodeBase = st.type({
alias: st.optional(st.string()), alias: st.optional(st.string()),
variables: st.optional(st.record(st.string(), st.any())), variables: st.optional(st.record(st.string(), st.any())),
}
export const ServiceAction = st.object({
...AutomationActionNodeBase,
data: st.any(),
target: st.any(),
service: st.string(),
}) })
export const RepeatAction = st.object({ export const ServiceAction = st.intersection([
...AutomationActionNodeBase, AutomationActionNodeBase,
repeat: st.object({ st.type({
count: st.number(), data: st.any(),
sequence: st.array(), target: st.any(),
service: st.string(),
}) })
}) ]);
export const RepeatAction = st.intersection([
AutomationActionNodeBase,
st.type({
repeat: st.object({
count: st.number(),
sequence: st.array(st.object()),
})
})
]);
export const WaitAction = st.intersection([
AutomationActionNodeBase,
st.type({
wait_template: st.string(),
timeout: st.optional(AutomationTime),
continue_on_timeout: st.optional(st.boolean()),
})
]);
export const FireEventAction = st.intersection([
AutomationActionNodeBase,
st.type({
event: st.string(),
event_data: st.any(),
})
]);
export const DeviceAction = st.intersection([
AutomationActionNodeBase,
st.type({
type: st.string(),
device_id: st.string(),
entity_id: st.optional(st.string()),
domain: st.string(),
})
]);
export const ChooseAction = st.intersection([
AutomationActionNodeBase,
st.type({
choose: st.array(st.type({
conditions: st.array(st.object()),
sequence: st.array(st.object()),
})),
default: st.optional(st.array(st.object())),
})
]);
+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()),
+32 -3
View File
@@ -1,9 +1,38 @@
import * as st from 'superstruct' import * as st from 'superstruct'
export const EntityId = st.union([
export const AutomationTime = st.object({ st.string(),
st.array(st.string()),
])
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])
+71
View File
@@ -0,0 +1,71 @@
import * as st from 'superstruct'
import { AutomationTime, EntityId } from './common';
export const AutomationConditionNodeBase = st.type({
alias: st.optional(st.string()),
});
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()]),
})
]);
+32 -1
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);
@@ -10,7 +11,7 @@ test('superstructure is', () => {
test('getFailures returns failures', () => { test('getFailures returns failures', () => {
const failures = getFailures({ metadata: {} }, AutomationData); const failures = getFailures({ metadata: {} }, AutomationData);
expect(failures).toHaveLength(8) expect(failures).toHaveLength(6)
}) })
test('getFailures returns null', () => { test('getFailures returns null', () => {
@@ -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)
}
})
+3
View File
@@ -0,0 +1,3 @@
export * as actions from "./actions"
export * as triggers from "./triggers"
export * as conditions from "./conditions"
+2 -2
View File
@@ -3,8 +3,8 @@ import * as st from 'superstruct'
export const AutomationMetadata = st.object({ export const AutomationMetadata = st.object({
id: st.string(), id: st.string(),
alias: st.string(), alias: st.optional(st.string()),
description: st.string(), description: st.optional(st.string()),
trigger_variables: st.optional(st.nullable(st.record(st.string(), st.string()))), trigger_variables: st.optional(st.nullable(st.record(st.string(), st.string()))),
mode: st.enums(["single", "restart", "queued", "parallel"]), mode: st.enums(["single", "restart", "queued", "parallel"]),
}) })
+14 -14
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 = {
@@ -7,7 +7,7 @@ const AutomationTriggerBase = {
id: st.optional(st.string()), id: st.optional(st.string()),
} }
export const AutomationTriggerEvent = st.object({ export const AutomationTriggerEvent = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('event'), platform: st.literal('event'),
event_type: st.union([st.string(), st.array(st.string())]), event_type: st.union([st.string(), st.array(st.string())]),
@@ -15,13 +15,13 @@ export const AutomationTriggerEvent = st.object({
context: st.any(), context: st.any(),
}) })
export const AutomationTriggerHA = st.object({ export const AutomationTriggerHA = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('homeassistant'), platform: st.literal('homeassistant'),
event: st.enums(['start', 'shutdown']), event: st.enums(['start', 'shutdown']),
}) })
export const AutomationTriggerMQTT = st.object({ export const AutomationTriggerMQTT = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('mqtt'), platform: st.literal('mqtt'),
topic: st.string(), topic: st.string(),
@@ -29,7 +29,7 @@ export const AutomationTriggerMQTT = st.object({
value_template: st.string(), value_template: st.string(),
}) })
export const AutomationTriggerNumericState = st.object({ export const AutomationTriggerNumericState = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('numeric_state'), platform: st.literal('numeric_state'),
entity_id: st.union([st.string(), st.array(st.string())]), entity_id: st.union([st.string(), st.array(st.string())]),
@@ -40,7 +40,7 @@ export const AutomationTriggerNumericState = st.object({
for: st.optional(AutomationTime), for: st.optional(AutomationTime),
}) })
export const AutomationTriggerState = st.object({ export const AutomationTriggerState = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('state'), platform: st.literal('state'),
entity_id: st.union([st.string(), st.array(st.string())]), entity_id: st.union([st.string(), st.array(st.string())]),
@@ -50,27 +50,27 @@ export const AutomationTriggerState = st.object({
for: st.optional(AutomationTime), for: st.optional(AutomationTime),
}) })
export const AutomationTriggerTag = st.object({ export const AutomationTriggerTag = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('tag'), platform: st.literal('tag'),
tag_id: st.string(), tag_id: st.string(),
device_id: st.union([st.string(), st.array(st.string())]), device_id: st.union([st.string(), st.array(st.string())]),
}) })
export const AutomationTriggerTemplate = st.object({ export const AutomationTriggerTemplate = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('template'), platform: st.literal('template'),
value_template: st.string(), value_template: st.string(),
for: st.optional(AutomationTime), for: st.optional(AutomationTime),
}) })
export const AutomationTriggerTime = st.object({ export const AutomationTriggerTime = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('time'), platform: st.literal('time'),
at: AutomationTime, at: AutomationTimeString,
}) })
export const AutomationTriggerTimePattern = st.object({ export const AutomationTriggerTimePattern = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('time_pattern'), platform: st.literal('time_pattern'),
hours: st.optional(st.string()), hours: st.optional(st.string()),
@@ -78,13 +78,13 @@ export const AutomationTriggerTimePattern = st.object({
seconds: st.optional(st.string()), seconds: st.optional(st.string()),
}) })
export const AutomationTriggerWebhook = st.object({ export const AutomationTriggerWebhook = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('webhook'), platform: st.literal('webhook'),
webhook_id: st.string(), webhook_id: st.string(),
}) })
export const AutomationTriggerZone = st.object({ export const AutomationTriggerZone = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('zone'), platform: st.literal('zone'),
entity_id: st.union([st.string(), st.array(st.string())]), entity_id: st.union([st.string(), st.array(st.string())]),
@@ -92,7 +92,7 @@ export const AutomationTriggerZone = st.object({
event: st.enums(['enter', 'leave']) event: st.enums(['enter', 'leave'])
}) })
export const AutomationTriggerDevice = st.object({ export const AutomationTriggerDevice = st.type({
...AutomationTriggerBase, ...AutomationTriggerBase,
platform: st.literal('device'), platform: st.literal('device'),
entity_id: st.optional(st.string()), entity_id: st.optional(st.string()),
+98
View File
@@ -1,5 +1,8 @@
import * as v from "types/validators";
import { AutomationNode, AutomationNodeMapping, AutomationNodeSubtype, AutomationNodeTypes } from "types/automations"; import { AutomationNode, AutomationNodeMapping, AutomationNodeSubtype, AutomationNodeTypes } from "types/automations";
import { AutomationTrigger } from 'types/automations/triggers'; import { AutomationTrigger } from 'types/automations/triggers';
import { MiniFailure } from "types/validators/helper";
import { getFailures } from '../types/validators/helper';
export const getNodeType = (node: AutomationNode): AutomationNodeTypes => { export const getNodeType = (node: AutomationNode): AutomationNodeTypes => {
@@ -78,3 +81,98 @@ export const makeDefault = (nodeType: keyof AutomationNodeMapping): AutomationNo
} as AutomationTrigger } as AutomationTrigger
} }
} }
export const getNodeSubType = <T extends AutomationNodeTypes>(
node: AutomationNode<T>
): AutomationNodeSubtype<T> => {
if ('condition' in node) {
return node.condition as any;
} else if ('platform' in node) {
return node.platform as any;
} else if ('service' in node) {
return 'service' as any
} else if ('repeat' in node) {
return 'repeat' as any
} else if ('wait_template' in node) {
return 'wait' as any
} else if ('event' in node) {
return 'event' as any
} else if ('device_id' in node) {
return 'device' as any
} else if ('choose' in node) {
return 'choose' as any
} else {
throw new Error("Invalid node type!")
}
}
export const validateNode = (node: AutomationNode): MiniFailure[] | null => {
const nodeType = getNodeType(node);
try {
const nodeSubType = getNodeSubType(node);
if (nodeType === 'action') {
if (nodeSubType === 'service') {
return getFailures(node, v.actions.ServiceAction)
} else if (nodeSubType === 'repeat') {
return getFailures(node, v.actions.RepeatAction)
} else if (nodeSubType === 'wait') {
return getFailures(node, v.actions.WaitAction)
} else if (nodeSubType === 'event') {
return getFailures(node, v.actions.FireEventAction)
} else if (nodeSubType === 'device') {
return getFailures(node, v.actions.DeviceAction)
} else if (nodeSubType === 'choose') {
return getFailures(node, v.actions.ChooseAction)
}
} else if (nodeType === 'trigger') {
if (nodeSubType === 'event') {
return getFailures(node, v.triggers.AutomationTriggerEvent)
} else if (nodeSubType === 'homeassistant') {
return getFailures(node, v.triggers.AutomationTriggerHA)
} else if (nodeSubType === 'mqtt') {
return getFailures(node, v.triggers.AutomationTriggerMQTT)
} else if (nodeSubType === 'numeric_state') {
return getFailures(node, v.triggers.AutomationTriggerNumericState)
} else if (nodeSubType === 'state') {
return getFailures(node, v.triggers.AutomationTriggerState)
} else if (nodeSubType === 'tag') {
return getFailures(node, v.triggers.AutomationTriggerTag)
} else if (nodeSubType === 'template') {
return getFailures(node, v.triggers.AutomationTriggerTemplate)
} else if (nodeSubType === 'time') {
return getFailures(node, v.triggers.AutomationTriggerTime)
} else if (nodeSubType === 'time_pattern') {
return getFailures(node, v.triggers.AutomationTriggerTimePattern)
} else if (nodeSubType === 'webhook') {
return getFailures(node, v.triggers.AutomationTriggerWebhook)
} else if (nodeSubType === 'zone') {
return getFailures(node, v.triggers.AutomationTriggerZone)
} else if (nodeSubType === 'device') {
return getFailures(node, v.triggers.AutomationTriggerDevice)
}
} else if (nodeType === 'condition') {
if (['and', 'or', 'not'].includes(nodeSubType)) {
return getFailures(node, v.conditions.LogicCondition)
} else if (nodeSubType === 'numeric_state') {
return getFailures(node, v.conditions.NumericCondition)
} else if (nodeSubType === 'state') {
return getFailures(node, v.conditions.StateCondition)
} else if (nodeSubType === 'template') {
return getFailures(node, v.conditions.TemplateCondition)
} else if (nodeSubType === 'trigger') {
return getFailures(node, v.conditions.TriggerCondition)
} else if (nodeSubType === 'time') {
return getFailures(node, v.conditions.TimeCondition)
} else if (nodeSubType === 'zone') {
return getFailures(node, v.conditions.ZoneCondition)
}
}
} catch (err) {
console.warn(err)
}
return [
{ "message": ["Invalid or unknown " + nodeType], "path": "" },
]
}
+42 -7
View File
@@ -2,18 +2,53 @@ 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 => {
console.log(node)
if (node.alias) { if (node.alias) {
return node.alias; return node.alias;
} }
if ('platform' in node) { if ('platform' in node) {
if (node.platform === 'time') {
return node.at
}
if (node.platform === 'homeassistant') {
if (node.event === 'start') {
return 'HA is starting'
} else {
return 'HA is shutting down'
}
}
if (node.platform === 'tag') {
return `Tag = ${node.tag_id}`
}
if (node.platform === 'state') {
let out = "";
if (typeof node.entity_id === 'string') {
out = node.entity_id
} else {
out = node.entity_id[0] + " and more"
}
if (node.from) {
out += ` from ${node.from}`
}
if (node.to) {
out += ` to ${node.to}`
}
return out
}
return node.platform return node.platform
} }
if ('condition' in node) { if ('condition' in node) {
+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(':')
}
+1
View File
@@ -5,6 +5,7 @@ export const useDelayEffect = (cb: () => void, deps: any[], timeout: number) =>
const fcn = useDelayedFunction(cb, timeout); const fcn = useDelayedFunction(cb, timeout);
useEffect(() => { useEffect(() => {
fcn() fcn()
// eslint-disable-next-line
}, deps) }, deps)
} }