Compare commits

...
47 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
ari d3adfaaacb making sure the version is required 2022-05-17 22:16:09 -04:00
ari c249a94b3d fixing up typo 2022-05-17 22:15:44 -04:00
ari dce028d0bc clean up 2022-05-17 22:15:18 -04:00
ari 7333f9e159 added manual build 2022-05-17 22:15:06 -04:00
ari 809095f8e0 added edge tag 2022-05-17 22:14:38 -04:00
ari 8942693a32 added a manual build 2022-05-17 22:13:57 -04:00
ari db49ed02ed updated tsc 2022-05-17 22:10:08 -04:00
ari cce2e03053 fixed up trigger issues 2022-05-17 22:03:22 -04:00
ari 4509a224a9 minor style patch 2022-05-17 21:51:20 -04:00
ari 7f8b75fa02 added installation instructions 2022-05-17 21:46:47 -04:00
ari d2c5310b93 new version release 2022-05-17 21:31:10 -04:00
ari a19db93c37 support for malformed automations 2022-05-17 20:48:43 -04:00
ari 6c57408f27 making PRs don't trigger deployments 2022-05-17 12:20:28 -04:00
ari b9a77746c0 updated changelog 2022-05-17 12:19:34 -04:00
ari f1ffab13be fixed up unittest 2022-05-17 12:18:15 -04:00
Ari Sosnovsky 52fcfd9271 Merge pull request #9 from issy/main 2022-05-17 07:50:30 -04:00
Issy Szemeti f435bb70aa Spelling 2022-05-17 11:05:41 +01:00
root 2598c23fd2 no local host 2022-05-16 23:56:47 -04:00
Ari Sosnovsky 070dc7c871 Update config.yaml 2022-05-16 22:51:12 -04:00
Ari Sosnovsky 3d70f04e60 Update CHANGELOG.md 2022-05-16 22:50:53 -04:00
ari cf29d9d61c added build ways 2022-05-16 22:03:27 -04:00
ari 2245fd556b removed logs 2022-05-16 21:54:22 -04:00
ari f50f22190e mobile mode 2022-05-16 21:50:05 -04:00
ari b342088b96 fixed up tsc error 2022-05-16 19:37:32 -04:00
ari c0c0d3181c v0.1.5 2022-05-16 19:27:03 -04:00
ari cf013cc342 fixed up styles 2022-05-16 19:27:03 -04:00
Ari Sosnovsky 23b869d43e Update README.md 2022-05-16 19:07:14 -04:00
Ari Sosnovsky e333e80ea3 Update README.md 2022-05-16 16:03:45 -04:00
Ari Sosnovsky 996e23038f Update README.md 2022-05-16 16:01:46 -04:00
ari 0be03b1536 updating api routing 2022-05-16 15:38:13 -04:00
ari dc726ff184 consolidated 2022-05-16 12:58:39 -04:00
89 changed files with 2254 additions and 468 deletions

No files matched your search

+34
View File
@@ -0,0 +1,34 @@
name: "Manual Build"
on:
workflow_dispatch:
inputs:
version:
type: string
description: "Version Number"
required: true
jobs:
build:
runs-on: ubuntu-latest
name: "${{ github.event.inputs.version }} / ${{ matrix.arch }}"
strategy:
matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build & Push to Dockerhub
uses: home-assistant/builder@2022.03.1
with:
args: |
--${{ matrix.arch }} \
--version ${{ github.event.inputs.version }} \
--additional-tag edge \
--target .
+45 -23
View File
@@ -2,47 +2,69 @@ name: Deploy
env: env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs" MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on: on:
# release:
# types: [published]
workflow_dispatch: workflow_dispatch:
push: push:
branch: [main]
paths: paths:
- 'config.yaml' - "config.yaml"
jobs: jobs:
build: metadata:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: ${{ matrix.arch }} name: Metadata
strategy: outputs:
matrix: version: ${{ steps.version.outputs.VERSION }}
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"] changlelog: ${{ steps.changlelog.outputs.CHANGELOG }}
steps: steps:
- name: Check out repository - name: Check out repository
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Get Version - name: Get Version
id: version id: version
shell: bash shell: bash
run: | run: |
echo ::set-output name=VERSION::$(cat config.yaml | sed -nr 's/version: (.*)/\1/p') echo ::set-output name=VERSION::$(cat config.yaml | sed -nr 's/version: (.*)/\1/p')
- name: Get Changelog
id: changlelog
shell: bash
run: |
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
- name: Login to DockerHub # build:
uses: docker/login-action@v2.0.0 # runs-on: ubuntu-latest
with: # name: Build & Publish ${{ matrix.arch }}
username: ${{ secrets.DOCKERHUB_USERNAME }} # needs:
password: ${{ secrets.DOCKERHUB_TOKEN }} # - metadata
# strategy:
# matrix:
# arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
- name: ${{ steps.version.outputs.VERSION }} / ${{ matrix.arch }} # steps:
uses: home-assistant/builder@2022.03.1 # - name: Check out repository
with: # uses: actions/checkout@v3
args: |
--${{ matrix.arch }} \
--target .
- name: Publish Release ${{ steps.version.outputs.VERSION }} # - name: Login to DockerHub
# uses: docker/login-action@v2.0.0
# with:
# username: ${{ secrets.DOCKERHUB_USERNAME }}
# password: ${{ secrets.DOCKERHUB_TOKEN }}
# - name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
# uses: home-assistant/builder@2022.03.1
# with:
# args: |
# --${{ matrix.arch }} \
# --target .
publish:
runs-on: ubuntu-latest
needs:
- metadata
name: Publish Github Release
steps:
- name: Publish Release ${{ needs.metadata.outputs.version }}
uses: actions/github-script@v6 uses: actions/github-script@v6
env: env:
VERSION: ${{ steps.version.outputs.VERSION }} VERSION: ${{ needs.metadata.outputs.version }}
CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
with: with:
script: | script: |
github.rest.repos.createRelease({ github.rest.repos.createRelease({
+7 -1
View File
@@ -61,6 +61,12 @@ jobs:
nodejs: nodejs:
name: "NodeJs Tests" name: "NodeJs Tests"
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy:
matrix:
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
@@ -71,7 +77,7 @@ jobs:
- name: Install Dependencies - name: Install Dependencies
run: cd webapp && yarn install run: cd webapp && yarn install
- name: Run Tests - name: Run Tests
run: cd webapp && yarn test:ci run: cd webapp && yarn ${{ matrix.action }}
+28 -1
View File
@@ -1,4 +1,31 @@
# Changelog -- [![GitHub version](https://badge.fury.io/gh/asosnovsky%2FShortumation.svg)](https://badge.fury.io/gh/asosnovsky%2FShortumation) # 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
- Some triggers had invalid types and were causing a false-positive validation
## [0.1.8] - Support for Malformed Automations
- API will no longer error out on missing values or invalid lists
- Frontend has support for displaying bad automations
## [0.1.6] - Mobile Mode
- Improved mobile mode
- Fixed up arrow styles due to typos
- Added selection color
## [0.1.2] - Docker Hub Images ## [0.1.2] - Docker Hub Images
+37 -3
View File
@@ -1,8 +1,13 @@
# Shortumation [![GitHub version](https://badge.fury.io/gh/asosnovsky%2FShortumation.svg)](https://badge.fury.io/gh/asosnovsky%2FShortumation) # Shortumation
![image](https://user-images.githubusercontent.com/7451445/167028000-41528244-47be-408e-8f47-55187c0e5dcd.png) A better way to write automations in home-assistant without having to install and run a seperate automation engine!
A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/). ![image](https://user-images.githubusercontent.com/7451445/168672575-fb19997d-fe9b-4192-96b0-733b62519797.png)
![image](https://user-images.githubusercontent.com/7451445/168672840-71ceaa8a-2bee-443e-9150-5b0f03b05d08.png)
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
## Features ## Features
@@ -18,4 +23,33 @@ A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1). See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
## Installation
### Addon
Add the repository URL under **Supervisor → Add-on store → ⋮ → Manage add-on repositories**:
https://github.com/asosnovsky/Shortumation
It should now appear in your `Add-on Store` and you should be able to install it!
### Containerized
Please note that this way of using Shortumation is **not future proof**, currently we use the `/config/automation.yaml` file as our source of truth for the automations. Which means that we do not need access to the HA API or Websockets. In future release you may need to configure some additional compomenents to enable this.
If this warning does not scare you or you still want to try things out, then take a look at the example [docker-compose.yaml](example/containerized/docker-compose.yaml).
## FAQ
**How is this different from Node-Red?**
> Node-Red is both an execution engine and an automation editor, which means that in order for you automations to run you have to have an additional component running and executing the automations. Shortumation simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database)
**Which HA Installation does this support?**
> Currently this is only tested on HA OS. However, you should be able to get it working supervised installations as well (as they support addons). If you want to make it work for Container or Core, you will need to do some additional leg-work and I welcome a PR to get this working (it should be just a matter of mounting the `/config` path to the container running the images in this repo).
**Which version of HA does this require?**
> Since I am working on this project on my own, I can only test it against my own HA installations at home, and I tend to keep things as up to date as possible. The lowest version of HA this was tested on is `core-2022.5.4`
+2 -2
View File
@@ -25,11 +25,11 @@ def make_automation_router(automations: AutomationManager) -> APIRouter:
), ),
) )
@router.post("") @router.post("/item")
def upsert_auto(body: UpdateAutoRequest): def upsert_auto(body: UpdateAutoRequest):
automations.update(body.index, body.data) automations.update(body.index, body.data)
@router.delete("") @router.delete("/item")
def delete_auto(body: DeleteAutoRequest): def delete_auto(body: DeleteAutoRequest):
try: try:
automations.delete(body.index) automations.delete(body.index)
+13 -4
View File
@@ -1,4 +1,4 @@
from typing import Iterator, Union from typing import Any, Iterator, Union
from pydantic.error_wrappers import ValidationError from pydantic.error_wrappers import ValidationError
@@ -26,18 +26,27 @@ def load_automation(
try: try:
yield ExtenededAutomationData( yield ExtenededAutomationData(
metadata=AutomationMetdata.parse_obj(auto_raw), metadata=AutomationMetdata.parse_obj(auto_raw),
condition=load_conditions(auto_raw.get("condition", [])), condition=ifempty_or_null_then_list(load_conditions(auto_raw.get("condition", []))),
sequence=load_conditions(auto_raw.get("action", [])), sequence=ifempty_or_null_then_list(load_conditions(auto_raw.get("action", []))),
trigger=normalize_obj(auto_raw.get("trigger", [])), trigger=ifempty_or_null_then_list(normalize_obj(auto_raw.get("trigger", []))),
tags=tags, tags=tags,
) )
except ValidationError as err: except ValidationError as err:
raise InvalidAutomationFile from err raise InvalidAutomationFile from err
def ifempty_or_null_then_list(obj: Any):
if not isinstance(obj, list):
return []
else:
return obj
def load_conditions(conditions: Union[dict, list, str]): def load_conditions(conditions: Union[dict, list, str]):
if isinstance(conditions, list): if isinstance(conditions, list):
return list(map(ensure_condition_dictionary, conditions)) return list(map(ensure_condition_dictionary, conditions))
elif not conditions:
return []
else: else:
return [ensure_condition_dictionary(conditions)] return [ensure_condition_dictionary(conditions)]
+2 -2
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
@@ -9,7 +9,7 @@ class AutomationMetdata(BaseModel):
alias: Optional[str] = None alias: Optional[str] = None
description: Optional[str] = None description: Optional[str] = None
trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None
mode: Literal["single", "restart", "queued", "parallel"] = "single" mode: str = "single"
class AutomationData(BaseModel): class AutomationData(BaseModel):
+28
View File
@@ -811,3 +811,31 @@
device_id: das2qdasdasdasadaasd device_id: das2qdasdasdasadaasd
default: [] default: []
mode: single mode: single
- id: 'baddy-1'
alias: 'bad triggers'
description: ''
trigger: ""
condition: []
action: []
mode: single
- id: 'baddy-2'
alias: 'null things'
description: ''
trigger:
condition:
action:
mode: single
- id: 'baddy-3'
alias: 'big null things'
description:
trigger:
condition:
action:
mode: single
- id: 'bad mode'
alias: 'bade mode'
description: ""
trigger: []
condition: []
action: []
mode: bad
+12 -12
View File
@@ -24,7 +24,7 @@ class BaseTestCase(TestCase):
class automation_list_tests(BaseTestCase): class automation_list_tests(BaseTestCase):
test_params = {"total": 28, "subtest2_found_items": 3, "subtest1_found_items": 10} test_params = {"total": 32, "subtest2_found_items": 7, "subtest1_found_items": 10}
def test_get_list_of_everything(self): def test_get_list_of_everything(self):
data = self.client.post( data = self.client.post(
@@ -106,25 +106,25 @@ class automation2_lists_tests(automation_list_tests):
class automation_update_tests(BaseTestCase): class automation_update_tests(BaseTestCase):
def test_insert_new(self): def test_insert_new(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
self.assertEqual(resp.json()["totalItems"], 28) self.assertEqual(resp.json()["totalItems"], 32)
resp = self.client.post( resp = self.client.post(
"/automations", "/automations/item",
json={ json={
"index": 29, "index": 33,
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(), "data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
}, },
) )
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 28}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 32})
data = resp.json() data = resp.json()
self.assertEqual(data["totalItems"], 29) self.assertEqual(data["totalItems"], 33)
self.assertEqual(data["data"][0]["metadata"]["id"], "testme") self.assertEqual(data["data"][0]["metadata"]["id"], "testme")
def test_update_some(self): def test_update_some(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
original_auto = resp.json()["data"][0] original_auto = resp.json()["data"][0]
resp = self.client.post( resp = self.client.post(
"/automations", "/automations/item",
json={ json={
"index": 20, "index": 20,
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(), "data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
@@ -143,7 +143,7 @@ class automation_update_tests(BaseTestCase):
original_auto = resp.json()["data"][0] original_auto = resp.json()["data"][0]
original_auto["metadata"]["alias"] = "I CHANGED!" original_auto["metadata"]["alias"] = "I CHANGED!"
resp = self.client.post( resp = self.client.post(
"/automations", "/automations/item",
json={ json={
"index": 15, "index": 15,
"data": original_auto, "data": original_auto,
@@ -194,7 +194,7 @@ class automation_update_tests(BaseTestCase):
original_auto = resp.json()["data"][0] original_auto = resp.json()["data"][0]
original_auto["metadata"]["alias"] = "I CHANGED!" original_auto["metadata"]["alias"] = "I CHANGED!"
resp = self.client.post( resp = self.client.post(
"/automations", "/automations/item",
json={ json={
"index": 27, "index": 27,
"data": original_auto, "data": original_auto,
@@ -324,13 +324,13 @@ class automation_update_tests(BaseTestCase):
class automation_delete_tests(BaseTestCase): class automation_delete_tests(BaseTestCase):
def test_delete_some(self): def test_delete_some(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
self.assertEqual(resp.json()["totalItems"], 28) self.assertEqual(resp.json()["totalItems"], 32)
resp = self.client.delete( resp = self.client.delete(
"/automations", "/automations/item",
json={ json={
"index": 20, "index": 20,
}, },
) )
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
self.assertEqual(resp.json()["totalItems"], 27) self.assertEqual(resp.json()["totalItems"], 31)
@@ -24,11 +24,11 @@ class manager_tests(TestCase):
_, _, loader = get_example_automation_loader() _, _, loader = get_example_automation_loader()
self.assertIsNone(loader.get(-1)) self.assertIsNone(loader.get(-1))
self.assertIsNone(loader.get(1_000)) self.assertIsNone(loader.get(1_000))
self.assertIsNone(loader.get(31)) self.assertIsNone(loader.get(33))
def test_length(self): def test_length(self):
_, _, loader = get_example_automation_loader() _, _, loader = get_example_automation_loader()
self.assertEqual(loader.get_total_items(), 28) self.assertEqual(loader.get_total_items(), 32)
def test_bad_automations_file(self): def test_bad_automations_file(self):
folder, _, manager = get_dummy_automation_loader( folder, _, manager = get_dummy_automation_loader(
@@ -51,11 +51,11 @@ class manager_tests(TestCase):
def test_create_automation_with_example_folder(self): def test_create_automation_with_example_folder(self):
_, _, manager = get_example_automation_loader() _, _, manager = get_example_automation_loader()
self.assertEqual(manager.get_total_items(), 28) self.assertEqual(manager.get_total_items(), 32)
manager.update(32, ExtenededAutomationData(metadata=AutomationMetdata(id="test1"))) manager.update(40, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
auto = manager.get(28) auto = manager.get(32)
self.assertIsNotNone(auto) self.assertIsNotNone(auto)
self.assertEqual(manager.get_total_items(), 29) self.assertEqual(manager.get_total_items(), 33)
self.assertEqual(auto.metadata.id, "test1") # type: ignore self.assertEqual(auto.metadata.id, "test1") # type: ignore
def test_update_automation(self): def test_update_automation(self):
+2 -2
View File
@@ -1,5 +1,5 @@
name: Shortumation name: Shortumation
version: 0.1.3 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"
@@ -20,7 +20,7 @@ panel_icon: mdi:home-automation
hassio_role: manager hassio_role: manager
privileged: privileged:
- SYS_RAWIO - SYS_RAWIO
host_network: true host_network: false
auth_api: true auth_api: true
map: map:
- config:rw - config:rw
+21
View File
@@ -0,0 +1,21 @@
version: '3'
services:
homeassistant:
container_name: homeassistant
image: "ghcr.io/home-assistant/home-assistant:stable"
volumes:
- config:/config
restart: unless-stopped
privileged: true
network_mode: host
shortumation:
# make sure to replace the ARCH with whatever system you are running!
image: "asosnovsky/shortumation-${ARCH:-amd64}:latest"
volumes:
- config:/config
ports:
- 8081:8000
volumes:
config:
+3
View File
@@ -15,6 +15,7 @@
"react-jss": "^10.8.2", "react-jss": "^10.8.2",
"react-router-dom": "6", "react-router-dom": "6",
"react-scripts": "4.0.3", "react-scripts": "4.0.3",
"superstruct": "^0.15.4",
"theming": "^3.3.0", "theming": "^3.3.0",
"typescript": "^4.1.2", "typescript": "^4.1.2",
"web-vitals": "^1.0.1", "web-vitals": "^1.0.1",
@@ -23,6 +24,8 @@
"scripts": { "scripts": {
"start": "react-scripts start", "start": "react-scripts start",
"build": "react-scripts build", "build": "react-scripts build",
"tsc": "tsc -w",
"tsc:ci": "tsc",
"test:ci": "react-scripts test --ci=true --all --watchAll=false", "test:ci": "react-scripts test --ci=true --all --watchAll=false",
"test": "react-scripts test", "test": "react-scripts test",
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache", "test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
+5 -5
View File
@@ -1,7 +1,7 @@
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
import { API } from "./base"; import { API } from "./base";
import { ListData, ListParams } from "./types"; import { ListData, ListParams } from "./types";
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths'; import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
export const makeAutomationAPI = (api: API) => ({ export const makeAutomationAPI = (api: API) => ({
@@ -14,19 +14,19 @@ export const makeAutomationAPI = (api: API) => ({
}); });
return data; return data;
}, },
async update({index, auto}: {index: number, auto: AutomationData}) { async update({ index, auto }: { index: number, auto: AutomationData }) {
return await api.makeCall({ return await api.makeCall({
path: AUTOMTAION_ROOT, path: AUTOMTAION_ITEM,
data: { data: {
index, index,
data: auto data: auto
}, },
}) })
}, },
async remove({index}: {index: number}) { async remove({ index }: { index: number }) {
return await api.makeCall({ return await api.makeCall({
method: "DELETE", method: "DELETE",
path: AUTOMTAION_ROOT, path: AUTOMTAION_ITEM,
data: { data: {
index, index,
} }
-1
View File
@@ -5,7 +5,6 @@ import { useAPIService } from './core';
import { useMockAPI } from "./mock"; import { useMockAPI } from "./mock";
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i); const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
console.log(process.env)
export const useConnectedApiService = () => useAPIService( export const useConnectedApiService = () => useAPIService(
makeAutomationAPI(makeRemoteAPI( makeAutomationAPI(makeRemoteAPI(
+2 -2
View File
@@ -1,7 +1,7 @@
import { useRef } from 'react'; import { useRef } from 'react';
import { AutomationData } from 'types/automations'; import { AutomationData } from 'types/automations';
import { API } from './base'; import { API } from './base';
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths'; import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
export const useMockAPI = ( export const useMockAPI = (
@@ -26,7 +26,7 @@ export const useMockAPI = (
})) }))
} as any } as any
} }
if (path === AUTOMTAION_ROOT) { if (path === AUTOMTAION_ITEM) {
if (method === 'POST') { if (method === 'POST') {
const { index, data: auto } = data as any; const { index, data: auto } = data as any;
if (index >= automationsRef.current.length) { if (index >= automationsRef.current.length) {
+3 -2
View File
@@ -1,4 +1,5 @@
export const AUTOMTAION_ROOT = '' as const; export const AUTOMTAION_ROOT = '/' as const;
export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}/list` as const; export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const;
export const AUTOMTAION_ITEM = `${AUTOMTAION_ROOT}item` as const;
@@ -15,7 +15,7 @@
} }
.automation-editor--info-box.show { .automation-editor--info-box.show {
min-width: 25em; min-width: 20em;
} }
.automation-editor--info-box.hide { .automation-editor--info-box.hide {
@@ -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}
@@ -5,6 +5,14 @@
height: 100%; height: 100%;
} }
.automation-editor-failures {
display: flex;
flex-direction: column;
padding: 1em;
overflow: scroll;
height: 100%;
}
.automation-editor--flow-wrapper { .automation-editor--flow-wrapper {
flex: 1; flex: 1;
padding: 0 0.5em 0 0.5em; padding: 0 0.5em 0 0.5em;
@@ -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 {
@@ -111,3 +111,63 @@ EmptyStart.args = {
sequence: [] sequence: []
} }
} }
export const BadAutomationInvalidMetadata = Template.bind({})
BadAutomationInvalidMetadata.args = {
...BadAutomationInvalidMetadata.args,
automation: {
condition: [],
tags: {},
metadata: {
} as any,
trigger: [
],
sequence: []
}
}
export const BadAutomationInvalidTriggers = Template.bind({})
BadAutomationInvalidTriggers.args = {
...BadAutomationInvalidTriggers.args,
automation: {
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Random",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
},
mode: 'single',
},
trigger: [
"haha I am a string"
] as any,
sequence: []
}
}
export const BadAutomationInvalidSequence = Template.bind({})
BadAutomationInvalidSequence.args = {
...BadAutomationInvalidSequence.args,
automation: {
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Bad Choose Sequence",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
},
mode: 'single',
},
trigger: [],
sequence: [
{
choose: {}
}
] as any
}
}
@@ -5,9 +5,11 @@ import { AutomationData } from "types/automations";
import { AutoInfoBox } from "./AutoInfoBox"; import { AutoInfoBox } from "./AutoInfoBox";
import { ButtonIcon } from "components/Icons/ButtonIcons"; import { ButtonIcon } from "components/Icons/ButtonIcons";
import { Button } from "components/Inputs/Button"; import { Button } from "components/Inputs/Button";
import { useAutomatioEditorState } from "./state"; import { useAutomatioEditorState, EditorData } from './state';
import { DAGAutomationFlow } from "components/DAGFlow"; import { SafeDAGAutomationFlow } from "components/DAGFlow/safe";
import { DAGAutomationFlowDims } from "components/DAGFlow/types"; import { DAGAutomationFlowDims } from "components/DAGFlow/types";
import { MiniFailure } from 'types/validators/helper';
import InputYaml from "components/Inputs/InputYaml";
interface Props { interface Props {
automation?: AutomationData; automation?: AutomationData;
@@ -26,7 +28,9 @@ export const AutomationEditor: FC<Props> = ({
updateTrigger, updateTrigger,
updateMetadata, updateMetadata,
updateCondition, updateCondition,
validate,
save, save,
saveAndUpdate,
} = useAutomatioEditorState(propsAutos, propsOnUpdate); } = useAutomatioEditorState(propsAutos, propsOnUpdate);
const [closeInfo, setCloseInfo] = useState(false); const [closeInfo, setCloseInfo] = useState(false);
@@ -37,6 +41,14 @@ export const AutomationEditor: FC<Props> = ({
Loading... Loading...
</div> </div>
} }
if (state.status === 'invalid') {
return <ValidationBox
failures={state.failures}
data={state.data}
validate={validate}
onSave={saveAndUpdate}
/>
}
return <div className="automation-editor"> return <div className="automation-editor">
<AutoInfoBox <AutoInfoBox
className={closeInfo ? "hide" : "show"} className={closeInfo ? "hide" : "show"}
@@ -61,7 +73,7 @@ export const AutomationEditor: FC<Props> = ({
Save <CheckMarkIcon color="#bf4" /> Save <CheckMarkIcon color="#bf4" />
</Button> </Button>
</div> </div>
<DAGAutomationFlow <SafeDAGAutomationFlow
className="automation-editor--flow-wrapper--flow" className="automation-editor--flow-wrapper--flow"
sequence={state.data.sequence} sequence={state.data.sequence}
trigger={state.data.trigger} trigger={state.data.trigger}
@@ -74,3 +86,58 @@ export const AutomationEditor: FC<Props> = ({
</div> </div>
</div> </div>
} }
export const ValidationBox: FC<{
failures: MiniFailure[]
validate: (d: any) => MiniFailure[] | null,
data: EditorData,
onSave: (d: EditorData) => void,
}> = props => {
const [{ failures, data }, setState] = useState({
failures: props.failures,
data: props.data,
});
const makeSave = <K extends keyof EditorData>(k: K) => (d: EditorData[K]) => {
const newData = {
...data,
[k]: d,
}
const newFails = props.validate(newData);
if (newFails) {
setState({
failures: newFails,
data: newData,
})
} else {
setState({
failures: [],
data: newData,
})
}
}
return <div className="automation-editor-failures">
<ul>
{failures.map((f, i) => <>
<li key={i}>
<b>{f.path}</b>:
<ul>
{f.message.map((m, j) => <li key={j}>
{m}
</li>)}
</ul>
</li>
</>)}
</ul>
<span>Please correct the automation file manually and then continue!</span>
<InputYaml label="Metadata" value={data.metadata} onChange={makeSave('metadata')} resizable />
<InputYaml label="Tags" value={data.tags} onChange={makeSave('tags')} resizable />
<InputYaml label="Trigger" value={data.trigger} onChange={makeSave('trigger')} resizable />
<InputYaml label="Condition" value={data.condition} onChange={makeSave('condition')} resizable />
<InputYaml label="Actions" value={data.sequence} onChange={makeSave('sequence')} resizable />
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>Save</Button>
</div>
}
+39 -18
View File
@@ -1,6 +1,8 @@
import { useState, useEffect } from 'react'; import { useState, useEffect } from 'react';
import { AutomationData, AutomationMetadata } from "types/automations"; import { AutomationData, AutomationMetadata } from "types/automations";
import * as v from "types/validators/autmation";
import { getFailures } from "types/validators/helper";
import { MiniFailure } from '../../types/validators/helper';
export type EditorData = ReturnType<typeof genEditorData>; export type EditorData = ReturnType<typeof genEditorData>;
export type EditorState = { export type EditorState = {
@@ -8,6 +10,10 @@ export type EditorState = {
data: EditorData data: EditorData
} | { } | {
status: 'loading' status: 'loading'
} | {
status: 'invalid',
failures: MiniFailure[],
data: EditorData,
} }
export type EditorStatus = EditorState['status']; export type EditorStatus = EditorState['status'];
@@ -20,7 +26,7 @@ export const useAutomatioEditorState = (
}); });
const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => ( const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => (
data: D data: D
) => state.status !== 'loading' && update({ ) => ((state.status === 'changed') || (state.status === 'unchanged')) && update({
status: 'changed', status: 'changed',
data: { data: {
...state.data, ...state.data,
@@ -28,21 +34,46 @@ export const useAutomatioEditorState = (
} }
}) })
const saveAndUpdate = (data: EditorData) => {
const cleanData = {
...data,
tags: data.tags.reduce((all, [tagName, tagValue]) => ({
...all,
[tagName.trim()]: tagValue.trim(),
}), {})
};
update({
status: "loading",
})
onSave(cleanData);
}
useEffect(() => { useEffect(() => {
if (automation) { if (automation) {
update({ const failures = getFailures(automation, v.AutomationData);
status: 'unchanged', if (failures) {
data: genEditorData(automation), update({
}) status: 'invalid',
failures,
data: genEditorData(automation),
})
} else {
update({
status: 'unchanged',
data: genEditorData(automation),
})
}
} }
}, [automation]); }, [automation]);
return { return {
validate: (data: any) => getFailures(data, v.AutomationData),
updateTrigger: makeUpdate('trigger'), updateTrigger: makeUpdate('trigger'),
updateSequence: makeUpdate('sequence'), updateSequence: makeUpdate('sequence'),
updateCondition: makeUpdate('condition'), updateCondition: makeUpdate('condition'),
saveAndUpdate,
updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => { updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => {
if (state.status !== 'loading') { if ((state.status === 'changed') || (state.status === 'unchanged')) {
update({ update({
status: 'changed', status: 'changed',
data: { data: {
@@ -55,17 +86,7 @@ export const useAutomatioEditorState = (
}, },
save: () => { save: () => {
if (state.status !== 'loading') { if (state.status !== 'loading') {
const data = { saveAndUpdate(state.data)
...state.data,
tags: state.data.tags.reduce((all, [tagName, tagValue]) => ({
...all,
[tagName]: tagValue,
}), {})
};
update({
status: "loading",
})
onSave(data);
} }
}, },
get state() { get state() {
@@ -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',
@@ -62,5 +62,530 @@ FewAutos.args = {
createMockAuto({ "Room": "Office", "Type": "Lights" }), createMockAuto({ "Room": "Office", "Type": "Lights" }),
createMockAuto({ "Room": "Office" }), createMockAuto({ "Room": "Office" }),
createMockAuto(), createMockAuto(),
{
"metadata": {
"id": "1649947692702",
"alias": "Bed Remote",
"description": "",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_on",
"id": "turn_on"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_off",
"id": "turn_off"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_up",
"id": "dim_up"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_down",
"id": "dim_down"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_double_press",
"subtype": "turn_on",
"id": "up_dbclk"
}
],
"condition": [],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "turn_off"
}
],
"sequence": [
{
"type": "turn_off",
"device_id": "asdasdasdasdas",
"entity_id": "light.bulb_ari_lamp",
"domain": "light"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "turn_on"
}
],
"sequence": [
{
"service": "light.turn_on",
"data": {
"color_temp": 153,
"brightness_pct": 100
},
"target": {
"device_id": "asdasdasdasdas"
}
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "dim_up"
}
],
"sequence": [
{
"device_id": "asdasdasdasdas",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_increase"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "dim_down"
}
],
"sequence": [
{
"device_id": "asdasdasdasdas",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_decrease"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "up_dbclk"
}
],
"sequence": [
{
"service": "light.turn_on",
"data": {
"color_temp": 500,
"brightness_pct": 100
},
"target": {
"device_id": "asdasdasdasdas"
}
}
]
}
],
"default": []
}
],
"tags": {
"Type": "Remote",
"Room": "Bedroom"
}
},
{
"metadata": {
"id": "1641617168123",
"alias": "Ensure On",
"description": "",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"platform": "device",
"type": "turned_off",
"device_id": "tasdasdasdasdasdasda",
"entity_id": "switch.power_washer",
"domain": "switch"
},
{
"platform": "device",
"type": "turned_off",
"device_id": "dasdasdasdasdas",
"entity_id": "switch.plug_living_room_tv",
"domain": "switch"
}
],
"condition": [],
"sequence": [
{
"type": "turn_on",
"device_id": "tasdasdasdasdasdasda",
"entity_id": "switch.power_washer",
"domain": "switch"
},
{
"type": "turn_on",
"device_id": "dasdasdasdasdas",
"entity_id": "switch.plug_living_room_tv",
"domain": "switch"
}
],
"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"
}
}
],
}
],
}
export const BadAutmations = Template.bind({})
BadAutmations.args = {
...BadAutmations.args,
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: [],
tags: {},
metadata: {
id: "Bad Choose Sequence",
alias: "Bad Choose",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
},
mode: 'single',
},
trigger: [],
sequence: [
{
choose: {}
}
] as any
},
{
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Bad Trigger",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
},
mode: 'single',
},
trigger: [
"haha I am a string"
] as any,
sequence: []
},
{
condition: [],
tags: {},
metadata: {
} as any,
trigger: [
],
sequence: []
}
], ],
} }
@@ -10,10 +10,12 @@
flex: 1; flex: 1;
user-select: none; user-select: none;
} }
.automation-list-box--body > * {
.automation-list-box--body>* {
padding-top: 0.5em; padding-top: 0.5em;
padding-bottom: 0.5em; padding-bottom: 0.5em;
} }
.automation-list-box--body--group { .automation-list-box--body--group {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -21,33 +23,37 @@
border-radius: 10px; border-radius: 10px;
padding-bottom: 0.5em; padding-bottom: 0.5em;
border-width: 1px; border-width: 1px;
border-bottom-style: solid ; border-bottom-style: solid;
border-color: white; border-color: white;
} }
.automation-list-box--body--group > .automation-list-box--body--group {
border-left-style: solid ; .automation-list-box--body--group>.automation-list-box--body--group {
border-left-style: solid;
border-top-left-radius: 0; border-top-left-radius: 0;
margin-left: 0.75em; margin-left: 0.75em;
padding-left: 0.5em; padding-left: 0.5em;
} }
.automation-list-box--body--group > b { .automation-list-box--body--group>b {
width: 100%; width: 100%;
cursor: pointer; cursor: pointer;
padding: 0.1em; padding: 0.1em;
} }
.automation-list-box--body--group > b:hover {
.automation-list-box--body--group>b:hover {
background-color: var(--secondary-accent); background-color: var(--secondary-accent);
color: var(--secondary); color: var(--secondary);
} }
.automation-list-box--body--item:hover { .automation-list-box--body--item:hover, .automation-list-box--body--item.selected {
background-color: var(--primary-accent); background-color: var(--primary-accent);
color: var(--primary); color: var(--primary);
} }
.automation-list-box--body--item:hover > .automation-list-box--body--item--tags > span {
.automation-list-box--body--item:hover>.automation-list-box--body--item--tags>span {
border-color: var(--primary); border-color: var(--primary);
} }
.automation-list-box--body--item { .automation-list-box--body--item {
padding-left: 1em; padding-left: 1em;
cursor: pointer; cursor: pointer;
@@ -57,25 +63,31 @@
gap: 1em; gap: 1em;
flex-wrap: wrap; flex-wrap: wrap;
} }
.automation-list-box--body--item::before { .automation-list-box--body--item::before {
content: "⊚ "; content: "⊚ ";
} }
.automation-list-box--body--item--title { .automation-list-box--body--item--title {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding-left: 0.25em; padding-left: 0.25em;
flex: 1; flex: 1;
} }
.automation-list-box--body--item--title > b {
.automation-list-box--body--item--title>b {
font-size: 1em; font-size: 1em;
} }
.automation-list-box--body--item--title > span, .automation-list-box--body--item--title > b > span {
.automation-list-box--body--item--title>span, .automation-list-box--body--item--title>b>span {
font-size: 0.75em; font-size: 0.75em;
} }
.automation-list-box--body--item > button {
.automation-list-box--body--item>button {
padding: 0.25em !important; padding: 0.25em !important;
margin: 0.5em !important; margin: 0.5em !important;
} }
.automation-list-box--body--item--tags { .automation-list-box--body--item--tags {
flex: 1; flex: 1;
display: flex; display: flex;
@@ -87,13 +99,15 @@
max-height: 100%; max-height: 100%;
gap: 0.25em; gap: 0.25em;
} }
.automation-list-box--body--item--tags > span {
.automation-list-box--body--item--tags>span {
border-color: var(--primary-accent); border-color: var(--primary-accent);
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
border-radius: 0.5em; border-radius: 0.5em;
padding: 0.1em 0.5em; padding: 0.1em 0.5em;
} }
.automation-list-box--bottom { .automation-list-box--bottom {
margin-top: 0.5em; margin-top: 0.5em;
margin-bottom: 0.5em; margin-bottom: 0.5em;
@@ -102,7 +116,8 @@
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
} }
.automation-list-box--bottom > button {
.automation-list-box--bottom>button {
background-color: #070; background-color: #070;
color: var(--primary-accent); color: var(--primary-accent);
padding: 0.5em 2em; padding: 0.5em 2em;
@@ -13,10 +13,12 @@ export default {
const Template: ComponentStory<typeof AutomationListBox> = args => { const Template: ComponentStory<typeof AutomationListBox> = args => {
const [autos, setAutos] = useState(args.automations) const [selected, setSelected] = useState(args.selected)
console.log({ args })
return <div className="page"> return <div className="page">
<AutomationListBox {...args} automations={autos} /> <AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
setSelected(i)
args.onSelectAutomation(i)
}} />
</div> </div>
} }
@@ -1,6 +1,6 @@
import "./AutomationListBox.css"; import "./AutomationListBox.css";
import { FC, useState } from 'react'; import { FC, useState } from 'react';
import { AutomationData } from "types/automations"; import { AutomationData, AutomationMetadata } from "types/automations";
import InputMultiSelect from "components/Inputs/InputMultiSelect"; import InputMultiSelect from "components/Inputs/InputMultiSelect";
import InputText from "components/Inputs/InputText"; import InputText from "components/Inputs/InputText";
import { Button } from "components/Inputs/Button"; import { Button } from "components/Inputs/Button";
@@ -9,6 +9,7 @@ import { TrashIcon } from "components/Icons";
export type Props = { export type Props = {
automations: AutomationData[]; automations: AutomationData[];
selected: number;
onSelectAutomation: (i: number) => void; onSelectAutomation: (i: number) => void;
onRemove: (i: number) => void; onRemove: (i: number) => void;
onAdd: () => void; onAdd: () => void;
@@ -16,6 +17,7 @@ export type Props = {
export const AutomationListBox: FC<Props> = ({ export const AutomationListBox: FC<Props> = ({
automations, automations,
selected,
onSelectAutomation, onSelectAutomation,
onAdd, onAdd,
onRemove, onRemove,
@@ -23,9 +25,9 @@ export const AutomationListBox: FC<Props> = ({
const tags = getTagList(automations); const tags = getTagList(automations);
const [searchText, setSearchText] = useState(''); const [searchText, setSearchText] = useState('');
const [selected, setSelected] = useState<number[]>([]); const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]);
const filteredAutomations = filterAutomations(automations, searchText, selected, tags); const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags);
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selected, tags); const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selectedTagIdx, tags);
return <div className="automation-list-box"> return <div className="automation-list-box">
<div className="automation-list-box--nav"> <div className="automation-list-box--nav">
@@ -36,14 +38,14 @@ export const AutomationListBox: FC<Props> = ({
/> />
<InputMultiSelect <InputMultiSelect
label="Tags" label="Tags"
selected={selected} selected={selectedTagIdx}
onChange={setSelected} onChange={setSelectedTagIdx}
options={tags} options={tags}
max={3} max={3}
/> />
</div> </div>
<div className="automation-list-box--body"> <div className="automation-list-box--body">
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove)} {convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove, selected)}
</div> </div>
<div className="automation-list-box--bottom"> <div className="automation-list-box--bottom">
<Button onClick={onAdd}>Add</Button> <Button onClick={onAdd}>Add</Button>
@@ -63,11 +65,14 @@ export const getTagList = (autos: AutomationData[]): string[] => Object.keys(aut
}, {})) }, {}))
const filterAutomations = (autos: AutomationData[], searchText: string, selected: number[], tags: string[]): Array<[AutomationData, number]> => autos.map<[AutomationData, number]>((a, i) => [a, i]).filter(([a, i]) => { const filterAutomations = (autos: AutomationData[], searchText: string, selected: number[], tags: string[]): Array<[AutomationData, number]> => autos.map<[AutomationData, number]>((a, i) => [a, i]).filter(([a, i]) => {
if (!a.metadata) {
return true
}
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
@@ -123,29 +128,22 @@ const convertGroupsToItems = (
autos: Array<[AutomationData, number]>, autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void, onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void, onRemove: (i: number) => void,
selected: number,
) => { ) => {
if (Array.isArray(groups)) { if (Array.isArray(groups)) {
return groups.map(i => { return groups.map(i => {
const [auto, autoIndex] = autos[i]; const [auto, autoIndex] = autos[i];
let title = "BadAuto<<Missing Metadata>>"
if (auto.metadata) {
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`
}
return <div return <div
key={i} key={i}
className="automation-list-box--body--item" className={["automation-list-box--body--item", selected === autoIndex ? 'selected' : ''].join(' ')}
title={`Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`} title={title}
onClick={() => onSelectAutomation(autoIndex)} onClick={() => onSelectAutomation(autoIndex)}
> >
<div <MetadataBox metadata={auto.metadata} tags={auto.tags} />
className="automation-list-box--body--item--title"
>
<b>{auto.metadata.alias.slice(0, 15)} <span>({auto.metadata.id.slice(0, 5)})</span></b>
<span>{auto.metadata.description.slice(0, 25)}</span>
<div
className="automation-list-box--body--item--tags"
>
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
<b>{tagName}:</b> {auto.tags[tagName]}
</span>)}
</div>
</div>
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button> <Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
</div> </div>
}) })
@@ -158,11 +156,37 @@ const convertGroupsToItems = (
autos={autos} autos={autos}
onSelectAutomation={onSelectAutomation} onSelectAutomation={onSelectAutomation}
onRemove={onRemove} onRemove={onRemove}
selected={selected}
/> />
}) })
} }
} }
export const MetadataBox: FC<{
metadata: AutomationMetadata,
tags: Record<string, string>,
}> = (auto) => {
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
if (auto.metadata) {
title = <>
<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>
</>
}
return <div
className="automation-list-box--body--item--title"
>
{title}
<div
className="automation-list-box--body--item--tags"
>
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
<b>{tagName}:</b> {auto.tags[tagName]}
</span>)}
</div>
</div>
}
const AutomationListBoxGroup: FC<{ const AutomationListBoxGroup: FC<{
groupName: string, groupName: string,
@@ -170,16 +194,18 @@ const AutomationListBoxGroup: FC<{
autos: Array<[AutomationData, number]>, autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void, onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void; onRemove: (i: number) => void;
selected: number,
}> = ({ }> = ({
groupName, groupName,
groups, groups,
autos, autos,
onSelectAutomation, onSelectAutomation,
onRemove, onRemove,
selected,
}) => { }) => {
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
return <div className="automation-list-box--body--group"> return <div className="automation-list-box--body--group">
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b> <b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove)} {open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove, selected)}
</div> </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',
@@ -9,7 +9,6 @@
.automation-list--list { .automation-list--list {
flex: 1; flex: 1;
min-width: 400px;
max-width: 400px; max-width: 400px;
position: relative; position: relative;
} }
@@ -0,0 +1,70 @@
/* none-hidden */
.automation-list--root.mobile {
flex-direction: column;
}
.automation-list--root.mobile>.automation-list--list {
max-width: 100vw;
min-height: 100vh;
}
.automation-list--root.mobile .automation-editor {
flex-direction: column;
}
.automation-list--root.mobile .automation-list--list-hide {
transform: rotate(90deg);
left: 1.25em;
}
.automation-list--root.mobile .automation-editor--info-box {
min-width: 100vw;
min-height: calc(100vh - 5em);
max-width: 100vw;
max-height: calc(100vh - 5em);
padding: 0;
}
.automation-list--root.mobile .automation-editor--info-box-inner {
margin-top: 2.5em;
padding-left: 0.5em;
padding-right: 0.5em;
margin-bottom: 2em;
}
.automation-list--root.mobile .automation-editor--info-box--icon {
left: 1.25em;
bottom: 0em;
background-color: var(--primary);
transform: rotate(90deg);
}
/* list hide */
.automation-list--root.mobile .automation-list--list.hide {
width: 100vw;
min-height: 0;
max-height: 0;
}
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
transform: rotate(270deg);
position: fixed;
top: 0.75em;
z-index: 20;
}
/* info box hide */
.automation-list--root.mobile .automation-editor--info-box.hide {
width: 100vw;
min-height: 0;
max-height: 0;
}
.automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon {
transform: rotate(270deg);
position: fixed;
top: 0.75em;
background-color: var(--green-opaque);
z-index: 30;
}
+13 -5
View File
@@ -1,4 +1,5 @@
import "./index.css"; import "./index.css";
import "./index.mobile.css";
import { AutomationEditor } from "components/AutomationEditor"; import { AutomationEditor } from "components/AutomationEditor";
import { FC, useState } from "react"; import { FC, useState } from "react";
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
@@ -8,6 +9,7 @@ import { ButtonIcon } from "components/Icons/ButtonIcons";
import { ApiService } from "apiService/core"; import { ApiService } from "apiService/core";
import { AutomationListBox } from "./AutomationListBox"; import { AutomationListBox } from "./AutomationListBox";
import { DAGAutomationFlowDims } from 'components/DAGFlow/types'; import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
import useWindowSize from "utils/useWindowSize";
interface AutomationListParams { interface AutomationListParams {
@@ -29,19 +31,25 @@ export const AutomationList: FC<AutomationListParams> = ({
// state // state
const [hideList, setHideList] = useState(false); const [hideList, setHideList] = useState(false);
const [current, setCurrent] = useState(0); const [current, setCurrent] = useState(0);
const { isMobile } = useWindowSize();
// alias // alias
const currentAuto = automations.length > 0 ? automations[current] : null; const currentAuto = automations.length > 0 ? automations[current] : null;
const automationListListCls = "automation-list--list" + (hideList ? " hide" : " show")
// render // render
return <div className="automation-list--root"> return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}>
<div className={automationListListCls}> <div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}>
<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={setCurrent} onSelectAutomation={i => {
setCurrent(i);
if (isMobile) {
setHideList(true)
}
}}
selected={current}
onRemove={onRemove} onRemove={onRemove}
/> />
<ButtonIcon <ButtonIcon
+1 -1
View File
@@ -1,5 +1,5 @@
import { FC } from "react"; import { FC } from "react";
import { AddIcon, PencilIcon, TrashIcon } from '../Icons/index'; import { AddIcon, TrashIcon } from '../Icons/index';
import { useCircleStyles } from './styles'; import { useCircleStyles } from './styles';
import { Handle, Position, XYPosition } from 'react-flow-renderer'; import { Handle, Position, XYPosition } from 'react-flow-renderer';
@@ -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>
}
+10 -14
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,
@@ -46,9 +44,7 @@ export const DAGNode: FC<{ data: DAGNodeProps }> = ({
{label} {label}
</span> </span>
</div> </div>
<div className={classes.rightEdge} onClick={() => { <div className={classes.rightEdge} onClick={onEditClick}>
console.log('editing me', label, onEditClick, onEditClick())
}}>
<button className={classes.buttonEdit}> <button className={classes.buttonEdit}>
<PencilIcon size={1.1} color={theme.green} /> <PencilIcon size={1.1} color={theme.green} />
</button> </button>
@@ -1,5 +1,5 @@
import { makeFlowCircle } from "./DAGCircle" import { makeFlowCircle } from "./DAGCircle"
import { DAGAutomationFlowDims, FlowData } from "./types" import { DAGAutomationFlowDims } from "./types"
import { XYPosition } from 'react-flow-renderer'; import { XYPosition } from 'react-flow-renderer';
export const makeAddButton = ( export const makeAddButton = (
@@ -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 {
@@ -27,7 +27,6 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
{...args} {...args}
{...state} {...state}
onTriggerUpdate={trigger => { onTriggerUpdate={trigger => {
console.log({ trigger })
setState({ ...state, trigger }) setState({ ...state, trigger })
}} }}
onSequenceUpdate={sequence => setState({ ...state, sequence })} onSequenceUpdate={sequence => setState({ ...state, sequence })}
@@ -211,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
]
}
+19 -17
View File
@@ -1,6 +1,6 @@
import { FC, useState } from "react"; import { FC, useState } from "react";
import ReactFlow, { MiniMap, Controls } from 'react-flow-renderer'; import ReactFlow, { Controls } from 'react-flow-renderer';
import { AutomationSequenceNode } from "types/automations"; import { AutomationSequenceNode } from "types/automations";
import { AutomationTrigger } from 'types/automations/triggers'; import { AutomationTrigger } from 'types/automations/triggers';
import { triggerToFlow } from "./triggerConvertor"; import { triggerToFlow } from "./triggerConvertor";
@@ -14,13 +14,27 @@ 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,
} }
interface Props { const makeOnEditAutomationConditions = (
conditions: AutomationCondition[],
updateConditions: (c: AutomationCondition[]) => void,
openModal: UpdateModalState,
) => () => openModal({
single: false,
node: conditions,
allowedTypes: ['condition'],
update: c => updateConditions(c as any),
})
export interface DAGAutomationFlowProps {
className?: string; className?: string;
trigger: AutomationTrigger[]; trigger: AutomationTrigger[];
condition: AutomationCondition[]; condition: AutomationCondition[];
@@ -31,7 +45,7 @@ interface Props {
onConditionUpdate: (s: AutomationCondition[]) => void; onConditionUpdate: (s: AutomationCondition[]) => void;
} }
export const DAGAutomationFlow: FC<Props> = ({ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
className, className,
trigger, trigger,
condition, condition,
@@ -50,6 +64,7 @@ export const DAGAutomationFlow: FC<Props> = ({
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}
@@ -112,7 +127,6 @@ export const DAGAutomationFlow: FC<Props> = ({
}, },
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState), makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
); );
// render // render
return <> return <>
<Modal open={!!modalState}> <Modal open={!!modalState}>
@@ -127,19 +141,7 @@ export const DAGAutomationFlow: FC<Props> = ({
nodesDraggable={false} nodesDraggable={false}
{...flowData} {...flowData}
> >
<MiniMap />
<Controls /> <Controls />
</ReactFlow> </ReactFlow>
</>; </>;
} }
const makeOnEditAutomationConditions = (
conditions: AutomationCondition[],
updateConditions: (c: AutomationCondition[]) => void,
openModal: UpdateModalState,
) => () => openModal({
single: false,
node: conditions,
allowedTypes: ['condition'],
update: c => updateConditions(c as any),
})
+4
View File
@@ -0,0 +1,4 @@
.dag-flow-safe {
height: 100%;
overflow: scroll;
}
+84
View File
@@ -0,0 +1,84 @@
import "./safe.css";
import { Component, ErrorInfo } from "react";
import { DAGAutomationFlow, DAGAutomationFlowProps } from ".";
import { AutomationSequenceNode } from "types/automations";
import { AutomationCondition } from "types/automations/conditions";
import { AutomationTrigger } from 'types/automations/triggers';
import InputYaml from "components/Inputs/InputYaml";
import { Button } from "components/Inputs/Button";
type GoodState = {
hasError: false;
}
type FailedStateData = {
sequence: AutomationSequenceNode[],
condition: AutomationCondition[],
trigger: AutomationTrigger[],
}
type FailedState = {
hasError: true,
error: any,
errorInfo?: ErrorInfo,
} & FailedStateData
type State = GoodState | FailedState
export class SafeDAGAutomationFlow extends Component<DAGAutomationFlowProps, State> {
state: State = {
hasError: false
}
componentDidCatch(error: Error, errorInfo: ErrorInfo) {
this.setState({
hasError: true,
error,
errorInfo,
sequence: this.props.sequence,
condition: this.props.condition,
trigger: this.props.trigger,
})
}
render() {
if (this.state.hasError) {
const makeSet = <K extends keyof FailedStateData>(k: K) => (d: FailedStateData[K]) => this.setState({
...this.state,
[k]: d,
});
const makeSave = <K extends keyof FailedStateData>(k: K) => () => {
if (!this.state.hasError) {
return
}
if (k === 'condition') {
this.props.onConditionUpdate(this.state.condition)
} else if (k === 'sequence') {
this.props.onSequenceUpdate(this.state.sequence)
} else if (k === 'trigger') {
this.props.onTriggerUpdate(this.state.trigger)
}
}
return <div className="dag-flow-safe">
<h1>An Error has occured.</h1>
<h1>Failed to Open Autmation!</h1>
Something is likely not configured in your automation properly.
<hr />
<h2>Error:</h2>
<h2>{String(this.state.error)}</h2>
<br />
{JSON.stringify(this.state.error, null, 4)}
{this.state.errorInfo && this.state.errorInfo.componentStack.split('\n').map((s, i) => <>
<span key={i}>{s}</span><br key={`br-${i}`} />
</>)}
<h2>Automation YAML</h2>
<InputYaml resizable label="Trigger" value={this.state.trigger} onChange={makeSet('trigger')} />
<Button onClick={makeSave('trigger')}>Save Triggers</Button>
<InputYaml resizable label="Condition" value={this.state.condition} onChange={makeSet('condition')} />
<Button onClick={makeSave('condition')}>Save Conditions</Button>
<InputYaml resizable label="Action" value={this.state.sequence} onChange={makeSet('sequence')} />
<Button onClick={makeSave('sequence')}>Save Actions</Button>
</div>
}
return <DAGAutomationFlow {...this.props} />;
}
}
@@ -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,7 +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 { makeFlowCircle } from './DAGCircle';
import { makeAddButton } from './flowDataMods'; import { makeAddButton } from './flowDataMods';
import { getDescriptionFromAutomationNode } from 'utils/formatting';
export const triggerToFlow = ( export const triggerToFlow = (
flowData: FlowData, flowData: FlowData,
@@ -14,7 +14,6 @@ export const triggerToFlow = (
distanceFactor, distanceFactor,
nodeHeight, nodeHeight,
nodeWidth, nodeWidth,
circleSize,
padding, padding,
conditionHeight, conditionHeight,
} = dims; } = dims;
@@ -25,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;
@@ -11,7 +11,6 @@ const mockSequenceUpdater = (defaultState: AutomationSequenceNode[] = []) => {
state, state,
s => { s => {
state = s state = s
console.log(state, s)
}, },
ms => modalStates.push(ms) ms => modalStates.push(ms)
); );
+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);
@@ -1,18 +1,19 @@
import "./InputBoolean.css"; import "./InputBoolean.css";
import InputWrapper from "./InputWrapper";
export interface Props { 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>
} }
@@ -26,9 +26,6 @@ export const InputList: FC<Props<any>> = ({
{...selattr} value={current} {...selattr} value={current}
onChange={e => { onChange={e => {
e.preventDefault(); e.preventDefault();
console.log(e.currentTarget.id)
console.log(e.currentTarget.value)
console.log(e.currentTarget.innerHTML)
if (e.currentTarget.id === 'invalid') { if (e.currentTarget.id === 'invalid') {
onChange(options[0]) onChange(options[0])
} else { } else {
+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 -2
View File
@@ -1,7 +1,7 @@
import * as yaml from "js-yaml"; import * as yaml from "js-yaml";
import { useState } from "react"; import { useState } from "react";
import InputTextArea from "./InputTextArea"; import InputTextArea from "./InputTextArea";
import { useDelayedFunction, useDelayEffect } from 'utils/useDelay'; import { useDelayEffect } from 'utils/useDelay';
export interface Props<T extends {}> { export interface Props<T extends {}> {
label: string; label: string;
@@ -24,7 +24,6 @@ export default function InputYaml<T>({
}); });
const setText = (t: string) => { const setText = (t: string) => {
try { try {
console.log(yaml.dump(yaml.load(t)));
setState({ text: t, error: undefined }) setState({ text: t, error: undefined })
} catch (_) { } catch (_) {
setState({ text: t, error: "! Invalid Yaml !" }) setState({ text: t, error: "! Invalid Yaml !" })
+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"
}) })
} }
}); });
@@ -44,7 +44,6 @@ export const InAModal: ComponentStory<typeof MultiNodeEditor> = props => {
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const [state, setState] = useState(props.sequence); const [state, setState] = useState(props.sequence);
console.log({ state })
return <div className="page"> return <div className="page">
<Button onClick={() => setOpen(!open)}>Open Editor</Button> <Button onClick={() => setOpen(!open)}>Open Editor</Button>
<Modal open={open}> <Modal open={open}>
@@ -27,7 +27,6 @@ export const useMultiNodeEditorState = (props: MultiNodeEditorProps) => {
internalNodeModified, internalNodeModified,
} = state; } = state;
const setState = (a: MultiNodeEditorInternalState) => { const setState = (a: MultiNodeEditorInternalState) => {
console.log('setting state', a)
_setState(a) _setState(a)
} }
return { return {
@@ -131,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()
} }
} }
@@ -11,6 +11,7 @@ export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
"type": "", "type": "",
"subtype": "", "subtype": "",
"device_id": "", "device_id": "",
"entity_id": "",
}), }),
isReady: ({ alias }) => { isReady: ({ alias }) => {
return (alias !== '') return (alias !== '')
@@ -33,6 +34,10 @@ export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
...state, ...state,
device_id device_id
})} /> })} />
<InputText label="Entity" value={state.entity_id ?? ""} onChange={entity_id => setState({
...state,
entity_id
})} />
</> </>
} }
} }
@@ -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,35 +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>>]
const mockUseState: UseState = s => { export const useEditorNodeState = (originalNode: AutomationNode, isErrored: boolean, uState: UseState = useState) => {
return [s, () => { }]
}
export const useEditorNodeState = (originalNode: AutomationNode, 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 {
@@ -45,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=''
@@ -61,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);
@@ -104,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,77 +0,0 @@
import { AutomationNodeSubtype, AutomationNodeTypes } from "types/automations";
import { ActionType } from "types/automations/actions";
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>
+15
View File
@@ -0,0 +1,15 @@
import { FC } from "react";
import useWindowSize from "utils/useWindowSize";
export const SizeModal: FC = () => {
const size = useWindowSize();
return <span style={{
position: 'absolute',
top: 0,
left: 0,
background: 'white',
zIndex: 10,
}}>{size.width}/{size.height}={size.ratioWbh} ({size.isMobile ? 'm' : 'd'})</span>
}
+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;
+2 -2
View File
@@ -16,8 +16,8 @@ export const {
primaryLightOpaque: 'var(--primary-light-opaque)', primaryLightOpaque: 'var(--primary-light-opaque)',
secondary: 'var(--secondary)', secondary: 'var(--secondary)',
secondaryOpaque: 'var(--secondary-opaque)', secondaryOpaque: 'var(--secondary-opaque)',
primaryAccent: 'var(--primary-acccent)', primaryAccent: 'var(--primary-accent)',
primaryAccentLight: 'var(--primary-acccent-light)', primaryAccentLight: 'var(--primary-accent-light)',
secondaryAccent: 'var(--secondary-accent)', secondaryAccent: 'var(--secondary-accent)',
condition: { condition: {
primaryColor: 'var(--condition-primary)', primaryColor: 'var(--condition-primary)',
+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
+5 -11
View File
@@ -1,15 +1,11 @@
import * as st from 'superstruct'
import { ActionType, AutomationAction } from "./actions"; import { ActionType, AutomationAction } from "./actions";
import { AutomationCondition, ConditionType } from "./conditions"; import { AutomationCondition, ConditionType } from "./conditions";
import { AutomationTrigger, TriggerType } from "./triggers"; import { AutomationTrigger, TriggerType } from "./triggers";
import * as mv from "types/validators/metadata";
export type AutomationMetadata = st.Infer<typeof mv.AutomationMetadata>
export interface AutomationMetadata {
id: string;
alias: string;
description: string;
trigger_variables?: Record<string, string>;
mode: "single" | "restart" | "queued" | "parallel";
}
export interface AutomationData { export interface AutomationData {
metadata: AutomationMetadata; metadata: AutomationMetadata;
trigger: AutomationTrigger[]; trigger: AutomationTrigger[];
@@ -23,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 :
+15 -71
View File
@@ -1,79 +1,23 @@
import { AutomationTime } from "./common"; import * as st from 'superstruct'
import * as v from "types/validators/triggers";
interface AutomationTriggerBase { interface AutomationTriggerBase {
alias?: string; alias?: string;
} }
export interface AutomationTriggerEvent extends AutomationTriggerBase { export type AutomationTriggerEvent = st.Infer<typeof v.AutomationTriggerEvent>;
platform: 'event'; export type AutomationTriggerHA = st.Infer<typeof v.AutomationTriggerHA>;
event_type: string | string[]; export type AutomationTriggerMQTT = st.Infer<typeof v.AutomationTriggerMQTT>;
event_data?: any; export type AutomationTriggerNumericState = st.Infer<typeof v.AutomationTriggerNumericState>;
context?: any; export type AutomationTriggerState = st.Infer<typeof v.AutomationTriggerState>;
} export type AutomationTriggerTag = st.Infer<typeof v.AutomationTriggerTag>;
export interface AutomationTriggerHA extends AutomationTriggerBase { export type AutomationTriggerTemplate = st.Infer<typeof v.AutomationTriggerTemplate>;
platform: 'homeassistant'; export type AutomationTriggerTime = st.Infer<typeof v.AutomationTriggerTime>;
event: 'start' | 'shutdown'; export type AutomationTriggerTimePattern = st.Infer<typeof v.AutomationTriggerTimePattern>;
} export type AutomationTriggerWebhook = st.Infer<typeof v.AutomationTriggerWebhook>;
export interface AutomationTriggerMQTT extends AutomationTriggerBase { export type AutomationTriggerZone = st.Infer<typeof v.AutomationTriggerZone>;
platform: 'mqtt'; export type AutomationTriggerDevice = st.Infer<typeof v.AutomationTriggerDevice>;
topic: string;
payload: string;
value_template: string;
}
export interface AutomationTriggerNumericState extends AutomationTriggerBase {
platform: 'numeric_state';
entity_id: string | string[];
attribute?: string;
value_template?: string;
above?: string;
below?: string;
for?: AutomationTime;
}
export interface AutomationTriggerState extends AutomationTriggerBase {
platform: 'state';
entity_id: string | string[];
attribute?: string;
from?: string;
to?: string;
for?: AutomationTime;
}
export interface AutomationTriggerTag extends AutomationTriggerBase {
platform: 'tag';
tag_id: string;
device_id: string | string[];
}
export interface AutomationTriggerTemplate extends AutomationTriggerBase {
platform: 'template';
value_template: string;
for?: AutomationTime;
}
export interface AutomationTriggerTime extends AutomationTriggerBase {
platform: 'time';
at: AutomationTime;
}
export interface AutomationTriggerTimePattern extends AutomationTriggerBase {
platform: 'time_pattern';
hours?: string;
minutes?: string;
seconds?: string;
}
export interface AutomationTriggerWebhook extends AutomationTriggerBase {
platform: 'webhook';
webhook_id: string;
}
export interface AutomationTriggerZone extends AutomationTriggerBase {
platform: 'zone';
entity_id: string | string[];
zone: string;
event: 'enter' | 'leave';
}
export interface AutomationTriggerDevice extends AutomationTriggerBase {
platform: 'device';
device_id: string;
domain: string;
type: string;
subtype: string;
}
export type AutomationTrigger = export type AutomationTrigger =
| AutomationTriggerEvent | AutomationTriggerEvent
| AutomationTriggerHA | AutomationTriggerHA
+68
View File
@@ -0,0 +1,68 @@
import * as st from 'superstruct'
import { AutomationTime } from './common';
export const AutomationActionNodeBase = st.type({
alias: st.optional(st.string()),
variables: st.optional(st.record(st.string(), st.any())),
})
export const ServiceAction = st.intersection([
AutomationActionNodeBase,
st.type({
data: st.any(),
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())),
})
]);
+11
View File
@@ -0,0 +1,11 @@
import * as st from 'superstruct'
import { AutomationMetadata } from './metadata'
export const AutomationData = st.object({
metadata: AutomationMetadata,
trigger: st.array(st.object()),
condition: st.array(st.object()),
sequence: st.array(st.object()),
tags: st.record(st.string(), st.string()),
})
+38
View File
@@ -0,0 +1,38 @@
import * as st from 'superstruct'
export const EntityId = st.union([
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()),
minutes: st.optional(st.number()),
seconds: 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()]),
})
]);
+31
View File
@@ -0,0 +1,31 @@
import * as st from 'superstruct';
export type MiniFailure = {
path: string,
message: string[],
}
export const getFailures = <T, S>(value: unknown, struct: st.Struct<T, S>): MiniFailure[] | null => {
try {
st.assert(value, struct)
} catch (err) {
if (err instanceof st.StructError) {
const failureMap = err.failures().reduce((all: Record<string, Set<string>> = {}, next) => {
const path = next.path.join('.');
if (all[path]) {
all[path].add(next.message)
} else {
all[path] = new Set([next.message])
}
return all
}, {})
return Object.keys(failureMap).map((path) => ({
path,
message: Array.from(failureMap[path].values())
}))
}
throw err
}
return null
}
+55
View File
@@ -0,0 +1,55 @@
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);
expect(badCheck).toBeFalsy()
})
test('getFailures returns failures', () => {
const failures = getFailures({ metadata: {} }, AutomationData);
expect(failures).toHaveLength(6)
})
test('getFailures returns null', () => {
const failures = getFailures({
id: "test",
alias: "hey",
description: "wow",
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)
}
})
+3
View File
@@ -0,0 +1,3 @@
export * as actions from "./actions"
export * as triggers from "./triggers"
export * as conditions from "./conditions"
+10
View File
@@ -0,0 +1,10 @@
import * as st from 'superstruct'
export const AutomationMetadata = st.object({
id: st.string(),
alias: st.optional(st.string()),
description: st.optional(st.string()),
trigger_variables: st.optional(st.nullable(st.record(st.string(), st.string()))),
mode: st.enums(["single", "restart", "queued", "parallel"]),
})
+119
View File
@@ -0,0 +1,119 @@
import * as st from 'superstruct'
import { AutomationTimeString, AutomationTime } from './common'
const AutomationTriggerBase = {
alias: st.optional(st.string()),
id: st.optional(st.string()),
}
export const AutomationTriggerEvent = st.type({
...AutomationTriggerBase,
platform: st.literal('event'),
event_type: st.union([st.string(), st.array(st.string())]),
event_data: st.any(),
context: st.any(),
})
export const AutomationTriggerHA = st.type({
...AutomationTriggerBase,
platform: st.literal('homeassistant'),
event: st.enums(['start', 'shutdown']),
})
export const AutomationTriggerMQTT = st.type({
...AutomationTriggerBase,
platform: st.literal('mqtt'),
topic: st.string(),
payload: st.string(),
value_template: st.string(),
})
export const AutomationTriggerNumericState = st.type({
...AutomationTriggerBase,
platform: st.literal('numeric_state'),
entity_id: st.union([st.string(), st.array(st.string())]),
attribute: st.optional(st.string()),
value_template: st.optional(st.string()),
above: st.optional(st.string()),
below: st.optional(st.string()),
for: st.optional(AutomationTime),
})
export const AutomationTriggerState = st.type({
...AutomationTriggerBase,
platform: st.literal('state'),
entity_id: st.union([st.string(), st.array(st.string())]),
attribute: st.optional(st.string()),
from: st.optional(st.string()),
to: st.optional(st.string()),
for: st.optional(AutomationTime),
})
export const AutomationTriggerTag = st.type({
...AutomationTriggerBase,
platform: st.literal('tag'),
tag_id: st.string(),
device_id: st.union([st.string(), st.array(st.string())]),
})
export const AutomationTriggerTemplate = st.type({
...AutomationTriggerBase,
platform: st.literal('template'),
value_template: st.string(),
for: st.optional(AutomationTime),
})
export const AutomationTriggerTime = st.type({
...AutomationTriggerBase,
platform: st.literal('time'),
at: AutomationTimeString,
})
export const AutomationTriggerTimePattern = st.type({
...AutomationTriggerBase,
platform: st.literal('time_pattern'),
hours: st.optional(st.string()),
minutes: st.optional(st.string()),
seconds: st.optional(st.string()),
})
export const AutomationTriggerWebhook = st.type({
...AutomationTriggerBase,
platform: st.literal('webhook'),
webhook_id: st.string(),
})
export const AutomationTriggerZone = st.type({
...AutomationTriggerBase,
platform: st.literal('zone'),
entity_id: st.union([st.string(), st.array(st.string())]),
zone: st.string(),
event: st.enums(['enter', 'leave'])
})
export const AutomationTriggerDevice = st.type({
...AutomationTriggerBase,
platform: st.literal('device'),
entity_id: st.optional(st.string()),
device_id: st.string(),
domain: st.string(),
type: st.string(),
subtype: st.optional(st.string()),
})
export const AutomationTrigger = st.union([
AutomationTriggerEvent,
AutomationTriggerHA,
AutomationTriggerMQTT,
AutomationTriggerNumericState,
AutomationTriggerState,
AutomationTriggerTag,
AutomationTriggerTemplate,
AutomationTriggerTime,
AutomationTriggerTimePattern,
AutomationTriggerWebhook,
AutomationTriggerZone,
AutomationTriggerDevice
])
+98 -1
View File
@@ -1,9 +1,11 @@
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 => {
console.log({ node })
if ('condition' in node) { if ('condition' in node) {
return 'condition' return 'condition'
} else if ('platform' in node) { } else if ('platform' in node) {
@@ -79,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(':')
}
+2 -1
View File
@@ -5,7 +5,8 @@ export const useDelayEffect = (cb: () => void, deps: any[], timeout: number) =>
const fcn = useDelayedFunction(cb, timeout); const fcn = useDelayedFunction(cb, timeout);
useEffect(() => { useEffect(() => {
fcn() fcn()
}, [deps]) // eslint-disable-next-line
}, deps)
} }
export const useDelayedFunction = <FcnParams extends any[]>( export const useDelayedFunction = <FcnParams extends any[]>(
+14 -12
View File
@@ -5,27 +5,22 @@ interface Size {
width: number; width: number;
height: number; height: number;
ratioWbh: number; ratioWbh: number;
isMobile: boolean;
} }
// Hook // Hook
export default function useWindowSize(): Size { export default function useWindowSize(mobileRatioInd: number = 0.8): Size {
// Initialize state with undefined width/height so server and client renders match // Initialize state with undefined width/height so server and client renders match
// Learn more here: https://joshwcomeau.com/react/the-perils-of-rehydration/ // Learn more here: https://joshwcomeau.com/react/the-perils-of-rehydration/
const [windowSize, setWindowSize] = useState<Size>({ const [windowSize, setWindowSize] = useState<Size>(makeUpdate(window, mobileRatioInd));
width: window.innerWidth,
height: window.innerHeight,
ratioWbh: window.innerWidth / window.innerHeight,
});
// alias
useEffect(() => { useEffect(() => {
// Handler to call on window resize // Handler to call on window resize
function handleResize() { function handleResize() {
// Set window width/height to state // Set window width/height to state
setWindowSize({ setWindowSize(makeUpdate(window, mobileRatioInd));
width: window.innerWidth,
height: window.innerHeight,
ratioWbh: window.innerWidth / window.innerHeight,
});
} }
// Add event listener // Add event listener
@@ -36,7 +31,14 @@ export default function useWindowSize(): Size {
// Remove event listener on cleanup // Remove event listener on cleanup
return () => window.removeEventListener("resize", handleResize); return () => window.removeEventListener("resize", handleResize);
}, []); // Empty array ensures that effect is only run on mount }, [mobileRatioInd]); // Empty array ensures that effect is only run on mount
return windowSize; return windowSize;
} }
const makeUpdate = (w: Window, mobileRatioInd: number): Size => ({
width: w.innerWidth,
height: w.innerHeight,
ratioWbh: w.innerWidth / w.innerHeight,
isMobile: w.innerWidth / w.innerHeight <= mobileRatioInd,
})
+5
View File
@@ -15937,6 +15937,11 @@ stylehacks@^4.0.0:
postcss "^7.0.0" postcss "^7.0.0"
postcss-selector-parser "^3.0.0" postcss-selector-parser "^3.0.0"
superstruct@^0.15.4:
version "0.15.4"
resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.15.4.tgz#e3381dd84ca07e704e19f69eda74eee1a5efb1f9"
integrity sha512-eOoMeSbP9ZJChNOm/9RYjE+F36rYR966AAqeG3xhQB02j2sfAUXDp4EQ/7bAOqnlJnuFDB8yvOu50SocvKpUEw==
supports-color@^5.3.0: supports-color@^5.3.0:
version "5.5.0" version "5.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"