Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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 |
No files matched your search
@@ -37,6 +37,11 @@ jobs:
|
|||||||
# Learn more about CodeQL language support at https://git.io/codeql-language-support
|
# Learn more about CodeQL language support at https://git.io/codeql-language-support
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
- name: Cancel Previous Runs
|
||||||
|
uses: styfle/cancel-workflow-action@0.9.1
|
||||||
|
with:
|
||||||
|
access_token: ${{ github.token }}
|
||||||
|
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,40 @@
|
|||||||
name: Build add-on
|
name: Deploy
|
||||||
env:
|
env:
|
||||||
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
|
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
|
||||||
on:
|
on:
|
||||||
release:
|
# release:
|
||||||
types: [published]
|
# types: [published]
|
||||||
|
workflow_dispatch:
|
||||||
|
push:
|
||||||
|
paths:
|
||||||
|
- 'config.yaml'
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
|
metadata:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
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)
|
||||||
|
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
name: Deploy ${{ github.ref }}
|
name: Build & Publish ${{ matrix.arch }}
|
||||||
|
needs:
|
||||||
|
- metadata
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
||||||
@@ -16,20 +43,36 @@ jobs:
|
|||||||
- name: Check out repository
|
- name: Check out repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Get the version
|
|
||||||
id: get_version
|
|
||||||
run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)-g$(echo ${{ github.sha }} | cut -c1-5 )
|
|
||||||
|
|
||||||
- name: Login to DockerHub
|
- name: Login to DockerHub
|
||||||
uses: docker/login-action@v2.0.0
|
uses: docker/login-action@v2.0.0
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
- name: ${{ steps.get_version.outputs.VERSION }} / ${{ matrix.arch }}
|
- name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
||||||
uses: home-assistant/builder@2022.03.1
|
uses: home-assistant/builder@2022.03.1
|
||||||
with:
|
with:
|
||||||
args: |
|
args: |
|
||||||
--version ${{ steps.get_version.outputs.VERSION }} \
|
|
||||||
--${{ matrix.arch }} \
|
--${{ matrix.arch }} \
|
||||||
--target .
|
--target .
|
||||||
|
|
||||||
|
publish:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs:
|
||||||
|
- metadata
|
||||||
|
- build
|
||||||
|
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:
|
||||||
|
script: |
|
||||||
|
github.rest.repos.createRelease({
|
||||||
|
owner: context.repo.owner,
|
||||||
|
repo: context.repo.repo,
|
||||||
|
tag_name: process.env.VERSION,
|
||||||
|
body: process.env.CHANGELOG,
|
||||||
|
});
|
||||||
@@ -1,19 +1,27 @@
|
|||||||
name: Test add-on
|
name: Test
|
||||||
env:
|
env:
|
||||||
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
|
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
push:
|
push:
|
||||||
branch: [main]
|
branch: [main]
|
||||||
|
pull_request:
|
||||||
|
branches: [main]
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
name: Test ${{ github.sha }}
|
name: Build Test for ${{ matrix.arch }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
||||||
|
|
||||||
steps:
|
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
|
- name: Check out repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
@@ -31,3 +39,39 @@ jobs:
|
|||||||
--test \
|
--test \
|
||||||
--${{ matrix.arch }} \
|
--${{ 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
|
||||||
|
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 test:ci
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -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
|
|
||||||
|
|
||||||
|
|
||||||
+4
-35
@@ -1,36 +1,5 @@
|
|||||||
# Changelog
|
# Changelog -- v0.1.6
|
||||||
|
|
||||||
## [0.0.15] - Publish to dockerhub
|
- Improved mobile mode
|
||||||
|
- Fixed up arrow styles due to typos
|
||||||
- Publishing images to docker hub
|
- Added selection color
|
||||||
|
|
||||||
## [0.0.14] - Using vanila ha yaml
|
|
||||||
|
|
||||||
- Supporing vanilla out of the box HA yaml as oppose to parsing them (no more $smType)
|
|
||||||
- Conditions have now a more a explicit node
|
|
||||||
|
|
||||||
## [0.0.13] - Better Styling with react-flow
|
|
||||||
|
|
||||||
- Fixed up styling (using react-flow)
|
|
||||||
- cleaned up some button styles
|
|
||||||
|
|
||||||
## [0.0.12] - Tags
|
|
||||||
|
|
||||||
- Added tag management system for automations
|
|
||||||
|
|
||||||
## [0.0.11] - Zoom
|
|
||||||
|
|
||||||
- Added lazy saving
|
|
||||||
|
|
||||||
## [0.0.10] - Zoom
|
|
||||||
|
|
||||||
- Introducing Zoom!
|
|
||||||
|
|
||||||
## [0.0.9] - First Working Version
|
|
||||||
|
|
||||||
- Instalable verion via github
|
|
||||||
- Initial POC done
|
|
||||||
|
|
||||||
|
|
||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|
||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
||||||
@@ -1,6 +1,11 @@
|
|||||||
# 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-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/).
|
||||||
|
|
||||||
@@ -19,3 +24,16 @@ A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI
|
|||||||
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
|
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
|
||||||
|
|
||||||
|
|
||||||
|
## 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. Shortumations 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]
|
$(PIP) install .[dev]
|
||||||
|
|
||||||
lint:
|
lint:
|
||||||
$(VENV_BIN)/vulture --exclude src
|
$(VENV_BIN)/vulture src .vulture_whitelist
|
||||||
$(MAKE) lint-project
|
$(MAKE) lint-project
|
||||||
$(MAKE) lint-tests
|
$(MAKE) lint-tests
|
||||||
|
|
||||||
|
|||||||
@@ -29,3 +29,15 @@ exclude = '''
|
|||||||
|
|
||||||
[tool.coverage.run]
|
[tool.coverage.run]
|
||||||
omit = ["./venv/*", "tests/*"]
|
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": [
|
"dev": [
|
||||||
"mypy==0.910",
|
"mypy==0.910",
|
||||||
"mypy-extensions==0.4.3",
|
"mypy-extensions==0.4.3",
|
||||||
"black==21.7b0",
|
"black==22.3.0",
|
||||||
"bandit==1.7.0",
|
"bandit==1.7.0",
|
||||||
"isort==5.9.3",
|
"isort==5.9.3",
|
||||||
"coverage==5.5",
|
"coverage==5.5",
|
||||||
|
|||||||
+5
-4
@@ -1,10 +1,11 @@
|
|||||||
from sys import prefix
|
|
||||||
from fastapi import FastAPI
|
from fastapi import FastAPI
|
||||||
from fastapi.staticfiles import StaticFiles
|
|
||||||
from fastapi.middleware.cors import CORSMiddleware
|
from fastapi.middleware.cors import CORSMiddleware
|
||||||
|
from fastapi.staticfiles import StaticFiles
|
||||||
|
|
||||||
from src.automations.manager import AutomationManager
|
from src.automations.manager import AutomationManager
|
||||||
from src.env import ROOT_FOLDER, ORIGIN
|
from src.env import ORIGIN, ROOT_FOLDER
|
||||||
from .routes import ping, automations, details
|
|
||||||
|
from .routes import automations, details, ping
|
||||||
|
|
||||||
|
|
||||||
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
from fastapi import APIRouter, HTTPException
|
from fastapi import APIRouter, HTTPException
|
||||||
from src.automations.manager import AutomationManager
|
|
||||||
from src.api.types import (
|
from src.api.types import (
|
||||||
DeleteAutoRequest,
|
DeleteAutoRequest,
|
||||||
ListData,
|
ListData,
|
||||||
@@ -7,6 +7,7 @@ from src.api.types import (
|
|||||||
UpdateAutoRequest,
|
UpdateAutoRequest,
|
||||||
)
|
)
|
||||||
from src.automations.errors import FailedDeletion
|
from src.automations.errors import FailedDeletion
|
||||||
|
from src.automations.manager import AutomationManager
|
||||||
from src.automations.types import AutomationData
|
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):
|
def upsert_auto(body: UpdateAutoRequest):
|
||||||
automations.update(body.index, body.data)
|
automations.update(body.index, body.data)
|
||||||
|
|
||||||
@router.delete("")
|
@router.delete("/item")
|
||||||
def delete_auto(body: DeleteAutoRequest):
|
def delete_auto(body: DeleteAutoRequest):
|
||||||
try:
|
try:
|
||||||
automations.delete(body.index)
|
automations.delete(body.index)
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
from fastapi import APIRouter
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from src.hass_config import HassConfig
|
from fastapi import APIRouter
|
||||||
from src.env import BUILD_VERSION
|
|
||||||
|
|
||||||
|
from src.env import BUILD_VERSION
|
||||||
|
from src.hass_config import HassConfig
|
||||||
|
|
||||||
|
|
||||||
def make_details_router(hass_config: HassConfig) -> APIRouter:
|
def make_details_router(hass_config: HassConfig) -> APIRouter:
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
from fastapi import APIRouter
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
|
from fastapi import APIRouter
|
||||||
|
|
||||||
from src.env import BUILD_VERSION
|
from src.env import BUILD_VERSION
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
from typing import Generic, List, TypeVar
|
from typing import Generic, List, TypeVar
|
||||||
|
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from pydantic.fields import Field
|
from pydantic.fields import Field
|
||||||
from pydantic.generics import GenericModel
|
from pydantic.generics import GenericModel
|
||||||
|
|
||||||
from src.automations.types import ExtenededAutomationData
|
from src.automations.types import ExtenededAutomationData
|
||||||
|
|
||||||
DataT = TypeVar("DataT")
|
DataT = TypeVar("DataT")
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
|
from src.api.app import make_app
|
||||||
from src.automations.manager import AutomationManager
|
from src.automations.manager import AutomationManager
|
||||||
from src.hass_config import find_hass_config
|
from src.hass_config import find_hass_config
|
||||||
from src.api.app import make_app
|
|
||||||
|
|
||||||
hass_config = find_hass_config()
|
hass_config = find_hass_config()
|
||||||
app = make_app(AutomationManager(hass_config))
|
app = make_app(AutomationManager(hass_config))
|
||||||
@@ -1,8 +1,12 @@
|
|||||||
from typing import Iterator, Union
|
from typing import Iterator, Union
|
||||||
|
|
||||||
from pydantic.error_wrappers import ValidationError
|
from pydantic.error_wrappers import ValidationError
|
||||||
|
|
||||||
from src.json_serializer import normalize_obj
|
from src.json_serializer import normalize_obj
|
||||||
from .types import AutomationMetdata, ExtenededAutomationData
|
|
||||||
from .errors import InvalidAutomationFile
|
from .errors import InvalidAutomationFile
|
||||||
|
from .types import AutomationMetdata, ExtenededAutomationData
|
||||||
|
|
||||||
|
|
||||||
# Single loader
|
# Single loader
|
||||||
def load_automation(
|
def load_automation(
|
||||||
@@ -35,17 +39,13 @@ def load_conditions(conditions: Union[dict, list, str]):
|
|||||||
if isinstance(conditions, list):
|
if isinstance(conditions, list):
|
||||||
return list(map(ensure_condition_dictionary, conditions))
|
return list(map(ensure_condition_dictionary, conditions))
|
||||||
else:
|
else:
|
||||||
return [
|
return [ensure_condition_dictionary(conditions)]
|
||||||
ensure_condition_dictionary(conditions)
|
|
||||||
]
|
|
||||||
|
|
||||||
def ensure_condition_dictionary(c: Union[str, dict]):
|
def ensure_condition_dictionary(c: Union[str, dict]):
|
||||||
c = normalize_obj(c)
|
c = normalize_obj(c)
|
||||||
if isinstance(c, str):
|
if isinstance(c, str):
|
||||||
return {
|
return {"condition": "template", "value_template": c}
|
||||||
"condition": "template",
|
|
||||||
"value_template": c
|
|
||||||
}
|
|
||||||
elif isinstance(c, dict):
|
elif isinstance(c, dict):
|
||||||
return c
|
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 typing import Iterator, List, Optional
|
||||||
|
|
||||||
from src.automations.errors import FailedDeletion
|
from src.automations.errors import FailedDeletion
|
||||||
from src.automations.types import AutomationData, ExtenededAutomationData
|
from src.automations.types import AutomationData, ExtenededAutomationData
|
||||||
from src.hass_config.loader import HassConfig
|
from src.hass_config.loader import HassConfig
|
||||||
|
|
||||||
from .loader import load_automation
|
from .loader import load_automation
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,15 +1,14 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Dict
|
from typing import Dict
|
||||||
|
|
||||||
from src.yaml_serializer import dump_yaml, load_yaml
|
from src.yaml_serializer import dump_yaml, load_yaml
|
||||||
|
|
||||||
|
|
||||||
class TagManager(Dict[int, Dict[str, str]]):
|
class TagManager(Dict[int, Dict[str, str]]):
|
||||||
def save(self, path: Path):
|
def save(self, path: Path):
|
||||||
path.write_text(dump_yaml(dict(self)))
|
path.write_text(dump_yaml(dict(self)))
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def load(cls, path: Path):
|
def load(cls, path: Path):
|
||||||
with path.open('r') as fp:
|
with path.open("r") as fp:
|
||||||
return cls(load_yaml(fp))
|
return cls(load_yaml(fp))
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
from typing import Dict, List, Literal, Optional, Union
|
from typing import Dict, List, Literal, Optional, Union
|
||||||
from pydantic.fields import Field
|
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
|
from pydantic.fields import Field
|
||||||
|
|
||||||
|
|
||||||
class AutomationMetdata(BaseModel):
|
class AutomationMetdata(BaseModel):
|
||||||
id: str
|
id: str
|
||||||
@@ -24,5 +26,6 @@ class AutomationData(BaseModel):
|
|||||||
"action": self.sequence,
|
"action": self.sequence,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class ExtenededAutomationData(AutomationData):
|
class ExtenededAutomationData(AutomationData):
|
||||||
tags: Dict[str, str] = Field(default_factory=dict)
|
tags: Dict[str, str] = Field(default_factory=dict)
|
||||||
+1
-2
@@ -1,7 +1,6 @@
|
|||||||
from email.policy import default
|
|
||||||
from decouple import config, Csv
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
|
from decouple import Csv, config
|
||||||
|
|
||||||
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
|
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
|
||||||
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
|
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import os
|
import os
|
||||||
from typing import cast
|
|
||||||
from decouple import config
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
|
from decouple import config
|
||||||
|
|
||||||
from .loader import HassConfig
|
from .loader import HassConfig
|
||||||
|
|
||||||
|
|
||||||
@@ -15,8 +16,9 @@ def find_hass_config() -> HassConfig:
|
|||||||
print("|-> ", path)
|
print("|-> ", path)
|
||||||
return HassConfig(path)
|
return HassConfig(path)
|
||||||
|
|
||||||
if "HASSIO_TOKEN" in os.environ:
|
config_dir = Path("/config")
|
||||||
return HassConfig(Path("/config"))
|
if config_dir.is_dir():
|
||||||
|
return HassConfig(config_dir)
|
||||||
|
|
||||||
"""Put together the default configuration directory based on the OS."""
|
"""Put together the default configuration directory based on the OS."""
|
||||||
data_dir = Path(config("APPDATA", None) if os.name == "nt" else os.path.expanduser("~"))
|
data_dir = Path(config("APPDATA", None) if os.name == "nt" else os.path.expanduser("~"))
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import List, Optional
|
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 src.yaml_serializer.types import IncludedYaml
|
||||||
|
|
||||||
from .errors import MissingFile
|
from .errors import MissingFile
|
||||||
|
|
||||||
|
|
||||||
@@ -35,7 +36,6 @@ class HassConfig:
|
|||||||
else:
|
else:
|
||||||
return TagManager.load(tag_path)
|
return TagManager.load(tag_path)
|
||||||
|
|
||||||
|
|
||||||
def get_automation_tags_path(self) -> Path:
|
def get_automation_tags_path(self) -> Path:
|
||||||
return self.root_path / ".shortumations" / "tags.yaml"
|
return self.root_path / ".shortumations" / "tags.yaml"
|
||||||
|
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ def normalize_obj(obj: Any) -> Any:
|
|||||||
or isinstance(obj, int)
|
or isinstance(obj, int)
|
||||||
or isinstance(obj, float)
|
or isinstance(obj, float)
|
||||||
or isinstance(obj, bool)
|
or isinstance(obj, bool)
|
||||||
|
or obj is None
|
||||||
):
|
):
|
||||||
return obj
|
return obj
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import io
|
import io
|
||||||
from typing import Any, Union, TextIO
|
from typing import Any, TextIO, Union
|
||||||
|
|
||||||
from src.yaml_serializer.base_yaml import yaml
|
from src.yaml_serializer.base_yaml import yaml
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
from ruamel.yaml import YAML
|
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 = YAML()
|
||||||
yaml.register_class(IncludedYaml)
|
yaml.register_class(IncludedYaml)
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
from typing import NamedTuple
|
from typing import NamedTuple
|
||||||
|
|
||||||
from ruamel.yaml.nodes import Node
|
from ruamel.yaml.nodes import Node
|
||||||
from ruamel.yaml.representer import BaseRepresenter
|
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:
|
||||||
@@ -1,9 +1,15 @@
|
|||||||
from ruamel.yaml import YAML
|
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from fastapi.testclient import TestClient
|
from fastapi.testclient import TestClient
|
||||||
|
from ruamel.yaml import YAML
|
||||||
|
|
||||||
from src.api.app import make_app
|
from src.api.app import make_app
|
||||||
from src.automations.types import AutomationData, AutomationMetdata, ExtenededAutomationData
|
from src.automations.types import (
|
||||||
from tests.utils import get_example_automation_loader
|
AutomationData,
|
||||||
|
AutomationMetdata,
|
||||||
|
ExtenededAutomationData,
|
||||||
|
)
|
||||||
|
from tests.utils import HA_CONFIG2_EXAMPLE, get_example_automation_loader
|
||||||
|
|
||||||
|
|
||||||
class BaseTestCase(TestCase):
|
class BaseTestCase(TestCase):
|
||||||
@@ -17,6 +23,9 @@ class BaseTestCase(TestCase):
|
|||||||
|
|
||||||
|
|
||||||
class automation_list_tests(BaseTestCase):
|
class automation_list_tests(BaseTestCase):
|
||||||
|
|
||||||
|
test_params = {"total": 28, "subtest2_found_items": 3, "subtest1_found_items": 10}
|
||||||
|
|
||||||
def test_get_list_of_everything(self):
|
def test_get_list_of_everything(self):
|
||||||
data = self.client.post(
|
data = self.client.post(
|
||||||
"/automations/list",
|
"/automations/list",
|
||||||
@@ -34,8 +43,8 @@ class automation_list_tests(BaseTestCase):
|
|||||||
"limit": 50,
|
"limit": 50,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(d["totalItems"], 28)
|
self.assertEqual(d["totalItems"], self.test_params["total"])
|
||||||
self.assertEqual(len(d["data"]), 28)
|
self.assertEqual(len(d["data"]), self.test_params["total"])
|
||||||
|
|
||||||
def test_subset1(self):
|
def test_subset1(self):
|
||||||
data = self.client.post(
|
data = self.client.post(
|
||||||
@@ -54,8 +63,8 @@ class automation_list_tests(BaseTestCase):
|
|||||||
"limit": 10,
|
"limit": 10,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(d["totalItems"], 28)
|
self.assertEqual(d["totalItems"], self.test_params["total"])
|
||||||
self.assertEqual(len(d["data"]), 10)
|
self.assertEqual(len(d["data"]), self.test_params["subtest1_found_items"])
|
||||||
|
|
||||||
def test_subset2(self):
|
def test_subset2(self):
|
||||||
data = self.client.post(
|
data = self.client.post(
|
||||||
@@ -74,8 +83,24 @@ class automation_list_tests(BaseTestCase):
|
|||||||
"limit": 10,
|
"limit": 10,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(d["totalItems"], 28)
|
self.assertEqual(d["totalItems"], self.test_params["total"])
|
||||||
self.assertEqual(len(d["data"]), 3)
|
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):
|
class automation_update_tests(BaseTestCase):
|
||||||
@@ -109,12 +134,14 @@ class automation_update_tests(BaseTestCase):
|
|||||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
|
||||||
new_auto = resp.json()["data"][0]
|
new_auto = resp.json()["data"][0]
|
||||||
self.assertNotEqual(original_auto, new_auto)
|
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):
|
def test_consistent_standard_1(self):
|
||||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 15})
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 15})
|
||||||
original_auto = resp.json()["data"][0]
|
original_auto = resp.json()["data"][0]
|
||||||
original_auto['metadata']['alias'] = "I CHANGED!"
|
original_auto["metadata"]["alias"] = "I CHANGED!"
|
||||||
resp = self.client.post(
|
resp = self.client.post(
|
||||||
"/automations",
|
"/automations",
|
||||||
json={
|
json={
|
||||||
@@ -123,46 +150,49 @@ class automation_update_tests(BaseTestCase):
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(resp.status_code, 200)
|
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])
|
disk_data = dict(YAML().load(fp)[15])
|
||||||
trigger = list(map(dict, disk_data.pop('trigger')))
|
trigger = list(map(dict, disk_data.pop("trigger")))
|
||||||
condition = disk_data.pop('condition')
|
condition = disk_data.pop("condition")
|
||||||
action = list(map(dict, disk_data.pop('action')))
|
action = list(map(dict, disk_data.pop("action")))
|
||||||
self.assertDictEqual(disk_data, {
|
self.assertDictEqual(
|
||||||
"id": "1629422438707",
|
disk_data,
|
||||||
"alias": "I CHANGED!",
|
{"id": "1629422438707", "alias": "I CHANGED!", "description": "", "mode": "single"},
|
||||||
"description": "",
|
)
|
||||||
"mode": "single"
|
self.assertListEqual(
|
||||||
})
|
trigger, [{"platform": "time", "at": "input_datetime.vita_night_pump_time"}]
|
||||||
self.assertListEqual(trigger, [
|
)
|
||||||
{"platform": "time", "at": "input_datetime.vita_night_pump_time"}
|
self.assertListEqual(
|
||||||
])
|
condition,
|
||||||
self.assertListEqual(condition, [{
|
[
|
||||||
"conditions": [
|
{
|
||||||
{"condition": "time", "after": "input_datetime.vita_night_pump_time", "before": "00:00:00"},
|
"conditions": [
|
||||||
{"condition": "time", "after": "00:00:00", "before": "06:00:00"}
|
{
|
||||||
],
|
"condition": "time",
|
||||||
"condition": "and"
|
"after": "input_datetime.vita_night_pump_time",
|
||||||
}, ])
|
"before": "00:00:00",
|
||||||
self.assertListEqual(action, [
|
},
|
||||||
|
{"condition": "time", "after": "00:00:00", "before": "06:00:00"},
|
||||||
{
|
],
|
||||||
"service": "light.turn_on",
|
"condition": "and",
|
||||||
"target": {
|
|
||||||
"entity_id": "light.bulb_staircase",
|
|
||||||
"area_id": "living_room"
|
|
||||||
},
|
},
|
||||||
"data": {
|
],
|
||||||
"brightness_pct": 40,
|
)
|
||||||
"transition": 15
|
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):
|
def test_consistent_standard_2(self):
|
||||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 27})
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 27})
|
||||||
original_auto = resp.json()["data"][0]
|
original_auto = resp.json()["data"][0]
|
||||||
original_auto['metadata']['alias'] = "I CHANGED!"
|
original_auto["metadata"]["alias"] = "I CHANGED!"
|
||||||
resp = self.client.post(
|
resp = self.client.post(
|
||||||
"/automations",
|
"/automations",
|
||||||
json={
|
json={
|
||||||
@@ -171,155 +201,125 @@ class automation_update_tests(BaseTestCase):
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(resp.status_code, 200)
|
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])
|
disk_data = dict(YAML().load(fp)[27])
|
||||||
trigger = list(map(dict, disk_data.pop('trigger')))
|
trigger = list(map(dict, disk_data.pop("trigger")))
|
||||||
condition = disk_data.pop('condition')
|
condition = disk_data.pop("condition")
|
||||||
action = list(map(dict, disk_data.pop('action')))
|
action = list(map(dict, disk_data.pop("action")))
|
||||||
self.assertDictEqual(disk_data, {
|
self.assertDictEqual(
|
||||||
"id": "1649947692702",
|
disk_data,
|
||||||
"alias": "I CHANGED!",
|
{"id": "1649947692702", "alias": "I CHANGED!", "description": "", "mode": "single"},
|
||||||
"description": "",
|
)
|
||||||
"mode": "single"
|
self.assertListEqual(
|
||||||
})
|
trigger,
|
||||||
self.assertListEqual(trigger, [
|
[
|
||||||
{
|
{
|
||||||
"device_id": "das2qdasdasdasadaasd",
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
"domain": "zha",
|
"domain": "zha",
|
||||||
"platform": "device",
|
"platform": "device",
|
||||||
"type": "remote_button_short_press",
|
"type": "remote_button_short_press",
|
||||||
"subtype": "turn_on",
|
"subtype": "turn_on",
|
||||||
"id": "turn_on"
|
"id": "turn_on",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"device_id": "das2qdasdasdasadaasd",
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
"domain": "zha",
|
"domain": "zha",
|
||||||
"platform": "device",
|
"platform": "device",
|
||||||
"type": "remote_button_short_press",
|
"type": "remote_button_short_press",
|
||||||
"subtype": "turn_off",
|
"subtype": "turn_off",
|
||||||
"id": "turn_off"
|
"id": "turn_off",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"device_id": "das2qdasdasdasadaasd",
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
"domain": "zha",
|
"domain": "zha",
|
||||||
"platform": "device",
|
"platform": "device",
|
||||||
"type": "remote_button_short_press",
|
"type": "remote_button_short_press",
|
||||||
"subtype": "dim_up",
|
"subtype": "dim_up",
|
||||||
"id": "dim_up"
|
"id": "dim_up",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"device_id": "das2qdasdasdasadaasd",
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
"domain": "zha",
|
"domain": "zha",
|
||||||
"platform": "device",
|
"platform": "device",
|
||||||
"type": "remote_button_short_press",
|
"type": "remote_button_short_press",
|
||||||
"subtype": "dim_down",
|
"subtype": "dim_down",
|
||||||
"id": "dim_down"
|
"id": "dim_down",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"device_id": "das2qdasdasdasadaasd",
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
"domain": "zha",
|
"domain": "zha",
|
||||||
"platform": "device",
|
"platform": "device",
|
||||||
"type": "remote_button_double_press",
|
"type": "remote_button_double_press",
|
||||||
"subtype": "turn_on",
|
"subtype": "turn_on",
|
||||||
"id": "up_dbclk"
|
"id": "up_dbclk",
|
||||||
}
|
},
|
||||||
])
|
],
|
||||||
|
)
|
||||||
self.assertListEqual(condition, [])
|
self.assertListEqual(condition, [])
|
||||||
self.assertListEqual(action, [
|
self.assertListEqual(
|
||||||
{
|
action,
|
||||||
"choose": [
|
[
|
||||||
{
|
{
|
||||||
"conditions": [
|
"choose": [
|
||||||
{
|
{
|
||||||
"condition": "trigger",
|
"conditions": [{"condition": "trigger", "id": "turn_off"}],
|
||||||
"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": [
|
"default": [],
|
||||||
{
|
|
||||||
"type": "turn_off",
|
|
||||||
"device_id": "das2qdasdasdasadaasd",
|
|
||||||
"entity_id": "light.bulb_ari_lamp",
|
|
||||||
"domain": "light"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"conditions": [
|
|
||||||
{
|
|
||||||
"condition": "trigger",
|
|
||||||
"id": "turn_on"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"sequence": [
|
|
||||||
{
|
|
||||||
"service": "light.turn_on",
|
|
||||||
"data": {
|
|
||||||
"color_temp": 153,
|
|
||||||
"brightness_pct": 100
|
|
||||||
},
|
|
||||||
"target": {
|
|
||||||
"device_id": "das2qdasdasdasadaasd"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"conditions": [
|
|
||||||
{
|
|
||||||
"condition": "trigger",
|
|
||||||
"id": "dim_up"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"sequence": [
|
|
||||||
{
|
|
||||||
"device_id": "das2qdasdasdasadaasd",
|
|
||||||
"domain": "light",
|
|
||||||
"entity_id": "light.bulb_ari_lamp",
|
|
||||||
"type": "brightness_increase"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"conditions": [
|
|
||||||
{
|
|
||||||
"condition": "trigger",
|
|
||||||
"id": "dim_down"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"sequence": [
|
|
||||||
{
|
|
||||||
"device_id": "das2qdasdasdasadaasd",
|
|
||||||
"domain": "light",
|
|
||||||
"entity_id": "light.bulb_ari_lamp",
|
|
||||||
"type": "brightness_decrease"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"conditions": [
|
|
||||||
{
|
|
||||||
"condition": "trigger",
|
|
||||||
"id": "up_dbclk"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"sequence": [
|
|
||||||
{
|
|
||||||
"service": "light.turn_on",
|
|
||||||
"data": {
|
|
||||||
"color_temp": 500,
|
|
||||||
"brightness_pct": 100
|
|
||||||
},
|
|
||||||
"target": {
|
|
||||||
"device_id": "das2qdasdasdasadaasd"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"default": []
|
)
|
||||||
}
|
|
||||||
])
|
|
||||||
|
|
||||||
class automation_delete_tests(BaseTestCase):
|
class automation_delete_tests(BaseTestCase):
|
||||||
def test_delete_some(self):
|
def test_delete_some(self):
|
||||||
|
|||||||
@@ -1,13 +1,8 @@
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
from src.automations.types import (
|
|
||||||
AutomationMetdata,
|
|
||||||
ExtenededAutomationData,
|
|
||||||
)
|
|
||||||
from src.automations.loader import load_automation
|
from src.automations.loader import load_automation
|
||||||
from src.yaml_serializer.types import (
|
from src.automations.types import AutomationMetdata, ExtenededAutomationData
|
||||||
SecretValue,
|
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
||||||
NOT_IMPLEMENTED_SV_MSG,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class loader_tests(TestCase):
|
class loader_tests(TestCase):
|
||||||
@@ -31,7 +26,7 @@ class loader_tests(TestCase):
|
|||||||
],
|
],
|
||||||
"mode": "single",
|
"mode": "single",
|
||||||
},
|
},
|
||||||
{}
|
{},
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
@@ -44,10 +39,12 @@ class loader_tests(TestCase):
|
|||||||
mode="single",
|
mode="single",
|
||||||
),
|
),
|
||||||
trigger=[{"platform": "homeassistant", "event": "shutdown"}],
|
trigger=[{"platform": "homeassistant", "event": "shutdown"}],
|
||||||
condition=[{
|
condition=[
|
||||||
"condition": "template",
|
{
|
||||||
"value_template": "states(time.time) >= '10:00:00'",
|
"condition": "template",
|
||||||
}],
|
"value_template": "states(time.time) >= '10:00:00'",
|
||||||
|
}
|
||||||
|
],
|
||||||
sequence=[
|
sequence=[
|
||||||
{
|
{
|
||||||
"device_id": NOT_IMPLEMENTED_SV_MSG,
|
"device_id": NOT_IMPLEMENTED_SV_MSG,
|
||||||
@@ -57,6 +54,6 @@ class loader_tests(TestCase):
|
|||||||
"message": "Hassio Is turning off...",
|
"message": "Hassio Is turning off...",
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
tags={}
|
tags={},
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from src.automations.errors import FailedDeletion, InvalidAutomationFile
|
from src.automations.errors import FailedDeletion, InvalidAutomationFile
|
||||||
from src.automations.types import AutomationMetdata, ExtenededAutomationData
|
from src.automations.types import AutomationMetdata, ExtenededAutomationData
|
||||||
from tests.utils import (
|
from tests.utils import (
|
||||||
|
|||||||
@@ -1,16 +1,15 @@
|
|||||||
|
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from tempfile import mktemp
|
from tempfile import mktemp
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from src.automations.tags import TagManager
|
from src.automations.tags import TagManager
|
||||||
|
|
||||||
class tag_tests(TestCase):
|
|
||||||
|
|
||||||
|
class tag_tests(TestCase):
|
||||||
def test_load_and_save(self):
|
def test_load_and_save(self):
|
||||||
tmp_file = Path(mktemp()).with_suffix('.yml')
|
tmp_file = Path(mktemp()).with_suffix(".yml")
|
||||||
tags = TagManager()
|
tags = TagManager()
|
||||||
tags[0] = {'Room': "Kitchen", "Type": 'Lights'}
|
tags[0] = {"Room": "Kitchen", "Type": "Lights"}
|
||||||
tags[1] = {}
|
tags[1] = {}
|
||||||
|
|
||||||
tags.save(tmp_file)
|
tags.save(tmp_file)
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from src.automations.types import AutomationData, AutomationMetdata
|
from src.automations.types import AutomationData, AutomationMetdata
|
||||||
from src.hass_config.errors import MissingFile
|
from src.hass_config.errors import MissingFile
|
||||||
from src.hass_config.loader import HassConfig
|
from src.hass_config.loader import HassConfig
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
import json
|
import json
|
||||||
from unittest import TestCase
|
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.scalarbool import ScalarBoolean
|
||||||
from ruamel.yaml.scalarfloat import ScalarFloat
|
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.json_serializer import json_dumps
|
||||||
|
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
||||||
|
|
||||||
|
|
||||||
class json_serializer_tests(TestCase):
|
class json_serializer_tests(TestCase):
|
||||||
|
|||||||
@@ -1,18 +1,16 @@
|
|||||||
import io
|
import io
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
from src.yaml_serializer import (
|
|
||||||
dump_yaml,
|
from src.yaml_serializer import dump_yaml, load_yaml
|
||||||
load_yaml,
|
|
||||||
)
|
|
||||||
from src.yaml_serializer.types import (
|
from src.yaml_serializer.types import (
|
||||||
IncludedYaml,
|
IncludedYaml,
|
||||||
SecretValue,
|
|
||||||
IncludedYamlDir,
|
IncludedYamlDir,
|
||||||
|
SecretValue,
|
||||||
)
|
)
|
||||||
from tests.utils import SAMPLES_FOLDER
|
from tests.utils import SAMPLES_FOLDER
|
||||||
|
|
||||||
class dumping_yamls_tests(TestCase):
|
|
||||||
|
|
||||||
|
class dumping_yamls_tests(TestCase):
|
||||||
def test_dumping_includes(self):
|
def test_dumping_includes(self):
|
||||||
yaml = dump_yaml(
|
yaml = dump_yaml(
|
||||||
{
|
{
|
||||||
|
|||||||
+9
-6
@@ -1,32 +1,35 @@
|
|||||||
|
from pathlib import Path
|
||||||
from shutil import copytree
|
from shutil import copytree
|
||||||
from tempfile import mkdtemp
|
from tempfile import mkdtemp
|
||||||
from pathlib import Path
|
|
||||||
from typing import List, Literal, Optional, Tuple
|
from typing import List, Literal, Optional, Tuple
|
||||||
|
|
||||||
from src.automations.manager import AutomationManager
|
from src.automations.manager import AutomationManager
|
||||||
from src.automations.types import AutomationData
|
from src.automations.types import AutomationData
|
||||||
from src.hass_config.loader import HassConfig
|
from src.hass_config.loader import HassConfig
|
||||||
|
|
||||||
from src.yaml_serializer import dump_yaml
|
from src.yaml_serializer import dump_yaml
|
||||||
from src.yaml_serializer.types import IncludedYaml
|
from src.yaml_serializer.types import IncludedYaml
|
||||||
|
|
||||||
THIS_FOLDER = Path(__file__).parent
|
THIS_FOLDER = Path(__file__).parent
|
||||||
SAMPLES_FOLDER = THIS_FOLDER / "samples"
|
SAMPLES_FOLDER = THIS_FOLDER / "samples"
|
||||||
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
|
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
|
"""Creates an example automation loader from the samples folder
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
Tuple[Path, HassConfig, AutomationManager]
|
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)
|
hass_config = HassConfig(root_folder)
|
||||||
automation_loader = AutomationManager(hass_config)
|
automation_loader = AutomationManager(hass_config)
|
||||||
return root_folder, hass_config, automation_loader
|
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
|
"""Creates a copy of the example config folder
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
@@ -34,7 +37,7 @@ def create_copy_of_example_config() -> Path:
|
|||||||
"""
|
"""
|
||||||
root_folder = Path(mkdtemp())
|
root_folder = Path(mkdtemp())
|
||||||
root_folder.rmdir()
|
root_folder.rmdir()
|
||||||
copytree(HA_CONFIG_EXAMPLE, root_folder)
|
copytree(config_to_copy, root_folder)
|
||||||
return root_folder
|
return root_folder
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
name: Shortumation
|
name: Shortumation
|
||||||
version: 0.0.15
|
version: 0.1.6
|
||||||
slug: shortumation
|
slug: shortumation
|
||||||
image: asosnovsky/shortumation-{arch}
|
image: asosnovsky/shortumation-{arch}
|
||||||
url: "https://github.com/asosnovsky/Shortumation"
|
url: "https://github.com/asosnovsky/Shortumation"
|
||||||
@@ -8,7 +8,7 @@ arch:
|
|||||||
- aarch64
|
- aarch64
|
||||||
- amd64
|
- amd64
|
||||||
- armhf
|
- armhf
|
||||||
- armv7s
|
- armv7
|
||||||
- i386
|
- i386
|
||||||
startup: application
|
startup: application
|
||||||
boot: auto
|
boot: auto
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "react-scripts start",
|
"start": "react-scripts start",
|
||||||
"build": "react-scripts build",
|
"build": "react-scripts build",
|
||||||
|
"test:ci": "react-scripts test --ci=true --all --watchAll=false",
|
||||||
"test": "react-scripts test",
|
"test": "react-scripts test",
|
||||||
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
|
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
|
||||||
"eject": "react-scripts eject",
|
"eject": "react-scripts eject",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import { API } from "./base";
|
import { API } from "./base";
|
||||||
import { ListData, ListParams } from "./types";
|
import { ListData, ListParams } from "./types";
|
||||||
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths';
|
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
|
||||||
|
|
||||||
|
|
||||||
export const makeAutomationAPI = (api: API) => ({
|
export const makeAutomationAPI = (api: API) => ({
|
||||||
@@ -14,19 +14,19 @@ export const makeAutomationAPI = (api: API) => ({
|
|||||||
});
|
});
|
||||||
return data;
|
return data;
|
||||||
},
|
},
|
||||||
async update({index, auto}: {index: number, auto: AutomationData}) {
|
async update({ index, auto }: { index: number, auto: AutomationData }) {
|
||||||
return await api.makeCall({
|
return await api.makeCall({
|
||||||
path: AUTOMTAION_ROOT,
|
path: AUTOMTAION_ITEM,
|
||||||
data: {
|
data: {
|
||||||
index,
|
index,
|
||||||
data: auto
|
data: auto
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
async remove({index}: {index: number}) {
|
async remove({ index }: { index: number }) {
|
||||||
return await api.makeCall({
|
return await api.makeCall({
|
||||||
method: "DELETE",
|
method: "DELETE",
|
||||||
path: AUTOMTAION_ROOT,
|
path: AUTOMTAION_ITEM,
|
||||||
data: {
|
data: {
|
||||||
index,
|
index,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import { useAPIService } from './core';
|
|||||||
import { useMockAPI } from "./mock";
|
import { useMockAPI } from "./mock";
|
||||||
|
|
||||||
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
|
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
|
||||||
console.log(process.env)
|
|
||||||
|
|
||||||
export const useConnectedApiService = () => useAPIService(
|
export const useConnectedApiService = () => useAPIService(
|
||||||
makeAutomationAPI(makeRemoteAPI(
|
makeAutomationAPI(makeRemoteAPI(
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { useRef } from 'react';
|
import { useRef } from 'react';
|
||||||
import { AutomationData } from 'types/automations';
|
import { AutomationData } from 'types/automations';
|
||||||
import { API } from './base';
|
import { API } from './base';
|
||||||
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths';
|
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
|
||||||
|
|
||||||
|
|
||||||
export const useMockAPI = (
|
export const useMockAPI = (
|
||||||
@@ -26,7 +26,7 @@ export const useMockAPI = (
|
|||||||
}))
|
}))
|
||||||
} as any
|
} as any
|
||||||
}
|
}
|
||||||
if (path === AUTOMTAION_ROOT) {
|
if (path === AUTOMTAION_ITEM) {
|
||||||
if (method === 'POST') {
|
if (method === 'POST') {
|
||||||
const { index, data: auto } = data as any;
|
const { index, data: auto } = data as any;
|
||||||
if (index >= automationsRef.current.length) {
|
if (index >= automationsRef.current.length) {
|
||||||
|
|||||||
@@ -2,3 +2,4 @@
|
|||||||
|
|
||||||
export const AUTOMTAION_ROOT = '/' as const;
|
export const AUTOMTAION_ROOT = '/' as const;
|
||||||
export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const;
|
export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const;
|
||||||
|
export const AUTOMTAION_ITEM = `${AUTOMTAION_ROOT}item` as const;
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box.show {
|
.automation-editor--info-box.show {
|
||||||
min-width: 25em;
|
min-width: 20em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box.hide {
|
.automation-editor--info-box.hide {
|
||||||
|
|||||||
@@ -10,10 +10,12 @@
|
|||||||
flex: 1;
|
flex: 1;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
.automation-list-box--body > * {
|
|
||||||
|
.automation-list-box--body>* {
|
||||||
padding-top: 0.5em;
|
padding-top: 0.5em;
|
||||||
padding-bottom: 0.5em;
|
padding-bottom: 0.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--group {
|
.automation-list-box--body--group {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -21,33 +23,37 @@
|
|||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
padding-bottom: 0.5em;
|
padding-bottom: 0.5em;
|
||||||
border-width: 1px;
|
border-width: 1px;
|
||||||
border-bottom-style: solid ;
|
border-bottom-style: solid;
|
||||||
border-color: white;
|
border-color: white;
|
||||||
}
|
}
|
||||||
.automation-list-box--body--group > .automation-list-box--body--group {
|
|
||||||
border-left-style: solid ;
|
.automation-list-box--body--group>.automation-list-box--body--group {
|
||||||
|
border-left-style: solid;
|
||||||
border-top-left-radius: 0;
|
border-top-left-radius: 0;
|
||||||
margin-left: 0.75em;
|
margin-left: 0.75em;
|
||||||
padding-left: 0.5em;
|
padding-left: 0.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--group > b {
|
.automation-list-box--body--group>b {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
padding: 0.1em;
|
padding: 0.1em;
|
||||||
}
|
}
|
||||||
.automation-list-box--body--group > b:hover {
|
|
||||||
|
.automation-list-box--body--group>b:hover {
|
||||||
background-color: var(--secondary-accent);
|
background-color: var(--secondary-accent);
|
||||||
color: var(--secondary);
|
color: var(--secondary);
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--item:hover {
|
.automation-list-box--body--item:hover, .automation-list-box--body--item.selected {
|
||||||
background-color: var(--primary-accent);
|
background-color: var(--primary-accent);
|
||||||
color: var(--primary);
|
color: var(--primary);
|
||||||
}
|
}
|
||||||
.automation-list-box--body--item:hover > .automation-list-box--body--item--tags > span {
|
|
||||||
|
.automation-list-box--body--item:hover>.automation-list-box--body--item--tags>span {
|
||||||
border-color: var(--primary);
|
border-color: var(--primary);
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--item {
|
.automation-list-box--body--item {
|
||||||
padding-left: 1em;
|
padding-left: 1em;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
@@ -57,25 +63,31 @@
|
|||||||
gap: 1em;
|
gap: 1em;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--item::before {
|
.automation-list-box--body--item::before {
|
||||||
content: "⊚ ";
|
content: "⊚ ";
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--item--title {
|
.automation-list-box--body--item--title {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
padding-left: 0.25em;
|
padding-left: 0.25em;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
.automation-list-box--body--item--title > b {
|
|
||||||
|
.automation-list-box--body--item--title>b {
|
||||||
font-size: 1em;
|
font-size: 1em;
|
||||||
}
|
}
|
||||||
.automation-list-box--body--item--title > span, .automation-list-box--body--item--title > b > span {
|
|
||||||
|
.automation-list-box--body--item--title>span, .automation-list-box--body--item--title>b>span {
|
||||||
font-size: 0.75em;
|
font-size: 0.75em;
|
||||||
}
|
}
|
||||||
.automation-list-box--body--item > button {
|
|
||||||
|
.automation-list-box--body--item>button {
|
||||||
padding: 0.25em !important;
|
padding: 0.25em !important;
|
||||||
margin: 0.5em !important;
|
margin: 0.5em !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--item--tags {
|
.automation-list-box--body--item--tags {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -87,13 +99,15 @@
|
|||||||
max-height: 100%;
|
max-height: 100%;
|
||||||
gap: 0.25em;
|
gap: 0.25em;
|
||||||
}
|
}
|
||||||
.automation-list-box--body--item--tags > span {
|
|
||||||
|
.automation-list-box--body--item--tags>span {
|
||||||
border-color: var(--primary-accent);
|
border-color: var(--primary-accent);
|
||||||
border-style: solid;
|
border-style: solid;
|
||||||
border-width: 1px;
|
border-width: 1px;
|
||||||
border-radius: 0.5em;
|
border-radius: 0.5em;
|
||||||
padding: 0.1em 0.5em;
|
padding: 0.1em 0.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--bottom {
|
.automation-list-box--bottom {
|
||||||
margin-top: 0.5em;
|
margin-top: 0.5em;
|
||||||
margin-bottom: 0.5em;
|
margin-bottom: 0.5em;
|
||||||
@@ -102,7 +116,8 @@
|
|||||||
justify-content: space-around;
|
justify-content: space-around;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
.automation-list-box--bottom > button {
|
|
||||||
|
.automation-list-box--bottom>button {
|
||||||
background-color: #070;
|
background-color: #070;
|
||||||
color: var(--primary-accent);
|
color: var(--primary-accent);
|
||||||
padding: 0.5em 2em;
|
padding: 0.5em 2em;
|
||||||
|
|||||||
@@ -13,10 +13,12 @@ export default {
|
|||||||
|
|
||||||
|
|
||||||
const Template: ComponentStory<typeof AutomationListBox> = args => {
|
const Template: ComponentStory<typeof AutomationListBox> = args => {
|
||||||
const [autos, setAutos] = useState(args.automations)
|
const [selected, setSelected] = useState(args.selected)
|
||||||
console.log({ args })
|
|
||||||
return <div className="page">
|
return <div className="page">
|
||||||
<AutomationListBox {...args} automations={autos} />
|
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
|
||||||
|
setSelected(i)
|
||||||
|
args.onSelectAutomation(i)
|
||||||
|
}} />
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import { TrashIcon } from "components/Icons";
|
|||||||
|
|
||||||
export type Props = {
|
export type Props = {
|
||||||
automations: AutomationData[];
|
automations: AutomationData[];
|
||||||
|
selected: number;
|
||||||
onSelectAutomation: (i: number) => void;
|
onSelectAutomation: (i: number) => void;
|
||||||
onRemove: (i: number) => void;
|
onRemove: (i: number) => void;
|
||||||
onAdd: () => void;
|
onAdd: () => void;
|
||||||
@@ -16,6 +17,7 @@ export type Props = {
|
|||||||
|
|
||||||
export const AutomationListBox: FC<Props> = ({
|
export const AutomationListBox: FC<Props> = ({
|
||||||
automations,
|
automations,
|
||||||
|
selected,
|
||||||
onSelectAutomation,
|
onSelectAutomation,
|
||||||
onAdd,
|
onAdd,
|
||||||
onRemove,
|
onRemove,
|
||||||
@@ -23,9 +25,9 @@ export const AutomationListBox: FC<Props> = ({
|
|||||||
|
|
||||||
const tags = getTagList(automations);
|
const tags = getTagList(automations);
|
||||||
const [searchText, setSearchText] = useState('');
|
const [searchText, setSearchText] = useState('');
|
||||||
const [selected, setSelected] = useState<number[]>([]);
|
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]);
|
||||||
const filteredAutomations = filterAutomations(automations, searchText, selected, tags);
|
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags);
|
||||||
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selected, tags);
|
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selectedTagIdx, tags);
|
||||||
|
|
||||||
return <div className="automation-list-box">
|
return <div className="automation-list-box">
|
||||||
<div className="automation-list-box--nav">
|
<div className="automation-list-box--nav">
|
||||||
@@ -36,14 +38,14 @@ export const AutomationListBox: FC<Props> = ({
|
|||||||
/>
|
/>
|
||||||
<InputMultiSelect
|
<InputMultiSelect
|
||||||
label="Tags"
|
label="Tags"
|
||||||
selected={selected}
|
selected={selectedTagIdx}
|
||||||
onChange={setSelected}
|
onChange={setSelectedTagIdx}
|
||||||
options={tags}
|
options={tags}
|
||||||
max={3}
|
max={3}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="automation-list-box--body">
|
<div className="automation-list-box--body">
|
||||||
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove)}
|
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove, selected)}
|
||||||
</div>
|
</div>
|
||||||
<div className="automation-list-box--bottom">
|
<div className="automation-list-box--bottom">
|
||||||
<Button onClick={onAdd}>Add</Button>
|
<Button onClick={onAdd}>Add</Button>
|
||||||
@@ -123,13 +125,14 @@ const convertGroupsToItems = (
|
|||||||
autos: Array<[AutomationData, number]>,
|
autos: Array<[AutomationData, number]>,
|
||||||
onSelectAutomation: (i: number) => void,
|
onSelectAutomation: (i: number) => void,
|
||||||
onRemove: (i: number) => void,
|
onRemove: (i: number) => void,
|
||||||
|
selected: number,
|
||||||
) => {
|
) => {
|
||||||
if (Array.isArray(groups)) {
|
if (Array.isArray(groups)) {
|
||||||
return groups.map(i => {
|
return groups.map(i => {
|
||||||
const [auto, autoIndex] = autos[i];
|
const [auto, autoIndex] = autos[i];
|
||||||
return <div
|
return <div
|
||||||
key={i}
|
key={i}
|
||||||
className="automation-list-box--body--item"
|
className={["automation-list-box--body--item", selected === autoIndex ? 'selected' : ''].join(' ')}
|
||||||
title={`Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`}
|
title={`Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`}
|
||||||
onClick={() => onSelectAutomation(autoIndex)}
|
onClick={() => onSelectAutomation(autoIndex)}
|
||||||
>
|
>
|
||||||
@@ -158,6 +161,7 @@ const convertGroupsToItems = (
|
|||||||
autos={autos}
|
autos={autos}
|
||||||
onSelectAutomation={onSelectAutomation}
|
onSelectAutomation={onSelectAutomation}
|
||||||
onRemove={onRemove}
|
onRemove={onRemove}
|
||||||
|
selected={selected}
|
||||||
/>
|
/>
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -170,16 +174,18 @@ const AutomationListBoxGroup: FC<{
|
|||||||
autos: Array<[AutomationData, number]>,
|
autos: Array<[AutomationData, number]>,
|
||||||
onSelectAutomation: (i: number) => void,
|
onSelectAutomation: (i: number) => void,
|
||||||
onRemove: (i: number) => void;
|
onRemove: (i: number) => void;
|
||||||
|
selected: number,
|
||||||
}> = ({
|
}> = ({
|
||||||
groupName,
|
groupName,
|
||||||
groups,
|
groups,
|
||||||
autos,
|
autos,
|
||||||
onSelectAutomation,
|
onSelectAutomation,
|
||||||
onRemove,
|
onRemove,
|
||||||
|
selected,
|
||||||
}) => {
|
}) => {
|
||||||
const [open, setOpen] = useState(false);
|
const [open, setOpen] = useState(false);
|
||||||
return <div className="automation-list-box--body--group">
|
return <div className="automation-list-box--body--group">
|
||||||
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
|
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
|
||||||
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove)}
|
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove, selected)}
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
@@ -9,7 +9,6 @@
|
|||||||
|
|
||||||
.automation-list--list {
|
.automation-list--list {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
min-width: 400px;
|
|
||||||
max-width: 400px;
|
max-width: 400px;
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,70 @@
|
|||||||
|
/* none-hidden */
|
||||||
|
.automation-list--root.mobile {
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.mobile>.automation-list--list {
|
||||||
|
max-width: 100vw;
|
||||||
|
min-height: 100vh;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.mobile .automation-editor {
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.mobile .automation-list--list-hide {
|
||||||
|
transform: rotate(90deg);
|
||||||
|
left: 1.25em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.mobile .automation-editor--info-box {
|
||||||
|
min-width: 100vw;
|
||||||
|
min-height: calc(100vh - 5em);
|
||||||
|
max-width: 100vw;
|
||||||
|
max-height: calc(100vh - 5em);
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.mobile .automation-editor--info-box-inner {
|
||||||
|
margin-top: 2.5em;
|
||||||
|
padding-left: 0.5em;
|
||||||
|
padding-right: 0.5em;
|
||||||
|
margin-bottom: 2em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.mobile .automation-editor--info-box--icon {
|
||||||
|
left: 1.25em;
|
||||||
|
bottom: 0em;
|
||||||
|
background-color: var(--primary);
|
||||||
|
transform: rotate(90deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* list hide */
|
||||||
|
.automation-list--root.mobile .automation-list--list.hide {
|
||||||
|
width: 100vw;
|
||||||
|
min-height: 0;
|
||||||
|
max-height: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
|
||||||
|
transform: rotate(270deg);
|
||||||
|
position: fixed;
|
||||||
|
top: 0.75em;
|
||||||
|
z-index: 20;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* info box hide */
|
||||||
|
.automation-list--root.mobile .automation-editor--info-box.hide {
|
||||||
|
width: 100vw;
|
||||||
|
min-height: 0;
|
||||||
|
max-height: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon {
|
||||||
|
transform: rotate(270deg);
|
||||||
|
position: fixed;
|
||||||
|
top: 0.75em;
|
||||||
|
background-color: var(--green-opaque);
|
||||||
|
z-index: 30;
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
|
import "./index.mobile.css";
|
||||||
import { AutomationEditor } from "components/AutomationEditor";
|
import { AutomationEditor } from "components/AutomationEditor";
|
||||||
import { FC, useState } from "react";
|
import { FC, useState } from "react";
|
||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
@@ -8,6 +9,7 @@ import { ButtonIcon } from "components/Icons/ButtonIcons";
|
|||||||
import { ApiService } from "apiService/core";
|
import { ApiService } from "apiService/core";
|
||||||
import { AutomationListBox } from "./AutomationListBox";
|
import { AutomationListBox } from "./AutomationListBox";
|
||||||
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
|
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
|
||||||
|
import useWindowSize from "utils/useWindowSize";
|
||||||
|
|
||||||
|
|
||||||
interface AutomationListParams {
|
interface AutomationListParams {
|
||||||
@@ -29,19 +31,25 @@ export const AutomationList: FC<AutomationListParams> = ({
|
|||||||
// state
|
// state
|
||||||
const [hideList, setHideList] = useState(false);
|
const [hideList, setHideList] = useState(false);
|
||||||
const [current, setCurrent] = useState(0);
|
const [current, setCurrent] = useState(0);
|
||||||
|
const { isMobile } = useWindowSize();
|
||||||
// alias
|
// alias
|
||||||
const currentAuto = automations.length > 0 ? automations[current] : null;
|
const currentAuto = automations.length > 0 ? automations[current] : null;
|
||||||
const automationListListCls = "automation-list--list" + (hideList ? " hide" : " show")
|
|
||||||
// render
|
// render
|
||||||
return <div className="automation-list--root">
|
return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}>
|
||||||
<div className={automationListListCls}>
|
<div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}>
|
||||||
<AutomationListBox
|
<AutomationListBox
|
||||||
automations={automations}
|
automations={automations}
|
||||||
onAdd={() => {
|
onAdd={() => {
|
||||||
onAdd(defaultAutomation(`shortu-${automations.length}`));
|
onAdd(defaultAutomation(`shortu-${automations.length}`));
|
||||||
setCurrent(automations.length)
|
setCurrent(automations.length)
|
||||||
}}
|
}}
|
||||||
onSelectAutomation={setCurrent}
|
onSelectAutomation={i => {
|
||||||
|
setCurrent(i);
|
||||||
|
if (isMobile) {
|
||||||
|
setHideList(true)
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
selected={current}
|
||||||
onRemove={onRemove}
|
onRemove={onRemove}
|
||||||
/>
|
/>
|
||||||
<ButtonIcon
|
<ButtonIcon
|
||||||
|
|||||||
@@ -46,9 +46,7 @@ export const DAGNode: FC<{ data: DAGNodeProps }> = ({
|
|||||||
{label}
|
{label}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div className={classes.rightEdge} onClick={() => {
|
<div className={classes.rightEdge} onClick={onEditClick}>
|
||||||
console.log('editing me', label, onEditClick, onEditClick())
|
|
||||||
}}>
|
|
||||||
<button className={classes.buttonEdit}>
|
<button className={classes.buttonEdit}>
|
||||||
<PencilIcon size={1.1} color={theme.green} />
|
<PencilIcon size={1.1} color={theme.green} />
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
|
|||||||
{...args}
|
{...args}
|
||||||
{...state}
|
{...state}
|
||||||
onTriggerUpdate={trigger => {
|
onTriggerUpdate={trigger => {
|
||||||
console.log({ trigger })
|
|
||||||
setState({ ...state, trigger })
|
setState({ ...state, trigger })
|
||||||
}}
|
}}
|
||||||
onSequenceUpdate={sequence => setState({ ...state, sequence })}
|
onSequenceUpdate={sequence => setState({ ...state, sequence })}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { FC, useState } from "react";
|
import { FC, useState } from "react";
|
||||||
|
|
||||||
import ReactFlow, { MiniMap, Controls } from 'react-flow-renderer';
|
import ReactFlow, { Controls } from 'react-flow-renderer';
|
||||||
import { AutomationSequenceNode } from "types/automations";
|
import { AutomationSequenceNode } from "types/automations";
|
||||||
import { AutomationTrigger } from 'types/automations/triggers';
|
import { AutomationTrigger } from 'types/automations/triggers';
|
||||||
import { triggerToFlow } from "./triggerConvertor";
|
import { triggerToFlow } from "./triggerConvertor";
|
||||||
@@ -127,7 +127,6 @@ export const DAGAutomationFlow: FC<Props> = ({
|
|||||||
nodesDraggable={false}
|
nodesDraggable={false}
|
||||||
{...flowData}
|
{...flowData}
|
||||||
>
|
>
|
||||||
<MiniMap />
|
|
||||||
<Controls />
|
<Controls />
|
||||||
</ReactFlow>
|
</ReactFlow>
|
||||||
</>;
|
</>;
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ const mockSequenceUpdater = (defaultState: AutomationSequenceNode[] = []) => {
|
|||||||
state,
|
state,
|
||||||
s => {
|
s => {
|
||||||
state = s
|
state = s
|
||||||
console.log(state, s)
|
|
||||||
},
|
},
|
||||||
ms => modalStates.push(ms)
|
ms => modalStates.push(ms)
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -26,9 +26,6 @@ export const InputList: FC<Props<any>> = ({
|
|||||||
{...selattr} value={current}
|
{...selattr} value={current}
|
||||||
onChange={e => {
|
onChange={e => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
console.log(e.currentTarget.id)
|
|
||||||
console.log(e.currentTarget.value)
|
|
||||||
console.log(e.currentTarget.innerHTML)
|
|
||||||
if (e.currentTarget.id === 'invalid') {
|
if (e.currentTarget.id === 'invalid') {
|
||||||
onChange(options[0])
|
onChange(options[0])
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ export default function InputYaml<T>({
|
|||||||
});
|
});
|
||||||
const setText = (t: string) => {
|
const setText = (t: string) => {
|
||||||
try {
|
try {
|
||||||
console.log(yaml.dump(yaml.load(t)));
|
|
||||||
setState({ text: t, error: undefined })
|
setState({ text: t, error: undefined })
|
||||||
} catch (_) {
|
} catch (_) {
|
||||||
setState({ text: t, error: "! Invalid Yaml !" })
|
setState({ text: t, error: "! Invalid Yaml !" })
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ export const InAModal: ComponentStory<typeof MultiNodeEditor> = props => {
|
|||||||
|
|
||||||
const [open, setOpen] = useState(false);
|
const [open, setOpen] = useState(false);
|
||||||
const [state, setState] = useState(props.sequence);
|
const [state, setState] = useState(props.sequence);
|
||||||
console.log({ state })
|
|
||||||
return <div className="page">
|
return <div className="page">
|
||||||
<Button onClick={() => setOpen(!open)}>Open Editor</Button>
|
<Button onClick={() => setOpen(!open)}>Open Editor</Button>
|
||||||
<Modal open={open}>
|
<Modal open={open}>
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ export const useMultiNodeEditorState = (props: MultiNodeEditorProps) => {
|
|||||||
internalNodeModified,
|
internalNodeModified,
|
||||||
} = state;
|
} = state;
|
||||||
const setState = (a: MultiNodeEditorInternalState) => {
|
const setState = (a: MultiNodeEditorInternalState) => {
|
||||||
console.log('setting state', a)
|
|
||||||
_setState(a)
|
_setState(a)
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -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>
|
||||||
|
}
|
||||||
@@ -16,8 +16,8 @@ export const {
|
|||||||
primaryLightOpaque: 'var(--primary-light-opaque)',
|
primaryLightOpaque: 'var(--primary-light-opaque)',
|
||||||
secondary: 'var(--secondary)',
|
secondary: 'var(--secondary)',
|
||||||
secondaryOpaque: 'var(--secondary-opaque)',
|
secondaryOpaque: 'var(--secondary-opaque)',
|
||||||
primaryAccent: 'var(--primary-acccent)',
|
primaryAccent: 'var(--primary-accent)',
|
||||||
primaryAccentLight: 'var(--primary-acccent-light)',
|
primaryAccentLight: 'var(--primary-accent-light)',
|
||||||
secondaryAccent: 'var(--secondary-accent)',
|
secondaryAccent: 'var(--secondary-accent)',
|
||||||
condition: {
|
condition: {
|
||||||
primaryColor: 'var(--condition-primary)',
|
primaryColor: 'var(--condition-primary)',
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { AutomationTrigger } from 'types/automations/triggers';
|
|||||||
|
|
||||||
|
|
||||||
export const getNodeType = (node: AutomationNode): AutomationNodeTypes => {
|
export const getNodeType = (node: AutomationNode): AutomationNodeTypes => {
|
||||||
console.log({ node })
|
|
||||||
if ('condition' in node) {
|
if ('condition' in node) {
|
||||||
return 'condition'
|
return 'condition'
|
||||||
} else if ('platform' in node) {
|
} else if ('platform' in node) {
|
||||||
|
|||||||
@@ -5,27 +5,24 @@ interface Size {
|
|||||||
width: number;
|
width: number;
|
||||||
height: number;
|
height: number;
|
||||||
ratioWbh: number;
|
ratioWbh: number;
|
||||||
|
isMobile: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Hook
|
// Hook
|
||||||
export default function useWindowSize(): Size {
|
export default function useWindowSize(mobileRatioInd: number = 0.8): Size {
|
||||||
|
|
||||||
// Initialize state with undefined width/height so server and client renders match
|
// Initialize state with undefined width/height so server and client renders match
|
||||||
// Learn more here: https://joshwcomeau.com/react/the-perils-of-rehydration/
|
// Learn more here: https://joshwcomeau.com/react/the-perils-of-rehydration/
|
||||||
const [windowSize, setWindowSize] = useState<Size>({
|
const [windowSize, setWindowSize] = useState<Size>(makeUpdate(window, mobileRatioInd));
|
||||||
width: window.innerWidth,
|
|
||||||
height: window.innerHeight,
|
// alias
|
||||||
ratioWbh: window.innerWidth / window.innerHeight,
|
|
||||||
});
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
// Handler to call on window resize
|
// Handler to call on window resize
|
||||||
function handleResize() {
|
function handleResize() {
|
||||||
// Set window width/height to state
|
// Set window width/height to state
|
||||||
setWindowSize({
|
setWindowSize(makeUpdate(window, mobileRatioInd));
|
||||||
width: window.innerWidth,
|
|
||||||
height: window.innerHeight,
|
|
||||||
ratioWbh: window.innerWidth / window.innerHeight,
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add event listener
|
// Add event listener
|
||||||
@@ -40,3 +37,10 @@ export default function useWindowSize(): Size {
|
|||||||
|
|
||||||
return windowSize;
|
return windowSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const makeUpdate = (w: Window, mobileRatioInd: number): Size => ({
|
||||||
|
width: w.innerWidth,
|
||||||
|
height: w.innerHeight,
|
||||||
|
ratioWbh: w.innerWidth / w.innerHeight,
|
||||||
|
isMobile: w.innerWidth / w.innerHeight <= mobileRatioInd,
|
||||||
|
})
|
||||||
Reference in new issue
Block a user