Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
25770e1c1d | ||
|
|
029a2dac9f | ||
|
|
8732ab8dda | ||
|
|
42ab6e5913 | ||
|
|
c28796872f | ||
|
|
40690293a8 | ||
|
|
621f43e5c8 | ||
|
|
f3496f9d32 | ||
|
|
409cf2b21a | ||
|
|
ef92261666 | ||
|
|
83edaf9bf8 | ||
|
|
f8efd895a9 | ||
|
|
da0d153b81 | ||
|
|
bcd262dd46 | ||
|
|
ea47b3e1eb | ||
|
|
5192c09681 | ||
|
|
d3adfaaacb | ||
|
|
c249a94b3d | ||
|
|
dce028d0bc | ||
|
|
7333f9e159 | ||
|
|
809095f8e0 | ||
|
|
8942693a32 | ||
|
|
db49ed02ed | ||
|
|
cce2e03053 | ||
|
|
4509a224a9 | ||
|
|
7f8b75fa02 | ||
|
|
d2c5310b93 | ||
|
|
a19db93c37 | ||
|
|
6c57408f27 | ||
|
|
b9a77746c0 | ||
|
|
f1ffab13be | ||
|
|
52fcfd9271 | ||
|
|
f435bb70aa | ||
|
|
2598c23fd2 | ||
|
|
070dc7c871 | ||
|
|
3d70f04e60 | ||
|
|
cf29d9d61c | ||
|
|
2245fd556b | ||
|
|
f50f22190e | ||
|
|
b342088b96 | ||
|
|
c0c0d3181c | ||
|
|
cf013cc342 | ||
|
|
23b869d43e | ||
|
|
e333e80ea3 | ||
|
|
996e23038f | ||
|
|
0be03b1536 | ||
|
|
dc726ff184 | ||
|
|
7e5885a34d | ||
|
|
38396c4d98 | ||
|
|
ea832884f1 | ||
|
|
ea14cd4239 | ||
|
|
4e19bdf4c4 | ||
|
|
75c5870e00 | ||
|
|
4b75ac9199 | ||
|
|
fd3780f5bc | ||
|
|
035ac0c898 | ||
|
|
b331e4c5a0 | ||
|
|
b9fb49fd32 | ||
|
|
a33a18c102 | ||
|
|
defa0ce787 | ||
|
|
b17e4c75b3 | ||
|
|
ef5e66a8f1 | ||
|
|
edc65da14b | ||
|
|
1ee34b234d | ||
|
|
cf178e23d0 | ||
|
|
7caac74d2d | ||
|
|
8b9d400a4d | ||
|
|
c830f35ee4 | ||
|
|
7ac92fb98e |
No files matched your search
@@ -0,0 +1,34 @@
|
||||
name: "Manual Build"
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
type: string
|
||||
description: "Version Number"
|
||||
required: true
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
name: "${{ github.event.inputs.version }} / ${{ matrix.arch }}"
|
||||
strategy:
|
||||
matrix:
|
||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
||||
|
||||
steps:
|
||||
- name: Check out repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v2.0.0
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Build & Push to Dockerhub
|
||||
uses: home-assistant/builder@2022.03.1
|
||||
with:
|
||||
args: |
|
||||
--${{ matrix.arch }} \
|
||||
--version ${{ github.event.inputs.version }} \
|
||||
--additional-tag edge \
|
||||
--target .
|
||||
@@ -37,6 +37,11 @@ jobs:
|
||||
# Learn more about CodeQL language support at https://git.io/codeql-language-support
|
||||
|
||||
steps:
|
||||
- name: Cancel Previous Runs
|
||||
uses: styfle/cancel-workflow-action@0.9.1
|
||||
with:
|
||||
access_token: ${{ github.token }}
|
||||
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
|
||||
@@ -1,31 +1,74 @@
|
||||
name: Build add-on
|
||||
name: Deploy
|
||||
env:
|
||||
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
|
||||
on:
|
||||
release:
|
||||
types: [published]
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branch: [main]
|
||||
paths:
|
||||
- "config.yaml"
|
||||
jobs:
|
||||
build:
|
||||
metadata:
|
||||
runs-on: ubuntu-latest
|
||||
name: Deploy ${{ github.ref }}
|
||||
strategy:
|
||||
matrix:
|
||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
||||
|
||||
name: Metadata
|
||||
outputs:
|
||||
version: ${{ steps.version.outputs.VERSION }}
|
||||
changlelog: ${{ steps.changlelog.outputs.CHANGELOG }}
|
||||
steps:
|
||||
- name: Check out repository
|
||||
uses: actions/checkout@v3
|
||||
- name: Get Version
|
||||
id: version
|
||||
shell: bash
|
||||
run: |
|
||||
echo ::set-output name=VERSION::$(cat config.yaml | sed -nr 's/version: (.*)/\1/p')
|
||||
- name: Get Changelog
|
||||
id: changlelog
|
||||
shell: bash
|
||||
run: |
|
||||
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
|
||||
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v2.0.0
|
||||
# build:
|
||||
# runs-on: ubuntu-latest
|
||||
# name: Build & Publish ${{ matrix.arch }}
|
||||
# needs:
|
||||
# - metadata
|
||||
# strategy:
|
||||
# matrix:
|
||||
# arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
||||
|
||||
# steps:
|
||||
# - name: Check out repository
|
||||
# uses: actions/checkout@v3
|
||||
|
||||
# - name: Login to DockerHub
|
||||
# uses: docker/login-action@v2.0.0
|
||||
# with:
|
||||
# username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
# password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
# - name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
||||
# uses: home-assistant/builder@2022.03.1
|
||||
# with:
|
||||
# args: |
|
||||
# --${{ matrix.arch }} \
|
||||
# --target .
|
||||
|
||||
publish:
|
||||
runs-on: ubuntu-latest
|
||||
needs:
|
||||
- metadata
|
||||
name: Publish Github Release
|
||||
steps:
|
||||
- name: Publish Release ${{ needs.metadata.outputs.version }}
|
||||
uses: actions/github-script@v6
|
||||
env:
|
||||
VERSION: ${{ needs.metadata.outputs.version }}
|
||||
CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
|
||||
- name: Publish
|
||||
uses: home-assistant/builder@2022.03.1
|
||||
with:
|
||||
args: |
|
||||
--${{ matrix.arch }} \
|
||||
--target .
|
||||
script: |
|
||||
github.rest.repos.createRelease({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
tag_name: process.env.VERSION,
|
||||
});
|
||||
@@ -1,19 +1,27 @@
|
||||
name: Test add-on
|
||||
name: Test
|
||||
env:
|
||||
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branch: [main]
|
||||
pull_request:
|
||||
branches: [main]
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
name: Test ${{ github.sha }}
|
||||
name: Build Test for ${{ matrix.arch }}
|
||||
strategy:
|
||||
matrix:
|
||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
||||
|
||||
steps:
|
||||
- name: Cancel Previous Runs
|
||||
uses: styfle/cancel-workflow-action@0.9.1
|
||||
with:
|
||||
all_but_latest: true
|
||||
access_token: ${{ github.token }}
|
||||
|
||||
- name: Check out repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
@@ -24,10 +32,52 @@ jobs:
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
|
||||
- name: Publish
|
||||
- name: ${{ matrix.arch }}
|
||||
uses: home-assistant/builder@2022.03.1
|
||||
with:
|
||||
args: |
|
||||
--test \
|
||||
--${{ matrix.arch }} \
|
||||
--target .
|
||||
--target .
|
||||
python:
|
||||
name: "Python Tests"
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
action: [lint, coverage, security-checks]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v3
|
||||
with:
|
||||
python-version: 3.9
|
||||
- name: Install Dependencies
|
||||
run: cd api && make setup
|
||||
- name: Echo dependencies
|
||||
run: cd api && ./venv/bin/pip freeze
|
||||
- name: Running ${{ matrix.action }}
|
||||
run: cd api && make ${{ matrix.action }}
|
||||
|
||||
nodejs:
|
||||
name: "NodeJs Tests"
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
action:
|
||||
- "test:ci"
|
||||
- "tsc:ci"
|
||||
- "build"
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: 16
|
||||
cache: 'yarn'
|
||||
cache-dependency-path: webapp/yarn.lock
|
||||
- name: Install Dependencies
|
||||
run: cd webapp && yarn install
|
||||
- name: Run Tests
|
||||
run: cd webapp && yarn ${{ matrix.action }}
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
.vscode/*.log
|
||||
Vendored
-1
@@ -1 +0,0 @@
|
||||
{"buildTargets":["local_logs","local_ps","local_run","local_stop"],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}}
|
||||
Vendored
-8
@@ -1,8 +0,0 @@
|
||||
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
-362
@@ -1,362 +0,0 @@
|
||||
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
|
||||
|
||||
|
||||
@@ -1,5 +1,36 @@
|
||||
# Changelog
|
||||
|
||||
## [0.1.12] - Less Intense Error Messages
|
||||
|
||||
- Added more node-based errors (this way it's easier to see where validations failed)
|
||||
- Made the validators less strict in order to capture more edge cases that HA supports
|
||||
- Nicer auto-generated descriptions for some trigger nodes
|
||||
|
||||
|
||||
## [0.1.10] - More Bug Fixes
|
||||
|
||||
- Allowing null or undefined values for metadata fields
|
||||
- Trigger.platform==time will now have the .at property better supported
|
||||
|
||||
## [0.1.9] - Fixed up invalid types for various triggers
|
||||
|
||||
- Some triggers had invalid types and were causing a false-positive validation
|
||||
|
||||
## [0.1.8] - Support for Malformed Automations
|
||||
|
||||
- API will no longer error out on missing values or invalid lists
|
||||
- Frontend has support for displaying bad automations
|
||||
|
||||
## [0.1.6] - Mobile Mode
|
||||
|
||||
- Improved mobile mode
|
||||
- Fixed up arrow styles due to typos
|
||||
- Added selection color
|
||||
|
||||
## [0.1.2] - Docker Hub Images
|
||||
|
||||
- Publishing images to docker hub is now stable
|
||||
|
||||
## [0.0.15] - Publish to dockerhub
|
||||
|
||||
- Publishing images to docker hub
|
||||
|
||||
@@ -1,8 +1,13 @@
|
||||
# Shortumation
|
||||
# Shortumation
|
||||
|
||||

|
||||
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
|
||||
|
||||
A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
||||

|
||||
|
||||

|
||||
|
||||
|
||||
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
||||
|
||||
## Features
|
||||
|
||||
@@ -18,4 +23,33 @@ A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI
|
||||
|
||||
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
|
||||
|
||||
## Installation
|
||||
|
||||
### Addon
|
||||
|
||||
Add the repository URL under **Supervisor → Add-on store → ⋮ → Manage add-on repositories**:
|
||||
|
||||
https://github.com/asosnovsky/Shortumation
|
||||
|
||||
It should now appear in your `Add-on Store` and you should be able to install it!
|
||||
|
||||
### Containerized
|
||||
|
||||
Please note that this way of using Shortumation is **not future proof**, currently we use the `/config/automation.yaml` file as our source of truth for the automations. Which means that we do not need access to the HA API or Websockets. In future release you may need to configure some additional compomenents to enable this.
|
||||
|
||||
If this warning does not scare you or you still want to try things out, then take a look at the example [docker-compose.yaml](example/containerized/docker-compose.yaml).
|
||||
|
||||
|
||||
## FAQ
|
||||
|
||||
**How is this different from Node-Red?**
|
||||
|
||||
> Node-Red is both an execution engine and an automation editor, which means that in order for you automations to run you have to have an additional component running and executing the automations. Shortumation simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database)
|
||||
|
||||
**Which HA Installation does this support?**
|
||||
|
||||
> Currently this is only tested on HA OS. However, you should be able to get it working supervised installations as well (as they support addons). If you want to make it work for Container or Core, you will need to do some additional leg-work and I welcome a PR to get this working (it should be just a matter of mounting the `/config` path to the container running the images in this repo).
|
||||
|
||||
**Which version of HA does this require?**
|
||||
|
||||
> Since I am working on this project on my own, I can only test it against my own HA installations at home, and I tend to keep things as up to date as possible. The lowest version of HA this was tested on is `core-2022.5.4`
|
||||
@@ -0,0 +1,17 @@
|
||||
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:16)
|
||||
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:27)
|
||||
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:31)
|
||||
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:12)
|
||||
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:9)
|
||||
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:16)
|
||||
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:17)
|
||||
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:6)
|
||||
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:7)
|
||||
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
|
||||
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
|
||||
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
|
||||
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
|
||||
logger # unused variable (/home/ari/Projects/Shortumation/api/src/logger.py:16)
|
||||
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:13)
|
||||
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:30)
|
||||
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:54)
|
||||
+1
-1
@@ -10,7 +10,7 @@ setup:
|
||||
$(PIP) install .[dev]
|
||||
|
||||
lint:
|
||||
$(VENV_BIN)/vulture --exclude src
|
||||
$(VENV_BIN)/vulture src .vulture_whitelist
|
||||
$(MAKE) lint-project
|
||||
$(MAKE) lint-tests
|
||||
|
||||
|
||||
@@ -29,3 +29,15 @@ exclude = '''
|
||||
|
||||
[tool.coverage.run]
|
||||
omit = ["./venv/*", "tests/*"]
|
||||
|
||||
[[tool.mypy.overrides]]
|
||||
module = "decouple.*"
|
||||
ignore_missing_imports = true
|
||||
|
||||
[[tool.mypy.overrides]]
|
||||
module = "ruamel.*"
|
||||
ignore_missing_imports = true
|
||||
|
||||
[[tool.mypy.overrides]]
|
||||
module = "tests.*"
|
||||
ignore_missing_imports = true
|
||||
+1
-1
@@ -14,7 +14,7 @@ setuptools.setup(
|
||||
"dev": [
|
||||
"mypy==0.910",
|
||||
"mypy-extensions==0.4.3",
|
||||
"black==21.7b0",
|
||||
"black==22.3.0",
|
||||
"bandit==1.7.0",
|
||||
"isort==5.9.3",
|
||||
"coverage==5.5",
|
||||
|
||||
+5
-4
@@ -1,10 +1,11 @@
|
||||
from sys import prefix
|
||||
from fastapi import FastAPI
|
||||
from fastapi.staticfiles import StaticFiles
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
from fastapi.staticfiles import StaticFiles
|
||||
|
||||
from src.automations.manager import AutomationManager
|
||||
from src.env import ROOT_FOLDER, ORIGIN
|
||||
from .routes import ping, automations, details
|
||||
from src.env import ORIGIN, ROOT_FOLDER
|
||||
|
||||
from .routes import automations, details, ping
|
||||
|
||||
|
||||
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from fastapi import APIRouter, HTTPException
|
||||
from src.automations.manager import AutomationManager
|
||||
|
||||
from src.api.types import (
|
||||
DeleteAutoRequest,
|
||||
ListData,
|
||||
@@ -7,6 +7,7 @@ from src.api.types import (
|
||||
UpdateAutoRequest,
|
||||
)
|
||||
from src.automations.errors import FailedDeletion
|
||||
from src.automations.manager import AutomationManager
|
||||
from src.automations.types import AutomationData
|
||||
|
||||
|
||||
@@ -24,11 +25,11 @@ def make_automation_router(automations: AutomationManager) -> APIRouter:
|
||||
),
|
||||
)
|
||||
|
||||
@router.post("")
|
||||
@router.post("/item")
|
||||
def upsert_auto(body: UpdateAutoRequest):
|
||||
automations.update(body.index, body.data)
|
||||
|
||||
@router.delete("")
|
||||
@router.delete("/item")
|
||||
def delete_auto(body: DeleteAutoRequest):
|
||||
try:
|
||||
automations.delete(body.index)
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
from fastapi import APIRouter
|
||||
from datetime import datetime
|
||||
|
||||
from src.hass_config import HassConfig
|
||||
from src.env import BUILD_VERSION
|
||||
from fastapi import APIRouter
|
||||
|
||||
from src.env import BUILD_VERSION
|
||||
from src.hass_config import HassConfig
|
||||
|
||||
|
||||
def make_details_router(hass_config: HassConfig) -> APIRouter:
|
||||
@@ -18,4 +18,4 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
|
||||
"autos": hass_config.get_automation_path(),
|
||||
}
|
||||
|
||||
return router
|
||||
return router
|
||||
@@ -1,6 +1,7 @@
|
||||
from fastapi import APIRouter
|
||||
from datetime import datetime
|
||||
|
||||
from fastapi import APIRouter
|
||||
|
||||
from src.env import BUILD_VERSION
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
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 ExtenededAutomationData
|
||||
|
||||
DataT = TypeVar("DataT")
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
from src.api.app import make_app
|
||||
from src.automations.manager import AutomationManager
|
||||
from src.hass_config import find_hass_config
|
||||
from src.api.app import make_app
|
||||
|
||||
hass_config = find_hass_config()
|
||||
app = make_app(AutomationManager(hass_config))
|
||||
@@ -1,8 +1,12 @@
|
||||
from typing import Iterator, Union
|
||||
from typing import Any, Iterator, Union
|
||||
|
||||
from pydantic.error_wrappers import ValidationError
|
||||
|
||||
from src.json_serializer import normalize_obj
|
||||
from .types import AutomationMetdata, ExtenededAutomationData
|
||||
|
||||
from .errors import InvalidAutomationFile
|
||||
from .types import AutomationMetdata, ExtenededAutomationData
|
||||
|
||||
|
||||
# Single loader
|
||||
def load_automation(
|
||||
@@ -22,30 +26,35 @@ def load_automation(
|
||||
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", [])),
|
||||
condition=ifempty_or_null_then_list(load_conditions(auto_raw.get("condition", []))),
|
||||
sequence=ifempty_or_null_then_list(load_conditions(auto_raw.get("action", []))),
|
||||
trigger=ifempty_or_null_then_list(normalize_obj(auto_raw.get("trigger", []))),
|
||||
tags=tags,
|
||||
)
|
||||
except ValidationError as err:
|
||||
raise InvalidAutomationFile from err
|
||||
|
||||
|
||||
def ifempty_or_null_then_list(obj: Any):
|
||||
if not isinstance(obj, list):
|
||||
return []
|
||||
else:
|
||||
return obj
|
||||
|
||||
|
||||
def load_conditions(conditions: Union[dict, list, str]):
|
||||
if isinstance(conditions, list):
|
||||
return list(map(ensure_condition_dictionary, conditions))
|
||||
elif not conditions:
|
||||
return []
|
||||
else:
|
||||
return [
|
||||
ensure_condition_dictionary(conditions)
|
||||
]
|
||||
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
|
||||
}
|
||||
return {"condition": "template", "value_template": c}
|
||||
elif isinstance(c, dict):
|
||||
return c
|
||||
raise InvalidAutomationFile(f"Invalid type for condition object {c}")
|
||||
raise InvalidAutomationFile(f"Invalid type for condition object {c}")
|
||||
@@ -1,7 +1,9 @@
|
||||
from typing import Iterator, List, Optional
|
||||
|
||||
from src.automations.errors import FailedDeletion
|
||||
from src.automations.types import AutomationData, ExtenededAutomationData
|
||||
from src.hass_config.loader import HassConfig
|
||||
|
||||
from .loader import load_automation
|
||||
|
||||
|
||||
@@ -45,7 +47,7 @@ class AutomationManager:
|
||||
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,15 +1,14 @@
|
||||
|
||||
|
||||
|
||||
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))
|
||||
with path.open("r") as fp:
|
||||
return cls(load_yaml(fp))
|
||||
@@ -1,20 +1,22 @@
|
||||
from typing import Dict, List, Literal, Optional, Union
|
||||
from pydantic.fields import Field
|
||||
from typing import Dict, List, Optional, Union
|
||||
|
||||
from pydantic import BaseModel
|
||||
from pydantic.fields import Field
|
||||
|
||||
|
||||
class AutomationMetdata(BaseModel):
|
||||
id: str
|
||||
alias: Optional[str] = None
|
||||
description: Optional[str] = None
|
||||
trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None
|
||||
mode: Literal["single", "restart", "queued", "parallel"] = "single"
|
||||
mode: str = "single"
|
||||
|
||||
|
||||
class AutomationData(BaseModel):
|
||||
metadata: AutomationMetdata
|
||||
trigger: List[dict] = []
|
||||
condition: List[dict] = []
|
||||
sequence: List[dict] = []
|
||||
sequence: List[dict] = []
|
||||
|
||||
def to_primitive(self):
|
||||
return {
|
||||
@@ -24,5 +26,6 @@ class AutomationData(BaseModel):
|
||||
"action": self.sequence,
|
||||
}
|
||||
|
||||
|
||||
class ExtenededAutomationData(AutomationData):
|
||||
tags: Dict[str, str] = Field(default_factory=dict)
|
||||
tags: Dict[str, str] = Field(default_factory=dict)
|
||||
+2
-3
@@ -1,9 +1,8 @@
|
||||
from email.policy import default
|
||||
from decouple import config, Csv
|
||||
from pathlib import Path
|
||||
|
||||
from decouple import Csv, config
|
||||
|
||||
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="*")
|
||||
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
|
||||
@@ -1,7 +1,8 @@
|
||||
import os
|
||||
from typing import cast
|
||||
from decouple import config
|
||||
from pathlib import Path
|
||||
|
||||
from decouple import config
|
||||
|
||||
from .loader import HassConfig
|
||||
|
||||
|
||||
@@ -10,13 +11,14 @@ 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
|
||||
|
||||
|
||||
path = create_copy_of_example_config()
|
||||
print("|-> ", path)
|
||||
return HassConfig(path)
|
||||
|
||||
if "HASSIO_TOKEN" in os.environ:
|
||||
return HassConfig(Path("/config"))
|
||||
config_dir = Path("/config")
|
||||
if config_dir.is_dir():
|
||||
return HassConfig(config_dir)
|
||||
|
||||
"""Put together the default configuration directory based on the OS."""
|
||||
data_dir = Path(config("APPDATA", None) if os.name == "nt" else os.path.expanduser("~"))
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
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.automations.tags import TagManager
|
||||
from src.yaml_serializer import dump_yaml, load_yaml
|
||||
from src.yaml_serializer.types import IncludedYaml
|
||||
|
||||
from .errors import MissingFile
|
||||
|
||||
|
||||
@@ -25,7 +26,7 @@ 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()
|
||||
@@ -35,7 +36,6 @@ class HassConfig:
|
||||
else:
|
||||
return TagManager.load(tag_path)
|
||||
|
||||
|
||||
def get_automation_tags_path(self) -> Path:
|
||||
return self.root_path / ".shortumations" / "tags.yaml"
|
||||
|
||||
@@ -66,4 +66,4 @@ class HassConfig:
|
||||
)
|
||||
|
||||
def save_tags(self, tags: TagManager):
|
||||
tags.save(self.get_automation_tags_path())
|
||||
tags.save(self.get_automation_tags_path())
|
||||
@@ -34,6 +34,7 @@ def normalize_obj(obj: Any) -> Any:
|
||||
or isinstance(obj, int)
|
||||
or isinstance(obj, float)
|
||||
or isinstance(obj, bool)
|
||||
or obj is None
|
||||
):
|
||||
return obj
|
||||
else:
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import io
|
||||
from typing import Any, Union, TextIO
|
||||
from typing import Any, TextIO, Union
|
||||
|
||||
from src.yaml_serializer.base_yaml import yaml
|
||||
|
||||
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
from ruamel.yaml import YAML
|
||||
from src.yaml_serializer.types import IncludedYaml, IncludedYamlDir, SecretValue
|
||||
|
||||
from src.yaml_serializer.types import (
|
||||
IncludedYaml,
|
||||
IncludedYamlDir,
|
||||
SecretValue,
|
||||
)
|
||||
|
||||
yaml = YAML()
|
||||
yaml.register_class(IncludedYaml)
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
from typing import NamedTuple
|
||||
|
||||
from ruamel.yaml.nodes import Node
|
||||
from ruamel.yaml.representer import BaseRepresenter
|
||||
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
- id: '1652069225859'
|
||||
alias: 'Climate - Pref temperature '
|
||||
description: ''
|
||||
trigger:
|
||||
- platform: state
|
||||
entity_id: input_number.preferred_temperature
|
||||
condition: []
|
||||
action:
|
||||
- service: climate.set_temperature
|
||||
data:
|
||||
temperature:
|
||||
'[object Object]':
|
||||
target:
|
||||
entity_id: climate.main_floor
|
||||
mode: single
|
||||
@@ -0,0 +1,2 @@
|
||||
# empty configuration file
|
||||
cloud:
|
||||
@@ -811,3 +811,31 @@
|
||||
device_id: das2qdasdasdasadaasd
|
||||
default: []
|
||||
mode: single
|
||||
- id: 'baddy-1'
|
||||
alias: 'bad triggers'
|
||||
description: ''
|
||||
trigger: ""
|
||||
condition: []
|
||||
action: []
|
||||
mode: single
|
||||
- id: 'baddy-2'
|
||||
alias: 'null things'
|
||||
description: ''
|
||||
trigger:
|
||||
condition:
|
||||
action:
|
||||
mode: single
|
||||
- id: 'baddy-3'
|
||||
alias: 'big null things'
|
||||
description:
|
||||
trigger:
|
||||
condition:
|
||||
action:
|
||||
mode: single
|
||||
- id: 'bad mode'
|
||||
alias: 'bade mode'
|
||||
description: ""
|
||||
trigger: []
|
||||
condition: []
|
||||
action: []
|
||||
mode: bad
|
||||
@@ -1,9 +1,15 @@
|
||||
from ruamel.yaml import YAML
|
||||
from unittest import TestCase
|
||||
|
||||
from fastapi.testclient import TestClient
|
||||
from ruamel.yaml import YAML
|
||||
|
||||
from src.api.app import make_app
|
||||
from src.automations.types import AutomationData, AutomationMetdata, ExtenededAutomationData
|
||||
from tests.utils import get_example_automation_loader
|
||||
from src.automations.types import (
|
||||
AutomationData,
|
||||
AutomationMetdata,
|
||||
ExtenededAutomationData,
|
||||
)
|
||||
from tests.utils import HA_CONFIG2_EXAMPLE, get_example_automation_loader
|
||||
|
||||
|
||||
class BaseTestCase(TestCase):
|
||||
@@ -17,6 +23,9 @@ class BaseTestCase(TestCase):
|
||||
|
||||
|
||||
class automation_list_tests(BaseTestCase):
|
||||
|
||||
test_params = {"total": 32, "subtest2_found_items": 7, "subtest1_found_items": 10}
|
||||
|
||||
def test_get_list_of_everything(self):
|
||||
data = self.client.post(
|
||||
"/automations/list",
|
||||
@@ -34,8 +43,8 @@ class automation_list_tests(BaseTestCase):
|
||||
"limit": 50,
|
||||
},
|
||||
)
|
||||
self.assertEqual(d["totalItems"], 28)
|
||||
self.assertEqual(len(d["data"]), 28)
|
||||
self.assertEqual(d["totalItems"], self.test_params["total"])
|
||||
self.assertEqual(len(d["data"]), self.test_params["total"])
|
||||
|
||||
def test_subset1(self):
|
||||
data = self.client.post(
|
||||
@@ -54,8 +63,8 @@ class automation_list_tests(BaseTestCase):
|
||||
"limit": 10,
|
||||
},
|
||||
)
|
||||
self.assertEqual(d["totalItems"], 28)
|
||||
self.assertEqual(len(d["data"]), 10)
|
||||
self.assertEqual(d["totalItems"], self.test_params["total"])
|
||||
self.assertEqual(len(d["data"]), self.test_params["subtest1_found_items"])
|
||||
|
||||
def test_subset2(self):
|
||||
data = self.client.post(
|
||||
@@ -74,32 +83,48 @@ class automation_list_tests(BaseTestCase):
|
||||
"limit": 10,
|
||||
},
|
||||
)
|
||||
self.assertEqual(d["totalItems"], 28)
|
||||
self.assertEqual(len(d["data"]), 3)
|
||||
self.assertEqual(d["totalItems"], self.test_params["total"])
|
||||
self.assertEqual(len(d["data"]), self.test_params["subtest2_found_items"])
|
||||
|
||||
|
||||
class automation2_lists_tests(automation_list_tests):
|
||||
test_params = {
|
||||
"total": 1,
|
||||
"subtest2_found_items": 0,
|
||||
"subtest1_found_items": 1,
|
||||
}
|
||||
|
||||
def setUp(self) -> None:
|
||||
(
|
||||
self.config_folder,
|
||||
self.hass_config,
|
||||
self.automation_loader,
|
||||
) = get_example_automation_loader(HA_CONFIG2_EXAMPLE)
|
||||
self.client = TestClient(make_app(self.automation_loader))
|
||||
|
||||
|
||||
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"], 28)
|
||||
self.assertEqual(resp.json()["totalItems"], 32)
|
||||
resp = self.client.post(
|
||||
"/automations",
|
||||
"/automations/item",
|
||||
json={
|
||||
"index": 29,
|
||||
"index": 33,
|
||||
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
|
||||
},
|
||||
)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 28})
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 32})
|
||||
data = resp.json()
|
||||
self.assertEqual(data["totalItems"], 29)
|
||||
self.assertEqual(data["totalItems"], 33)
|
||||
self.assertEqual(data["data"][0]["metadata"]["id"], "testme")
|
||||
|
||||
def test_update_some(self):
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
|
||||
original_auto = resp.json()["data"][0]
|
||||
resp = self.client.post(
|
||||
"/automations",
|
||||
"/automations/item",
|
||||
json={
|
||||
"index": 20,
|
||||
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
|
||||
@@ -109,228 +134,203 @@ 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(ExtenededAutomationData(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!"
|
||||
original_auto["metadata"]["alias"] = "I CHANGED!"
|
||||
resp = self.client.post(
|
||||
"/automations",
|
||||
"/automations/item",
|
||||
json={
|
||||
"index": 15,
|
||||
"data": original_auto,
|
||||
},
|
||||
)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
with (self.config_folder / "automations.yaml").open('r') as fp:
|
||||
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
|
||||
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!"
|
||||
original_auto["metadata"]["alias"] = "I CHANGED!"
|
||||
resp = self.client.post(
|
||||
"/automations",
|
||||
"/automations/item",
|
||||
json={
|
||||
"index": 27,
|
||||
"data": original_auto,
|
||||
},
|
||||
)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
with (self.config_folder / "automations.yaml").open('r') as fp:
|
||||
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"
|
||||
}
|
||||
])
|
||||
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": [
|
||||
self.assertListEqual(
|
||||
action,
|
||||
[
|
||||
{
|
||||
"conditions": [
|
||||
"choose": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "turn_off"
|
||||
}
|
||||
"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"},
|
||||
}
|
||||
],
|
||||
},
|
||||
],
|
||||
"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": [],
|
||||
}
|
||||
],
|
||||
"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"], 28)
|
||||
self.assertEqual(resp.json()["totalItems"], 32)
|
||||
resp = self.client.delete(
|
||||
"/automations",
|
||||
"/automations/item",
|
||||
json={
|
||||
"index": 20,
|
||||
},
|
||||
)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
||||
self.assertEqual(resp.json()["totalItems"], 27)
|
||||
self.assertEqual(resp.json()["totalItems"], 31)
|
||||
@@ -1,13 +1,8 @@
|
||||
from unittest import TestCase
|
||||
from src.automations.types import (
|
||||
AutomationMetdata,
|
||||
ExtenededAutomationData,
|
||||
)
|
||||
|
||||
from src.automations.loader import load_automation
|
||||
from src.yaml_serializer.types import (
|
||||
SecretValue,
|
||||
NOT_IMPLEMENTED_SV_MSG,
|
||||
)
|
||||
from src.automations.types import AutomationMetdata, ExtenededAutomationData
|
||||
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
||||
|
||||
|
||||
class loader_tests(TestCase):
|
||||
@@ -31,7 +26,7 @@ class loader_tests(TestCase):
|
||||
],
|
||||
"mode": "single",
|
||||
},
|
||||
{}
|
||||
{},
|
||||
)
|
||||
)
|
||||
self.assertEqual(
|
||||
@@ -44,10 +39,12 @@ class loader_tests(TestCase):
|
||||
mode="single",
|
||||
),
|
||||
trigger=[{"platform": "homeassistant", "event": "shutdown"}],
|
||||
condition=[{
|
||||
"condition": "template",
|
||||
"value_template": "states(time.time) >= '10:00:00'",
|
||||
}],
|
||||
condition=[
|
||||
{
|
||||
"condition": "template",
|
||||
"value_template": "states(time.time) >= '10:00:00'",
|
||||
}
|
||||
],
|
||||
sequence=[
|
||||
{
|
||||
"device_id": NOT_IMPLEMENTED_SV_MSG,
|
||||
@@ -57,6 +54,6 @@ class loader_tests(TestCase):
|
||||
"message": "Hassio Is turning off...",
|
||||
}
|
||||
],
|
||||
tags={}
|
||||
tags={},
|
||||
),
|
||||
)
|
||||
@@ -1,4 +1,5 @@
|
||||
from unittest import TestCase
|
||||
|
||||
from src.automations.errors import FailedDeletion, InvalidAutomationFile
|
||||
from src.automations.types import AutomationMetdata, ExtenededAutomationData
|
||||
from tests.utils import (
|
||||
@@ -23,11 +24,11 @@ class manager_tests(TestCase):
|
||||
_, _, loader = get_example_automation_loader()
|
||||
self.assertIsNone(loader.get(-1))
|
||||
self.assertIsNone(loader.get(1_000))
|
||||
self.assertIsNone(loader.get(31))
|
||||
self.assertIsNone(loader.get(33))
|
||||
|
||||
def test_length(self):
|
||||
_, _, loader = get_example_automation_loader()
|
||||
self.assertEqual(loader.get_total_items(), 28)
|
||||
self.assertEqual(loader.get_total_items(), 32)
|
||||
|
||||
def test_bad_automations_file(self):
|
||||
folder, _, manager = get_dummy_automation_loader(
|
||||
@@ -50,11 +51,11 @@ class manager_tests(TestCase):
|
||||
|
||||
def test_create_automation_with_example_folder(self):
|
||||
_, _, manager = get_example_automation_loader()
|
||||
self.assertEqual(manager.get_total_items(), 28)
|
||||
manager.update(32, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
|
||||
auto = manager.get(28)
|
||||
self.assertEqual(manager.get_total_items(), 32)
|
||||
manager.update(40, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
|
||||
auto = manager.get(32)
|
||||
self.assertIsNotNone(auto)
|
||||
self.assertEqual(manager.get_total_items(), 29)
|
||||
self.assertEqual(manager.get_total_items(), 33)
|
||||
self.assertEqual(auto.metadata.id, "test1") # type: ignore
|
||||
|
||||
def test_update_automation(self):
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
|
||||
|
||||
from pathlib import Path
|
||||
from tempfile import mktemp
|
||||
from unittest import TestCase
|
||||
|
||||
from src.automations.tags import TagManager
|
||||
|
||||
class tag_tests(TestCase):
|
||||
|
||||
class tag_tests(TestCase):
|
||||
def test_load_and_save(self):
|
||||
tmp_file = Path(mktemp()).with_suffix('.yml')
|
||||
tmp_file = Path(mktemp()).with_suffix(".yml")
|
||||
tags = TagManager()
|
||||
tags[0] = {'Room': "Kitchen", "Type": 'Lights'}
|
||||
tags[0] = {"Room": "Kitchen", "Type": "Lights"}
|
||||
tags[1] = {}
|
||||
|
||||
tags.save(tmp_file)
|
||||
loaded_tags = TagManager.load(tmp_file)
|
||||
assert loaded_tags.keys() == tags.keys()
|
||||
assert loaded_tags.keys() == tags.keys()
|
||||
@@ -1,4 +1,5 @@
|
||||
from unittest import TestCase
|
||||
|
||||
from src.automations.types import AutomationData, AutomationMetdata
|
||||
from src.hass_config.errors import MissingFile
|
||||
from src.hass_config.loader import HassConfig
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
import json
|
||||
from unittest import TestCase
|
||||
from ruamel.yaml.scalarstring import ScalarString
|
||||
from ruamel.yaml.scalarint import ScalarInt
|
||||
|
||||
from ruamel.yaml.scalarbool import ScalarBoolean
|
||||
from ruamel.yaml.scalarfloat import ScalarFloat
|
||||
from src.yaml_serializer.types import SecretValue, NOT_IMPLEMENTED_SV_MSG
|
||||
from ruamel.yaml.scalarint import ScalarInt
|
||||
from ruamel.yaml.scalarstring import ScalarString
|
||||
|
||||
from src.json_serializer import json_dumps
|
||||
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
||||
|
||||
|
||||
class json_serializer_tests(TestCase):
|
||||
|
||||
@@ -1,18 +1,16 @@
|
||||
import io
|
||||
from unittest import TestCase
|
||||
from src.yaml_serializer import (
|
||||
dump_yaml,
|
||||
load_yaml,
|
||||
)
|
||||
|
||||
from src.yaml_serializer import dump_yaml, load_yaml
|
||||
from src.yaml_serializer.types import (
|
||||
IncludedYaml,
|
||||
SecretValue,
|
||||
IncludedYamlDir,
|
||||
SecretValue,
|
||||
)
|
||||
from tests.utils import SAMPLES_FOLDER
|
||||
|
||||
class dumping_yamls_tests(TestCase):
|
||||
|
||||
class dumping_yamls_tests(TestCase):
|
||||
def test_dumping_includes(self):
|
||||
yaml = dump_yaml(
|
||||
{
|
||||
|
||||
+9
-6
@@ -1,32 +1,35 @@
|
||||
from pathlib import Path
|
||||
from shutil import copytree
|
||||
from tempfile import mkdtemp
|
||||
from pathlib import Path
|
||||
from typing import List, Literal, Optional, Tuple
|
||||
|
||||
from src.automations.manager import AutomationManager
|
||||
from src.automations.types import AutomationData
|
||||
from src.hass_config.loader import HassConfig
|
||||
|
||||
from src.yaml_serializer import dump_yaml
|
||||
from src.yaml_serializer.types import IncludedYaml
|
||||
|
||||
THIS_FOLDER = Path(__file__).parent
|
||||
SAMPLES_FOLDER = THIS_FOLDER / "samples"
|
||||
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
|
||||
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
|
||||
|
||||
|
||||
def get_example_automation_loader() -> Tuple[Path, HassConfig, AutomationManager]:
|
||||
def get_example_automation_loader(
|
||||
config_to_copy: Path = HA_CONFIG_EXAMPLE,
|
||||
) -> Tuple[Path, HassConfig, AutomationManager]:
|
||||
"""Creates an example automation loader from the samples folder
|
||||
|
||||
Returns:
|
||||
Tuple[Path, HassConfig, AutomationManager]
|
||||
"""
|
||||
root_folder = create_copy_of_example_config()
|
||||
root_folder = create_copy_of_example_config(config_to_copy)
|
||||
hass_config = HassConfig(root_folder)
|
||||
automation_loader = AutomationManager(hass_config)
|
||||
return root_folder, hass_config, automation_loader
|
||||
|
||||
|
||||
def create_copy_of_example_config() -> Path:
|
||||
def create_copy_of_example_config(config_to_copy: Path = HA_CONFIG_EXAMPLE) -> Path:
|
||||
"""Creates a copy of the example config folder
|
||||
|
||||
Returns:
|
||||
@@ -34,7 +37,7 @@ def create_copy_of_example_config() -> Path:
|
||||
"""
|
||||
root_folder = Path(mkdtemp())
|
||||
root_folder.rmdir()
|
||||
copytree(HA_CONFIG_EXAMPLE, root_folder)
|
||||
copytree(config_to_copy, root_folder)
|
||||
return root_folder
|
||||
|
||||
|
||||
|
||||
+3
-3
@@ -1,5 +1,5 @@
|
||||
name: Shortumation
|
||||
version: 0.0.15
|
||||
version: 0.1.12
|
||||
slug: shortumation
|
||||
image: asosnovsky/shortumation-{arch}
|
||||
url: "https://github.com/asosnovsky/Shortumation"
|
||||
@@ -8,7 +8,7 @@ arch:
|
||||
- aarch64
|
||||
- amd64
|
||||
- armhf
|
||||
- armv7s
|
||||
- armv7
|
||||
- i386
|
||||
startup: application
|
||||
boot: auto
|
||||
@@ -20,7 +20,7 @@ panel_icon: mdi:home-automation
|
||||
hassio_role: manager
|
||||
privileged:
|
||||
- SYS_RAWIO
|
||||
host_network: true
|
||||
host_network: false
|
||||
auth_api: true
|
||||
map:
|
||||
- config:rw
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
version: '3'
|
||||
services:
|
||||
homeassistant:
|
||||
container_name: homeassistant
|
||||
image: "ghcr.io/home-assistant/home-assistant:stable"
|
||||
volumes:
|
||||
- config:/config
|
||||
restart: unless-stopped
|
||||
privileged: true
|
||||
network_mode: host
|
||||
|
||||
shortumation:
|
||||
# make sure to replace the ARCH with whatever system you are running!
|
||||
image: "asosnovsky/shortumation-${ARCH:-amd64}:latest"
|
||||
volumes:
|
||||
- config:/config
|
||||
ports:
|
||||
- 8081:8000
|
||||
|
||||
volumes:
|
||||
config:
|
||||
+5
-1
@@ -15,6 +15,7 @@
|
||||
"react-jss": "^10.8.2",
|
||||
"react-router-dom": "6",
|
||||
"react-scripts": "4.0.3",
|
||||
"superstruct": "^0.15.4",
|
||||
"theming": "^3.3.0",
|
||||
"typescript": "^4.1.2",
|
||||
"web-vitals": "^1.0.1",
|
||||
@@ -23,6 +24,9 @@
|
||||
"scripts": {
|
||||
"start": "react-scripts start",
|
||||
"build": "react-scripts build",
|
||||
"tsc": "tsc -w",
|
||||
"tsc:ci": "tsc",
|
||||
"test:ci": "react-scripts test --ci=true --all --watchAll=false",
|
||||
"test": "react-scripts test",
|
||||
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
|
||||
"eject": "react-scripts eject",
|
||||
@@ -77,4 +81,4 @@
|
||||
"node_modules",
|
||||
"src"
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
import { AutomationData } from "types/automations";
|
||||
import { API } from "./base";
|
||||
import { ListData, ListParams } from "./types";
|
||||
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths';
|
||||
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
|
||||
|
||||
|
||||
export const makeAutomationAPI = (api: API) => ({
|
||||
@@ -14,19 +14,19 @@ export const makeAutomationAPI = (api: API) => ({
|
||||
});
|
||||
return data;
|
||||
},
|
||||
async update({index, auto}: {index: number, auto: AutomationData}) {
|
||||
async update({ index, auto }: { index: number, auto: AutomationData }) {
|
||||
return await api.makeCall({
|
||||
path: AUTOMTAION_ROOT,
|
||||
path: AUTOMTAION_ITEM,
|
||||
data: {
|
||||
index,
|
||||
data: auto
|
||||
},
|
||||
})
|
||||
},
|
||||
async remove({index}: {index: number}) {
|
||||
async remove({ index }: { index: number }) {
|
||||
return await api.makeCall({
|
||||
method: "DELETE",
|
||||
path: AUTOMTAION_ROOT,
|
||||
path: AUTOMTAION_ITEM,
|
||||
data: {
|
||||
index,
|
||||
}
|
||||
|
||||
@@ -5,7 +5,6 @@ import { useAPIService } from './core';
|
||||
import { useMockAPI } from "./mock";
|
||||
|
||||
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
|
||||
console.log(process.env)
|
||||
|
||||
export const useConnectedApiService = () => useAPIService(
|
||||
makeAutomationAPI(makeRemoteAPI(
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useRef } from 'react';
|
||||
import { AutomationData } from 'types/automations';
|
||||
import { API } from './base';
|
||||
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths';
|
||||
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
|
||||
|
||||
|
||||
export const useMockAPI = (
|
||||
@@ -26,7 +26,7 @@ export const useMockAPI = (
|
||||
}))
|
||||
} as any
|
||||
}
|
||||
if (path === AUTOMTAION_ROOT) {
|
||||
if (path === AUTOMTAION_ITEM) {
|
||||
if (method === 'POST') {
|
||||
const { index, data: auto } = data as any;
|
||||
if (index >= automationsRef.current.length) {
|
||||
@@ -37,7 +37,7 @@ export const useMockAPI = (
|
||||
auto,
|
||||
...automationsRef.current.slice(index + 1)
|
||||
];
|
||||
}
|
||||
}
|
||||
return {
|
||||
ok: true,
|
||||
data: {}
|
||||
|
||||
@@ -2,3 +2,4 @@
|
||||
|
||||
export const AUTOMTAION_ROOT = '/' as const;
|
||||
export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const;
|
||||
export const AUTOMTAION_ITEM = `${AUTOMTAION_ROOT}item` as const;
|
||||
@@ -15,7 +15,7 @@
|
||||
}
|
||||
|
||||
.automation-editor--info-box.show {
|
||||
min-width: 25em;
|
||||
min-width: 20em;
|
||||
}
|
||||
|
||||
.automation-editor--info-box.hide {
|
||||
|
||||
@@ -80,8 +80,8 @@ export const AutoInfoBox: FC<Props> = ({
|
||||
return <div className={`automation-editor--info-box ${className}`}>
|
||||
<div className="automation-editor--info-box-inner">
|
||||
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} />
|
||||
<InputText label="Name" value={metadata.alias} onChange={onUpdateMetadata('alias')} />
|
||||
<InputTextArea label="Description" value={metadata.description} onChange={onUpdateMetadata('description')} />
|
||||
<InputText label="Name" value={metadata.alias ?? ""} onChange={onUpdateMetadata('alias')} />
|
||||
<InputTextArea label="Description" value={metadata.description ?? ""} onChange={onUpdateMetadata('description')} />
|
||||
<InputList
|
||||
label="Mode"
|
||||
current={metadata.mode}
|
||||
|
||||
@@ -5,6 +5,14 @@
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.automation-editor-failures {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding: 1em;
|
||||
overflow: scroll;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.automation-editor--flow-wrapper {
|
||||
flex: 1;
|
||||
padding: 0 0.5em 0 0.5em;
|
||||
|
||||
@@ -2,7 +2,7 @@ import React from "react";
|
||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||
import { AutomationEditor } from './index';
|
||||
import { useState } from 'react';
|
||||
import * as dgconst from 'components/DAGSvgs/constants';
|
||||
import * as dgconst from 'components/DAGFlow/constants';
|
||||
|
||||
|
||||
export default {
|
||||
@@ -111,3 +111,63 @@ EmptyStart.args = {
|
||||
sequence: []
|
||||
}
|
||||
}
|
||||
|
||||
export const BadAutomationInvalidMetadata = Template.bind({})
|
||||
BadAutomationInvalidMetadata.args = {
|
||||
...BadAutomationInvalidMetadata.args,
|
||||
automation: {
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
} as any,
|
||||
trigger: [
|
||||
],
|
||||
sequence: []
|
||||
}
|
||||
}
|
||||
|
||||
export const BadAutomationInvalidTriggers = Template.bind({})
|
||||
BadAutomationInvalidTriggers.args = {
|
||||
...BadAutomationInvalidTriggers.args,
|
||||
automation: {
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Random",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
'wowo': '!'
|
||||
},
|
||||
mode: 'single',
|
||||
},
|
||||
trigger: [
|
||||
"haha I am a string"
|
||||
] as any,
|
||||
sequence: []
|
||||
}
|
||||
}
|
||||
|
||||
export const BadAutomationInvalidSequence = Template.bind({})
|
||||
BadAutomationInvalidSequence.args = {
|
||||
...BadAutomationInvalidSequence.args,
|
||||
automation: {
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Bad Choose Sequence",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
'wowo': '!'
|
||||
},
|
||||
mode: 'single',
|
||||
},
|
||||
trigger: [],
|
||||
sequence: [
|
||||
{
|
||||
choose: {}
|
||||
}
|
||||
] as any
|
||||
}
|
||||
}
|
||||
@@ -5,9 +5,11 @@ import { AutomationData } from "types/automations";
|
||||
import { AutoInfoBox } from "./AutoInfoBox";
|
||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
import { useAutomatioEditorState } from "./state";
|
||||
import { DAGAutomationFlow } from "components/DAGFlow";
|
||||
import { useAutomatioEditorState, EditorData } from './state';
|
||||
import { SafeDAGAutomationFlow } from "components/DAGFlow/safe";
|
||||
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
|
||||
import { MiniFailure } from 'types/validators/helper';
|
||||
import InputYaml from "components/Inputs/InputYaml";
|
||||
|
||||
interface Props {
|
||||
automation?: AutomationData;
|
||||
@@ -26,7 +28,9 @@ export const AutomationEditor: FC<Props> = ({
|
||||
updateTrigger,
|
||||
updateMetadata,
|
||||
updateCondition,
|
||||
validate,
|
||||
save,
|
||||
saveAndUpdate,
|
||||
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
|
||||
|
||||
const [closeInfo, setCloseInfo] = useState(false);
|
||||
@@ -37,6 +41,14 @@ export const AutomationEditor: FC<Props> = ({
|
||||
Loading...
|
||||
</div>
|
||||
}
|
||||
if (state.status === 'invalid') {
|
||||
return <ValidationBox
|
||||
failures={state.failures}
|
||||
data={state.data}
|
||||
validate={validate}
|
||||
onSave={saveAndUpdate}
|
||||
/>
|
||||
}
|
||||
return <div className="automation-editor">
|
||||
<AutoInfoBox
|
||||
className={closeInfo ? "hide" : "show"}
|
||||
@@ -61,7 +73,7 @@ export const AutomationEditor: FC<Props> = ({
|
||||
Save <CheckMarkIcon color="#bf4" />
|
||||
</Button>
|
||||
</div>
|
||||
<DAGAutomationFlow
|
||||
<SafeDAGAutomationFlow
|
||||
className="automation-editor--flow-wrapper--flow"
|
||||
sequence={state.data.sequence}
|
||||
trigger={state.data.trigger}
|
||||
@@ -74,3 +86,58 @@ export const AutomationEditor: FC<Props> = ({
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
|
||||
export const ValidationBox: FC<{
|
||||
failures: MiniFailure[]
|
||||
validate: (d: any) => MiniFailure[] | null,
|
||||
data: EditorData,
|
||||
onSave: (d: EditorData) => void,
|
||||
}> = props => {
|
||||
|
||||
const [{ failures, data }, setState] = useState({
|
||||
failures: props.failures,
|
||||
data: props.data,
|
||||
});
|
||||
|
||||
const makeSave = <K extends keyof EditorData>(k: K) => (d: EditorData[K]) => {
|
||||
const newData = {
|
||||
...data,
|
||||
[k]: d,
|
||||
}
|
||||
const newFails = props.validate(newData);
|
||||
if (newFails) {
|
||||
setState({
|
||||
failures: newFails,
|
||||
data: newData,
|
||||
})
|
||||
} else {
|
||||
setState({
|
||||
failures: [],
|
||||
data: newData,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
return <div className="automation-editor-failures">
|
||||
<ul>
|
||||
{failures.map((f, i) => <>
|
||||
<li key={i}>
|
||||
<b>{f.path}</b>:
|
||||
<ul>
|
||||
{f.message.map((m, j) => <li key={j}>
|
||||
{m}
|
||||
</li>)}
|
||||
</ul>
|
||||
</li>
|
||||
</>)}
|
||||
</ul>
|
||||
<span>Please correct the automation file manually and then continue!</span>
|
||||
<InputYaml label="Metadata" value={data.metadata} onChange={makeSave('metadata')} resizable />
|
||||
<InputYaml label="Tags" value={data.tags} onChange={makeSave('tags')} resizable />
|
||||
<InputYaml label="Trigger" value={data.trigger} onChange={makeSave('trigger')} resizable />
|
||||
<InputYaml label="Condition" value={data.condition} onChange={makeSave('condition')} resizable />
|
||||
<InputYaml label="Actions" value={data.sequence} onChange={makeSave('sequence')} resizable />
|
||||
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>Save</Button>
|
||||
</div>
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
import { useState, useEffect } from 'react';
|
||||
import { AutomationData, AutomationMetadata } from "types/automations";
|
||||
|
||||
import * as v from "types/validators/autmation";
|
||||
import { getFailures } from "types/validators/helper";
|
||||
import { MiniFailure } from '../../types/validators/helper';
|
||||
|
||||
export type EditorData = ReturnType<typeof genEditorData>;
|
||||
export type EditorState = {
|
||||
@@ -8,6 +10,10 @@ export type EditorState = {
|
||||
data: EditorData
|
||||
} | {
|
||||
status: 'loading'
|
||||
} | {
|
||||
status: 'invalid',
|
||||
failures: MiniFailure[],
|
||||
data: EditorData,
|
||||
}
|
||||
export type EditorStatus = EditorState['status'];
|
||||
|
||||
@@ -20,7 +26,7 @@ export const useAutomatioEditorState = (
|
||||
});
|
||||
const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => (
|
||||
data: D
|
||||
) => state.status !== 'loading' && update({
|
||||
) => ((state.status === 'changed') || (state.status === 'unchanged')) && update({
|
||||
status: 'changed',
|
||||
data: {
|
||||
...state.data,
|
||||
@@ -28,21 +34,46 @@ export const useAutomatioEditorState = (
|
||||
}
|
||||
})
|
||||
|
||||
const saveAndUpdate = (data: EditorData) => {
|
||||
const cleanData = {
|
||||
...data,
|
||||
tags: data.tags.reduce((all, [tagName, tagValue]) => ({
|
||||
...all,
|
||||
[tagName.trim()]: tagValue.trim(),
|
||||
}), {})
|
||||
};
|
||||
update({
|
||||
status: "loading",
|
||||
})
|
||||
onSave(cleanData);
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
if (automation) {
|
||||
update({
|
||||
status: 'unchanged',
|
||||
data: genEditorData(automation),
|
||||
})
|
||||
const failures = getFailures(automation, v.AutomationData);
|
||||
if (failures) {
|
||||
update({
|
||||
status: 'invalid',
|
||||
failures,
|
||||
data: genEditorData(automation),
|
||||
})
|
||||
} else {
|
||||
update({
|
||||
status: 'unchanged',
|
||||
data: genEditorData(automation),
|
||||
})
|
||||
}
|
||||
}
|
||||
}, [automation]);
|
||||
|
||||
return {
|
||||
validate: (data: any) => getFailures(data, v.AutomationData),
|
||||
updateTrigger: makeUpdate('trigger'),
|
||||
updateSequence: makeUpdate('sequence'),
|
||||
updateCondition: makeUpdate('condition'),
|
||||
saveAndUpdate,
|
||||
updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => {
|
||||
if (state.status !== 'loading') {
|
||||
if ((state.status === 'changed') || (state.status === 'unchanged')) {
|
||||
update({
|
||||
status: 'changed',
|
||||
data: {
|
||||
@@ -55,17 +86,7 @@ export const useAutomatioEditorState = (
|
||||
},
|
||||
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);
|
||||
saveAndUpdate(state.data)
|
||||
}
|
||||
},
|
||||
get state() {
|
||||
|
||||
@@ -3,7 +3,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { useState } from "react";
|
||||
import { AutomationList } from ".";
|
||||
import { createMockAuto } from "utils/mocks";
|
||||
import * as dgconst from 'components/DAGSvgs/constants';
|
||||
import * as dgconst from 'components/DAGFlow/constants';
|
||||
|
||||
export default {
|
||||
title: 'App/AutomationList',
|
||||
@@ -62,5 +62,530 @@ FewAutos.args = {
|
||||
createMockAuto({ "Room": "Office", "Type": "Lights" }),
|
||||
createMockAuto({ "Room": "Office" }),
|
||||
createMockAuto(),
|
||||
{
|
||||
"metadata": {
|
||||
"id": "1649947692702",
|
||||
"alias": "Bed Remote",
|
||||
"description": "",
|
||||
"trigger_variables": null,
|
||||
"mode": "single"
|
||||
},
|
||||
"trigger": [
|
||||
{
|
||||
"device_id": "asdasdasdas",
|
||||
"domain": "zha",
|
||||
"platform": "device",
|
||||
"type": "remote_button_short_press",
|
||||
"subtype": "turn_on",
|
||||
"id": "turn_on"
|
||||
},
|
||||
{
|
||||
"device_id": "asdasdasdas",
|
||||
"domain": "zha",
|
||||
"platform": "device",
|
||||
"type": "remote_button_short_press",
|
||||
"subtype": "turn_off",
|
||||
"id": "turn_off"
|
||||
},
|
||||
{
|
||||
"device_id": "asdasdasdas",
|
||||
"domain": "zha",
|
||||
"platform": "device",
|
||||
"type": "remote_button_short_press",
|
||||
"subtype": "dim_up",
|
||||
"id": "dim_up"
|
||||
},
|
||||
{
|
||||
"device_id": "asdasdasdas",
|
||||
"domain": "zha",
|
||||
"platform": "device",
|
||||
"type": "remote_button_short_press",
|
||||
"subtype": "dim_down",
|
||||
"id": "dim_down"
|
||||
},
|
||||
{
|
||||
"device_id": "asdasdasdas",
|
||||
"domain": "zha",
|
||||
"platform": "device",
|
||||
"type": "remote_button_double_press",
|
||||
"subtype": "turn_on",
|
||||
"id": "up_dbclk"
|
||||
}
|
||||
],
|
||||
"condition": [],
|
||||
"sequence": [
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "turn_off"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"type": "turn_off",
|
||||
"device_id": "asdasdasdasdas",
|
||||
"entity_id": "light.bulb_ari_lamp",
|
||||
"domain": "light"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "turn_on"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "light.turn_on",
|
||||
"data": {
|
||||
"color_temp": 153,
|
||||
"brightness_pct": 100
|
||||
},
|
||||
"target": {
|
||||
"device_id": "asdasdasdasdas"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "dim_up"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"device_id": "asdasdasdasdas",
|
||||
"domain": "light",
|
||||
"entity_id": "light.bulb_ari_lamp",
|
||||
"type": "brightness_increase"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "dim_down"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"device_id": "asdasdasdasdas",
|
||||
"domain": "light",
|
||||
"entity_id": "light.bulb_ari_lamp",
|
||||
"type": "brightness_decrease"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "up_dbclk"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "light.turn_on",
|
||||
"data": {
|
||||
"color_temp": 500,
|
||||
"brightness_pct": 100
|
||||
},
|
||||
"target": {
|
||||
"device_id": "asdasdasdasdas"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"default": []
|
||||
}
|
||||
],
|
||||
"tags": {
|
||||
"Type": "Remote",
|
||||
"Room": "Bedroom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"metadata": {
|
||||
"id": "1641617168123",
|
||||
"alias": "Ensure On",
|
||||
"description": "",
|
||||
"trigger_variables": null,
|
||||
"mode": "single"
|
||||
},
|
||||
"trigger": [
|
||||
{
|
||||
"platform": "device",
|
||||
"type": "turned_off",
|
||||
"device_id": "tasdasdasdasdasdasda",
|
||||
"entity_id": "switch.power_washer",
|
||||
"domain": "switch"
|
||||
},
|
||||
{
|
||||
"platform": "device",
|
||||
"type": "turned_off",
|
||||
"device_id": "dasdasdasdasdas",
|
||||
"entity_id": "switch.plug_living_room_tv",
|
||||
"domain": "switch"
|
||||
}
|
||||
],
|
||||
"condition": [],
|
||||
"sequence": [
|
||||
{
|
||||
"type": "turn_on",
|
||||
"device_id": "tasdasdasdasdasdasda",
|
||||
"entity_id": "switch.power_washer",
|
||||
"domain": "switch"
|
||||
},
|
||||
{
|
||||
"type": "turn_on",
|
||||
"device_id": "dasdasdasdasdas",
|
||||
"entity_id": "switch.plug_living_room_tv",
|
||||
"domain": "switch"
|
||||
}
|
||||
],
|
||||
"tags": {}
|
||||
},
|
||||
{
|
||||
"metadata": {
|
||||
"id": "1649726828269",
|
||||
"alias": "Climate Heat Mode Settings",
|
||||
"description": "Ensures that the climate is always in sync with the house settings",
|
||||
"trigger_variables": null,
|
||||
"mode": "single"
|
||||
},
|
||||
"trigger": [
|
||||
{
|
||||
"platform": "state",
|
||||
"entity_id": "climate.main_floor",
|
||||
"id": "main"
|
||||
},
|
||||
{
|
||||
"platform": "state",
|
||||
"entity_id": "climate.second_floor",
|
||||
"id": "second"
|
||||
},
|
||||
{
|
||||
"platform": "state",
|
||||
"entity_id": "input_boolean.thermostats_house_is_heating",
|
||||
"id": "setting"
|
||||
}
|
||||
],
|
||||
"condition": [],
|
||||
"sequence": [
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "setting"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "climate.turn_off",
|
||||
"data": {},
|
||||
"target": {
|
||||
"device_id": [
|
||||
"d88dcfe82bc9a1c0f2b77b871848155e",
|
||||
"ef2d47fdeef19f8984b85f92f2597f73"
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "state",
|
||||
"entity_id": "input_boolean.thermostats_house_is_heating",
|
||||
"state": "on"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "and",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "template",
|
||||
"value_template": "{{ trigger.to_state.state != 'heat' }}"
|
||||
},
|
||||
{
|
||||
"condition": "template",
|
||||
"value_template": "{{ trigger.to_state.state != 'off' }}"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "climate.set_hvac_mode",
|
||||
"data": {
|
||||
"hvac_mode": "heat"
|
||||
},
|
||||
"target": {
|
||||
"entity_id": "{{ trigger.entity_id }}"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"default": [
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "and",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "template",
|
||||
"value_template": "{{ trigger.to_state.state != 'cool' }}"
|
||||
},
|
||||
{
|
||||
"condition": "template",
|
||||
"value_template": "{{ trigger.to_state.state != 'off' }}"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "climate.set_hvac_mode",
|
||||
"data": {
|
||||
"hvac_mode": "cool"
|
||||
},
|
||||
"target": {
|
||||
"entity_id": "{{ trigger.entity_id }}"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"tags": {}
|
||||
},
|
||||
{
|
||||
"metadata": {
|
||||
"id": "1628024070687",
|
||||
"alias": "Baby Light Setting",
|
||||
"description": "Configures max/min light settings for the baby ",
|
||||
"trigger_variables": null,
|
||||
"mode": "single"
|
||||
},
|
||||
"trigger": [
|
||||
{
|
||||
"platform": "time",
|
||||
"at": "21:00:00",
|
||||
"id": "night"
|
||||
},
|
||||
{
|
||||
"platform": "time",
|
||||
"at": "07:30:00",
|
||||
"id": "day"
|
||||
}
|
||||
],
|
||||
"condition": [],
|
||||
"sequence": [
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "night"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "zwave_js.set_config_parameter",
|
||||
"data": {
|
||||
"parameter": "5",
|
||||
"value": "15"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "day"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "zwave_js.set_config_parameter",
|
||||
"data": {
|
||||
"parameter": "5",
|
||||
"value": 100
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"default": []
|
||||
}
|
||||
],
|
||||
"tags": {}
|
||||
},
|
||||
{
|
||||
"metadata": {
|
||||
"id": "alarmanlage_an",
|
||||
"alias": "alarmanlage_an (Uhrzeit)",
|
||||
"mode": "single"
|
||||
},
|
||||
tags: {},
|
||||
"trigger": [
|
||||
{
|
||||
"entity_id": "sensor.time",
|
||||
"platform": "state",
|
||||
"to": "23:30"
|
||||
}
|
||||
],
|
||||
"condition": [
|
||||
{
|
||||
"condition": "or",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "state",
|
||||
"entity_id": "person.simon",
|
||||
"state": "home"
|
||||
},
|
||||
{
|
||||
"condition": "state",
|
||||
"entity_id": "person.leni",
|
||||
"state": "home"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "alarm_control_panel.alarm_arm_night",
|
||||
"target": {
|
||||
"entity_id": [
|
||||
"alarm_control_panel.alarmo"
|
||||
]
|
||||
},
|
||||
"data": {
|
||||
"code": "xxx"
|
||||
}
|
||||
},
|
||||
{
|
||||
"service": "alarm_control_panel.alarm_arm_away",
|
||||
"data": {},
|
||||
"target": {
|
||||
"entity_id": "alarm_control_panel.blink_home"
|
||||
}
|
||||
}
|
||||
],
|
||||
}
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
|
||||
export const BadAutmations = Template.bind({})
|
||||
BadAutmations.args = {
|
||||
...BadAutmations.args,
|
||||
automations: [
|
||||
{
|
||||
"metadata": {
|
||||
"alias": "Set Thermostat to 76 at 8am",
|
||||
"description": "",
|
||||
"mode": "single",
|
||||
} as any,
|
||||
"trigger": [
|
||||
{
|
||||
"at": "08:00:00",
|
||||
"platform": "time"
|
||||
}
|
||||
],
|
||||
"condition": [
|
||||
{
|
||||
"condition": "state",
|
||||
"entity_id": "climate.thermostat",
|
||||
"state": "cool"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"data": {
|
||||
"temperature": 76
|
||||
},
|
||||
"service": "climate.set_temperature",
|
||||
"target": {
|
||||
"entity_id": "climate.thermostat"
|
||||
}
|
||||
}
|
||||
],
|
||||
"tags": {},
|
||||
},
|
||||
{
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "Bad Choose Sequence",
|
||||
alias: "Bad Choose",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
'wowo': '!'
|
||||
},
|
||||
mode: 'single',
|
||||
},
|
||||
trigger: [],
|
||||
sequence: [
|
||||
{
|
||||
choose: {}
|
||||
}
|
||||
] as any
|
||||
},
|
||||
{
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Bad Trigger",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
'wowo': '!'
|
||||
},
|
||||
mode: 'single',
|
||||
},
|
||||
trigger: [
|
||||
"haha I am a string"
|
||||
] as any,
|
||||
sequence: []
|
||||
},
|
||||
{
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
} as any,
|
||||
trigger: [
|
||||
],
|
||||
sequence: []
|
||||
}
|
||||
],
|
||||
}
|
||||
@@ -10,10 +10,12 @@
|
||||
flex: 1;
|
||||
user-select: none;
|
||||
}
|
||||
.automation-list-box--body > * {
|
||||
|
||||
.automation-list-box--body>* {
|
||||
padding-top: 0.5em;
|
||||
padding-bottom: 0.5em;
|
||||
}
|
||||
|
||||
.automation-list-box--body--group {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -21,33 +23,37 @@
|
||||
border-radius: 10px;
|
||||
padding-bottom: 0.5em;
|
||||
border-width: 1px;
|
||||
border-bottom-style: solid ;
|
||||
border-bottom-style: solid;
|
||||
border-color: white;
|
||||
}
|
||||
.automation-list-box--body--group > .automation-list-box--body--group {
|
||||
border-left-style: solid ;
|
||||
|
||||
.automation-list-box--body--group>.automation-list-box--body--group {
|
||||
border-left-style: solid;
|
||||
border-top-left-radius: 0;
|
||||
margin-left: 0.75em;
|
||||
padding-left: 0.5em;
|
||||
}
|
||||
|
||||
.automation-list-box--body--group > b {
|
||||
.automation-list-box--body--group>b {
|
||||
width: 100%;
|
||||
cursor: pointer;
|
||||
padding: 0.1em;
|
||||
}
|
||||
.automation-list-box--body--group > b:hover {
|
||||
|
||||
.automation-list-box--body--group>b:hover {
|
||||
background-color: var(--secondary-accent);
|
||||
color: var(--secondary);
|
||||
}
|
||||
|
||||
.automation-list-box--body--item:hover {
|
||||
.automation-list-box--body--item:hover, .automation-list-box--body--item.selected {
|
||||
background-color: var(--primary-accent);
|
||||
color: var(--primary);
|
||||
}
|
||||
.automation-list-box--body--item:hover > .automation-list-box--body--item--tags > span {
|
||||
|
||||
.automation-list-box--body--item:hover>.automation-list-box--body--item--tags>span {
|
||||
border-color: var(--primary);
|
||||
}
|
||||
|
||||
.automation-list-box--body--item {
|
||||
padding-left: 1em;
|
||||
cursor: pointer;
|
||||
@@ -57,25 +63,31 @@
|
||||
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 {
|
||||
|
||||
.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 {
|
||||
|
||||
.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 {
|
||||
|
||||
.automation-list-box--body--item>button {
|
||||
padding: 0.25em !important;
|
||||
margin: 0.5em !important;
|
||||
}
|
||||
|
||||
.automation-list-box--body--item--tags {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
@@ -87,13 +99,15 @@
|
||||
max-height: 100%;
|
||||
gap: 0.25em;
|
||||
}
|
||||
.automation-list-box--body--item--tags > span {
|
||||
|
||||
.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;
|
||||
@@ -102,7 +116,8 @@
|
||||
justify-content: space-around;
|
||||
align-items: center;
|
||||
}
|
||||
.automation-list-box--bottom > button {
|
||||
|
||||
.automation-list-box--bottom>button {
|
||||
background-color: #070;
|
||||
color: var(--primary-accent);
|
||||
padding: 0.5em 2em;
|
||||
|
||||
@@ -13,10 +13,12 @@ export default {
|
||||
|
||||
|
||||
const Template: ComponentStory<typeof AutomationListBox> = args => {
|
||||
const [autos, setAutos] = useState(args.automations)
|
||||
console.log({ args })
|
||||
const [selected, setSelected] = useState(args.selected)
|
||||
return <div className="page">
|
||||
<AutomationListBox {...args} automations={autos} />
|
||||
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
|
||||
setSelected(i)
|
||||
args.onSelectAutomation(i)
|
||||
}} />
|
||||
</div>
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import "./AutomationListBox.css";
|
||||
import { FC, useState } from 'react';
|
||||
import { AutomationData } from "types/automations";
|
||||
import { AutomationData, AutomationMetadata } from "types/automations";
|
||||
import InputMultiSelect from "components/Inputs/InputMultiSelect";
|
||||
import InputText from "components/Inputs/InputText";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
@@ -9,6 +9,7 @@ import { TrashIcon } from "components/Icons";
|
||||
|
||||
export type Props = {
|
||||
automations: AutomationData[];
|
||||
selected: number;
|
||||
onSelectAutomation: (i: number) => void;
|
||||
onRemove: (i: number) => void;
|
||||
onAdd: () => void;
|
||||
@@ -16,6 +17,7 @@ export type Props = {
|
||||
|
||||
export const AutomationListBox: FC<Props> = ({
|
||||
automations,
|
||||
selected,
|
||||
onSelectAutomation,
|
||||
onAdd,
|
||||
onRemove,
|
||||
@@ -23,9 +25,9 @@ export const AutomationListBox: FC<Props> = ({
|
||||
|
||||
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);
|
||||
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]);
|
||||
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags);
|
||||
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selectedTagIdx, tags);
|
||||
|
||||
return <div className="automation-list-box">
|
||||
<div className="automation-list-box--nav">
|
||||
@@ -36,14 +38,14 @@ export const AutomationListBox: FC<Props> = ({
|
||||
/>
|
||||
<InputMultiSelect
|
||||
label="Tags"
|
||||
selected={selected}
|
||||
onChange={setSelected}
|
||||
selected={selectedTagIdx}
|
||||
onChange={setSelectedTagIdx}
|
||||
options={tags}
|
||||
max={3}
|
||||
/>
|
||||
</div>
|
||||
<div className="automation-list-box--body">
|
||||
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove)}
|
||||
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove, selected)}
|
||||
</div>
|
||||
<div className="automation-list-box--bottom">
|
||||
<Button onClick={onAdd}>Add</Button>
|
||||
@@ -63,11 +65,14 @@ export const getTagList = (autos: AutomationData[]): string[] => Object.keys(aut
|
||||
}, {}))
|
||||
|
||||
const filterAutomations = (autos: AutomationData[], searchText: string, selected: number[], tags: string[]): Array<[AutomationData, number]> => autos.map<[AutomationData, number]>((a, i) => [a, i]).filter(([a, i]) => {
|
||||
if (!a.metadata) {
|
||||
return true
|
||||
}
|
||||
if (searchText.length > 0) {
|
||||
if (
|
||||
!(
|
||||
a.metadata.description.toLocaleLowerCase().includes(searchText) ||
|
||||
a.metadata.alias.toLocaleLowerCase().includes(searchText)
|
||||
(a.metadata.description ?? "").toLocaleLowerCase().includes(searchText) ||
|
||||
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
|
||||
)
|
||||
) {
|
||||
return false
|
||||
@@ -123,29 +128,22 @@ const convertGroupsToItems = (
|
||||
autos: Array<[AutomationData, number]>,
|
||||
onSelectAutomation: (i: number) => void,
|
||||
onRemove: (i: number) => void,
|
||||
selected: number,
|
||||
) => {
|
||||
if (Array.isArray(groups)) {
|
||||
return groups.map(i => {
|
||||
const [auto, autoIndex] = autos[i];
|
||||
let title = "BadAuto<<Missing Metadata>>"
|
||||
if (auto.metadata) {
|
||||
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`
|
||||
}
|
||||
return <div
|
||||
key={i}
|
||||
className="automation-list-box--body--item"
|
||||
title={`Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`}
|
||||
className={["automation-list-box--body--item", selected === autoIndex ? 'selected' : ''].join(' ')}
|
||||
title={title}
|
||||
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>
|
||||
<MetadataBox metadata={auto.metadata} tags={auto.tags} />
|
||||
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
|
||||
</div>
|
||||
})
|
||||
@@ -158,11 +156,37 @@ const convertGroupsToItems = (
|
||||
autos={autos}
|
||||
onSelectAutomation={onSelectAutomation}
|
||||
onRemove={onRemove}
|
||||
selected={selected}
|
||||
/>
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
export const MetadataBox: FC<{
|
||||
metadata: AutomationMetadata,
|
||||
tags: Record<string, string>,
|
||||
}> = (auto) => {
|
||||
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
|
||||
if (auto.metadata) {
|
||||
title = <>
|
||||
<b>{String(auto.metadata.alias ?? "").slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
|
||||
<span>{String(auto.metadata.description ?? "").slice(0, 25)}</span>
|
||||
</>
|
||||
}
|
||||
return <div
|
||||
className="automation-list-box--body--item--title"
|
||||
>
|
||||
{title}
|
||||
<div
|
||||
className="automation-list-box--body--item--tags"
|
||||
>
|
||||
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
|
||||
<b>{tagName}:</b> {auto.tags[tagName]}
|
||||
</span>)}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
|
||||
const AutomationListBoxGroup: FC<{
|
||||
groupName: string,
|
||||
@@ -170,16 +194,18 @@ const AutomationListBoxGroup: FC<{
|
||||
autos: Array<[AutomationData, number]>,
|
||||
onSelectAutomation: (i: number) => void,
|
||||
onRemove: (i: number) => void;
|
||||
selected: number,
|
||||
}> = ({
|
||||
groupName,
|
||||
groups,
|
||||
autos,
|
||||
onSelectAutomation,
|
||||
onRemove,
|
||||
selected,
|
||||
}) => {
|
||||
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)}
|
||||
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove, selected)}
|
||||
</div>
|
||||
}
|
||||
@@ -2,7 +2,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { ConnectedAutomationList } from ".";
|
||||
import { createMockAuto } from "utils/mocks";
|
||||
import { useMockApiService } from "apiService";
|
||||
import { DEFAULT_DIMS } from 'components/DAGSvgs/constants';
|
||||
import { DEFAULT_DIMS } from 'components/DAGFlow/constants';
|
||||
|
||||
export default {
|
||||
title: 'App/AutomationList/Connected',
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
|
||||
.automation-list--list {
|
||||
flex: 1;
|
||||
min-width: 400px;
|
||||
max-width: 400px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
/* none-hidden */
|
||||
.automation-list--root.mobile {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile>.automation-list--list {
|
||||
max-width: 100vw;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-editor {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-list--list-hide {
|
||||
transform: rotate(90deg);
|
||||
left: 1.25em;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-editor--info-box {
|
||||
min-width: 100vw;
|
||||
min-height: calc(100vh - 5em);
|
||||
max-width: 100vw;
|
||||
max-height: calc(100vh - 5em);
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-editor--info-box-inner {
|
||||
margin-top: 2.5em;
|
||||
padding-left: 0.5em;
|
||||
padding-right: 0.5em;
|
||||
margin-bottom: 2em;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-editor--info-box--icon {
|
||||
left: 1.25em;
|
||||
bottom: 0em;
|
||||
background-color: var(--primary);
|
||||
transform: rotate(90deg);
|
||||
}
|
||||
|
||||
|
||||
/* list hide */
|
||||
.automation-list--root.mobile .automation-list--list.hide {
|
||||
width: 100vw;
|
||||
min-height: 0;
|
||||
max-height: 0;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
|
||||
transform: rotate(270deg);
|
||||
position: fixed;
|
||||
top: 0.75em;
|
||||
z-index: 20;
|
||||
}
|
||||
|
||||
/* info box hide */
|
||||
.automation-list--root.mobile .automation-editor--info-box.hide {
|
||||
width: 100vw;
|
||||
min-height: 0;
|
||||
max-height: 0;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon {
|
||||
transform: rotate(270deg);
|
||||
position: fixed;
|
||||
top: 0.75em;
|
||||
background-color: var(--green-opaque);
|
||||
z-index: 30;
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import "./index.css";
|
||||
import "./index.mobile.css";
|
||||
import { AutomationEditor } from "components/AutomationEditor";
|
||||
import { FC, useState } from "react";
|
||||
import { AutomationData } from "types/automations";
|
||||
@@ -8,6 +9,7 @@ import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||
import { ApiService } from "apiService/core";
|
||||
import { AutomationListBox } from "./AutomationListBox";
|
||||
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
|
||||
import useWindowSize from "utils/useWindowSize";
|
||||
|
||||
|
||||
interface AutomationListParams {
|
||||
@@ -29,19 +31,25 @@ export const AutomationList: FC<AutomationListParams> = ({
|
||||
// state
|
||||
const [hideList, setHideList] = useState(false);
|
||||
const [current, setCurrent] = useState(0);
|
||||
const { isMobile } = useWindowSize();
|
||||
// alias
|
||||
const currentAuto = automations.length > 0 ? automations[current] : null;
|
||||
const automationListListCls = "automation-list--list" + (hideList ? " hide" : " show")
|
||||
// render
|
||||
return <div className="automation-list--root">
|
||||
<div className={automationListListCls}>
|
||||
return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}>
|
||||
<div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}>
|
||||
<AutomationListBox
|
||||
automations={automations}
|
||||
onAdd={() => {
|
||||
onAdd(defaultAutomation(`shortu-${automations.length}`));
|
||||
onAdd(defaultAutomation(String(Date.now())));
|
||||
setCurrent(automations.length)
|
||||
}}
|
||||
onSelectAutomation={setCurrent}
|
||||
onSelectAutomation={i => {
|
||||
setCurrent(i);
|
||||
if (isMobile) {
|
||||
setHideList(true)
|
||||
}
|
||||
}}
|
||||
selected={current}
|
||||
onRemove={onRemove}
|
||||
/>
|
||||
<ButtonIcon
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { FC } from "react";
|
||||
import { AddIcon, PencilIcon, TrashIcon } from '../Icons/index';
|
||||
import { AddIcon, TrashIcon } from '../Icons/index';
|
||||
import { useCircleStyles } from './styles';
|
||||
import { Handle, Position, XYPosition } from 'react-flow-renderer';
|
||||
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
.dagnode-error {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: flex-end;
|
||||
font-size: 0.85em;
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
.dagnode-error.open .dagnode-error--inner {
|
||||
align-items: flex-start;
|
||||
padding-top: 1em;
|
||||
}
|
||||
|
||||
.dagnode-error--inner {
|
||||
position: relative;
|
||||
flex: 1;
|
||||
|
||||
/* internal positioning */
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
gap: 0.5em;
|
||||
|
||||
/* shape */
|
||||
background-color: var(--error-dark);
|
||||
border-radius: 1em;
|
||||
height: 100%;
|
||||
max-height: 100%;
|
||||
max-width: 100%;
|
||||
margin-top: 2.5px;
|
||||
margin-bottom: 2.5px;
|
||||
border-top-width: 1px;
|
||||
border-top-style: solid;
|
||||
border-top-left-radius: 10px;
|
||||
border-top-right-radius: 10px;
|
||||
border-top-color: var(--error);
|
||||
}
|
||||
|
||||
.dagnode-error--inner:hover {
|
||||
background-color: var(--error-accent);
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
.dagnode-error--inner--edit-icon:hover {
|
||||
transform: rotate(180deg);
|
||||
cursor: pointer;
|
||||
background-color: var(--error);
|
||||
padding: 0.5em;
|
||||
border-radius: 10px;
|
||||
height: 0.25em;
|
||||
width: 0.25em;
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
|
||||
|
||||
import React from "react";
|
||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||
import { DAGAutomationFlow } from '.';
|
||||
import * as dgconst from "components/DAGFlow/constants";
|
||||
import ReactFlow, { Controls } from 'react-flow-renderer';
|
||||
import { DAGErrorNode } from "./DAGErrorNode";
|
||||
import { convertToFlowNode } from "./helpers";
|
||||
|
||||
|
||||
export default {
|
||||
title: 'DAGAutomationFlow/Viewer/DAGErrorNode',
|
||||
component: DAGAutomationFlow,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
args: {
|
||||
"height": dgconst.NODE_HEIGHT,
|
||||
"width": dgconst.NODE_WIDTH,
|
||||
}
|
||||
} as ComponentMeta<typeof DAGErrorNode>
|
||||
|
||||
export const Examples: ComponentStory<typeof DAGErrorNode> = args => {
|
||||
const nodes = ["1", "2", "3", "4"].map((id, i) => ({
|
||||
"data": args,
|
||||
"id": id,
|
||||
"type": "mynode",
|
||||
"position": {
|
||||
"x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i,
|
||||
"y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i
|
||||
}
|
||||
}));
|
||||
return <div className="page">
|
||||
<ReactFlow
|
||||
defaultNodes={nodes}
|
||||
nodeTypes={{
|
||||
"mynode": convertToFlowNode(DAGErrorNode)
|
||||
}}
|
||||
snapToGrid
|
||||
onlyRenderVisibleElements
|
||||
nodesConnectable={false}
|
||||
nodesDraggable={false}
|
||||
>
|
||||
<Controls />
|
||||
</ReactFlow>
|
||||
</div>
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
import "./DAGErrorNode.css";
|
||||
import { Handle, Position } from 'react-flow-renderer';
|
||||
import { FC } from 'react';
|
||||
import { InfoIcon, PencilIcon } from 'components/Icons';
|
||||
|
||||
|
||||
export interface DAGErrorNodeProps {
|
||||
height: number;
|
||||
width: number;
|
||||
hasInput?: boolean;
|
||||
error?: any,
|
||||
onEdit: () => void;
|
||||
}
|
||||
export const DAGErrorNode: FC<DAGErrorNodeProps> = ({
|
||||
height, width, hasInput, error, onEdit
|
||||
}) => {
|
||||
// render
|
||||
return <>
|
||||
{hasInput && <Handle type="target" position={Position.Left} />}
|
||||
<Handle type="source" position={Position.Right} />
|
||||
<div className={["dagnode-error"].join(' ')} style={{
|
||||
height,
|
||||
width,
|
||||
maxHeight: height,
|
||||
maxWidth: width,
|
||||
}}>
|
||||
<div className={"dagnode-error--inner"} title={String(error)}>
|
||||
<InfoIcon color="var(--error-light)" size={1.25} />
|
||||
Invalid Node
|
||||
<PencilIcon className="dagnode-error--inner--edit-icon" size={1.25} onClick={onEdit} />
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
|
||||
|
||||
import React from "react";
|
||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||
import { DAGAutomationFlow } from '.';
|
||||
import { useState } from 'react';
|
||||
import * as dgconst from "components/DAGFlow/constants";
|
||||
import ReactFlow, { Controls } from 'react-flow-renderer';
|
||||
import { DAGNode } from "./DAGNode";
|
||||
import { convertToFlowNode } from "./helpers";
|
||||
|
||||
|
||||
export default {
|
||||
title: 'DAGAutomationFlow/Viewer/DAGNode',
|
||||
component: DAGAutomationFlow,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
args: {
|
||||
"color": "lblue",
|
||||
"height": dgconst.NODE_HEIGHT,
|
||||
"width": dgconst.NODE_WIDTH,
|
||||
"label": "test",
|
||||
"hasInput": true,
|
||||
}
|
||||
} as ComponentMeta<typeof DAGNode>
|
||||
|
||||
export const Colors: ComponentStory<typeof DAGNode> = args => {
|
||||
const nodes = ["blue", "red", "green", "lblue"].map((color, i) => ({
|
||||
"data": { ...args, color },
|
||||
"id": color,
|
||||
"type": "mynode",
|
||||
"position": { "x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i, "y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i }
|
||||
}));
|
||||
return <div className="page">
|
||||
<ReactFlow
|
||||
defaultNodes={nodes}
|
||||
nodeTypes={{
|
||||
"mynode": convertToFlowNode(DAGNode)
|
||||
}}
|
||||
snapToGrid
|
||||
onlyRenderVisibleElements
|
||||
nodesConnectable={false}
|
||||
nodesDraggable={false}
|
||||
>
|
||||
<Controls />
|
||||
</ReactFlow>
|
||||
</div>
|
||||
}
|
||||
@@ -15,17 +15,15 @@ export interface DAGNodeProps {
|
||||
hasInput?: boolean;
|
||||
accentBackground?: boolean;
|
||||
}
|
||||
export const DAGNode: FC<{ data: DAGNodeProps }> = ({
|
||||
data: {
|
||||
label,
|
||||
height,
|
||||
width,
|
||||
onXClick,
|
||||
onEditClick = () => { },
|
||||
color,
|
||||
hasInput = false,
|
||||
accentBackground = false,
|
||||
},
|
||||
export const DAGNode: FC<DAGNodeProps> = ({
|
||||
label,
|
||||
height,
|
||||
width,
|
||||
onXClick,
|
||||
onEditClick = () => { },
|
||||
color,
|
||||
hasInput = false,
|
||||
accentBackground = false,
|
||||
}) => {
|
||||
const { classes, theme } = useNodeStyles({
|
||||
color,
|
||||
@@ -46,9 +44,7 @@ export const DAGNode: FC<{ data: DAGNodeProps }> = ({
|
||||
{label}
|
||||
</span>
|
||||
</div>
|
||||
<div className={classes.rightEdge} onClick={() => {
|
||||
console.log('editing me', label, onEditClick, onEditClick())
|
||||
}}>
|
||||
<div className={classes.rightEdge} onClick={onEditClick}>
|
||||
<button className={classes.buttonEdit}>
|
||||
<PencilIcon size={1.1} color={theme.green} />
|
||||
</button>
|
||||
|
||||
File renamed without changes.
@@ -1,5 +1,5 @@
|
||||
import { makeFlowCircle } from "./DAGCircle"
|
||||
import { DAGAutomationFlowDims, FlowData } from "./types"
|
||||
import { DAGAutomationFlowDims } from "./types"
|
||||
import { XYPosition } from 'react-flow-renderer';
|
||||
|
||||
export const makeAddButton = (
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
import { FC } from 'react';
|
||||
|
||||
|
||||
export const convertToFlowNode = <D extends {}>(
|
||||
Component: FC<D>
|
||||
): FC<{ data: D }> =>
|
||||
({ data }) => {
|
||||
return <Component {...data} />
|
||||
}
|
||||
@@ -4,7 +4,7 @@ import React from "react";
|
||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||
import { DAGAutomationFlow } from '.';
|
||||
import { useState } from 'react';
|
||||
import * as dgconst from "components/DAGSvgs/constants";
|
||||
import * as dgconst from "components/DAGFlow/constants";
|
||||
|
||||
|
||||
export default {
|
||||
@@ -27,7 +27,6 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
|
||||
{...args}
|
||||
{...state}
|
||||
onTriggerUpdate={trigger => {
|
||||
console.log({ trigger })
|
||||
setState({ ...state, trigger })
|
||||
}}
|
||||
onSequenceUpdate={sequence => setState({ ...state, sequence })}
|
||||
@@ -211,3 +210,24 @@ EmptyStart.args = {
|
||||
trigger: [],
|
||||
sequence: []
|
||||
}
|
||||
|
||||
|
||||
export const Errors = Template.bind({})
|
||||
Errors.args = {
|
||||
...Errors.args,
|
||||
condition: [
|
||||
{
|
||||
"condition": "numeric_state",
|
||||
} as any
|
||||
],
|
||||
trigger: [
|
||||
{
|
||||
"platform": "event",
|
||||
} as any
|
||||
],
|
||||
sequence: [
|
||||
{
|
||||
"choose": {}
|
||||
} as any
|
||||
]
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
import { FC, useState } from "react";
|
||||
|
||||
import ReactFlow, { MiniMap, Controls } from 'react-flow-renderer';
|
||||
import ReactFlow, { Controls } from 'react-flow-renderer';
|
||||
import { AutomationSequenceNode } from "types/automations";
|
||||
import { AutomationTrigger } from 'types/automations/triggers';
|
||||
import { triggerToFlow } from "./triggerConvertor";
|
||||
@@ -14,13 +14,27 @@ import { MultiNodeEditor } from "components/MultiNodeEditors";
|
||||
import { Modal } from "components/Modal";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { makeConditionPoint } from "./flowDataMods";
|
||||
import { convertToFlowNode } from "./helpers";
|
||||
import { DAGErrorNode } from "./DAGErrorNode";
|
||||
|
||||
const nodeTypes = {
|
||||
'dagnode': DAGNode,
|
||||
'dagnode': convertToFlowNode(DAGNode),
|
||||
'errornode': convertToFlowNode(DAGErrorNode),
|
||||
'dagcircle': DAGCircle,
|
||||
}
|
||||
|
||||
interface Props {
|
||||
const makeOnEditAutomationConditions = (
|
||||
conditions: AutomationCondition[],
|
||||
updateConditions: (c: AutomationCondition[]) => void,
|
||||
openModal: UpdateModalState,
|
||||
) => () => openModal({
|
||||
single: false,
|
||||
node: conditions,
|
||||
allowedTypes: ['condition'],
|
||||
update: c => updateConditions(c as any),
|
||||
})
|
||||
|
||||
export interface DAGAutomationFlowProps {
|
||||
className?: string;
|
||||
trigger: AutomationTrigger[];
|
||||
condition: AutomationCondition[];
|
||||
@@ -31,7 +45,7 @@ interface Props {
|
||||
onConditionUpdate: (s: AutomationCondition[]) => void;
|
||||
}
|
||||
|
||||
export const DAGAutomationFlow: FC<Props> = ({
|
||||
export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
|
||||
className,
|
||||
trigger,
|
||||
condition,
|
||||
@@ -50,6 +64,7 @@ export const DAGAutomationFlow: FC<Props> = ({
|
||||
if (modalState.single) {
|
||||
modalBody = <NodeEditor
|
||||
node={modalState.node}
|
||||
isErrored={modalState.isError}
|
||||
onClose={() => setModalState(null)}
|
||||
onSave={n => { modalState.update(n as any); setModalState(null); }}
|
||||
allowedTypes={modalState.allowedTypes}
|
||||
@@ -112,7 +127,6 @@ export const DAGAutomationFlow: FC<Props> = ({
|
||||
},
|
||||
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
|
||||
);
|
||||
|
||||
// render
|
||||
return <>
|
||||
<Modal open={!!modalState}>
|
||||
@@ -127,19 +141,7 @@ export const DAGAutomationFlow: FC<Props> = ({
|
||||
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,4 @@
|
||||
.dag-flow-safe {
|
||||
height: 100%;
|
||||
overflow: scroll;
|
||||
}
|
||||
@@ -0,0 +1,84 @@
|
||||
import "./safe.css";
|
||||
import { Component, ErrorInfo } from "react";
|
||||
import { DAGAutomationFlow, DAGAutomationFlowProps } from ".";
|
||||
import { AutomationSequenceNode } from "types/automations";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { AutomationTrigger } from 'types/automations/triggers';
|
||||
import InputYaml from "components/Inputs/InputYaml";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
|
||||
type GoodState = {
|
||||
hasError: false;
|
||||
}
|
||||
type FailedStateData = {
|
||||
sequence: AutomationSequenceNode[],
|
||||
condition: AutomationCondition[],
|
||||
trigger: AutomationTrigger[],
|
||||
}
|
||||
type FailedState = {
|
||||
hasError: true,
|
||||
error: any,
|
||||
errorInfo?: ErrorInfo,
|
||||
} & FailedStateData
|
||||
type State = GoodState | FailedState
|
||||
export class SafeDAGAutomationFlow extends Component<DAGAutomationFlowProps, State> {
|
||||
|
||||
state: State = {
|
||||
hasError: false
|
||||
}
|
||||
|
||||
componentDidCatch(error: Error, errorInfo: ErrorInfo) {
|
||||
this.setState({
|
||||
hasError: true,
|
||||
error,
|
||||
errorInfo,
|
||||
sequence: this.props.sequence,
|
||||
condition: this.props.condition,
|
||||
trigger: this.props.trigger,
|
||||
})
|
||||
}
|
||||
|
||||
render() {
|
||||
if (this.state.hasError) {
|
||||
const makeSet = <K extends keyof FailedStateData>(k: K) => (d: FailedStateData[K]) => this.setState({
|
||||
...this.state,
|
||||
[k]: d,
|
||||
});
|
||||
const makeSave = <K extends keyof FailedStateData>(k: K) => () => {
|
||||
if (!this.state.hasError) {
|
||||
return
|
||||
}
|
||||
if (k === 'condition') {
|
||||
this.props.onConditionUpdate(this.state.condition)
|
||||
} else if (k === 'sequence') {
|
||||
this.props.onSequenceUpdate(this.state.sequence)
|
||||
} else if (k === 'trigger') {
|
||||
this.props.onTriggerUpdate(this.state.trigger)
|
||||
}
|
||||
}
|
||||
return <div className="dag-flow-safe">
|
||||
<h1>An Error has occured.</h1>
|
||||
|
||||
<h1>Failed to Open Autmation!</h1>
|
||||
Something is likely not configured in your automation properly.
|
||||
<hr />
|
||||
<h2>Error:</h2>
|
||||
<h2>{String(this.state.error)}</h2>
|
||||
<br />
|
||||
{JSON.stringify(this.state.error, null, 4)}
|
||||
{this.state.errorInfo && this.state.errorInfo.componentStack.split('\n').map((s, i) => <>
|
||||
<span key={i}>{s}</span><br key={`br-${i}`} />
|
||||
</>)}
|
||||
<h2>Automation YAML</h2>
|
||||
<InputYaml resizable label="Trigger" value={this.state.trigger} onChange={makeSet('trigger')} />
|
||||
<Button onClick={makeSave('trigger')}>Save Triggers</Button>
|
||||
<InputYaml resizable label="Condition" value={this.state.condition} onChange={makeSet('condition')} />
|
||||
<Button onClick={makeSave('condition')}>Save Conditions</Button>
|
||||
<InputYaml resizable label="Action" value={this.state.sequence} onChange={makeSet('sequence')} />
|
||||
<Button onClick={makeSave('sequence')}>Save Actions</Button>
|
||||
</div>
|
||||
}
|
||||
|
||||
return <DAGAutomationFlow {...this.props} />;
|
||||
}
|
||||
}
|
||||
@@ -38,7 +38,14 @@ export const sequenceToFlow = (
|
||||
// draw node
|
||||
if (getNodeType(node) === 'action') {
|
||||
if ('choose' in node) {
|
||||
position = addChooseNode(flowData, node, position, nodeId, dims, updater, i)
|
||||
try {
|
||||
const out = addChooseNode(node, position, nodeId, dims, updater, i);
|
||||
position = out.lastPos
|
||||
flowData = mergeFlowDatas(flowData, out.flowData);
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
addErrorNode(flowData, nodeId, position, dims, err, updater.makeOnEditForBadNode(i));
|
||||
}
|
||||
} else {
|
||||
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||
@@ -56,6 +63,7 @@ export const sequenceToFlow = (
|
||||
lastPointId = nodeId;
|
||||
lasPos = position;
|
||||
}
|
||||
|
||||
// add button
|
||||
const addCircle = makeAddButton(
|
||||
`${prefix}-+`,
|
||||
@@ -117,10 +125,33 @@ const addSingleNode = (
|
||||
position,
|
||||
});
|
||||
|
||||
const addErrorNode = (
|
||||
flowData: FlowData,
|
||||
nodeId: string,
|
||||
position: XYPosition,
|
||||
{
|
||||
nodeHeight,
|
||||
nodeWidth,
|
||||
}: DAGAutomationFlowDims,
|
||||
error: any,
|
||||
onEdit: () => void,
|
||||
hasInput: boolean = true,
|
||||
) => flowData.nodes.push({
|
||||
id: nodeId,
|
||||
type: 'errornode',
|
||||
position,
|
||||
data: {
|
||||
height: nodeHeight,
|
||||
width: nodeWidth,
|
||||
hasInput,
|
||||
onEdit,
|
||||
error,
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
|
||||
const addChooseNode = (
|
||||
flowData: FlowData,
|
||||
node: ChooseAction,
|
||||
position: XYPosition,
|
||||
nodeId: string,
|
||||
@@ -128,6 +159,10 @@ const addChooseNode = (
|
||||
updater: SequenceUpdater,
|
||||
i: number,
|
||||
) => {
|
||||
const flowData: FlowData = {
|
||||
nodes: [],
|
||||
edges: [],
|
||||
};
|
||||
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||
onXClick: () => updater.removeNode(i),
|
||||
@@ -209,7 +244,7 @@ const addChooseNode = (
|
||||
}, { size: dims.circleSize })
|
||||
flowData.nodes.push(elseCircle)
|
||||
addEdge(flowData, nodeId, elseCircle.id, true)
|
||||
const lastPoint = sequenceToFlow(flowData, node.default, elseCircle.id, {
|
||||
const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, {
|
||||
...dims,
|
||||
padding: {
|
||||
x: position.x - dims.nodeWidth,
|
||||
@@ -221,5 +256,11 @@ const addChooseNode = (
|
||||
} else {
|
||||
lastPos = xyApply(lastPos, elseCircle.position, Math.max)
|
||||
}
|
||||
return lastPos
|
||||
return { lastPos, flowData }
|
||||
}
|
||||
|
||||
export const mergeFlowDatas = (fd1: FlowData, fd2: FlowData): FlowData => {
|
||||
fd1.edges = fd1.edges.concat(fd2.edges);
|
||||
fd1.nodes = fd1.nodes.concat(fd2.nodes);
|
||||
return fd1
|
||||
}
|
||||
@@ -78,6 +78,7 @@ export const useNodeStyles = createAppUseStyles<{
|
||||
textOverflow: 'ellipsis',
|
||||
overflow: "hidden",
|
||||
whiteSpace: "break-spaces",
|
||||
lineBreak: "anywhere",
|
||||
cursor: 'default',
|
||||
},
|
||||
buttonDelete: {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { AutomationTrigger } from 'types/automations/triggers';
|
||||
import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from './types';
|
||||
import { makeFlowCircle } from './DAGCircle';
|
||||
import { makeAddButton } from './flowDataMods';
|
||||
import { getDescriptionFromAutomationNode } from 'utils/formatting';
|
||||
|
||||
export const triggerToFlow = (
|
||||
flowData: FlowData,
|
||||
@@ -14,7 +14,6 @@ export const triggerToFlow = (
|
||||
distanceFactor,
|
||||
nodeHeight,
|
||||
nodeWidth,
|
||||
circleSize,
|
||||
padding,
|
||||
conditionHeight,
|
||||
} = dims;
|
||||
@@ -25,7 +24,7 @@ export const triggerToFlow = (
|
||||
id: flowId,
|
||||
type: 'dagnode',
|
||||
data: {
|
||||
label: t.alias ?? t.platform,
|
||||
label: getDescriptionFromAutomationNode(t),
|
||||
height: nodeHeight,
|
||||
width: nodeWidth,
|
||||
color: 'red',
|
||||
|
||||
@@ -4,6 +4,7 @@ import { DAGCircleProps } from './DAGCircle';
|
||||
import { DAGNodeProps } from './DAGNode';
|
||||
import { AutomationTrigger } from 'types/automations/triggers';
|
||||
import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
|
||||
import { DAGErrorNodeProps } from './DAGErrorNode';
|
||||
|
||||
|
||||
export type DAGAutomationFlowDims = {
|
||||
@@ -16,7 +17,7 @@ export type DAGAutomationFlowDims = {
|
||||
distanceFactor: number;
|
||||
}
|
||||
|
||||
export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | any>;
|
||||
export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | DAGErrorNodeProps | any>;
|
||||
export type FlowData = {
|
||||
nodes: DAGAutomationFlowNode[],
|
||||
edges: Edge[],
|
||||
@@ -34,6 +35,7 @@ export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigge
|
||||
|
||||
export type ModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = {
|
||||
single: true,
|
||||
isError?: boolean,
|
||||
node: T
|
||||
update: (n: T) => void;
|
||||
saveBtnCreateText?: boolean;
|
||||
|
||||
@@ -11,7 +11,6 @@ const mockSequenceUpdater = (defaultState: AutomationSequenceNode[] = []) => {
|
||||
state,
|
||||
s => {
|
||||
state = s
|
||||
console.log(state, s)
|
||||
},
|
||||
ms => modalStates.push(ms)
|
||||
);
|
||||
|
||||
@@ -2,6 +2,7 @@ import { AutomationSequenceNode } from "types/automations";
|
||||
import { ChooseAction } from "types/automations/actions";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { UpdateModalState } from "./types";
|
||||
import { getNodeType } from '../../utils/automations';
|
||||
|
||||
export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>;
|
||||
|
||||
@@ -68,7 +69,7 @@ export const makeSequenceUpdater = (
|
||||
)
|
||||
} else {
|
||||
return makeSequenceUpdater(
|
||||
node.default,
|
||||
node.default ?? [],
|
||||
seq => this.updateNode(i, {
|
||||
...node,
|
||||
default: seq
|
||||
@@ -114,6 +115,16 @@ export const makeSequenceUpdater = (
|
||||
})
|
||||
}
|
||||
},
|
||||
makeOnEditForBadNode(i: number) {
|
||||
const node = sequence[i];
|
||||
return () => openModal({
|
||||
single: true,
|
||||
isError: true,
|
||||
node,
|
||||
allowedTypes: [getNodeType(node)],
|
||||
update: n => this.updateNode(i, n),
|
||||
})
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
@@ -10,6 +10,10 @@
|
||||
background-color: var(--secondary);
|
||||
}
|
||||
|
||||
.input-boolean.disabled:hover, .input-boolean.disabled:hover * {
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.input-boolean:hover, .input-boolean:hover * {
|
||||
cursor: pointer;
|
||||
background-color: var(--secondary-opaque);
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
import "./InputBoolean.css";
|
||||
import InputWrapper from "./InputWrapper";
|
||||
|
||||
export interface Props {
|
||||
label: string;
|
||||
value: boolean;
|
||||
onChange: (v: boolean) => void;
|
||||
disabled?: boolean;
|
||||
}
|
||||
export default function InputBoolean({
|
||||
label,
|
||||
value = false,
|
||||
onChange,
|
||||
disabled = false,
|
||||
}: Props) {
|
||||
return <div className="input-boolean" onClick={() => onChange(!value)}>
|
||||
<input type="checkbox" checked={value} onChange={() => { }} />
|
||||
return <div className={["input-boolean", disabled ? 'disabled' : ''].join(' ')} onClick={() => onChange(!value)}>
|
||||
<input type="checkbox" checked={value} onChange={() => { }} disabled={disabled} />
|
||||
<label>{label}</label>
|
||||
</div>
|
||||
}
|
||||
@@ -26,9 +26,6 @@ export const InputList: FC<Props<any>> = ({
|
||||
{...selattr} value={current}
|
||||
onChange={e => {
|
||||
e.preventDefault();
|
||||
console.log(e.currentTarget.id)
|
||||
console.log(e.currentTarget.value)
|
||||
console.log(e.currentTarget.innerHTML)
|
||||
if (e.currentTarget.id === 'invalid') {
|
||||
onChange(options[0])
|
||||
} else {
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
import { PropsWithChildren, useState } from "react";
|
||||
import { AutomationTime } from "types/automations/common";
|
||||
import { AutomationTime, AutomationTimeObject } from "types/automations/common";
|
||||
import { milisecondsToObject } from "utils/time";
|
||||
import InputWrapper from "./InputWrapper";
|
||||
import { useInputTimeStyles } from "./styles";
|
||||
import { convertStringToAutomationTimeObject } from 'utils/time';
|
||||
|
||||
export interface Props {
|
||||
textBoxFor?: string;
|
||||
label: string;
|
||||
value?: AutomationTime;
|
||||
onChange: (v?: AutomationTime) => void;
|
||||
onChange: (v?: AutomationTimeObject) => void;
|
||||
onEnter?: () => void;
|
||||
}
|
||||
export default function InputTime({
|
||||
@@ -21,11 +22,14 @@ export default function InputTime({
|
||||
}: PropsWithChildren<Props>) {
|
||||
let cleanValue = '';
|
||||
if (value) {
|
||||
if (typeof value === 'string') {
|
||||
value = convertStringToAutomationTimeObject(value);
|
||||
}
|
||||
const {
|
||||
hours,
|
||||
minutes,
|
||||
seconds,
|
||||
milliseconds,
|
||||
hours = 0,
|
||||
minutes = 0,
|
||||
seconds = 0,
|
||||
milliseconds = 0,
|
||||
} = value;
|
||||
cleanValue = [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':') + `.${String(milliseconds).padStart(3, '0')}`;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import * as yaml from "js-yaml";
|
||||
import { useState } from "react";
|
||||
import InputTextArea from "./InputTextArea";
|
||||
import { useDelayedFunction, useDelayEffect } from 'utils/useDelay';
|
||||
import { useDelayEffect } from 'utils/useDelay';
|
||||
|
||||
export interface Props<T extends {}> {
|
||||
label: string;
|
||||
@@ -24,7 +24,6 @@ export default function InputYaml<T>({
|
||||
});
|
||||
const setText = (t: string) => {
|
||||
try {
|
||||
console.log(yaml.dump(yaml.load(t)));
|
||||
setState({ text: t, error: undefined })
|
||||
} catch (_) {
|
||||
setState({ text: t, error: "! Invalid Yaml !" })
|
||||
|
||||
@@ -229,7 +229,10 @@ export const useInputTextAreaStyles = createAppUseStyles<{ resizable: boolean }>
|
||||
return {
|
||||
input: ({ resizable }) => ({
|
||||
...styles.input,
|
||||
resize: resizable ? 'both' : 'none'
|
||||
resize: resizable ? 'both' : 'none',
|
||||
minWidth: "calc(100% - 2em)",
|
||||
maxWidth: "calc(100% - 2em)",
|
||||
minHeight: "8em"
|
||||
})
|
||||
}
|
||||
});
|
||||
|
||||
@@ -44,7 +44,6 @@ export const InAModal: ComponentStory<typeof MultiNodeEditor> = props => {
|
||||
|
||||
const [open, setOpen] = useState(false);
|
||||
const [state, setState] = useState(props.sequence);
|
||||
console.log({ state })
|
||||
return <div className="page">
|
||||
<Button onClick={() => setOpen(!open)}>Open Editor</Button>
|
||||
<Modal open={open}>
|
||||
|
||||
@@ -27,7 +27,6 @@ export const useMultiNodeEditorState = (props: MultiNodeEditorProps) => {
|
||||
internalNodeModified,
|
||||
} = state;
|
||||
const setState = (a: MultiNodeEditorInternalState) => {
|
||||
console.log('setting state', a)
|
||||
_setState(a)
|
||||
}
|
||||
return {
|
||||
@@ -131,12 +130,12 @@ export const useMultiNodeEditorState = (props: MultiNodeEditorProps) => {
|
||||
})
|
||||
},
|
||||
onClose() {
|
||||
if (!multiNode.isSaved) {
|
||||
if (!multiNode.isSaved && multiNode.isModified) {
|
||||
if (!window.confirm("You haven't saved your work, are you ok with losing it?")) {
|
||||
return
|
||||
}
|
||||
props.onSave && props.onSave(slides)
|
||||
}
|
||||
props.onSave && props.onSave(slides)
|
||||
props.onClose && props.onClose()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
|
||||
"type": "",
|
||||
"subtype": "",
|
||||
"device_id": "",
|
||||
"entity_id": "",
|
||||
}),
|
||||
isReady: ({ alias }) => {
|
||||
return (alias !== '')
|
||||
@@ -33,6 +34,10 @@ export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
|
||||
...state,
|
||||
device_id
|
||||
})} />
|
||||
<InputText label="Entity" value={state.entity_id ?? ""} onChange={entity_id => setState({
|
||||
...state,
|
||||
entity_id
|
||||
})} />
|
||||
</>
|
||||
}
|
||||
}
|
||||
@@ -1,13 +1,14 @@
|
||||
import { OptionManager } from './OptionManager';
|
||||
import { AutomationTriggerTime } from 'types/automations/triggers';
|
||||
import InputTime from 'components/Inputs/InputTime';
|
||||
import { convertObjectToAutomationTimeString } from 'utils/time';
|
||||
|
||||
|
||||
export const TriggerTime: OptionManager<AutomationTriggerTime> = {
|
||||
defaultState: () => ({
|
||||
"alias": "",
|
||||
"platform": 'time',
|
||||
"at": {},
|
||||
"at": "",
|
||||
}),
|
||||
isReady: ({ alias }) => {
|
||||
return (alias !== '')
|
||||
@@ -19,7 +20,7 @@ export const TriggerTime: OptionManager<AutomationTriggerTime> = {
|
||||
value={state.at}
|
||||
onChange={_at => setState({
|
||||
...state,
|
||||
at: _at ?? {},
|
||||
at: _at ? convertObjectToAutomationTimeString(_at) : "00:00:00",
|
||||
})}
|
||||
/>
|
||||
</>
|
||||
|
||||
@@ -2,35 +2,42 @@ import { Dispatch, SetStateAction, useEffect, useState } from 'react';
|
||||
import { AutomationNode, AutomationNodeTypes } from 'types/automations';
|
||||
import { AutomationNodeSubtype } from 'types/automations';
|
||||
import { getOptionManager } from './getOptionManager';
|
||||
import { getNodeType, getSubTypeList } from 'utils/automations';
|
||||
import { getNodeSubType } from '../constants';
|
||||
import { getNodeType, getNodeSubType, getSubTypeList, validateNode } from 'utils/automations';
|
||||
import InputYaml from 'components/Inputs/InputYaml';
|
||||
|
||||
type UseState = <S>(s: S) => [S, Dispatch<SetStateAction<S>>]
|
||||
|
||||
const mockUseState: UseState = s => {
|
||||
return [s, () => { }]
|
||||
}
|
||||
|
||||
export const useEditorNodeState = (originalNode: AutomationNode, uState: UseState = useState) => {
|
||||
export const useEditorNodeState = (originalNode: AutomationNode, isErrored: boolean, uState: UseState = useState) => {
|
||||
const [allState, setAllState] = uState({
|
||||
node: originalNode,
|
||||
yamlMode: false,
|
||||
isModified: false,
|
||||
invalidManualYaml: "",
|
||||
...computeInvalidYaml(originalNode, isErrored)
|
||||
});
|
||||
const { node: currentNode, isModified, yamlMode, invalidManualYaml } = allState;
|
||||
useEffect(() => {
|
||||
setAllState({ ...allState, node: originalNode, isModified: false, })
|
||||
// eslint-disable-next-line
|
||||
}, [originalNode])
|
||||
const setState = (node: AutomationNode) => setAllState(({ ...allState, node, isModified: true, }));
|
||||
const setYamlMode = (yamlMode: boolean) => setAllState({ ...allState, yamlMode, });
|
||||
const setStateForManualYaml = (yaml: any) => {
|
||||
try {
|
||||
createData(yaml, yaml)
|
||||
setAllState({ ...allState, node: yaml, invalidManualYaml: '' })
|
||||
const errors = validateNode(yaml);
|
||||
if (errors) {
|
||||
setAllState({
|
||||
...allState, invalidManualYaml: <ul key={'error'}>
|
||||
{errors.map(({ message, path }, i) => <li key={i}>
|
||||
<b>{path}</b>: {message}
|
||||
</li>)}
|
||||
</ul>
|
||||
})
|
||||
} else {
|
||||
setAllState({ ...allState, node: yaml, invalidManualYaml: <></> })
|
||||
}
|
||||
} catch (err) {
|
||||
setAllState({ ...allState, invalidManualYaml: String(err) })
|
||||
setAllState({ ...allState, invalidManualYaml: <>{String(err)}</> })
|
||||
}
|
||||
}
|
||||
const {
|
||||
@@ -45,15 +52,19 @@ export const useEditorNodeState = (originalNode: AutomationNode, uState: UseStat
|
||||
nodeType,
|
||||
subType,
|
||||
subTypes,
|
||||
yamlMode,
|
||||
setYamlMode,
|
||||
invalidManualYaml,
|
||||
isModified,
|
||||
isErrored: allState.isErrored,
|
||||
get yamlMode() {
|
||||
return allState.isErrored || yamlMode
|
||||
},
|
||||
get data() {
|
||||
return currentNode
|
||||
},
|
||||
renderOptionList() {
|
||||
if (yamlMode) {
|
||||
if (yamlMode || allState.isErrored) {
|
||||
|
||||
return <>
|
||||
<InputYaml
|
||||
label=''
|
||||
@@ -61,7 +72,7 @@ export const useEditorNodeState = (originalNode: AutomationNode, uState: UseStat
|
||||
onChange={setStateForManualYaml}
|
||||
resizable
|
||||
/>
|
||||
<span className="node-editor--error">{invalidManualYaml}</span>
|
||||
<div className="node-editor--error">{invalidManualYaml}</div>
|
||||
</>
|
||||
}
|
||||
return optionManager.renderOptionList(currentNode, setState);
|
||||
@@ -103,4 +114,23 @@ const createData = (originalNode: AutomationNode, currentNode: AutomationNode) =
|
||||
subTypes,
|
||||
optionManager,
|
||||
}
|
||||
}
|
||||
|
||||
const computeInvalidYaml = (node: AutomationNode, isErrored: boolean) => {
|
||||
const errors = validateNode(node);
|
||||
if (errors) {
|
||||
return {
|
||||
isErrored: true,
|
||||
invalidManualYaml: <ul key={'error'}>
|
||||
{errors.map(({ message, path }, i) => <li key={i}>
|
||||
<b>{path}</b>: {message}
|
||||
</li>)}
|
||||
</ul>
|
||||
}
|
||||
} else {
|
||||
return {
|
||||
isErrored,
|
||||
invalidManualYaml: <></>
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
import { AutomationNodeSubtype, AutomationNodeTypes } from "types/automations";
|
||||
import { ActionType } from "types/automations/actions";
|
||||
import { AutomationNode } from '../../types/automations/index';
|
||||
|
||||
|
||||
const actionTypes = [
|
||||
'choose',
|
||||
'device',
|
||||
'event',
|
||||
'repeat',
|
||||
'service',
|
||||
'wait',
|
||||
] as AutomationNodeSubtype<'action'>[];
|
||||
|
||||
const conditionTypes = [
|
||||
'and',
|
||||
'not',
|
||||
'numeric_state',
|
||||
'or',
|
||||
'state',
|
||||
'template',
|
||||
'time',
|
||||
'trigger',
|
||||
'zone',
|
||||
] as AutomationNodeSubtype<'condition'>[];
|
||||
|
||||
const triggerTypes = [
|
||||
'device',
|
||||
'event',
|
||||
'homeassistant',
|
||||
'mqtt',
|
||||
'numeric_state',
|
||||
'state',
|
||||
'tag',
|
||||
'template',
|
||||
'time',
|
||||
'time_pattern',
|
||||
'webhook',
|
||||
'zone',
|
||||
] as AutomationNodeSubtype<'trigger'>[];
|
||||
|
||||
export const getSubTypeList = <T extends AutomationNodeTypes>(
|
||||
nodeType: T
|
||||
): Array<AutomationNodeSubtype<T> | 'condition'> => {
|
||||
if (nodeType === 'action') {
|
||||
return actionTypes as any;
|
||||
} else if (nodeType === 'condition') {
|
||||
return conditionTypes as any;
|
||||
} else if (nodeType === 'trigger') {
|
||||
return triggerTypes as any;
|
||||
}
|
||||
return [];
|
||||
}
|
||||
|
||||
export const getNodeSubType = <T extends AutomationNodeTypes>(
|
||||
node: AutomationNode<T>
|
||||
): AutomationNodeSubtype<T> => {
|
||||
if ('condition' in node) {
|
||||
return node.condition as any;
|
||||
} else if ('platform' in node) {
|
||||
return node.platform as any;
|
||||
} else if ('service' in node) {
|
||||
return 'service' as any
|
||||
} else if ('repeat' in node) {
|
||||
return 'repeat' as any
|
||||
} else if ('wait_template' in node) {
|
||||
return 'wait' as any
|
||||
} else if ('event' in node) {
|
||||
return 'event' as any
|
||||
} else if ('device_id' in node) {
|
||||
return 'device' as any
|
||||
} else if ('choose' in node) {
|
||||
return 'choose' as any
|
||||
} else {
|
||||
throw new Error("Invalid node type!")
|
||||
}
|
||||
}
|
||||
@@ -51,4 +51,10 @@
|
||||
width: 100%;
|
||||
min-height: 50px;
|
||||
min-width: 25vw;
|
||||
}
|
||||
|
||||
.node-editor--error {
|
||||
max-width: 30em;
|
||||
overflow: auto;
|
||||
max-height: 10em;
|
||||
}
|
||||
@@ -14,6 +14,7 @@ export interface NodeEditorProps {
|
||||
onSave?: (n: AutomationNode) => void;
|
||||
onFlags?: (isReady: boolean, isModified: boolean) => void;
|
||||
saveBtnCreateText?: boolean;
|
||||
isErrored?: boolean;
|
||||
}
|
||||
|
||||
export const NodeEditor: FC<NodeEditorProps> = ({
|
||||
@@ -23,10 +24,11 @@ export const NodeEditor: FC<NodeEditorProps> = ({
|
||||
onSave = () => { },
|
||||
onFlags = () => { },
|
||||
saveBtnCreateText = false,
|
||||
children
|
||||
children,
|
||||
isErrored = false,
|
||||
}) => {
|
||||
// state
|
||||
const state = useEditorNodeState(node);
|
||||
const state = useEditorNodeState(node, isErrored);
|
||||
|
||||
// alias
|
||||
const isModified = state.isModified;
|
||||
@@ -53,7 +55,7 @@ export const NodeEditor: FC<NodeEditorProps> = ({
|
||||
options={state.subTypes}
|
||||
onChange={state.setSubType}
|
||||
/> : <></>}
|
||||
<InputBoolean label="Yaml" onChange={state.setYamlMode} value={state.yamlMode} />
|
||||
<InputBoolean label="Yaml" onChange={state.setYamlMode} value={state.yamlMode} disabled={state.isErrored} />
|
||||
</div>
|
||||
{state.renderOptionList()}
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
import { FC } from "react";
|
||||
import useWindowSize from "utils/useWindowSize";
|
||||
|
||||
|
||||
export const SizeModal: FC = () => {
|
||||
const size = useWindowSize();
|
||||
|
||||
return <span style={{
|
||||
position: 'absolute',
|
||||
top: 0,
|
||||
left: 0,
|
||||
background: 'white',
|
||||
zIndex: 10,
|
||||
}}>{size.width}/{size.height}={size.ratioWbh} ({size.isMobile ? 'm' : 'd'})</span>
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
import { ApiService } from 'apiService/core';
|
||||
import { ConnectedAutomationList } from "components/AutomationList";
|
||||
import { DEFAULT_DIMS } from "components/DAGSvgs/constants";
|
||||
import { DEFAULT_DIMS } from "components/DAGFlow/constants";
|
||||
import { FC } from "react";
|
||||
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
--green-light: #6f5;
|
||||
--error: #c55;
|
||||
--error-light: #f77;
|
||||
--error-dark: #5c2323;
|
||||
--error-opaque: #c555;
|
||||
--error-accent: #9f3a3a;
|
||||
--change: #0f9;
|
||||
|
||||
@@ -16,8 +16,8 @@ export const {
|
||||
primaryLightOpaque: 'var(--primary-light-opaque)',
|
||||
secondary: 'var(--secondary)',
|
||||
secondaryOpaque: 'var(--secondary-opaque)',
|
||||
primaryAccent: 'var(--primary-acccent)',
|
||||
primaryAccentLight: 'var(--primary-acccent-light)',
|
||||
primaryAccent: 'var(--primary-accent)',
|
||||
primaryAccentLight: 'var(--primary-accent-light)',
|
||||
secondaryAccent: 'var(--secondary-accent)',
|
||||
condition: {
|
||||
primaryColor: 'var(--condition-primary)',
|
||||
|
||||
Loaded 100 of 120 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user