Compare commits

...
11 Commits
Author SHA1 Message Date
ari ca1fcc9189 0.0.14 2022-05-13 17:26:17 -04:00
ari 33e0c7871c cleand up webapp for building 2022-05-13 17:20:25 -04:00
ari d07cfa8b61 updated api 2022-05-13 17:15:13 -04:00
ari ef876a1c0a cleaned up styling for editor 2022-05-13 16:29:27 -04:00
ari aa9755b003 cleaned up multinode stlying 2022-05-12 17:45:10 -04:00
ari e1c983e1d1 cleaned up styling 2022-05-12 16:31:30 -04:00
ari 38baac3acc fixed test 2022-05-09 22:31:30 -04:00
ari 7ff5db3fa0 Added Gear Icon 2022-05-09 22:30:15 -04:00
ari 021fa2b651 no more $smType in webapp 2022-05-09 22:14:51 -04:00
ari 47bf511bbf removed $smType for conditions and trigger 2022-05-09 21:41:49 -04:00
ari ebd99c80a3 cleaned up types 2022-05-09 20:55:59 -04:00
100 changed files with 2233 additions and 2057 deletions

No files matched your search

+1
View File
@@ -0,0 +1 @@
{"buildTargets":["local_logs","local_ps","local_run","local_stop"],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}}
+8
View File
@@ -0,0 +1,8 @@
make --dry-run --always-make --keep-going --print-directory
make: Entering directory '/home/ari/Projects/Shortumation'
docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml build
docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml up -d
sleep 1
docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml ps
make: Leaving directory '/home/ari/Projects/Shortumation'
+362
View File
@@ -0,0 +1,362 @@
make all --print-data-base --no-builtin-variables --no-builtin-rules --question
make: *** No rule to make target 'all'. Stop.
# GNU Make 4.3
# Built for x86_64-pc-linux-gnu
# Copyright (C) 1988-2020 Free Software Foundation, Inc.
# License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
# This is free software: you are free to change and redistribute it.
# There is NO WARRANTY, to the extent permitted by law.
# Make data base, printed on Fri May 13 17:20:44 2022
# Variables
# environment
GDK_BACKEND = x11
# environment
LC_ALL = C
# environment
NO_AT_BRIDGE = 1
# environment
PNPM_HOME = /home/ari/.local/share/pnpm
# environment
GTK_RC_FILES = /etc/gtk/gtkrc:/home/ari/.gtkrc:/home/ari/.config/gtkrc
# environment
VSCODE_IPC_HOOK_EXTHOST = /run/user/1000/vscode-ipc-f9d84edd-b084-4e53-beee-9f25f2f79698.sock
# environment
KONSOLE_DBUS_SERVICE = :1.8038
# environment
LC_NAME = en_CA.UTF-8
# environment
LC_NUMERIC = en_CA.UTF-8
# environment
VSCODE_CWD = /home/ari/Projects/Shortumation
# environment
WINDOWID = 1
# environment
LC_ADDRESS = en_CA.UTF-8
# default
MAKE_COMMAND := make
# automatic
@D = $(patsubst %/,%,$(dir $@))
# environment
GDK_DPI_SCALE = 1
# environment
KONSOLE_VERSION = 211203
# environment
VSCODE_HANDLES_UNCAUGHT_ERRORS = true
# default
.VARIABLES :=
# environment
PWD = /home/ari/Projects/Shortumation
# automatic
%D = $(patsubst %/,%,$(dir $%))
# environment
LSCOLORS = Gxfxcxdxbxegedabagacad
# environment
MAIL = /var/spool/mail/ari
# environment
OLDPWD = /home/ari/Projects/Shortumation/api
# environment
KONSOLE_DBUS_WINDOW = /Windows/1
# automatic
^D = $(patsubst %/,%,$(dir $^))
# environment
VSCODE_LOG_STACK = false
# automatic
%F = $(notdir $%)
# environment
VSCODE_CODE_CACHE_PATH = /home/ari/.config/Code/CachedData/57fd6d0195bb9b9d1b49f6da5db789060795de47
# environment
XDG_SESSION_PATH = /org/freedesktop/DisplayManager/Session1
# environment
LANG = C
# environment
XAUTHORITY = /run/user/1000/xauth_ejBDkJ
# default
.LOADED :=
# default
.INCLUDE_DIRS = /usr/include /usr/local/include /usr/include
# environment
COLORFGBG = 15;0
# makefile
MAKEFLAGS = pqrR
# environment
PLASMA_USE_QT_SCALING = 1
# makefile
CURDIR := /home/ari/Projects/Shortumation
# environment
VSCODE_PIPE_LOGGING = true
# environment
APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL = true
# automatic
*D = $(patsubst %/,%,$(dir $*))
# environment
PAM_KWALLET5_LOGIN = /run/user/1000/kwallet5.socket
# environment
MFLAGS = -pqrR
# default
.SHELLFLAGS := -c
# environment
QT_LINUX_ACCESSIBILITY_ALWAYS_ON = 1
# environment
WAYLAND_DISPLAY = wayland-0
# environment
XDG_CONFIG_DIRS = /home/ari/.config/kdedefaults:/etc/xdg
# automatic
+D = $(patsubst %/,%,$(dir $+))
# environment
XCURSOR_THEME = breeze_cursors
# environment
XDG_SESSION_DESKTOP = KDE
# makefile (from 'Makefile', line 1)
MAKEFILE_LIST := Makefile
# automatic
@F = $(notdir $@)
# environment
VSCODE_VERBOSE_LOGGING = true
# environment
VSCODE_PID = 164826
# environment
XDG_SESSION_TYPE = wayland
# automatic
?D = $(patsubst %/,%,$(dir $?))
# environment
SESSION_MANAGER = local/ari-laptop:@/tmp/.ICE-unix/1646,unix/ari-laptop:/tmp/.ICE-unix/1646
# automatic
*F = $(notdir $*)
# environment
CHROME_DESKTOP = code-url-handler.desktop
# environment
DBUS_SESSION_BUS_ADDRESS = unix:path=/run/user/1000/bus
# automatic
<D = $(patsubst %/,%,$(dir $<))
# environment
VSCODE_NLS_CONFIG = {"locale":"en-gb","availableLanguages":{},"_languagePackSupport":true}
# default
MAKE_HOST := x86_64-pc-linux-gnu
# makefile
SHELL = /bin/sh
# default
MAKECMDGOALS := all
# environment
XDG_ACTIVATION_TOKEN = kwin-5
# environment
SHLVL = 2
# environment
PROFILEHOME =
# environment
MAKELEVEL := 0
# default
MAKE = $(MAKE_COMMAND)
# environment
PATH = /home/ari/.local/share/pnpm:/home/ari/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/home/ari/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/home/ari/.local/bin:/home/ari/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/usr/lib/servo:/home/ari/.local/share/coursier/bin:/usr/local/go/bin
# environment
NIX_SSL_CERT_FILE = /etc/ssl/certs/ca-certificates.crt
# default
MAKEFILES :=
# environment
LANGUAGE =
# environment
LC_MONETARY = en_CA.UTF-8
# environment
MOTD_SHOWN = pam
# automatic
^F = $(notdir $^)
# environment
LC_TIME = en_CA.UTF-8
# environment
VSCODE_LOG_NATIVE = false
# environment
LC_TELEPHONE = en_CA.UTF-8
# environment
GDK_SCALE = 1
# automatic
?F = $(notdir $?)
# environment
KDE_APPLICATIONS_AS_SCOPE = 1
# makefile (from 'Makefile', line 1)
DC = docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
# environment
XDG_SEAT = seat0
# environment
XDG_CURRENT_DESKTOP = KDE
# environment
LS_COLORS = rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.webp=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:
# automatic
+F = $(notdir $+)
# environment
XDG_SEAT_PATH = /org/freedesktop/DisplayManager/Seat0
# environment
LESS = -R
# environment
DESKTOP_SESSION = plasmawayland
# environment
ORIGINAL_XDG_CURRENT_DESKTOP = KDE
# 'override' directive
GNUMAKEFLAGS :=
# environment
LOGNAME = ari
# environment
XDG_VTNR = 2
# makefile
.DEFAULT_GOAL := local_run
# environment
SYSTEMD_EXEC_PID = 1544
# environment
DISPLAY = :1
# environment
USER = ari
# default
MAKE_VERSION := 4.3
# environment
KDE_SESSION_UID = 1000
# environment
NIX_PROFILES = /nix/var/nix/profiles/default /home/ari/.nix-profile
# environment
KONSOLE_DBUS_SESSION = /Sessions/2
# environment
QT_WAYLAND_FORCE_DPI = 96
# environment
LC_MEASUREMENT = en_CA.UTF-8
# environment
XKB_DEFAULT_LAYOUT = us
# environment
PAGER = less
# environment
_ = /usr/bin/make
# environment
LC_PAPER = en_CA.UTF-8
# environment
XDG_RUNTIME_DIR = /run/user/1000
# environment
COLORTERM = truecolor
# environment
XDG_SESSION_CLASS = user
# environment
VSCODE_AMD_ENTRYPOINT = vs/workbench/api/node/extensionHostProcess
# environment
GTK2_RC_FILES = /etc/gtk-2.0/gtkrc:/home/ari/.gtkrc-2.0:/home/ari/.config/gtkrc-2.0
# environment
HOME = /home/ari
# environment
ELECTRON_RUN_AS_NODE = 1
# environment
VSCODE_IPC_HOOK = /run/user/1000/vscode-76568338-1.67.0-main.sock
# environment
TERM = xterm-256color
# environment
XDG_SESSION_ID = 2
# environment
XCURSOR_SIZE = 24
# default
.RECIPEPREFIX :=
# automatic
<F = $(notdir $<)
# default
SUFFIXES :=
# environment
QT_AUTO_SCREEN_SCALE_FACTOR = 0
# environment
VSCODE_CLI = 1
# environment
ELECTRON_NO_ATTACH_CONSOLE = 1
# environment
SHELL_SESSION_ID = e4f012979f714ed4b074886cbaddcbcd
# environment
KDE_SESSION_VERSION = 5
# default
.FEATURES := target-specific order-only second-expansion else-if shortest-stem undefine oneshell nocomment grouped-target extra-prereqs archives jobserver output-sync check-symlink guile load
# environment
KDE_FULL_SESSION = true
# environment
LC_IDENTIFICATION = en_CA.UTF-8
# variable set hash-table stats:
# Load=130/1024=13%, Rehash=0, Collisions=12/160=8%
# Pattern-specific Variable Values
# No pattern-specific variable values.
# Directories
# . (device 66306, inode 17047758): 19 files, no impossibilities.
# 19 files, no impossibilities in 1 directories.
# Implicit Rules
# No implicit rules.
# Files
local_run:
# Implicit rule search has not been done.
# Modification time never checked.
# File has not been updated.
# recipe to execute (from 'Makefile', line 4):
$(DC) build
$(DC) up -d
sleep 1
$(DC) ps
# Not a target:
Makefile:
# Implicit rule search has been done.
# Last modified 2022-04-13 11:23:36.575524961
# File has been updated.
# Successfully updated.
local_ps:
# Implicit rule search has not been done.
# Modification time never checked.
# File has not been updated.
# recipe to execute (from 'Makefile', line 13):
$(DC) ps
# Not a target:
.DEFAULT:
# Implicit rule search has not been done.
# Modification time never checked.
# File has not been updated.
# Not a target:
all:
# Command line target.
# Implicit rule search has been done.
# File does not exist.
# File has not been updated.
local_logs:
# Implicit rule search has not been done.
# Modification time never checked.
# File has not been updated.
# recipe to execute (from 'Makefile', line 10):
$(DC) logs -f
local_stop:
# Implicit rule search has not been done.
# Modification time never checked.
# File has not been updated.
# recipe to execute (from 'Makefile', line 17):
$(DC) stop
# files hash-table stats:
# Load=8/1024=1%, Rehash=0, Collisions=0/18=0%
# VPATH Search Paths
# No 'vpath' search paths.
# No general ('VPATH' variable) search path.
# strcache buffers: 1 (0) / strings = 28 / storage = 296 B / avg = 10 B
# current buf: size = 8162 B / used = 296 B / count = 28 / avg = 10 B
# strcache performance: lookups = 36 / hit rate = 22%
# hash-table stats:
# Load=28/8192=0%, Rehash=0, Collisions=0/36=0%
# Finished Make data base on Fri May 13 17:20:44 2022
+5
View File
@@ -1,5 +1,10 @@
# Changelog
## [0.0.14] - Using vanila ha yaml
- Supporing vanilla out of the box HA yaml as oppose to parsing them (no more $smType)
- Conditions have now a more a explicit node
## [0.0.13] - Better Styling with react-flow
- Fixed up styling (using react-flow)
+25 -14
View File
@@ -1,10 +1,7 @@
from itertools import chain
from typing import Iterable, Iterator
from typing import Iterator, Union
from pydantic.error_wrappers import ValidationError
from src.automations.tags import TagManager
from src.json_serializer import normalize_obj
from .types import AutomationData, AutomationMetdata, ExtenededAutomationData
from .parsers import _parse_actions
from .types import AutomationMetdata, ExtenededAutomationData
from .errors import InvalidAutomationFile
# Single loader
@@ -25,16 +22,30 @@ def load_automation(
try:
yield ExtenededAutomationData(
metadata=AutomationMetdata.parse_obj(auto_raw),
sequence=list(
_parse_actions(
chain(
auto_raw.get("condition", []),
auto_raw.get("action", []),
)
)
),
trigger=[normalize_obj(obj) for obj in auto_raw.get("trigger", [])],
condition=load_conditions(auto_raw.get("condition", [])),
sequence=load_conditions(auto_raw.get("action", [])),
trigger=normalize_obj(auto_raw.get("trigger", [])),
tags=tags,
)
except ValidationError as err:
raise InvalidAutomationFile from err
def load_conditions(conditions: Union[dict, list, str]):
if isinstance(conditions, list):
return list(map(ensure_condition_dictionary, conditions))
else:
return [
ensure_condition_dictionary(conditions)
]
def ensure_condition_dictionary(c: Union[str, dict]):
c = normalize_obj(c)
if isinstance(c, str):
return {
"condition": "template",
"value_template": c
}
elif isinstance(c, dict):
return c
raise InvalidAutomationFile(f"Invalid type for condition object {c}")
-88
View File
@@ -1,88 +0,0 @@
from typing import Iterable, Union
from src.json_serializer import json_dumps, normalize_obj
from src.yaml_serializer.types import SecretValue, NOT_IMPLEMENTED_SV_MSG
from .types import AutomationActionNode, AutomationConditionNode
def _parse_actions(
raw_actions: Iterable[Union[dict, str]]
) -> Iterable[Union[AutomationActionNode, AutomationConditionNode]]:
for raw_c in raw_actions:
action_type = "unknown"
if isinstance(raw_c, str):
yield from _parse_conditions([raw_c])
continue
elif isinstance(raw_c, dict):
if raw_c.get("condition"):
yield from _parse_conditions([raw_c])
continue
elif raw_c.get("service"):
action_type = "service"
action_data = normalize_obj(raw_c)
elif raw_c.get("repeat"):
action_type = "repeat"
repeat_data = raw_c.pop("repeat")
action_data = {
**raw_c,
"repeat": {
"count": repeat_data.get("count", 0),
"sequence": list(_parse_actions(repeat_data.get("sequence", []))),
},
}
elif raw_c.get("wait_template"):
action_type = "wait"
action_data = normalize_obj(raw_c)
elif raw_c.get("event"):
action_type = "event"
action_data = normalize_obj(raw_c)
elif raw_c.get("type") and raw_c.get("device_id"):
action_type = "device"
action_data = normalize_obj(raw_c)
elif raw_c.get("choose"):
action_type = "choose"
choose_data = raw_c.pop("choose")
default_data = raw_c.pop("default", [])
action_data = {
**raw_c,
"choose": [
{
"conditions": list(_parse_conditions(option.get("conditions", []))),
"sequence": list(_parse_actions(option.get("sequence", []))),
}
for option in choose_data
],
"default": list(_parse_actions(default_data)),
}
else:
action_data = normalize_obj(raw_c)
yield AutomationActionNode(
action=action_type,
action_data=action_data,
)
def _parse_conditions(
raw_conditions: Iterable[Union[dict, str]]
) -> Iterable[AutomationConditionNode]:
for raw_c in raw_conditions:
if isinstance(raw_c, str):
yield AutomationConditionNode(
condition="template",
condition_data={"value_template": raw_c},
)
elif isinstance(raw_c, SecretValue):
yield AutomationConditionNode(
condition="template",
condition_data={"value_template": NOT_IMPLEMENTED_SV_MSG},
)
elif isinstance(raw_c, dict):
condition = raw_c.pop("condition")
yield AutomationConditionNode(
condition=condition,
condition_data=normalize_obj(raw_c),
)
else:
yield AutomationConditionNode(
condition="template",
condition_data=json_dumps(raw_c),
)
+5 -26
View File
@@ -2,28 +2,6 @@ from typing import Dict, List, Literal, Optional, Union
from pydantic.fields import Field
from pydantic import BaseModel
class AutomationConditionNode(BaseModel):
condition: str
condition_data: dict
node_type: Literal["condition"] = Field(alias="$smType", default="condition")
def to_primitive(self):
return {
**self.condition_data,
"condition": self.condition,
}
class AutomationActionNode(BaseModel):
action: str
action_data: dict
node_type: Literal["action"] = Field(alias="$smType", default="action")
def to_primitive(self):
return self.action_data
class AutomationMetdata(BaseModel):
id: str
alias: Optional[str] = None
@@ -35,14 +13,15 @@ class AutomationMetdata(BaseModel):
class AutomationData(BaseModel):
metadata: AutomationMetdata
trigger: List[dict] = []
sequence: List[Union[AutomationConditionNode, AutomationActionNode]] = []
condition: List[dict] = []
sequence: List[dict] = []
def to_primitive(self):
return {
**self.metadata.dict(),
**self.metadata.dict(exclude_unset=True, exclude_none=True),
"trigger": self.trigger,
"condition": [],
"action": [action.to_primitive() for action in self.sequence],
"condition": self.condition,
"action": self.sequence,
}
class ExtenededAutomationData(AutomationData):
+4 -2
View File
@@ -10,8 +10,10 @@ def find_hass_config() -> HassConfig:
if config("USE_EXAMPLE_REPO", False, cast=bool):
print("using USE_EXAMPLE_REPO")
from tests.utils import create_copy_of_example_config
return HassConfig(create_copy_of_example_config())
path = create_copy_of_example_config()
print("|-> ", path)
return HassConfig(path)
if "HASSIO_TOKEN" in os.environ:
return HassConfig(Path("/config"))
+1 -1
View File
@@ -1,5 +1,5 @@
import json
from typing import Any
from typing import Any, List
def json_dumps(obj: Any) -> str:
@@ -0,0 +1,77 @@
0:
Type: HA
1:
Type: HA
2:
Type: Button
Room: Living
3:
Type: Button
Room: Kitchen
4:
Type: Button
Room: Kitchen
5:
Type: Button
Room: Kitchen
6:
Type: Button
Room: Kitchen
7:
Type: Button
Room: Living
8:
Type: Button
Room: Baby
9:
Type: Button
Room: Baby
10:
Type: Button
Room: Baby
11:
Type: Routine
Room: Baby
12:
Type: Routine
Room: Baby
13:
Type: Window
Room: Office
14:
Type: Door
Room: Balcony
15:
Type: Routine
16:
Type: Button
Room: Baby
17:
Type: Routine
18:
Type: Routine
19:
Type: Door
Room: Bedroom
20:
Type: Ensure Power
21:
Type: Ensure Power
22:
Type: Motion
Room: Office
23:
Type: Routine
Room: Baby
24:
Type: Climate
Climate: Heat
25:
Type: Climate
Climate: Time
26:
Type: Routine
27:
Type: Button
Room: Bedroom
BadOne: yes
+210
View File
@@ -1,3 +1,4 @@
from ruamel.yaml import YAML
from unittest import TestCase
from fastapi.testclient import TestClient
from src.api.app import make_app
@@ -110,6 +111,215 @@ class automation_update_tests(BaseTestCase):
self.assertNotEqual(original_auto, new_auto)
self.assertEqual(ExtenededAutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto)
def test_consistent_standard_1(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 15})
original_auto = resp.json()["data"][0]
original_auto['metadata']['alias'] = "I CHANGED!"
resp = self.client.post(
"/automations",
json={
"index": 15,
"data": original_auto,
},
)
self.assertEqual(resp.status_code, 200)
with (self.config_folder / "automations.yaml").open('r') as fp:
disk_data = dict(YAML().load(fp)[15])
trigger = list(map(dict, disk_data.pop('trigger')))
condition = disk_data.pop('condition')
action = list(map(dict, disk_data.pop('action')))
self.assertDictEqual(disk_data, {
"id": "1629422438707",
"alias": "I CHANGED!",
"description": "",
"mode": "single"
})
self.assertListEqual(trigger, [
{"platform": "time", "at": "input_datetime.vita_night_pump_time"}
])
self.assertListEqual(condition, [{
"conditions": [
{"condition": "time", "after": "input_datetime.vita_night_pump_time", "before": "00:00:00"},
{"condition": "time", "after": "00:00:00", "before": "06:00:00"}
],
"condition": "and"
}, ])
self.assertListEqual(action, [
{
"service": "light.turn_on",
"target": {
"entity_id": "light.bulb_staircase",
"area_id": "living_room"
},
"data": {
"brightness_pct": 40,
"transition": 15
}
}
])
def test_consistent_standard_2(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 27})
original_auto = resp.json()["data"][0]
original_auto['metadata']['alias'] = "I CHANGED!"
resp = self.client.post(
"/automations",
json={
"index": 27,
"data": original_auto,
},
)
self.assertEqual(resp.status_code, 200)
with (self.config_folder / "automations.yaml").open('r') as fp:
disk_data = dict(YAML().load(fp)[27])
trigger = list(map(dict, disk_data.pop('trigger')))
condition = disk_data.pop('condition')
action = list(map(dict, disk_data.pop('action')))
self.assertDictEqual(disk_data, {
"id": "1649947692702",
"alias": "I CHANGED!",
"description": "",
"mode": "single"
})
self.assertListEqual(trigger, [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_on",
"id": "turn_on"
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_off",
"id": "turn_off"
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_up",
"id": "dim_up"
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_down",
"id": "dim_down"
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_double_press",
"subtype": "turn_on",
"id": "up_dbclk"
}
])
self.assertListEqual(condition, [])
self.assertListEqual(action, [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "turn_off"
}
],
"sequence": [
{
"type": "turn_off",
"device_id": "das2qdasdasdasadaasd",
"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": "das2qdasdasdasadaasd"
}
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "dim_up"
}
],
"sequence": [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_increase"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "dim_down"
}
],
"sequence": [
{
"device_id": "das2qdasdasdasadaasd",
"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": "das2qdasdasdasadaasd"
}
}
]
}
],
"default": []
}
])
class automation_delete_tests(BaseTestCase):
def test_delete_some(self):
+11 -16
View File
@@ -1,7 +1,5 @@
from unittest import TestCase
from src.automations.types import (
AutomationActionNode,
AutomationConditionNode,
AutomationMetdata,
ExtenededAutomationData,
)
@@ -46,21 +44,18 @@ class loader_tests(TestCase):
mode="single",
),
trigger=[{"platform": "homeassistant", "event": "shutdown"}],
condition=[{
"condition": "template",
"value_template": "states(time.time) >= '10:00:00'",
}],
sequence=[
AutomationConditionNode(
condition="template",
condition_data={"value_template": "states(time.time) >= '10:00:00'"},
),
AutomationActionNode(
action="device",
action_data={
"device_id": NOT_IMPLEMENTED_SV_MSG,
"domain": "mobile_app",
"type": "notify",
"title": "Hassio Status",
"message": "Hassio Is turning off...",
},
),
{
"device_id": NOT_IMPLEMENTED_SV_MSG,
"domain": "mobile_app",
"type": "notify",
"title": "Hassio Status",
"message": "Hassio Is turning off...",
}
],
tags={}
),
@@ -1,222 +0,0 @@
from unittest import TestCase
from src.automations.types import (
AutomationActionNode,
AutomationConditionNode,
)
from src.automations.parsers import (
_parse_conditions,
_parse_actions,
)
from src.yaml_serializer.types import (
SecretValue,
NOT_IMPLEMENTED_SV_MSG,
)
class parser_tests(TestCase):
def test_various_condition_types(self):
raw_conditions = [
{"condition": "template", "value_template": "silly logic here"},
"silly logic here",
{"condition": "time", "after": "10:00:00", "weekday": ["mon", "tue"]},
{"condition": "what is this?", "wuba": "dub"},
SecretValue("supersecretcondition", "rm -rf ./*"),
]
expected_process = [
AutomationConditionNode(
condition="template",
condition_data={"value_template": "silly logic here"},
),
AutomationConditionNode(
condition="template",
condition_data={"value_template": "silly logic here"},
),
AutomationConditionNode(
condition="time",
condition_data={"after": "10:00:00", "weekday": ["mon", "tue"]},
),
AutomationConditionNode(
condition="what is this?",
condition_data={"wuba": "dub"},
),
AutomationConditionNode(
condition="template",
condition_data={"value_template": NOT_IMPLEMENTED_SV_MSG},
),
]
for expected, parsed in zip(expected_process, _parse_conditions(raw_conditions)):
self.assertEqual(parsed, expected)
def test_various_action_types(self):
raw_conditions = [
{"condition": "template", "value_template": "silly logic here"},
"silly logic here",
{"condition": "time", "after": "10:00:00", "weekday": ["mon", "tue"]},
{
"service": "light.turn_on",
"target": ["light.kitchen"],
"data": {"brightness": 10},
},
{"something": "is wrong"},
{
"alias": "Doing amazing things!",
"repeat": {
"count": 1000,
"sequence": [
"conditionA",
{
"wait_template": "states('light.kitchen') == 'off",
"timeout": 10,
},
{
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
],
},
},
{"event": "custom-event", "event_data": "wow"},
{
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
{
"alias": "Doing amazing things!",
"choose": [
{
"conditions": [
r"{{ states('switch.plug_out_bug_lamp') == 'unavailable'}}",
],
"sequence": [
"conditionA",
{
"wait_template": "states('light.kitchen') == 'off",
"timeout": 10,
},
{
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
],
}
],
"default": [{"event": "nope", "event_data": {}}],
},
]
expected_process = [
AutomationConditionNode(
condition="template",
condition_data={"value_template": "silly logic here"},
),
AutomationConditionNode(
condition="template",
condition_data={"value_template": "silly logic here"},
),
AutomationConditionNode(
condition="time",
condition_data={"after": "10:00:00", "weekday": ["mon", "tue"]},
),
AutomationActionNode(
action="service",
action_data={
"service": "light.turn_on",
"target": ["light.kitchen"],
"data": {"brightness": 10},
},
),
AutomationActionNode(action="unknown", action_data={"something": "is wrong"}),
AutomationActionNode(
action="repeat",
action_data={
"alias": "Doing amazing things!",
"repeat": {
"count": 1000,
"sequence": [
AutomationConditionNode(
condition="template",
condition_data={"value_template": "conditionA"},
),
AutomationActionNode(
action="wait",
action_data={
"wait_template": "states('light.kitchen') == 'off",
"timeout": 10,
},
),
AutomationActionNode(
action="device",
action_data={
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
),
],
},
},
),
AutomationActionNode(
action="event",
action_data={"event": "custom-event", "event_data": "wow"},
),
AutomationActionNode(
action="device",
action_data={
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
),
AutomationActionNode(
action="choose",
action_data={
"alias": "Doing amazing things!",
"choose": [
{
"conditions": [
AutomationConditionNode(
condition="template",
condition_data={
"value_template": r"{{ states('switch.plug_out_bug_lamp') == 'unavailable'}}"
},
)
],
"sequence": [
AutomationConditionNode(
condition="template",
condition_data={"value_template": "conditionA"},
),
AutomationActionNode(
action="wait",
action_data={
"wait_template": "states('light.kitchen') == 'off",
"timeout": 10,
},
),
AutomationActionNode(
action="device",
action_data={
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
),
],
}
],
"default": [
AutomationActionNode(
action="event",
action_data={"event": "nope", "event_data": {}},
)
],
},
),
]
for expected, parsed in zip(expected_process, _parse_actions(raw_conditions)):
self.assertEqual(parsed, expected)
+2 -1
View File
@@ -9,9 +9,10 @@ from src.yaml_serializer.types import (
SecretValue,
IncludedYamlDir,
)
from tests.utils import SAMPLES_FOLDER
class dumping_yamls_tests(TestCase):
def test_dumping_includes(self):
yaml = dump_yaml(
{
+1 -1
View File
@@ -1,5 +1,5 @@
name: Shortumation
version: 0.0.13
version: 0.0.14
slug: shortumation
url: "https://github.com/asosnovsky/Shortumation"
description: "A homeassitant addon which provides better UI for automations & scripts."
+6 -2
View File
@@ -40,13 +40,17 @@
- id: shortu-2
alias: Neat trick
description: ''
trigger_variables:
mode: queued
trigger: []
condition: []
action:
- alias: Choose
default: []
default:
- condition: and
alias: ''
conditions:
- condition: or
conditions: []
choose: []
- service: lights.turn_on
target:
-1
View File
@@ -8,7 +8,6 @@
"@types/node": "^12.0.0",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"chroma-js": "^2.1.2",
"jss": "^10.8.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
@@ -1,6 +1,6 @@
import "./AutoInfoBox.css";
import { AutomationMetadata } from "types/automations";
import InputList from "components/Inputs/InputList";
import { InputList } from "components/Inputs/InputList";
import InputText from "components/Inputs/InputText";
import InputTextArea from "components/Inputs/InputTextArea";
import { FC, useRef, useState } from 'react';
@@ -10,16 +10,7 @@ export default {
component: AutomationEditor,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
dims: {
nodeHeight: dgconst.NODE_HEIGHT,
nodeWidth: dgconst.NODE_WIDTH,
distanceFactor: dgconst.DISTANCE_FACTOR,
circleSize: dgconst.CIRCLE_SIZE,
padding: {
x: dgconst.PADDING,
y: dgconst.PADDING,
},
}
dims: dgconst.DEFAULT_DIMS
}
} as ComponentMeta<typeof AutomationEditor>
@@ -43,6 +34,7 @@ export const Simple = Template.bind({})
Simple.args = {
...Simple.args,
automation: {
condition: [],
tags: {
"Room": "Bathroom",
"For": "Toliet",
@@ -60,53 +52,38 @@ Simple.args = {
},
trigger: [
{
"$smType": undefined,
"platform": "numeric_state",
"entity_id": "test",
},
{
"$smType": undefined,
"platform": "homeassistant",
"event": "start",
}
],
sequence: [
{
$smType: "condition",
condition: 'and',
condition_data: {
conditions: [
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.temperature_kitchen',
below: '15',
}
},
{
$smType: "condition",
condition: 'template',
condition_data: {
value_template: 'states(switch.kitchen_light) == "on"'
}
}
]
}
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.temperature_kitchen',
below: '15',
},
{
condition: 'template',
value_template: 'states(switch.kitchen_light) == "on"'
}
]
},
{
$smType: "action",
action: "service",
action_data: {
alias: "Start Music In Kitchen",
service: 'media_player.play_media',
target: {
entity_id: "media_player.kitchen_dot"
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
alias: "Start Music In Kitchen",
service: 'media_player.play_media',
target: {
entity_id: "media_player.kitchen_dot"
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
}
]
@@ -118,6 +95,7 @@ export const EmptyStart = Template.bind({})
EmptyStart.args = {
...EmptyStart.args,
automation: {
condition: [],
tags: {},
metadata: {
id: "random",
@@ -25,6 +25,7 @@ export const AutomationEditor: FC<Props> = ({
updateSequence,
updateTrigger,
updateMetadata,
updateCondition,
save,
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
@@ -64,8 +65,10 @@ export const AutomationEditor: FC<Props> = ({
className="automation-editor--flow-wrapper--flow"
sequence={state.data.sequence}
trigger={state.data.trigger}
condition={state.data.condition}
onSequenceUpdate={updateSequence}
onTriggerUpdate={updateTrigger}
onConditionUpdate={updateCondition}
dims={dims}
/>
</div>
@@ -18,7 +18,6 @@ export const useAutomatioEditorState = (
const [state, update] = useState<EditorState>({
status: "loading",
});
const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => (
data: D
) => state.status !== 'loading' && update({
@@ -41,6 +40,7 @@ export const useAutomatioEditorState = (
return {
updateTrigger: makeUpdate('trigger'),
updateSequence: makeUpdate('sequence'),
updateCondition: makeUpdate('condition'),
updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => {
if (state.status !== 'loading') {
update({
@@ -80,6 +80,7 @@ const genEditorData = (automation: AutomationData) => {
metadata,
trigger,
sequence,
condition,
} = automation;
const tags: [string, string][] = Object.keys(automation.tags).map(tagName => [tagName, automation.tags[tagName]]);
@@ -88,6 +89,7 @@ const genEditorData = (automation: AutomationData) => {
metadata,
trigger,
sequence,
condition,
tags,
}
}
@@ -10,16 +10,7 @@ export default {
component: AutomationList,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
dims: {
nodeHeight: dgconst.NODE_HEIGHT,
nodeWidth: dgconst.NODE_WIDTH,
distanceFactor: dgconst.DISTANCE_FACTOR,
circleSize: dgconst.CIRCLE_SIZE,
padding: {
x: dgconst.PADDING,
y: dgconst.PADDING,
},
}
dims: dgconst.DEFAULT_DIMS
}
} as ComponentMeta<typeof AutomationList>;
@@ -5,6 +5,7 @@ import { createMockAuto } from 'utils/mocks';
test('group automations', () => {
const automations: AutomationData[] = [
{
condition: [],
metadata: {
id: '1',
alias: '',
@@ -19,6 +20,7 @@ test('group automations', () => {
trigger: [],
},
{
condition: [],
metadata: {
id: '2',
alias: '',
@@ -33,6 +35,7 @@ test('group automations', () => {
trigger: [],
},
{
condition: [],
metadata: {
id: '3',
alias: '',
@@ -2,23 +2,14 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { ConnectedAutomationList } from ".";
import { createMockAuto } from "utils/mocks";
import { useMockApiService } from "apiService";
import * as dgconst from 'components/DAGSvgs/constants';
import { DEFAULT_DIMS } from 'components/DAGSvgs/constants';
export default {
title: 'App/AutomationList/Connected',
component: ConnectedAutomationList,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
dims: {
nodeHeight: dgconst.NODE_HEIGHT,
nodeWidth: dgconst.NODE_WIDTH,
distanceFactor: dgconst.DISTANCE_FACTOR,
circleSize: dgconst.CIRCLE_SIZE,
padding: {
x: dgconst.PADDING,
y: dgconst.PADDING,
},
},
dims: DEFAULT_DIMS,
initialAutomations: [],
}
} as ComponentMeta<typeof ConnectedAutomationList>;
@@ -12,48 +12,32 @@ export default {
export const Basic: ComponentStory<typeof ConditionEditor> = args => {
const [state, setState] = useState<AutomationCondition>({
"$smType": "condition",
"condition": "or",
"condition_data": {
"conditions": [
{
"$smType": "condition",
"condition": "and",
"condition_data": {
"conditions": [
{
"$smType": "condition",
"condition": "numeric_state",
"condition_data": {
"entity_id": [
"sensor.kitchen_humidity"
],
"conditions": [],
"above": "40"
}
},
{
"$smType": "condition",
"condition": "template",
"condition_data": {
"value_template": "states('switch.kitchen') == 'on'"
}
}
]
}
},
{
"$smType": "condition",
"condition": "numeric_state",
"condition_data": {
"conditions": [
{
"condition": "and",
"conditions": [
{
"condition": "numeric_state",
"entity_id": [
"sensor.kitchen_temperature"
"sensor.kitchen_humidity"
],
"above": "51"
"above": "40"
},
{
"condition": "template",
"value_template": "states('switch.kitchen') == 'on'"
}
}
]
}
]
},
{
"condition": "numeric_state",
"entity_id": [
"sensor.kitchen_temperature"
],
"above": "51"
}
]
})
return (
<div className="page">
@@ -3,7 +3,7 @@ import { FC, useState, useEffect } from 'react';
import { getConditionDefaultValues } from "utils/defaults";
import { AutomationCondition } from "types/automations/conditions";
import { CheckMarkIcon, PencilIcon } from "components/Icons";
import InputList from "components/Inputs/InputList";
import { InputList } from "components/Inputs/InputList";
import InputYaml from "components/Inputs/InputYaml";
import { getEditor } from "./editorRender";
import { useStyles } from "./style";
@@ -51,17 +51,10 @@ export const ConditionNode: FC<{
) {
onUpdate({
...condition,
$smType: 'condition',
condition_data: {
...condition.condition_data,
conditions: condition.condition_data.conditions.concat({
$smType: 'condition',
condition: 'or',
condition_data: {
conditions: []
}
})
}
conditions: condition.conditions.concat({
condition: 'or',
conditions: []
})
})
}
}
@@ -69,20 +62,10 @@ export const ConditionNode: FC<{
let childrenConditions: JSX.Element;
if (effectiveDM) {
const Viewer = getViewer(condition);
childrenConditions = <Viewer condition={condition} onChange={data => {
onUpdate({
...data,
$smType: 'condition',
})
}} />
childrenConditions = <Viewer condition={condition} onChange={onUpdate} />
} else {
const Editor = getEditor(condition);
childrenConditions = <Editor condition={condition} onChange={data => {
onUpdate({
...data,
$smType: 'condition',
})
}} />
childrenConditions = <Editor condition={condition} onChange={onUpdate} />
}
// styles
let hasChildren = false;
@@ -115,13 +98,10 @@ export const ConditionNode: FC<{
'trigger',
'zone',
]}
onChange={n => onUpdate({
$smType: 'condition',
onChange={(n: any) => onUpdate({
...getConditionDefaultValues(n),
...condition,
condition: n,
condition_data: {
...getConditionDefaultValues(n),
...condition.condition_data,
}
} as any)}
/>
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
@@ -134,11 +114,8 @@ export const ConditionNode: FC<{
<div className={classes.children}>
{yamlMode && <InputYaml
label=""
value={condition.condition_data}
onChange={update => onUpdate({
...condition,
condition_data: update as any
})}
value={condition}
onChange={update => onUpdate(update as any)}
resizable
/>}
{!yamlMode && childrenConditions}
@@ -46,19 +46,13 @@ export const TemplateEditor: Editor<TemplateCondition> = ({
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
condition_data: {
...condition.condition_data,
alias
}
alias
})} />
<InputTextArea label="Template" value={condition.condition_data.value_template} onChange={value_template => onChange({
<InputTextArea label="Template" value={condition.value_template} onChange={value_template => onChange({
...condition,
condition_data: {
...condition.condition_data,
value_template
}
value_template
})} resizable />
</div>
}
@@ -69,58 +63,40 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
condition_data: {
...condition.condition_data,
alias
}
alias
})} />
<InputEntity
value={condition.condition_data.entity_id}
value={condition.entity_id}
onChange={entity_id => onChange({
...condition,
condition_data: {
...condition.condition_data,
entity_id
}
entity_id
})}
/>
<InputText label="Attribute" value={condition.condition_data.attribute ?? ""} onChange={attribute => onChange({
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
...condition,
condition_data: {
...condition.condition_data,
attribute
}
attribute
})} />
<InputNumber
label="Above"
value={condition.condition_data.above ? Number(condition.condition_data.above) : undefined}
value={condition.above ? Number(condition.above) : undefined}
onChange={above => onChange({
...condition,
condition_data: {
...condition.condition_data,
above: above ? String(above) : undefined,
}
above: above ? String(above) : undefined,
})}
/>
<InputNumber
label="Below"
value={condition.condition_data.below ? Number(condition.condition_data.below) : undefined}
value={condition.below ? Number(condition.below) : undefined}
onChange={below => onChange({
...condition,
condition_data: {
...condition.condition_data,
below: below ? String(below) : undefined,
}
below: below ? String(below) : undefined,
})}
/>
<InputTextArea label="Template" value={condition.condition_data.value_template ?? ""} onChange={value_template => onChange({
<InputTextArea label="Template" value={condition.value_template ?? ""} onChange={value_template => onChange({
...condition,
condition_data: {
...condition.condition_data,
value_template
}
value_template
})} resizable />
</div>
}
@@ -132,7 +108,7 @@ export const LogicViewer: Editor<LogicCondition> = ({
}) => {
return <>
{condition.condition_data.conditions.map((c, i) => {
{condition.conditions.map((c, i) => {
return <ConditionNode
key={i}
condition={c}
@@ -151,50 +127,35 @@ export const StateEditor: Editor<StateCondition> = ({
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
condition_data: {
...condition.condition_data,
alias
}
alias
})} />
<InputEntity
value={condition.condition_data.entity_id}
value={condition.entity_id}
onChange={entity_id => onChange({
...condition,
condition_data: {
...condition.condition_data,
entity_id
}
entity_id
})}
/>
<InputText label="Attribute" value={condition.condition_data.attribute ?? ""} onChange={attribute => onChange({
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
...condition,
condition_data: {
...condition.condition_data,
attribute
}
attribute
})} />
<InputText
label="State"
value={String(condition.condition_data.state)}
value={String(condition.state)}
onChange={state => onChange({
...condition,
condition_data: {
...condition.condition_data,
state,
}
state,
})}
/>
<InputTime
label="For"
value={condition.condition_data.for}
value={condition.for}
onChange={_for => onChange({
...condition,
condition_data: {
...condition.condition_data,
for: _for,
}
for: _for,
})}
/>
</div>
@@ -205,36 +166,27 @@ export const TimeEditor: Editor<TimeCondition> = ({
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
condition_data: {
...condition.condition_data,
alias
}
alias
})} />
<InputTime
label="After"
value={condition.condition_data.after}
value={condition.after}
onChange={after => onChange({
...condition,
condition_data: {
...condition.condition_data,
after,
}
after,
})}
/>
<InputTime
label="Before"
value={condition.condition_data.before}
value={condition.before}
onChange={before => onChange({
...condition,
condition_data: {
...condition.condition_data,
before,
}
before,
})}
/>
<b>Weekday not support for no, use yaml for now</b> {condition.condition_data.weekday}
<b>Weekday not support for no, use yaml for now</b> {condition.weekday}
</div>
}
@@ -243,19 +195,13 @@ export const TriggerEditor: Editor<TriggerCondition> = ({
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
condition_data: {
...condition.condition_data,
alias
}
alias
})} />
<InputText label="Trigger ID" value={condition.condition_data.id} onChange={id => onChange({
<InputText label="Trigger ID" value={condition.id} onChange={id => onChange({
...condition,
condition_data: {
...condition.condition_data,
id
}
id
})} />
</div>
}
@@ -265,39 +211,27 @@ export const ZoneEditor: Editor<ZoneCondition> = ({
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
condition_data: {
...condition.condition_data,
alias
}
alias
})} />
<InputText label="Zone" value={condition.condition_data.zone} onChange={zone => onChange({
<InputText label="Zone" value={condition.zone} onChange={zone => onChange({
...condition,
condition_data: {
...condition.condition_data,
zone
}
zone
})} />
<InputEntity
value={condition.condition_data.entity_id}
value={condition.entity_id}
onChange={entity_id => onChange({
...condition,
condition_data: {
...condition.condition_data,
entity_id
}
entity_id
})}
/>
<InputText
label="State"
value={String(condition.condition_data.state)}
value={String(condition.state)}
onChange={state => onChange({
...condition,
condition_data: {
...condition.condition_data,
state,
}
state,
})}
/>
</div>
@@ -27,11 +27,8 @@ const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }
export const TemplateViewer = Template.bind({})
TemplateViewer.args = {
condition: {
$smType: 'condition',
condition: 'template',
condition_data: {
value_template: "states('switch.light_kitchen') == 'on'"
}
value_template: "states('switch.light_kitchen') == 'on'"
} as AutomationCondition,
}
@@ -39,63 +36,42 @@ TemplateViewer.args = {
export const NumericStateViewer = Template.bind({})
NumericStateViewer.args = {
condition: {
$smType: 'condition',
condition: "numeric_state",
condition_data: {
entity_id: "sensor.humidity_kitchen",
above: "10",
}
entity_id: "sensor.humidity_kitchen",
above: "10",
} as AutomationCondition,
}
export const LogicCondition = Template.bind({})
LogicCondition.args = {
condition: {
$smType: 'condition',
condition: 'or',
condition_data: {
conditions: [
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.humidity_kitchen',
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.humidity_kitchen',
above: '60'
},
{
condition: 'numeric_state',
entity_id: 'sensor.humidity_living_room',
above: '60'
},
{
condition: 'and',
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.humidity_bedroom',
above: '60'
},
{
condition: 'numeric_state',
entity_id: 'sensor.humidity_bathroom',
above: '60'
}
},
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.humidity_living_room',
above: '60'
}
},
{
$smType: 'condition',
condition: 'and',
condition_data: {
conditions: [
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.humidity_bedroom',
above: '60'
}
},
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.humidity_bathroom',
above: '60'
}
}
]
}
},
]
}
]
},
]
} as AutomationCondition,
}
@@ -2,30 +2,24 @@ import { AutomationCondition, LogicCondition } from "types/automations/condition
export const genUpdateMethods = (
condition: LogicCondition,
onChange: (c: LogicCondition) => void
condition: LogicCondition,
onChange: (c: LogicCondition) => void
) => (i: number) => ({
onUpdate: (update: AutomationCondition) => onChange({
...condition,
condition_data: {
...condition.condition_data,
conditions: [
...condition.condition_data.conditions.slice(0, i),
update,
...condition.condition_data.conditions.slice(i+1)
]
}
conditions: [
...condition.conditions.slice(0, i),
update,
...condition.conditions.slice(i + 1)
]
}),
onDelete: (which: 'root' | number) => {
if (which === 'root') {
onChange({
...condition,
condition_data: {
...condition.condition_data,
conditions: condition.condition_data.conditions.slice(0, i).concat(
condition.condition_data.conditions.slice(i+1)
)
}
conditions: condition.conditions.slice(0, i).concat(
condition.conditions.slice(i + 1)
)
})
} else {
throw new Error("Not Implemented")
+16 -18
View File
@@ -1,5 +1,4 @@
import { Styles } from "jss";
import Color from 'chroma-js';
import { createAppUseStyles } from "styles/theme";
export const useStyles = createAppUseStyles<{
@@ -26,9 +25,9 @@ export const useStyles = createAppUseStyles<{
padding: 0,
position: 'relative',
display: 'flex',
flexDirection: hasChildren? 'column' : 'row',
flexDirection: hasChildren ? 'column' : 'row',
}),
title: ({hasChildren}) => ({
title: ({ hasChildren }) => ({
display: 'flex',
border: hasChildren ? `1px solid ${theme.primaryAccent}` : 'none',
borderRadius: 10,
@@ -36,7 +35,7 @@ export const useStyles = createAppUseStyles<{
borderBottomLeftRadius: 0,
height: '100%',
}),
titleText: ({hasChildren}) => ({
titleText: ({ hasChildren }) => ({
background: theme.condition.primaryColor,
border: `1px solid ${theme.primaryAccent}`,
borderRadius: 10,
@@ -44,7 +43,6 @@ export const useStyles = createAppUseStyles<{
borderBottomRightRadius: 0,
borderBottomLeftRadius: hasChildren ? 0 : 10,
padding: 10,
maxWidth: 120,
minWidth: 30,
textOverflow: 'ellipsis',
textAlign: 'center',
@@ -57,9 +55,10 @@ export const useStyles = createAppUseStyles<{
left: -35,
top: 10,
},
modifyBtn: ({hasChildren}) => ({
modifyBtn: ({ hasChildren }) => ({
// styling
backgroundColor: theme.primary,
backgroundColor: theme.green,
color: theme.primary,
fill: theme.primaryAccent,
borderColor: theme.primaryAccent,
borderWidth: 1,
@@ -67,20 +66,19 @@ export const useStyles = createAppUseStyles<{
borderTopLeftRadius: 0,
borderBottomLeftRadius: 0,
cursor: 'pointer',
// positioning
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
padding: '0px 10px',
// position: hasChildren ? 'absolute' : 'block',
right: 1,
top: 10,
// on hover
"&:hover": {
backgroundColor: Color(theme.primary).brighten().hex(),
fill: Color(theme.primaryAccent).brighten().hex(),
backgroundColor: theme.greenLight,
fill: theme.primaryAccentLight,
},
"&:hover $icon": {
transform: "rotate(90deg)"
@@ -88,14 +86,14 @@ export const useStyles = createAppUseStyles<{
}),
icon: {},
deleteBtn,
children: ({hasChildren}) => ({
children: ({ hasChildren }) => ({
flex: 1,
paddingLeft: hasChildren ? 50 : 10,
paddingRight: hasChildren ? 0 : 10,
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
border: `1px solid ${theme.primaryAccent}`,
justifyContent: 'center',
border: `1px solid ${theme.secondaryAccent}`,
borderBottomRightRadius: hasChildren ? 10 : 0,
borderBottomLeftRadius: hasChildren ? 10 : 0,
minHeight: hasChildren ? undefined : '100%'
@@ -114,8 +112,8 @@ export const useStyles = createAppUseStyles<{
paddingRight: 20,
cursor: 'pointer',
"&:hover": {
backgroundColor: Color(theme.primary).brighten().hex(),
fill: Color(theme.primaryAccent).brighten().hex(),
backgroundColor: theme.primaryLight,
fill: theme.primaryAccentLight,
},
},
addBtn: {
@@ -131,8 +129,8 @@ export const useStyles = createAppUseStyles<{
paddingRight: 20,
cursor: 'pointer',
"&:hover": {
backgroundColor: Color(theme.primary).brighten().hex(),
fill: Color(theme.primaryAccent).brighten().hex(),
backgroundColor: theme.primaryLight,
fill: theme.primaryAccentLight,
},
}
}
@@ -34,7 +34,7 @@ export const LogicViewer: Viewer<LogicCondition> = ({
onChange,
}) => {
return <>
{condition.condition_data.conditions.map((c, i) => {
{condition.conditions.map((c, i) => {
return <ConditionNode key={i} condition={c} displayMode
{...genUpdateMethods(condition, onChange)(i)}
/>
+6 -13
View File
@@ -6,7 +6,6 @@ import { Handle, Position, XYPosition } from 'react-flow-renderer';
export interface DAGCircleProps {
onEdit?: () => void;
onAdd?: () => void;
onRemove?: () => void;
size: number,
@@ -28,7 +27,6 @@ export const makeFlowCircle = (
export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
data: {
size,
onEdit,
onAdd,
onRemove,
backgroundColor,
@@ -38,7 +36,7 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
}) => {
const { classes } = useCircleStyles({
size,
hasOnFunction: !!onEdit || !!onAdd,
hasOnFunction: !!onRemove || !!onAdd,
hasRemoveFunction: !!onRemove,
backgroundColor,
});
@@ -47,18 +45,13 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
{!disableTarget && <Handle type="target" position={Position.Left} />}
<div className={classes.root}>
{
onEdit ?
<PencilIcon
onAdd ?
<AddIcon
size={70} units="%"
className={classes.icon}
onClick={onEdit}
/> : onAdd ?
<AddIcon
size={70} units="%"
className={classes.icon}
onClick={onAdd}
/>
: backgroundColor ? "" : "else"
onClick={onAdd}
/>
: (backgroundColor || onRemove) ? "" : "else"
}
{onRemove ? <TrashIcon className={classes.trashIcon} onClick={onRemove} /> : <></>}
</div>
+6 -4
View File
@@ -1,4 +1,3 @@
import Color from "chroma-js";
import { PencilIcon } from "components/Icons"
import { NodeColor } from "types/graphs";
import { useNodeStyles } from "./styles";
@@ -14,22 +13,25 @@ export interface DAGNodeProps {
color: NodeColor;
label: string;
hasInput?: boolean;
accentBackground?: boolean;
}
export const DAGNode: FC<{ data: DAGNodeProps }> = ({
data: {
label,
height,
width,
onXClick = () => { },
onXClick,
onEditClick = () => { },
color,
hasInput = false,
accentBackground = false,
},
}) => {
const { classes, theme } = useNodeStyles({
color,
nodeHeight: height,
nodeWidth: width,
accentBackground,
});
return <>
{hasInput && <Handle type="target" position={Position.Left} />}
@@ -37,7 +39,7 @@ export const DAGNode: FC<{ data: DAGNodeProps }> = ({
<div className={classes.root}>
<div className={classes.inner}>
<div className={classes.leftEdge} onClick={onXClick}>
<button className={classes.buttonDelete}>X</button>
{!!onXClick && <button className={classes.buttonDelete}>X</button>}
</div>
<div className={classes.textWrap}>
<span className={classes.text} title={label}>
@@ -48,7 +50,7 @@ export const DAGNode: FC<{ data: DAGNodeProps }> = ({
console.log('editing me', label, onEditClick, onEditClick())
}}>
<button className={classes.buttonEdit}>
<PencilIcon size={1.1} color={Color(theme.primary).set('rgb.g', 200).hex()} />
<PencilIcon size={1.1} color={theme.green} />
</button>
</div>
</div>
@@ -0,0 +1,52 @@
import { makeFlowCircle } from "./DAGCircle"
import { DAGAutomationFlowDims, FlowData } from "./types"
import { XYPosition } from 'react-flow-renderer';
export const makeAddButton = (
id: string,
position: XYPosition,
{
circleSize,
}: DAGAutomationFlowDims,
onAdd: () => void,
disableTarget: boolean = true,
) => makeFlowCircle(
id,
position,
{
size: circleSize,
onAdd,
disableSource: true,
disableTarget,
}
)
export const makeConditionPoint = (
id: string,
position: XYPosition,
{
padding,
conditionWidth,
conditionHeight,
nodeWidth,
nodeHeight,
circleSize,
distanceFactor,
}: DAGAutomationFlowDims,
totalConditions: number,
onEditClick: () => void,
) => ({
id,
type: 'dagnode',
position,
data: {
size: circleSize,
color: 'lblue',
accentBackground: true,
label: `${totalConditions} Condition${totalConditions !== 1 ? 's' : ''}`,
height: conditionHeight,
width: conditionWidth,
hasInput: true,
onEditClick,
}
})
+116 -193
View File
@@ -12,16 +12,7 @@ export default {
component: DAGAutomationFlow,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
dims: {
nodeHeight: dgconst.NODE_HEIGHT,
nodeWidth: dgconst.NODE_WIDTH,
distanceFactor: dgconst.DISTANCE_FACTOR,
circleSize: dgconst.CIRCLE_SIZE,
padding: {
x: dgconst.PADDING,
y: dgconst.PADDING,
},
}
dims: dgconst.DEFAULT_DIMS
}
} as ComponentMeta<typeof DAGAutomationFlow>
@@ -29,8 +20,8 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
const [state, setState] = useState({
trigger: args.trigger,
sequence: args.sequence,
condition: args.condition,
})
console.log(state)
return <div className="page">
<DAGAutomationFlow
{...args}
@@ -40,6 +31,7 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
setState({ ...state, trigger })
}}
onSequenceUpdate={sequence => setState({ ...state, sequence })}
onConditionUpdate={condition => setState({ ...state, condition })}
/>
</div>
}
@@ -47,55 +39,41 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
export const Simple = Template.bind({})
Simple.args = {
...Simple.args,
condition: [],
trigger: [
{
"$smType": undefined,
"platform": "numeric_state",
"entity_id": "test",
},
{
"$smType": undefined,
"platform": "homeassistant",
"event": "start",
}
],
sequence: [
{
$smType: "condition",
condition: 'and',
condition_data: {
conditions: [
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.temperature_kitchen',
below: '15',
}
},
{
$smType: "condition",
condition: 'template',
condition_data: {
value_template: 'states(switch.kitchen_light) == "on"'
}
}
]
}
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.temperature_kitchen',
below: '15',
},
{
condition: 'template',
value_template: 'states(switch.kitchen_light) == "on"'
}
]
},
{
$smType: "action",
action: "service",
action_data: {
alias: "Start Music In Kitchen",
service: 'media_player.play_media',
target: {
entity_id: "media_player.kitchen_dot"
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
alias: "Start Music In Kitchen",
service: 'media_player.play_media',
target: {
entity_id: "media_player.kitchen_dot"
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
}
]
@@ -105,178 +83,123 @@ Simple.args = {
export const Complex = Template.bind({})
Complex.args = {
...Complex.args,
condition: [],
trigger: [
{
"$smType": undefined,
"platform": "numeric_state",
"entity_id": "test",
},
{
"$smType": undefined,
"platform": "homeassistant",
"event": "start",
}
],
sequence: [
{
"$smType": "condition",
"condition": "and",
"condition_data": {
"conditions": [
{
"$smType": "condition",
"condition": "numeric_state",
"condition_data": {
"entity_id": "sensor.temperature_kitchen",
"below": "15"
}
},
{
"$smType": "condition",
"condition": "template",
"condition_data": {
"value_template": "states(switch.kitchen_light) == \"on\""
}
}
]
}
},
{
"$smType": "action",
"action": "service",
"action_data": {
"alias": "Start Music In Kitchen",
"service": "media_player.play_media",
"target": {
"entity_id": "media_player.kitchen_dot"
"conditions": [
{
"condition": "numeric_state",
"entity_id": "sensor.temperature_kitchen",
"below": "15"
},
"data": {
"media_content_id": "Good Morning",
"media_content_type": "SPOTIFY"
{
"condition": "template",
"value_template": "states(switch.kitchen_light) == \"on\""
}
]
},
{
"alias": "Start Music In Kitchen",
"service": "media_player.play_media",
"target": {
"entity_id": "media_player.kitchen_dot"
},
"data": {
"media_content_id": "Good Morning",
"media_content_type": "SPOTIFY"
}
},
{
"$smType": "action",
"action": "choose",
"action_data": {
"choose": [
{
"conditions": [
{
"$smType": "condition",
"condition": "state",
"condition_data": {
"entity_id": "lights.bathroom",
"state": "off",
}
}
],
"sequence": [
{
"$smType": "action",
"action": "service",
"action_data": {
"service": "light.turn_on",
"target": {
"entity_id": "lights.bathroom"
},
"data": {}
}
},
{
"$smType": "action",
"action": "service",
"action_data": {
"alias": "Turn off bedroom",
"service": "light.turn_off",
"target": {
"entity_id": "lights.bedroom"
},
"data": {}
}
}
]
},
{
"conditions": [
{
"$smType": "condition",
"condition": "state",
"condition_data": {
"entity_id": "lights.bedroom",
"state": "off",
}
}
],
"sequence": [
{
"$smType": "action",
"action": "service",
"action_data": {
"alias": "Turn on bedroom",
"service": "light.turn_on",
"target": {
"entity_id": "lights.bedroom"
},
"data": {}
}
},
{
"$smType": "action",
"action": "choose",
"action_data": {
"choose": [
{
"conditions": [],
"sequence": [
{
"$smType": "action",
"action": "choose",
"action_data": {
"choose": [],
"default": [],
}
}
]
}
],
"default": [
{
"$smType": "action",
"action": "choose",
"action_data": {
"choose": [],
"default": [],
}
}
],
}
}
]
}
],
"default": [
{
"$smType": "action",
"action": "service",
"action_data": {
"service": "light.turn_off",
"choose": [
{
"conditions": [
{
"condition": "state",
"entity_id": "lights.bathroom",
"state": "off",
}
],
"sequence": [
{
"service": "light.turn_on",
"target": {
"entity_id": "lights.bathroom"
},
"data": {}
},
{
"alias": "Turn off bedroom",
"service": "light.turn_off",
"target": {
"entity_id": "lights.bedroom"
},
"data": {}
}
}
]
}
]
},
{
"conditions": [
{
"condition": "state",
"entity_id": "lights.bedroom",
"state": "off",
}
],
"sequence": [
{
"alias": "Turn on bedroom",
"service": "light.turn_on",
"target": {
"entity_id": "lights.bedroom"
},
"data": {}
},
{
"choose": [
{
"conditions": [],
"sequence": [
{
"choose": [],
"default": [],
}
]
}
],
"default": [
{
"choose": [],
"default": [],
}
],
}
]
}
],
"default": [
{
"service": "light.turn_off",
"target": {
"entity_id": "lights.bathroom"
},
"data": {}
}
]
},
{
"$smType": "condition",
"condition": "and",
"condition_data": {
"conditions": []
}
"conditions": []
}
]
}
@@ -284,7 +207,7 @@ Complex.args = {
export const EmptyStart = Template.bind({})
EmptyStart.args = {
...EmptyStart.args,
trigger: [
],
condition: [],
trigger: [],
sequence: []
}
+34 -25
View File
@@ -5,13 +5,15 @@ import { AutomationSequenceNode } from "types/automations";
import { AutomationTrigger } from 'types/automations/triggers';
import { triggerToFlow } from "./triggerConvertor";
import { DAGNode } from "./DAGNode";
import { DAGAutomationFlowDims, FlowData, ModalState } from './types';
import { DAGAutomationFlowDims, FlowData, ModalState, UpdateModalState } from './types';
import { DAGCircle } from './DAGCircle';
import { sequenceToFlow } from "./sequenceConvertor";
import { makeSequenceUpdater } from "./updater";
import { NodeEditor } from "components/NodeEditor";
import { MultiNodeEditor } from "components/MultiNodeEditors";
import { Modal } from "components/Modal";
import { AutomationCondition } from "types/automations/conditions";
import { makeConditionPoint } from "./flowDataMods";
const nodeTypes = {
'dagnode': DAGNode,
@@ -20,19 +22,23 @@ const nodeTypes = {
interface Props {
className?: string;
sequence: AutomationSequenceNode[];
trigger: AutomationTrigger[];
condition: AutomationCondition[];
sequence: AutomationSequenceNode[];
dims: DAGAutomationFlowDims;
onTriggerUpdate: (t: AutomationTrigger[]) => void;
onSequenceUpdate: (s: AutomationSequenceNode[]) => void;
onConditionUpdate: (s: AutomationCondition[]) => void;
}
export const DAGAutomationFlow: FC<Props> = ({
className,
sequence,
trigger,
condition,
sequence,
onTriggerUpdate,
onSequenceUpdate,
onConditionUpdate,
dims,
}) => {
// state
@@ -53,17 +59,21 @@ export const DAGAutomationFlow: FC<Props> = ({
modalBody = <MultiNodeEditor
sequence={modalState.node}
onClose={() => setModalState(null)}
onSave={(n) => {
modalState.update(n as any);
setModalState(null);
}}
onSave={(n) => modalState.update(n as any)}
allowedTypes={['condition']}
/>
}
}
// convert automation to flow data
const condPoint = makeConditionPoint(dims);
const condPoint = makeConditionPoint('c', {
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y + dims.nodeHeight * 0.25
}, dims, condition.length, makeOnEditAutomationConditions(
condition,
onConditionUpdate,
setModalState,
));
const flowData: FlowData = {
nodes: [condPoint],
edges: [],
@@ -72,8 +82,7 @@ export const DAGAutomationFlow: FC<Props> = ({
onAdd: () => onTriggerUpdate([
...trigger, {
platform: 'event',
$smType: 'trigger',
event_type: 'test',
event_type: '',
}
]),
onDelete: i => onTriggerUpdate([
@@ -95,7 +104,12 @@ export const DAGAutomationFlow: FC<Props> = ({
flowData,
sequence,
condPoint.id,
dims,
{
...dims, padding: {
x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth,
y: dims.padding.y,
}
},
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
);
@@ -119,18 +133,13 @@ export const DAGAutomationFlow: FC<Props> = ({
</>;
}
const makeConditionPoint = ({
padding,
nodeWidth,
nodeHeight,
circleSize,
}: DAGAutomationFlowDims) => ({
id: `c`,
type: 'dagcircle',
position: { x: padding.x + nodeWidth * 2, y: padding.y + nodeHeight * 0.25 },
data: {
size: circleSize,
backgroundColor: 'blue',
}
const makeOnEditAutomationConditions = (
conditions: AutomationCondition[],
updateConditions: (c: AutomationCondition[]) => void,
openModal: UpdateModalState,
) => () => openModal({
single: false,
node: conditions,
allowedTypes: ['condition'],
update: c => updateConditions(c as any),
})
@@ -5,6 +5,8 @@ import { XYPosition } from 'react-flow-renderer';
import { ChooseAction } from 'types/automations/actions';
import { makeFlowCircle } from './DAGCircle';
import { createOnRemoveForChooseNode, SequenceUpdater } from './updater';
import { getNodeType } from 'utils/automations';
import { makeAddButton, makeConditionPoint } from './flowDataMods';
export const sequenceToFlow = (
@@ -34,8 +36,8 @@ export const sequenceToFlow = (
};
}
// draw node
if (node.$smType === 'action') {
if (node.action === 'choose') {
if (getNodeType(node) === 'action') {
if ('choose' in node) {
position = addChooseNode(flowData, node, position, nodeId, dims, updater, i)
} else {
addSingleNode(flowData, node, position, nodeId, dims, {
@@ -55,13 +57,19 @@ export const sequenceToFlow = (
lasPos = position;
}
// add button
const addCircle = makeFlowCircle(
const addCircle = makeAddButton(
`${prefix}-+`,
{
x: (lasPos === null ? dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) : lasPos.x) + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y + dims.circleSize / 2
x: (
lasPos === null ?
dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) :
lasPos.x
) + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y + dims.circleSize / 4
},
{ onAdd: updater.addNode, size: dims.circleSize, disableSource: true, }
dims,
updater.addNode,
false,
)
flowData.nodes.push(addCircle)
addEdge(flowData, lastPointId, addCircle.id, false)
@@ -102,7 +110,7 @@ const addSingleNode = (
label: getDescriptionFromAutomationNode(node),
height: nodeHeight,
width: nodeWidth,
color: node.$smType === 'action' ? 'green' : 'blue',
color: getNodeType(node) === 'action' ? 'green' : 'blue',
hasInput: true,
...opts,
},
@@ -126,15 +134,14 @@ const addChooseNode = (
});
let lastPos: XYPosition = position;
// conditions
node.action_data.choose.forEach(({ sequence, conditions }, j) => {
node.choose.forEach(({ sequence, conditions }, j) => {
const sequenceId = `${nodeId}.${j}`;
// edit/delete circle
const circle = makeFlowCircle(`${sequenceId}>cond`, {
const circle = makeFlowCircle(`${sequenceId}>delete`, {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
}, {
size: dims.circleSize * dims.distanceFactor,
onEdit: updater.makeOnEditConditionsForChooseNode(i, j),
size: dims.circleSize,
onRemove: createOnRemoveForChooseNode(
node,
d => updater.updateNode(i, d),
@@ -143,12 +150,25 @@ const addChooseNode = (
})
flowData.nodes.push(circle)
addEdge(flowData, nodeId, circle.id, true)
const condNode = makeConditionPoint(
`${sequenceId}>cond`,
{
x: circle.position.x + dims.circleSize * dims.distanceFactor,
y: circle.position.y + dims.circleSize / 8,
},
dims,
conditions.length,
updater.makeOnEditConditionsForChooseNode(i, j)
);
flowData.nodes.push(condNode)
addEdge(flowData, circle.id, condNode.id, true)
// actual sub sequence
const lastPoint = sequenceToFlow(flowData, sequence, circle.id, {
const lastPoint = sequenceToFlow(flowData, sequence, condNode.id, {
...dims,
padding: {
x: position.x - dims.nodeWidth,
y: circle.position.y,
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
y: condNode.position.y - dims.conditionHeight / 2,
},
}, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`);
if (lastPoint.position) {
@@ -157,47 +177,43 @@ const addChooseNode = (
lastPos = xyApply(lastPos, { x: lastPos.x, y: lastPos.y + dims.nodeHeight * dims.distanceFactor }, Math.max)
}
})
const totalChildren = node.action_data.choose.length;
const totalChildren = node.choose.length;
// add button
const addCirlce = makeFlowCircle(
`${nodeId}>add`, {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
},
const addCirlce = makeAddButton(
`${nodeId}>add`,
{
size: dims.circleSize * dims.distanceFactor,
onAdd: () => updater.updateNode(i, {
...node,
action_data: {
...node.action_data,
choose: [
...node.action_data.choose,
{
sequence: [],
conditions: [],
}
]
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
},
dims,
() => updater.updateNode(i, {
...node,
choose: [
...node.choose,
{
sequence: [],
conditions: [],
}
}),
disableSource: true,
}
]
}),
false,
);
flowData.nodes.push(addCirlce)
addEdge(flowData, nodeId, addCirlce.id, true)
// default
// else
const elseCircle = makeFlowCircle(`${nodeId}>else`, {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2,
}, { size: dims.circleSize * dims.distanceFactor })
}, { size: dims.circleSize })
flowData.nodes.push(elseCircle)
addEdge(flowData, nodeId, elseCircle.id, true)
const lastPoint = sequenceToFlow(flowData, node.action_data.default, elseCircle.id, {
const lastPoint = sequenceToFlow(flowData, node.default, elseCircle.id, {
...dims,
padding: {
x: position.x - dims.nodeWidth,
y: elseCircle.position.y,
y: elseCircle.position.y - dims.circleSize / 4,
},
}, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`)
if (lastPoint.position) {
+14 -22
View File
@@ -1,12 +1,12 @@
import { Styles } from "jss";
import Color from 'chroma-js';
import { createAppUseStyles } from "styles/theme";
import { Node } from "types/graphs";
import { NodeColor } from "types/graphs";
export const useNodeStyles = createAppUseStyles<{
color: Node['color'],
color: NodeColor,
nodeHeight: number,
nodeWidth: number,
accentBackground: boolean,
}>(theme => {
const edgeStyle: Styles = {
flex: '1',
@@ -41,11 +41,12 @@ export const useNodeStyles = createAppUseStyles<{
width: nodeWidth,
fontSize: 10,
}),
inner: ({ color }) => ({
inner: ({ color, accentBackground }) => ({
position: 'relative',
display: 'flex',
flexDirection: 'row',
backgroundColor: theme.secondary,
backgroundColor: !accentBackground ? theme.secondary :
color === 'lblue' ? theme.condition.primaryColorOpaque : 'none',
borderRadius: '1em',
flex: 1,
height: `100%`,
@@ -57,10 +58,11 @@ export const useNodeStyles = createAppUseStyles<{
borderTopStyle: 'solid',
borderTopLeftRadius: '10px',
borderTopRightRadius: '10px',
borderTopColor: color === 'red' ? Color(theme.secondary).set('rgb.r', 125).hex() :
color === 'blue' ? Color(theme.secondary).set('rgb.b', 125).hex() :
color === 'green' ? Color(theme.secondary).set('rgb.g', 125).hex() :
'none'
borderTopColor: color === 'red' ? theme.redAccent :
color === 'blue' ? theme.condition.primaryColor :
color === 'green' ? theme.green :
color === 'lblue' ? theme.condition.primaryAccent :
'none'
}),
textWrap: {
display: 'flex',
@@ -112,13 +114,14 @@ export const useCircleStyles = createAppUseStyles<{
backgroundColor?: string,
}>(theme => ({
root: ({ size, hasOnFunction, hasRemoveFunction, backgroundColor }) => {
const baseColor = backgroundColor ? backgroundColor : Color(theme.primary).set('rgb.g', 100).hex();
const hoverColor = (hasOnFunction && !hasRemoveFunction) ? Color(theme.primary).set('rgb.g', 150).hex() : baseColor
const baseColor = backgroundColor ? backgroundColor : theme.green;
const hoverColor = hasOnFunction ? theme.greenOpaque : baseColor
return {
backgroundColor: baseColor,
borderRadius: hasRemoveFunction ? 10 : 500,
height: size,
width: size,
color: theme.primary,
cursor: hasOnFunction ? "pointer" : 'default',
"&:hover": {
backgroundColor: hoverColor,
@@ -129,18 +132,7 @@ export const useCircleStyles = createAppUseStyles<{
alignItems: 'center',
}
},
icon: {
"&:hover": {
borderRadius: 500,
background: Color(theme.primary).set('rgb.g', 150).hex(),
}
},
trashIcon: {
padding: 1,
"&:hover": {
borderRadius: 500,
background: Color(theme.primary).set('rgb.g', 150).hex(),
cursor: 'pointer',
}
}
}))
@@ -1,20 +1,23 @@
import { AutomationTrigger } from 'types/automations/triggers';
import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from './types';
import { makeFlowCircle } from './DAGCircle';
import { makeAddButton } from './flowDataMods';
export const triggerToFlow = (
flowData: FlowData,
trigger: AutomationTrigger[],
toPoint: string,
{
dims: DAGAutomationFlowDims,
opts: TriggerMakerOptions,
) => {
const {
distanceFactor,
nodeHeight,
nodeWidth,
circleSize,
padding,
}: DAGAutomationFlowDims,
opts: TriggerMakerOptions,
) => {
conditionHeight,
} = dims;
// convert all triggers to dag nodes
trigger.forEach((t, i) => {
const flowId = `t-${i}`;
@@ -39,19 +42,13 @@ export const triggerToFlow = (
});
// create a 'add button'
flowData.nodes.push(makeFlowCircle(
flowData.nodes.push(makeAddButton(
'trigger-add',
{
x: padding.x + nodeWidth * 0.4,
y: padding.y + nodeHeight * distanceFactor * trigger.length,
y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length,
},
{
size: circleSize,
backgroundColor: 'green',
onAdd: opts.onAdd,
disableSource: true,
disableTarget: true,
}
dims,
opts.onAdd
))
}
+3 -1
View File
@@ -3,13 +3,15 @@ import { AutomationSequenceNode } from 'types/automations';
import { DAGCircleProps } from './DAGCircle';
import { DAGNodeProps } from './DAGNode';
import { AutomationTrigger } from 'types/automations/triggers';
import { MultiNodeEditorProps } from 'components/MultiNodeEditors';
import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
export type DAGAutomationFlowDims = {
padding: XYPosition;
nodeHeight: number;
nodeWidth: number;
conditionWidth: number;
conditionHeight: number;
circleSize: number;
distanceFactor: number;
}
+21 -35
View File
@@ -27,44 +27,33 @@ const mockSequenceUpdater = (defaultState: AutomationSequenceNode[] = []) => {
test("sequence updater updates nodes", () => {
const mock = mockSequenceUpdater([
{
"$smType": "action",
"action": "choose",
"action_data": {
"choose": [
{
"conditions": [],
"sequence": [],
}
],
"default": [],
}
"choose": [
{
"conditions": [],
"sequence": [],
}
],
"default": [],
}
]);
expect(mock.state.length).toBe(1)
expect((mock.state[0] as ChooseAction).action_data.alias).toBe(undefined)
expect((mock.state[0] as ChooseAction).alias).toBe(undefined)
mock.updater.updateNode(0, {
...mock.state[0],
action_data: {
...(mock.state[0] as ChooseAction).action_data,
alias: "Hello"
}
} as any)
expect((mock.state[0] as ChooseAction).action_data.alias).toBe("Hello")
alias: "Hello"
})
expect(mock.state[0].alias).toBe("Hello")
})
test('update conditions for node', () => {
const mock = mockSequenceUpdater([
{
"$smType": "action",
"action": "choose",
"action_data": {
"choose": [
{
"conditions": [],
"sequence": [],
}
],
"default": [],
}
"choose": [
{
"conditions": [],
"sequence": [],
}
],
"default": [],
}
]);
mock.updater.makeOnEditConditionsForChooseNode(0, 0)();
@@ -73,13 +62,10 @@ test('update conditions for node', () => {
expect((mock.modalStates[0].node as AutomationSequenceNode[]).length).toBe(0)
mock.modalStates[0].update([
{
"$smType": "condition",
"condition": "and",
"condition_data": {
"conditions": [],
}
"conditions": [],
}
] as any)
expect((mock.state[0] as ChooseAction).action_data.choose[0].conditions.length).toBe(1)
expect((mock.state[0] as ChooseAction).action_data.choose[0].conditions[0].condition).toBe("and")
expect((mock.state[0] as ChooseAction).choose[0].conditions.length).toBe(1)
expect((mock.state[0] as ChooseAction).choose[0].conditions[0].condition).toBe("and")
})
+30 -46
View File
@@ -23,12 +23,8 @@ export const makeSequenceUpdater = (
single: true,
saveBtnCreateText: true,
node: {
$smType: 'action',
action: 'choose',
action_data: {
choose: [],
default: [],
}
choose: [],
default: [],
},
update: n => onChange([
...sequence,
@@ -44,44 +40,38 @@ export const makeSequenceUpdater = (
...sequence.slice(i + 1),
])
},
updateChooseActionData(i: number, data: ChooseAction['action_data']) {
updateChooseActionData(i: number, data: ChooseAction) {
const node = sequence[i] as ChooseAction;
return this.updateNode(i, {
...node,
action_data: data,
...data,
})
},
makeChildUpdaterForChooseAction(i: number, j: number | null) {
const node = sequence[i];
if ((node.$smType === 'action') && (node.action === 'choose')) {
if ('choose' in node) {
if (j !== null) {
return makeSequenceUpdater(
node.action_data.choose[j].sequence,
node.choose[j].sequence,
seq => this.updateNode(i, {
...node,
action_data: {
...node.action_data,
choose: [
...node.action_data.choose.slice(0, j),
{
...node.action_data.choose[j],
sequence: seq,
},
...node.action_data.choose.slice(j + 1),
]
}
choose: [
...node.choose.slice(0, j),
{
...node.choose[j],
sequence: seq,
},
...node.choose.slice(j + 1),
]
}),
openModal,
)
} else {
return makeSequenceUpdater(
node.action_data.default,
node.default,
seq => this.updateNode(i, {
...node,
action_data: {
...node.action_data,
default: seq
}
default: seq
}),
openModal,
)
@@ -108,25 +98,22 @@ export const makeSequenceUpdater = (
const node = sequence[i] as ChooseAction;
return openModal({
single: false,
node: node.action_data.choose[j].conditions,
node: node.choose[j].conditions,
allowedTypes: ['condition'],
update: conditions => this.updateNode(i, {
...node,
action_data: {
...node.action_data,
choose: [
...node.action_data.choose.slice(0, j),
{
sequence: node.action_data.choose[j].sequence,
conditions: conditions as AutomationCondition[],
},
...node.action_data.choose.slice(j + 1),
]
}
choose: [
...node.choose.slice(0, j),
{
sequence: node.choose[j].sequence,
conditions: conditions as AutomationCondition[],
},
...node.choose.slice(j + 1),
]
}),
})
}
}
},
});
@@ -136,11 +123,8 @@ export const createOnRemoveForChooseNode = (
j: number
) => () => update({
...action,
action_data: {
...action.action_data,
choose: [
...action.action_data.choose.slice(0, j),
...action.action_data.choose.slice(j + 1),
]
}
choose: [
...action.choose.slice(0, j),
...action.choose.slice(j + 1),
]
})
+8 -4
View File
@@ -1,18 +1,22 @@
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
export const NODE_WIDTH = 150 as const;
export const NODE_HEIGHT = 60 as const;
export const ADD_HEIGHT = 10 as const;
export const ADD_WIDTH = 10 as const;
export const CIRCLE_SIZE = 30 as const;
export const CONDITION_HEIGHT = 30 as const;
export const CONDITION_WIDTH = 120 as const;
export const CIRCLE_SIZE = 40 as const;
export const DISTANCE_FACTOR = 1.5 as const;
export const PADDING = 50 as const;
export const DEFAULT_DIMS = {
nodeHeight: NODE_HEIGHT,
nodeWidth: NODE_WIDTH,
conditionHeight: CONDITION_HEIGHT,
conditionWidth: CONDITION_WIDTH,
distanceFactor: DISTANCE_FACTOR,
circleSize: CIRCLE_SIZE,
padding: {
x: PADDING,
y: PADDING,
},
}
} as DAGAutomationFlowDims
@@ -1,7 +1,7 @@
import { ComponentStory } from "@storybook/react";
import { IconBase } from "./base";
import { PencilIcon, CheckMarkIcon, TrashIcon, InfoIcon, ArrowIcon, AddIcon, ZoomIcon } from ".";
import { PencilIcon, CheckMarkIcon, TrashIcon, InfoIcon, ArrowIcon, AddIcon, ZoomIcon, GearIcon } from ".";
import { ButtonIcon } from "./ButtonIcons";
export default {
@@ -19,6 +19,7 @@ export const IconList: ComponentStory<typeof IconBase> = (args) => {
<TrashIcon {...args} />
<InfoIcon {...args} />
<ZoomIcon {...args} />
<GearIcon {...args} />
</div>
}
IconList.args = {
+13
View File
@@ -64,4 +64,17 @@ export const ZoomIcon: FC<IconBaseProps> = props => <IconBase {...props}
}}
>
<path d="M410.9,10c54.3,0,106.2,10.6,155.7,31.8c49.5,21.2,92.1,49.7,127.9,85.4c35.7,35.7,64.2,78.4,85.4,127.9c21.2,49.5,31.8,101.4,31.8,155.7c0,46.6-7.6,91.3-22.8,134c-15.2,42.7-36.8,81.4-64.9,116.2l253,252.7c8.6,8.6,12.9,19.1,12.9,31.7c0,12.8-4.2,23.4-12.7,31.8c-8.5,8.5-19.1,12.7-31.8,12.7c-12.5,0-23.1-4.3-31.7-12.9l-252.7-253c-34.8,28.1-73.6,49.7-116.2,64.9c-42.7,15.2-87.3,22.8-134,22.8c-54.3,0-106.2-10.6-155.7-31.8c-49.5-21.2-92.1-49.7-127.9-85.4C91.5,658.8,63,616.2,41.8,566.7C20.6,517.1,10,465.2,10,410.9c0-54.3,10.6-106.2,31.8-155.7s49.7-92.2,85.4-127.9s78.3-64.2,127.9-85.4S356.6,10,410.9,10L410.9,10z M410.9,99.1c-42.2,0-82.6,8.2-121.1,24.7c-38.5,16.5-71.7,38.6-99.5,66.5c-27.8,27.8-50,61-66.5,99.5c-16.5,38.5-24.7,78.9-24.7,121.1c0,42.2,8.2,82.6,24.7,121.1c16.5,38.5,38.6,71.7,66.5,99.5s61,50,99.5,66.5c38.5,16.5,78.9,24.7,121.1,24.7c42.2,0,82.6-8.2,121.1-24.7c38.5-16.5,71.7-38.6,99.5-66.5s50-61,66.5-99.5c16.5-38.5,24.7-78.9,24.7-121.1c0-42.2-8.2-82.6-24.7-121.1c-16.5-38.5-38.6-71.7-66.5-99.5c-27.8-27.8-61-50-99.5-66.5C493.5,107.3,453.2,99.1,410.9,99.1z M410.9,232.7c12.3,0,22.8,4.4,31.5,13.1c8.7,8.7,13.1,19.2,13.1,31.5v89.1h89.1c12.3,0,22.8,4.4,31.5,13.1c8.7,8.7,13.1,19.2,13.1,31.5c0,12.3-4.4,22.8-13.1,31.5c-8.7,8.7-19.2,13.1-31.5,13.1h-89.1v89.1c0,12.3-4.4,22.8-13.1,31.5c-8.7,8.7-19.2,13.1-31.5,13.1c-12.3,0-22.8-4.4-31.5-13.1c-8.7-8.7-13.1-19.2-13.1-31.5v-89.1h-89.1c-12.3,0-22.8-4.4-31.5-13.1c-8.7-8.7-13.1-19.2-13.1-31.5c0-12.3,4.4-22.8,13.1-31.5c8.7-8.7,19.2-13.1,31.5-13.1h89.1v-89.1c0-12.3,4.4-22.8,13.1-31.5C388.1,237.1,398.6,232.7,410.9,232.7z" />
</IconBase>
export const GearIcon: FC<IconBaseProps> = props => <IconBase {...props}
svgProps={{
viewBox: "0 0 1000 1000",
x: 0,
y: 0,
enableBackground: 'new 0 0 1000 100',
}}
>
<g transform="translate(0.000000,511.000000) scale(0.100000,-0.100000)">
<path d="M4559,4977.4c-53.3-23.4-108.6-70.3-134.2-110.8c-23.4-38.3-115-291.9-206.7-560.3l-161.9-492.1l-247.1-78.8c-136.3-44.7-364.3-138.5-504.9-208.8l-259.9-127.8l-492.1,247.1c-296.1,147-519.8,245-558.2,245c-34.1,0-98-14.9-140.6-32c-95.9-40.5-528.3-462.3-583.7-568.8c-76.7-151.3-61.8-208.8,202.4-737.1l242.9-485.7l-129.9-266.3c-72.4-144.9-166.2-372.8-206.7-502.8l-74.6-240.7L788.1,887c-283.3-95.9-539-191.7-566.7-213C114.9,590.9,100,518.4,100,109.4c0-349.4,4.3-383.5,46.9-462.3c25.6-44.7,76.7-100.1,112.9-121.4c34.1-21.3,285.5-112.9,553.9-202.4l490-164l81-253.5c44.7-138.5,136.4-360,204.5-494.3l121.4-240.7L1469.9-2315c-204.5-415.4-240.7-500.7-240.7-585.9c2.1-55.4,14.9-123.6,29.8-149.1c14.9-27.7,147-170.4,291.9-315.3c281.2-281.2,353.7-326,494.3-294c38.4,8.5,279.1,119.3,536.9,247.1l468.7,234.3l287.6-138.5c157.7-76.7,383.5-170.4,500.6-206.7l215.2-66l155.5-473c245-741.4,228-724.3,739.3-735c598.6-12.8,594.4-17,828.7,692.4l168.3,515.6l215.2,66c117.2,36.2,343,130,502.8,206.7l289.7,138.5l466.6-234.3c255.7-127.8,496.4-240.7,534.8-247.1c142.7-32,232.2,17.1,498.5,279.1c409,400.5,409,404.8,76.7,1067.3l-238.6,473l129.9,264.2c72.5,144.9,161.9,362.2,200.3,483.6c38.3,121.4,81,232.2,93.8,245c12.8,14.9,245,98,517.7,187.5c272.7,91.6,517.7,183.2,545.4,204.5C9885.1-370,9900-299.7,9900,124.3c0,428.2-12.8,479.3-140.6,564.6c-34.1,21.3-283.4,115-558.2,208.8l-498.5,170.4l-83.1,249.3c-44.8,136.3-136.4,360-204.5,494.3l-125.7,242.9l240.7,477.2c210.9,421.8,238.6,487.9,238.6,588c2.1,61.8-10.7,138.5-27.7,170.4c-51.1,95.9-507,532.6-592.3,568.8c-44.7,17-108.6,32-142.7,32c-38.3,0-262-98-556-245l-494.3-247.1l-242.9,121.4c-134.2,66-360,161.9-502.8,210.9l-259.9,87.3l-172.6,513.4c-93.7,283.3-189.6,534.7-213,560.3c-93.8,106.5-185.4,127.8-564.6,127.8C4699.6,5020,4635.7,5013.6,4559,4977.4z M5311,1992.7c385.6-68.2,707.3-232.2,997.1-507c954.4-914,703-2496.9-487.9-3070c-707.3-340.9-1548.8-210.9-2113.4,328.1c-266.3,251.4-424,507-532.6,858.6c-51.1,168.3-57.5,219.4-57.5,517.7s6.4,349.4,57.5,517.7c215.2,705.2,754.2,1199.4,1463.6,1346.4C4808.3,2018.3,5140.6,2024.6,5311,1992.7z" />
</g>
</IconBase>
@@ -0,0 +1,20 @@
.input-boolean {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
max-width: fit-content;
border: 1px solid var(--secondary-accent);
border-radius: 5px;
padding: 0.5em;
background-color: var(--secondary);
}
.input-boolean:hover, .input-boolean:hover * {
cursor: pointer;
background-color: var(--secondary-opaque);
}
.input-boolean * {
user-select: none;
}
@@ -0,0 +1,26 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react";
import InputBoolean from "./InputBoolean";
export default {
title: 'Inputs/InputBoolean',
component: InputBoolean,
parameters: { actions: { argTypesRegex: '^on.*' } },
} as ComponentMeta<typeof InputBoolean>;
const Template: ComponentStory<typeof InputBoolean> = args => {
const [state, onChange] = useState(args.value)
return <div className="page">
<InputBoolean {...args} value={state} onChange={v => {
args.onChange(v)
onChange(v)
}} />
</div>
}
export const SimpleText = Template.bind({})
SimpleText.args = {
label: "Template",
}
@@ -1,3 +1,4 @@
import "./InputBoolean.css";
import InputWrapper from "./InputWrapper";
export interface Props {
@@ -10,12 +11,8 @@ export default function InputBoolean({
value = false,
onChange,
}: Props) {
return <InputWrapper label={label}>
<span className="checkbox" onClick={e => {
e.preventDefault()
onChange(!value)
}}>
{value ? '✔️' : ' '}
</span>
</InputWrapper>
return <div className="input-boolean" onClick={() => onChange(!value)}>
<input type="checkbox" checked={value} onChange={() => { }} />
<label>{label}</label>
</div>
}
@@ -1,7 +1,7 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react";
import { useState, useEffect } from 'react';
import InputList from "./InputList";
import { InputList } from "./InputList";
export default {
title: 'Inputs/InputList',
@@ -12,7 +12,12 @@ export default {
const Template: ComponentStory<typeof InputList> = args => {
const [value, setValue] = useState('')
const [value, setValue] = useState(args.current);
useEffect(() => {
if (value !== args.current) {
setValue(args.current)
}
}, [args.current])
return <div className="page">
<InputList {...args} current={value} onChange={setValue} />
</div>
@@ -27,3 +32,15 @@ SimpleText.args = {
"Toots"
]
}
export const InvalidSelection = Template.bind({})
InvalidSelection.args = {
current: "Derek",
label: "Entity ID",
options: [
'Bob',
'Martin',
"Toots"
]
}
+23 -6
View File
@@ -1,3 +1,4 @@
import { FC } from "react";
import InputWrapper from "./InputWrapper";
import { useInputListStyles } from "./styles";
@@ -10,21 +11,37 @@ export interface Props<T extends string> {
className?: string;
label: string;
}
export default function InputList<T extends string>({
export const InputList: FC<Props<any>> = ({
current, options, onChange, label,
...selattr
}: Props<T>) {
const { classes } = useInputListStyles({});
return <InputWrapper label={label} labelSize={'small'} noMargin>
}) => {
const invalidCurrent = !options.includes(current);
const { classes } = useInputListStyles({
invalidCurrent
});
return <InputWrapper label={label} labelSize={'small'} noMargin error={invalidCurrent ? "Invalid Selection" : undefined}>
<select
title={invalidCurrent ? "Invalid Selection" : ""}
className={classes.input}
{...selattr} value={current}
onChange={e => {
e.preventDefault();
onChange(e.currentTarget.value as any);
console.log(e.currentTarget.id)
console.log(e.currentTarget.value)
console.log(e.currentTarget.innerHTML)
if (e.currentTarget.id === 'invalid') {
onChange(options[0])
} else {
onChange(e.currentTarget.value as any);
}
}}
>
{options.map((t, i) => <option id={String(i)} key={i}>{t}</option>)}
{options.map((t, i) => <option id={String(i)} key={i} value={t}>{t}</option>)}
{invalidCurrent ? <option
id={'invalid'}
value={current}
style={{ display: 'none' }}
>!{current}!</option> : <></>}
</select>
</InputWrapper>
}
@@ -9,6 +9,7 @@ export interface Props {
value: string;
onChange: (v: string) => void;
additionalTooltipFilters?: Record<string, string>;
error?: string;
resizable?: boolean;
}
export default function InputTextArea({
@@ -16,13 +17,14 @@ export default function InputTextArea({
textBoxFor,
value = "",
onChange,
error,
additionalTooltipFilters = {},
resizable = false,
}: Props) {
const { classes } = useInputTextAreaStyles({ resizable });
const tooltip = useToolTip();
const [isFocused, setIsFocused] = useState(false)
return <InputWrapper label={label} labelSize={(value === '') && !isFocused ? 'normal' : 'small'}>
return <InputWrapper error={error} label={label} labelSize={(value === '') && !isFocused ? 'normal' : 'small'}>
<textarea
className={classes.input}
value={value}
@@ -7,12 +7,14 @@ export interface Props {
labelSize?: 'normal' | 'small';
noMargin?: boolean;
className?: string;
error?: string;
}
const InputWrapper: FC<Props> = ({ label, children, labelSize = 'normal', noMargin = false, className = "" }) => {
const { classes } = useInputWrapperStyles({ labelSize, noMargin })
const InputWrapper: FC<Props> = ({ error, label, children, labelSize = 'normal', noMargin = false, className = "" }) => {
const { classes } = useInputWrapperStyles({ labelSize, noMargin, hasError: !!error })
return <div className={[classes.wrapper, className].join(" ")}>
<label className={classes.label}>{label}</label>
{children}
<span className={classes.error}>{error}</span>
</div>
}
export default InputWrapper;
+28 -15
View File
@@ -1,6 +1,7 @@
import * as yaml from "js-yaml";
import { useEffect, useRef, useState } from "react";
import { useState } from "react";
import InputTextArea from "./InputTextArea";
import { useDelayedFunction, useDelayEffect } from 'utils/useDelay';
export interface Props<T extends {}> {
label: string;
@@ -14,25 +15,37 @@ export default function InputYaml<T>({
onChange,
resizable,
}: Props<T>) {
const [text, setText] = useState("");
useEffect(() => {
setText(yaml.dump(value));
}, [value]);
const delayId = useRef<null | number>(null);
const delayedUpdate = (update: string) => {
setText(update)
if (delayId.current) {
window.clearTimeout(delayId.current);
delayId.current = null;
const [{ text, error }, setState] = useState<{
text: string,
error: undefined | string,
}>({
text: yaml.dump(value),
error: undefined
});
const setText = (t: string) => {
try {
console.log(yaml.dump(yaml.load(t)));
setState({ text: t, error: undefined })
} catch (_) {
setState({ text: t, error: "! Invalid Yaml !" })
}
delayId.current = window.setTimeout(() => {
onChange(yaml.load(update) as any)
}, 1000);
}
useDelayEffect(() => {
if (!error && (yaml.dump(value) !== text)) {
if (text) {
onChange(yaml.load(text) as any)
} else if (Array.isArray(value)) {
onChange([] as any)
} else {
onChange({} as any)
}
}
}, [text], 1000)
return <InputTextArea
error={error}
label={label}
value={text}
onChange={delayedUpdate}
onChange={setText}
resizable={resizable}
/>
}
+24 -11
View File
@@ -1,5 +1,4 @@
import { createAppUseStyles, AppTheme } from "styles/theme";
import Color from 'chroma-js';
const commonInputStyle = (theme: AppTheme) => ({
input: {
@@ -36,6 +35,7 @@ export const useButtonStyles = createAppUseStyles<{}>(theme => ({
export const useInputWrapperStyles = createAppUseStyles<{
labelSize: 'normal' | 'small',
noMargin: boolean,
hasError: boolean,
}>(theme => {
return {
wrapper: ({ noMargin }) => ({
@@ -52,7 +52,16 @@ export const useInputWrapperStyles = createAppUseStyles<{
top: labelSize === 'normal' ? '0.5em' : '0.25em',
fontWeight: 'bold',
color: theme.primaryAccent,
})
}),
error: ({ hasError }) => (hasError ? {
textAlign: 'center',
color: theme.red,
padding: '0.25em',
border: `1px solid ${theme.red}`,
borderTop: 'none',
borderBottomRightRadius: 5,
borderBottomLeftRadius: 5,
} : {})
}
})
@@ -112,13 +121,17 @@ export const useInputNumberStyles = createAppUseStyles<{}>(theme => {
}
});
export const useInputListStyles = createAppUseStyles<{}>(theme => {
export const useInputListStyles = createAppUseStyles<{
invalidCurrent: boolean;
}>(theme => {
const styles = commonInputStyle(theme);
return {
input: {
input: ({ invalidCurrent }) => ({
...styles.input,
cursor: 'pointer'
}
cursor: 'pointer',
borderColor: invalidCurrent ? theme.redAccent : styles.input.borderColor,
color: invalidCurrent ? theme.redLight : styles.input.color,
}),
}
});
@@ -251,8 +264,8 @@ export const useInputBubblesStyles = createAppUseStyles<{}>(theme => ({
position: 'relative',
border: `1px solid ${theme.primaryAccent}`,
borderRadius: 10,
backgroundColor: Color(theme.primary).set('rgb.g', 150).alpha(0.35).hex(),
color: Color(theme.primary).brighten(5).hex(),
backgroundColor: theme.greenOpaque,
color: theme.primaryLight,
fontSize: 16,
marginLeft: 1,
@@ -262,8 +275,8 @@ export const useInputBubblesStyles = createAppUseStyles<{}>(theme => ({
cursor: 'pointer',
"&:hover": {
backgroundColor: Color(theme.primary).set('rgb.r', 150).alpha(0.35).hex(),
color: Color(theme.primary).brighten(5).alpha(0.35).hex(),
backgroundColor: theme.redOpaque,
color: theme.primaryLightOpaque,
},
"&:hover $deleteIcon": {
@@ -291,7 +304,7 @@ export const useInputBubblesStyles = createAppUseStyles<{}>(theme => ({
padding: "3px 7px",
"&:hover": {
borderRadius: 100,
backgroundColor: Color(theme.primary).set('rgb.g', 150).alpha(0.35).hex(),
backgroundColor: theme.greenOpaque,
borderColor: theme.secondaryAccent,
},
}
+1 -2
View File
@@ -1,6 +1,5 @@
import { FC } from "react";
import { createAppUseStyles } from "styles/theme";
import Color from 'chroma-js';
export interface ModalStyleProps {
open: boolean;
@@ -26,7 +25,7 @@ const useModalStyle = createAppUseStyles<ModalStyleProps>(theme => ({
width: '100vw',
top: 0,
left: 0,
backgroundColor: Color(theme.secondary).alpha(0.5).hex(),
backgroundColor: theme.secondaryOpaque,
},
inner: {
zIndex: 10,
@@ -0,0 +1,19 @@
.multinode-editor {
max-width: 80vw;
}
.multinode-editor--navbar {
display: flex;
flex-direction: row;
justify-content: space-evenly;
align-items: center;
min-width: 20vw;
}
.multinode-editor.modded>.multinode-editor--navbar * {
border-color: var(--green-light);
}
.multinode-editor.modded .multinode-editor--total {
color: var(--green-light)
}
@@ -10,39 +10,41 @@ export default {
component: MultiNodeEditor,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
allowedTypes: ['action', 'condition', 'trigger'],
sequence: [
{
"$smType": "condition",
"condition": "numeric_state",
"condition_data": {
"entity_id": [
"sensor.kitchen_humidity"
],
"conditions": [],
"above": "40"
}
"entity_id": [
"sensor.kitchen_humidity"
],
"conditions": [],
"above": "40"
},
{
"$smType": "condition",
"condition": "template",
"condition_data": {
"value_template": "states('switch.kitchen') == 'on'"
}
"value_template": "states('switch.kitchen') == 'on'"
}
]
}
} as ComponentMeta<typeof MultiNodeEditor>
export const Simple: ComponentStory<typeof MultiNodeEditor> = args => {
const [state, setState] = useState(args.sequence);
return <div className="page">
<MultiNodeEditor {...args} />
<div className="center column" style={{ paddingTop: "1em" }}>
<MultiNodeEditor {...args} sequence={state} onSave={s => {
args.onSave && args.onSave(s)
setState(s)
}} />
</div>
</div>
}
export const InAModal: ComponentStory<typeof MultiNodeEditor> = props => {
const [open, setOpen] = useState(false);
const [state, setState] = useState(props.sequence);
console.log({ state })
return <div className="page">
<Button onClick={() => setOpen(!open)}>Open Editor</Button>
<Modal open={open}>
@@ -50,8 +52,19 @@ export const InAModal: ComponentStory<typeof MultiNodeEditor> = props => {
{...props}
sequence={state}
onClose={() => setOpen(!open)}
onSave={setState}
onSave={s => {
props.onSave && props.onSave(s)
setState(s)
}}
/>
</Modal>
</div>
};
export const EmptyConditionEditor = Simple.bind({})
EmptyConditionEditor.args = {
...EmptyConditionEditor.args,
allowedTypes: ['condition'],
sequence: [],
}
+23 -136
View File
@@ -1,117 +1,22 @@
import { FC, useState } from 'react';
import { AutomationNode, AutomationNodeMapping } from 'types/automations';
import "./index.css";
import { FC } from 'react';
import { NodeEditor } from 'components/NodeEditor';
import { Button } from 'components/Inputs/Button';
import { AutomationTriggerDevice } from 'types/automations/triggers';
import { useMultiNodeEditorState } from "./state";
import { MultiNodeEditorProps } from "./types";
const makeDefault = (nodeType: keyof AutomationNodeMapping): AutomationNode => {
switch (nodeType) {
case 'action':
return {
$smType: 'action',
action: "service",
action_data: {
'data': {},
'service': '',
'target': {},
}
}
case 'condition':
return {
$smType: 'condition',
condition: 'and',
condition_data: {
conditions: []
}
}
default:
return {
platform: 'device',
device_id: '',
domain: '',
type: '',
subtype: '',
} as AutomationTriggerDevice
}
}
export interface MultiNodeEditorProps {
sequence: AutomationNode[];
allowedTypes?: Array<keyof AutomationNodeMapping>;
onClose?: () => void;
onSave?: (n: AutomationNode[]) => void;
}
export const MultiNodeEditor: FC<MultiNodeEditorProps> = ({
sequence: initialState,
allowedTypes = ['action', 'condition'],
onClose = () => { },
onSave = () => { },
}) => {
export const MultiNodeEditor: FC<MultiNodeEditorProps> = props => {
// state
const [{ slide, state, isNodeModified, isModified, isReady }, setState] = useState({
slide: 0,
state: initialState,
isModified: false,
isNodeModified: false,
isReady: true,
})
// alias
const areYouSureItsModified = () => isNodeModified ?
window.confirm("You've made changes, by pressing this you will lose them!") :
true
const areYouSureItsNotReady = () => !isReady ?
window.confirm("The node is not ready, are you sure you want to move?") :
true
const onAdd = () => setState({
slide: state.length,
state: [...state, makeDefault(allowedTypes[0])],
isNodeModified: false,
isReady,
isModified: true,
});
const onRemove = () => setState({
slide: slide > 0 ? slide - 1 : 0,
state: [...state.slice(0, slide), ...state.slice(slide + 1)],
isNodeModified: false,
isReady,
isModified: true,
});
const onNodeSave = (n: AutomationNode) => setState({
slide,
state: [...state.slice(0, slide), n, ...state.slice(slide + 1)],
isNodeModified: false,
isReady,
isModified: true,
});
const onSaveAll = () => isNodeModified ?
window.alert("Please save the node data first!") :
onSave(state)
const onNextOrAdd = () => {
if (!areYouSureItsModified()) {
return
}
if (!areYouSureItsNotReady()) {
return
}
if (slide >= state.length - 1) {
onAdd()
} else {
setState({ slide: slide + 1, state, isNodeModified, isReady, isModified, })
}
}
const onBack = () => areYouSureItsModified() &&
areYouSureItsNotReady() &&
setState({ slide: slide - 1, state, isNodeModified, isReady, isModified, })
const state = useMultiNodeEditorState(props)
// components
const nextOrAddBtn = <Button
onClick={onNextOrAdd}
onClick={state.moveForward}
>
{(slide < state.length - 1) ? ">>" : "+"}
{!state.isLast ? ">>" : "+"}
</Button>;
// branch
if (state.length === 0) {
if (state.isEmpty) {
return <div className='column center' style={{
minWidth: '20vw',
}}>
@@ -124,44 +29,26 @@ export const MultiNodeEditor: FC<MultiNodeEditorProps> = ({
{nextOrAddBtn}
</div>
<div className='column center' style={{ marginTop: '1em' }}>
<Button onClick={() => areYouSureItsModified() && onClose()}>Close</Button>
<Button onClick={state.onClose}>Close</Button>
</div>
</div>
}
return <>
<div style={{
display: 'flex',
flexDirection: 'row',
justifyContent: 'space-evenly',
alignItems: 'center',
minWidth: '20vw',
}}>
<Button onClick={onBack} disabled={slide === 0}>{"<<"}</Button>
<Button
onClick={onRemove}
>
Delete
</Button>
return <div className={["multinode-editor", state.isModified ? "modded" : ''].join(' ')}>
<div className="multinode-editor--navbar">
<Button onClick={state.moveBack} disabled={state.currentSlideNumber === 0}>{"<<"}</Button>
<Button onClick={state.onRemove}> Delete</Button>
{nextOrAddBtn}
</div>
<NodeEditor
key={slide}
node={state[slide]}
allowedTypes={allowedTypes}
onClose={onClose}
onSave={onNodeSave}
onFlags={
(ir, inm) => ((inm !== isNodeModified) || (ir !== isReady)) &&
setState({ slide, state, isNodeModified: inm, isReady: ir, isModified })
}
>
<Button onClick={onSaveAll} style={{
borderColor: isModified ? "var(--change)" : undefined,
color: isModified ? "var(--change)" : undefined,
}}>Save All</Button>
</NodeEditor>
key={state.currentSlideNumber}
node={state.currentSlide}
allowedTypes={props.allowedTypes}
onClose={state.onClose}
onSave={state.onSave}
onFlags={state.updateInternalNode}
/>
<div className='column center'>
<span>{slide + 1}/{state.length}</span>
<span>{state.currentSlideNumber + 1}/<u className="multinode-editor--total">{state.totalSlides}</u></span>
</div>
</>
</div>
}
@@ -0,0 +1,154 @@
import { MultiNodeEditorProps } from "./types";
import { useState, useRef } from 'react';
import { AutomationNode } from '../../types/automations/index';
import { makeDefault } from "utils/automations";
export type MultiNodeEditorInternalState = {
slides: AutomationNode[];
slide: number;
multiNode: {
isModified: boolean,
isSaved: boolean,
},
internalNodeModified: boolean,
};
export const useMultiNodeEditorState = (props: MultiNodeEditorProps) => {
const [state, _setState] = useState(makeInitialState({
slides: props.sequence
}))
const justSaved = useRef(false);
const {
slide,
slides,
multiNode,
internalNodeModified,
} = state;
const setState = (a: MultiNodeEditorInternalState) => {
console.log('setting state', a)
_setState(a)
}
return {
get totalSlides() {
return slides.length
},
get currentSlideNumber() {
return slide
},
get currentSlide() {
return slides[slide]
},
get isLast() {
return slide >= slides.length - 1
},
get isEmpty() {
return slides.length === 0
},
get isModified() {
return (internalNodeModified || multiNode.isModified) && !multiNode.isSaved
},
moveBack() {
if (slide <= 0) {
return
}
if (internalNodeModified && !multiNode.isSaved) {
if (!window.confirm("Moving back without saving will cause you to lose the work, are you sure you want to do that?")) {
return
}
}
setState({ ...state, slide: slide - 1, internalNodeModified: false, })
},
moveForward() {
const createNew = slide >= slides.length - 1;
if (internalNodeModified && !multiNode.isSaved) {
const action = createNew ? 'Creating a new new node' : 'Moving forward'
if (!window.confirm(`${action} without saving will cause you to lose the work, are you sure you want to do that?`)) {
return
}
}
if (createNew) {
setState({
...state,
slide: slides.length,
slides: slides.concat([makeDefault(props.allowedTypes[0])]),
internalNodeModified: false,
multiNode: {
isModified: true,
isSaved: false,
}
})
} else {
setState({ ...state, slide: slide + 1, internalNodeModified: false, })
}
},
updateInternalNode(isReady: boolean, isModified: boolean) {
if (!isReady || isModified) {
if (!state.multiNode.isModified || state.multiNode.isSaved) {
if (justSaved.current) {
justSaved.current = false
} else {
setState({
...state,
multiNode: { isModified: true, isSaved: false, },
internalNodeModified: true,
})
}
}
}
},
onRemove() {
setState({
...state,
slide: Math.max(slide - 1, 0),
slides: slides
.slice(0, slide)
.concat(
slides.slice(slide + 1)
),
multiNode: {
isModified: multiNode.isModified,
isSaved: false,
}
})
},
onSave(node: AutomationNode) {
justSaved.current = true
setState({
...state,
slides: slides
.slice(0, slide)
.concat([node])
.concat(
slides.slice(slide + 1)
),
multiNode: {
isModified: multiNode.isModified,
isSaved: true,
},
internalNodeModified: false,
})
},
onClose() {
if (!multiNode.isSaved) {
if (!window.confirm("You haven't saved your work, are you ok with losing it?")) {
return
}
}
props.onSave && props.onSave(slides)
props.onClose && props.onClose()
}
}
}
const makeInitialState = (props: Partial<MultiNodeEditorInternalState>): MultiNodeEditorInternalState => ({
slides: [],
slide: 0,
multiNode: {
isModified: false,
isSaved: false,
},
internalNodeModified: false,
...props,
})
@@ -0,0 +1,8 @@
import { AutomationNode, AutomationNodeMapping } from "types/automations";
export interface MultiNodeEditorProps {
sequence: AutomationNode[];
allowedTypes: Array<keyof AutomationNodeMapping>;
onClose?: () => void;
onSave?: (n: AutomationNode[]) => void;
}
@@ -5,15 +5,11 @@ import { OptionManager, updateActionData } from './OptionManager';
export const ActionChooseState: OptionManager<ChooseAction> = {
defaultState: () => ({
$smType: 'action',
action: 'choose',
action_data: {
alias: "Choose",
default: [],
choose: [],
}
alias: "",
default: [],
choose: [],
}),
isReady: ({ action_data: { alias } }) => {
isReady: ({ alias }) => {
return alias !== ''
},
renderOptionList: (state, setState) => {
@@ -21,7 +17,7 @@ export const ActionChooseState: OptionManager<ChooseAction> = {
return <>
<InputText
label="Description"
value={state.action_data.alias ?? ""}
value={state.alias ?? ""}
onChange={alias => update({ alias })}
/>
</>
@@ -5,24 +5,18 @@ import { OptionManager, updateActionData } from './OptionManager';
export const ActionDeviceState: OptionManager<DeviceAction> = {
defaultState: () => ({
$smType: 'action',
action: 'device',
action_data: {
alias: "Device",
type: "",
entity_id: "",
device_id: "",
domain: "",
}
alias: "",
type: "",
entity_id: "",
device_id: "",
domain: "",
}),
isReady: ({
action_data: {
alias,
type,
entity_id,
device_id,
domain,
}
alias,
type,
entity_id,
device_id,
domain,
}) => (
alias !== '' &&
type !== "" &&
@@ -35,25 +29,25 @@ export const ActionDeviceState: OptionManager<DeviceAction> = {
return <>
<InputText
label="Description"
value={state.action_data.alias ?? ""}
value={state.alias ?? ""}
onChange={alias => update({ alias })}
/>
<InputText
textBoxFor="device_id"
label="Device"
value={state.action_data.device_id}
value={state.device_id}
onChange={device_id => update({ device_id })}
/>
<InputText
textBoxFor="type"
label="Action"
value={state.action_data.type}
value={state.type}
onChange={type => update({ type })}
/>
<InputText
textBoxFor="entity_id"
label="Entity ID"
value={state.action_data.entity_id ?? ""}
value={state.entity_id ?? ""}
onChange={entity_id => update({ entity_id, domain: entity_id.split('.')[0] })}
/>
</>
@@ -6,15 +6,11 @@ import { OptionManager, updateActionData } from "./OptionManager";
export const ActionEventState: OptionManager<FireEventAction> = {
defaultState: () => ({
$smType: "action",
action: 'event',
action_data: {
alias: "Fire Event",
event: "",
event_data: {},
}
alias: "Fire Event",
event: "",
event_data: {},
}),
isReady: ({ action_data: { alias, event } }) => (
isReady: ({ alias, event }) => (
alias !== '' &&
event !== ""
),
@@ -23,18 +19,18 @@ export const ActionEventState: OptionManager<FireEventAction> = {
return <>
<InputText
label="Description"
value={state.action_data.alias ?? ""}
value={state.alias ?? ""}
onChange={alias => update({ alias })}
/>
<InputText
textBoxFor="event"
label="Event"
value={state.action_data.event}
value={state.event}
onChange={event => update({ event })}
/>
<InputYaml
label="Event Data"
value={state.action_data.event_data}
value={state.event_data}
onChange={event_data => update({ event_data })}
/>
</>
@@ -7,20 +7,16 @@ import { OptionManager, updateActionData } from './OptionManager';
export const ActionRepeatState: OptionManager<RepeatAction> = {
defaultState: () => ({
$smType: 'action',
action: 'repeat',
action_data: {
alias: "Repeat",
repeat: {
count: 1,
sequence: [],
}
alias: "Repeat",
repeat: {
count: 1,
sequence: [],
}
}),
isReady: ({ action_data: {
isReady: ({
alias,
repeat,
} }) => (
}) => (
alias !== '' &&
repeat?.sequence.length > 0
),
@@ -29,18 +25,18 @@ export const ActionRepeatState: OptionManager<RepeatAction> = {
return <>
<InputText
label="Description"
value={state.action_data.alias ?? ""}
value={state.alias ?? ""}
onChange={alias => update({ alias })}
/>
<InputNumber
label="How many times?"
value={state.action_data.repeat.count}
onChange={(count = 1) => update({ repeat: { ...state.action_data.repeat, count } })}
value={state.repeat.count}
onChange={(count = 1) => update({ repeat: { ...state.repeat, count } })}
/>
<InputYaml
label="Sequence"
value={state.action_data.repeat.sequence ?? []}
onChange={sequence => update({ repeat: { ...state.action_data.repeat, sequence } })}
value={state.repeat.sequence ?? []}
onChange={sequence => update({ repeat: { ...state.repeat, sequence } })}
/>
</>
}
@@ -6,23 +6,19 @@ import { OptionManager, updateActionData } from './OptionManager';
export const ActionCallServiceState: OptionManager<ServiceAction> = {
defaultState: () => ({
$smType: 'action',
action: 'service',
action_data: {
service: "",
target: "",
data: {},
}
service: "",
target: "",
data: {},
}),
isReady: ({
action_data: { service, alias, target }
service, alias, target
}) => (
service !== '' &&
alias !== '' &&
target !== ''
),
renderOptionList: (state, setState) => {
const { service, alias = "", target } = state.action_data;
const { service, alias = "", target } = state;
const update = updateActionData(state, setState);
return <>
<InputText
@@ -6,17 +6,13 @@ import { OptionManager, updateActionData } from './OptionManager';
export const ActionWaitState: OptionManager<WaitAction> = {
defaultState: () => ({
$smType: 'action',
action: 'wait',
action_data: {
alias: "Wait",
wait_template: "",
// timeout: 0,
continue_on_timeout: false,
}
alias: "Wait",
wait_template: "",
// timeout: 0,
continue_on_timeout: false,
}),
isReady: ({
action_data: { alias, wait_template }
alias, wait_template
}) => (
alias !== '' &&
wait_template !== ""
@@ -26,23 +22,23 @@ export const ActionWaitState: OptionManager<WaitAction> = {
return <>
<InputText
label="Description"
value={state.action_data.alias ?? ""}
value={state.alias ?? ""}
onChange={alias => update({ alias })}
/>
<InputText
textBoxFor="template"
label="Template"
value={state.action_data.wait_template}
value={state.wait_template}
onChange={wait_template => update({ wait_template })}
/>
{/* <InputNumber
label="Timeout"
value={state.action_data.timeout ?? 0}
value={state.timeout ?? 0}
onChange={(timeout = 0) => update({ timeout })}
/> */}
<InputBoolean
label="Continue on Timeout"
value={state.action_data.continue_on_timeout ?? false}
value={state.continue_on_timeout ?? false}
onChange={continue_on_timeout => update({ continue_on_timeout })}
/>
</>
@@ -5,12 +5,9 @@ import { OptionManager } from "./OptionManager";
export const ConditionLogicState: OptionManager<AutomationCondition> = {
defaultState: () => ({
$smType: 'condition',
condition: 'and',
condition_data: {
alias: "",
conditions: [],
}
alias: "",
conditions: [],
}),
isReady: _ => true,
renderOptionList: (state, setState) => <ConditionEditor
@@ -1,9 +1,9 @@
import { AutomationAction } from 'types/automations/actions';
import { AutomationCondition } from 'types/automations/conditions';
export interface OptionManager<T> {
defaultState(): T ;
defaultState(): T;
isReady(s: T): boolean;
renderOptionList(s: T, set: (s:T) => void): JSX.Element;
renderOptionList(s: T, set: (s: T) => void): JSX.Element;
}
@@ -11,24 +11,18 @@ export const updateConditionData = <T extends AutomationCondition>(
setState: (s: T) => void
) => (
state: T,
data: Partial<T['condition_data']>,
) => setState({
...state,
condition_data: {
...state.condition_data,
data: Partial<T>,
) => setState({
...state,
...data,
},
})
})
export const updateActionData = <T extends AutomationAction>(
state: T,
setState: (s: T) => void
) => (
data: Partial<T['action_data']>,
) => setState({
...state,
action_data: {
...state.action_data,
data: Partial<T>,
) => setState({
...state,
...data,
},
})
})
@@ -5,7 +5,6 @@ import InputText from 'components/Inputs/InputText';
export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
defaultState: () => ({
$smType: 'trigger',
"alias": "",
"platform": 'device',
"domain": "",
@@ -6,7 +6,6 @@ import InputYaml from "components/Inputs/InputYaml";
export const TriggerEventState: OptionManager<AutomationTriggerEvent> = {
defaultState: () => ({
$smType: 'trigger',
"alias": "",
"platform": "event",
"event_type": "",
@@ -1,11 +1,10 @@
import { OptionManager } from './OptionManager';
import { AutomationTriggerHA } from 'types/automations/triggers';
import InputList from "components/Inputs/InputList";
import { InputList } from "components/Inputs/InputList";
export const TriggerHAState: OptionManager<AutomationTriggerHA> = {
defaultState: () => ({
$smType: 'trigger',
"alias": "HA Starts",
"platform": "homeassistant",
"event": "start",
@@ -5,7 +5,6 @@ import InputText from 'components/Inputs/InputText';
export const TriggerMQTTState: OptionManager<AutomationTriggerMQTT> = {
defaultState: () => ({
$smType: 'trigger',
"alias": "",
"platform": "mqtt",
"payload": "",
@@ -9,7 +9,6 @@ import InputTime from 'components/Inputs/InputTime';
export const TriggerNumericState: OptionManager<AutomationTriggerNumericState> = {
defaultState: () => ({
$smType: 'trigger',
"alias": "",
"platform": 'numeric_state',
"entity_id": "",
@@ -7,7 +7,6 @@ import InputTime from 'components/Inputs/InputTime';
export const TriggerState: OptionManager<AutomationTriggerState> = {
defaultState: () => ({
$smType: 'trigger',
"alias": "",
"platform": 'state',
"entity_id": "",
@@ -6,7 +6,6 @@ import InputTime from 'components/Inputs/InputTime';
export const TriggerTemplate: OptionManager<AutomationTriggerTemplate> = {
defaultState: () => ({
$smType: 'trigger',
"alias": "",
"platform": 'template',
"value_template": "",
@@ -5,7 +5,6 @@ import InputTime from 'components/Inputs/InputTime';
export const TriggerTime: OptionManager<AutomationTriggerTime> = {
defaultState: () => ({
$smType: 'trigger',
"alias": "",
"platform": 'time',
"at": {},
@@ -5,7 +5,6 @@ import InputText from 'components/Inputs/InputText';
export const TriggerTimePattern: OptionManager<AutomationTriggerTimePattern> = {
defaultState: () => ({
$smType: 'trigger',
"alias": "",
"platform": 'time_pattern',
}),
@@ -5,7 +5,6 @@ import InputText from 'components/Inputs/InputText';
export const TriggerWebhook: OptionManager<AutomationTriggerWebhook> = {
defaultState: () => ({
$smType: 'trigger',
"alias": "",
"platform": 'webhook',
"webhook_id": "",
@@ -1,13 +1,12 @@
import { OptionManager } from './OptionManager';
import { AutomationTriggerZone } from 'types/automations/triggers';
import InputText from 'components/Inputs/InputText';
import InputList from 'components/Inputs/InputList';
import { InputList } from 'components/Inputs/InputList';
import { InputEntity } from 'components/Inputs/InputTextBubble';
export const TriggerZone: OptionManager<AutomationTriggerZone> = {
defaultState: () => ({
$smType: 'trigger',
"alias": "",
"platform": 'zone',
"zone": "",
@@ -1,133 +0,0 @@
import { useEffect, useState } from 'react';
import { AutomationNode, AutomationNodeTypes } from 'types/automations';
import { AutomationNodeSubtype } from 'types/automations';
import { getOptionManager } from './getOptionManager';
export const useEditorNodeState = (node: AutomationNode) => {
const [{ node: state, isModified }, setAllState] = useState({
node,
isModified: false,
});
useEffect(() => {
setAllState({ node, isModified: false })
}, [node])
const setState = (node: AutomationNode) => setAllState(({ node, isModified: true }))
const nodeType: AutomationNodeTypes = state.$smType ?? 'trigger';
const subType: AutomationNodeSubtype =
state.$smType === 'action' ? state.action :
state.$smType === 'condition' ? state.condition :
state.platform;
const subTypes = getSubTypeList(nodeType)
const optionManager = getOptionManager(nodeType, subType as any);
return {
nodeType,
subType,
subTypes,
get isModified() {
return isModified
},
get data() {
return state
},
renderOptionList() {
return optionManager.renderOptionList(state, setState);
},
isReady() {
return optionManager.isReady(state);
},
setNodeType(newType: AutomationNodeTypes) {
if (newType === (node.$smType ?? 'trigger')) {
if (node.$smType === 'action') {
setState({
...state,
$smType: 'action',
action: node.action,
} as any)
} else if (node.$smType === 'condition') {
setState({
...state,
$smType: 'condition',
condition: node.condition
} as any)
} else {
setState({
...state,
$smType: undefined,
platform: node.platform
} as any)
}
} else {
setState({
...state,
$smType: newType === 'trigger' ? undefined : newType,
...getOptionManager(newType, getSubTypeList(newType)[0]).defaultState()
} as any)
}
},
setSubType(newSubType: AutomationNodeSubtype<typeof nodeType>) {
if (state.$smType === 'action') {
setState({
...state,
action: newSubType,
...getOptionManager(state.$smType, newSubType as any).defaultState()
} as any)
} else if (state.$smType === 'condition') {
setState({
...state,
condition: newSubType,
...getOptionManager(state.$smType, newSubType as any).defaultState()
} as any)
} else {
setState({
...state,
platform: newSubType,
...getOptionManager(state.$smType, newSubType as any).defaultState()
} as any)
}
}
}
}
const getSubTypeList = <T extends AutomationNodeTypes>(nodeType: T): AutomationNodeSubtype<T>[] => {
switch (nodeType) {
case 'action':
return [
"service",
"repeat",
"wait",
"device",
"choose",
] as any
case "condition":
return [
'or',
'and',
'not',
'numeric_state',
'state',
'template',
'time',
'trigger',
'zone',
] as any
case 'trigger':
return [
'event',
'homeassistant',
'mqtt',
'numeric_state',
'state',
'tag',
'template',
'time',
'time_pattern',
'webhook',
'zone',
'device',
] as any
default:
return [];
}
}
@@ -0,0 +1,106 @@
import { Dispatch, SetStateAction, useEffect, useState } from 'react';
import { AutomationNode, AutomationNodeTypes } from 'types/automations';
import { AutomationNodeSubtype } from 'types/automations';
import { getOptionManager } from './getOptionManager';
import { getNodeType, getSubTypeList } from 'utils/automations';
import { getNodeSubType } from '../constants';
import InputYaml from 'components/Inputs/InputYaml';
type UseState = <S>(s: S) => [S, Dispatch<SetStateAction<S>>]
const mockUseState: UseState = s => {
return [s, () => { }]
}
export const useEditorNodeState = (originalNode: AutomationNode, uState: UseState = useState) => {
const [allState, setAllState] = uState({
node: originalNode,
yamlMode: false,
isModified: false,
invalidManualYaml: "",
});
const { node: currentNode, isModified, yamlMode, invalidManualYaml } = allState;
useEffect(() => {
setAllState({ ...allState, node: originalNode, isModified: false, })
}, [originalNode])
const setState = (node: AutomationNode) => setAllState(({ ...allState, node, isModified: true, }));
const setYamlMode = (yamlMode: boolean) => setAllState({ ...allState, yamlMode, });
const setStateForManualYaml = (yaml: any) => {
try {
createData(yaml, yaml)
setAllState({ ...allState, node: yaml, invalidManualYaml: '' })
} catch (err) {
setAllState({ ...allState, invalidManualYaml: String(err) })
}
}
const {
originalNodeType,
originalNodeSubType,
nodeType,
subType,
subTypes,
optionManager,
} = createData(originalNode, currentNode);
return {
nodeType,
subType,
subTypes,
yamlMode,
setYamlMode,
invalidManualYaml,
isModified,
get data() {
return currentNode
},
renderOptionList() {
if (yamlMode) {
return <>
<InputYaml
label=''
value={currentNode}
onChange={setStateForManualYaml}
resizable
/>
<span className="node-editor--error">{invalidManualYaml}</span>
</>
}
return optionManager.renderOptionList(currentNode, setState);
},
isReady() {
return optionManager.isReady(currentNode);
},
setNodeType(newType: AutomationNodeTypes) {
if (newType === originalNodeType) {
setState(originalNode)
} else {
setState(getOptionManager(newType, getSubTypeList(newType)[0]).defaultState())
}
},
setSubType(newSubType: AutomationNodeSubtype<typeof nodeType>) {
if (newSubType === originalNodeSubType) {
setState(originalNode)
} else {
setState(getOptionManager(nodeType, newSubType as any).defaultState())
}
}
}
}
const createData = (originalNode: AutomationNode, currentNode: AutomationNode) => {
const originalNodeType = getNodeType(originalNode);
const originalNodeSubType = getNodeSubType(originalNode);
const nodeType = getNodeType(currentNode);
const subType = getNodeSubType(currentNode);
const subTypes = getSubTypeList(nodeType)
const optionManager = getOptionManager(nodeType, subType as any);
return {
originalNodeType,
originalNodeSubType,
nodeType,
subType,
subTypes,
optionManager,
}
}
+19 -6
View File
@@ -1,4 +1,5 @@
import { AutomationNodeSubtype, AutomationNodeTypes } from "types/automations";
import { ActionType } from "types/automations/actions";
import { AutomationNode } from '../../types/automations/index';
@@ -40,13 +41,13 @@ const triggerTypes = [
export const getSubTypeList = <T extends AutomationNodeTypes>(
nodeType: T
): Array<AutomationNodeSubtype<T>| 'condition'> => {
): 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 triggerTypes as any;
}
return [];
}
@@ -54,11 +55,23 @@ export const getSubTypeList = <T extends AutomationNodeTypes>(
export const getNodeSubType = <T extends AutomationNodeTypes>(
node: AutomationNode<T>
): AutomationNodeSubtype<T> => {
if (node.$smType === 'action') {
return node.action as any;
} else if(node.$smType === 'condition') {
if ('condition' in node) {
return node.condition as any;
} else {
} 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!")
}
}
@@ -17,6 +17,10 @@
border-color: var(--change);
}
.node-editor--root.not-ready .node-editor--footer--save {
color: var(--error)
}
.node-editor--body-title {
display: flex;
flex-direction: row;
@@ -14,13 +14,9 @@ export default {
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
node: {
$smType: 'action',
action: 'service',
action_data: {
'data': {},
'service': '',
'target': '',
}
'data': {},
'service': '',
'target': '',
}
}
} as ComponentMeta<typeof NodeEditor>
@@ -41,30 +37,21 @@ export const Condition = Action.bind({})
Condition.args = {
...Condition.args,
node: {
"$smType": "condition",
"condition": "and",
"condition_data": {
"conditions": [
{
"$smType": "condition",
"condition": "numeric_state",
"condition_data": {
"entity_id": [
"sensor.kitchen_humidity"
],
"conditions": [],
"above": "40"
}
},
{
"$smType": "condition",
"condition": "template",
"condition_data": {
"value_template": "states('switch.kitchen') == 'on'"
}
}
]
}
"conditions": [
{
"condition": "numeric_state",
"entity_id": [
"sensor.kitchen_humidity"
],
"conditions": [],
"above": "40"
},
{
"condition": "template",
"value_template": "states('switch.kitchen') == 'on'"
}
]
} as AutomationCondition,
}
+23 -11
View File
@@ -1,12 +1,13 @@
import "./index.css";
import { FC } from "react";
import { FC } from 'react';
import { AutomationNode, AutomationNodeMapping } from 'types/automations/index';
import { useEditorNodeState } from "./OptionManager";
import InputList from "components/Inputs/InputList";
import { InputList } from "components/Inputs/InputList";
import { Button } from "components/Inputs/Button";
import InputBoolean from "components/Inputs/InputBoolean";
export interface Props {
export interface NodeEditorProps {
node: AutomationNode
allowedTypes?: Array<keyof AutomationNodeMapping>;
onClose?: () => void;
@@ -15,7 +16,7 @@ export interface Props {
saveBtnCreateText?: boolean;
}
export const NodeEditor: FC<Props> = ({
export const NodeEditor: FC<NodeEditorProps> = ({
node,
allowedTypes = ["action", "condition", "trigger"],
onClose = () => { },
@@ -27,15 +28,17 @@ export const NodeEditor: FC<Props> = ({
// state
const state = useEditorNodeState(node);
// state
// alias
const isModified = state.isModified;
const isReady = state.isReady();
const areYouSureNotReady = (what: string) => !isReady ?
window.confirm(`This node is missing some values, are you sure you want to ${what}?`) :
true;
// events
onFlags(isReady, isModified);
// render
return <div className={["node-editor--root", isModified ? "modded" : ""].join(" ")}>
return <div className={["node-editor--root", isModified ? "modded" : "", (!isReady && isModified) ? 'not-ready' : ''].join(" ")}>
<div className="node-editor--body">
<div className="node-editor--body-title">
{allowedTypes.length > 1 ? <InputList
@@ -50,14 +53,23 @@ export const NodeEditor: FC<Props> = ({
options={state.subTypes}
onChange={state.setSubType}
/> : <></>}
<InputBoolean label="Yaml" onChange={state.setYamlMode} value={state.yamlMode} />
</div>
{state.renderOptionList()}
</div>
<div className="node-editor--footer">
<Button onClick={onClose}>Close</Button>
<Button onClick={() => {
isReady && onSave(state.data)
}} disabled={!isReady}>{saveBtnCreateText ? "Create" : "Save"}</Button>
<Button className="node-editor--footer--close" onClick={() => areYouSureNotReady('close') && onClose()}>Close</Button>
<Button
className="node-editor--footer--save"
onClick={() => {
areYouSureNotReady('save') && onSave(state.data)
}}
title={
!isReady ? "Some fields have not been properly filled up" : ""
}
>
{saveBtnCreateText ? "Create" : "Save"}
</Button>
{children}
</div>
</div>
+15 -2
View File
@@ -1,10 +1,23 @@
:root {
--primary: #111111;
--primary: #111;
--primary-light: #333;
--primary-light-opaque: #3335;
--secondary-opaque: #1c1c1c;
--secondary: #1c1c1c;
--primary-accent: #bbbbbb;
--primary-accent: #bbb;
--primary-accent-light: #eee;
--secondary-accent: #929191;
--green: #1f1;
--green-opaque: #1f15;
--green-light: #6f5;
--error: #c55;
--error-light: #f77;
--error-opaque: #c555;
--error-accent: #9f3a3a;
--change: #0f9;
--condition-primary: #447;
--condition-accent: #8af;
--condition-primary-opaque: #4476;
touch-action: pan-x pan-y;
height: 100%;
}
+28 -17
View File
@@ -11,29 +11,40 @@ export const {
ThemeProvider,
useTheme,
} = createTheming(createContext({
primary: '#111111',
secondary: '#1c1c1c',
primaryAccent: '#bbbbbb',
secondaryAccent: '#929191',
primary: 'var(--primary)',
primaryLight: 'var(--primary-light)',
primaryLightOpaque: 'var(--primary-light-opaque)',
secondary: 'var(--secondary)',
secondaryOpaque: 'var(--secondary-opaque)',
primaryAccent: 'var(--primary-acccent)',
primaryAccentLight: 'var(--primary-acccent-light)',
secondaryAccent: 'var(--secondary-accent)',
condition: {
primaryColor: '#4f4f77',
primaryColor: 'var(--condition-primary)',
primaryAccent: 'var(--condition-accent)',
primaryColorOpaque: 'var(--condition-primary-opaque)'
},
red: '#ed0c0c',
redAccent: '#9f3a3a',
green: 'var(--green)',
greenLight: 'var(--green-light)',
greenOpaque: 'var(--green-opaque)',
red: 'var(--error)',
redOpaque: 'var(--error-opaque)',
redAccent: 'var(--error-accent)',
redLight: 'var(--error-light)',
}));
export type GetThemeType<C extends Context<any>> = C extends Context<infer T> ? T : unknown;
export type GetThemeType<C extends Context<any>> = C extends Context<infer T> ? T : unknown;
export type ClassNamesOfStyle<F extends (...args: any) => any> = Record<keyof ReturnType<F>, string>;
export type AppTheme = GetThemeType<typeof ThemeContext>;
export const createAppUseStyles = <
Props extends {} = {},
C extends string = string,
>(f: (theme: AppTheme) => Styles<C, Props, AppTheme>) => (props: Props): {
classes: Classes<keyof Styles<C, Props, AppTheme>>,
theme: AppTheme,
} => {
const theme = useTheme();
const useStyles = createUseStyles<C,Props,AppTheme>(f as any)
const classes = useStyles({...props, theme}) as Classes<keyof Styles<C, Props, AppTheme>>;
return {classes, theme};
}
>(f: (theme: AppTheme) => Styles<C, Props, AppTheme>) => (props: Props): {
classes: Classes<keyof Styles<C, Props, AppTheme>>,
theme: AppTheme,
} => {
const theme = useTheme();
const useStyles = createUseStyles<C, Props, AppTheme>(f as any)
const classes = useStyles({ ...props, theme }) as Classes<keyof Styles<C, Props, AppTheme>>;
return { classes, theme };
}
+25 -22
View File
@@ -2,54 +2,57 @@ import { AutomationSequenceNode } from ".";
import { AutomationTime } from "./common";
import { AutomationCondition } from "./conditions";
interface AutomationActionNodeBase<Name extends String,Data extends Object> {
$smType: 'action';
action: Name;
action_data: Data & {
alias?: string;
variables?: Record<string, any>;
};
type AutomationActionNodeBase<Data extends Object> = Data & {
alias?: string;
variables?: Record<string, any>;
}
export interface ServiceAction extends AutomationActionNodeBase<"service", {
export type ServiceAction = AutomationActionNodeBase<{
service: string;
target: any;
data: any;
}>{}
export interface RepeatAction extends AutomationActionNodeBase<"repeat", {
}>
export type RepeatAction = AutomationActionNodeBase<{
repeat: {
count: number;
sequence: AutomationAction[];
}
}>{}
export interface WaitAction extends AutomationActionNodeBase<"wait", {
}>
export type WaitAction = AutomationActionNodeBase<{
wait_template: string;
timeout?: AutomationTime;
continue_on_timeout?: boolean;
}>{}
export interface FireEventAction extends AutomationActionNodeBase<"event", {
}>
export type FireEventAction = AutomationActionNodeBase<{
event: string;
event_data: any;
}>{}
export interface DeviceAction extends AutomationActionNodeBase<"device", {
}>
export type DeviceAction = AutomationActionNodeBase<{
type: string;
device_id: string;
entity_id?: string;
domain: string;
}>{}
export interface ChooseAction extends AutomationActionNodeBase<"choose", {
}>
export type ChooseAction = AutomationActionNodeBase<{
choose: Array<{
conditions: AutomationCondition[];
sequence: AutomationSequenceNode[];
}>;
default: AutomationSequenceNode[];
}>{}
export type AutomationAction =
}>
export type AutomationAction =
| ServiceAction
| RepeatAction
| WaitAction
| FireEventAction
| DeviceAction
| ChooseAction
;
export type ActionType = AutomationAction['action'];
;
export type ActionType =
| 'service'
| 'repeat'
| 'wait'
| 'event'
| 'device'
| 'choose'
;
+17 -20
View File
@@ -1,44 +1,41 @@
import { AutomationTime } from "./common";
interface AutomationConditionNodeBase<Name extends String, Data extends Object> {
$smType: 'condition';
type AutomationConditionNodeBase<Name extends String, Data extends Object> = {
condition: Name;
condition_data: Data & {
alias?: string;
};
}
export interface LogicCondition extends AutomationConditionNodeBase<'and' | 'or' | 'not', {
alias?: string;
} & Data;
export type LogicCondition = AutomationConditionNodeBase<'and' | 'or' | 'not', {
conditions: AutomationCondition[];
}> { }
export interface NumericCondition extends AutomationConditionNodeBase<'numeric_state', {
}>;
export type NumericCondition = AutomationConditionNodeBase<'numeric_state', {
entity_id: string | string[];
above?: string;
below?: string;
attribute?: string;
value_template?: string;
}> { }
export interface StateCondition extends AutomationConditionNodeBase<'state', {
}>;
export type StateCondition = AutomationConditionNodeBase<'state', {
entity_id: string | string[];
state: string | string[];
for?: AutomationTime;
attribute?: string;
}> { }
export interface TemplateCondition extends AutomationConditionNodeBase<'template', {
}>;
export type TemplateCondition = AutomationConditionNodeBase<'template', {
value_template: string;
}> { }
export interface TimeCondition extends AutomationConditionNodeBase<'time', {
}>;
export type TimeCondition = AutomationConditionNodeBase<'time', {
after?: AutomationTime;
before?: AutomationTime;
weekday?: Array<'mon' | 'tue' | 'wed' | 'thu' | 'fri' | 'sat' | 'sun'>;
}> { }
export interface TriggerCondition extends AutomationConditionNodeBase<'trigger', {
}>;
export type TriggerCondition = AutomationConditionNodeBase<'trigger', {
id: string;
}> { }
export interface ZoneCondition extends AutomationConditionNodeBase<'zone', {
}>;
export type ZoneCondition = AutomationConditionNodeBase<'zone', {
zone: string;
entity_id: string | string[];
state: string | string[];
}> { }
}>;
export type AutomationCondition =
| LogicCondition
| NumericCondition
+1
View File
@@ -13,6 +13,7 @@ export interface AutomationMetadata {
export interface AutomationData {
metadata: AutomationMetadata;
trigger: AutomationTrigger[];
condition: AutomationCondition[];
sequence: AutomationSequenceNode[];
tags: Record<string, string>;
}
-1
View File
@@ -2,7 +2,6 @@ import { AutomationTime } from "./common";
interface AutomationTriggerBase {
alias?: string;
$smType: undefined | 'trigger';
}
export interface AutomationTriggerEvent extends AutomationTriggerBase {
+1 -13
View File
@@ -1,13 +1 @@
export type Point = [number, number];
export type BBox = [Point, Point];
export type NodeColor = 'red' | 'blue' | 'green';
export interface Node {
loc: Point;
text: string;
color: NodeColor;
}
export type EdgeDirection = '1->2' | '1<->2' | '1<-2';
export interface BoundedObj<J> {
elm: J;
bbox: BBox;
}
export type NodeColor = 'red' | 'blue' | 'green' | 'lblue';
+81
View File
@@ -0,0 +1,81 @@
import { AutomationNode, AutomationNodeMapping, AutomationNodeSubtype, AutomationNodeTypes } from "types/automations";
import { AutomationTrigger } from 'types/automations/triggers';
export const getNodeType = (node: AutomationNode): AutomationNodeTypes => {
console.log({ node })
if ('condition' in node) {
return 'condition'
} else if ('platform' in node) {
return 'trigger'
} else {
return 'action'
}
}
export const getSubTypeList = <T extends AutomationNodeTypes>(nodeType: T): AutomationNodeSubtype<T>[] => {
switch (nodeType) {
case 'action':
return [
"service",
"repeat",
"wait",
"device",
"choose",
] as any
case "condition":
return [
'or',
'and',
'not',
'numeric_state',
'state',
'template',
'time',
'trigger',
'zone',
] as any
case 'trigger':
return [
'event',
'homeassistant',
'mqtt',
'numeric_state',
'state',
'tag',
'template',
'time',
'time_pattern',
'webhook',
'zone',
'device',
] as any
default:
return [];
}
}
export const makeDefault = (nodeType: keyof AutomationNodeMapping): AutomationNode => {
switch (nodeType) {
case 'action':
return {
'data': {},
'service': '',
'target': {},
}
case 'condition':
return {
condition: 'and',
conditions: []
}
default:
return {
platform: 'device',
device_id: '',
domain: '',
type: '',
subtype: '',
} as AutomationTrigger
}
}
+16 -8
View File
@@ -2,41 +2,48 @@ import { AutomationCondition, LogicCondition, NumericCondition, StateCondition,
import { AutomationData } from 'types/automations';
export const getConditionDefaultValues = (condition: AutomationCondition['condition']): AutomationCondition['condition_data'] => {
export const getConditionDefaultValues = (condition: AutomationCondition['condition']): AutomationCondition => {
if (
(condition === 'or') ||
(condition === 'and') ||
(condition === 'not')
) {
return {
condition,
conditions: []
} as LogicCondition['condition_data']
} as LogicCondition
} else if (condition === 'template') {
return {
condition,
value_template: ""
} as TemplateCondition['condition_data']
} as TemplateCondition
} else if (condition === 'numeric_state') {
return {
condition,
entity_id: []
} as NumericCondition['condition_data']
} as NumericCondition
} else if (condition === 'state') {
return {
condition,
entity_id: [],
state: [],
} as StateCondition['condition_data']
} as StateCondition
} else if (condition === 'time') {
return {
} as TimeCondition['condition_data']
condition,
} as TimeCondition
} else if (condition === 'trigger') {
return {
condition,
id: ""
} as TriggerCondition['condition_data']
} as TriggerCondition
} else if (condition === 'zone') {
return {
condition,
zone: "",
entity_id: [],
state: [],
} as ZoneCondition['condition_data']
} as ZoneCondition
}
throw new Error("NOT IMPLEMENTED!")
}
@@ -51,4 +58,5 @@ export const defaultAutomation = (id: string): AutomationData => ({
tags: {},
trigger: [],
sequence: [],
condition: [],
})
+61 -128
View File
@@ -1,27 +1,23 @@
import {convertTimeToString, getDescriptionFromAutomationNode} from "./formatting";
import { convertTimeToString, getDescriptionFromAutomationNode } from "./formatting";
test('converting time to a string', () => {
expect(convertTimeToString({hours: 1})).toEqual('01:00:00:00')
expect(convertTimeToString({hours: 1, minutes:5})).toEqual('01:05:00:00')
expect(convertTimeToString({hours: 1, minutes:5, seconds: 24})).toEqual('01:05:24:00')
expect(convertTimeToString({hours: 1, milliseconds: 100})).toEqual('01:00:00:100')
expect(convertTimeToString({ hours: 1 })).toEqual('01:00:00:00')
expect(convertTimeToString({ hours: 1, minutes: 5 })).toEqual('01:05:00:00')
expect(convertTimeToString({ hours: 1, minutes: 5, seconds: 24 })).toEqual('01:05:24:00')
expect(convertTimeToString({ hours: 1, milliseconds: 100 })).toEqual('01:00:00:100')
})
test('using alias as description', () => {
expect(getDescriptionFromAutomationNode({
$smType: "action",
action: "service",
action_data: {
alias: "Start Music In Kitchen",
service: 'media_player.play_media',
target: {
entity_id: "media_player.kitchen_dot"
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
alias: "Start Music In Kitchen",
service: 'media_player.play_media',
target: {
entity_id: "media_player.kitchen_dot"
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
})).toEqual("Start Music In Kitchen")
})
@@ -29,30 +25,22 @@ test('using alias as description', () => {
test('get service action description', () => {
expect(getDescriptionFromAutomationNode({
$smType: "action",
action: "service",
action_data: {
service: 'media_player.play_media',
target: {
entity_id: "media_player.kitchen_dot"
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
service: 'media_player.play_media',
target: {
entity_id: "media_player.kitchen_dot"
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
})).toEqual("media_player.play_media")
})
test('get repeat action description', () => {
expect(getDescriptionFromAutomationNode({
$smType: "action",
action: "repeat",
action_data: {
repeat: {
count: 10,
sequence: []
}
repeat: {
count: 10,
sequence: []
}
})).toEqual("Repeat 10")
})
@@ -60,156 +48,101 @@ test('get repeat action description', () => {
test('get wait action description', () => {
expect(getDescriptionFromAutomationNode({
$smType: "action",
action: "wait",
action_data: {
wait_template: "states(switch.kitchen_light) == 'on'"
}
wait_template: "states(switch.kitchen_light) == 'on'"
})).toEqual("Wait on states(switch.kitchen_light) == 'on'")
expect(getDescriptionFromAutomationNode({
$smType: "action",
action: "wait",
action_data: {
wait_template: "states(switch.kitchen_light) == 'on'",
// timeout: '00:01:00',
timeout: {
'minutes': 1,
}
wait_template: "states(switch.kitchen_light) == 'on'",
timeout: {
'minutes': 1,
}
})).toEqual("Wait on states(switch.kitchen_light) == 'on' for 00:01:00:00")
})
test('get fire event action description', () => {
expect(getDescriptionFromAutomationNode({
$smType: 'action',
action: 'event',
action_data: {
event: 'test_event',
event_data: {},
}
event: 'test_event',
event_data: {},
})).toEqual("Trigger test_event")
})
test('get device action description', () => {
expect(getDescriptionFromAutomationNode({
$smType: 'action',
action: 'device',
action_data: {
device_id: "12310das01231",
domain: "zwave_js",
type: "set_value"
}
device_id: "12310das01231",
domain: "zwave_js",
type: "set_value"
})).toEqual("set_value on 12310das01231")
})
test('get choose action description', () => {
expect(getDescriptionFromAutomationNode({
$smType: 'action',
action: 'choose',
action_data: {
choose: [],
default: [],
}
choose: [],
default: [],
})).toEqual("Choose")
})
test('get and/or/not condition description', () => {
expect(getDescriptionFromAutomationNode({
$smType: 'condition',
condition: 'and',
condition_data: {
conditions: [],
}
conditions: [],
})).toEqual("Logic")
expect(getDescriptionFromAutomationNode({
$smType: 'condition',
condition: 'or',
condition_data: {
conditions: [],
}
conditions: [],
})).toEqual("Logic")
expect(getDescriptionFromAutomationNode({
$smType: 'condition',
condition: 'not',
condition_data: {
conditions: [],
}
conditions: [],
})).toEqual("Logic")
})
test('get Numeric State condition description', () => {
expect(getDescriptionFromAutomationNode({
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.temperature',
}
entity_id: 'sensor.temperature',
})).toEqual("sensor.temperature?>?<")
expect(getDescriptionFromAutomationNode({
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: ""
}
entity_id: ""
})).toEqual("Numeric State Condition")
expect(getDescriptionFromAutomationNode({
$smType: 'condition',
condition: "numeric_state",
condition_data: {
entity_id: 'sensor.temperature',
above: '17',
}
entity_id: 'sensor.temperature',
above: '17',
})).toEqual("sensor.temperature > 17")
expect(getDescriptionFromAutomationNode({
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.temperature',
below: '5',
}
entity_id: 'sensor.temperature',
below: '5',
})).toEqual("sensor.temperature < 5")
expect(getDescriptionFromAutomationNode({
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.temperature',
above: '17',
below: '20',
}
})).toEqual("17 < sensor.temperature < 20")
expect(getDescriptionFromAutomationNode({
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.temperature',
above: '17',
below: '20',
value_template: "{{ float(state.state) + 2 }}"
}
above: '17',
below: '20',
})).toEqual("17 < sensor.temperature < 20")
expect(getDescriptionFromAutomationNode({
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: [
"sensor.kitchen_temperature",
"sensor.living_room_temperature"
],
above: '17',
below: '20',
value_template: "{{ float(state.state) + 2 }}"
}
entity_id: 'sensor.temperature',
above: '17',
below: '20',
value_template: "{{ float(state.state) + 2 }}"
})).toEqual("17 < sensor.temperature < 20")
expect(getDescriptionFromAutomationNode({
condition: 'numeric_state',
entity_id: [
"sensor.kitchen_temperature",
"sensor.living_room_temperature"
],
above: '17',
below: '20',
value_template: "{{ float(state.state) + 2 }}"
})).toEqual("17 < ... < 20")
})
test('get State condition description', () => {
expect(getDescriptionFromAutomationNode({
$smType: 'condition',
condition: 'state',
condition_data: {
entity_id: 'switch.kitchen_light',
state: "on"
}
entity_id: 'switch.kitchen_light',
state: "on"
})).toEqual("switch.kitchen_light is 'on'")
})
+67 -148
View File
@@ -3,164 +3,83 @@ import { AutomationTime } from "types/automations/common";
export const convertTimeToString = ({
hours=0,
minutes=0,
seconds=0,
milliseconds=0,
}: AutomationTime) => [hours,minutes,seconds,milliseconds].map(n => String(n).padStart(2, '0')).join(':')
hours = 0,
minutes = 0,
seconds = 0,
milliseconds = 0,
}: AutomationTime) => [hours, minutes, seconds, milliseconds].map(n => String(n).padStart(2, '0')).join(':')
export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(node: AutomationNode<N>): string => {
if (node.$smType) {
switch (node['$smType']) {
case "action":
if (node.action_data.alias) {
return node.action_data.alias;
}
switch(node.action) {
case 'service':
return node.action_data.service
case 'repeat':
return 'Repeat ' + node.action_data.repeat.count;
case 'wait':
let out= 'Wait on ' + node.action_data.wait_template;
if (node.action_data.timeout) {
out += (' for ' + convertTimeToString(node.action_data.timeout))
}
return out;
case 'event':
return `Trigger ${node.action_data.event}`
case 'device':
return `${node.action_data.type} on ${node.action_data.device_id}`
case 'choose':
return "Choose"
default:
return 'n/a'
}
case "condition":
if (node.condition_data.alias) {
return node.condition_data.alias;
}
if(
(node.condition === 'and') ||
(node.condition === 'or') ||
(node.condition === 'not')
) {
return "Logic"
} else {
switch(node.condition) {
case "numeric_state":
if(node.condition_data.entity_id) {
const center = prettyEntityId(node.condition_data.entity_id);
if(node.condition_data.above) {
if(node.condition_data.below) {
return `${node.condition_data.above} < ${center} < ${node.condition_data.below}`
}
return `${center} > ${node.condition_data.above}`
}
if(node.condition_data.below) {
return `${center} < ${node.condition_data.below}`
}
return `${center}?>?<`
}
return "Numeric State Condition"
case "state":
return `${node.condition_data.entity_id} is '${node.condition_data.state}'`
case 'template':
return node.condition_data.value_template
default:
return 'n/a'
}
}
}
} else {
if (node.alias) {
return node.alias;
}
if (node.alias) {
return node.alias;
}
if ('platform' in node) {
return node.platform
}
if ('condition' in node) {
if (
(node.condition === 'and') ||
(node.condition === 'or') ||
(node.condition === 'not')
) {
return "Logic"
} else {
switch (node.condition) {
case "numeric_state":
if (node.entity_id) {
const center = prettyEntityId(node.entity_id);
if (node.above) {
if (node.below) {
return `${node.above} < ${center} < ${node.below}`
}
return `${center} > ${node.above}`
}
if (node.below) {
return `${center} < ${node.below}`
}
return `${center}?>?<`
}
return "Numeric State Condition"
case "state":
return `${node.entity_id} is '${node.state}'`
case 'template':
return node.value_template
default:
return 'n/a'
}
}
}
if ('service' in node) {
return node.service
}
if ('repeat' in node) {
return 'Repeat ' + node.repeat.count
}
if ('wait_template' in node) {
let out = 'Wait on ' + node.wait_template;
if (node.timeout) {
out += (' for ' + convertTimeToString(node.timeout))
}
return out;
}
if ('event' in node) {
return `Trigger ${node.event}`
}
if ('device_id' in node) {
return `${node.type} on ${node.device_id}`
}
if ('choose' in node) {
return "Choose"
}
return 'n/a'
}
export const prettyEntityId = (entityId: string| string[]) => {
export const prettyEntityId = (entityId: string | string[]) => {
if (typeof entityId === 'string') {
return entityId
} else if(entityId.length === 1) {
} else if (entityId.length === 1) {
return entityId[0]
} else {
} else {
return "..."
}
}
// export const determineNodeTypes = (action: AutomationNode<any>) : [AutomationNodeType, NodeSubType] => {
// if ('condition' in action) {
// switch (action.condition) {
// case 'and':
// return ['condition', 'Logic']
// case 'or':
// return ['condition', 'Logic']
// case 'not':
// return ['condition', 'Logic']
// case 'numeric_state':
// return ['condition', 'Numeric State']
// case 'state':
// return ['condition', 'State']
// case 'template':
// return ['condition', 'Template']
// case 'trigger':
// return ['condition', 'Trigger']
// case 'zone':
// return ['condition', 'Zone']
// default:
// return ['condition', 'Generic']
// }
// }
// if ('platform' in action) {
// switch (action.platform) {
// case 'event':
// return ['trigger', 'Event']
// case 'homeassistant':
// return ['trigger', 'Home Assistant']
// case 'mqtt':
// return ['trigger', 'MQTT']
// case 'numeric_state':
// return ['trigger', 'Numeric State']
// case 'state':
// return ['trigger', 'State']
// case 'tag':
// return ['trigger', 'Tag']
// case 'template':
// return ['trigger', 'Template']
// case 'time':
// return ['trigger', 'Time']
// case 'time_pattern':
// return ['trigger', 'Time Pattern']
// case 'webhook':
// return ['trigger', 'Webhook']
// case 'zone':
// return ['trigger', 'Zone']
// default:
// return ['trigger', 'Generic']
// }
// }
// if ('service' in action) {
// return ["action", "Service"]
// }
// if ('repeat' in action) {
// return ["action", "Repeat"]
// }
// if ('wait_template' in action) {
// return ["action", "Wait"]
// }
// if ('event' in action) {
// return ["action", "Event"]
// }
// if (('type' in action) && ('device_id' in action)) {
// return ["action", "Device"]
// }
// if ('choose' in action) {
// return ["action", "Choose"]
// }
// throw Error(`Could not determine node type ${JSON.stringify(action)}`)
// }
-51
View File
@@ -1,51 +0,0 @@
import { Point } from "types/graphs";
export const offsetPoint = (
[x, y]: Point,
[ox, oy]: Point = [0, 0],
): Point => [x + ox, y + oy];
export const applyPoints = (
[x1, y1]: Point,
[x2, y2]: Point,
fun: (a: number, b: number) => number,
): Point => [fun(x1, x2), fun(y1, y2)];
export const avgPoints = (
p1: Point,
p2: Point,
): Point => applyPoints(p1, p2, (a,b) => (a+b)/2);
export const minPoints = (
p1: Point,
p2: Point,
): Point => applyPoints(p1, p2, Math.min);
export const maxPoints = (
p1: Point,
p2: Point,
): Point => applyPoints(p1, p2, Math.max);
export const makeOffsetMaintainer = (startPoint: Point) => {
let offset: Point = [0, 0];
let i = 0;
return {
setI(newI: number) {
i = newI;
},
resetY() {
offset[1] = 0;
},
update(p: Point, innerStartLoc: Point) {
offset[0] = Math.max(offset[0], p[0] - i - 0.5 - startPoint[0])
offset[1] = Math.max(offset[1], p[1] - innerStartLoc[1] + 1)
},
get x() {
return offset[0]
},
get y() {
return offset[1]
}
}
}
+20 -34
View File
@@ -12,55 +12,41 @@ export const createMockAuto = (tags: Record<string, string> = {}): AutomationDat
mode: 'single',
},
tags,
condition: [],
trigger: [
{
"$smType": undefined,
"platform": "numeric_state",
"entity_id": "test",
},
{
"$smType": undefined,
"platform": "homeassistant",
"event": "start",
}
],
sequence: [
{
$smType: "condition",
condition: 'and',
condition_data: {
conditions: [
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.temperature_kitchen',
below: '15',
}
},
{
$smType: "condition",
condition: 'template',
condition_data: {
value_template: 'states(switch.kitchen_light) == "on"'
}
}
]
}
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.temperature_kitchen',
below: '15',
},
{
condition: 'template',
value_template: 'states(switch.kitchen_light) == "on"'
}
]
},
{
$smType: "action",
action: "service",
action_data: {
alias: "Start Music In Kitchen",
service: 'media_player.play_media',
target: {
entity_id: "media_player.kitchen_dot"
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
alias: "Start Music In Kitchen",
service: 'media_player.play_media',
target: {
entity_id: "media_player.kitchen_dot"
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
}
]
+23
View File
@@ -0,0 +1,23 @@
import { useRef, useEffect } from 'react';
export const useDelayEffect = (cb: () => void, deps: any[], timeout: number) => {
const fcn = useDelayedFunction(cb, timeout);
useEffect(() => {
fcn()
}, [deps])
}
export const useDelayedFunction = <FcnParams extends any[]>(
cb: (...p: FcnParams) => void, timeout: number
) => {
const timeid = useRef<number | null>(null);
return (...args: FcnParams) => {
if (timeid.current) {
window.clearTimeout(timeid.current)
}
timeid.current = window.setTimeout(() => {
cb(...args)
}, timeout)
}
}
-14
View File
@@ -6704,13 +6704,6 @@ chownr@^2.0.0:
resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"
integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
chroma-js@^2.1.2:
version "2.1.2"
resolved "https://registry.npmjs.org/chroma-js/-/chroma-js-2.1.2.tgz"
integrity sha512-ri/ouYDWuxfus3UcaMxC1Tfp3IE9K5iQzxc2hSxbBRVNQFut1UuGAsZmiAf2mOUubzGJwgMSv9lHg+XqLaz1QQ==
dependencies:
cross-env "^6.0.3"
chrome-trace-event@^1.0.2:
version "1.0.2"
resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"
@@ -7249,13 +7242,6 @@ create-require@^1.1.0:
resolved "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz"
integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
cross-env@^6.0.3:
version "6.0.3"
resolved "https://registry.npmjs.org/cross-env/-/cross-env-6.0.3.tgz"
integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==
dependencies:
cross-spawn "^7.0.0"
cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2:
version "7.0.3"
resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"