Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ca1fcc9189 | ||
|
|
33e0c7871c | ||
|
|
d07cfa8b61 | ||
|
|
ef876a1c0a | ||
|
|
aa9755b003 | ||
|
|
e1c983e1d1 | ||
|
|
38baac3acc | ||
|
|
7ff5db3fa0 | ||
|
|
021fa2b651 | ||
|
|
47bf511bbf | ||
|
|
ebd99c80a3 | ||
|
|
b76dc672f3 | ||
|
|
6821bb8714 | ||
|
|
c256400518 | ||
|
|
634f3e9219 | ||
|
|
a56c7ff964 | ||
|
|
b29596fe78 | ||
|
|
1620d04624 | ||
|
|
1ed1e63330 | ||
|
|
7ae50e634a | ||
|
|
56d68d9065 | ||
|
|
468a022582 | ||
|
|
5dcd17ad17 | ||
|
|
b1df6aebe2 | ||
|
|
b98d4a8812 | ||
|
|
58379ebfc8 | ||
|
|
41059b4974 | ||
|
|
af600aaf57 | ||
|
|
738712e946 | ||
|
|
7a278c856a | ||
|
|
3c64550d10 | ||
|
|
beff46aeff | ||
|
|
7f3173684d | ||
|
|
8a06a1674b | ||
|
|
3e28974abf | ||
|
|
19ea12a70e | ||
|
|
f30ba7286b | ||
|
|
2617febece | ||
|
|
81bd15436e | ||
|
|
4b3028355d | ||
|
|
46209564f0 | ||
|
|
bd3cfdf859 | ||
|
|
44ad46cff3 | ||
|
|
baada590c5 | ||
|
|
4f78e42699 | ||
|
|
43c3438b2f | ||
|
|
7ea923a050 | ||
|
|
afc67a17ec | ||
|
|
248660ff30 | ||
|
|
3314d111d6 | ||
|
|
b368be0ff4 | ||
|
|
acb12e73e8 | ||
|
|
9e9cea9269 | ||
|
|
b329e3f594 | ||
|
|
e9cbacbc92 | ||
|
|
5e345d20e5 | ||
|
|
f6af594a8f | ||
|
|
ff7dee0879 | ||
|
|
d250018c9a | ||
|
|
95af6392ba | ||
|
|
fedc6c889a | ||
|
|
77c338eb90 | ||
|
|
967508c29e | ||
|
|
93fe26e787 | ||
|
|
5a6f79a0d6 | ||
|
|
b1c5bce584 | ||
|
|
50ba9f3d6b |
No files matched your search
@@ -0,0 +1,70 @@
|
||||
# For most projects, this workflow file will not need changing; you simply need
|
||||
# to commit it to your repository.
|
||||
#
|
||||
# You may wish to alter this file to override the set of languages analyzed,
|
||||
# or to provide custom queries or build logic.
|
||||
#
|
||||
# ******** NOTE ********
|
||||
# We have attempted to detect the languages in your repository. Please check
|
||||
# the `language` matrix defined below to confirm you have the correct set of
|
||||
# supported CodeQL languages.
|
||||
#
|
||||
name: "CodeQL"
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ main ]
|
||||
pull_request:
|
||||
# The branches below must be a subset of the branches above
|
||||
branches: [ main ]
|
||||
schedule:
|
||||
- cron: '29 23 * * 0'
|
||||
|
||||
jobs:
|
||||
analyze:
|
||||
name: Analyze
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
actions: read
|
||||
contents: read
|
||||
security-events: write
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
language: [ 'javascript', 'python' ]
|
||||
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
|
||||
# Learn more about CodeQL language support at https://git.io/codeql-language-support
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
# Initializes the CodeQL tools for scanning.
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@v2
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
# If you wish to specify custom queries, you can do so here or in a config file.
|
||||
# By default, queries listed here will override any specified in a config file.
|
||||
# Prefix the list here with "+" to use these queries and those in the config file.
|
||||
# queries: ./path/to/local/query, your-org/your-repo/queries@main
|
||||
|
||||
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
|
||||
# If this step fails, then you should remove it and run the build manually (see below)
|
||||
- name: Autobuild
|
||||
uses: github/codeql-action/autobuild@v2
|
||||
|
||||
# ℹ️ Command-line programs to run using the OS shell.
|
||||
# 📚 https://git.io/JvXDl
|
||||
|
||||
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
|
||||
# and modify them (or add more) to build your code if your project
|
||||
# uses a compiled language
|
||||
|
||||
#- run: |
|
||||
# make bootstrap
|
||||
# make release
|
||||
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v2
|
||||
Vendored
+1
@@ -0,0 +1 @@
|
||||
{"buildTargets":["local_logs","local_ps","local_run","local_stop"],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}}
|
||||
Vendored
+8
@@ -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'
|
||||
|
||||
Vendored
+11
-2
@@ -1,3 +1,12 @@
|
||||
{
|
||||
"python.formatting.provider": "black"
|
||||
}
|
||||
"python.formatting.provider": "black",
|
||||
"python.testing.unittestArgs": [
|
||||
"-v",
|
||||
"-s",
|
||||
"./api/tests",
|
||||
"-p",
|
||||
"*test_*.py"
|
||||
],
|
||||
"python.testing.pytestEnabled": false,
|
||||
"python.testing.unittestEnabled": true
|
||||
}
|
||||
Vendored
+362
@@ -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
|
||||
|
||||
|
||||
+26
-4
@@ -1,10 +1,32 @@
|
||||
# Changelog
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
## [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)
|
||||
- cleaned up some button styles
|
||||
|
||||
## [0.0.12] - Tags
|
||||
|
||||
- Added tag management system for automations
|
||||
|
||||
## [0.0.11] - Zoom
|
||||
|
||||
- Added lazy saving
|
||||
|
||||
## [0.0.10] - Zoom
|
||||
|
||||
- Introducing Zoom!
|
||||
|
||||
## [0.0.9] - First Working Version
|
||||
|
||||
- Instalable verion via github
|
||||
- Initial POC done
|
||||
- Initial POC done
|
||||
|
||||
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
+4
-3
@@ -13,7 +13,8 @@ RUN apk add --no-cache \
|
||||
npm \
|
||||
build-base \
|
||||
python3-dev
|
||||
RUN pip install -U wheel setuptools pip
|
||||
RUN pip install -U wheel setuptools pip && \
|
||||
npm i -g yarn
|
||||
|
||||
# <--- Python Dependencies -->
|
||||
COPY api/setup.py /app/setup.py
|
||||
@@ -22,8 +23,8 @@ RUN pip install . /app
|
||||
# <--- Webapp Build -->
|
||||
COPY webapp/ /app/web-builder
|
||||
RUN cd /app/web-builder && \
|
||||
npm install && \
|
||||
npm run build && \
|
||||
yarn && \
|
||||
yarn build && \
|
||||
cp -r /app/web-builder/build /app/web && \
|
||||
rm -rf /app/web-builder
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Shortumation
|
||||
|
||||

|
||||

|
||||
|
||||
A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
||||
|
||||
@@ -9,6 +9,7 @@ A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI
|
||||
- [X] View your automations & scripts in a visual graph
|
||||
- [X] See all automations in one common view
|
||||
- [X] Automation Manager
|
||||
- [X] Tags for automation organization
|
||||
- [ ] Script Manager
|
||||
- [ ] Use secrets and global parameters
|
||||
- [ ] Autocomplete fields for entities/devices
|
||||
|
||||
+1
-2
@@ -8,7 +8,6 @@ setup:
|
||||
python3 -m venv $(VENV_FOLDER)
|
||||
$(PIP) install wheel==0.35.1
|
||||
$(PIP) install .[dev]
|
||||
$(VENV_BIN)/pre-commit install
|
||||
|
||||
lint:
|
||||
$(VENV_BIN)/vulture --exclude src
|
||||
@@ -44,4 +43,4 @@ clean:
|
||||
run-local:
|
||||
rm -f web
|
||||
ln -s ../webapp/build web
|
||||
USE_EXAMPLE_REPO=1 uvicorn src.app:app --reload
|
||||
USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload
|
||||
+12
-3
@@ -1,8 +1,10 @@
|
||||
from sys import prefix
|
||||
from fastapi import FastAPI
|
||||
from fastapi.staticfiles import StaticFiles
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
from src.automations.manager import AutomationManager
|
||||
from src.env import ROOT_FOLDER
|
||||
from .routes import ping, automations
|
||||
from src.env import ROOT_FOLDER, ORIGIN
|
||||
from .routes import ping, automations, details
|
||||
|
||||
|
||||
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
||||
@@ -18,7 +20,14 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
||||
)
|
||||
else:
|
||||
print("WARN: could not find web folder")
|
||||
app.add_middleware(
|
||||
CORSMiddleware,
|
||||
allow_origins=ORIGIN,
|
||||
allow_credentials=True,
|
||||
allow_methods=["*"],
|
||||
allow_headers=["*"],
|
||||
)
|
||||
app.include_router(ping.router, prefix="/ping")
|
||||
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations")
|
||||
|
||||
app.include_router(details.make_details_router(automation_mgr.hass_config), prefix="/details")
|
||||
return app
|
||||
@@ -0,0 +1,21 @@
|
||||
from fastapi import APIRouter
|
||||
from datetime import datetime
|
||||
|
||||
from src.hass_config import HassConfig
|
||||
from src.env import BUILD_VERSION
|
||||
|
||||
|
||||
|
||||
def make_details_router(hass_config: HassConfig) -> APIRouter:
|
||||
router = APIRouter()
|
||||
|
||||
@router.get("/")
|
||||
def read_ping():
|
||||
return {
|
||||
"version": BUILD_VERSION,
|
||||
"config": hass_config.get_configuration_path(),
|
||||
"tags": hass_config.get_automation_tags_path(),
|
||||
"autos": hass_config.get_automation_path(),
|
||||
}
|
||||
|
||||
return router
|
||||
@@ -2,7 +2,7 @@ from typing import Generic, List, TypeVar
|
||||
from pydantic import BaseModel
|
||||
from pydantic.fields import Field
|
||||
from pydantic.generics import GenericModel
|
||||
from src.automations.types import AutomationData
|
||||
from src.automations.types import ExtenededAutomationData
|
||||
|
||||
DataT = TypeVar("DataT")
|
||||
|
||||
@@ -20,7 +20,7 @@ class ListData(GenericModel, Generic[DataT]):
|
||||
|
||||
class UpdateAutoRequest(BaseModel):
|
||||
index: int = Field(description="Index of the automation to update")
|
||||
data: AutomationData
|
||||
data: ExtenededAutomationData
|
||||
|
||||
|
||||
class DeleteAutoRequest(BaseModel):
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
from itertools import chain
|
||||
from typing import Iterable, Iterator
|
||||
from typing import Iterator, Union
|
||||
from pydantic.error_wrappers import ValidationError
|
||||
from src.json_serializer import normalize_obj
|
||||
from .types import AutomationData, AutomationMetdata
|
||||
from .parsers import _parse_actions
|
||||
from .types import AutomationMetdata, ExtenededAutomationData
|
||||
from .errors import InvalidAutomationFile
|
||||
|
||||
# Single loader
|
||||
def load_automation(
|
||||
automations_raw_data: Iterable[dict],
|
||||
) -> Iterator[AutomationData]:
|
||||
auto_raw: dict,
|
||||
tags: dict,
|
||||
) -> Iterator[ExtenededAutomationData]:
|
||||
"""Converts an automation dictionary loaded directly from the config into
|
||||
several python typed objects
|
||||
|
||||
@@ -17,22 +16,36 @@ def load_automation(
|
||||
automations_raw_data (Iterable[dict])
|
||||
|
||||
Returns:
|
||||
Iterator[AutomationData]
|
||||
Iterator[ExtenededAutomationData]
|
||||
|
||||
"""
|
||||
for auto_raw in automations_raw_data:
|
||||
try:
|
||||
yield AutomationData(
|
||||
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", [])],
|
||||
)
|
||||
except ValidationError as err:
|
||||
raise InvalidAutomationFile from err
|
||||
try:
|
||||
yield ExtenededAutomationData(
|
||||
metadata=AutomationMetdata.parse_obj(auto_raw),
|
||||
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}")
|
||||
@@ -1,6 +1,6 @@
|
||||
from typing import Iterator, List, Optional
|
||||
from src.automations.errors import FailedDeletion
|
||||
from src.automations.types import AutomationData
|
||||
from src.automations.types import AutomationData, ExtenededAutomationData
|
||||
from src.hass_config.loader import HassConfig
|
||||
from .loader import load_automation
|
||||
|
||||
@@ -14,21 +14,24 @@ class AutomationManager:
|
||||
offset: int = 0,
|
||||
limit: int = 10,
|
||||
) -> Iterator[AutomationData]:
|
||||
tags = self.hass_config.automation_tags
|
||||
for i, auto in enumerate(self.hass_config.automations):
|
||||
if i < offset:
|
||||
continue
|
||||
if i >= offset + limit:
|
||||
break
|
||||
yield from load_automation([auto])
|
||||
yield from load_automation(auto, tags.get(i, {}))
|
||||
|
||||
def get(self, index: int) -> Optional[AutomationData]:
|
||||
tags = self.hass_config.automation_tags
|
||||
if index >= 0:
|
||||
for i, auto in enumerate(self.hass_config.automations):
|
||||
if i == index:
|
||||
return next(load_automation(([auto])))
|
||||
return next(load_automation(auto, tags.get(i, {})))
|
||||
return None
|
||||
|
||||
def update(self, index: int, automation: AutomationData):
|
||||
def update(self, index: int, automation: ExtenededAutomationData):
|
||||
tags = self.hass_config.automation_tags
|
||||
automations: List[dict] = []
|
||||
updated = False
|
||||
for i, orig_auto in enumerate(self.hass_config.automations):
|
||||
@@ -39,8 +42,10 @@ class AutomationManager:
|
||||
automations.append(orig_auto)
|
||||
if not updated:
|
||||
automations.append(automation.to_primitive())
|
||||
tags[index] = automation.tags
|
||||
self.hass_config.save_automations(automations)
|
||||
|
||||
self.hass_config.save_tags(tags)
|
||||
|
||||
def delete(self, index: int):
|
||||
automations: List[dict] = []
|
||||
deleted = False
|
||||
|
||||
@@ -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),
|
||||
)
|
||||
@@ -0,0 +1,15 @@
|
||||
|
||||
|
||||
|
||||
from pathlib import Path
|
||||
from typing import Dict
|
||||
from src.yaml_serializer import dump_yaml, load_yaml
|
||||
|
||||
class TagManager(Dict[int, Dict[str, str]]):
|
||||
def save(self, path: Path):
|
||||
path.write_text(dump_yaml(dict(self)))
|
||||
|
||||
@classmethod
|
||||
def load(cls, path: Path):
|
||||
with path.open('r') as fp:
|
||||
return cls(load_yaml(fp))
|
||||
@@ -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,12 +13,16 @@ 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):
|
||||
tags: Dict[str, str] = Field(default_factory=dict)
|
||||
+3
-1
@@ -1,7 +1,9 @@
|
||||
from decouple import config
|
||||
from email.policy import default
|
||||
from decouple import config, Csv
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
|
||||
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
|
||||
LOG_LEVEL = config("LOG_LEVEL", "INFO")
|
||||
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
|
||||
@@ -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,5 +1,6 @@
|
||||
from pathlib import Path
|
||||
from typing import List, Optional
|
||||
from src.automations.tags import TagManager
|
||||
|
||||
from src.yaml_serializer import load_yaml, dump_yaml
|
||||
from src.yaml_serializer.types import IncludedYaml
|
||||
@@ -24,6 +25,19 @@ class HassConfig:
|
||||
except FileNotFoundError as err:
|
||||
raise MissingFile("automations.yaml") from err
|
||||
return self.configurations["automation"]
|
||||
|
||||
@property
|
||||
def automation_tags(self) -> TagManager:
|
||||
tag_path = self.get_automation_tags_path()
|
||||
if not tag_path.exists():
|
||||
tag_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
return TagManager()
|
||||
else:
|
||||
return TagManager.load(tag_path)
|
||||
|
||||
|
||||
def get_automation_tags_path(self) -> Path:
|
||||
return self.root_path / ".shortumations" / "tags.yaml"
|
||||
|
||||
def get_configuration_path(self) -> Path:
|
||||
return self.root_path / "configuration.yaml"
|
||||
@@ -50,3 +64,6 @@ class HassConfig:
|
||||
self.get_configuration_path().write_text(
|
||||
dump_yaml({**self.configurations, "automation": automations})
|
||||
)
|
||||
|
||||
def save_tags(self, tags: TagManager):
|
||||
tags.save(self.get_automation_tags_path())
|
||||
@@ -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
|
||||
@@ -0,0 +1,813 @@
|
||||
- id: '1616887975473'
|
||||
alias: Home Assistant Off
|
||||
description: ''
|
||||
trigger:
|
||||
- platform: homeassistant
|
||||
event: shutdown
|
||||
condition: []
|
||||
action:
|
||||
- device_id: das2qdasdasdasadaasd
|
||||
domain: mobile_app
|
||||
type: notify
|
||||
title: Hassio Status
|
||||
message: Hassio Is turning off...
|
||||
mode: single
|
||||
- id: '1616888026264'
|
||||
alias: Home Assistant On
|
||||
description: ''
|
||||
trigger:
|
||||
- platform: homeassistant
|
||||
event: start
|
||||
condition: []
|
||||
action:
|
||||
- device_id: das2qdasdasdasadaasd
|
||||
domain: mobile_app
|
||||
type: notify
|
||||
title: Hassio Status
|
||||
message: Home assistant is up!
|
||||
mode: single
|
||||
- id: '1619371298367'
|
||||
alias: Living Room Button - Single Press
|
||||
description: ''
|
||||
trigger:
|
||||
- device_id: das2qdasdasdasadaasd
|
||||
domain: zha
|
||||
platform: device
|
||||
type: remote_button_short_press
|
||||
subtype: remote_button_short_press
|
||||
condition: []
|
||||
action:
|
||||
- service: light.toggle
|
||||
data: {}
|
||||
target:
|
||||
area_id: dining_table
|
||||
mode: single
|
||||
- id: '1620239986670'
|
||||
alias: Kitchen Button - Short Press
|
||||
description: ''
|
||||
trigger:
|
||||
- device_id: das2qdasdasdasadaasd
|
||||
domain: zha
|
||||
platform: device
|
||||
type: remote_button_short_press
|
||||
subtype: remote_button_short_press
|
||||
condition: []
|
||||
action:
|
||||
- service: light.toggle
|
||||
data: {}
|
||||
target:
|
||||
entity_id: light.switch_kitchen
|
||||
mode: single
|
||||
- id: '1620324780561'
|
||||
alias: Kitchen Island Button - Single Press
|
||||
description: ''
|
||||
trigger:
|
||||
- device_id: das2qdasdasdasadaasd
|
||||
domain: zha
|
||||
platform: device
|
||||
type: remote_button_short_press
|
||||
subtype: remote_button_short_press
|
||||
condition: []
|
||||
action:
|
||||
- type: toggle
|
||||
device_id: das2qdasdasdasadaasd
|
||||
entity_id: light.switch_island
|
||||
domain: light
|
||||
mode: single
|
||||
- id: '1621352850204'
|
||||
alias: Kitchen Button - Double Press
|
||||
description: ''
|
||||
trigger:
|
||||
- device_id: das2qdasdasdasadaasd
|
||||
domain: zha
|
||||
platform: device
|
||||
type: remote_button_double_press
|
||||
subtype: remote_button_double_press
|
||||
condition: []
|
||||
action:
|
||||
- type: toggle
|
||||
device_id: das2qdasdasdasadaasd
|
||||
entity_id: light.switch_island
|
||||
domain: light
|
||||
mode: single
|
||||
- id: '1622210698281'
|
||||
alias: Kitchen Button - Long Press
|
||||
description: ''
|
||||
trigger:
|
||||
- device_id: das2qdasdasdasadaasd
|
||||
domain: zha
|
||||
platform: device
|
||||
type: remote_button_long_press
|
||||
subtype: remote_button_long_press
|
||||
condition: []
|
||||
action:
|
||||
- choose:
|
||||
- conditions:
|
||||
- condition: numeric_state
|
||||
entity_id: light.switch_kitchen
|
||||
attribute: brightness
|
||||
above: '200'
|
||||
sequence:
|
||||
- service: light.turn_on
|
||||
data:
|
||||
brightness: 50
|
||||
target:
|
||||
entity_id: light.switch_kitchen
|
||||
default:
|
||||
- service: light.turn_on
|
||||
data:
|
||||
brightness: 255
|
||||
target:
|
||||
entity_id: light.switch_kitchen
|
||||
mode: single
|
||||
- id: '1622769811245'
|
||||
alias: Living Room Button - Double Press
|
||||
description: ''
|
||||
trigger:
|
||||
- device_id: das2qdasdasdasadaasd
|
||||
domain: zha
|
||||
platform: device
|
||||
type: remote_button_double_press
|
||||
subtype: remote_button_double_press
|
||||
condition: []
|
||||
action:
|
||||
- service: light.toggle
|
||||
data:
|
||||
brightness: 255
|
||||
target:
|
||||
entity_id: light.switch_living
|
||||
mode: single
|
||||
- id: '1623430479201'
|
||||
alias: Bedroom Button - Single Press
|
||||
description: ''
|
||||
trigger:
|
||||
- device_id: das2qdasdasdasadaasd
|
||||
domain: zha
|
||||
platform: device
|
||||
type: remote_button_short_press
|
||||
subtype: remote_button_short_press
|
||||
condition: []
|
||||
action:
|
||||
- type: toggle
|
||||
device_id: das2qdasdasdasadaasd
|
||||
entity_id: light.bulb_ari_lamp
|
||||
domain: light
|
||||
mode: single
|
||||
- id: '1623642118976'
|
||||
alias: Bedroom Button - Double Press
|
||||
description: ''
|
||||
trigger:
|
||||
- device_id: das2qdasdasdasadaasd
|
||||
domain: zha
|
||||
platform: device
|
||||
type: remote_button_double_press
|
||||
subtype: remote_button_double_press
|
||||
condition: []
|
||||
action:
|
||||
- service: script.turn_all_lights_off
|
||||
mode: single
|
||||
- id: '1624640900951'
|
||||
alias: Baby Button - Double Press
|
||||
description: ''
|
||||
trigger:
|
||||
- device_id: das2qdasdasdasadaasd
|
||||
domain: zha
|
||||
platform: device
|
||||
type: remote_button_double_press
|
||||
subtype: remote_button_double_press
|
||||
condition: []
|
||||
action:
|
||||
- service: media_player.play_media
|
||||
target:
|
||||
entity_id: media_player.baby_bedroom_dot
|
||||
data:
|
||||
media_content_id: Baby Sleep Music
|
||||
media_content_type: SPOTIFY
|
||||
mode: single
|
||||
- id: '1628024070687'
|
||||
alias: Baby Light Setting - Night
|
||||
description: ''
|
||||
trigger:
|
||||
- platform: time
|
||||
at: '20:35:00'
|
||||
condition: []
|
||||
action:
|
||||
- service: zwave_js.set_config_parameter
|
||||
data:
|
||||
parameter: '5'
|
||||
value: '15'
|
||||
target:
|
||||
area_id: bedroom
|
||||
- condition: state
|
||||
entity_id: light.switch_baby
|
||||
state: 'on'
|
||||
- service: light.turn_on
|
||||
data:
|
||||
transition: 5
|
||||
brightness_pct: 15
|
||||
target:
|
||||
area_id: bedroom
|
||||
- service: light.turn_on
|
||||
target:
|
||||
area_id: bedroom
|
||||
data:
|
||||
brightness_pct: 25
|
||||
mode: single
|
||||
- id: '1628024123214'
|
||||
alias: Baby Light Setting - Day
|
||||
description: ''
|
||||
trigger:
|
||||
- platform: time
|
||||
at: 07:00:00
|
||||
condition: []
|
||||
action:
|
||||
- service: zwave_js.set_config_parameter
|
||||
data:
|
||||
value: '100'
|
||||
parameter: '5'
|
||||
target:
|
||||
area_id: bedroom
|
||||
- condition: state
|
||||
entity_id: light.switch_baby
|
||||
state: 'on'
|
||||
- service: light.turn_on
|
||||
data:
|
||||
transition: 5
|
||||
brightness_pct: 50
|
||||
target:
|
||||
area_id: bedroom
|
||||
mode: single
|
||||
- id: '1628444671951'
|
||||
alias: Office Window Opened
|
||||
description: ''
|
||||
trigger:
|
||||
- type: opened
|
||||
platform: device
|
||||
device_id: das2qdasdasdasadaasd
|
||||
entity_id: binary_sensor.window_office
|
||||
domain: binary_sensor
|
||||
condition:
|
||||
- condition: time
|
||||
after: '21:00'
|
||||
- condition: state
|
||||
entity_id: alarm_control_panel.home_alarm
|
||||
state: armed_away
|
||||
action:
|
||||
- service: notify.mobile_app_levas_phone
|
||||
data:
|
||||
message: Window is opened in office
|
||||
mode: single
|
||||
- id: '1629309267204'
|
||||
alias: On Balcony Door Open
|
||||
description: ''
|
||||
trigger:
|
||||
- type: opened
|
||||
platform: device
|
||||
device_id: das2qdasdasdasadaasd
|
||||
entity_id: binary_sensor.door_balcony
|
||||
domain: binary_sensor
|
||||
condition: []
|
||||
action:
|
||||
- service: switch.turn_on
|
||||
target:
|
||||
area_id: balcony
|
||||
data: {}
|
||||
- service: light.turn_on
|
||||
target:
|
||||
area_id: balcony
|
||||
data: {}
|
||||
- repeat:
|
||||
until:
|
||||
- type: is_not_open
|
||||
condition: device
|
||||
device_id: das2qdasdasdasadaasd
|
||||
entity_id: binary_sensor.door_balcony
|
||||
domain: binary_sensor
|
||||
sequence:
|
||||
- delay:
|
||||
hours: 0
|
||||
minutes: 5
|
||||
seconds: 0
|
||||
milliseconds: 0
|
||||
- service: switch.turn_off
|
||||
target:
|
||||
device_id:
|
||||
- das2qdasdasdasadaasd
|
||||
- sad2q3qdewqdasdadasdas
|
||||
area_id: balcony
|
||||
data: {}
|
||||
mode: single
|
||||
- id: '1629422438707'
|
||||
alias: Vita Night Light
|
||||
description: ''
|
||||
trigger:
|
||||
- platform: time
|
||||
at: input_datetime.vita_night_pump_time
|
||||
condition:
|
||||
- condition: and
|
||||
conditions:
|
||||
- condition: time
|
||||
after: input_datetime.vita_night_pump_time
|
||||
before: 00:00:00
|
||||
- condition: time
|
||||
after: 00:00:00
|
||||
before: 06:00:00
|
||||
action:
|
||||
- service: light.turn_on
|
||||
target:
|
||||
entity_id: light.bulb_staircase
|
||||
area_id: living_room
|
||||
data:
|
||||
brightness_pct: 40
|
||||
transition: 15
|
||||
mode: single
|
||||
- id: '1634497376234'
|
||||
alias: Baby Button - Long Press
|
||||
description: ''
|
||||
trigger:
|
||||
- device_id: das2qdasdasdasadaasd
|
||||
domain: zha
|
||||
platform: device
|
||||
type: remote_button_long_press
|
||||
subtype: remote_button_long_press
|
||||
condition: []
|
||||
action:
|
||||
- service: media_player.media_pause
|
||||
target:
|
||||
device_id: das2qdasdasdasadaasd
|
||||
- type: turn_off
|
||||
device_id: das2qdasdasdasadaasd
|
||||
entity_id: light.switch_baby
|
||||
domain: light
|
||||
mode: single
|
||||
- id: '1635539262562'
|
||||
alias: On Home Enter
|
||||
description: ''
|
||||
trigger:
|
||||
- platform: zone
|
||||
entity_id: person.ari
|
||||
zone: zone.home_2
|
||||
event: enter
|
||||
condition:
|
||||
- condition: not
|
||||
conditions:
|
||||
- condition: state
|
||||
entity_id: alarm_control_panel.home_alarm
|
||||
state: disarmed
|
||||
action:
|
||||
- service: alarm_control_panel.alarm_disarm
|
||||
target:
|
||||
entity_id: alarm_control_panel.home_alarm
|
||||
data:
|
||||
code: '8012'
|
||||
- condition: state
|
||||
entity_id: light.switch_living
|
||||
state: 'off'
|
||||
- wait_template: '{{ states("binary_sensor.door_main") == "on" }}'
|
||||
timeout: 00:10:00
|
||||
- service: light.turn_on
|
||||
target:
|
||||
area_id: living_room
|
||||
data:
|
||||
transition: 5
|
||||
brightness: 255
|
||||
mode: single
|
||||
- id: '1636428429596'
|
||||
alias: Night - On TV off
|
||||
description: Auto runs things when we go to sleep
|
||||
trigger:
|
||||
- platform: time
|
||||
at: '22:30:00'
|
||||
- platform: device
|
||||
device_id: das2qdasdasdasadaasd
|
||||
domain: media_player
|
||||
entity_id: media_player.ari_s_fire_tv
|
||||
type: turned_off
|
||||
- platform: device
|
||||
device_id: das2qdasdasdasadaasd
|
||||
domain: media_player
|
||||
entity_id: media_player.living_room_firetv
|
||||
type: turned_off
|
||||
- platform: numeric_state
|
||||
entity_id: sensor.analog_input_living_room_tv
|
||||
below: '1'
|
||||
condition:
|
||||
- condition: time
|
||||
before: 07:00:00
|
||||
after: '21:00:00'
|
||||
- condition: numeric_state
|
||||
entity_id: sensor.analog_input_living_room_tv
|
||||
below: '1'
|
||||
- condition: state
|
||||
entity_id: input_boolean.night_automation_ran
|
||||
state: 'off'
|
||||
action:
|
||||
- service: switch.turn_off
|
||||
data: {}
|
||||
target:
|
||||
area_id:
|
||||
- dining_table
|
||||
- office
|
||||
- living_room
|
||||
- service: light.turn_off
|
||||
target:
|
||||
entity_id:
|
||||
- light.switch_kitchen
|
||||
- light.switch_island
|
||||
- light.switch_dining_chandelier
|
||||
- light.switch_office_hallway
|
||||
- switch.light_office
|
||||
area_id:
|
||||
- dining_table
|
||||
- kitchen
|
||||
data:
|
||||
transition: 5
|
||||
- service: light.turn_on
|
||||
data:
|
||||
transition: 10
|
||||
brightness_pct: 50
|
||||
target:
|
||||
entity_id: light.switch_living
|
||||
- service: light.turn_on
|
||||
data:
|
||||
brightness_pct: 47
|
||||
kelvin: 4600
|
||||
target:
|
||||
entity_id:
|
||||
- light.bulb_ari_lamp
|
||||
- light.bulb_ari_lamp_philip
|
||||
device_id: das2qdasdasdasadaasd
|
||||
- service: input_boolean.turn_on
|
||||
data: {}
|
||||
target:
|
||||
entity_id: input_boolean.night_automation_ran
|
||||
- wait_template: '{{ states("light.bulb_ari_lamp") == "off" }}'
|
||||
- service: script.turn_all_lights_off
|
||||
data: {}
|
||||
mode: single
|
||||
- id: '1639500650865'
|
||||
alias: Main Bedroom - Closet Door - Toggle
|
||||
description: ''
|
||||
trigger:
|
||||
- platform: state
|
||||
entity_id: binary_sensor.door_main_bedroom_closet
|
||||
condition: []
|
||||
action:
|
||||
- choose:
|
||||
- conditions:
|
||||
- condition: template
|
||||
value_template: '{{ trigger.to_state.attributes.contact }}'
|
||||
sequence:
|
||||
- service: light.turn_off
|
||||
target:
|
||||
entity_id:
|
||||
- light.bulb_closet
|
||||
default:
|
||||
- service: light.turn_on
|
||||
target:
|
||||
entity_id:
|
||||
- light.bulb_closet
|
||||
data:
|
||||
transition: 3
|
||||
mode: single
|
||||
- id: '1641617168123'
|
||||
alias: Ensure On
|
||||
description: ''
|
||||
trigger:
|
||||
- platform: device
|
||||
type: turned_off
|
||||
device_id: das2qdasdasdasadaasd
|
||||
entity_id: switch.power_washer
|
||||
domain: switch
|
||||
- platform: device
|
||||
type: turned_off
|
||||
device_id: das2qdasdasdasadaasd
|
||||
entity_id: switch.plug_living_room_tv
|
||||
domain: switch
|
||||
condition: []
|
||||
action:
|
||||
- type: turn_on
|
||||
device_id: das2qdasdasdasadaasd
|
||||
entity_id: switch.power_washer
|
||||
domain: switch
|
||||
- type: turn_on
|
||||
device_id: das2qdasdasdasadaasd
|
||||
entity_id: switch.plug_living_room_tv
|
||||
domain: switch
|
||||
mode: single
|
||||
- id: '1648071019802'
|
||||
alias: 'Keep Bug Light On '
|
||||
description: Keeps living room bug lamp on
|
||||
trigger:
|
||||
- platform: device
|
||||
type: turned_off
|
||||
device_id: das2qdasdasdasadaasd
|
||||
entity_id: switch.plug_buglamp_indoor
|
||||
domain: switch
|
||||
condition: []
|
||||
action:
|
||||
- type: turn_on
|
||||
device_id: das2qdasdasdasadaasd
|
||||
entity_id: switch.plug_buglamp_indoor
|
||||
domain: switch
|
||||
mode: single
|
||||
- id: '1649426399020'
|
||||
alias: Office Motion
|
||||
description: Turn lights on or off when motion is detected
|
||||
trigger:
|
||||
- platform: state
|
||||
entity_id: binary_sensor.motion_office_inv
|
||||
for:
|
||||
hours: 0
|
||||
minutes: 0
|
||||
seconds: 0
|
||||
condition:
|
||||
- condition: time
|
||||
before: '18:00:00'
|
||||
after: 06:00:00
|
||||
weekday:
|
||||
- mon
|
||||
- tue
|
||||
- wed
|
||||
- thu
|
||||
- fri
|
||||
action:
|
||||
- choose:
|
||||
- conditions:
|
||||
- condition: state
|
||||
entity_id: binary_sensor.motion_office_inv
|
||||
state: 'on'
|
||||
sequence:
|
||||
- type: turn_on
|
||||
device_id: das2qdasdasdasadaasd
|
||||
entity_id: switch.light_office
|
||||
domain: switch
|
||||
default:
|
||||
- type: turn_off
|
||||
device_id: das2qdasdasdasadaasd
|
||||
entity_id: switch.light_office
|
||||
domain: switch
|
||||
mode: single
|
||||
- id: '1649432254675'
|
||||
alias: Baby Light Setting
|
||||
description: Controls max brightness on the baby light
|
||||
trigger:
|
||||
- platform: time
|
||||
at: 07:00:00
|
||||
- platform: time
|
||||
at: '20:30:00'
|
||||
condition: []
|
||||
action:
|
||||
- choose:
|
||||
- conditions:
|
||||
- condition: time
|
||||
before: 07:00:00
|
||||
after: '20:30:00'
|
||||
sequence:
|
||||
- service: zwave_js.set_config_parameter
|
||||
data:
|
||||
parameter: '5'
|
||||
value: '15'
|
||||
target:
|
||||
area_id: bedroom
|
||||
- condition: state
|
||||
entity_id: light.switch_baby
|
||||
state: 'on'
|
||||
- service: light.turn_on
|
||||
data:
|
||||
transition: 5
|
||||
brightness_pct: 15
|
||||
target:
|
||||
area_id: bedroom
|
||||
- service: light.turn_on
|
||||
target:
|
||||
area_id: bedroom
|
||||
data:
|
||||
brightness_pct: 25
|
||||
default:
|
||||
- service: zwave_js.set_config_parameter
|
||||
data:
|
||||
value: '100'
|
||||
parameter: '5'
|
||||
target:
|
||||
area_id: bedroom
|
||||
- condition: state
|
||||
entity_id: light.switch_baby
|
||||
state: 'on'
|
||||
- service: light.turn_on
|
||||
data:
|
||||
transition: 5
|
||||
brightness_pct: 50
|
||||
target:
|
||||
area_id: bedroom
|
||||
mode: single
|
||||
- id: '1649726828269'
|
||||
alias: Climate Heat Mode Settings
|
||||
description: Ensures that the climate is always in sync with the house settings
|
||||
trigger:
|
||||
- platform: state
|
||||
entity_id: climate.main_floor
|
||||
id: main
|
||||
- platform: state
|
||||
entity_id: climate.second_floor
|
||||
id: second
|
||||
- platform: state
|
||||
entity_id: input_boolean.thermostats_house_is_heating
|
||||
id: setting
|
||||
condition: []
|
||||
action:
|
||||
- choose:
|
||||
- conditions:
|
||||
- condition: template
|
||||
value_template: '{{ trigger.id == "setting" }}'
|
||||
sequence:
|
||||
- service: climate.turn_off
|
||||
data: {}
|
||||
target:
|
||||
device_id:
|
||||
- das2qdasdasdasadaasd
|
||||
- 32424rsafdsafsasq2341
|
||||
- conditions:
|
||||
- condition: state
|
||||
entity_id: input_boolean.thermostats_house_is_heating
|
||||
state: 'on'
|
||||
sequence:
|
||||
- choose:
|
||||
- conditions:
|
||||
- condition: and
|
||||
conditions:
|
||||
- condition: template
|
||||
value_template: '{{ trigger.to_state.state != ''heat'' }}'
|
||||
- condition: template
|
||||
value_template: '{{ trigger.to_state.state != ''off'' }}'
|
||||
sequence:
|
||||
- service: climate.set_hvac_mode
|
||||
data:
|
||||
hvac_mode: heat
|
||||
target:
|
||||
entity_id: '{{ trigger.entity_id }}'
|
||||
default:
|
||||
- choose:
|
||||
- conditions:
|
||||
- condition: and
|
||||
conditions:
|
||||
- condition: template
|
||||
value_template: '{{ trigger.to_state.state != ''cool'' }}'
|
||||
- condition: template
|
||||
value_template: '{{ trigger.to_state.state != ''off'' }}'
|
||||
sequence:
|
||||
- service: climate.set_hvac_mode
|
||||
data:
|
||||
hvac_mode: cool
|
||||
target:
|
||||
entity_id: '{{ trigger.entity_id }}'
|
||||
mode: single
|
||||
- id: '1649727810678'
|
||||
alias: Climate Timing
|
||||
description: ''
|
||||
trigger:
|
||||
- platform: time
|
||||
at: 01:00:00
|
||||
id: night
|
||||
- platform: time
|
||||
at: 06:00:00
|
||||
id: day
|
||||
condition: []
|
||||
action:
|
||||
- choose:
|
||||
- conditions:
|
||||
- condition: template
|
||||
value_template: '{{ trigger.id == "night" }}'
|
||||
sequence:
|
||||
- service: climate.turn_off
|
||||
data: {}
|
||||
target:
|
||||
area_id:
|
||||
- living_room
|
||||
- main_bedroom
|
||||
default:
|
||||
- choose:
|
||||
- conditions:
|
||||
- condition: state
|
||||
entity_id: input_boolean.thermostats_house_is_heating
|
||||
state: 'on'
|
||||
sequence:
|
||||
- service: climate.set_hvac_mode
|
||||
data:
|
||||
hvac_mode: heat
|
||||
target:
|
||||
area_id:
|
||||
- living_room
|
||||
- main_bedroom
|
||||
default:
|
||||
- service: climate.set_hvac_mode
|
||||
data:
|
||||
hvac_mode: cool
|
||||
target:
|
||||
area_id:
|
||||
- living_room
|
||||
- main_bedroom
|
||||
- service: climate.set_temperature
|
||||
data:
|
||||
temperature: 23.5
|
||||
target:
|
||||
area_id:
|
||||
- living_room
|
||||
- main_bedroom
|
||||
mode: single
|
||||
- id: '1649820885714'
|
||||
alias: Turn off Night Auto Ran
|
||||
description: ''
|
||||
trigger:
|
||||
- platform: time
|
||||
at: 07:00:00
|
||||
condition: []
|
||||
action:
|
||||
- service: input_boolean.turn_off
|
||||
data: {}
|
||||
target:
|
||||
entity_id: input_boolean.night_automation_ran
|
||||
mode: single
|
||||
- id: '1649947692702'
|
||||
alias: Bed Remote
|
||||
description: ''
|
||||
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
|
||||
condition: []
|
||||
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: []
|
||||
mode: single
|
||||
@@ -0,0 +1,2 @@
|
||||
# empty configuration file
|
||||
cloud:
|
||||
Submodule api/tests/samples/example_config_folder deleted from 2f2c69d6db.
@@ -1,7 +1,8 @@
|
||||
from ruamel.yaml import YAML
|
||||
from unittest import TestCase
|
||||
from fastapi.testclient import TestClient
|
||||
from src.api.app import make_app
|
||||
from src.automations.types import AutomationData, AutomationMetdata
|
||||
from src.automations.types import AutomationData, AutomationMetdata, ExtenededAutomationData
|
||||
from tests.utils import get_example_automation_loader
|
||||
|
||||
|
||||
@@ -33,8 +34,8 @@ class automation_list_tests(BaseTestCase):
|
||||
"limit": 50,
|
||||
},
|
||||
)
|
||||
self.assertEqual(d["totalItems"], 31)
|
||||
self.assertEqual(len(d["data"]), 31)
|
||||
self.assertEqual(d["totalItems"], 28)
|
||||
self.assertEqual(len(d["data"]), 28)
|
||||
|
||||
def test_subset1(self):
|
||||
data = self.client.post(
|
||||
@@ -53,7 +54,7 @@ class automation_list_tests(BaseTestCase):
|
||||
"limit": 10,
|
||||
},
|
||||
)
|
||||
self.assertEqual(d["totalItems"], 31)
|
||||
self.assertEqual(d["totalItems"], 28)
|
||||
self.assertEqual(len(d["data"]), 10)
|
||||
|
||||
def test_subset2(self):
|
||||
@@ -73,25 +74,25 @@ class automation_list_tests(BaseTestCase):
|
||||
"limit": 10,
|
||||
},
|
||||
)
|
||||
self.assertEqual(d["totalItems"], 31)
|
||||
self.assertEqual(len(d["data"]), 6)
|
||||
self.assertEqual(d["totalItems"], 28)
|
||||
self.assertEqual(len(d["data"]), 3)
|
||||
|
||||
|
||||
class automation_update_tests(BaseTestCase):
|
||||
def test_insert_new(self):
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
||||
self.assertEqual(resp.json()["totalItems"], 31)
|
||||
self.assertEqual(resp.json()["totalItems"], 28)
|
||||
resp = self.client.post(
|
||||
"/automations",
|
||||
json={
|
||||
"index": 33,
|
||||
"index": 29,
|
||||
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
|
||||
},
|
||||
)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 31})
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 28})
|
||||
data = resp.json()
|
||||
self.assertEqual(data["totalItems"], 32)
|
||||
self.assertEqual(data["totalItems"], 29)
|
||||
self.assertEqual(data["data"][0]["metadata"]["id"], "testme")
|
||||
|
||||
def test_update_some(self):
|
||||
@@ -108,13 +109,222 @@ class automation_update_tests(BaseTestCase):
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
|
||||
new_auto = resp.json()["data"][0]
|
||||
self.assertNotEqual(original_auto, new_auto)
|
||||
self.assertEqual(AutomationData(metadata=AutomationMetdata(id="testme")).dict(), 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):
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
||||
self.assertEqual(resp.json()["totalItems"], 31)
|
||||
self.assertEqual(resp.json()["totalItems"], 28)
|
||||
resp = self.client.delete(
|
||||
"/automations",
|
||||
json={
|
||||
@@ -123,4 +333,4 @@ class automation_delete_tests(BaseTestCase):
|
||||
)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
||||
self.assertEqual(resp.json()["totalItems"], 30)
|
||||
self.assertEqual(resp.json()["totalItems"], 27)
|
||||
@@ -1,9 +1,7 @@
|
||||
from unittest import TestCase
|
||||
from src.automations.types import (
|
||||
AutomationActionNode,
|
||||
AutomationConditionNode,
|
||||
AutomationData,
|
||||
AutomationMetdata,
|
||||
ExtenededAutomationData,
|
||||
)
|
||||
from src.automations.loader import load_automation
|
||||
from src.yaml_serializer.types import (
|
||||
@@ -16,30 +14,29 @@ class loader_tests(TestCase):
|
||||
def test_load_automation_runs(self):
|
||||
auto = list(
|
||||
load_automation(
|
||||
[
|
||||
{
|
||||
"id": "1616887975473",
|
||||
"alias": "Home Assistant Off",
|
||||
"description": "",
|
||||
"trigger": [{"platform": "homeassistant", "event": "shutdown"}],
|
||||
"condition": ["states(time.time) >= '10:00:00'"],
|
||||
"action": [
|
||||
{
|
||||
"device_id": SecretValue("my_mobile_phone", "..."),
|
||||
"domain": "mobile_app",
|
||||
"type": "notify",
|
||||
"title": "Hassio Status",
|
||||
"message": "Hassio Is turning off...",
|
||||
}
|
||||
],
|
||||
"mode": "single",
|
||||
}
|
||||
]
|
||||
{
|
||||
"id": "1616887975473",
|
||||
"alias": "Home Assistant Off",
|
||||
"description": "",
|
||||
"trigger": [{"platform": "homeassistant", "event": "shutdown"}],
|
||||
"condition": ["states(time.time) >= '10:00:00'"],
|
||||
"action": [
|
||||
{
|
||||
"device_id": SecretValue("my_mobile_phone", "..."),
|
||||
"domain": "mobile_app",
|
||||
"type": "notify",
|
||||
"title": "Hassio Status",
|
||||
"message": "Hassio Is turning off...",
|
||||
}
|
||||
],
|
||||
"mode": "single",
|
||||
},
|
||||
{}
|
||||
)
|
||||
)
|
||||
self.assertEqual(
|
||||
auto[0],
|
||||
AutomationData(
|
||||
ExtenededAutomationData(
|
||||
metadata=AutomationMetdata(
|
||||
id="1616887975473",
|
||||
alias="Home Assistant Off",
|
||||
@@ -47,21 +44,19 @@ 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,6 +1,6 @@
|
||||
from unittest import TestCase
|
||||
from src.automations.errors import FailedDeletion, InvalidAutomationFile
|
||||
from src.automations.types import AutomationData, AutomationMetdata
|
||||
from src.automations.types import AutomationMetdata, ExtenededAutomationData
|
||||
from tests.utils import (
|
||||
get_dummy_automation_loader,
|
||||
get_example_automation_loader,
|
||||
@@ -27,7 +27,7 @@ class manager_tests(TestCase):
|
||||
|
||||
def test_length(self):
|
||||
_, _, loader = get_example_automation_loader()
|
||||
self.assertEqual(loader.get_total_items(), 31)
|
||||
self.assertEqual(loader.get_total_items(), 28)
|
||||
|
||||
def test_bad_automations_file(self):
|
||||
folder, _, manager = get_dummy_automation_loader(
|
||||
@@ -43,41 +43,41 @@ class manager_tests(TestCase):
|
||||
[],
|
||||
automation_in_conifguration_mode="none",
|
||||
)
|
||||
manager.update(1, AutomationData(metadata=AutomationMetdata(id="test1")))
|
||||
manager.update(1, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
|
||||
auto = manager.get(0)
|
||||
self.assertIsNotNone(auto)
|
||||
self.assertEqual(auto.metadata.id, "test1") # type: ignore
|
||||
|
||||
def test_create_automation_with_example_folder(self):
|
||||
_, _, manager = get_example_automation_loader()
|
||||
self.assertEqual(manager.get_total_items(), 31)
|
||||
manager.update(32, AutomationData(metadata=AutomationMetdata(id="test1")))
|
||||
auto = manager.get(31)
|
||||
self.assertEqual(manager.get_total_items(), 28)
|
||||
manager.update(32, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
|
||||
auto = manager.get(28)
|
||||
self.assertIsNotNone(auto)
|
||||
self.assertEqual(manager.get_total_items(), 32)
|
||||
self.assertEqual(manager.get_total_items(), 29)
|
||||
self.assertEqual(auto.metadata.id, "test1") # type: ignore
|
||||
|
||||
def test_update_automation(self):
|
||||
_, _, manager = get_dummy_automation_loader(
|
||||
[
|
||||
AutomationData(metadata=AutomationMetdata(id="test1")),
|
||||
AutomationData(metadata=AutomationMetdata(id="test2")),
|
||||
AutomationData(metadata=AutomationMetdata(id="test3")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
|
||||
],
|
||||
automation_in_conifguration_mode="none",
|
||||
)
|
||||
auto = manager.get(0)
|
||||
self.assertEqual(auto.metadata.id, "test1") # type: ignore
|
||||
manager.update(0, AutomationData(metadata=AutomationMetdata(id="toaster-7")))
|
||||
manager.update(0, ExtenededAutomationData(metadata=AutomationMetdata(id="toaster-7")))
|
||||
auto = manager.get(0)
|
||||
self.assertEqual(auto.metadata.id, "toaster-7") # type: ignore
|
||||
|
||||
def test_delete_automation(self):
|
||||
_, _, manager = get_dummy_automation_loader(
|
||||
[
|
||||
AutomationData(metadata=AutomationMetdata(id="test1")),
|
||||
AutomationData(metadata=AutomationMetdata(id="test2")),
|
||||
AutomationData(metadata=AutomationMetdata(id="test3")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
|
||||
],
|
||||
automation_in_conifguration_mode="none",
|
||||
)
|
||||
@@ -90,9 +90,9 @@ class manager_tests(TestCase):
|
||||
def test_failed_deletion_automation(self):
|
||||
_, _, manager = get_dummy_automation_loader(
|
||||
[
|
||||
AutomationData(metadata=AutomationMetdata(id="test1")),
|
||||
AutomationData(metadata=AutomationMetdata(id="test2")),
|
||||
AutomationData(metadata=AutomationMetdata(id="test3")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
|
||||
],
|
||||
automation_in_conifguration_mode="none",
|
||||
)
|
||||
|
||||
@@ -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)
|
||||
@@ -0,0 +1,18 @@
|
||||
|
||||
|
||||
from pathlib import Path
|
||||
from tempfile import mktemp
|
||||
from unittest import TestCase
|
||||
from src.automations.tags import TagManager
|
||||
|
||||
class tag_tests(TestCase):
|
||||
|
||||
def test_load_and_save(self):
|
||||
tmp_file = Path(mktemp()).with_suffix('.yml')
|
||||
tags = TagManager()
|
||||
tags[0] = {'Room': "Kitchen", "Type": 'Lights'}
|
||||
tags[1] = {}
|
||||
|
||||
tags.save(tmp_file)
|
||||
loaded_tags = TagManager.load(tmp_file)
|
||||
assert loaded_tags.keys() == tags.keys()
|
||||
@@ -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
@@ -11,7 +11,7 @@ from src.yaml_serializer.types import IncludedYaml
|
||||
|
||||
THIS_FOLDER = Path(__file__).parent
|
||||
SAMPLES_FOLDER = THIS_FOLDER / "samples"
|
||||
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "example_config_folder"
|
||||
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
|
||||
|
||||
|
||||
def get_example_automation_loader() -> Tuple[Path, HassConfig, AutomationManager]:
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
name: Shortumation
|
||||
version: 0.0.8
|
||||
version: 0.0.14
|
||||
slug: shortumation
|
||||
url: "https://github.com/asosnovsky/Shortumation"
|
||||
description: "A homeassitant addon which provides better UI for automations & scripts."
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
0:
|
||||
Type: Generic
|
||||
1:
|
||||
Type: Generic
|
||||
2:
|
||||
Type: Climate
|
||||
Room: House
|
||||
4: {}
|
||||
3:
|
||||
Type: Vent
|
||||
Room: Bathroom
|
||||
Floor: First
|
||||
5: {}
|
||||
@@ -25,6 +25,8 @@
|
||||
- id: '1616888026264'
|
||||
alias: Home Assistant On
|
||||
description: ''
|
||||
trigger_variables:
|
||||
mode: single
|
||||
trigger:
|
||||
- platform: homeassistant
|
||||
event: start
|
||||
@@ -38,15 +40,27 @@
|
||||
- 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:
|
||||
entity: bear
|
||||
data: {}
|
||||
- id: shortu-3
|
||||
alias: Bathroom Vent
|
||||
description: Turn the vent on when the humidity is high or it's smelly
|
||||
trigger_variables:
|
||||
mode: single
|
||||
trigger: []
|
||||
condition: []
|
||||
action: []
|
||||
Vendored
+2
-6
@@ -19,11 +19,7 @@
|
||||
"env": {
|
||||
"CI": "true"
|
||||
},
|
||||
"disableOptimisticBPs": true,
|
||||
"jasmineExplorer.nodeArgv": [
|
||||
"-r",
|
||||
"ts-node/register"
|
||||
]
|
||||
"disableOptimisticBPs": true
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
Generated
-75200
File diff suppressed because it is too large.
Load diff
+16
-10
@@ -8,10 +8,10 @@
|
||||
"@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",
|
||||
"react-flow-renderer": "^10.1.2",
|
||||
"react-jss": "^10.8.2",
|
||||
"react-router-dom": "6",
|
||||
"react-scripts": "4.0.3",
|
||||
@@ -24,6 +24,7 @@
|
||||
"start": "react-scripts start",
|
||||
"build": "react-scripts build",
|
||||
"test": "react-scripts test",
|
||||
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
|
||||
"eject": "react-scripts eject",
|
||||
"storybook": "start-storybook -p 6006 -s public",
|
||||
"build-storybook": "build-storybook -s public"
|
||||
@@ -57,18 +58,23 @@
|
||||
]
|
||||
},
|
||||
"devDependencies": {
|
||||
"@storybook/addon-actions": "^6.4.22",
|
||||
"@storybook/addon-essentials": "^6.4.22",
|
||||
"@storybook/addon-links": "^6.4.22",
|
||||
"@storybook/addon-queryparams": "^6.2.9",
|
||||
"@storybook/node-logger": "^6.4.22",
|
||||
"@storybook/preset-create-react-app": "^3.2.0",
|
||||
"@storybook/react": "^6.4.22",
|
||||
"@testing-library/jest-dom": "^5.11.4",
|
||||
"@testing-library/react": "^11.1.0",
|
||||
"@testing-library/user-event": "^12.1.10",
|
||||
"@storybook/addon-actions": "^6.3.12",
|
||||
"@storybook/addon-essentials": "^6.3.12",
|
||||
"@storybook/addon-links": "^6.3.12",
|
||||
"@storybook/addon-queryparams": "^6.2.9",
|
||||
"@storybook/node-logger": "^6.3.12",
|
||||
"@storybook/preset-create-react-app": "^3.2.0",
|
||||
"@storybook/react": "^6.3.12",
|
||||
"@types/chroma-js": "^2.1.3",
|
||||
"@types/js-yaml": "^4.0.5",
|
||||
"jest-environment-jsdom": "^27.5.1",
|
||||
"ts-node": "^10.4.0"
|
||||
}
|
||||
}
|
||||
},
|
||||
"moduleDirectories": [
|
||||
"node_modules",
|
||||
"src"
|
||||
]
|
||||
}
|
||||
+8
-5
@@ -2,16 +2,19 @@ import './App.css';
|
||||
import { Routes, Route, BrowserRouter } from "react-router-dom";
|
||||
import { AutomationRoute } from 'routes/automation';
|
||||
import { useConnectedApiService } from 'apiService';
|
||||
import { ErrorBoundary } from 'components/ErrorBoundary';
|
||||
|
||||
function App() {
|
||||
const api = useConnectedApiService();
|
||||
return (
|
||||
<div className="app">
|
||||
<BrowserRouter>
|
||||
<Routes>
|
||||
<Route path="*" element={<AutomationRoute api={api} />} />
|
||||
</Routes>
|
||||
</BrowserRouter>
|
||||
<ErrorBoundary>
|
||||
<BrowserRouter>
|
||||
<Routes>
|
||||
<Route path="*" element={<AutomationRoute api={api} />} />
|
||||
</Routes>
|
||||
</BrowserRouter>
|
||||
</ErrorBoundary>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
import { APIRequest, APIResponse } from './types';
|
||||
|
||||
export interface API {
|
||||
makeCall: <Res = any, Req = any>(req: APIRequest<Req>) => Promise<APIResponse<Res>>;
|
||||
makeCall: <Res = any, Req = any>(req: APIRequest<Req>) => Promise<APIResponse<Res>>;
|
||||
}
|
||||
export const makeRemoteAPI = (baseURL: string): API => ({
|
||||
async makeCall({
|
||||
path,
|
||||
method = "POST",
|
||||
data={}
|
||||
}) {
|
||||
path,
|
||||
method = "POST",
|
||||
data = {}
|
||||
}) {
|
||||
try {
|
||||
const reply = await fetch(baseURL + path, {
|
||||
method,
|
||||
headers: {
|
||||
@@ -30,5 +31,18 @@ export const makeRemoteAPI = (baseURL: string): API => ({
|
||||
console.error(response)
|
||||
}
|
||||
return response
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
let error = String(err)
|
||||
|
||||
if (err instanceof Error) {
|
||||
error += ` ${err.stack}`
|
||||
}
|
||||
|
||||
return {
|
||||
ok: false,
|
||||
error,
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
@@ -8,17 +8,18 @@ export const useAPIService = (
|
||||
) => {
|
||||
// state
|
||||
const [state, setState] = useDefaultApiState();
|
||||
const {reload, wrapCall} = makeReloadAutomations(automationAPI, state, setState);
|
||||
|
||||
const { reload, wrapCall } = makeReloadAutomations(automationAPI, state, setState);
|
||||
|
||||
|
||||
// initial load of autos
|
||||
useEffect(() => {
|
||||
reload();
|
||||
// eslint-disable-next-line
|
||||
}, []);
|
||||
|
||||
return {
|
||||
state,
|
||||
removeAutomation: wrapCall(automationAPI.remove),
|
||||
updateAutomation: wrapCall(automationAPI.update),
|
||||
removeAutomation: wrapCall(automationAPI.remove),
|
||||
updateAutomation: wrapCall(automationAPI.update),
|
||||
}
|
||||
}
|
||||
@@ -2,13 +2,16 @@ import { AutomationData } from 'types/automations';
|
||||
import { makeAutomationAPI } from './automations';
|
||||
import { makeRemoteAPI } from "./base";
|
||||
import { useAPIService } from './core';
|
||||
import {useMockAPI} from "./mock";
|
||||
import { useMockAPI } from "./mock";
|
||||
|
||||
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
|
||||
console.log(process.env)
|
||||
|
||||
export const useConnectedApiService = () => useAPIService(
|
||||
makeAutomationAPI(makeRemoteAPI(
|
||||
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
|
||||
process.env.NODE_ENV === 'development' ?
|
||||
"http://localhost:8000/automations" :
|
||||
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
|
||||
))
|
||||
);
|
||||
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
|
||||
|
||||
@@ -1,18 +1,84 @@
|
||||
.automation-editor--info-box {
|
||||
min-width : 25px;
|
||||
padding-left : 10px;
|
||||
padding-right : 10px;
|
||||
display : flex;
|
||||
flex-direction : column;
|
||||
height: 100%;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: flex-start;
|
||||
overflow : auto;
|
||||
padding-top : 5;
|
||||
padding-bottom : 10;
|
||||
position : relative;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
/* .automation-editor--info-box.hide {} */
|
||||
.automation-editor--info-box-inner {
|
||||
height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.automation-editor--info-box.show {
|
||||
min-width: 25em;
|
||||
}
|
||||
|
||||
.automation-editor--info-box.hide {
|
||||
min-width: 1em;
|
||||
}
|
||||
|
||||
.automation-editor--info-box.hide>.automation-editor--info-box-inner {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tags {
|
||||
padding: 0.25em 0.75em 1em 0.75em;
|
||||
border-color: var(--primary-accent);
|
||||
border-width: 1px;
|
||||
border-style: ridge;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tags>h1 {
|
||||
font-size: 1.5em;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.5em;
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag>div {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag>div>input {
|
||||
max-width: 5em;
|
||||
padding: 1em 0.25em 0.2em 0.25em;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag>button {
|
||||
height: 1.25em;
|
||||
width: 1.25em;
|
||||
font-size: 1em;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag--error {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag--error.hide {
|
||||
height: 0;
|
||||
opacity: 0;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag--error.show {
|
||||
height: fit-content;
|
||||
opacity: 1;
|
||||
}
|
||||
@@ -3,29 +3,31 @@ import { useState } from "react";
|
||||
import { AutoInfoBox } from "./AutoInfoBox";
|
||||
|
||||
export default {
|
||||
title: 'AutomationEditor/AutoInfoBox',
|
||||
title: 'App/AutomationList/Editor/InfoBox',
|
||||
component: AutoInfoBox,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
} as ComponentMeta<typeof AutoInfoBox>;
|
||||
|
||||
|
||||
export const Basic: ComponentStory<typeof AutoInfoBox> = args => {
|
||||
const [state, setState] = useState(args.metadata)
|
||||
export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
|
||||
const [[metadata, tags], setState] = useState([args.metadata, args.tags])
|
||||
return (
|
||||
<div className="page">
|
||||
<AutoInfoBox
|
||||
className=""
|
||||
metadata={state}
|
||||
onUpdate={up => {
|
||||
args.onUpdate(up)
|
||||
setState(up)
|
||||
metadata={metadata}
|
||||
tags={tags}
|
||||
onUpdate={(m, t) => {
|
||||
args.onUpdate(m, t)
|
||||
setState([m, t])
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
Basic.args = {
|
||||
...Basic.args,
|
||||
NoTags.args = {
|
||||
...NoTags.args,
|
||||
tags: [],
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Random",
|
||||
@@ -34,5 +36,23 @@ Basic.args = {
|
||||
'wowo': '!'
|
||||
},
|
||||
mode: 'single',
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
export const SomeTags: ComponentStory<typeof AutoInfoBox> = NoTags.bind({})
|
||||
SomeTags.args = {
|
||||
...SomeTags.args,
|
||||
tags: [
|
||||
["Room", "Bathroom"],
|
||||
["Type", "Climate"],
|
||||
],
|
||||
metadata: {
|
||||
id: "2432asd23",
|
||||
alias: "Bathroom Vent",
|
||||
description: "Turn the vent when the humidity is high",
|
||||
trigger_variables: {
|
||||
'wowo': '!'
|
||||
},
|
||||
mode: 'single',
|
||||
},
|
||||
}
|
||||
@@ -1,28 +1,81 @@
|
||||
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 } from "react";
|
||||
import { FC, useRef, useState } from 'react';
|
||||
import { AddIcon, TrashIcon } from "components/Icons";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
|
||||
interface Props {
|
||||
className: string;
|
||||
metadata: AutomationMetadata;
|
||||
onUpdate: (m: AutomationMetadata) => void;
|
||||
tags: Array<[string, string]>;
|
||||
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
|
||||
}
|
||||
export const AutoInfoBox: FC<Props> = ({
|
||||
metadata,
|
||||
tags,
|
||||
onUpdate,
|
||||
className,
|
||||
children,
|
||||
}) => {
|
||||
// state
|
||||
const [newTag, setNewTag] = useState<[string, string]>(["", ""])
|
||||
const [[errorIndex, error], _setError] = useState<[number | 'new', string]>([-1, ""]);
|
||||
const errorTimeoutId = useRef(-1);
|
||||
|
||||
// aliases
|
||||
const setError = (index: number | 'new', msg: string) => {
|
||||
_setError([index, msg])
|
||||
if (errorTimeoutId.current >= 0) {
|
||||
window.clearTimeout(errorTimeoutId.current);
|
||||
}
|
||||
errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000);
|
||||
}
|
||||
const onUpdateMetadata = <K extends keyof AutomationMetadata>(k: K) => (update: AutomationMetadata[K]) => onUpdate({
|
||||
...metadata,
|
||||
[k]: update
|
||||
})
|
||||
|
||||
}, tags);
|
||||
const validTagName = (newName: string): string | undefined => {
|
||||
if (newName.length <= 0) {
|
||||
return "Name must be at least 1 character long"
|
||||
}
|
||||
// eslint-disable-next-line
|
||||
for (const [name, _] of tags) {
|
||||
if (name.trim() === newName.trim()) {
|
||||
return `The tag '${name}' already exists`
|
||||
}
|
||||
}
|
||||
}
|
||||
const updateTagName = (newName: string, tagIndex: number) => {
|
||||
const error = validTagName(newName);
|
||||
if (error) {
|
||||
return setError(tagIndex, error)
|
||||
}
|
||||
onUpdate(metadata, [
|
||||
...tags.slice(0, tagIndex),
|
||||
[newName, tags[tagIndex][1]],
|
||||
...tags.slice(tagIndex + 1),
|
||||
])
|
||||
}
|
||||
const onUpdateTags = (tagValue: string, tagIndex: number) => onUpdate(metadata, [
|
||||
...tags.slice(0, tagIndex),
|
||||
[tags[tagIndex][0], tagValue],
|
||||
...tags.slice(tagIndex + 1),
|
||||
])
|
||||
const addNewTag = () => {
|
||||
const error = validTagName(newTag[0]);
|
||||
if (error) {
|
||||
return setError('new', error)
|
||||
}
|
||||
onUpdate(metadata, tags.concat([newTag]));
|
||||
setNewTag(['', '']);
|
||||
}
|
||||
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [
|
||||
...tags.slice(0, tagIndex),
|
||||
...tags.slice(tagIndex + 1),
|
||||
])
|
||||
// render
|
||||
return <div className={`automation-editor--info-box ${className}`}>
|
||||
<div className="automation-editor--info-box-inner">
|
||||
@@ -40,6 +93,26 @@ export const AutoInfoBox: FC<Props> = ({
|
||||
'restart'
|
||||
]}
|
||||
/>
|
||||
<div className="automation-editor--info-box--tags">
|
||||
<h1>Tags</h1>
|
||||
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag">
|
||||
<Button onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button>
|
||||
<InputText value={tagName} label="Name" onChange={v => updateTagName(v, tagIndex)} />
|
||||
<InputText value={tagValue} label="Tag" onChange={v => onUpdateTags(v, tagIndex)} />
|
||||
<span className={["automation-editor--info-box--tag--error", (errorIndex === tagIndex) ? "show" : "hide"].join(" ")}>
|
||||
{error}
|
||||
</span>
|
||||
</div>)}
|
||||
<hr />
|
||||
<div className="automation-editor--info-box--tag">
|
||||
<InputText value={newTag[0]} label="Name" onChange={v => setNewTag([v, newTag[1]])} onEnter={addNewTag} />
|
||||
<InputText value={newTag[1]} label="Tag" onChange={v => setNewTag([newTag[0], v])} onEnter={addNewTag} />
|
||||
<Button onClick={addNewTag} ><AddIcon /></Button>
|
||||
<span className={["automation-editor--info-box--tag--error", (errorIndex === 'new') ? "show" : "hide"].join(" ")}>
|
||||
{error}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{children}
|
||||
</div>
|
||||
|
||||
@@ -1,9 +1,69 @@
|
||||
.automation-editor--info-icon {
|
||||
position: absolute;
|
||||
right : 10px;
|
||||
z-index : 10;
|
||||
.automation-editor {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.automation-editor--info-box.hide>.automation-editor--info-icon {
|
||||
transform: rotate(180deg);
|
||||
.automation-editor--flow-wrapper {
|
||||
flex: 1;
|
||||
padding: 0 0.5em 0 0.5em;
|
||||
max-height: 100%;
|
||||
max-width: 100%;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.5em;
|
||||
}
|
||||
|
||||
.automation-editor--flow-wrapper--toolbar {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
.automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
|
||||
height: 0;
|
||||
opacity: 0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
|
||||
border-color: var(--change);
|
||||
color: var(--change)
|
||||
}
|
||||
|
||||
|
||||
.automation-editor--flow-wrapper--toolbar--save-btn {
|
||||
display: flex;
|
||||
gap: 0.5em;
|
||||
align-items: center;
|
||||
padding: 0.25em;
|
||||
}
|
||||
|
||||
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--flow {
|
||||
border-color: var(--change);
|
||||
}
|
||||
|
||||
.automation-editor--flow-wrapper--flow {
|
||||
flex: 1;
|
||||
border: 1px solid var(--secondary-accent);
|
||||
margin: 0 0 0.5em 0;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.automation-editor--info-box {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--icon {
|
||||
position: absolute;
|
||||
right: 0em;
|
||||
bottom: 0.5em;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
|
||||
transform: rotate(180deg);
|
||||
z-index: 2;
|
||||
}
|
||||
@@ -1,23 +1,16 @@
|
||||
import React from "react";
|
||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||
import { AutomationEditor } from './index';
|
||||
import { NODE_HEIGHT, NODE_WIDTH, DISTANCE_FACTOR, ADD_HEIGHT, ADD_WIDTH, CIRCLE_SIZE } from '../DAGSvgs/constants';
|
||||
import { useState } from 'react';
|
||||
import * as dgconst from 'components/DAGSvgs/constants';
|
||||
|
||||
|
||||
export default {
|
||||
title: 'AutomationEditor/AutomationEditor',
|
||||
title: 'App/AutomationList/Editor',
|
||||
component: AutomationEditor,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
args: {
|
||||
dims: {
|
||||
nodeHeight: NODE_HEIGHT,
|
||||
nodeWidth: NODE_WIDTH,
|
||||
addHeight: ADD_HEIGHT,
|
||||
addWidth: ADD_WIDTH,
|
||||
circleSize: CIRCLE_SIZE,
|
||||
distanceFactor: DISTANCE_FACTOR,
|
||||
}
|
||||
dims: dgconst.DEFAULT_DIMS
|
||||
}
|
||||
} as ComponentMeta<typeof AutomationEditor>
|
||||
|
||||
@@ -27,15 +20,27 @@ const Template: ComponentStory<typeof AutomationEditor> = args => {
|
||||
<AutomationEditor
|
||||
{...args}
|
||||
automation={state}
|
||||
onUpdate={setState}
|
||||
onUpdate={s => {
|
||||
window.setTimeout(() => setState(s), 3000)
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
}
|
||||
|
||||
export const Loading = Template.bind({});
|
||||
|
||||
|
||||
export const Simple = Template.bind({})
|
||||
Simple.args = {
|
||||
...Simple.args,
|
||||
automation: {
|
||||
condition: [],
|
||||
tags: {
|
||||
"Room": "Bathroom",
|
||||
"For": "Toliet",
|
||||
"Type": "Smell",
|
||||
"Use": "Flushing"
|
||||
},
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Random",
|
||||
@@ -47,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",
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -105,6 +95,8 @@ export const EmptyStart = Template.bind({})
|
||||
EmptyStart.args = {
|
||||
...EmptyStart.args,
|
||||
automation: {
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Random",
|
||||
|
||||
@@ -1,109 +1,76 @@
|
||||
import "./index.css";
|
||||
import { DAGBoardElmDims } from "components/DAGSvgs/DAGBoard";
|
||||
import { ArrowIcon } from "components/Icons";
|
||||
import { SequenceNodes } from "components/SequenceNodes";
|
||||
import { ArrowIcon, CheckMarkIcon } from "components/Icons";
|
||||
import { FC, useState } from "react";
|
||||
import { AutomationData, AutomationSequenceNode } from "types/automations";
|
||||
import useWindowSize from "utils/useWindowSize";
|
||||
import { AutomationData } from "types/automations";
|
||||
import { AutoInfoBox } from "./AutoInfoBox";
|
||||
import { useEditorStyles } from "./styles";
|
||||
import { computeTriggerPos, computeExtraField } from './positions';
|
||||
import { chain } from "utils/iter";
|
||||
import { AutomationTrigger } from 'types/automations/triggers';
|
||||
import { Modal } from "components/Modal";
|
||||
import { NodeEditor } from "components/NodeEditor";
|
||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
import { useAutomatioEditorState } from "./state";
|
||||
import { DAGAutomationFlow } from "components/DAGFlow";
|
||||
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
|
||||
|
||||
interface TriggerEditorModalState {
|
||||
trigger: AutomationTrigger;
|
||||
onSave: (node: AutomationTrigger) => void;
|
||||
}
|
||||
interface Props {
|
||||
automation: AutomationData;
|
||||
dims: DAGBoardElmDims;
|
||||
automation?: AutomationData;
|
||||
dims: DAGAutomationFlowDims;
|
||||
onUpdate: (auto: AutomationData) => void;
|
||||
}
|
||||
export const AutomationEditor: FC<Props> = ({
|
||||
dims,
|
||||
automation,
|
||||
onUpdate,
|
||||
automation: propsAutos,
|
||||
onUpdate: propsOnUpdate,
|
||||
}) => {
|
||||
// state
|
||||
const { ratioWbh } = useWindowSize();
|
||||
const [closeInfo, setCloseInfo] = useState(false);
|
||||
const [modalState, setModalState] = useState<null | TriggerEditorModalState>(null);
|
||||
const { classes } = useEditorStyles({
|
||||
closeInfo,
|
||||
horizontalMode: ratioWbh < 0.75
|
||||
});
|
||||
const {
|
||||
state,
|
||||
updateSequence,
|
||||
updateTrigger,
|
||||
updateMetadata,
|
||||
updateCondition,
|
||||
save,
|
||||
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
|
||||
|
||||
// alias
|
||||
const updateSequence = (sequence: AutomationSequenceNode[]) => onUpdate({
|
||||
...automation,
|
||||
sequence,
|
||||
});
|
||||
const updateTriggers = (trigger: AutomationTrigger[]) => onUpdate({
|
||||
...automation,
|
||||
trigger,
|
||||
});
|
||||
const [closeInfo, setCloseInfo] = useState(false);
|
||||
|
||||
// render
|
||||
return <div className={classes.root}>
|
||||
<Modal open={!!modalState}>
|
||||
{!!modalState && <NodeEditor
|
||||
node={modalState.trigger}
|
||||
onClose={() => setModalState(null)}
|
||||
onSave={(n) => {
|
||||
modalState.onSave(n as any);
|
||||
setModalState(null);
|
||||
}}
|
||||
allowedTypes={['trigger']}
|
||||
/>}
|
||||
</Modal>
|
||||
if (state.status === 'loading') {
|
||||
return <div className="automation-editor loading">
|
||||
Loading...
|
||||
</div>
|
||||
}
|
||||
return <div className="automation-editor">
|
||||
<AutoInfoBox
|
||||
className={closeInfo ? "hide" : "show"}
|
||||
metadata={automation.metadata}
|
||||
onUpdate={metadata => onUpdate({ ...automation, metadata })}
|
||||
metadata={state.data.metadata}
|
||||
tags={state.data.tags}
|
||||
onUpdate={updateMetadata}
|
||||
>
|
||||
<ButtonIcon
|
||||
className={`${classes.infoIcon} automation-editor--info-icon`}
|
||||
className="automation-editor--info-box--icon"
|
||||
onClick={() => setCloseInfo(!closeInfo)}
|
||||
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
|
||||
>{ArrowIcon}</ButtonIcon>
|
||||
</AutoInfoBox>
|
||||
|
||||
<SequenceNodes
|
||||
zoomLevel={1.5}
|
||||
startPoint={[2, 0.5]}
|
||||
dims={dims}
|
||||
sequence={automation.sequence}
|
||||
onChange={updateSequence}
|
||||
additionalElements={() => chain([
|
||||
computeExtraField([1, 0.5], [2, 0.5]),
|
||||
computeTriggerPos(
|
||||
[0.5, 0.5],
|
||||
automation.trigger,
|
||||
[1.5, 0.5],
|
||||
updateTriggers,
|
||||
() => {
|
||||
setModalState({
|
||||
trigger: {
|
||||
$smType: "trigger",
|
||||
platform: "device",
|
||||
device_id: "",
|
||||
domain: "",
|
||||
type: "",
|
||||
subtype: ""
|
||||
},
|
||||
onSave: (t) => updateTriggers([...automation.trigger, t])
|
||||
});
|
||||
},
|
||||
(trigger, onSave) => setModalState({
|
||||
trigger,
|
||||
onSave,
|
||||
})
|
||||
),
|
||||
])}
|
||||
/>
|
||||
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
|
||||
<div className="automation-editor--flow-wrapper--toolbar">
|
||||
<Button
|
||||
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
|
||||
onClick={save}
|
||||
disabled={state.status !== 'changed'}
|
||||
>
|
||||
Save <CheckMarkIcon color="#bf4" />
|
||||
</Button>
|
||||
</div>
|
||||
<DAGAutomationFlow
|
||||
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>
|
||||
</div>
|
||||
}
|
||||
@@ -1,78 +0,0 @@
|
||||
import { DAGElement } from "components/DAGSvgs/DAGBoard";
|
||||
import { Point } from "types/graphs";
|
||||
import { AutomationTrigger } from 'types/automations/triggers';
|
||||
import { avgPoints } from "utils/graph";
|
||||
|
||||
|
||||
export function* computeTriggerPos(
|
||||
startPoint: Point,
|
||||
triggers: AutomationTrigger[],
|
||||
toPath: Point,
|
||||
onUpdate: (ts: AutomationTrigger[]) => void,
|
||||
onAdd: () => void,
|
||||
onEdit: (nt: AutomationTrigger, onSave: (ts: AutomationTrigger) => void) => void,
|
||||
): Generator<DAGElement> {
|
||||
// functions
|
||||
const makeRemoveNode = (i: number) => () => onUpdate([
|
||||
...triggers.slice(0, i),
|
||||
...triggers.slice(i + 1),
|
||||
]);
|
||||
const updateNode = (n: AutomationTrigger, i: number) => onUpdate([
|
||||
...triggers.slice(0, i),
|
||||
n,
|
||||
...triggers.slice(i + 1),
|
||||
])
|
||||
|
||||
// main loop
|
||||
for (let i = 0; i < triggers.length; i++) {
|
||||
const node = triggers[i];
|
||||
const nodeLoc: Point = [startPoint[0], startPoint[1] + i];
|
||||
yield {
|
||||
type: "node",
|
||||
node,
|
||||
loc: nodeLoc,
|
||||
onRemove: makeRemoveNode(i),
|
||||
onOpen: () => onEdit(node, up => updateNode(up, i))
|
||||
}
|
||||
yield {
|
||||
type: "edge",
|
||||
p1: nodeLoc,
|
||||
p2: toPath,
|
||||
direction: "1->2",
|
||||
}
|
||||
}
|
||||
// if we had nothing to loop on
|
||||
if (triggers.length === 0) {
|
||||
yield {
|
||||
type: "edge",
|
||||
p1: [startPoint[0] - 0.25, startPoint[1] + triggers.length],
|
||||
p2: toPath,
|
||||
direction: "1->2",
|
||||
}
|
||||
}
|
||||
// add circle
|
||||
yield {
|
||||
type: 'circle',
|
||||
icon: 'add',
|
||||
loc: [startPoint[0] + 0.25, startPoint[1] + triggers.length],
|
||||
onAdd
|
||||
}
|
||||
}
|
||||
|
||||
export function* computeExtraField(
|
||||
triggerEndPos: Point,
|
||||
sequenceStartPos: Point,
|
||||
): Generator<DAGElement> {
|
||||
yield {
|
||||
type: 'circle',
|
||||
loc: avgPoints(triggerEndPos, sequenceStartPos),
|
||||
icon: 'color',
|
||||
color: 'blue',
|
||||
}
|
||||
yield {
|
||||
type: 'edge',
|
||||
p1: triggerEndPos,
|
||||
p2: sequenceStartPos,
|
||||
direction: '1->2',
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
import { useState, useEffect } from 'react';
|
||||
import { AutomationData, AutomationMetadata } from "types/automations";
|
||||
|
||||
|
||||
export type EditorData = ReturnType<typeof genEditorData>;
|
||||
export type EditorState = {
|
||||
status: 'unchanged' | 'changed',
|
||||
data: EditorData
|
||||
} | {
|
||||
status: 'loading'
|
||||
}
|
||||
export type EditorStatus = EditorState['status'];
|
||||
|
||||
export const useAutomatioEditorState = (
|
||||
automation: AutomationData | undefined,
|
||||
onSave: (a: AutomationData) => void,
|
||||
) => {
|
||||
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({
|
||||
status: 'changed',
|
||||
data: {
|
||||
...state.data,
|
||||
[name]: data,
|
||||
}
|
||||
})
|
||||
|
||||
useEffect(() => {
|
||||
if (automation) {
|
||||
update({
|
||||
status: 'unchanged',
|
||||
data: genEditorData(automation),
|
||||
})
|
||||
}
|
||||
}, [automation]);
|
||||
|
||||
return {
|
||||
updateTrigger: makeUpdate('trigger'),
|
||||
updateSequence: makeUpdate('sequence'),
|
||||
updateCondition: makeUpdate('condition'),
|
||||
updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => {
|
||||
if (state.status !== 'loading') {
|
||||
update({
|
||||
status: 'changed',
|
||||
data: {
|
||||
...state.data,
|
||||
tags,
|
||||
metadata,
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
save: () => {
|
||||
if (state.status !== 'loading') {
|
||||
const data = {
|
||||
...state.data,
|
||||
tags: state.data.tags.reduce((all, [tagName, tagValue]) => ({
|
||||
...all,
|
||||
[tagName]: tagValue,
|
||||
}), {})
|
||||
};
|
||||
update({
|
||||
status: "loading",
|
||||
})
|
||||
onSave(data);
|
||||
}
|
||||
},
|
||||
get state() {
|
||||
return state;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
const genEditorData = (automation: AutomationData) => {
|
||||
const {
|
||||
metadata,
|
||||
trigger,
|
||||
sequence,
|
||||
condition,
|
||||
} = automation;
|
||||
|
||||
const tags: [string, string][] = Object.keys(automation.tags).map(tagName => [tagName, automation.tags[tagName]]);
|
||||
|
||||
return {
|
||||
metadata,
|
||||
trigger,
|
||||
sequence,
|
||||
condition,
|
||||
tags,
|
||||
}
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
import { createAppUseStyles } from "styles/theme";
|
||||
|
||||
|
||||
export const useEditorStyles = createAppUseStyles<{
|
||||
closeInfo: boolean;
|
||||
horizontalMode: boolean;
|
||||
}>(theme => ({
|
||||
root: ({horizontalMode}) => ({
|
||||
height: '100%',
|
||||
width: '100%',
|
||||
color: theme.primaryAccent,
|
||||
display: 'flex',
|
||||
flexDirection: horizontalMode ? 'column' : 'row',
|
||||
}),
|
||||
dag: {
|
||||
borderWidth: 1,
|
||||
borderStyle: 'solid',
|
||||
borderColor: theme.secondaryAccent,
|
||||
width: '100%',
|
||||
},
|
||||
infoIcon: ({horizontalMode}) => ({
|
||||
bottom: horizontalMode ? '90%' : 10
|
||||
})
|
||||
}))
|
||||
@@ -1,22 +1,16 @@
|
||||
import "styles/root.css";
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { useState } from "react";
|
||||
import { AutomationList } from ".";
|
||||
import { NODE_HEIGHT, NODE_WIDTH, ADD_HEIGHT, ADD_WIDTH, CIRCLE_SIZE, DISTANCE_FACTOR } from 'components/DAGSvgs/constants';
|
||||
import { createMockAuto } from "utils/mocks";
|
||||
import * as dgconst from 'components/DAGSvgs/constants';
|
||||
|
||||
export default {
|
||||
title: 'App/AutomationList',
|
||||
component: AutomationList,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
args: {
|
||||
dims: {
|
||||
nodeHeight: NODE_HEIGHT,
|
||||
nodeWidth: NODE_WIDTH,
|
||||
addHeight: ADD_HEIGHT,
|
||||
addWidth: ADD_WIDTH,
|
||||
circleSize: CIRCLE_SIZE,
|
||||
distanceFactor: DISTANCE_FACTOR,
|
||||
}
|
||||
dims: dgconst.DEFAULT_DIMS
|
||||
}
|
||||
} as ComponentMeta<typeof AutomationList>;
|
||||
|
||||
@@ -58,15 +52,15 @@ export const FewAutos = Template.bind({})
|
||||
FewAutos.args = {
|
||||
...FewAutos.args,
|
||||
automations: [
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
|
||||
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
|
||||
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
|
||||
createMockAuto({ "Type": "Climate" }),
|
||||
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
|
||||
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
|
||||
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
|
||||
createMockAuto({ "Room": "Office", "Type": "Lights" }),
|
||||
createMockAuto({ "Room": "Office" }),
|
||||
createMockAuto(),
|
||||
],
|
||||
}
|
||||
@@ -0,0 +1,109 @@
|
||||
.automation-list-box {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.automation-list-box--body {
|
||||
overflow: auto;
|
||||
height: 100%;
|
||||
flex: 1;
|
||||
user-select: none;
|
||||
}
|
||||
.automation-list-box--body > * {
|
||||
padding-top: 0.5em;
|
||||
padding-bottom: 0.5em;
|
||||
}
|
||||
.automation-list-box--body--group {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding-left: 1em;
|
||||
border-radius: 10px;
|
||||
padding-bottom: 0.5em;
|
||||
border-width: 1px;
|
||||
border-bottom-style: solid ;
|
||||
border-color: white;
|
||||
}
|
||||
.automation-list-box--body--group > .automation-list-box--body--group {
|
||||
border-left-style: solid ;
|
||||
border-top-left-radius: 0;
|
||||
margin-left: 0.75em;
|
||||
padding-left: 0.5em;
|
||||
}
|
||||
|
||||
.automation-list-box--body--group > b {
|
||||
width: 100%;
|
||||
cursor: pointer;
|
||||
padding: 0.1em;
|
||||
}
|
||||
.automation-list-box--body--group > b:hover {
|
||||
background-color: var(--secondary-accent);
|
||||
color: var(--secondary);
|
||||
}
|
||||
|
||||
.automation-list-box--body--item:hover {
|
||||
background-color: var(--primary-accent);
|
||||
color: var(--primary);
|
||||
}
|
||||
.automation-list-box--body--item:hover > .automation-list-box--body--item--tags > span {
|
||||
border-color: var(--primary);
|
||||
}
|
||||
.automation-list-box--body--item {
|
||||
padding-left: 1em;
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
justify-content: left;
|
||||
align-items: flex-start;
|
||||
gap: 1em;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.automation-list-box--body--item::before {
|
||||
content: "⊚ ";
|
||||
}
|
||||
.automation-list-box--body--item--title {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding-left: 0.25em;
|
||||
flex: 1;
|
||||
}
|
||||
.automation-list-box--body--item--title > b {
|
||||
font-size: 1em;
|
||||
}
|
||||
.automation-list-box--body--item--title > span, .automation-list-box--body--item--title > b > span {
|
||||
font-size: 0.75em;
|
||||
}
|
||||
.automation-list-box--body--item > button {
|
||||
padding: 0.25em !important;
|
||||
margin: 0.5em !important;
|
||||
}
|
||||
.automation-list-box--body--item--tags {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
font-size: 0.75em;
|
||||
justify-content: left;
|
||||
align-items: flex-start;
|
||||
overflow: auto;
|
||||
max-height: 100%;
|
||||
gap: 0.25em;
|
||||
}
|
||||
.automation-list-box--body--item--tags > span {
|
||||
border-color: var(--primary-accent);
|
||||
border-style: solid;
|
||||
border-width: 1px;
|
||||
border-radius: 0.5em;
|
||||
padding: 0.1em 0.5em;
|
||||
}
|
||||
.automation-list-box--bottom {
|
||||
margin-top: 0.5em;
|
||||
margin-bottom: 0.5em;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
align-items: center;
|
||||
}
|
||||
.automation-list-box--bottom > button {
|
||||
background-color: #070;
|
||||
color: var(--primary-accent);
|
||||
padding: 0.5em 2em;
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { useState } from "react";
|
||||
import { AutomationListBox } from "./AutomationListBox";
|
||||
import { createMockAuto } from "utils/mocks";
|
||||
|
||||
export default {
|
||||
title: 'App/AutomationList/Box',
|
||||
component: AutomationListBox,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
args: {
|
||||
}
|
||||
} as ComponentMeta<typeof AutomationListBox>;
|
||||
|
||||
|
||||
const Template: ComponentStory<typeof AutomationListBox> = args => {
|
||||
const [autos, setAutos] = useState(args.automations)
|
||||
console.log({ args })
|
||||
return <div className="page">
|
||||
<AutomationListBox {...args} automations={autos} />
|
||||
</div>
|
||||
}
|
||||
|
||||
export const EmptyStart = Template.bind({})
|
||||
EmptyStart.args = {
|
||||
...EmptyStart.args,
|
||||
automations: [],
|
||||
}
|
||||
|
||||
export const FewAutos = Template.bind({})
|
||||
FewAutos.args = {
|
||||
...FewAutos.args,
|
||||
automations: [
|
||||
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
|
||||
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
|
||||
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
|
||||
createMockAuto({ "Type": "Climate" }),
|
||||
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
|
||||
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
|
||||
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
|
||||
createMockAuto({ "Room": "Office", "Type": "Lights" }),
|
||||
createMockAuto({ "Room": "Office" }),
|
||||
createMockAuto(),
|
||||
],
|
||||
}
|
||||
@@ -0,0 +1,101 @@
|
||||
import { groupAutomations, getTagList } from './AutomationListBox';
|
||||
import { AutomationData } from 'types/automations/index';
|
||||
import { createMockAuto } from 'utils/mocks';
|
||||
|
||||
test('group automations', () => {
|
||||
const automations: AutomationData[] = [
|
||||
{
|
||||
condition: [],
|
||||
metadata: {
|
||||
id: '1',
|
||||
alias: '',
|
||||
description: '',
|
||||
mode: 'single',
|
||||
},
|
||||
tags: {
|
||||
"Room": 'Living Room',
|
||||
"Type": 'Lights'
|
||||
},
|
||||
sequence: [],
|
||||
trigger: [],
|
||||
},
|
||||
{
|
||||
condition: [],
|
||||
metadata: {
|
||||
id: '2',
|
||||
alias: '',
|
||||
description: '',
|
||||
mode: 'single',
|
||||
},
|
||||
tags: {
|
||||
"Room": 'Living Room',
|
||||
"Type": 'Climate'
|
||||
},
|
||||
sequence: [],
|
||||
trigger: [],
|
||||
},
|
||||
{
|
||||
condition: [],
|
||||
metadata: {
|
||||
id: '3',
|
||||
alias: '',
|
||||
description: '',
|
||||
mode: 'single',
|
||||
},
|
||||
tags: {
|
||||
"Room": 'Kitchen',
|
||||
"Type": 'Climate'
|
||||
},
|
||||
sequence: [],
|
||||
trigger: [],
|
||||
},
|
||||
];
|
||||
expect(groupAutomations(automations, [0, 1], ['Room', "Type"])).toStrictEqual({
|
||||
"Living Room": {
|
||||
"Lights": [0],
|
||||
"Climate": [1],
|
||||
},
|
||||
"Kitchen": {
|
||||
"Climate": [2],
|
||||
}
|
||||
})
|
||||
expect(groupAutomations(automations, [1, 0], ['Room', "Type"])).toStrictEqual({
|
||||
"Lights": {
|
||||
"Living Room": [0],
|
||||
},
|
||||
"Climate": {
|
||||
"Living Room": [1],
|
||||
"Kitchen": [2]
|
||||
}
|
||||
})
|
||||
expect(groupAutomations(automations, [1], ['Room', "Type"])).toStrictEqual({
|
||||
"Lights": [0],
|
||||
"Climate": [1, 2]
|
||||
})
|
||||
expect(groupAutomations(automations, [0], ['Room', "Type"])).toStrictEqual({
|
||||
"Living Room": [0, 1],
|
||||
"Kitchen": [2]
|
||||
})
|
||||
|
||||
|
||||
expect(groupAutomations(automations, [], ['Room', "Type"])).toStrictEqual([
|
||||
0, 1, 2
|
||||
])
|
||||
});
|
||||
|
||||
|
||||
test('getTagList', () => {
|
||||
expect(getTagList([
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
])).toStrictEqual([])
|
||||
|
||||
expect(getTagList([
|
||||
createMockAuto({ "Room": "Kitchen", "Area": "Oven" }),
|
||||
createMockAuto({ "Room": "Attic" }),
|
||||
createMockAuto({ "Room": "Office" }),
|
||||
createMockAuto({ "Area": "Balcony" }),
|
||||
])).toStrictEqual(["Room", "Area"])
|
||||
})
|
||||
@@ -0,0 +1,185 @@
|
||||
import "./AutomationListBox.css";
|
||||
import { FC, useState } from 'react';
|
||||
import { AutomationData } from "types/automations";
|
||||
import InputMultiSelect from "components/Inputs/InputMultiSelect";
|
||||
import InputText from "components/Inputs/InputText";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
import { TrashIcon } from "components/Icons";
|
||||
|
||||
|
||||
export type Props = {
|
||||
automations: AutomationData[];
|
||||
onSelectAutomation: (i: number) => void;
|
||||
onRemove: (i: number) => void;
|
||||
onAdd: () => void;
|
||||
}
|
||||
|
||||
export const AutomationListBox: FC<Props> = ({
|
||||
automations,
|
||||
onSelectAutomation,
|
||||
onAdd,
|
||||
onRemove,
|
||||
}) => {
|
||||
|
||||
const tags = getTagList(automations);
|
||||
const [searchText, setSearchText] = useState('');
|
||||
const [selected, setSelected] = useState<number[]>([]);
|
||||
const filteredAutomations = filterAutomations(automations, searchText, selected, tags);
|
||||
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selected, tags);
|
||||
|
||||
return <div className="automation-list-box">
|
||||
<div className="automation-list-box--nav">
|
||||
<InputText
|
||||
label="Search"
|
||||
value={searchText}
|
||||
onChange={setSearchText}
|
||||
/>
|
||||
<InputMultiSelect
|
||||
label="Tags"
|
||||
selected={selected}
|
||||
onChange={setSelected}
|
||||
options={tags}
|
||||
max={3}
|
||||
/>
|
||||
</div>
|
||||
<div className="automation-list-box--body">
|
||||
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove)}
|
||||
</div>
|
||||
<div className="automation-list-box--bottom">
|
||||
<Button onClick={onAdd}>Add</Button>
|
||||
<span>Showing Automations: {filteredAutomations.length} out of {automations.length}</span>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
|
||||
export const getTagList = (autos: AutomationData[]): string[] => Object.keys(autos
|
||||
.map(a => Object.keys(a.tags))
|
||||
.reduce((all: any, keys) => {
|
||||
for (const k of keys) {
|
||||
all[k] = 1
|
||||
}
|
||||
return all;
|
||||
}, {}))
|
||||
|
||||
const filterAutomations = (autos: AutomationData[], searchText: string, selected: number[], tags: string[]): Array<[AutomationData, number]> => autos.map<[AutomationData, number]>((a, i) => [a, i]).filter(([a, i]) => {
|
||||
if (searchText.length > 0) {
|
||||
if (
|
||||
!(
|
||||
a.metadata.description.toLocaleLowerCase().includes(searchText) ||
|
||||
a.metadata.alias.toLocaleLowerCase().includes(searchText)
|
||||
)
|
||||
) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
if (selected.length > 0) {
|
||||
for (const i of selected) {
|
||||
if (!a.tags[tags[i]]) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
return true
|
||||
})
|
||||
|
||||
|
||||
export const groupAutomations = (
|
||||
autos: AutomationData[],
|
||||
selected: number[],
|
||||
tags: string[],
|
||||
) => {
|
||||
if (selected.length === 0) {
|
||||
return autos.map((_, i) => i);
|
||||
}
|
||||
const out: any = {};
|
||||
for (let ai = 0; ai < autos.length; ai++) {
|
||||
const a = autos[ai];
|
||||
let where = out;
|
||||
let tag: string = '';
|
||||
let lastKey: string | null = null;
|
||||
for (const i of selected) {
|
||||
tag = tags[i];
|
||||
if (lastKey !== null) {
|
||||
where = where[lastKey]
|
||||
}
|
||||
if (!where[a.tags[tag]]) {
|
||||
where[a.tags[tag]] = {}
|
||||
}
|
||||
lastKey = a.tags[tag]
|
||||
}
|
||||
if (lastKey !== null) {
|
||||
if (!where[lastKey] || !Array.isArray(where[lastKey])) {
|
||||
where[lastKey] = []
|
||||
}
|
||||
where[lastKey].push(ai)
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
const convertGroupsToItems = (
|
||||
groups: any,
|
||||
autos: Array<[AutomationData, number]>,
|
||||
onSelectAutomation: (i: number) => void,
|
||||
onRemove: (i: number) => void,
|
||||
) => {
|
||||
if (Array.isArray(groups)) {
|
||||
return groups.map(i => {
|
||||
const [auto, autoIndex] = autos[i];
|
||||
return <div
|
||||
key={i}
|
||||
className="automation-list-box--body--item"
|
||||
title={`Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`}
|
||||
onClick={() => onSelectAutomation(autoIndex)}
|
||||
>
|
||||
<div
|
||||
className="automation-list-box--body--item--title"
|
||||
>
|
||||
<b>{auto.metadata.alias.slice(0, 15)} <span>({auto.metadata.id.slice(0, 5)})</span></b>
|
||||
<span>{auto.metadata.description.slice(0, 25)}</span>
|
||||
<div
|
||||
className="automation-list-box--body--item--tags"
|
||||
>
|
||||
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
|
||||
<b>{tagName}:</b> {auto.tags[tagName]}
|
||||
</span>)}
|
||||
</div>
|
||||
</div>
|
||||
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
|
||||
</div>
|
||||
})
|
||||
} else {
|
||||
return Object.keys(groups).map(groupName => {
|
||||
return <AutomationListBoxGroup
|
||||
key={groupName}
|
||||
groupName={groupName}
|
||||
groups={groups[groupName]}
|
||||
autos={autos}
|
||||
onSelectAutomation={onSelectAutomation}
|
||||
onRemove={onRemove}
|
||||
/>
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
const AutomationListBoxGroup: FC<{
|
||||
groupName: string,
|
||||
groups: any,
|
||||
autos: Array<[AutomationData, number]>,
|
||||
onSelectAutomation: (i: number) => void,
|
||||
onRemove: (i: number) => void;
|
||||
}> = ({
|
||||
groupName,
|
||||
groups,
|
||||
autos,
|
||||
onSelectAutomation,
|
||||
onRemove,
|
||||
}) => {
|
||||
const [open, setOpen] = useState(false);
|
||||
return <div className="automation-list-box--body--group">
|
||||
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
|
||||
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove)}
|
||||
</div>
|
||||
}
|
||||
@@ -1,31 +1,24 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { ConnectedAutmationList } from ".";
|
||||
import { NODE_HEIGHT, NODE_WIDTH, ADD_HEIGHT, ADD_WIDTH, CIRCLE_SIZE, DISTANCE_FACTOR } from 'components/DAGSvgs/constants';
|
||||
import { ConnectedAutomationList } from ".";
|
||||
import { createMockAuto } from "utils/mocks";
|
||||
import { useMockApiService } from "apiService";
|
||||
import { DEFAULT_DIMS } from 'components/DAGSvgs/constants';
|
||||
|
||||
export default {
|
||||
title: 'App/ConnectedAutmationList',
|
||||
component: ConnectedAutmationList,
|
||||
title: 'App/AutomationList/Connected',
|
||||
component: ConnectedAutomationList,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
args: {
|
||||
dims: {
|
||||
nodeHeight: NODE_HEIGHT,
|
||||
nodeWidth: NODE_WIDTH,
|
||||
addHeight: ADD_HEIGHT,
|
||||
addWidth: ADD_WIDTH,
|
||||
circleSize: CIRCLE_SIZE,
|
||||
distanceFactor: DISTANCE_FACTOR,
|
||||
},
|
||||
dims: DEFAULT_DIMS,
|
||||
initialAutomations: [],
|
||||
}
|
||||
} as ComponentMeta<typeof ConnectedAutmationList>;
|
||||
} as ComponentMeta<typeof ConnectedAutomationList>;
|
||||
|
||||
|
||||
const Template: ComponentStory<any> = args => {
|
||||
const api = useMockApiService(args.initialAutomations);
|
||||
return <div className="page">
|
||||
<ConnectedAutmationList
|
||||
<ConnectedAutomationList
|
||||
{...args}
|
||||
api={api}
|
||||
/>
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
/* root elements */
|
||||
.automation-list--root {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.automation-list--list {
|
||||
flex: 1;
|
||||
min-width: 400px;
|
||||
max-width: 400px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.automation-list--viewer {
|
||||
overflow: hidden;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
/* list children: on hide */
|
||||
.automation-list--list.hide>.automation-list-box {
|
||||
width: 0;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.automation-list--list.hide {
|
||||
min-width: 35px;
|
||||
max-width: 35px;
|
||||
}
|
||||
|
||||
.automation-list--list.hide>.automation-list--list-hide {
|
||||
transform: rotate(180deg);
|
||||
}
|
||||
|
||||
/* list children: normal */
|
||||
.automation-list--list {
|
||||
border-right: solid;
|
||||
border-width: 1px;
|
||||
}
|
||||
|
||||
.automation-list--list-hide {
|
||||
position: absolute;
|
||||
bottom: 0.5em;
|
||||
right: 0.5em;
|
||||
}
|
||||
@@ -1,13 +1,13 @@
|
||||
import "./styles.css";
|
||||
import "./index.css";
|
||||
import { AutomationEditor } from "components/AutomationEditor";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
import { FC, useState } from "react";
|
||||
import { AutomationData } from "types/automations";
|
||||
import { DAGBoardElmDims } from 'components/DAGSvgs/DAGBoard';
|
||||
import { defaultAutomation } from '../../utils/defaults';
|
||||
import { ArrowIcon, TrashIcon } from "components/Icons";
|
||||
import { defaultAutomation } from 'utils/defaults';
|
||||
import { ArrowIcon } from "components/Icons";
|
||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||
import { ApiService } from "apiService/core";
|
||||
import { AutomationListBox } from "./AutomationListBox";
|
||||
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
|
||||
|
||||
|
||||
interface AutomationListParams {
|
||||
@@ -15,7 +15,7 @@ interface AutomationListParams {
|
||||
onUpdate: (i: number, auto: AutomationData) => void;
|
||||
onAdd: (auto: AutomationData) => void;
|
||||
onRemove: (i: number) => void;
|
||||
dims: DAGBoardElmDims;
|
||||
dims: DAGAutomationFlowDims;
|
||||
}
|
||||
|
||||
export const AutomationList: FC<AutomationListParams> = ({
|
||||
@@ -35,21 +35,15 @@ export const AutomationList: FC<AutomationListParams> = ({
|
||||
// render
|
||||
return <div className="automation-list--root">
|
||||
<div className={automationListListCls}>
|
||||
<div className="automation-list--list-box">
|
||||
{automations.map((auto, i) =>
|
||||
<div key={i} className="automation-list--elm">
|
||||
<Button onClick={() => onRemove(i)} className="automation-list--elm-remove"><TrashIcon /></Button>
|
||||
<Button onClick={() => setCurrent(i)}>
|
||||
{auto.metadata.alias.slice(0, 15)} <br />
|
||||
<span>{auto.metadata.description.slice(0, 25)}</span>
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
<Button onClick={() => {
|
||||
<AutomationListBox
|
||||
automations={automations}
|
||||
onAdd={() => {
|
||||
onAdd(defaultAutomation(`shortu-${automations.length}`));
|
||||
setCurrent(automations.length)
|
||||
}}>Add</Button>
|
||||
</div>
|
||||
}}
|
||||
onSelectAutomation={setCurrent}
|
||||
onRemove={onRemove}
|
||||
/>
|
||||
<ButtonIcon
|
||||
onClick={() => setHideList(!hideList)}
|
||||
className="automation-list--list-hide"
|
||||
@@ -68,11 +62,11 @@ export const AutomationList: FC<AutomationListParams> = ({
|
||||
</div>
|
||||
}
|
||||
|
||||
interface ConnectedAutmationListParams {
|
||||
dims: DAGBoardElmDims;
|
||||
interface ConnectedAutomationListParams {
|
||||
dims: DAGAutomationFlowDims;
|
||||
api: ApiService;
|
||||
}
|
||||
export const ConnectedAutmationList: FC<ConnectedAutmationListParams> = ({
|
||||
export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
|
||||
api: {
|
||||
state: {
|
||||
automations,
|
||||
|
||||
@@ -1,89 +0,0 @@
|
||||
/* root elements */
|
||||
.automation-list--root {
|
||||
width : 100%;
|
||||
height : 100%;
|
||||
display : flex;
|
||||
flex-direction: row;
|
||||
overflow : hidden;
|
||||
}
|
||||
|
||||
.automation-list--list {
|
||||
flex : 1;
|
||||
min-width: 200px;
|
||||
max-width: 200px;
|
||||
position : relative;
|
||||
}
|
||||
|
||||
.automation-list--viewer {
|
||||
/* flex: 6; */
|
||||
min-width: 100%;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
/* list children: on hide */
|
||||
.automation-list--list.hide>.automation-list--list-box {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.automation-list--list.hide {
|
||||
min-width: 35px;
|
||||
max-width: 35px;
|
||||
}
|
||||
|
||||
.automation-list--list.hide>.automation-list--list-hide {
|
||||
transform: rotate(180deg);
|
||||
}
|
||||
|
||||
/* list children: normal */
|
||||
.automation-list--list {
|
||||
border-right: solid;
|
||||
border-width: 1px;
|
||||
}
|
||||
|
||||
.automation-list--list-hide {
|
||||
position: absolute;
|
||||
bottom : 10px;
|
||||
right : 5px;
|
||||
}
|
||||
|
||||
|
||||
.automation-list--list-box {
|
||||
overflow : auto;
|
||||
height : 100%;
|
||||
display : flex;
|
||||
flex-direction : column;
|
||||
justify-content: flex-start;
|
||||
align-items : center;
|
||||
padding-top : 10px;
|
||||
margin-bottom : 10px;
|
||||
}
|
||||
|
||||
.automation-list--list-box>* {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.automation-list--list-box>:last-child {
|
||||
background-color: #070;
|
||||
color : white;
|
||||
}
|
||||
|
||||
.automation-list--elm {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.automation-list--elm>button {
|
||||
padding-left : 5px;
|
||||
padding-right: 5px;
|
||||
}
|
||||
|
||||
.automation-list--elm>button>span {
|
||||
font-size: 0.75em;
|
||||
}
|
||||
|
||||
.automation-list--elm>.automation-list--elm-remove {
|
||||
position: absolute;
|
||||
left : -10px;
|
||||
top : 10%;
|
||||
padding : 0;
|
||||
margin : 0;
|
||||
}
|
||||
@@ -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")
|
||||
|
||||
@@ -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)}
|
||||
/>
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
import { FC } from "react";
|
||||
import { AddIcon, PencilIcon, TrashIcon } from '../Icons/index';
|
||||
import { useCircleStyles } from './styles';
|
||||
import { Handle, Position, XYPosition } from 'react-flow-renderer';
|
||||
|
||||
|
||||
|
||||
export interface DAGCircleProps {
|
||||
onAdd?: () => void;
|
||||
onRemove?: () => void;
|
||||
size: number,
|
||||
backgroundColor?: string;
|
||||
disableSource?: boolean;
|
||||
disableTarget?: boolean;
|
||||
}
|
||||
export const makeFlowCircle = (
|
||||
circleId: string,
|
||||
position: XYPosition,
|
||||
data: DAGCircleProps,
|
||||
) => ({
|
||||
id: circleId,
|
||||
type: 'dagcircle',
|
||||
position,
|
||||
data
|
||||
})
|
||||
|
||||
export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
|
||||
data: {
|
||||
size,
|
||||
onAdd,
|
||||
onRemove,
|
||||
backgroundColor,
|
||||
disableSource = false,
|
||||
disableTarget = false,
|
||||
}
|
||||
}) => {
|
||||
const { classes } = useCircleStyles({
|
||||
size,
|
||||
hasOnFunction: !!onRemove || !!onAdd,
|
||||
hasRemoveFunction: !!onRemove,
|
||||
backgroundColor,
|
||||
});
|
||||
return <>
|
||||
{!disableSource && <Handle type="source" position={Position.Right} />}
|
||||
{!disableTarget && <Handle type="target" position={Position.Left} />}
|
||||
<div className={classes.root}>
|
||||
{
|
||||
onAdd ?
|
||||
<AddIcon
|
||||
size={70} units="%"
|
||||
className={classes.icon}
|
||||
onClick={onAdd}
|
||||
/>
|
||||
: (backgroundColor || onRemove) ? "" : "else"
|
||||
}
|
||||
{onRemove ? <TrashIcon className={classes.trashIcon} onClick={onRemove} /> : <></>}
|
||||
</div>
|
||||
</>
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
import { PencilIcon } from "components/Icons"
|
||||
import { NodeColor } from "types/graphs";
|
||||
import { useNodeStyles } from "./styles";
|
||||
import { Handle, Position } from 'react-flow-renderer';
|
||||
import { FC } from "react";
|
||||
|
||||
|
||||
export interface DAGNodeProps {
|
||||
height: number;
|
||||
width: number;
|
||||
onXClick?: () => void;
|
||||
onEditClick?: () => void;
|
||||
color: NodeColor;
|
||||
label: string;
|
||||
hasInput?: boolean;
|
||||
accentBackground?: boolean;
|
||||
}
|
||||
export const DAGNode: FC<{ data: DAGNodeProps }> = ({
|
||||
data: {
|
||||
label,
|
||||
height,
|
||||
width,
|
||||
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} />}
|
||||
<Handle type="source" position={Position.Right} />
|
||||
<div className={classes.root}>
|
||||
<div className={classes.inner}>
|
||||
<div className={classes.leftEdge} onClick={onXClick}>
|
||||
{!!onXClick && <button className={classes.buttonDelete}>X</button>}
|
||||
</div>
|
||||
<div className={classes.textWrap}>
|
||||
<span className={classes.text} title={label}>
|
||||
{label}
|
||||
</span>
|
||||
</div>
|
||||
<div className={classes.rightEdge} onClick={() => {
|
||||
console.log('editing me', label, onEditClick, onEditClick())
|
||||
}}>
|
||||
<button className={classes.buttonEdit}>
|
||||
<PencilIcon size={1.1} color={theme.green} />
|
||||
</button>
|
||||
</div>
|
||||
</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,
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,213 @@
|
||||
|
||||
|
||||
import React from "react";
|
||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||
import { DAGAutomationFlow } from '.';
|
||||
import { useState } from 'react';
|
||||
import * as dgconst from "components/DAGSvgs/constants";
|
||||
|
||||
|
||||
export default {
|
||||
title: 'DAGAutomationFlow/Viewer',
|
||||
component: DAGAutomationFlow,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
args: {
|
||||
dims: dgconst.DEFAULT_DIMS
|
||||
}
|
||||
} as ComponentMeta<typeof DAGAutomationFlow>
|
||||
|
||||
const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
|
||||
const [state, setState] = useState({
|
||||
trigger: args.trigger,
|
||||
sequence: args.sequence,
|
||||
condition: args.condition,
|
||||
})
|
||||
return <div className="page">
|
||||
<DAGAutomationFlow
|
||||
{...args}
|
||||
{...state}
|
||||
onTriggerUpdate={trigger => {
|
||||
console.log({ trigger })
|
||||
setState({ ...state, trigger })
|
||||
}}
|
||||
onSequenceUpdate={sequence => setState({ ...state, sequence })}
|
||||
onConditionUpdate={condition => setState({ ...state, condition })}
|
||||
/>
|
||||
</div>
|
||||
}
|
||||
|
||||
export const Simple = Template.bind({})
|
||||
Simple.args = {
|
||||
...Simple.args,
|
||||
condition: [],
|
||||
trigger: [
|
||||
{
|
||||
"platform": "numeric_state",
|
||||
"entity_id": "test",
|
||||
},
|
||||
{
|
||||
"platform": "homeassistant",
|
||||
"event": "start",
|
||||
}
|
||||
],
|
||||
sequence: [
|
||||
{
|
||||
condition: 'and',
|
||||
conditions: [
|
||||
{
|
||||
condition: 'numeric_state',
|
||||
entity_id: 'sensor.temperature_kitchen',
|
||||
below: '15',
|
||||
},
|
||||
{
|
||||
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",
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
export const Complex = Template.bind({})
|
||||
Complex.args = {
|
||||
...Complex.args,
|
||||
condition: [],
|
||||
trigger: [
|
||||
{
|
||||
"platform": "numeric_state",
|
||||
"entity_id": "test",
|
||||
},
|
||||
{
|
||||
"platform": "homeassistant",
|
||||
"event": "start",
|
||||
}
|
||||
],
|
||||
sequence: [
|
||||
{
|
||||
"condition": "and",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "numeric_state",
|
||||
"entity_id": "sensor.temperature_kitchen",
|
||||
"below": "15"
|
||||
},
|
||||
{
|
||||
"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"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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": {}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"condition": "and",
|
||||
"conditions": []
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
export const EmptyStart = Template.bind({})
|
||||
EmptyStart.args = {
|
||||
...EmptyStart.args,
|
||||
condition: [],
|
||||
trigger: [],
|
||||
sequence: []
|
||||
}
|
||||
@@ -0,0 +1,145 @@
|
||||
import { FC, useState } from "react";
|
||||
|
||||
import ReactFlow, { MiniMap, Controls } from 'react-flow-renderer';
|
||||
import { AutomationSequenceNode } from "types/automations";
|
||||
import { AutomationTrigger } from 'types/automations/triggers';
|
||||
import { triggerToFlow } from "./triggerConvertor";
|
||||
import { DAGNode } from "./DAGNode";
|
||||
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,
|
||||
'dagcircle': DAGCircle,
|
||||
}
|
||||
|
||||
interface Props {
|
||||
className?: string;
|
||||
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,
|
||||
trigger,
|
||||
condition,
|
||||
sequence,
|
||||
onTriggerUpdate,
|
||||
onSequenceUpdate,
|
||||
onConditionUpdate,
|
||||
dims,
|
||||
}) => {
|
||||
// state
|
||||
const [modalState, setModalState] = useState<ModalState | null>(null);
|
||||
|
||||
// modal
|
||||
let modalBody = <></>
|
||||
if (modalState) {
|
||||
if (modalState.single) {
|
||||
modalBody = <NodeEditor
|
||||
node={modalState.node}
|
||||
onClose={() => setModalState(null)}
|
||||
onSave={n => { modalState.update(n as any); setModalState(null); }}
|
||||
allowedTypes={modalState.allowedTypes}
|
||||
saveBtnCreateText={modalState.saveBtnCreateText}
|
||||
/>
|
||||
} else {
|
||||
modalBody = <MultiNodeEditor
|
||||
sequence={modalState.node}
|
||||
onClose={() => setModalState(null)}
|
||||
onSave={(n) => modalState.update(n as any)}
|
||||
allowedTypes={['condition']}
|
||||
/>
|
||||
}
|
||||
}
|
||||
|
||||
// convert automation to flow data
|
||||
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: [],
|
||||
}
|
||||
triggerToFlow(flowData, trigger, condPoint.id, dims, {
|
||||
onAdd: () => onTriggerUpdate([
|
||||
...trigger, {
|
||||
platform: 'event',
|
||||
event_type: '',
|
||||
}
|
||||
]),
|
||||
onDelete: i => onTriggerUpdate([
|
||||
...trigger.slice(0, i),
|
||||
...trigger.slice(i + 1)
|
||||
]),
|
||||
onEdit: i => setModalState({
|
||||
single: true,
|
||||
node: trigger[i],
|
||||
update: t => onTriggerUpdate([
|
||||
...trigger.slice(0, i),
|
||||
t,
|
||||
...trigger.slice(i + 1)
|
||||
]),
|
||||
allowedTypes: ['trigger'],
|
||||
})
|
||||
});
|
||||
sequenceToFlow(
|
||||
flowData,
|
||||
sequence,
|
||||
condPoint.id,
|
||||
{
|
||||
...dims, padding: {
|
||||
x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth,
|
||||
y: dims.padding.y,
|
||||
}
|
||||
},
|
||||
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
|
||||
);
|
||||
|
||||
// render
|
||||
return <>
|
||||
<Modal open={!!modalState}>
|
||||
{modalBody}
|
||||
</Modal>
|
||||
<ReactFlow
|
||||
className={className}
|
||||
nodeTypes={nodeTypes}
|
||||
snapToGrid
|
||||
onlyRenderVisibleElements
|
||||
nodesConnectable={false}
|
||||
nodesDraggable={false}
|
||||
{...flowData}
|
||||
>
|
||||
<MiniMap />
|
||||
<Controls />
|
||||
</ReactFlow>
|
||||
</>;
|
||||
}
|
||||
|
||||
const makeOnEditAutomationConditions = (
|
||||
conditions: AutomationCondition[],
|
||||
updateConditions: (c: AutomationCondition[]) => void,
|
||||
openModal: UpdateModalState,
|
||||
) => () => openModal({
|
||||
single: false,
|
||||
node: conditions,
|
||||
allowedTypes: ['condition'],
|
||||
update: c => updateConditions(c as any),
|
||||
})
|
||||
@@ -0,0 +1,225 @@
|
||||
import { AutomationSequenceNode } from 'types/automations';
|
||||
import { DAGAutomationFlowDims, FlowData } from './types';
|
||||
import { getDescriptionFromAutomationNode } from 'utils/formatting';
|
||||
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 = (
|
||||
flowData: FlowData,
|
||||
sequence: AutomationSequenceNode[],
|
||||
fromPoint: string,
|
||||
dims: DAGAutomationFlowDims,
|
||||
updater: SequenceUpdater,
|
||||
prefix: string = "",
|
||||
) => {
|
||||
let lastPointId = fromPoint;
|
||||
let lasPos: XYPosition | null = null;
|
||||
// sequence
|
||||
for (let i = 0; i < sequence.length; i++) {
|
||||
const node = sequence[i];
|
||||
const nodeId = `${prefix}n-${i}`;
|
||||
let position: XYPosition;
|
||||
if (lasPos) {
|
||||
position = {
|
||||
x: lasPos.x + dims.nodeWidth * dims.distanceFactor,
|
||||
y: dims.padding.y
|
||||
}
|
||||
} else {
|
||||
position = {
|
||||
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2),
|
||||
y: dims.padding.y
|
||||
};
|
||||
}
|
||||
// draw node
|
||||
if (getNodeType(node) === 'action') {
|
||||
if ('choose' in node) {
|
||||
position = addChooseNode(flowData, node, position, nodeId, dims, updater, i)
|
||||
} else {
|
||||
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||
onXClick: () => updater.removeNode(i)
|
||||
});
|
||||
}
|
||||
} else {
|
||||
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||
onXClick: () => updater.removeNode(i)
|
||||
});
|
||||
|
||||
}
|
||||
addEdge(flowData, lastPointId, nodeId, false)
|
||||
lastPointId = nodeId;
|
||||
lasPos = position;
|
||||
}
|
||||
// add button
|
||||
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 / 4
|
||||
},
|
||||
dims,
|
||||
updater.addNode,
|
||||
false,
|
||||
)
|
||||
flowData.nodes.push(addCircle)
|
||||
addEdge(flowData, lastPointId, addCircle.id, false)
|
||||
return {
|
||||
position: lasPos,
|
||||
pointId: lastPointId,
|
||||
};
|
||||
}
|
||||
|
||||
const xyApply = (p1: XYPosition, p2: XYPosition, fcn: (a: number, b: number) => number): XYPosition => ({
|
||||
x: fcn(p1.x, p2.x), y: fcn(p1.y, p2.y)
|
||||
})
|
||||
|
||||
const addEdge = (flowData: FlowData, source: string, target: string, animated: boolean = false) => flowData.edges.push({
|
||||
id: `${source}-${target}`,
|
||||
source,
|
||||
target,
|
||||
animated,
|
||||
})
|
||||
|
||||
const addSingleNode = (
|
||||
flowData: FlowData,
|
||||
node: AutomationSequenceNode,
|
||||
position: XYPosition,
|
||||
nodeId: string,
|
||||
{
|
||||
nodeHeight,
|
||||
nodeWidth,
|
||||
}: DAGAutomationFlowDims,
|
||||
opts: {
|
||||
onEditClick: () => void;
|
||||
onXClick: () => void;
|
||||
}
|
||||
) => flowData.nodes.push({
|
||||
id: nodeId,
|
||||
type: 'dagnode',
|
||||
data: {
|
||||
label: getDescriptionFromAutomationNode(node),
|
||||
height: nodeHeight,
|
||||
width: nodeWidth,
|
||||
color: getNodeType(node) === 'action' ? 'green' : 'blue',
|
||||
hasInput: true,
|
||||
...opts,
|
||||
},
|
||||
position,
|
||||
});
|
||||
|
||||
|
||||
|
||||
const addChooseNode = (
|
||||
flowData: FlowData,
|
||||
node: ChooseAction,
|
||||
position: XYPosition,
|
||||
nodeId: string,
|
||||
dims: DAGAutomationFlowDims,
|
||||
updater: SequenceUpdater,
|
||||
i: number,
|
||||
) => {
|
||||
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||
onXClick: () => updater.removeNode(i),
|
||||
});
|
||||
let lastPos: XYPosition = position;
|
||||
// conditions
|
||||
node.choose.forEach(({ sequence, conditions }, j) => {
|
||||
const sequenceId = `${nodeId}.${j}`;
|
||||
// edit/delete circle
|
||||
const circle = makeFlowCircle(`${sequenceId}>delete`, {
|
||||
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
||||
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
|
||||
}, {
|
||||
size: dims.circleSize,
|
||||
onRemove: createOnRemoveForChooseNode(
|
||||
node,
|
||||
d => updater.updateNode(i, d),
|
||||
j,
|
||||
),
|
||||
})
|
||||
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, condNode.id, {
|
||||
...dims,
|
||||
padding: {
|
||||
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
|
||||
y: condNode.position.y - dims.conditionHeight / 2,
|
||||
},
|
||||
}, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`);
|
||||
if (lastPoint.position) {
|
||||
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
|
||||
} else {
|
||||
lastPos = xyApply(lastPos, { x: lastPos.x, y: lastPos.y + dims.nodeHeight * dims.distanceFactor }, Math.max)
|
||||
}
|
||||
})
|
||||
const totalChildren = node.choose.length;
|
||||
|
||||
// add button
|
||||
const addCirlce = makeAddButton(
|
||||
`${nodeId}>add`,
|
||||
{
|
||||
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
||||
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
|
||||
},
|
||||
dims,
|
||||
() => updater.updateNode(i, {
|
||||
...node,
|
||||
choose: [
|
||||
...node.choose,
|
||||
{
|
||||
sequence: [],
|
||||
conditions: [],
|
||||
}
|
||||
]
|
||||
}),
|
||||
false,
|
||||
);
|
||||
flowData.nodes.push(addCirlce)
|
||||
addEdge(flowData, nodeId, addCirlce.id, true)
|
||||
|
||||
// else
|
||||
const elseCircle = makeFlowCircle(`${nodeId}>else`, {
|
||||
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
||||
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2,
|
||||
}, { size: dims.circleSize })
|
||||
flowData.nodes.push(elseCircle)
|
||||
addEdge(flowData, nodeId, elseCircle.id, true)
|
||||
const lastPoint = sequenceToFlow(flowData, node.default, elseCircle.id, {
|
||||
...dims,
|
||||
padding: {
|
||||
x: position.x - dims.nodeWidth,
|
||||
y: elseCircle.position.y - dims.circleSize / 4,
|
||||
},
|
||||
}, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`)
|
||||
if (lastPoint.position) {
|
||||
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
|
||||
} else {
|
||||
lastPos = xyApply(lastPos, elseCircle.position, Math.max)
|
||||
}
|
||||
return lastPos
|
||||
}
|
||||
@@ -1,49 +1,12 @@
|
||||
import { Styles } from "jss";
|
||||
import Color from 'chroma-js';
|
||||
import { createAppUseStyles } from "styles/theme";
|
||||
import { Node } from "types/graphs";
|
||||
|
||||
|
||||
export const useBoardStyles = createAppUseStyles<{
|
||||
boardHeight: number,
|
||||
boardWidth: number,
|
||||
}>(theme => ({
|
||||
dag: {
|
||||
borderWidth: 1,
|
||||
borderStyle: 'solid',
|
||||
borderColor: theme.secondaryAccent,
|
||||
color: theme.primaryAccent,
|
||||
background: theme.primary,
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
overflow: 'scroll'
|
||||
},
|
||||
svg: ({ boardHeight, boardWidth }) => ({
|
||||
minHeight: `${boardHeight}px`,
|
||||
minWidth: `${boardWidth}px`,
|
||||
padding: 0,
|
||||
margin: 0,
|
||||
}),
|
||||
circle: {
|
||||
fill: Color(theme.secondary).set('rgb.b', 125).hex(),
|
||||
},
|
||||
infoBox: {
|
||||
paddingLeft: '10px',
|
||||
paddingRight: '10px',
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
justifyContent: 'flex-start',
|
||||
overflow: 'auto',
|
||||
},
|
||||
dagEdge: {
|
||||
stroke: theme.secondaryAccent,
|
||||
},
|
||||
}))
|
||||
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',
|
||||
@@ -68,21 +31,22 @@ export const useNodeStyles = createAppUseStyles<{
|
||||
cursor: 'pointer',
|
||||
}
|
||||
return {
|
||||
root: {
|
||||
root: ({ nodeHeight, nodeWidth }) => ({
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
justifyContent: 'flex-end',
|
||||
height: `100%`,
|
||||
maxHeight: `100%`,
|
||||
maxWidth: '100%',
|
||||
width: '100%',
|
||||
height: nodeHeight,
|
||||
maxHeight: nodeHeight,
|
||||
maxWidth: nodeWidth,
|
||||
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%`,
|
||||
@@ -94,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',
|
||||
@@ -149,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,
|
||||
@@ -166,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',
|
||||
}
|
||||
}
|
||||
}))
|
||||
@@ -0,0 +1,54 @@
|
||||
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,
|
||||
conditionHeight,
|
||||
} = dims;
|
||||
// convert all triggers to dag nodes
|
||||
trigger.forEach((t, i) => {
|
||||
const flowId = `t-${i}`;
|
||||
flowData.nodes.push({
|
||||
id: flowId,
|
||||
type: 'dagnode',
|
||||
data: {
|
||||
label: t.alias ?? t.platform,
|
||||
height: nodeHeight,
|
||||
width: nodeWidth,
|
||||
color: 'red',
|
||||
onEditClick: () => opts.onEdit(i),
|
||||
onXClick: () => opts.onDelete(i),
|
||||
},
|
||||
position: { x: padding.x, y: padding.y + nodeHeight * distanceFactor * i }
|
||||
})
|
||||
flowData.edges.push({
|
||||
id: `e(${flowId})-(${toPoint})`,
|
||||
source: flowId,
|
||||
target: toPoint,
|
||||
})
|
||||
});
|
||||
|
||||
// create a 'add button'
|
||||
flowData.nodes.push(makeAddButton(
|
||||
'trigger-add',
|
||||
{
|
||||
x: padding.x + nodeWidth * 0.4,
|
||||
y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length,
|
||||
},
|
||||
dims,
|
||||
opts.onAdd
|
||||
))
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
import { Edge, Node, XYPosition } from 'react-flow-renderer';
|
||||
import { AutomationSequenceNode } from 'types/automations';
|
||||
import { DAGCircleProps } from './DAGCircle';
|
||||
import { DAGNodeProps } from './DAGNode';
|
||||
import { AutomationTrigger } from 'types/automations/triggers';
|
||||
import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
|
||||
|
||||
|
||||
export type DAGAutomationFlowDims = {
|
||||
padding: XYPosition;
|
||||
nodeHeight: number;
|
||||
nodeWidth: number;
|
||||
conditionWidth: number;
|
||||
conditionHeight: number;
|
||||
circleSize: number;
|
||||
distanceFactor: number;
|
||||
}
|
||||
|
||||
export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | any>;
|
||||
export type FlowData = {
|
||||
nodes: DAGAutomationFlowNode[],
|
||||
edges: Edge[],
|
||||
}
|
||||
|
||||
export type TriggerMakerOptions = {
|
||||
onAdd: () => void,
|
||||
onEdit: (i: number) => void,
|
||||
onDelete: (i: number) => void,
|
||||
}
|
||||
|
||||
export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = (
|
||||
s: ModalState<T>
|
||||
) => void;
|
||||
|
||||
export type ModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = {
|
||||
single: true,
|
||||
node: T
|
||||
update: (n: T) => void;
|
||||
saveBtnCreateText?: boolean;
|
||||
allowedTypes: MultiNodeEditorProps['allowedTypes'],
|
||||
} | {
|
||||
single: false,
|
||||
node: AutomationSequenceNode[]
|
||||
update: (n: AutomationSequenceNode[]) => void;
|
||||
allowedTypes: ['condition']
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
import { AutomationSequenceNode } from "types/automations"
|
||||
import { ChooseAction } from "types/automations/actions";
|
||||
import { ModalState } from "./types";
|
||||
import { makeSequenceUpdater } from "./updater"
|
||||
|
||||
const mockSequenceUpdater = (defaultState: AutomationSequenceNode[] = []) => {
|
||||
let state: AutomationSequenceNode[] = [...defaultState]
|
||||
const modalStates: ModalState[] = [];
|
||||
|
||||
const updater = makeSequenceUpdater(
|
||||
state,
|
||||
s => {
|
||||
state = s
|
||||
console.log(state, s)
|
||||
},
|
||||
ms => modalStates.push(ms)
|
||||
);
|
||||
return {
|
||||
get state() {
|
||||
return state
|
||||
},
|
||||
modalStates,
|
||||
updater
|
||||
};
|
||||
}
|
||||
|
||||
test("sequence updater updates nodes", () => {
|
||||
const mock = mockSequenceUpdater([
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [],
|
||||
"sequence": [],
|
||||
}
|
||||
],
|
||||
"default": [],
|
||||
}
|
||||
]);
|
||||
expect(mock.state.length).toBe(1)
|
||||
expect((mock.state[0] as ChooseAction).alias).toBe(undefined)
|
||||
mock.updater.updateNode(0, {
|
||||
...mock.state[0],
|
||||
alias: "Hello"
|
||||
})
|
||||
expect(mock.state[0].alias).toBe("Hello")
|
||||
})
|
||||
test('update conditions for node', () => {
|
||||
const mock = mockSequenceUpdater([
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [],
|
||||
"sequence": [],
|
||||
}
|
||||
],
|
||||
"default": [],
|
||||
}
|
||||
]);
|
||||
mock.updater.makeOnEditConditionsForChooseNode(0, 0)();
|
||||
|
||||
expect(mock.modalStates.length).toBe(1)
|
||||
expect((mock.modalStates[0].node as AutomationSequenceNode[]).length).toBe(0)
|
||||
mock.modalStates[0].update([
|
||||
{
|
||||
"condition": "and",
|
||||
"conditions": [],
|
||||
}
|
||||
] as any)
|
||||
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")
|
||||
})
|
||||
@@ -0,0 +1,130 @@
|
||||
import { AutomationSequenceNode } from "types/automations";
|
||||
import { ChooseAction } from "types/automations/actions";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { UpdateModalState } from "./types";
|
||||
|
||||
export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>;
|
||||
|
||||
export const makeSequenceUpdater = (
|
||||
sequence: AutomationSequenceNode[],
|
||||
onChange: (s: AutomationSequenceNode[]) => void,
|
||||
openModal: UpdateModalState,
|
||||
) => ({
|
||||
sequence,
|
||||
onChange,
|
||||
removeNode(i: number) {
|
||||
return onChange([
|
||||
...sequence.slice(0, i),
|
||||
...sequence.slice(i + 1),
|
||||
])
|
||||
},
|
||||
addNode() {
|
||||
return openModal({
|
||||
single: true,
|
||||
saveBtnCreateText: true,
|
||||
node: {
|
||||
choose: [],
|
||||
default: [],
|
||||
},
|
||||
update: n => onChange([
|
||||
...sequence,
|
||||
n,
|
||||
]),
|
||||
allowedTypes: ['action', 'condition']
|
||||
})
|
||||
},
|
||||
updateNode(i: number, node: AutomationSequenceNode) {
|
||||
return onChange([
|
||||
...sequence.slice(0, i),
|
||||
node,
|
||||
...sequence.slice(i + 1),
|
||||
])
|
||||
},
|
||||
updateChooseActionData(i: number, data: ChooseAction) {
|
||||
const node = sequence[i] as ChooseAction;
|
||||
return this.updateNode(i, {
|
||||
...node,
|
||||
...data,
|
||||
})
|
||||
},
|
||||
makeChildUpdaterForChooseAction(i: number, j: number | null) {
|
||||
const node = sequence[i];
|
||||
if ('choose' in node) {
|
||||
if (j !== null) {
|
||||
return makeSequenceUpdater(
|
||||
node.choose[j].sequence,
|
||||
seq => this.updateNode(i, {
|
||||
...node,
|
||||
choose: [
|
||||
...node.choose.slice(0, j),
|
||||
{
|
||||
...node.choose[j],
|
||||
sequence: seq,
|
||||
},
|
||||
...node.choose.slice(j + 1),
|
||||
]
|
||||
}),
|
||||
openModal,
|
||||
)
|
||||
} else {
|
||||
return makeSequenceUpdater(
|
||||
node.default,
|
||||
seq => this.updateNode(i, {
|
||||
...node,
|
||||
default: seq
|
||||
}),
|
||||
openModal,
|
||||
)
|
||||
}
|
||||
}
|
||||
throw new Error(`Cannot create sub-updater for ${node}`)
|
||||
},
|
||||
makeOnModalOpenForNode(
|
||||
i: number,
|
||||
node: AutomationSequenceNode,
|
||||
) {
|
||||
return () => openModal({
|
||||
single: true,
|
||||
node,
|
||||
allowedTypes: ['action', 'condition'],
|
||||
update: n => this.updateNode(i, n),
|
||||
})
|
||||
},
|
||||
makeOnEditConditionsForChooseNode(
|
||||
i: number,
|
||||
j: number,
|
||||
) {
|
||||
return () => {
|
||||
const node = sequence[i] as ChooseAction;
|
||||
return openModal({
|
||||
single: false,
|
||||
node: node.choose[j].conditions,
|
||||
allowedTypes: ['condition'],
|
||||
update: conditions => this.updateNode(i, {
|
||||
...node,
|
||||
choose: [
|
||||
...node.choose.slice(0, j),
|
||||
{
|
||||
sequence: node.choose[j].sequence,
|
||||
conditions: conditions as AutomationCondition[],
|
||||
},
|
||||
...node.choose.slice(j + 1),
|
||||
]
|
||||
}),
|
||||
})
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
export const createOnRemoveForChooseNode = (
|
||||
action: ChooseAction,
|
||||
update: (data: ChooseAction) => void,
|
||||
j: number
|
||||
) => () => update({
|
||||
...action,
|
||||
choose: [
|
||||
...action.choose.slice(0, j),
|
||||
...action.choose.slice(j + 1),
|
||||
]
|
||||
})
|
||||
@@ -1,11 +0,0 @@
|
||||
.dag-svg--add-btn > a {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
.dag-svg--add-btn > a:hover > svg {
|
||||
fill: rgb(48, 189, 59);
|
||||
}
|
||||
.dag-svg--add-btn:hover {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
import React from "react";
|
||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||
import { SVGBoard } from './Board';
|
||||
import { AddButton } from "./AddButton";
|
||||
|
||||
|
||||
export default {
|
||||
title: 'DAGSvgs/AddButton',
|
||||
component: AddButton,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
args: {
|
||||
height: 10,
|
||||
width: 10,
|
||||
loc: [50, 50]
|
||||
}
|
||||
} as ComponentMeta<typeof AddButton>
|
||||
|
||||
export const Basic: ComponentStory<typeof AddButton> = args => {
|
||||
return <SVGBoard>
|
||||
<AddButton
|
||||
{...args}
|
||||
/>
|
||||
</SVGBoard>
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
import "./AddButton.css";
|
||||
import { Point } from "types/graphs";
|
||||
import { AddIcon } from '../Icons/index';
|
||||
|
||||
|
||||
|
||||
export interface AddProps {
|
||||
onClick?: () => void;
|
||||
loc: Point,
|
||||
height: number,
|
||||
width: number,
|
||||
}
|
||||
export const AddButton = ({
|
||||
loc: [x, y],
|
||||
height,
|
||||
width,
|
||||
onClick = () => { },
|
||||
}: AddProps) => {
|
||||
return <>
|
||||
<foreignObject className="dag-svg--add-btn" x={x} y={y} width={width} height={height}>
|
||||
<AddIcon onClick={onClick} />
|
||||
</foreignObject>
|
||||
</>
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
import { FC } from 'react';
|
||||
import useWindowSize from "utils/useWindowSize";
|
||||
import { useBoardStyles } from "./styles";
|
||||
import { NODE_HEIGHT, NODE_WIDTH } from './constants';
|
||||
|
||||
|
||||
export const SVGBoard: FC<{
|
||||
graphHeight?: number,
|
||||
minGraphWidth?: number,
|
||||
nodeHeight?: number,
|
||||
nodeWidth?: number,
|
||||
zoomLevel?: number,
|
||||
}> = ({
|
||||
children,
|
||||
graphHeight = 300,
|
||||
minGraphWidth = 300,
|
||||
nodeHeight = NODE_HEIGHT,
|
||||
nodeWidth = NODE_WIDTH,
|
||||
zoomLevel = 1,
|
||||
}) => {
|
||||
|
||||
// state
|
||||
const { ratioWbh } = useWindowSize();
|
||||
// alias
|
||||
const graphWidth = Math.max(
|
||||
Math.round(graphHeight * ratioWbh),
|
||||
minGraphWidth
|
||||
);
|
||||
const { classes, theme } = useBoardStyles({
|
||||
boardHeight: Math.max(nodeHeight, graphHeight) * zoomLevel,
|
||||
boardWidth: Math.max(4 * nodeWidth, graphWidth) * zoomLevel,
|
||||
});
|
||||
// render
|
||||
return <div className={classes.dag} >
|
||||
<svg
|
||||
className={classes.svg}
|
||||
viewBox={[0, 0, graphWidth, graphHeight].join(" ")}
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
>
|
||||
<defs>
|
||||
<marker id="arrow" viewBox="0 0 10 10" refX="10" refY="5"
|
||||
markerWidth="6" markerHeight="6"
|
||||
orient="auto-start-reverse">
|
||||
<path d="M 0 0 L 10 5 L 0 10 z" fill={theme.secondaryAccent} />
|
||||
</marker>
|
||||
</defs>
|
||||
{children}
|
||||
</svg>
|
||||
</div>
|
||||
}
|
||||
@@ -1,160 +0,0 @@
|
||||
import React from "react";
|
||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||
import { DAGBoard, DAGElement, DAGNodeElm } from "./DAGBoard";
|
||||
import { NODE_HEIGHT, NODE_WIDTH, ADD_HEIGHT, ADD_WIDTH, DISTANCE_FACTOR, CIRCLE_SIZE } from './constants';
|
||||
import { AutomationAction } from 'types/automations/actions';
|
||||
|
||||
|
||||
export default {
|
||||
title: 'DAGSvgs/DAGBoard',
|
||||
component: DAGBoard,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
args: {
|
||||
zoomLevel: 1,
|
||||
settings: {
|
||||
nodeHeight: NODE_HEIGHT,
|
||||
nodeWidth: NODE_WIDTH,
|
||||
addHeight: ADD_HEIGHT,
|
||||
addWidth: ADD_WIDTH,
|
||||
circleSize: CIRCLE_SIZE,
|
||||
distanceFactor: DISTANCE_FACTOR,
|
||||
edgeChildColor: 'blue',
|
||||
edgeNextColor: 'white',
|
||||
},
|
||||
}
|
||||
} as ComponentMeta<typeof DAGBoard>;
|
||||
|
||||
|
||||
const nodeFromPoint = ([x, y, add = true]: any): DAGNodeElm => ({
|
||||
type: 'node',
|
||||
loc: [x, y],
|
||||
onRemove() { },
|
||||
onAdd: add ? () => { } : undefined,
|
||||
node: ({
|
||||
alias: `${x},${y}`,
|
||||
"$smType": "action",
|
||||
"action": "wait",
|
||||
"action_data": {
|
||||
"wait_template": "",
|
||||
}
|
||||
} as AutomationAction)
|
||||
});
|
||||
|
||||
function* makeDummyData(pts: Array<any>, extras: DAGElement[]): Generator<DAGElement> {
|
||||
for (const p of pts) {
|
||||
yield nodeFromPoint(p);
|
||||
};
|
||||
for (const e of extras) {
|
||||
yield e;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export const Simple: ComponentStory<typeof DAGBoard> = args => {
|
||||
return <div className="page">
|
||||
<DAGBoard {...args} />
|
||||
</div>
|
||||
}
|
||||
Simple.args = {
|
||||
...Simple.args,
|
||||
elements: Array.from(makeDummyData(
|
||||
[
|
||||
[0, 0, false],
|
||||
[1, 0, false],
|
||||
[2, 1, false],
|
||||
],
|
||||
[
|
||||
{
|
||||
type: 'edge',
|
||||
p1: [0, 0],
|
||||
p2: [1, 0],
|
||||
direction: '1->2'
|
||||
},
|
||||
{
|
||||
type: 'edge',
|
||||
p1: [2, 1],
|
||||
p2: [2, 3],
|
||||
direction: '1->2'
|
||||
},
|
||||
{
|
||||
type: 'circle',
|
||||
icon: 'blank',
|
||||
loc: [2, 3]
|
||||
},
|
||||
{
|
||||
type: 'edge',
|
||||
p1: [2, 1],
|
||||
p2: [2, 2],
|
||||
direction: '1->2'
|
||||
},
|
||||
{
|
||||
type: 'circle',
|
||||
loc: [2, 2],
|
||||
icon: 'color',
|
||||
color: 'red',
|
||||
}
|
||||
]))
|
||||
}
|
||||
|
||||
|
||||
export const Complex: ComponentStory<typeof DAGBoard> = args => {
|
||||
return <div className="page">
|
||||
<DAGBoard {...args} />
|
||||
</div>
|
||||
}
|
||||
Complex.args = {
|
||||
...Complex.args,
|
||||
elements: Array.from(makeDummyData(
|
||||
[
|
||||
[0, 0, false],
|
||||
[1, 0, false],
|
||||
[2, 1, false],
|
||||
[4, 1],
|
||||
[3, 2],
|
||||
[2, 3],
|
||||
[5, 0, false],
|
||||
[6, 0],
|
||||
[0, 6],
|
||||
],
|
||||
[
|
||||
{
|
||||
type: 'edge',
|
||||
p1: [0, 0],
|
||||
p2: [1, 0],
|
||||
direction: '1->2'
|
||||
},
|
||||
{
|
||||
type: 'edge',
|
||||
p1: [2, 1],
|
||||
p2: [4, 1],
|
||||
direction: '1->2',
|
||||
},
|
||||
{
|
||||
type: 'edge',
|
||||
p1: [1, 0],
|
||||
p2: [2, 1],
|
||||
direction: '1->2',
|
||||
},
|
||||
{
|
||||
type: 'edge',
|
||||
p1: [2, 1],
|
||||
p2: [3, 2],
|
||||
direction: '1->2',
|
||||
},
|
||||
{
|
||||
type: 'edge',
|
||||
p1: [1, 0],
|
||||
p2: [2, 3],
|
||||
direction: '1->2',
|
||||
},
|
||||
{
|
||||
type: 'edge',
|
||||
p1: [1, 0],
|
||||
p2: [5, 0],
|
||||
direction: '1->2'
|
||||
},
|
||||
]
|
||||
))
|
||||
}
|
||||
|
||||
|
||||
@@ -1,205 +0,0 @@
|
||||
import { FC, useRef } from "react";
|
||||
import { SVGBoard } from "./Board";
|
||||
import { AutomationNode } from '../../types/automations/index';
|
||||
import { Point, EdgeDirection, BBox } from 'types/graphs';
|
||||
import { DAGNode } from "./DAGNode";
|
||||
import { DAGEdge } from "./DAGEdge";
|
||||
import { AddButton } from "./AddButton";
|
||||
import { IteratorWrap } from "utils/iter";
|
||||
import { DAGCircle, AddProps } from "./DAGCircle";
|
||||
import { getDescriptionFromAutomationNode } from "utils/formatting";
|
||||
import { minPoints } from "utils/graph";
|
||||
import { maxPoints } from '../../utils/graph';
|
||||
|
||||
|
||||
export type DAGCircleElm = {
|
||||
type: 'circle';
|
||||
loc: Point;
|
||||
} & (
|
||||
{
|
||||
icon: 'add',
|
||||
onAdd: () => void;
|
||||
} |
|
||||
{
|
||||
icon: 'edit',
|
||||
onEdit: () => void;
|
||||
onRemove?: () => void;
|
||||
} |
|
||||
{
|
||||
icon: 'blank',
|
||||
onRemove?: () => void;
|
||||
} |
|
||||
{
|
||||
icon: 'color',
|
||||
color: string,
|
||||
}
|
||||
)
|
||||
export interface DAGNodeElm {
|
||||
type: 'node';
|
||||
loc: Point;
|
||||
node: AutomationNode;
|
||||
onRemove: () => void;
|
||||
onAdd?: () => void;
|
||||
onOpen?: () => void;
|
||||
}
|
||||
export interface DAGEdgeElm {
|
||||
type: 'edge';
|
||||
p1: Point;
|
||||
p2: Point;
|
||||
direction: EdgeDirection;
|
||||
fromCircle?: boolean;
|
||||
onAdd?: () => void;
|
||||
}
|
||||
export type DAGElement = DAGEdgeElm | DAGNodeElm | DAGCircleElm;
|
||||
export interface DAGBoardSettings extends DAGBoardElmDims {
|
||||
edgeChildColor: string;
|
||||
edgeNextColor: string;
|
||||
}
|
||||
export interface DAGBoardElmDims {
|
||||
nodeHeight: number;
|
||||
nodeWidth: number;
|
||||
addHeight: number;
|
||||
addWidth: number;
|
||||
circleSize: number;
|
||||
distanceFactor: number;
|
||||
}
|
||||
|
||||
export interface Props {
|
||||
elements: Generator<DAGElement> | Array<DAGElement>;
|
||||
settings: DAGBoardSettings;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
export function* mapDataToElements({
|
||||
elements,
|
||||
settings: st,
|
||||
}: Props) {
|
||||
let bbox: BBox = [[0, 0], [0, 0]];
|
||||
const updateBBox = (p: Point) => {
|
||||
bbox = [
|
||||
[Math.min(bbox[0][0], p[0]), Math.min(bbox[0][1], p[1])],
|
||||
[Math.max(bbox[1][0], p[0] + st.nodeWidth), Math.max(bbox[1][1], p[1] + st.nodeHeight)],
|
||||
]
|
||||
return p;
|
||||
}
|
||||
const offsetPoint = (
|
||||
[x, y]: Point,
|
||||
[ox, oy]: Point = [0, 0]
|
||||
): Point => updateBBox([x + ox, y + oy]);
|
||||
const mapWithNode = (
|
||||
[x, y]: Point,
|
||||
[ox, oy]: Point = [0, 0],
|
||||
): Point => updateBBox([
|
||||
x * st.nodeWidth * st.distanceFactor + ox,
|
||||
y * st.nodeHeight * st.distanceFactor + oy,
|
||||
])
|
||||
for (let elm of elements) {
|
||||
switch (elm.type) {
|
||||
case 'node':
|
||||
const nodeLoc = mapWithNode(elm.loc);
|
||||
const addLoc = mapWithNode(elm.loc, [
|
||||
st.nodeWidth * st.distanceFactor,
|
||||
st.addHeight + st.addHeight / 2
|
||||
])
|
||||
yield <DAGNode
|
||||
key={`(${elm.loc})-*`}
|
||||
height={st.nodeHeight}
|
||||
width={st.nodeWidth}
|
||||
loc={nodeLoc}
|
||||
text={getDescriptionFromAutomationNode(elm.node)}
|
||||
color={elm.node.$smType === 'action' ? 'green' : 'blue'}
|
||||
onXClick={elm.onRemove}
|
||||
onOpenClick={elm.onOpen}
|
||||
/>
|
||||
if (elm.onAdd) {
|
||||
yield <DAGEdge
|
||||
key={`(${elm.loc})->+`}
|
||||
p1={offsetPoint(nodeLoc, [st.nodeWidth, st.nodeHeight / 2])}
|
||||
p2={offsetPoint(addLoc, [0, st.addHeight / 2])}
|
||||
direction="1->2"
|
||||
color={st.edgeNextColor}
|
||||
/>
|
||||
yield <AddButton
|
||||
key={`(${elm.loc})-+`}
|
||||
loc={addLoc}
|
||||
height={st.addHeight}
|
||||
width={st.addWidth}
|
||||
onClick={elm.onAdd}
|
||||
/>
|
||||
}
|
||||
break
|
||||
case 'edge':
|
||||
const p2 = mapWithNode(elm.p2, [0, st.nodeHeight / 2]);
|
||||
let p1: Point;
|
||||
if (elm.fromCircle) {
|
||||
p1 = mapWithNode(elm.p1, [st.circleSize * 0.95, 1.3 * st.circleSize / 2])
|
||||
} else {
|
||||
p1 = mapWithNode(elm.p1, [st.nodeWidth, st.nodeHeight / 2])
|
||||
}
|
||||
yield <DAGEdge
|
||||
key={`(${elm.p1})->(${elm.p2})`}
|
||||
p1={p1}
|
||||
p2={p2}
|
||||
direction={elm.direction}
|
||||
color={st.edgeNextColor}
|
||||
/>
|
||||
if (elm.onAdd) {
|
||||
yield <AddButton
|
||||
key={`(${elm.p2})-+`}
|
||||
loc={offsetPoint(p2, [0, -st.addHeight / 2])}
|
||||
height={st.addHeight}
|
||||
width={st.addWidth}
|
||||
onClick={elm.onAdd}
|
||||
/>
|
||||
}
|
||||
break
|
||||
case 'circle':
|
||||
const loc = mapWithNode(elm.loc, [0, st.nodeHeight / 2 - st.circleSize / 2]);
|
||||
const clickProps: Partial<AddProps> = {}
|
||||
if (elm.icon === 'add') {
|
||||
clickProps.onAdd = elm.onAdd;
|
||||
} else if (elm.icon === 'edit') {
|
||||
clickProps.onEdit = elm.onEdit
|
||||
clickProps.onRemove = elm.onRemove
|
||||
} else if (elm.icon === 'blank') {
|
||||
clickProps.onRemove = elm.onRemove
|
||||
} else {
|
||||
clickProps.backgroundColor = elm.color
|
||||
}
|
||||
yield <DAGCircle
|
||||
key={`(${elm.loc})-o`}
|
||||
loc={loc}
|
||||
size={st.circleSize}
|
||||
{...clickProps}
|
||||
/>
|
||||
break
|
||||
default:
|
||||
break
|
||||
}
|
||||
}
|
||||
return bbox;
|
||||
}
|
||||
|
||||
|
||||
export const DAGBoard: FC<Props & { zoomLevel: number }> = props => {
|
||||
const graphDims = useRef<BBox>([[0, 0], [0, 0]]);
|
||||
const it = new IteratorWrap(mapDataToElements(props));
|
||||
const el = it.toArray();
|
||||
const [p0, p1] = it.returnValue as BBox;
|
||||
const [[x0, y0], [x1, y1]] = graphDims.current = [
|
||||
minPoints(p0, graphDims.current[0]),
|
||||
maxPoints(p1, graphDims.current[1])
|
||||
];
|
||||
return <SVGBoard
|
||||
graphHeight={y1 - y0}
|
||||
minGraphWidth={Math.max(x1 - x0, props.settings.nodeWidth * 8)}
|
||||
nodeHeight={props.settings.nodeHeight}
|
||||
nodeWidth={props.settings.nodeWidth}
|
||||
zoomLevel={props.zoomLevel}
|
||||
>
|
||||
{el}
|
||||
{props.children}
|
||||
</SVGBoard>
|
||||
}
|
||||
@@ -1,46 +0,0 @@
|
||||
import React from "react";
|
||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||
import { SVGBoard } from './Board';
|
||||
import { DAGCircle } from "./DAGCircle";
|
||||
|
||||
|
||||
export default {
|
||||
title: 'DAGSvgs/DAGCircle',
|
||||
component: DAGCircle,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
args: {
|
||||
size: 20,
|
||||
loc: [50, 50]
|
||||
}
|
||||
} as ComponentMeta<typeof DAGCircle>
|
||||
|
||||
export const Basic: ComponentStory<typeof DAGCircle> = args => {
|
||||
return <SVGBoard>
|
||||
<DAGCircle
|
||||
size={args.size}
|
||||
loc={args.loc}
|
||||
/>
|
||||
<DAGCircle
|
||||
size={args.size}
|
||||
loc={[args.loc[0] + args.size, args.loc[1]]}
|
||||
onAdd={args.onAdd}
|
||||
/>
|
||||
<DAGCircle
|
||||
size={args.size}
|
||||
loc={[args.loc[0] + 2 * args.size, args.loc[1]]}
|
||||
onEdit={args.onEdit}
|
||||
/>
|
||||
<DAGCircle
|
||||
size={args.size}
|
||||
loc={[args.loc[0] + 3 * args.size, args.loc[1]]}
|
||||
onEdit={args.onEdit}
|
||||
onRemove={args.onRemove}
|
||||
/>
|
||||
<DAGCircle
|
||||
size={args.size}
|
||||
loc={[args.loc[0] + 4 * args.size, args.loc[1]]}
|
||||
onRemove={args.onRemove}
|
||||
/>
|
||||
</SVGBoard>
|
||||
}
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
// import "./DAGCircle.css";
|
||||
import { Point } from "types/graphs";
|
||||
import { AddIcon, PencilIcon, TrashIcon } from '../Icons/index';
|
||||
import { useCircleStyles } from './styles';
|
||||
|
||||
|
||||
|
||||
export interface AddProps {
|
||||
onEdit?: () => void;
|
||||
onAdd?: () => void;
|
||||
onRemove?: () => void;
|
||||
loc: Point,
|
||||
size: number,
|
||||
backgroundColor?: string;
|
||||
}
|
||||
export const DAGCircle = ({
|
||||
loc: [x, y],
|
||||
size,
|
||||
onEdit,
|
||||
onAdd,
|
||||
onRemove,
|
||||
backgroundColor,
|
||||
}: AddProps) => {
|
||||
const { classes } = useCircleStyles({
|
||||
size: size * 0.9,
|
||||
hasOnFunction: !!onEdit || !!onAdd,
|
||||
hasRemoveFunction: !!onRemove,
|
||||
backgroundColor,
|
||||
});
|
||||
return <>
|
||||
<foreignObject x={x} y={y} width={size} height={size}>
|
||||
<div className={classes.root}>
|
||||
{
|
||||
onEdit ?
|
||||
<PencilIcon
|
||||
size={70} units="%"
|
||||
className={classes.icon}
|
||||
onClick={onEdit}
|
||||
/> : onAdd ?
|
||||
<AddIcon
|
||||
size={70} units="%"
|
||||
className={classes.icon}
|
||||
onClick={onAdd}
|
||||
/>
|
||||
: backgroundColor ? "" : "else"
|
||||
}
|
||||
{onRemove ? <TrashIcon className={classes.trashIcon} onClick={onRemove} /> : <></>}
|
||||
</div>
|
||||
</foreignObject>
|
||||
</>
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
import { EdgeDirection, Point } from "types/graphs"
|
||||
|
||||
|
||||
|
||||
export interface EdgeProp {
|
||||
p1: Point,
|
||||
p2: Point,
|
||||
direction: EdgeDirection,
|
||||
color: string,
|
||||
debug?: boolean,
|
||||
}
|
||||
export const DAGEdge = ({
|
||||
p1: [x1, y1],
|
||||
p2: [x2, y2],
|
||||
direction,
|
||||
color,
|
||||
debug = false,
|
||||
}: EdgeProp) => {
|
||||
const [mx, my] = [(x1 + x2) / 2, (y1 + y2) / 2]
|
||||
let [cx1, cy1] = [(x1 + mx) / 2, (y1 + my) / 2]
|
||||
let [cx2, cy2] = [(x2 + mx) / 2, (y2 + my) / 2]
|
||||
const l1 = Math.sqrt((cy1 - y1) ** 2 + (cx1 - x1) ** 2)
|
||||
const l2 = Math.sqrt((cy2 - y2) ** 2 + (cx2 - x2) ** 2)
|
||||
const theta = Math.atan2(y2 - y1, x2 - x1)
|
||||
if ((theta < Math.PI / 2) && (theta > -Math.PI / 2)) {
|
||||
cy1 = y1 - 0.5 * l1 * Math.sin(theta)
|
||||
cx1 = x1 + 2 * l1 * Math.cos(theta)
|
||||
cy2 = y2
|
||||
cx2 = x2 - 3 * l2 * Math.cos(theta)
|
||||
} else if ((theta > Math.PI / 2) && (theta < Math.PI)) {
|
||||
cy2 += l2 * Math.sin(theta)
|
||||
cx2 += 10 * l2 * Math.cos(theta)
|
||||
cx1 -= 10 * l1 * Math.cos(theta)
|
||||
}
|
||||
|
||||
return <>
|
||||
{debug && <>
|
||||
<circle cx={cx1} cy={cy1} r="5" fill="yellow" />
|
||||
<line x1={cx1} y1={cy1} x2={x1} y2={y1} stroke="yellow" />
|
||||
<line x1={cx1} y1={cy1} x2={x2} y2={y2} stroke="yellow" />
|
||||
<circle cx={cx2} cy={cy2} r="5" fill="green" />
|
||||
<line x1={cx2} y1={cy2} x2={x1} y2={y1} stroke="green" />
|
||||
<line x1={cx2} y1={cy2} x2={x2} y2={y2} stroke="green" />
|
||||
<text x={mx} y={my} stroke="white">{theta}</text>
|
||||
</>}
|
||||
<path stroke={color}
|
||||
d={`M${x1} ${y1} C${cx1} ${cy1}, ${cx2} ${cy2}, ${x2} ${y2}`}
|
||||
fill="none"
|
||||
markerStart={
|
||||
(direction === '1<-2' || direction === '1<->2') ?
|
||||
"url(#arrow)" : ''
|
||||
}
|
||||
markerEnd={
|
||||
(direction === '1->2' || direction === '1<->2') ?
|
||||
"url(#arrow)" : ''
|
||||
}
|
||||
/>
|
||||
</>
|
||||
}
|
||||
@@ -1,75 +0,0 @@
|
||||
import React from "react";
|
||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||
import { DAGNode } from "./DAGNode";
|
||||
import { SVGBoard } from './Board';
|
||||
import { NODE_HEIGHT, NODE_WIDTH } from './constants';
|
||||
import { DAGEdge } from "./DAGEdge";
|
||||
|
||||
const GRAPH_HEIGHT = 300;
|
||||
|
||||
export default {
|
||||
title: 'DAGSvgs/DAGNode',
|
||||
component: DAGNode,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
args: {
|
||||
height: NODE_HEIGHT,
|
||||
width: NODE_WIDTH,
|
||||
text: "Test",
|
||||
loc: [NODE_WIDTH * 2,GRAPH_HEIGHT / 2]
|
||||
}
|
||||
} as ComponentMeta<typeof DAGNode>;
|
||||
|
||||
export const Basic: ComponentStory<typeof DAGNode> = args => <SVGBoard
|
||||
graphHeight={GRAPH_HEIGHT}
|
||||
>
|
||||
<DAGNode {...args}/>
|
||||
</SVGBoard>
|
||||
|
||||
export const WithFromEdge: ComponentStory<typeof DAGNode> = args => <SVGBoard
|
||||
graphHeight={GRAPH_HEIGHT}
|
||||
>
|
||||
<DAGNode {...args} />
|
||||
</SVGBoard>
|
||||
WithFromEdge.args = {
|
||||
...(WithFromEdge.args ?? {}),
|
||||
edge: {
|
||||
color: 'white',
|
||||
loc: [NODE_WIDTH * 4, NODE_HEIGHT * 2],
|
||||
direction: '1->2',
|
||||
}
|
||||
}
|
||||
|
||||
export const WithToEdge: ComponentStory<typeof DAGNode> = args => <SVGBoard
|
||||
graphHeight={GRAPH_HEIGHT}
|
||||
>
|
||||
<DAGNode {...args} edge={{
|
||||
color: 'white',
|
||||
loc: [args.loc[0] - args.width, args.loc[1] + args.height / 2],
|
||||
direction: '1<-2',
|
||||
}}/>
|
||||
</SVGBoard>
|
||||
export const WithManyEdges: ComponentStory<typeof DAGNode> = args => <SVGBoard
|
||||
graphHeight={GRAPH_HEIGHT}
|
||||
>
|
||||
<DAGNode {...args} />
|
||||
{[
|
||||
// TODO: make it nicer to view when from behind
|
||||
// [0, 0],
|
||||
// [args.loc[0] - args.width, args.loc[1] + args.height / 2], // behind
|
||||
// [args.loc[0] - 0.5*args.width, args.loc[1] + args.height ], // behind
|
||||
// [args.loc[0], args.loc[1] + args.height ], // behind
|
||||
// [args.loc[0], args.loc[1] + 2 * args.height ], // behind
|
||||
[args.loc[0] + args.width / 2, args.loc[1] + 2 * args.height ], // below
|
||||
[args.loc[0] + args.width, args.loc[1] + args.height * 2], // down
|
||||
[args.loc[0] + args.width, args.loc[1] - args.height * 2], // up
|
||||
[args.loc[0] + 2*args.width, args.loc[1] + args.height * 2], // down right
|
||||
[args.loc[0] + 2*args.width, args.loc[1] + args.height / 2], // forward
|
||||
[args.loc[0] + 2*args.width, args.loc[1] - args.height * 2], // up right
|
||||
].map((p: any) => <DAGEdge
|
||||
p1={[args.loc[0] + args.width, args.loc[1] + args.height / 2]}
|
||||
p2={p}
|
||||
direction="1->2"
|
||||
color="white"
|
||||
// debug
|
||||
/>)}
|
||||
</SVGBoard>
|
||||
@@ -1,75 +0,0 @@
|
||||
import Color from "chroma-js";
|
||||
import { PencilIcon } from "components/Icons"
|
||||
import { useNodeStyles } from "./styles"
|
||||
import { EdgeDirection, Node, Point } from "types/graphs";
|
||||
import { DAGEdge } from "./DAGEdge";
|
||||
|
||||
|
||||
|
||||
export interface NodeProp extends Node {
|
||||
height: number;
|
||||
width: number;
|
||||
onXClick?: () => void;
|
||||
onOpenClick?: () => void;
|
||||
debug?: boolean;
|
||||
edge?: {
|
||||
color: string;
|
||||
loc: Point;
|
||||
direction: EdgeDirection;
|
||||
}
|
||||
}
|
||||
export const DAGNode = ({
|
||||
loc: [x, y],
|
||||
text,
|
||||
height,
|
||||
width,
|
||||
onXClick = () => { },
|
||||
onOpenClick = () => { },
|
||||
color,
|
||||
edge,
|
||||
debug = false,
|
||||
}: NodeProp) => {
|
||||
const { classes, theme } = useNodeStyles({
|
||||
color,
|
||||
nodeHeight: height,
|
||||
nodeWidth: width,
|
||||
});
|
||||
return <>
|
||||
<foreignObject x={x} y={y} width={width} height={height}>
|
||||
<div className={classes.root}>
|
||||
<div className={classes.inner}>
|
||||
<div className={classes.leftEdge} onClick={onXClick}>
|
||||
<button className={classes.buttonDelete}>X</button>
|
||||
</div>
|
||||
<div className={classes.textWrap}>
|
||||
<span className={classes.text} title={text}>
|
||||
{text}
|
||||
</span>
|
||||
</div>
|
||||
<div className={classes.rightEdge} onClick={onOpenClick}>
|
||||
<button className={classes.buttonEdit}>
|
||||
<PencilIcon size={1.1} color={Color(theme.primary).set('rgb.g', 200).hex()} />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</foreignObject>
|
||||
{
|
||||
edge && (edge.direction === '1->2' ?
|
||||
<DAGEdge
|
||||
p1={[x + width, y + height / 2]}
|
||||
p2={edge.loc}
|
||||
direction={edge.direction}
|
||||
color={edge.color}
|
||||
debug={debug}
|
||||
/> :
|
||||
<DAGEdge
|
||||
p1={[x, y + height / 2]}
|
||||
p2={edge.loc}
|
||||
direction={edge.direction}
|
||||
color={edge.color}
|
||||
debug={debug}
|
||||
/>)
|
||||
}
|
||||
</>
|
||||
}
|
||||
@@ -1,19 +1,22 @@
|
||||
import { DAGBoardElmDims } from 'components/DAGSvgs/DAGBoard';
|
||||
|
||||
|
||||
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: DAGBoardElmDims = {
|
||||
export const DEFAULT_DIMS = {
|
||||
nodeHeight: NODE_HEIGHT,
|
||||
nodeWidth: NODE_WIDTH,
|
||||
addHeight: ADD_HEIGHT,
|
||||
addWidth: ADD_WIDTH,
|
||||
circleSize: CIRCLE_SIZE,
|
||||
conditionHeight: CONDITION_HEIGHT,
|
||||
conditionWidth: CONDITION_WIDTH,
|
||||
distanceFactor: DISTANCE_FACTOR,
|
||||
};
|
||||
circleSize: CIRCLE_SIZE,
|
||||
padding: {
|
||||
x: PADDING,
|
||||
y: PADDING,
|
||||
},
|
||||
} as DAGAutomationFlowDims
|
||||
@@ -0,0 +1,7 @@
|
||||
.error-boundary {
|
||||
padding: 2em 5%;
|
||||
}
|
||||
|
||||
h1, h2 {
|
||||
margin: 0;
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
import React, { FC } from "react";
|
||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||
import { ErrorBoundary } from ".";
|
||||
|
||||
|
||||
export default {
|
||||
title: 'ErrorBoundary',
|
||||
component: ErrorBoundary,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
args: {
|
||||
}
|
||||
} as ComponentMeta<typeof ErrorBoundary>
|
||||
|
||||
export const ErrorThrown: ComponentStory<typeof ErrorBoundary> = args => {
|
||||
const BadComponent: FC = () => {
|
||||
throw new Error("!!!")
|
||||
}
|
||||
return <div className="page">
|
||||
<ErrorBoundary>
|
||||
<BadComponent />
|
||||
</ErrorBoundary>
|
||||
</div>
|
||||
}
|
||||
|
||||
export const NoError: ComponentStory<typeof ErrorBoundary> = args => {
|
||||
const GoodComponent: FC = () => {
|
||||
return <span>All Good.</span>
|
||||
}
|
||||
return <div className="page">
|
||||
<ErrorBoundary>
|
||||
<GoodComponent />
|
||||
</ErrorBoundary>
|
||||
</div>
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
import "./index.css";
|
||||
import { Component, ErrorInfo } from "react";
|
||||
|
||||
type State = {
|
||||
hasError: false;
|
||||
} | {
|
||||
hasError: true,
|
||||
error: any,
|
||||
errorInfo?: ErrorInfo,
|
||||
}
|
||||
export class ErrorBoundary extends Component<{}, State> {
|
||||
|
||||
state: State = {
|
||||
hasError: false
|
||||
}
|
||||
|
||||
static getDerivedStateFromError(error: any): State {
|
||||
return { error, hasError: true, };
|
||||
}
|
||||
|
||||
componentDidCatch(error: Error, errorInfo: ErrorInfo) {
|
||||
this.setState({
|
||||
hasError: true,
|
||||
error,
|
||||
errorInfo,
|
||||
})
|
||||
}
|
||||
|
||||
render() {
|
||||
if (this.state.hasError) {
|
||||
return <div className="error-boundary">
|
||||
<h1>An Error has occured.</h1>
|
||||
<h2>{String(this.state.error)}</h2>
|
||||
{JSON.stringify(this.state.error, null, 4)}
|
||||
<br />
|
||||
{this.state.errorInfo && this.state.errorInfo.componentStack.split('\n').map((s, i) => <>
|
||||
<span key={i}>{s}</span><br key={`br-${i}`} />
|
||||
</>)}
|
||||
</div>
|
||||
}
|
||||
|
||||
return this.props.children;
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,7 @@
|
||||
import { ComponentStory } from "@storybook/react";
|
||||
|
||||
import { IconBase } from "./base";
|
||||
import { PencilIcon, CheckMarkIcon, TrashIcon, InfoIcon, ArrowIcon } from ".";
|
||||
import { AddIcon } from './index';
|
||||
import { PencilIcon, CheckMarkIcon, TrashIcon, InfoIcon, ArrowIcon, AddIcon, ZoomIcon, GearIcon } from ".";
|
||||
import { ButtonIcon } from "./ButtonIcons";
|
||||
|
||||
export default {
|
||||
@@ -19,6 +18,8 @@ export const IconList: ComponentStory<typeof IconBase> = (args) => {
|
||||
<AddIcon {...args} />
|
||||
<TrashIcon {...args} />
|
||||
<InfoIcon {...args} />
|
||||
<ZoomIcon {...args} />
|
||||
<GearIcon {...args} />
|
||||
</div>
|
||||
}
|
||||
IconList.args = {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { FC } from "react";
|
||||
import { IconBase, IconBaseProps } from "./base";
|
||||
import { IconBase, IconBaseProps } from './base';
|
||||
|
||||
|
||||
export const PencilIcon: FC<IconBaseProps> = props => <IconBase {...props}
|
||||
@@ -54,3 +54,27 @@ export const ArrowIcon: FC<IconBaseProps> = props => <IconBase
|
||||
>
|
||||
<path d="M3 12l18-12v24z" />
|
||||
</IconBase>
|
||||
|
||||
|
||||
export const ZoomIcon: FC<IconBaseProps> = props => <IconBase {...props}
|
||||
svgProps={{
|
||||
viewBox: "0 0 1000 1000",
|
||||
x: 0,
|
||||
y: 0
|
||||
}}
|
||||
>
|
||||
<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"
|
||||
]
|
||||
}
|
||||
@@ -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>
|
||||
}
|
||||
Loaded 100 of 160 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user