Compare commits

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

No files matched your search

+1 -9
View File
@@ -1,12 +1,4 @@
webapp/node_modules
webapp/build
webapp/.storybook
webapp/.vscode
webapp/.env.local
webapp/tmux.sh
api/.env
api/.coverage
api/venv
api/build
api/.mypy_cache
api/.vscode
api/.coverage
-109
View File
@@ -1,109 +0,0 @@
name: Build
on:
workflow_dispatch:
inputs:
version:
type: string
description: "Version Number"
push:
branch: [main]
jobs:
metadata:
runs-on: ubuntu-latest
name: Metadata
outputs:
version: ${{ steps.version.outputs.VERSION }}
steps:
- name: Check out repository
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Get Version
id: version
shell: bash
run: |
if [ -z "${INPUT_VERSION}" ]; then
echo ::set-output name=VERSION::$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
else
echo ::set-output name=VERSION::${INPUT_VERSION}
fi
env:
INPUT_VERSION: ${{ github.event.inputs.version }}
- name: ${{ steps.version.outputs.VERSION }}
shell: bash
run: |
echo ${{ steps.version.outputs.VERSION }}
deploy:
runs-on: ubuntu-latest
name: Build & Publish ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
if: github.event_name != 'pull_request'
needs:
- metadata
strategy:
matrix:
arch:
- "aarch64"
- "amd64"
- "armhf"
- "armv7"
- "i386"
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.10.0
with:
all_but_latest: true
access_token: ${{ github.token }}
- name: Check out repository
uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 16
cache: "yarn"
cache-dependency-path: webapp/yarn.lock
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: "Save version number"
run: echo "REACT_APP_BUILD_VERSION=${{ needs.metadata.outputs.version }}" > ./webapp/.env.production
- name: "Build Web"
run: cd webapp && yarn install && yarn build
- name: ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
uses: home-assistant/builder@2022.07.0
with:
args: |
--${{ matrix.arch }} \
--no-latest \
--version ${{ needs.metadata.outputs.version }} \
--target .
publish:
runs-on: ubuntu-latest
if: "${{ github.event.inputs.version != '' }}"
needs:
- metadata
- deploy
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,
});
+70
View File
@@ -0,0 +1,70 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"
on:
push:
branches: [ main ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
schedule:
- cron: '29 23 * * 0'
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
strategy:
fail-fast: false
matrix:
language: [ 'javascript', 'python' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support
steps:
- name: Checkout repository
uses: actions/checkout@v3
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
#- run: |
# make bootstrap
# make release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
-44
View File
@@ -1,44 +0,0 @@
name: Test Release
on:
workflow_dispatch:
inputs:
version:
type: string
description: "Version Number"
jobs:
release:
runs-on: ubuntu-latest
name: Publish Github Release
permissions:
contents: write
steps:
- name: "${{ github.event.inputs.version }}"
uses: actions/github-script@v6
env:
VERSION: "${{ github.event.inputs.version }}"
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
github.rest.repos.createRelease({
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: process.env.VERSION,
});
pre:
runs-on: ubuntu-latest
name: Publish Github PreRelease
permissions:
contents: write
steps:
- name: "${{ github.event.inputs.version }}"
uses: actions/github-script@v6
env:
VERSION: pre-${{ github.event.inputs.version }}
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
github.rest.repos.createRelease({
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: process.env.VERSION,
});
-77
View File
@@ -1,77 +0,0 @@
name: Commit Tests
on:
push:
branch:
- main
paths:
- "webapp"
- "api"
pull_request:
branch:
- main
jobs:
metadata:
runs-on: ubuntu-latest
name: Metadata
outputs:
version: ${{ steps.version.outputs.VERSION }}
steps:
- name: Check out repository
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Get Version
id: version
shell: bash
run: |
echo ::set-output name=VERSION::$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
- name: ${{ steps.version.outputs.VERSION }}
shell: bash
run: |
echo ${{ steps.version.outputs.VERSION }}
python:
name: "Python Tests"
runs-on: ubuntu-latest
needs:
- metadata
strategy:
matrix:
action:
- lint
- coverage
- security-checks
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Install Dependencies
run: cd api && make setup
- name: Echo dependencies
run: cd api && ./venv/bin/pip freeze
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
run: cd api && make ${{ matrix.action }}
nodejs:
name: "NodeJs Tests"
runs-on: ubuntu-latest
needs:
- metadata
strategy:
matrix:
action:
- "test:ci"
- "tsc:ci"
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: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
run: cd webapp && yarn ${{ matrix.action }}
-2
View File
@@ -1,2 +0,0 @@
.vscode/*.log
webapp/src/types/validators/index.test.ts
+1
View File
@@ -0,0 +1 @@
{"buildTargets":["local_logs","local_ps","local_run","local_stop"],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}}
+8
View File
@@ -0,0 +1,8 @@
make --dry-run --always-make --keep-going --print-directory
make: Entering directory '/home/ari/Projects/Shortumation'
docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml build
docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml up -d
sleep 1
docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml ps
make: Leaving directory '/home/ari/Projects/Shortumation'
+1 -4
View File
@@ -8,8 +8,5 @@
"*test_*.py"
],
"python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": true,
"yaml.schemas": {
"https://json.schemastore.org/github-action.json": ".github/workflows/*.yml"
}
"python.testing.unittestEnabled": true
}
+362
View File
@@ -0,0 +1,362 @@
make all --print-data-base --no-builtin-variables --no-builtin-rules --question
make: *** No rule to make target 'all'. Stop.
# GNU Make 4.3
# Built for x86_64-pc-linux-gnu
# Copyright (C) 1988-2020 Free Software Foundation, Inc.
# License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
# This is free software: you are free to change and redistribute it.
# There is NO WARRANTY, to the extent permitted by law.
# Make data base, printed on Fri May 13 17:20:44 2022
# Variables
# environment
GDK_BACKEND = x11
# environment
LC_ALL = C
# environment
NO_AT_BRIDGE = 1
# environment
PNPM_HOME = /home/ari/.local/share/pnpm
# environment
GTK_RC_FILES = /etc/gtk/gtkrc:/home/ari/.gtkrc:/home/ari/.config/gtkrc
# environment
VSCODE_IPC_HOOK_EXTHOST = /run/user/1000/vscode-ipc-f9d84edd-b084-4e53-beee-9f25f2f79698.sock
# environment
KONSOLE_DBUS_SERVICE = :1.8038
# environment
LC_NAME = en_CA.UTF-8
# environment
LC_NUMERIC = en_CA.UTF-8
# environment
VSCODE_CWD = /home/ari/Projects/Shortumation
# environment
WINDOWID = 1
# environment
LC_ADDRESS = en_CA.UTF-8
# default
MAKE_COMMAND := make
# automatic
@D = $(patsubst %/,%,$(dir $@))
# environment
GDK_DPI_SCALE = 1
# environment
KONSOLE_VERSION = 211203
# environment
VSCODE_HANDLES_UNCAUGHT_ERRORS = true
# default
.VARIABLES :=
# environment
PWD = /home/ari/Projects/Shortumation
# automatic
%D = $(patsubst %/,%,$(dir $%))
# environment
LSCOLORS = Gxfxcxdxbxegedabagacad
# environment
MAIL = /var/spool/mail/ari
# environment
OLDPWD = /home/ari/Projects/Shortumation/api
# environment
KONSOLE_DBUS_WINDOW = /Windows/1
# automatic
^D = $(patsubst %/,%,$(dir $^))
# environment
VSCODE_LOG_STACK = false
# automatic
%F = $(notdir $%)
# environment
VSCODE_CODE_CACHE_PATH = /home/ari/.config/Code/CachedData/57fd6d0195bb9b9d1b49f6da5db789060795de47
# environment
XDG_SESSION_PATH = /org/freedesktop/DisplayManager/Session1
# environment
LANG = C
# environment
XAUTHORITY = /run/user/1000/xauth_ejBDkJ
# default
.LOADED :=
# default
.INCLUDE_DIRS = /usr/include /usr/local/include /usr/include
# environment
COLORFGBG = 15;0
# makefile
MAKEFLAGS = pqrR
# environment
PLASMA_USE_QT_SCALING = 1
# makefile
CURDIR := /home/ari/Projects/Shortumation
# environment
VSCODE_PIPE_LOGGING = true
# environment
APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL = true
# automatic
*D = $(patsubst %/,%,$(dir $*))
# environment
PAM_KWALLET5_LOGIN = /run/user/1000/kwallet5.socket
# environment
MFLAGS = -pqrR
# default
.SHELLFLAGS := -c
# environment
QT_LINUX_ACCESSIBILITY_ALWAYS_ON = 1
# environment
WAYLAND_DISPLAY = wayland-0
# environment
XDG_CONFIG_DIRS = /home/ari/.config/kdedefaults:/etc/xdg
# automatic
+D = $(patsubst %/,%,$(dir $+))
# environment
XCURSOR_THEME = breeze_cursors
# environment
XDG_SESSION_DESKTOP = KDE
# makefile (from 'Makefile', line 1)
MAKEFILE_LIST := Makefile
# automatic
@F = $(notdir $@)
# environment
VSCODE_VERBOSE_LOGGING = true
# environment
VSCODE_PID = 164826
# environment
XDG_SESSION_TYPE = wayland
# automatic
?D = $(patsubst %/,%,$(dir $?))
# environment
SESSION_MANAGER = local/ari-laptop:@/tmp/.ICE-unix/1646,unix/ari-laptop:/tmp/.ICE-unix/1646
# automatic
*F = $(notdir $*)
# environment
CHROME_DESKTOP = code-url-handler.desktop
# environment
DBUS_SESSION_BUS_ADDRESS = unix:path=/run/user/1000/bus
# automatic
<D = $(patsubst %/,%,$(dir $<))
# environment
VSCODE_NLS_CONFIG = {"locale":"en-gb","availableLanguages":{},"_languagePackSupport":true}
# default
MAKE_HOST := x86_64-pc-linux-gnu
# makefile
SHELL = /bin/sh
# default
MAKECMDGOALS := all
# environment
XDG_ACTIVATION_TOKEN = kwin-5
# environment
SHLVL = 2
# environment
PROFILEHOME =
# environment
MAKELEVEL := 0
# default
MAKE = $(MAKE_COMMAND)
# environment
PATH = /home/ari/.local/share/pnpm:/home/ari/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/home/ari/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/home/ari/.local/bin:/home/ari/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/usr/lib/servo:/home/ari/.local/share/coursier/bin:/usr/local/go/bin
# environment
NIX_SSL_CERT_FILE = /etc/ssl/certs/ca-certificates.crt
# default
MAKEFILES :=
# environment
LANGUAGE =
# environment
LC_MONETARY = en_CA.UTF-8
# environment
MOTD_SHOWN = pam
# automatic
^F = $(notdir $^)
# environment
LC_TIME = en_CA.UTF-8
# environment
VSCODE_LOG_NATIVE = false
# environment
LC_TELEPHONE = en_CA.UTF-8
# environment
GDK_SCALE = 1
# automatic
?F = $(notdir $?)
# environment
KDE_APPLICATIONS_AS_SCOPE = 1
# makefile (from 'Makefile', line 1)
DC = docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
# environment
XDG_SEAT = seat0
# environment
XDG_CURRENT_DESKTOP = KDE
# environment
LS_COLORS = rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.webp=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:
# automatic
+F = $(notdir $+)
# environment
XDG_SEAT_PATH = /org/freedesktop/DisplayManager/Seat0
# environment
LESS = -R
# environment
DESKTOP_SESSION = plasmawayland
# environment
ORIGINAL_XDG_CURRENT_DESKTOP = KDE
# 'override' directive
GNUMAKEFLAGS :=
# environment
LOGNAME = ari
# environment
XDG_VTNR = 2
# makefile
.DEFAULT_GOAL := local_run
# environment
SYSTEMD_EXEC_PID = 1544
# environment
DISPLAY = :1
# environment
USER = ari
# default
MAKE_VERSION := 4.3
# environment
KDE_SESSION_UID = 1000
# environment
NIX_PROFILES = /nix/var/nix/profiles/default /home/ari/.nix-profile
# environment
KONSOLE_DBUS_SESSION = /Sessions/2
# environment
QT_WAYLAND_FORCE_DPI = 96
# environment
LC_MEASUREMENT = en_CA.UTF-8
# environment
XKB_DEFAULT_LAYOUT = us
# environment
PAGER = less
# environment
_ = /usr/bin/make
# environment
LC_PAPER = en_CA.UTF-8
# environment
XDG_RUNTIME_DIR = /run/user/1000
# environment
COLORTERM = truecolor
# environment
XDG_SESSION_CLASS = user
# environment
VSCODE_AMD_ENTRYPOINT = vs/workbench/api/node/extensionHostProcess
# environment
GTK2_RC_FILES = /etc/gtk-2.0/gtkrc:/home/ari/.gtkrc-2.0:/home/ari/.config/gtkrc-2.0
# environment
HOME = /home/ari
# environment
ELECTRON_RUN_AS_NODE = 1
# environment
VSCODE_IPC_HOOK = /run/user/1000/vscode-76568338-1.67.0-main.sock
# environment
TERM = xterm-256color
# environment
XDG_SESSION_ID = 2
# environment
XCURSOR_SIZE = 24
# default
.RECIPEPREFIX :=
# automatic
<F = $(notdir $<)
# default
SUFFIXES :=
# environment
QT_AUTO_SCREEN_SCALE_FACTOR = 0
# environment
VSCODE_CLI = 1
# environment
ELECTRON_NO_ATTACH_CONSOLE = 1
# environment
SHELL_SESSION_ID = e4f012979f714ed4b074886cbaddcbcd
# environment
KDE_SESSION_VERSION = 5
# default
.FEATURES := target-specific order-only second-expansion else-if shortest-stem undefine oneshell nocomment grouped-target extra-prereqs archives jobserver output-sync check-symlink guile load
# environment
KDE_FULL_SESSION = true
# environment
LC_IDENTIFICATION = en_CA.UTF-8
# variable set hash-table stats:
# Load=130/1024=13%, Rehash=0, Collisions=12/160=8%
# Pattern-specific Variable Values
# No pattern-specific variable values.
# Directories
# . (device 66306, inode 17047758): 19 files, no impossibilities.
# 19 files, no impossibilities in 1 directories.
# Implicit Rules
# No implicit rules.
# Files
local_run:
# Implicit rule search has not been done.
# Modification time never checked.
# File has not been updated.
# recipe to execute (from 'Makefile', line 4):
$(DC) build
$(DC) up -d
sleep 1
$(DC) ps
# Not a target:
Makefile:
# Implicit rule search has been done.
# Last modified 2022-04-13 11:23:36.575524961
# File has been updated.
# Successfully updated.
local_ps:
# Implicit rule search has not been done.
# Modification time never checked.
# File has not been updated.
# recipe to execute (from 'Makefile', line 13):
$(DC) ps
# Not a target:
.DEFAULT:
# Implicit rule search has not been done.
# Modification time never checked.
# File has not been updated.
# Not a target:
all:
# Command line target.
# Implicit rule search has been done.
# File does not exist.
# File has not been updated.
local_logs:
# Implicit rule search has not been done.
# Modification time never checked.
# File has not been updated.
# recipe to execute (from 'Makefile', line 10):
$(DC) logs -f
local_stop:
# Implicit rule search has not been done.
# Modification time never checked.
# File has not been updated.
# recipe to execute (from 'Makefile', line 17):
$(DC) stop
# files hash-table stats:
# Load=8/1024=1%, Rehash=0, Collisions=0/18=0%
# VPATH Search Paths
# No 'vpath' search paths.
# No general ('VPATH' variable) search path.
# strcache buffers: 1 (0) / strings = 28 / storage = 296 B / avg = 10 B
# current buf: size = 8162 B / used = 296 B / count = 28 / avg = 10 B
# strcache performance: lookups = 36 / hit rate = 22%
# hash-table stats:
# Load=28/8192=0%, Rehash=0, Collisions=0/36=0%
# Finished Make data base on Fri May 13 17:20:44 2022
+3 -114
View File
@@ -1,116 +1,4 @@
# Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge)
## [0.3.2] - Fixed Addon Image for arm-based devices
- Using hypercon instead of uvicorn (this losses the rust dependency which makes it easier to install on arm)
- Pre-building web assets outside of docker (this takes the image size down and speeds up instaltion of addon)
- Updated build scripts to actually fail installation when build/prep steps fail
- Ensured that builds for all architecture run successfully
- Re-worked github actions (quicker test phases)
## [0.3.1] - Increased Pagination + Restricted Repeat Node
- Increased pagination to display up to 10,000 autos for now
- Repeat node now has types
## [0.3.0] - Complete Refactor of Graphs
- Added visual support for
- Repeat Nodes
- Parallel Nodes
- Using collections for conditions & triggers
- Fixed several bugs with improper alerts
- Fixed graph breakage during zoom
- Support for enable/disable nodes in UI
![image](https://user-images.githubusercontent.com/7451445/179135734-8d7ca46d-7e6f-4975-abc3-de86a48de0c0.png)
![image](https://user-images.githubusercontent.com/7451445/179135790-a5e77e2b-6d42-4810-a27b-ff4d165e99ec.png)
![image](https://user-images.githubusercontent.com/7451445/179135916-8083aab5-bee1-4d27-b19d-9e000ca012f9.png)
## [0.1.22] - Many Visual improvements
- Deprecated several custom components in favor of mui.com
- Device Editor now has support for 99% of diplay types
- Condition Device is implemented
- Improved naming autogen for trigger & choose
## [0.1.21] - Service Editor
- first version of service editor
- reloading automations on save
## [0.1.20] - UI Bugfixes
- Using MUI elements for input time
- Added delay action / wait_on_triggers action
- Added enabled/disabled flag in node editor
- Optional flip vertical during desktop mode
- Fixed up modal clipping
## [0.1.19] - Vertical mobile mode
- in mobile mode we draw the graphs vertically now
## [0.1.17] - Websockets
- Connected to HA main websocket -- now we retrieve real-time information about
- Device names
- Entity names/ids
- Autocomplete for devices and entities
## [0.1.14] - Material UI + Autocomplete
- Brought some Material UI elements for input and text
- Autocomplete for tags
- Using 'id' as alias for trigger (as it seems to break HA otherwise)
- Not using 'alias' for conditions, always auto-generating it (again, this used to break HA)
- Added missing `data` object to service-actions
## [0.1.13] - YAML
- Better YAML
- Rewrote yaml parser/loader to use pyyaml and safe mode
- Cleaned up description vs alias
## [0.1.12] - Less Intense Error Messages
- Added more node-based errors (this way it's easier to see where validations failed)
- Made the validators less strict in order to capture more edge cases that HA supports
- Nicer auto-generated descriptions for some trigger nodes
## [0.1.10] - More Bug Fixes
- Allowing null or undefined values for metadata fields
- Trigger.platform==time will now have the .at property better supported
## [0.1.9] - Fixed up invalid types for various triggers
- Some triggers had invalid types and were causing a false-positive validation
## [0.1.8] - Support for Malformed Automations
- API will no longer error out on missing values or invalid lists
- Frontend has support for displaying bad automations
## [0.1.6] - Mobile Mode
- Improved mobile mode
- Fixed up arrow styles due to typos
- Added selection color
## [0.1.2] - Docker Hub Images
- Publishing images to docker hub is now stable
## [0.0.15] - Publish to dockerhub
- Publishing images to docker hub
# Changelog
## [0.0.14] - Using vanila ha yaml
@@ -137,7 +25,8 @@
## [0.0.9] - First Working Version
- Instalable verion via github
- Initial POC done
- Initial POC done
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+27 -24
View File
@@ -1,36 +1,41 @@
# <--- Pre-Build Args -->
# <--- Build Args -->
ARG BUILD_ARCH
# <--- Main Image -->
FROM python:3.9.13-slim-buster
WORKDIR /app
# <--- Post-Build Args -->
ARG BUILD_VERSION
# <--- Environment Variables -->
ENV BUILD_VERSION $BUILD_VERSION
# <--- Image Setup -->
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
WORKDIR /app
# <--- System Wide Dependencies -->
ENV LANG C.UTF-8
RUN apt-get update -y && \
apt-get install -y gcc git build-essential libtool automake curl
# <--- Scripts -->
COPY docker/bin /app/bin
# <--- PREP -->
RUN /app/bin/prep.sh
RUN apk add --no-cache \
nodejs \
npm \
build-base \
python3-dev
RUN pip install -U wheel setuptools pip && \
npm i -g yarn
# <--- Python Dependencies -->
COPY api/setup.py /app/setup.py
RUN pip install . /app
# <--- BUILD -->
RUN /app/bin/build.sh /app
# <--- Webapp Build -->
COPY webapp/ /app/web-builder
RUN cd /app/web-builder && \
yarn && \
yarn build && \
cp -r /app/web-builder/build /app/web && \
rm -rf /app/web-builder
# <--- Api Code -->
COPY api/src /app/src
COPY webapp/build /app/web
COPY run.sh /app/run.sh
RUN chmod +x /app/run.sh
# <--- Environment Variables -->
ENV HASSIO_TOKEN ""
ENV BUILD_VERSION $BUILD_VERSION
# <--- Ports -->
EXPOSE 8000
@@ -38,9 +43,7 @@ EXPOSE 8000
# <--- Final -->
LABEL \
io.hass.type="addon" \
io.hass.arch="armhf|aarch64|i386|amd64|armv7"
io.hass.arch="armhf|aarch64|i386|amd64"
ENTRYPOINT [ "/app/bin/run.sh" ]
CMD [ "/app" ]
CMD [ "/app/run.sh" ]
LABEL org.opencontainers.image.source https://github.com/asosnovsky/Shortumation
+6 -34
View File
@@ -1,46 +1,18 @@
BUILD_TAG=$(shell git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
DC=BUILD_TAG=${BUILD_TAG} docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
build-with-builder:
docker run \
--rm \
--privileged \
-v ~/.docker:/root/.docker \
-v /var/run/docker.sock:/var/run/docker.sock:ro \
-v ${PWD}:/data \
homeassistant/amd64-builder \
--amd64 \
--test \
--version ${BUILD_TAG} \
-t /data
build:
cd webapp && yarn build
local_run:
$(DC) build
build-no-cache:
cd webapp && yarn buil
$(DC) build --no-cache
push:
$(DC) push
start:
$(DC) up -d
sleep 1
$(DC) ps
logs:
local_logs:
$(DC) logs -f
ps:
local_ps:
$(DC) ps
stop:
local_stop:
$(DC) stop
bash:
$(DC) exec addon bash
config:
$(DC) config
+8 -71
View File
@@ -1,42 +1,8 @@
# Shortumation ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=platsic)
# Shortumation
[![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [![Build](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml)
| | Stable | Edge
| --- | --- | ---
| Version | ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-amd64?&sort=date&label=&style=for-the-badge)
![image](https://user-images.githubusercontent.com/7451445/165433007-371cc1f1-39cf-4857-8bba-331d4048750e.png)
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
Sort and organize your home-assistant automations using tags!
![image](https://user-images.githubusercontent.com/7451445/179136346-cf04a8c0-ac4e-44b2-b9fe-806824864660.png)
Utilize the auto-generated node descriptions to understand what your automation is doing! No more reading YAML to just understand what 1 node does!
![image](https://user-images.githubusercontent.com/7451445/179137357-455260f3-2cdd-44ca-ae62-084ed7c59ebd.png)
More condense UI for service calls!
![image](https://user-images.githubusercontent.com/7451445/179137126-93601ea9-435f-4c4f-8f21-0d09cd61c7a2.png)
Visualize complex 'choose' or 'if/else' nodes
![image](https://user-images.githubusercontent.com/7451445/179135734-8d7ca46d-7e6f-4975-abc3-de86a48de0c0.png)
Visualize parallel nodes!
![image](https://user-images.githubusercontent.com/7451445/179136706-695912d7-e223-42d9-a27b-f330b021a56a.png)
Visualize repeat nodes!
![image](https://user-images.githubusercontent.com/7451445/179135790-a5e77e2b-6d42-4810-a27b-ff4d165e99ec.png)
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
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/).
## Features
@@ -44,41 +10,12 @@ A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI
- [X] See all automations in one common view
- [X] Automation Manager
- [X] Tags for automation organization
- [X] Autocomplete fields for entities/devices
- [X] Visualize parallel/repeat/choose/if-else nodes
- [X] Autogenerate node names
- [ ] Clean error reporting
- [ ] Script Editor
- [ ] Script Manager
- [ ] Use secrets and global parameters
- [ ] Autocomplete fields for entities/devices
- [ ] Autocomplete fields for template editor
- [ ] Autocomplete fields for referencing scripts
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
## Installation
### Addon
Add the repository URL under **Supervisor → Add-on store → ⋮ → Manage add-on repositories**:
https://github.com/asosnovsky/Shortumation
It should now appear in your `Add-on Store` and you should be able to install it!
### Containerized
Please note that this way of using Shortumation is **not future proof**, currently we use the `/config/automation.yaml` file as our source of truth for the automations. Which means that we do not need access to the HA API or Websockets. In future release you may need to configure some additional compomenents to enable this.
If this warning does not scare you or you still want to try things out, then take a look at the example [docker-compose.yaml](example/containerized/docker-compose.yaml).
## FAQ
**How is this different from Node-Red?**
> Node-Red is both an execution engine and an automation editor, which means that in order for your automations to run you have to have an additional component running and executing the automations. Shortumation simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database)
**Which HA Installation does this support?**
> Currently this is only tested on HA OS. However, you should be able to get it working supervised installations as well (as they support addons). If you want to make it work for Container or Core, you will need to do some additional leg-work and I welcome a PR to get this working (it should be just a matter of mounting the `/config` path to the container running the images in this repo).
**Which version of HA does this require?**
> Since I am working on this project on my own, I can only test it against my own HA installations at home, and I tend to keep things as up to date as possible. The lowest version of HA this was tested on is `core-2022.5.4`
-12
View File
@@ -1,12 +0,0 @@
# Security Policy
## Supported Versions
| Version | Supported |
| ------- | ------------------ |
| 0.1.x | :white_check_mark: |
## Reporting a Vulnerability
Please open an issue with the tag 'Vulnerability', and include your reasoning in it.
-14
View File
@@ -1,14 +0,0 @@
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:17)
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:28)
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:32)
read_details # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:10)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:10)
websocket_endpoint # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/socket.py:9)
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:18)
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:19)
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:11)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:12)
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
+3 -3
View File
@@ -10,7 +10,7 @@ setup:
$(PIP) install .[dev]
lint:
$(VENV_BIN)/vulture src .vulture_whitelist
$(VENV_BIN)/vulture --exclude src
$(MAKE) lint-project
$(MAKE) lint-tests
@@ -33,7 +33,7 @@ test:
coverage:
$(VENV_BIN)/coverage run -m unittest discover tests
$(VENV_BIN)/coverage report -m --fail-under=80
$(VENV_BIN)/coverage report -m --fail-under=90
clean:
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
@@ -43,4 +43,4 @@ clean:
run-local:
rm -f web
ln -s ../webapp/build web
USE_EXAMPLE_REPO=1 $(VENV_BIN)/hypercorn src.app:app --reload
USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload
-12
View File
@@ -29,15 +29,3 @@ exclude = '''
[tool.coverage.run]
omit = ["./venv/*", "tests/*"]
[[tool.mypy.overrides]]
module = "decouple.*"
ignore_missing_imports = true
[[tool.mypy.overrides]]
module = "ruamel.*"
ignore_missing_imports = true
[[tool.mypy.overrides]]
module = "tests.*"
ignore_missing_imports = true
+14 -16
View File
@@ -4,26 +4,24 @@ import setuptools # type: ignore
setuptools.setup(
python_requires=">=3.9",
install_requires=[
"PyYAML==6.0",
"fastapi==0.78.0",
"pydantic==1.9.1",
"hypercorn==0.13.2",
"python-decouple==3.6",
"websockets==10.3"
"ruamel.yaml==0.17.17",
"fastapi==0.70.0",
"pydantic==1.8.2",
"uvicorn[standard]==0.15.0",
"python-decouple==3.5",
],
extras_require={
"dev": [
"mypy==0.961",
"mypy==0.910",
"mypy-extensions==0.4.3",
"black==22.6.0",
"bandit==1.7.4",
"isort==5.10.1",
"coverage==6.4.1",
"pre-commit==2.19.0",
"vulture==2.4",
"types-requests==2.28.0",
"types-PyYAML==6.0.9",
"requests==2.28.1",
"black==21.7b0",
"bandit==1.7.0",
"isort==5.9.3",
"coverage==5.5",
"pre-commit==2.13.0",
"vulture==2.3",
"types-requests==2.25.6",
"requests==2.27.0",
],
},
)
+7 -13
View File
@@ -1,18 +1,17 @@
from sys import prefix
from fastapi import FastAPI
from fastapi.middleware.cors import CORSMiddleware
from fastapi.staticfiles import StaticFiles
from fastapi.middleware.cors import CORSMiddleware
from src.automations.manager import AutomationManager
from src.env import API_PREFIX, ORIGIN, ROOT_FOLDER
from .routes import automations, details, ping, socket
from src.env import ROOT_FOLDER, ORIGIN
from .routes import ping, automations, details
def make_app(automation_mgr: AutomationManager) -> FastAPI:
app = FastAPI()
if (ROOT_FOLDER / "web").exists():
app.mount(
f"{API_PREFIX}/web",
"/web",
StaticFiles(
directory=ROOT_FOLDER / "web",
html=True,
@@ -29,11 +28,6 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
allow_headers=["*"],
)
app.include_router(ping.router, prefix="/ping")
app.include_router(
automations.make_automation_router(automation_mgr), prefix=f"{API_PREFIX}/automations"
)
app.include_router(
details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details"
)
app.include_router(socket.router, prefix=f"{API_PREFIX}/socket")
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations")
app.include_router(details.make_details_router(automation_mgr.hass_config), prefix="/details")
return app
+3 -9
View File
@@ -1,14 +1,12 @@
from fastapi import APIRouter, HTTPException
from src.automations.manager import AutomationManager
from src.api.types import (
DeleteAutoRequest,
ListData,
ListParams,
UpdateAutoRequest,
UpdateTags,
)
from src.automations.errors import FailedDeletion
from src.automations.manager import AutomationManager
from src.automations.types import AutomationData
@@ -26,15 +24,11 @@ def make_automation_router(automations: AutomationManager) -> APIRouter:
),
)
@router.post("/item")
@router.post("")
def upsert_auto(body: UpdateAutoRequest):
automations.update(body.index, body.data)
@router.post("/item/tags")
def update_tags(body: UpdateTags):
automations.update_tags(body.automation_id, body.tags)
@router.delete("/item")
@router.delete("")
def delete_auto(body: DeleteAutoRequest):
try:
automations.delete(body.index)
+5 -5
View File
@@ -1,21 +1,21 @@
from fastapi import APIRouter
from datetime import datetime
from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
from src.hass_config import HassConfig
from src.env import BUILD_VERSION
def make_details_router(hass_config: HassConfig) -> APIRouter:
router = APIRouter()
@router.get("/")
def read_details():
def read_ping():
return {
"version": BUILD_VERSION,
"hassio_token": HASSIO_TOKEN,
"hassio_url": HASSIO_WS,
"config": hass_config.get_configuration_path(),
"tags": hass_config.get_automation_tags_path(),
"autos": hass_config.get_automation_path(),
}
return router
return router
+1 -2
View File
@@ -1,6 +1,5 @@
from datetime import datetime
from fastapi import APIRouter
from datetime import datetime
from src.env import BUILD_VERSION
-39
View File
@@ -1,39 +0,0 @@
import asyncio
import json
from fastapi import APIRouter, WebSocket, WebSocketDisconnect
from src.logger import get_logger
from src.ws_redirect import WSRedirector
router = APIRouter()
logger = get_logger(__name__)
@router.websocket("/api/websocket")
async def websocket_endpoint(websocket: WebSocket):
async def on_message(msg: str):
await websocket.send_text(msg)
conn = WSRedirector(
on_message=on_message,
)
async def wait_for_data():
while True:
try:
msg_str = await websocket.receive_text()
msg_d = json.loads(msg_str)
if msg_d.get("type") != "auth":
await conn.send(msg_str)
except WebSocketDisconnect:
logger.info("Websocket closed.")
await conn.close()
break
await websocket.accept()
await asyncio.gather(
conn.start(),
wait_for_data(),
)
+1 -8
View File
@@ -1,9 +1,7 @@
from typing import Dict, Generic, List, TypeVar
from typing import Generic, List, TypeVar
from pydantic import BaseModel
from pydantic.fields import Field
from pydantic.generics import GenericModel
from src.automations.types import ExtenededAutomationData
DataT = TypeVar("DataT")
@@ -25,10 +23,5 @@ class UpdateAutoRequest(BaseModel):
data: ExtenededAutomationData
class UpdateTags(BaseModel):
automation_id: str = Field(description="Automation Id to update")
tags: Dict[str, str]
class DeleteAutoRequest(BaseModel):
index: int = Field(description="Index of the automation to update")
+1 -1
View File
@@ -1,6 +1,6 @@
from src.api.app import make_app
from src.automations.manager import AutomationManager
from src.hass_config import find_hass_config
from src.api.app import make_app
hass_config = find_hass_config()
app = make_app(AutomationManager(hass_config))
+1 -4
View File
@@ -1,8 +1,5 @@
class AutomationLoaderException(Exception):
def __init__(self, *args: object, **kwargs) -> None:
super().__init__(
"".join(map(str, args)) + ",".join((f"{k}={v}" for k, v in kwargs.items())),
)
pass
class InvalidAutomationFile(AutomationLoaderException):
+13 -22
View File
@@ -1,12 +1,8 @@
from typing import Any, Iterator, Union
from typing import Iterator, Union
from pydantic.error_wrappers import ValidationError
from src.json_serializer import normalize_obj
from .errors import InvalidAutomationFile
from .types import AutomationMetdata, ExtenededAutomationData
from .errors import InvalidAutomationFile
# Single loader
def load_automation(
@@ -26,35 +22,30 @@ def load_automation(
try:
yield ExtenededAutomationData(
metadata=AutomationMetdata.parse_obj(auto_raw),
condition=ifempty_or_null_then_list(load_conditions(auto_raw.get("condition", []))),
sequence=ifempty_or_null_then_list(load_conditions(auto_raw.get("action", []))),
trigger=ifempty_or_null_then_list(normalize_obj(auto_raw.get("trigger", []))),
condition=load_conditions(auto_raw.get("condition", [])),
sequence=load_conditions(auto_raw.get("action", [])),
trigger=normalize_obj(auto_raw.get("trigger", [])),
tags=tags,
)
except ValidationError as err:
raise InvalidAutomationFile from err
def ifempty_or_null_then_list(obj: Any):
if not isinstance(obj, list):
return []
else:
return obj
def load_conditions(conditions: Union[dict, list, str]):
if isinstance(conditions, list):
return list(map(ensure_condition_dictionary, conditions))
elif not conditions:
return []
else:
return [ensure_condition_dictionary(conditions)]
return [
ensure_condition_dictionary(conditions)
]
def ensure_condition_dictionary(c: Union[str, dict]):
c = normalize_obj(c)
if isinstance(c, str):
return {"condition": "template", "value_template": c}
return {
"condition": "template",
"value_template": c
}
elif isinstance(c, dict):
return c
raise InvalidAutomationFile(f"Invalid type for condition object {c}")
raise InvalidAutomationFile(f"Invalid type for condition object {c}")
+10 -20
View File
@@ -1,9 +1,7 @@
from typing import Dict, Iterator, List, Optional
from src.automations.errors import FailedDeletion, InvalidAutomationFile
from typing import Iterator, List, Optional
from src.automations.errors import FailedDeletion
from src.automations.types import AutomationData, ExtenededAutomationData
from src.hass_config.loader import HassConfig
from .loader import load_automation
@@ -22,40 +20,32 @@ class AutomationManager:
continue
if i >= offset + limit:
break
yield from load_automation(auto, tags.get(auto.get("id", ""), {}))
yield from load_automation(auto, tags.get(i, {}))
def get(self, index: int) -> Optional[ExtenededAutomationData]:
def get(self, index: int) -> Optional[AutomationData]:
tags = self.hass_config.automation_tags
if index >= 0:
for i, auto in enumerate(self.hass_config.automations):
if not isinstance(auto, dict):
raise InvalidAutomationFile(automation_index=i)
if i == index:
return next(load_automation(auto, tags.get(auto.get("id", ""), {})))
return next(load_automation(auto, tags.get(i, {})))
return None
def update(self, index: int, automation: ExtenededAutomationData):
tags = self.hass_config.automation_tags
automations: List[dict] = []
updated_index: Optional[int] = None
updated = False
for i, orig_auto in enumerate(self.hass_config.automations):
if i == index:
automations.append(automation.to_primitive())
updated_index = i
updated = True
else:
automations.append(orig_auto)
if updated_index is None:
if not updated:
automations.append(automation.to_primitive())
updated_index = len(automations) - 1
tags[automation.metadata.id] = automation.tags
tags[index] = automation.tags
self.hass_config.save_automations(automations)
self.hass_config.save_tags(tags)
def update_tags(self, auto_id: str, tags: Dict[str, str]):
autos_tags = self.hass_config.automation_tags
autos_tags[auto_id] = tags
self.hass_config.save_tags(autos_tags)
def delete(self, index: int):
automations: List[dict] = []
deleted = False
+7 -6
View File
@@ -1,14 +1,15 @@
from pathlib import Path
from typing import Dict
from src.yaml_serializer import dump_yaml, load_yaml
class TagManager(Dict[str, Dict[str, str]]):
class TagManager(Dict[int, Dict[str, str]]):
def save(self, path: Path):
path.write_text(dump_yaml(dict(self)))
@classmethod
def load(cls, path: Path):
with path.open("r") as fp:
return cls(load_yaml(fp))
with path.open('r') as fp:
return cls(load_yaml(fp))
+5 -8
View File
@@ -1,22 +1,20 @@
from typing import Dict, List, Optional, Union
from pydantic import BaseModel
from typing import Dict, List, Literal, Optional, Union
from pydantic.fields import Field
from pydantic import BaseModel
class AutomationMetdata(BaseModel):
id: str
alias: Optional[str] = None
description: Optional[str] = None
trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None
mode: str = "single"
mode: Literal["single", "restart", "queued", "parallel"] = "single"
class AutomationData(BaseModel):
metadata: AutomationMetdata
trigger: List[dict] = []
condition: List[dict] = []
sequence: List[dict] = []
sequence: List[dict] = []
def to_primitive(self):
return {
@@ -26,6 +24,5 @@ class AutomationData(BaseModel):
"action": self.sequence,
}
class ExtenededAutomationData(AutomationData):
tags: Dict[str, str] = Field(default_factory=dict)
tags: Dict[str, str] = Field(default_factory=dict)
-28
View File
@@ -1,28 +0,0 @@
import argparse
from pathlib import Path
from typing import Dict, List
import yaml
def convert_tags(automations: List[dict], tags: Dict[int, dict]) -> Dict[str, dict]:
converted = {}
for tagsIdx, tagValues in tags.items():
if tagsIdx < len(automations):
auto = automations[tagsIdx]
converted[auto["id"]] = tagValues
else:
print(f"WARN: tags index = {tagsIdx} is out of bounds")
return converted
if __name__ == "__main__":
parser = argparse.ArgumentParser()
parser.add_argument("-i", dest="input", required=True, type=Path)
args = parser.parse_args()
auto_path: Path = args.input / "automations.yaml"
tags_path: Path = args.input / ".shortumations" / "tags.yaml"
automations = yaml.safe_load(auto_path.read_text())
tags = yaml.safe_load(tags_path.read_text())
converted = convert_tags(automations, tags)
tags_path.write_text(yaml.dump(converted))
+3 -5
View File
@@ -1,11 +1,9 @@
from email.policy import default
from decouple import config, Csv
from pathlib import Path
from decouple import Csv, config
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
HASSIO_TOKEN = config("SUPERVISOR_TOKEN", "")
HASSIO_WS = config("HASSIO_WS", "ws://supervisor/core/websocket")
LOG_LEVEL = config("LOG_LEVEL", "INFO")
API_PREFIX = config("API_PREFIX", "")
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
+7 -12
View File
@@ -1,8 +1,7 @@
import os
from pathlib import Path
from typing import cast
from decouple import config
from pathlib import Path
from .loader import HassConfig
@@ -10,18 +9,14 @@ def find_hass_config() -> HassConfig:
"""Try to find HASS config."""
if config("USE_EXAMPLE_REPO", False, cast=bool):
print("using USE_EXAMPLE_REPO")
from tests.utils import (
HA_CONFIG3_EXAMPLE,
create_copy_of_example_config,
)
path = create_copy_of_example_config(HA_CONFIG3_EXAMPLE)
from tests.utils import create_copy_of_example_config
path = create_copy_of_example_config()
print("|-> ", path)
return HassConfig(path)
config_dir = Path("/config")
if config_dir.is_dir():
return HassConfig(config_dir)
if "HASSIO_TOKEN" in os.environ:
return HassConfig(Path("/config"))
"""Put together the default configuration directory based on the OS."""
data_dir = Path(config("APPDATA", None) if os.name == "nt" else os.path.expanduser("~"))
+5 -5
View File
@@ -1,10 +1,9 @@
from pathlib import Path
from typing import List, Optional
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 import load_yaml, dump_yaml
from src.yaml_serializer.types import IncludedYaml
from .errors import MissingFile
@@ -26,7 +25,7 @@ class HassConfig:
except FileNotFoundError as err:
raise MissingFile("automations.yaml") from err
return self.configurations["automation"]
@property
def automation_tags(self) -> TagManager:
tag_path = self.get_automation_tags_path()
@@ -36,6 +35,7 @@ class HassConfig:
else:
return TagManager.load(tag_path)
def get_automation_tags_path(self) -> Path:
return self.root_path / ".shortumations" / "tags.yaml"
@@ -66,4 +66,4 @@ class HassConfig:
)
def save_tags(self, tags: TagManager):
tags.save(self.get_automation_tags_path())
tags.save(self.get_automation_tags_path())
-1
View File
@@ -34,7 +34,6 @@ def normalize_obj(obj: Any) -> Any:
or isinstance(obj, int)
or isinstance(obj, float)
or isinstance(obj, bool)
or obj is None
):
return obj
else:
-4
View File
@@ -14,7 +14,3 @@ else:
logging.basicConfig(level=logging.NOTSET)
logger = logging.getLogger()
def get_logger(name: str):
return logging.getLogger(name)
-59
View File
@@ -1,59 +0,0 @@
import asyncio
import json
from typing import Callable, Coroutine, Optional
from websockets.client import WebSocketClientProtocol, connect
from websockets.exceptions import ConnectionClosedOK
from src.env import HASSIO_TOKEN, HASSIO_WS
from src.logger import get_logger, logger
OnMessage = Callable[[str], Coroutine]
logger = get_logger(__name__)
class WSRedirector:
def __init__(
self,
on_message: OnMessage,
token: str = HASSIO_TOKEN,
host: str = HASSIO_WS,
) -> None:
self._host = host
self._token = token
self._on_message = on_message
self._client: Optional[WebSocketClientProtocol] = None
self._close: bool = False
@property
def is_closed(self):
return self._close
async def send(self, msg: str):
if self._client:
return await self._client.send(msg)
async def start(self):
async with connect(self._host) as websocket:
self._client = websocket
await websocket.send(json.dumps({"type": "auth", "access_token": self._token}))
while not self.is_closed:
try:
msg = await websocket.recv()
# logger.debug(f"HA MSG :--> {msg} {self.is_closed}")
await self.process_message(msg)
except ConnectionClosedOK:
pass
logger.info("Closing socket...")
await websocket.close()
logger.info("Closed socket")
async def process_message(self, msg: str):
await self._on_message(msg)
async def close(self):
self._close = True
await self._client.close()
def __del__(self):
asyncio.create_task(self.close())
+4 -15
View File
@@ -1,10 +1,6 @@
import io
from typing import Any, TextIO, Union
import yaml
from src.yaml_serializer.dumper import YamlSafeDumper
from src.yaml_serializer.loader import YamlSafeLoader
from typing import Any, Union, TextIO
from src.yaml_serializer.base_yaml import yaml
def dump_yaml(obj: Any) -> str:
@@ -17,14 +13,7 @@ def dump_yaml(obj: Any) -> str:
str
"""
stream = io.StringIO()
yaml.dump( # nosec
obj,
stream,
default_flow_style=False,
allow_unicode=True,
sort_keys=False,
Dumper=YamlSafeDumper,
)
yaml.dump(obj, stream)
stream.seek(0)
return stream.read()
@@ -38,4 +27,4 @@ def load_yaml(yaml_stream: TextIO) -> Union[dict, list]:
Returns:
List[dict, list]
"""
return yaml.load(yaml_stream, Loader=YamlSafeLoader) # nosec
return yaml.load(yaml_stream)
+14
View File
@@ -0,0 +1,14 @@
from ruamel.yaml import YAML
from src.yaml_serializer.types import IncludedYaml, IncludedYamlDir, SecretValue
yaml = YAML()
yaml.register_class(IncludedYaml)
yaml.register_class(SecretValue)
yaml.register_class(IncludedYamlDir)
yaml.constructor.add_constructor("!include", IncludedYaml.from_yaml)
yaml.constructor.add_constructor("!secret", SecretValue.from_yaml)
yaml.constructor.add_constructor("!env_var", IncludedYamlDir.from_yaml)
yaml.constructor.add_constructor("!include_dir_list", IncludedYamlDir.from_yaml)
yaml.constructor.add_constructor("!include_dir_merge_list", IncludedYamlDir.from_yaml)
yaml.constructor.add_constructor("!include_dir_named", IncludedYamlDir.from_yaml)
yaml.constructor.add_constructor("!include_dir_merge_named", IncludedYamlDir.from_yaml)
-16
View File
@@ -1,16 +0,0 @@
import yaml
from src.yaml_serializer.types import (
IncludedYaml,
IncludedYamlDir,
SecretValue,
)
class YamlSafeDumper(yaml.SafeDumper):
pass
YamlSafeDumper.add_representer(IncludedYaml, IncludedYaml.to_yaml) # type: ignore
YamlSafeDumper.add_representer(SecretValue, SecretValue.to_yaml) # type: ignore
YamlSafeDumper.add_representer(IncludedYamlDir, IncludedYamlDir.to_yaml) # type: ignore
-20
View File
@@ -1,20 +0,0 @@
import yaml
from src.yaml_serializer.types import (
IncludedYaml,
IncludedYamlDir,
SecretValue,
)
class YamlSafeLoader(yaml.SafeLoader):
pass
YamlSafeLoader.add_constructor("!include", IncludedYaml.from_yaml)
YamlSafeLoader.add_constructor("!secret", SecretValue.from_yaml)
YamlSafeLoader.add_constructor("!env_var", IncludedYamlDir.from_yaml)
YamlSafeLoader.add_constructor("!include_dir_list", IncludedYamlDir.from_yaml)
YamlSafeLoader.add_constructor("!include_dir_merge_list", IncludedYamlDir.from_yaml)
YamlSafeLoader.add_constructor("!include_dir_named", IncludedYamlDir.from_yaml)
YamlSafeLoader.add_constructor("!include_dir_merge_named", IncludedYamlDir.from_yaml)
+2 -3
View File
@@ -1,7 +1,6 @@
from typing import NamedTuple
from yaml.nodes import Node
from yaml.representer import BaseRepresenter
from ruamel.yaml.nodes import Node
from ruamel.yaml.representer import BaseRepresenter
class IncludedYaml(NamedTuple):
@@ -1,15 +0,0 @@
- 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
@@ -1,2 +0,0 @@
# empty configuration file
cloud:
@@ -1,77 +0,0 @@
'1616887975473':
Type: HA
'1616888026264':
Type: HA
'1619371298367':
Room: Living
Type: Button
'1620239986670':
Room: Kitchen
Type: Button
'1620324780561':
Room: Kitchen
Type: Button
'1621352850204':
Room: Kitchen
Type: Button
'1622210698281':
Room: Kitchen
Type: Button
'1622769811245':
Room: Living
Type: Button
'1623430479201':
Room: Baby
Type: Button
'1623642118976':
Room: Baby
Type: Button
'1624640900951':
Room: Baby
Type: Button
'1628024070687':
Room: Baby
Type: Routine
'1628024123214':
Room: Baby
Type: Routine
'1628444671951':
Room: Office
Type: Window
'1629309267204':
Room: Balcony
Type: Door
'1629422438707':
Type: Routine
'1634497376234':
Room: Baby
Type: Button
'1635539262562':
Type: Routine
'1636428429596':
Type: Routine
'1639500650865':
Room: Bedroom
Type: Door
'1641617168123':
Type: Ensure Power
'1648071019802':
Type: Ensure Power
'1649426399020':
Room: Office
Type: Motion
'1649432254675':
Room: Baby
Type: Routine
'1649726828269':
Climate: Heat
Type: Climate
'1649727810678':
Climate: Time
Type: Climate
'1649820885714':
Type: Routine
'1649947692702':
BadOne: true
Room: Bedroom
Type: Button
File diff suppressed because it is too large. Load diff
@@ -1,2 +0,0 @@
# empty configuration file
cloud:
@@ -1,77 +1,77 @@
'1616887975473':
0:
Type: HA
'1616888026264':
1:
Type: HA
'1619371298367':
2:
Type: Button
Room: Living
3:
Type: Button
'1620239986670':
Room: Kitchen
4:
Type: Button
'1620324780561':
Room: Kitchen
5:
Type: Button
'1621352850204':
Room: Kitchen
6:
Type: Button
'1622210698281':
Room: Kitchen
7:
Type: Button
'1622769811245':
Room: Living
8:
Type: Button
'1623430479201':
Room: Baby
9:
Type: Button
'1623642118976':
Room: Baby
10:
Type: Button
'1624640900951':
Room: Baby
Type: Button
'1628024070687':
Room: Baby
11:
Type: Routine
'1628024123214':
Room: Baby
12:
Type: Routine
'1628444671951':
Room: Office
Room: Baby
13:
Type: Window
'1629309267204':
Room: Balcony
Type: Door
'1629422438707':
Type: Routine
'1634497376234':
Room: Baby
Type: Button
'1635539262562':
Type: Routine
'1636428429596':
Type: Routine
'1639500650865':
Room: Bedroom
Type: Door
'1641617168123':
Type: Ensure Power
'1648071019802':
Type: Ensure Power
'1649426399020':
Room: Office
Type: Motion
'1649432254675':
Room: Baby
14:
Type: Door
Room: Balcony
15:
Type: Routine
'1649726828269':
Climate: Heat
Type: Climate
'1649727810678':
Climate: Time
Type: Climate
'1649820885714':
Type: Routine
'1649947692702':
BadOne: true
Room: Bedroom
16:
Type: Button
Room: Baby
17:
Type: Routine
18:
Type: Routine
19:
Type: Door
Room: Bedroom
20:
Type: Ensure Power
21:
Type: Ensure Power
22:
Type: Motion
Room: Office
23:
Type: Routine
Room: Baby
24:
Type: Climate
Climate: Heat
25:
Type: Climate
Climate: Time
26:
Type: Routine
27:
Type: Button
Room: Bedroom
BadOne: yes
-28
View File
@@ -811,31 +811,3 @@
device_id: das2qdasdasdasadaasd
default: []
mode: single
- id: 'baddy-1'
alias: 'bad triggers'
description: ''
trigger: ""
condition: []
action: []
mode: single
- id: 'baddy-2'
alias: 'null things'
description: ''
trigger:
condition:
action:
mode: single
- id: 'baddy-3'
alias: 'big null things'
description:
trigger:
condition:
action:
mode: single
- id: 'bad mode'
alias: 'bade mode'
description: ""
trigger: []
condition: []
action: []
mode: bad
+200 -200
View File
@@ -1,15 +1,9 @@
from ruamel.yaml import YAML
from unittest import TestCase
import yaml
from fastapi.testclient import TestClient
from src.api.app import make_app
from src.automations.types import (
AutomationData,
AutomationMetdata,
ExtenededAutomationData,
)
from tests.utils import HA_CONFIG2_EXAMPLE, get_example_automation_loader
from src.automations.types import AutomationData, AutomationMetdata, ExtenededAutomationData
from tests.utils import get_example_automation_loader
class BaseTestCase(TestCase):
@@ -23,9 +17,6 @@ class BaseTestCase(TestCase):
class automation_list_tests(BaseTestCase):
test_params = {"total": 32, "subtest2_found_items": 7, "subtest1_found_items": 10}
def test_get_list_of_everything(self):
data = self.client.post(
"/automations/list",
@@ -43,8 +34,8 @@ class automation_list_tests(BaseTestCase):
"limit": 50,
},
)
self.assertEqual(d["totalItems"], self.test_params["total"])
self.assertEqual(len(d["data"]), self.test_params["total"])
self.assertEqual(d["totalItems"], 28)
self.assertEqual(len(d["data"]), 28)
def test_subset1(self):
data = self.client.post(
@@ -63,8 +54,8 @@ class automation_list_tests(BaseTestCase):
"limit": 10,
},
)
self.assertEqual(d["totalItems"], self.test_params["total"])
self.assertEqual(len(d["data"]), self.test_params["subtest1_found_items"])
self.assertEqual(d["totalItems"], 28)
self.assertEqual(len(d["data"]), 10)
def test_subset2(self):
data = self.client.post(
@@ -83,48 +74,32 @@ class automation_list_tests(BaseTestCase):
"limit": 10,
},
)
self.assertEqual(d["totalItems"], self.test_params["total"])
self.assertEqual(len(d["data"]), self.test_params["subtest2_found_items"])
class automation2_lists_tests(automation_list_tests):
test_params = {
"total": 1,
"subtest2_found_items": 0,
"subtest1_found_items": 1,
}
def setUp(self) -> None:
(
self.config_folder,
self.hass_config,
self.automation_loader,
) = get_example_automation_loader(HA_CONFIG2_EXAMPLE)
self.client = TestClient(make_app(self.automation_loader))
self.assertEqual(d["totalItems"], 28)
self.assertEqual(len(d["data"]), 3)
class automation_update_tests(BaseTestCase):
def test_insert_new(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
self.assertEqual(resp.json()["totalItems"], 32)
self.assertEqual(resp.json()["totalItems"], 28)
resp = self.client.post(
"/automations/item",
"/automations",
json={
"index": 33,
"index": 29,
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
},
)
self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 32})
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 28})
data = resp.json()
self.assertEqual(data["totalItems"], 33)
self.assertEqual(data["totalItems"], 29)
self.assertEqual(data["data"][0]["metadata"]["id"], "testme")
def test_update_some(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
original_auto = resp.json()["data"][0]
resp = self.client.post(
"/automations/item",
"/automations",
json={
"index": 20,
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
@@ -134,203 +109,228 @@ class automation_update_tests(BaseTestCase):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
new_auto = resp.json()["data"][0]
self.assertNotEqual(original_auto, new_auto)
self.assertEqual(
ExtenededAutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto
)
self.assertEqual(ExtenededAutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto)
def test_consistent_standard_1(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 15})
original_auto = resp.json()["data"][0]
original_auto["metadata"]["alias"] = "I CHANGED!"
original_auto['metadata']['alias'] = "I CHANGED!"
resp = self.client.post(
"/automations/item",
"/automations",
json={
"index": 15,
"data": original_auto,
},
)
self.assertEqual(resp.status_code, 200)
with (self.config_folder / "automations.yaml").open("r") as fp:
disk_data = dict(yaml.safe_load(fp)[15])
trigger = list(map(dict, disk_data.pop("trigger")))
condition = disk_data.pop("condition")
action = list(map(dict, disk_data.pop("action")))
self.assertDictEqual(
disk_data,
{"id": "1629422438707", "alias": "I CHANGED!", "description": "", "mode": "single"},
)
self.assertListEqual(
trigger, [{"platform": "time", "at": "input_datetime.vita_night_pump_time"}]
)
self.assertListEqual(
condition,
[
{
"conditions": [
{
"condition": "time",
"after": "input_datetime.vita_night_pump_time",
"before": "00:00:00",
},
{"condition": "time", "after": "00:00:00", "before": "06:00:00"},
],
"condition": "and",
},
],
)
self.assertListEqual(
action,
[
{
"service": "light.turn_on",
"target": {"entity_id": "light.bulb_staircase", "area_id": "living_room"},
"data": {"brightness_pct": 40, "transition": 15},
with (self.config_folder / "automations.yaml").open('r') as fp:
disk_data = dict(YAML().load(fp)[15])
trigger = list(map(dict, disk_data.pop('trigger')))
condition = disk_data.pop('condition')
action = list(map(dict, disk_data.pop('action')))
self.assertDictEqual(disk_data, {
"id": "1629422438707",
"alias": "I CHANGED!",
"description": "",
"mode": "single"
})
self.assertListEqual(trigger, [
{"platform": "time", "at": "input_datetime.vita_night_pump_time"}
])
self.assertListEqual(condition, [{
"conditions": [
{"condition": "time", "after": "input_datetime.vita_night_pump_time", "before": "00:00:00"},
{"condition": "time", "after": "00:00:00", "before": "06:00:00"}
],
"condition": "and"
}, ])
self.assertListEqual(action, [
{
"service": "light.turn_on",
"target": {
"entity_id": "light.bulb_staircase",
"area_id": "living_room"
},
"data": {
"brightness_pct": 40,
"transition": 15
}
],
)
}
])
def test_consistent_standard_2(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 27})
original_auto = resp.json()["data"][0]
original_auto["metadata"]["alias"] = "I CHANGED!"
original_auto['metadata']['alias'] = "I CHANGED!"
resp = self.client.post(
"/automations/item",
"/automations",
json={
"index": 27,
"data": original_auto,
},
)
self.assertEqual(resp.status_code, 200)
with (self.config_folder / "automations.yaml").open("r") as fp:
disk_data = dict(yaml.safe_load(fp)[27])
trigger = list(map(dict, disk_data.pop("trigger")))
condition = disk_data.pop("condition")
action = list(map(dict, disk_data.pop("action")))
self.assertDictEqual(
disk_data,
{"id": "1649947692702", "alias": "I CHANGED!", "description": "", "mode": "single"},
)
self.assertListEqual(
trigger,
[
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_on",
"id": "turn_on",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_off",
"id": "turn_off",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_up",
"id": "dim_up",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_down",
"id": "dim_down",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_double_press",
"subtype": "turn_on",
"id": "up_dbclk",
},
],
)
with (self.config_folder / "automations.yaml").open('r') as fp:
disk_data = dict(YAML().load(fp)[27])
trigger = list(map(dict, disk_data.pop('trigger')))
condition = disk_data.pop('condition')
action = list(map(dict, disk_data.pop('action')))
self.assertDictEqual(disk_data, {
"id": "1649947692702",
"alias": "I CHANGED!",
"description": "",
"mode": "single"
})
self.assertListEqual(trigger, [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_on",
"id": "turn_on"
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_off",
"id": "turn_off"
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_up",
"id": "dim_up"
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_down",
"id": "dim_down"
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_double_press",
"subtype": "turn_on",
"id": "up_dbclk"
}
])
self.assertListEqual(condition, [])
self.assertListEqual(
action,
[
self.assertListEqual(action, [
{
"choose": [
{
"choose": [
"conditions": [
{
"conditions": [{"condition": "trigger", "id": "turn_off"}],
"sequence": [
{
"type": "turn_off",
"device_id": "das2qdasdasdasadaasd",
"entity_id": "light.bulb_ari_lamp",
"domain": "light",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "turn_on"}],
"sequence": [
{
"service": "light.turn_on",
"data": {"color_temp": 153, "brightness_pct": 100},
"target": {"device_id": "das2qdasdasdasadaasd"},
}
],
},
{
"conditions": [{"condition": "trigger", "id": "dim_up"}],
"sequence": [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_increase",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "dim_down"}],
"sequence": [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_decrease",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "up_dbclk"}],
"sequence": [
{
"service": "light.turn_on",
"data": {"color_temp": 500, "brightness_pct": 100},
"target": {"device_id": "das2qdasdasdasadaasd"},
}
],
},
"condition": "trigger",
"id": "turn_off"
}
],
"default": [],
"sequence": [
{
"type": "turn_off",
"device_id": "das2qdasdasdasadaasd",
"entity_id": "light.bulb_ari_lamp",
"domain": "light"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "turn_on"
}
],
"sequence": [
{
"service": "light.turn_on",
"data": {
"color_temp": 153,
"brightness_pct": 100
},
"target": {
"device_id": "das2qdasdasdasadaasd"
}
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "dim_up"
}
],
"sequence": [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_increase"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "dim_down"
}
],
"sequence": [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_decrease"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "up_dbclk"
}
],
"sequence": [
{
"service": "light.turn_on",
"data": {
"color_temp": 500,
"brightness_pct": 100
},
"target": {
"device_id": "das2qdasdasdasadaasd"
}
}
]
}
],
)
"default": []
}
])
class automation_delete_tests(BaseTestCase):
def test_delete_some(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
self.assertEqual(resp.json()["totalItems"], 32)
self.assertEqual(resp.json()["totalItems"], 28)
resp = self.client.delete(
"/automations/item",
"/automations",
json={
"index": 20,
},
)
self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
self.assertEqual(resp.json()["totalItems"], 31)
self.assertEqual(resp.json()["totalItems"], 27)
+14 -11
View File
@@ -1,8 +1,13 @@
from unittest import TestCase
from src.automations.types import (
AutomationMetdata,
ExtenededAutomationData,
)
from src.automations.loader import load_automation
from src.automations.types import AutomationMetdata, ExtenededAutomationData
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
from src.yaml_serializer.types import (
SecretValue,
NOT_IMPLEMENTED_SV_MSG,
)
class loader_tests(TestCase):
@@ -26,7 +31,7 @@ class loader_tests(TestCase):
],
"mode": "single",
},
{},
{}
)
)
self.assertEqual(
@@ -39,12 +44,10 @@ class loader_tests(TestCase):
mode="single",
),
trigger=[{"platform": "homeassistant", "event": "shutdown"}],
condition=[
{
"condition": "template",
"value_template": "states(time.time) >= '10:00:00'",
}
],
condition=[{
"condition": "template",
"value_template": "states(time.time) >= '10:00:00'",
}],
sequence=[
{
"device_id": NOT_IMPLEMENTED_SV_MSG,
@@ -54,6 +57,6 @@ class loader_tests(TestCase):
"message": "Hassio Is turning off...",
}
],
tags={},
tags={}
),
)
@@ -1,5 +1,4 @@
from unittest import TestCase
from src.automations.errors import FailedDeletion, InvalidAutomationFile
from src.automations.types import AutomationMetdata, ExtenededAutomationData
from tests.utils import (
@@ -24,11 +23,11 @@ class manager_tests(TestCase):
_, _, loader = get_example_automation_loader()
self.assertIsNone(loader.get(-1))
self.assertIsNone(loader.get(1_000))
self.assertIsNone(loader.get(33))
self.assertIsNone(loader.get(31))
def test_length(self):
_, _, loader = get_example_automation_loader()
self.assertEqual(loader.get_total_items(), 32)
self.assertEqual(loader.get_total_items(), 28)
def test_bad_automations_file(self):
folder, _, manager = get_dummy_automation_loader(
@@ -51,11 +50,11 @@ class manager_tests(TestCase):
def test_create_automation_with_example_folder(self):
_, _, manager = get_example_automation_loader()
self.assertEqual(manager.get_total_items(), 32)
manager.update(40, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
auto = manager.get(32)
self.assertEqual(manager.get_total_items(), 28)
manager.update(32, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
auto = manager.get(28)
self.assertIsNotNone(auto)
self.assertEqual(manager.get_total_items(), 33)
self.assertEqual(manager.get_total_items(), 29)
self.assertEqual(auto.metadata.id, "test1") # type: ignore
def test_update_automation(self):
@@ -100,16 +99,3 @@ class manager_tests(TestCase):
self.assertEqual(manager.get_total_items(), 3)
with self.assertRaises(FailedDeletion):
manager.delete(10)
def test_save_tags(self):
_, _, manager = get_dummy_automation_loader(
[
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
],
automation_in_conifguration_mode="none",
)
manager.update_tags("test1", {"room": "bathroom"})
auto = manager.get(0)
assert auto.tags == {"room": "bathroom"}
+6 -5
View File
@@ -1,17 +1,18 @@
from pathlib import Path
from tempfile import mktemp
from unittest import TestCase
from src.automations.tags import TagManager
class tag_tests(TestCase):
def test_load_and_save(self):
tmp_file = Path(mktemp()).with_suffix(".yml")
tmp_file = Path(mktemp()).with_suffix('.yml')
tags = TagManager()
tags[0] = {"Room": "Kitchen", "Type": "Lights"}
tags[0] = {'Room': "Kitchen", "Type": 'Lights'}
tags[1] = {}
tags.save(tmp_file)
loaded_tags = TagManager.load(tmp_file)
assert loaded_tags.keys() == tags.keys()
assert loaded_tags.keys() == tags.keys()
@@ -1,5 +1,4 @@
from unittest import TestCase
from src.automations.types import AutomationData, AutomationMetdata
from src.hass_config.errors import MissingFile
from src.hass_config.loader import HassConfig
+27 -2
View File
@@ -1,8 +1,11 @@
import json
from unittest import TestCase
from ruamel.yaml.scalarstring import ScalarString
from ruamel.yaml.scalarint import ScalarInt
from ruamel.yaml.scalarbool import ScalarBoolean
from ruamel.yaml.scalarfloat import ScalarFloat
from src.yaml_serializer.types import SecretValue, NOT_IMPLEMENTED_SV_MSG
from src.json_serializer import json_dumps
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
class json_serializer_tests(TestCase):
@@ -29,3 +32,25 @@ class json_serializer_tests(TestCase):
},
),
)
def test_convert_ruamel_types(self):
self.assertEqual(
json_dumps(
{
"int": ScalarInt(1),
"float": ScalarFloat(1.3),
"bool": ScalarBoolean(False),
"list": [1, ScalarString("w")],
"tup": (1, ScalarString("w")),
}
),
json.dumps(
{
"int": 1,
"float": 1.3,
"bool": 0,
"list": [1, "w"],
"tup": (1, "w"),
},
),
)
+13 -32
View File
@@ -1,16 +1,18 @@
import io
from unittest import TestCase
from src.yaml_serializer import dump_yaml, load_yaml
from src.yaml_serializer import (
dump_yaml,
load_yaml,
)
from src.yaml_serializer.types import (
IncludedYaml,
IncludedYamlDir,
SecretValue,
IncludedYamlDir,
)
from tests.utils import SAMPLES_FOLDER
class dumping_yamls_tests(TestCase):
def test_dumping_includes(self):
yaml = dump_yaml(
{
@@ -19,29 +21,21 @@ class dumping_yamls_tests(TestCase):
)
}
)
self.assertEqual(yaml, "automations: !include 'automations.yaml'\n")
self.assertEqual(yaml, "automations: !include automations.yaml\n")
def test_dumping_secrets(self):
yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")})
self.assertEqual(yaml, "google_password: !secret 'gpass'\n")
self.assertEqual(yaml, "google_password: !secret gpass\n")
def test_dumping_stub(self):
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")})
self.assertEqual(yaml, "sensor: !include_dir_list 'sensors/*yaml'\n")
self.assertEqual(yaml, "sensor: !include_dir_list sensors/*yaml\n")
def test_load_stub(self):
yaml_obj = load_yaml(
io.StringIO(
"""
name: cool
date: "10:00"
bools:
- "yes"
- "no"
- true
- false
bobIsNull:
bobIsNull2: null
google_password: !secret gpass
sensor: !include_dir_list sensors/*yaml
automations: !include automations.yaml
@@ -52,10 +46,6 @@ class dumping_yamls_tests(TestCase):
dict(yaml_obj),
{
"name": "cool",
"date": "10:00",
"bools": ["yes", "no", True, False],
"bobIsNull": None,
"bobIsNull2": None,
"google_password": SecretValue("gpass", "n/a"),
"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"),
"automations": IncludedYaml("automations.yaml"),
@@ -63,17 +53,8 @@ class dumping_yamls_tests(TestCase):
)
self.assertEqual(
dump_yaml(yaml_obj),
"""name: cool
date: '10:00'
bools:
- 'yes'
- 'no'
- true
- false
bobIsNull: null
bobIsNull2: null
google_password: !secret 'gpass'
sensor: !include_dir_list 'sensors/*yaml'
automations: !include 'automations.yaml'
""",
"name: cool\n"
"google_password: !secret gpass\n"
"sensor: !include_dir_list sensors/*yaml\n"
f"automations: !include automations.yaml\n",
)
+6 -10
View File
@@ -1,36 +1,32 @@
from pathlib import Path
from shutil import copytree
from tempfile import mkdtemp
from pathlib import Path
from typing import List, Literal, Optional, Tuple
from src.automations.manager import AutomationManager
from src.automations.types import AutomationData
from src.hass_config.loader import HassConfig
from src.yaml_serializer import dump_yaml
from src.yaml_serializer.types import IncludedYaml
THIS_FOLDER = Path(__file__).parent
SAMPLES_FOLDER = THIS_FOLDER / "samples"
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
HA_CONFIG3_EXAMPLE = SAMPLES_FOLDER / "config-3"
def get_example_automation_loader(
config_to_copy: Path = HA_CONFIG_EXAMPLE,
) -> Tuple[Path, HassConfig, AutomationManager]:
def get_example_automation_loader() -> Tuple[Path, HassConfig, AutomationManager]:
"""Creates an example automation loader from the samples folder
Returns:
Tuple[Path, HassConfig, AutomationManager]
"""
root_folder = create_copy_of_example_config(config_to_copy)
root_folder = create_copy_of_example_config()
hass_config = HassConfig(root_folder)
automation_loader = AutomationManager(hass_config)
return root_folder, hass_config, automation_loader
def create_copy_of_example_config(config_to_copy: Path = HA_CONFIG_EXAMPLE) -> Path:
def create_copy_of_example_config() -> Path:
"""Creates a copy of the example config folder
Returns:
@@ -38,7 +34,7 @@ def create_copy_of_example_config(config_to_copy: Path = HA_CONFIG_EXAMPLE) -> P
"""
root_folder = Path(mkdtemp())
root_folder.rmdir()
copytree(config_to_copy, root_folder)
copytree(HA_CONFIG_EXAMPLE, root_folder)
return root_folder
-29
View File
@@ -1,29 +0,0 @@
import os
import yaml
from pathlib import Path
print(Path().absolute())
CONFIG_YAML = Path("config.yaml").absolute()
CHANGELOG_MD = Path("CHANGELOG.md").absolute()
print(CONFIG_YAML)
print(CHANGELOG_MD)
version = os.environ["VERSION"]
version_name = os.environ["NAME"]
change = os.environ["CHANGELOG"].splitlines()
config = yaml.load(CONFIG_YAML.read_text(), yaml.Loader)
changelog = CHANGELOG_MD.read_text().splitlines()
with CHANGELOG_MD.open("w") as fp:
for i, log in enumerate(changelog):
if i == 2:
fp.write(f"## [{version}] - {version_name}\n\n")
for clog in change:
fp.write(f"- {clog.strip()}\n")
fp.write(log.strip() + "\n")
CONFIG_YAML.write_text(yaml.dump(config))
+9 -10
View File
@@ -1,30 +1,29 @@
name: Shortumation
version: v0.3.2
version: 0.0.14
slug: shortumation
image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation"
description: "A homeassitant addon which provides better UI for automations & scripts."
arch:
- aarch64
- amd64
- armhf
- armv7
- aarch64
- amd64
- i386
startup: application
boot: auto
init: false
ingress: true
ingress_port: 8000
ingress_entry: "web/"
homeassistant_api: true
auth_api: true
panel_icon: mdi:home-automation
hassio_role: homeassistant
host_network: false
hassio_role: manager
privileged:
- SYS_RAWIO
host_network: true
auth_api: true
map:
- config:rw
options: {}
ports:
8000/tcp:
8000/tcp: 8000
ports_description:
8000/tcp: Main port for the API & Web.
+2 -3
View File
@@ -1,10 +1,9 @@
version: '3'
services:
addon:
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
image: "asosnovsky/shortumation:${ARCH:-amd64}-${BUILD_TAG:-latest}"
build:
context: "./"
dockerfile: "./Dockerfile"
args:
BUILD_ARCH: ${ARCH:-amd64}
BUILD_VERSION: ${BUILD_TAG:-edge}
- BUILD_ARCH=${ARCH:-amd64}
-3
View File
@@ -3,8 +3,5 @@ services:
addon:
volumes:
- "./sample_config:/config"
- "./api/tests:/app/tests"
ports:
- "8000:8000"
env_file:
- api/.env
-24
View File
@@ -1,24 +0,0 @@
#!/bin/bash
set -e
api_location=${1}
# web_location=${2}
function install_yarn() {
pushd $web_location
yarn
yarn build
cp -r $web_location/build $api_location/web
popd
}
function install_py() {
pushd $api_location
pip install . $api_location
popd
}
install_py
# install_yarn
echo "DONE BUILD"
-18
View File
@@ -1,18 +0,0 @@
#!/bin/bash
set -e
function prep_yarn() {
curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n
ln -s /usr/bin/nodejs /usr/bin/node
bash n lts
npm i -g yarn
}
function prep_py() {
pip install -U wheel setuptools pip Cython
}
prep_py
# prep_yarn
echo "DONE PREP"
-10
View File
@@ -1,10 +0,0 @@
#!/bin/bash
api_location=${1}
pushd $api_location
echo "--------------------"
echo "BUILD_VERSION = "$BUILD_VERSION
echo $(python --version)
echo "--------------------"
python -m hypercorn src.app:app -b "0.0.0.0:8000"
-21
View File
@@ -1,21 +0,0 @@
version: '3'
services:
homeassistant:
container_name: homeassistant
image: "ghcr.io/home-assistant/home-assistant:stable"
volumes:
- config:/config
restart: unless-stopped
privileged: true
network_mode: host
shortumation:
# make sure to replace the ARCH with whatever system you are running!
image: "asosnovsky/shortumation-${ARCH:-amd64}:latest"
volumes:
- config:/config
ports:
- 8081:8000
volumes:
config:
BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
-11
View File
@@ -1,11 +0,0 @@
{
"extends": ["config:base"],
"schedule": ["every month"],
"packageRules": [
{
"matchDepTypes": ["devDependencies"],
"matchUpdateTypes": ["patch", "minor"],
"groupName": "devDependencies (non-major)"
}
]
}
Executable
+4
View File
@@ -0,0 +1,4 @@
#!/bin/bash
echo $(python --version)
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
+1 -1
View File
@@ -1,5 +1,5 @@
0:
Type: Generic2
Type: Generic
1:
Type: Generic
2:
+1 -1
View File
@@ -1 +1 @@
SKIP_PREFLIGHT_CHECK=true
SKIP_PREFLIGHT_CHECK=true
+1 -7
View File
@@ -1,7 +1,4 @@
module.exports = {
'core': {
builder: 'webpack5'
},
"stories": [
"../src/**/*.stories.mdx",
"../src/**/*.stories.@(js|jsx|ts|tsx)"
@@ -11,8 +8,5 @@ module.exports = {
"@storybook/addon-essentials",
"@storybook/preset-create-react-app",
"@storybook/addon-queryparams",
],
"features": {
"emotionAlias": false,
},
]
}
+13 -6
View File
@@ -2,17 +2,24 @@
"version": "0.2.0",
"configurations": [
{
"name": "Debug Jest Tests",
"name": "Debug CRA Tests",
"type": "node",
"request": "launch",
"runtimeArgs": [
"--inspect-brk",
"${workspaceRoot}/node_modules/.bin/jest",
"--runInBand"
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts",
"args": [
"test",
"--runInBand",
"--no-cache",
"--watchAll=false"
],
"cwd": "${workspaceRoot}",
"protocol": "inspector",
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"port": 9229
"env": {
"CI": "true"
},
"disableOptimisticBPs": true
}
]
}
-59
View File
@@ -1,59 +0,0 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "tsc",
"problemMatcher": [],
"label": "npm: tsc",
"detail": "tsc -w",
"presentation": {
"reveal": "always",
"panel": "shared"
},
"runOptions": {
"runOn": "folderOpen"
},
"group": "test"
},
{
"type": "npm",
"script": "test",
"problemMatcher": [],
"label": "npm: test",
"detail": "test",
"presentation": {
"reveal": "always",
"panel": "shared"
},
"runOptions": {
"runOn": "folderOpen"
},
"group": "test",
},
{
"type": "npm",
"script": "storybook",
"problemMatcher": [],
"label": "npm: storybook",
"detail": "start-storybook -p 6006 -s public",
"promptOnClose": true
},
{
"type": "npm",
"script": "build",
"problemMatcher": [],
"label": "npm: build",
"detail": "react-scripts build",
"group": "build"
},
{
"type": "npm",
"script": "start",
"problemMatcher": [],
"label": "npm: start",
"detail": "react-scripts start",
"promptOnClose": true
},
]
}
+29 -52
View File
@@ -4,43 +4,25 @@
"private": true,
"homepage": ".",
"dependencies": {
"@emotion/react": "11.9.3",
"@emotion/styled": "11.9.3",
"@mui/icons-material": "5.8.4",
"@mui/material": "5.8.6",
"@mui/styles": "5.8.6",
"@types/jest": "28.1.5",
"@types/node": "17.0.36",
"@types/react": "18.0.15",
"@types/react-dom": "18.0.6",
"@types/ws": "8.5.3",
"@uiw/react-codemirror": "4.10.4",
"autosuggest-highlight": "3.3.2",
"home-assistant-js-websocket": "7.1.0",
"jss": "10.9.0",
"material-ui-confirm": "3.0.4",
"notistack": "2.0.5",
"react": "18.2.0",
"react-cookie": "4.1.1",
"react-dom": "18.2.0",
"react-flow-renderer": "10.3.8",
"react-imask": "6.4.2",
"react-jss": "10.9.0",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1",
"superstruct": "0.16.0",
"theming": "3.3.0",
"typescript": "4.7.4",
"web-vitals": "2.1.4",
"ws": "8.8.0",
"yarn": "1.22.19"
"@types/jest": "^26.0.15",
"@types/node": "^12.0.0",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"jss": "^10.8.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-flow-renderer": "^10.1.2",
"react-jss": "^10.8.2",
"react-router-dom": "6",
"react-scripts": "4.0.3",
"theming": "^3.3.0",
"typescript": "^4.1.2",
"web-vitals": "^1.0.1",
"yarn": "^1.22.17"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"tsc": "tsc -w",
"tsc:ci": "tsc",
"test:ci": "react-scripts test --ci=true --all --watchAll=false",
"test": "react-scripts test",
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
"eject": "react-scripts eject",
@@ -76,25 +58,20 @@
]
},
"devDependencies": {
"@storybook/addon-actions": "6.5.9",
"@storybook/addon-essentials": "6.5.9",
"@storybook/addon-links": "6.5.9",
"@storybook/addon-queryparams": "6.2.9",
"@storybook/builder-webpack5": "6.5.9",
"@storybook/manager-webpack5": "6.5.9",
"@storybook/node-logger": "6.5.9",
"@storybook/preset-create-react-app": "4.1.2",
"@storybook/react": "6.5.9",
"@testing-library/jest-dom": "5.16.4",
"@testing-library/react": "13.3.0",
"@testing-library/user-event": "14.2.1",
"@types/autosuggest-highlight": "3.2.0",
"@types/chroma-js": "2.1.3",
"@types/js-yaml": "4.0.5",
"jest-environment-jsdom": "28.1.2",
"ts-node": "10.8.2",
"webpack": "5.73.0",
"webpack-dev-server": "4.9.3"
"@storybook/addon-actions": "^6.4.22",
"@storybook/addon-essentials": "^6.4.22",
"@storybook/addon-links": "^6.4.22",
"@storybook/addon-queryparams": "^6.2.9",
"@storybook/node-logger": "^6.4.22",
"@storybook/preset-create-react-app": "^3.2.0",
"@storybook/react": "^6.4.22",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"@types/chroma-js": "^2.1.3",
"@types/js-yaml": "^4.0.5",
"jest-environment-jsdom": "^27.5.1",
"ts-node": "^10.4.0"
},
"moduleDirectories": [
"node_modules",
+5 -9
View File
@@ -3,21 +3,17 @@ import { Routes, Route, BrowserRouter } from "react-router-dom";
import { AutomationRoute } from 'routes/automation';
import { useConnectedApiService } from 'apiService';
import { ErrorBoundary } from 'components/ErrorBoundary';
import { CookiesProvider } from "react-cookie";
function App() {
const api = useConnectedApiService();
return (
<div className="app">
<ErrorBoundary>
<CookiesProvider>
<BrowserRouter>
<Routes>
<Route path="*" element={<AutomationRoute api={api} />} />
</Routes>
</BrowserRouter>
</CookiesProvider>
<BrowserRouter>
<Routes>
<Route path="*" element={<AutomationRoute api={api} />} />
</Routes>
</BrowserRouter>
</ErrorBoundary>
</div>
);
+14 -32
View File
@@ -1,56 +1,38 @@
import { AutomationData } from "types/automations";
import { API } from "./base";
import { ListData, ListParams } from "./types";
import {
AUTOMTAION_LIST,
AUTOMTAION_ITEM,
AUTOMTAION_ITEM_TAGS,
} from "./paths";
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths';
export const makeAutomationAPI = (api: API) => ({
async list({ offset, limit }: ListParams) {
const data = await api.makeCall<ListData<AutomationData>, ListParams>({
path: AUTOMTAION_LIST,
data: {
offset,
limit,
},
offset, limit,
}
});
return data;
},
async update({ index, auto }: { index: number; auto: AutomationData }) {
async update({index, auto}: {index: number, auto: AutomationData}) {
return await api.makeCall({
path: AUTOMTAION_ITEM,
path: AUTOMTAION_ROOT,
data: {
index,
data: auto,
data: auto
},
});
})
},
async updateTags({
automation_id,
tags,
}: {
automation_id: string;
tags: Record<string, string>;
}) {
return await api.makeCall({
path: AUTOMTAION_ITEM_TAGS,
data: {
automation_id,
tags,
},
});
},
async remove({ index }: { index: number }) {
async remove({index}: {index: number}) {
return await api.makeCall({
method: "DELETE",
path: AUTOMTAION_ITEM,
path: AUTOMTAION_ROOT,
data: {
index,
},
});
},
}
})
}
});
export type AutomationAPI = ReturnType<typeof makeAutomationAPI>;
+3 -6
View File
@@ -10,16 +10,13 @@ export const makeRemoteAPI = (baseURL: string): API => ({
data = {}
}) {
try {
const payload: RequestInit = {
const reply = await fetch(baseURL + path, {
method,
headers: {
"Content-Type": "application/json"
},
};
if (method !== 'GET') {
payload["body"] = JSON.stringify(data);
}
const reply = await fetch(baseURL + path, payload);
body: JSON.stringify(data),
});
let response: APIResponse<any>;
if (reply.status === 200) {
response = {
+10 -12
View File
@@ -1,16 +1,15 @@
import { useEffect } from "react";
import { useDefaultApiState, makeReloadAutomations } from "./util";
import { AutomationAPI } from "./automations";
import { useEffect } from 'react';
import { useDefaultApiState, makeReloadAutomations } from './util';
import { AutomationAPI } from './automations';
export type ApiService = ReturnType<typeof useAPIService>;
export const useAPIService = (automationAPI: AutomationAPI) => {
export const useAPIService = (
automationAPI: AutomationAPI
) => {
// state
const [state, setState] = useDefaultApiState();
const { reload, wrapCall } = makeReloadAutomations(
automationAPI,
state,
setState
);
const { reload, wrapCall } = makeReloadAutomations(automationAPI, state, setState);
// initial load of autos
useEffect(() => {
@@ -22,6 +21,5 @@ export const useAPIService = (automationAPI: AutomationAPI) => {
state,
removeAutomation: wrapCall(automationAPI.remove),
updateAutomation: wrapCall(automationAPI.update),
updateTags: wrapCall(automationAPI.updateTags),
};
};
}
}
+8 -11
View File
@@ -4,18 +4,15 @@ import { makeRemoteAPI } from "./base";
import { useAPIService } from './core';
import { useMockAPI } from "./mock";
const locationPrefixWeb = window.location.pathname.match(/(\/.+\/)web/i);
const baseURL = new URL(
process.env.NODE_ENV === 'development' ?
`http://${window.location.hostname}:8000` :
window.location.origin + (!locationPrefixWeb ? '' : locationPrefixWeb[1])
);
export const wsURL = baseURL + "socket"
export const remoteAutoAPI = makeRemoteAPI(
baseURL + "automations"
);
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
console.log(process.env)
export const useConnectedApiService = () => useAPIService(
makeAutomationAPI(remoteAutoAPI)
makeAutomationAPI(makeRemoteAPI(
process.env.NODE_ENV === 'development' ?
"http://localhost:8000/automations" :
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
))
);
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
makeAutomationAPI(useMockAPI(initialAutos))
+28 -64
View File
@@ -1,93 +1,57 @@
import { useMockAPI } from "./mock";
import { useMockAPI } from "./mock"
import { makeAutomationAPI } from "./automations";
import { createMockAuto } from "../utils/mocks";
import { AutomationData } from "types/automations";
import { createMockAuto } from '../utils/mocks';
const fakeUseRef = (a: any) => ({ current: a });
test("mock api uses initial autos for initial population -- empty", async () => {
test('mock api uses initial autos for initial population -- empty', async () => {
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
const data = await mockApi.list({ limit: 10, offset: 0 });
expect(data.ok).toBe(true);
expect((data as any).data.data).toHaveLength(0);
expect((data as any).data.totalItems).toBe(0);
});
})
test("mock api uses initial autos for initial population -- some data", async () => {
const initials = [createMockAuto(), createMockAuto()];
test('mock api uses initial autos for initial population -- some data', async () => {
const initials = [
createMockAuto(),
createMockAuto()
];
const mockApi = makeAutomationAPI(useMockAPI(initials, fakeUseRef as any));
const data = await mockApi.list({ limit: 10, offset: 0 });
expect(data.ok).toBe(true);
expect((data as any).data.data).toHaveLength(2);
expect((data as any).data.totalItems).toBe(2);
});
})
test("populate mock api with some data", async () => {
test('populate mock api with some data', async () => {
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
await mockApi.update({ index: 0, auto: createMockAuto() });
await mockApi.update({index: 0, auto: createMockAuto()})
let data = await mockApi.list({ limit: 10, offset: 0 });
expect(data.ok).toBe(true);
expect((data as any).data.data).toHaveLength(1);
expect((data as any).data.totalItems).toBe(1);
await mockApi.update({ index: 1, auto: createMockAuto() });
await mockApi.update({index: 1, auto: createMockAuto()})
data = await mockApi.list({ limit: 10, offset: 0 });
expect((data as any).data.data).toHaveLength(2);
expect((data as any).data.totalItems).toBe(2);
});
})
test("delete/update data from mock api", async () => {
const mockApi = makeAutomationAPI(
useMockAPI(
[
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
],
fakeUseRef as any
)
);
let data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
test('delete/update data from mock api', async () => {
const mockApi = makeAutomationAPI(useMockAPI([
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
], fakeUseRef as any));
let data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data;
const toBeEdited = data[0];
toBeEdited.metadata.alias = "Bob is my uncle";
await mockApi.update({ index: 0, auto: toBeEdited });
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
await mockApi.update({index: 0, auto: toBeEdited})
data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data;
expect(data[0].metadata.alias).toEqual("Bob is my uncle");
await mockApi.remove({ index: 0 });
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
await mockApi.remove({index: 0})
data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data;
expect(data[0].metadata.alias === "Bob is my uncle").toEqual(false);
});
test("update tags from mock api", async () => {
const mockApi = makeAutomationAPI(
useMockAPI(
[
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
],
fakeUseRef as any
)
);
let data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data
.data as AutomationData[];
const autoId = data[0].metadata.id;
expect(data[0].tags).toStrictEqual({});
mockApi.updateTags({
automation_id: autoId,
tags: {
room: "bathroom",
type: "popup",
},
});
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data
.data as AutomationData[];
expect(data[0].metadata.id).toEqual(autoId);
expect(data[0].tags).toStrictEqual({
room: "bathroom",
type: "popup",
});
});
})
+30 -47
View File
@@ -1,34 +1,33 @@
import { useRef } from "react";
import { AutomationData } from "types/automations";
import { API } from "./base";
import {
AUTOMTAION_LIST,
AUTOMTAION_ITEM,
AUTOMTAION_ITEM_TAGS,
} from "./paths";
import { useRef } from 'react';
import { AutomationData } from 'types/automations';
import { API } from './base';
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths';
export const useMockAPI = (
initialAutos: AutomationData[] = [],
makeRef = useRef
makeRef = useRef,
): API => {
const automationsRef = makeRef(initialAutos);
return {
async makeCall({ path, method = "POST", data = {} }) {
// console.debug("[[mockCall]]", method, path, data);
async makeCall({
path,
method = "POST",
data = {}
}) {
console.debug("[[mockCall]]", method, path, data);
if (path === AUTOMTAION_LIST) {
return {
ok: true,
data: JSON.parse(
JSON.stringify({
totalItems: automationsRef.current.length,
params: { offset: 0, limit: 100 },
data: automationsRef.current,
})
),
} as any;
data: JSON.parse(JSON.stringify({
totalItems: automationsRef.current.length,
params: { offset: 0, limit: 100 },
data: automationsRef.current,
}))
} as any
}
if (path === AUTOMTAION_ITEM) {
if (method === "POST") {
if (path === AUTOMTAION_ROOT) {
if (method === 'POST') {
const { index, data: auto } = data as any;
if (index >= automationsRef.current.length) {
automationsRef.current = [...automationsRef.current, auto];
@@ -36,45 +35,29 @@ export const useMockAPI = (
automationsRef.current = [
...automationsRef.current.slice(0, index),
auto,
...automationsRef.current.slice(index + 1),
...automationsRef.current.slice(index + 1)
];
}
}
return {
ok: true,
data: {},
};
data: {}
}
} else if (method === "DELETE") {
const { index } = data as any;
automationsRef.current = [
...automationsRef.current.slice(0, index),
...automationsRef.current.slice(index + 1),
...automationsRef.current.slice(index + 1)
];
return {
ok: true,
data: {},
};
}
}
if (path === AUTOMTAION_ITEM_TAGS) {
if (method === "POST") {
const { automation_id, tags } = data as any;
for (let i = 0; i < automationsRef.current.length; i++) {
const auto = automationsRef.current[i];
if (auto.metadata.id === automation_id) {
automationsRef.current[i].tags = JSON.parse(JSON.stringify(tags));
break;
}
data: {}
}
return {
ok: true,
data: {},
};
}
}
return {
ok: false,
error: "PATH NOT FOUND " + method + ": " + path,
};
},
};
};
}
}
}
}
+3 -3
View File
@@ -1,4 +1,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_ITEM = `${AUTOMTAION_ROOT}item` as const;
export const AUTOMTAION_ITEM_TAGS = `${AUTOMTAION_ITEM}/tags` as const;
+1 -1
View File
@@ -7,7 +7,7 @@ export interface ListParams {
}
export type APIRequest<D> = {
path: string;
method?: "POST" | "DELETE" | "GET",
method?: "POST" | "DELETE",
data?: D;
};
+21 -19
View File
@@ -1,40 +1,42 @@
import { useState } from "react";
import { ApiState } from "./types";
import { AutomationAPI } from "./automations";
import { AutomationAPI } from './automations';
export const useDefaultApiState = () =>
useState<ApiState>({
automations: { ready: false },
});
export const useDefaultApiState = () => useState<ApiState>({
automations: {ready: false},
});
export const makeReloadAutomations = (
automationAPI: AutomationAPI,
state: ApiState,
setState: (s: ApiState) => void
setState: (s: ApiState) => void,
) => {
const reload = async () => {
let params = { offset: 0, limit: 10000 };
let params = { offset: 0, limit: 100 };
if (state.automations.ready && state.automations.ok) {
params = state.automations.data.params;
params = state.automations.data.params
}
const resp = await automationAPI.list(params);
setState({
...state,
automations: {
ready: true,
...resp,
},
...state, automations: {
ready: true,
...resp,
}
});
};
const wrapCall = <Call extends (a: any) => Promise<any>>(fcn: Call) => {
}
const wrapCall = <
Call extends (a: any) => Promise<any>
>(fcn: Call) => {
return async (args: Parameters<Call>[0]): Promise<ReturnType<Call>> => {
const resp = await fcn(args);
await reload();
return resp;
};
};
}
}
return {
reload,
wrapCall,
};
};
}
}
@@ -1,31 +1,39 @@
.automation-editor--info-box {
height: 100%;
padding-left: 10px;
padding-right: 10px;
display: flex;
flex-direction: column;
align-items: center;
gap: 0.5em;
justify-content: flex-start;
overflow: hidden;
position: relative;
}
.automation-editor--info-box-inner {
max-width: 95vw;
max-height: 90vh;
height: 100%;
overflow: auto;
}
.automation-editor--info-box.show {
min-width: 25em;
}
.automation-editor--info-box.hide {
min-width: 1em;
}
.automation-editor--info-box.hide>.automation-editor--info-box-inner {
display: none;
}
.automation-editor--info-box--tags {
padding: 0.25em 0.75em 1em 0.75em;
border-color: var(--mui-grey-400);
border-color: var(--primary-accent);
border-width: 1px;
border-style: ridge;
border-radius: 5px;
}
.automation-editor--info-box--tag-list {
max-height: 30vh;
overflow-y: scroll;
padding-left: 0.25em;
padding-right: 0.25em;
}
.automation-editor--info-box--tags>h1 {
font-size: 1.5em;
}
@@ -41,7 +49,6 @@
.automation-editor--info-box--tag>div {
margin: 0;
flex: 1;
}
.automation-editor--info-box--tag>div>input {
@@ -49,11 +56,29 @@
padding: 1em 0.25em 0.2em 0.25em;
}
.automation-editor--info-box--tag--trash, .automation-editor--info-box--tag--add {
height: 2em;
width: 2em;
.automation-editor--info-box--tag>button {
height: 1.25em;
width: 1.25em;
font-size: 1em;
display: flex;
justify-content: center;
align-items: center;
}
.automation-editor--info-box--tag--error {
width: 100%;
display: flex;
justify-content: center;
padding: 0;
}
.automation-editor--info-box--tag--error.hide {
height: 0;
opacity: 0;
display: none;
}
.automation-editor--info-box--tag--error.show {
height: fit-content;
opacity: 1;
}
@@ -1,35 +1,30 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { makeTagDB } from "components/AutomationList/TagDB";
import { Page } from "components/Page";
import { useState } from "react";
import { AutoInfoBox } from "./AutoInfoBox";
import { defaultAutomation } from "utils/defaults";
export default {
title: "App/AutomationList/Editor/InfoBox",
title: 'App/AutomationList/Editor/InfoBox',
component: AutoInfoBox,
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
tagDB: makeTagDB([defaultAutomation("test")]),
},
parameters: { actions: { argTypesRegex: '^on.*' } },
} as ComponentMeta<typeof AutoInfoBox>;
export const NoTags: ComponentStory<typeof AutoInfoBox> = (args) => {
const [[metadata, tags], setState] = useState([args.metadata, args.tags]);
export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
const [[metadata, tags], setState] = useState([args.metadata, args.tags])
return (
<Page>
<div className="page">
<AutoInfoBox
{...args}
className=""
metadata={metadata}
tags={tags}
onUpdate={(m, t) => {
args.onUpdate(m, t);
setState([m, t]);
args.onUpdate(m, t)
setState([m, t])
}}
/>
</Page>
);
};
</div>
)
}
NoTags.args = {
...NoTags.args,
tags: [],
@@ -38,13 +33,13 @@ NoTags.args = {
alias: "Random",
description: "Example Metadata",
trigger_variables: {
wowo: "!",
'wowo': '!'
},
mode: "single",
mode: 'single',
},
};
}
export const SomeTags: ComponentStory<typeof AutoInfoBox> = NoTags.bind({});
export const SomeTags: ComponentStory<typeof AutoInfoBox> = NoTags.bind({})
SomeTags.args = {
...SomeTags.args,
tags: [
@@ -56,8 +51,8 @@ SomeTags.args = {
alias: "Bathroom Vent",
description: "Turn the vent when the humidity is high",
trigger_variables: {
wowo: "!",
'wowo': '!'
},
mode: "single",
mode: 'single',
},
};
}
@@ -2,175 +2,118 @@ import "./AutoInfoBox.css";
import { AutomationMetadata } from "types/automations";
import { InputList } from "components/Inputs/InputList";
import InputText from "components/Inputs/InputText";
import { FC, ReactNode, useRef, useState } from "react";
import InputTextArea from "components/Inputs/InputTextArea";
import { FC, useRef, useState } from 'react';
import { AddIcon, TrashIcon } from "components/Icons";
import InputAutoText from "components/Inputs/InputAutoText";
import { TagDB } from "components/AutomationList/TagDB";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import { Button } from "components/Inputs/Button";
interface Props {
className: string;
metadata: AutomationMetadata;
tags: Array<[string, string]>;
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
tagDB: TagDB;
children?: ReactNode;
}
export const AutoInfoBox: FC<Props> = ({
metadata,
tags,
onUpdate,
className,
children,
tagDB,
}) => {
// state
const [newTag, setNewTag] = useState<[string, string]>(["", ""]);
const [[errorIndex, error], _setError] = useState<[number | "new", string]>([
-1,
"",
]);
const [newTag, setNewTag] = useState<[string, string]>(["", ""])
const [[errorIndex, error], _setError] = useState<[number | 'new', string]>([-1, ""]);
const errorTimeoutId = useRef(-1);
// aliases
const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n));
const setError = (index: number | "new", msg: string) => {
_setError([index, msg]);
const setError = (index: number | 'new', msg: string) => {
_setError([index, msg])
if (errorTimeoutId.current >= 0) {
window.clearTimeout(errorTimeoutId.current);
}
errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000);
};
const onUpdateMetadata =
<K extends keyof AutomationMetadata>(k: K) =>
(update: AutomationMetadata[K]) =>
onUpdate(
{
...metadata,
[k]: update,
},
tags
);
}
const onUpdateMetadata = <K extends keyof AutomationMetadata>(k: K) => (update: AutomationMetadata[K]) => onUpdate({
...metadata,
[k]: update
}, tags);
const validTagName = (newName: string): string | undefined => {
if (newName.length <= 0) {
return "Name must be at least 1 character long";
return "Name must be at least 1 character long"
}
// eslint-disable-next-line
for (const [name, _] of tags) {
if (name.trim() === newName.trim()) {
return `The tag '${name}' already exists`;
return `The tag '${name}' already exists`
}
}
};
}
const updateTagName = (newName: string, tagIndex: number) => {
const error = validTagName(newName);
if (error) {
return setError(tagIndex, error);
return setError(tagIndex, error)
}
onUpdate(metadata, [
...tags.slice(0, tagIndex),
[newName, tags[tagIndex][1]],
...tags.slice(tagIndex + 1),
]);
};
const onUpdateTags = (tagValue: string, tagIndex: number) =>
onUpdate(metadata, [
...tags.slice(0, tagIndex),
[tags[tagIndex][0], tagValue],
...tags.slice(tagIndex + 1),
]);
])
}
const onUpdateTags = (tagValue: string, tagIndex: number) => onUpdate(metadata, [
...tags.slice(0, tagIndex),
[tags[tagIndex][0], tagValue],
...tags.slice(tagIndex + 1),
])
const addNewTag = () => {
const error = validTagName(newTag[0]);
if (error) {
return setError("new", error);
return setError('new', error)
}
onUpdate(
metadata,
tags.concat([newTag.map((x) => x.trim()) as [string, string]])
);
setNewTag(["", ""]);
};
const onRemoveTag = (tagIndex: number) =>
onUpdate(metadata, [
...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1),
]);
onUpdate(metadata, tags.concat([newTag]));
setNewTag(['', '']);
}
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [
...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1),
])
// render
return (
<div className="automation-editor--info-box">
<div className="automation-editor--info-box-inner">
<InputText
label="ID"
value={metadata.id}
onChange={onUpdateMetadata("id")}
/>
<InputText
label="Name"
value={metadata.alias ?? ""}
onChange={onUpdateMetadata("alias")}
/>
<InputText
multiline
label="Description"
value={metadata.description ?? ""}
onChange={onUpdateMetadata("description")}
/>
<InputList
label="Mode"
current={metadata.mode}
onChange={onUpdateMetadata("mode")}
options={["parallel", "single", "queued", "restart"]}
/>
<div className="automation-editor--info-box--tags">
<h1>Tags</h1>
<div className="automation-editor--info-box--tag-list">
{tags.map(([tagName, tagValue], tagIndex) => (
<div key={tagIndex} className="automation-editor--info-box--tag">
<InputAutoText
value={tagName}
label="Name"
onChange={(v) => updateTagName(v, tagIndex)}
options={foundNewTagNames}
error={errorIndex === tagIndex ? error : undefined}
/>
<InputAutoText
value={tagValue}
label="Tag"
onChange={(v) => onUpdateTags(v, tagIndex)}
options={tagDB.getTagValues(tagName)}
error={errorIndex === tagIndex ? error : undefined}
/>
<ButtonIcon
className="automation-editor--info-box--tag--trash"
onClick={() => onRemoveTag(tagIndex)}
icon={<TrashIcon />}
/>
</div>
))}
</div>
<hr />
<div className="automation-editor--info-box--tag">
<InputAutoText
value={newTag[0]}
label="Name"
onChange={(v) => setNewTag([v, newTag[1]])}
options={foundNewTagNames}
error={errorIndex === "new" ? error : undefined}
/>
<InputAutoText
value={newTag[1]}
label="Tag"
onChange={(v) => setNewTag([newTag[0], v])}
options={tagDB.getTagValues(newTag[0])}
error={errorIndex === "new" ? error : undefined}
/>
<ButtonIcon
className="automation-editor--info-box--tag--add"
onClick={addNewTag}
icon={<AddIcon />}
/>
</div>
return <div className={`automation-editor--info-box ${className}`}>
<div className="automation-editor--info-box-inner">
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} />
<InputText label="Name" value={metadata.alias} onChange={onUpdateMetadata('alias')} />
<InputTextArea label="Description" value={metadata.description} onChange={onUpdateMetadata('description')} />
<InputList
label="Mode"
current={metadata.mode}
onChange={onUpdateMetadata('mode')}
options={[
'parallel',
'single',
'queued',
'restart'
]}
/>
<div className="automation-editor--info-box--tags">
<h1>Tags</h1>
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag">
<Button onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button>
<InputText value={tagName} label="Name" onChange={v => updateTagName(v, tagIndex)} />
<InputText value={tagValue} label="Tag" onChange={v => onUpdateTags(v, tagIndex)} />
<span className={["automation-editor--info-box--tag--error", (errorIndex === tagIndex) ? "show" : "hide"].join(" ")}>
{error}
</span>
</div>)}
<hr />
<div className="automation-editor--info-box--tag">
<InputText value={newTag[0]} label="Name" onChange={v => setNewTag([v, newTag[1]])} onEnter={addNewTag} />
<InputText value={newTag[1]} label="Tag" onChange={v => setNewTag([newTag[0], v])} onEnter={addNewTag} />
<Button onClick={addNewTag} ><AddIcon /></Button>
<span className={["automation-editor--info-box--tag--error", (errorIndex === 'new') ? "show" : "hide"].join(" ")}>
{error}
</span>
</div>
</div>
{children}
</div>
);
};
{children}
</div>
}
@@ -1,19 +1,10 @@
.automation-editor {
display: flex;
position: relative;
flex-direction: row;
width: 100%;
height: 100%;
}
.automation-editor-failures {
display: flex;
flex-direction: column;
padding: 1em;
overflow: scroll;
height: 100%;
}
.automation-editor--flow-wrapper {
flex: 1;
padding: 0 0.5em 0 0.5em;
@@ -28,55 +19,18 @@
.automation-editor--flow-wrapper--toolbar {
display: flex;
flex-direction: row;
gap: 0.25em;
justify-content: space-between;
margin-top: 0.25em;
justify-content: flex-end;
}
.automation-editor--flow-wrapper--toolbar--title {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
gap: 0.25em;
width: 100%;
}
.automation-editor--flow-wrapper--toolbar--title--text .id {
font-size: 0.75em;
max-width: 15em;
padding: 0;
margin: 0;
white-space: break-word;
.automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
height: 0;
opacity: 0;
overflow: hidden;
text-overflow: ellipsis;
padding-bottom: 0.25em;
}
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--title--text {
min-width: 5em;
}
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--modes {
min-width: 6em;
}
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--modes .MuiSelect-select {
padding-left: 0.25em;
padding-right: 0.25em;
padding-top: 1.15em;
padding-bottom: 0.25em;
}
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--modes .MuiInputLabel-root {
font-size: 0.9em;
left: -0.5em;
}
.automation-editor.changed .automation-editor--flow-wrapper--toolbar--save-btn,
.automation-editor--info-box--buttons.changed .automation-editor--flow-wrapper--toolbar--save-btn {
border-color: var(--mui-success-light);
color: var(--mui-success-light);
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
border-color: var(--change);
color: var(--change)
}
@@ -87,13 +41,13 @@
padding: 0.25em;
}
.automation-editor--flow-wrapper.changed>.dag-graphboard {
border-color: var(--mui-success-light);
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--flow {
border-color: var(--change);
}
.dag-graphboard {
.automation-editor--flow-wrapper--flow {
flex: 1;
border: 1px solid var(--mui-grey-700);
border: 1px solid var(--secondary-accent);
margin: 0 0 0.5em 0;
z-index: 1;
}
@@ -102,29 +56,14 @@
position: relative;
}
.automation-editor.loading .mock-list {
.automation-editor--info-box--icon {
position: absolute;
left: 0;
width: 40%;
height: 100%;
right: 0em;
bottom: 0.5em;
z-index: 10;
}
.automation-editor.loading .mock-graph {
position: absolute;
left: 40%;
width: 60%;
height: 100%;
}
.automation-editor .linear-loader {
position: absolute;
top: 0;
left: 0;
width: 100%;
}
.automation-editor--info-box--buttons {
display: flex;
gap: 1em;
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
transform: rotate(180deg);
z-index: 2;
}
@@ -1,100 +1,97 @@
import React from "react";
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { AutomationEditor } from "./index";
import { useState } from "react";
import { Page } from "components/Page";
import { makeTagDB } from "components/AutomationList/TagDB";
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { AutomationEditor } from './index';
import { useState } from 'react';
import * as dgconst from 'components/DAGSvgs/constants';
export default {
title: "App/AutomationList/Editor",
title: 'App/AutomationList/Editor',
component: AutomationEditor,
parameters: { actions: { argTypesRegex: "^on.*" } },
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
dims: DEFAULT_DIMS,
},
} as ComponentMeta<typeof AutomationEditor>;
dims: dgconst.DEFAULT_DIMS
}
} as ComponentMeta<typeof AutomationEditor>
const Template: ComponentStory<typeof AutomationEditor> = (args) => {
const [state, setState] = useState(args.automation);
return (
<Page>
<AutomationEditor
{...args}
tagDB={makeTagDB(state ? [state] : [])}
automation={state}
onUpdate={(s) => {
window.setTimeout(() => setState(s), 3000);
}}
/>
</Page>
);
};
const Template: ComponentStory<typeof AutomationEditor> = args => {
const [state, setState] = useState(args.automation)
return <div className="page">
<AutomationEditor
{...args}
automation={state}
onUpdate={s => {
window.setTimeout(() => setState(s), 3000)
}}
/>
</div>
}
export const Loading = Template.bind({});
export const Simple = Template.bind({});
export const Simple = Template.bind({})
Simple.args = {
...Simple.args,
automation: {
condition: [],
tags: {
Room: "Bathroom",
For: "Toliet",
Type: "Smell",
Use: "Flushing",
"Room": "Bathroom",
"For": "Toliet",
"Type": "Smell",
"Use": "Flushing"
},
metadata: {
id:
"random" + String(Date.now()) + String(Date.now()) + String(Date.now()),
id: "random",
alias: "Random",
description: "Example Metadata",
trigger_variables: {
wowo: "!",
'wowo': '!'
},
mode: "single",
mode: 'single',
},
trigger: [
{
platform: "numeric_state",
entity_id: "test",
"platform": "numeric_state",
"entity_id": "test",
},
{
platform: "homeassistant",
event: "start",
},
"platform": "homeassistant",
"event": "start",
}
],
sequence: [
{
condition: "and",
condition: 'and',
conditions: [
{
condition: "numeric_state",
entity_id: "sensor.temperature_kitchen",
below: "15",
condition: 'numeric_state',
entity_id: 'sensor.temperature_kitchen',
below: '15',
},
{
condition: "template",
value_template: 'states(switch.kitchen_light) == "on"',
},
],
condition: 'template',
value_template: 'states(switch.kitchen_light) == "on"'
}
]
},
{
alias: "Start Music In Kitchen",
service: "media_player.play_media",
service: 'media_player.play_media',
target: {
entity_id: "media_player.kitchen_dot",
entity_id: "media_player.kitchen_dot"
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
},
},
],
},
};
}
}
]
}
}
export const EmptyStart = Template.bind({});
export const EmptyStart = Template.bind({})
EmptyStart.args = {
...EmptyStart.args,
automation: {
@@ -105,141 +102,12 @@ EmptyStart.args = {
alias: "Random",
description: "Example Metadata",
trigger_variables: {
wowo: "!",
'wowo': '!'
},
mode: "single",
},
trigger: [],
sequence: [],
},
};
export const BadAutomationInvalidMetadata = Template.bind({});
BadAutomationInvalidMetadata.args = {
...BadAutomationInvalidMetadata.args,
automation: {
condition: [],
tags: {},
metadata: {} as any,
trigger: [],
sequence: [],
},
};
export const BadAutomationInvalidTriggers = Template.bind({});
BadAutomationInvalidTriggers.args = {
...BadAutomationInvalidTriggers.args,
automation: {
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Random",
description: "Example Metadata",
trigger_variables: {
wowo: "!",
},
mode: "single",
},
trigger: ["haha I am a string"] as any,
sequence: [],
},
};
export const BadAutomationInvalidSequence = Template.bind({});
BadAutomationInvalidSequence.args = {
...BadAutomationInvalidSequence.args,
automation: {
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Bad Choose Sequence",
description: "Example Metadata",
trigger_variables: {
wowo: "!",
},
mode: "single",
},
trigger: [],
sequence: [
{
choose: {},
},
] as any,
},
};
export const RepeatExample = Template.bind({});
RepeatExample.args = {
...RepeatExample.args,
automation: {
metadata: {
id: "1654976151462",
alias: "Get out of baby room",
description: "",
mode: "single",
mode: 'single',
},
trigger: [
{
type: "opened",
platform: "device",
device_id: "9b33663d2700da8efe0c31c946448f77",
entity_id: "binary_sensor.door_baby",
domain: "binary_sensor",
},
],
condition: [],
sequence: [
{
service: "notify.mobile_app_levas_phone",
data: {
message: "Someone is in Korie’s room!!!",
},
},
{
repeat: {
while: [
{
type: "is_open",
condition: "device",
device_id: "9b33663d2700da8efe0c31c946448f77",
entity_id: "binary_sensor.door_baby",
domain: "binary_sensor",
},
],
sequence: [
{
service: "notify.alexa_media",
data: {
message:
"Get the fuck out of the baby’s bedroom you sick fuck! This room belongs to Korie! Close the door! I said close. The. Door!",
data: null,
type: "tts",
target: "media_player.baby_bedroom_dot",
},
},
{
delay: {
hours: 0,
minutes: 0,
seconds: 7,
milliseconds: 0,
},
},
],
},
},
{
service: "light.turn_off",
target: {
entity_id: ["light.switch_baby"],
},
data: {
flash: "short",
},
},
],
tags: {},
},
};
sequence: []
}
}
+47 -266
View File
@@ -1,36 +1,23 @@
import "./index.css";
import Icon from "@mui/material/Icon";
import { CheckMarkIcon } from "components/Icons";
import { ArrowIcon, CheckMarkIcon } from "components/Icons";
import { FC, useState } from "react";
import { AutomationData } from "types/automations";
import { Modal } from "components/Modal";
import { AutoInfoBox } from "./AutoInfoBox";
import ModeEditOutlineTwoToneIcon from "@mui/icons-material/ModeEditOutlineTwoTone";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import { Button } from "components/Inputs/Button";
import { useAutomatioEditorState, EditorData } from "./state";
import { MiniFailure } from "types/validators/helper";
import InputYaml from "components/Inputs/InputYaml";
import { TagDB } from "components/AutomationList/TagDB";
import Skeleton from "@mui/material/Skeleton";
import LinearProgress from "@mui/material/LinearProgress";
import { useCookies } from "react-cookie";
import { DAGDims } from "components/DAGGraph/elements/types";
import { DAGAutomationGraph } from "components/DAGGraph";
import { InputList } from "components/Inputs/InputList";
import { InputTextView } from "components/Inputs/InputTextView";
import { ControlButton } from "react-flow-renderer";
import { useAutomatioEditorState } from "./state";
import { DAGAutomationFlow } from "components/DAGFlow";
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
interface Props {
automation?: AutomationData;
dims: DAGDims;
dims: DAGAutomationFlowDims;
onUpdate: (auto: AutomationData) => void;
tagDB: TagDB;
}
export const AutomationEditor: FC<Props> = ({
dims,
automation: propsAutos,
onUpdate: propsOnUpdate,
tagDB,
}) => {
// state
const {
@@ -39,257 +26,51 @@ export const AutomationEditor: FC<Props> = ({
updateTrigger,
updateMetadata,
updateCondition,
validate,
save,
saveAndUpdate,
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
const [infoBoxOpen, setInfoBox] = useState(false);
const [
{ ckFlipped },
setCookies,
// eslint-disable-next-line
_,
] = useCookies(["ckFlipped"]);
// alias
const flipped = dims.flipped ? true : ckFlipped === "1";
const setFlipped = (v: boolean) => setCookies("ckFlipped", v ? "1" : "0");
const [closeInfo, setCloseInfo] = useState(false);
// render
if (state.status === "loading") {
return (
<div className="automation-editor loading">
<LinearProgress className="linear-loader" />
<Skeleton className="mock-list" variant="rectangular" />
<Skeleton className="mock-graph" variant="rectangular" />
</div>
);
if (state.status === 'loading') {
return <div className="automation-editor loading">
Loading...
</div>
}
if (state.status === "invalid") {
return (
<ValidationBox
failures={state.failures}
data={state.data}
validate={validate}
onSave={saveAndUpdate}
/>
);
}
return (
<div className={["automation-editor", state.status].join(" ")}>
{state.status === "saving" && (
<LinearProgress className="linear-loader" />
)}
<Modal open={infoBoxOpen}>
<AutoInfoBox
metadata={state.data.metadata}
tags={state.data.tags}
onUpdate={updateMetadata}
tagDB={tagDB}
return <div className="automation-editor">
<AutoInfoBox
className={closeInfo ? "hide" : "show"}
metadata={state.data.metadata}
tags={state.data.tags}
onUpdate={updateMetadata}
>
<ButtonIcon
className="automation-editor--info-box--icon"
onClick={() => setCloseInfo(!closeInfo)}
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
>{ArrowIcon}</ButtonIcon>
</AutoInfoBox>
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
<div className="automation-editor--flow-wrapper--toolbar">
<Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save}
disabled={state.status !== 'changed'}
>
<div
className={[
"automation-editor--info-box--buttons",
state.status,
].join(" ")}
>
<Button onClick={() => setInfoBox(false)}>Close</Button>
<Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save}
disabled={state.status !== "changed"}
>
Save <CheckMarkIcon color="#bf4" />
</Button>
</div>
</AutoInfoBox>
</Modal>
<div
className={["automation-editor--flow-wrapper", state.status].join(" ")}
>
<div className="automation-editor--flow-wrapper--toolbar">
<div className="automation-editor--flow-wrapper--toolbar--title">
<span className="automation-editor--flow-wrapper--toolbar--title--text">
<div className="id">{state.data.metadata.id}</div>
<InputTextView
value={state.data.metadata.alias ?? ""}
placeholder="Name"
onChange={(alias) =>
updateMetadata(
{
...state.data.metadata,
alias,
},
state.data.tags
)
}
/>
</span>
<InputList
fullWidth={false}
label="Mode"
className="automation-editor--flow-wrapper--toolbar--modes"
current={{
id: state.data.metadata.mode,
label: "",
}}
onChange={({ id }) =>
updateMetadata(
{
...state.data.metadata,
mode: id,
},
state.data.tags
)
}
getKey={({ id }) => id}
getDescription={({ label }) => label}
options={[
{
id: "single",
label: "Do not start a new run. Issue a warning.",
},
{
id: "parallel",
label:
"Start a new, independent run in parallel with previous runs.",
},
{
id: "queued",
label:
"Start a new run after all previous runs complete. Runs are guaranteed to execute in the order they were queued.",
},
{
id: "restart",
label: "Start a new run after first stopping previous run.",
},
]}
/>
<InputTextView
className="description"
value={state.data.metadata.description ?? ""}
placeholder="Description"
onChange={(description) =>
updateMetadata(
{
...state.data.metadata,
description,
},
state.data.tags
)
}
/>
</div>
{!dims.flipped && (
<Button
className={"automation-editor--flow-wrapper--toolbar--flip-btn"}
onClick={() => setFlipped(!flipped)}
>
<Icon>{flipped ? "flip_to_front" : "flip_to_back"}</Icon>
Flip
</Button>
)}
<Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save}
disabled={state.status !== "changed"}
>
Save <CheckMarkIcon color="#bf4" />
</Button>
</div>
<DAGAutomationGraph
sequence={state.data.sequence}
trigger={state.data.trigger}
condition={state.data.condition}
onSequenceUpdate={updateSequence}
onTriggerUpdate={updateTrigger}
onConditionUpdate={updateCondition}
isFlipped={flipped}
additionalControls={
<ControlButton onClick={() => setInfoBox(!infoBoxOpen)}>
<ModeEditOutlineTwoToneIcon />
</ControlButton>
}
/>
Save <CheckMarkIcon color="#bf4" />
</Button>
</div>
<DAGAutomationFlow
className="automation-editor--flow-wrapper--flow"
sequence={state.data.sequence}
trigger={state.data.trigger}
condition={state.data.condition}
onSequenceUpdate={updateSequence}
onTriggerUpdate={updateTrigger}
onConditionUpdate={updateCondition}
dims={dims}
/>
</div>
);
};
export const ValidationBox: FC<{
failures: MiniFailure[];
validate: (d: any) => MiniFailure[] | null;
data: EditorData;
onSave: (d: EditorData) => void;
}> = (props) => {
const [{ failures, data }, setState] = useState({
failures: props.failures,
data: props.data,
});
const makeSave =
<K extends keyof EditorData>(k: K) =>
(d: EditorData[K]) => {
const newData = {
...data,
[k]: d,
};
const newFails = props.validate(newData);
if (newFails) {
setState({
failures: newFails,
data: newData,
});
} else {
setState({
failures: [],
data: newData,
});
}
};
return (
<div className="automation-editor-failures">
<ul>
{failures.map((f, i) => (
<>
<li key={i}>
<b>{f.path}</b>:
<ul>
{f.message.map((m, j) => (
<li key={j}>{m}</li>
))}
</ul>
</li>
</>
))}
</ul>
<span>
Please correct the automation file manually and then continue!
</span>
<InputYaml
label="Metadata"
value={data.metadata}
onChange={makeSave("metadata")}
/>
<InputYaml label="Tags" value={data.tags} onChange={makeSave("tags")} />
<InputYaml
label="Trigger"
value={data.trigger}
onChange={makeSave("trigger")}
/>
<InputYaml
label="Condition"
value={data.condition}
onChange={makeSave("condition")}
/>
<InputYaml
label="Actions"
value={data.sequence}
onChange={makeSave("sequence")}
/>
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>
Save
</Button>
</div>
);
};
</div>
}
+19 -41
View File
@@ -1,19 +1,13 @@
import { useState, useEffect } from 'react';
import { AutomationData, AutomationMetadata } from "types/automations";
import * as v from "types/validators/autmation";
import { getFailures } from "types/validators/helper";
import { MiniFailure } from '../../types/validators/helper';
export type EditorData = ReturnType<typeof genEditorData>;
export type EditorState = {
status: 'unchanged' | 'changed' | 'saving',
status: 'unchanged' | 'changed',
data: EditorData
} | {
status: 'loading'
} | {
status: 'invalid',
failures: MiniFailure[],
data: EditorData,
}
export type EditorStatus = EditorState['status'];
@@ -26,7 +20,7 @@ export const useAutomatioEditorState = (
});
const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => (
data: D
) => ((state.status === 'changed') || (state.status === 'unchanged')) && update({
) => state.status !== 'loading' && update({
status: 'changed',
data: {
...state.data,
@@ -34,47 +28,21 @@ export const useAutomatioEditorState = (
}
})
const saveAndUpdate = (data: EditorData) => {
const cleanData = {
...data,
tags: data.tags.reduce((all, [tagName, tagValue]) => ({
...all,
[tagName.trim()]: tagValue.trim(),
}), {})
};
update({
status: "saving",
data,
})
onSave(cleanData);
}
useEffect(() => {
if (automation) {
const failures = getFailures(automation, v.AutomationData);
if (failures) {
update({
status: 'invalid',
failures,
data: genEditorData(automation),
})
} else {
update({
status: 'unchanged',
data: genEditorData(automation),
})
}
update({
status: 'unchanged',
data: genEditorData(automation),
})
}
}, [automation]);
return {
validate: (data: any) => getFailures(data, v.AutomationData),
updateTrigger: makeUpdate('trigger'),
updateSequence: makeUpdate('sequence'),
updateCondition: makeUpdate('condition'),
saveAndUpdate,
updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => {
if ((state.status === 'changed') || (state.status === 'unchanged')) {
if (state.status !== 'loading') {
update({
status: 'changed',
data: {
@@ -87,7 +55,17 @@ export const useAutomatioEditorState = (
},
save: () => {
if (state.status !== 'loading') {
saveAndUpdate(state.data)
const data = {
...state.data,
tags: state.data.tags.reduce((all, [tagName, tagValue]) => ({
...all,
[tagName]: tagValue,
}), {})
};
update({
status: "loading",
})
onSave(data);
}
},
get state() {
@@ -2,186 +2,65 @@ import "styles/root.css";
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react";
import { AutomationList } from ".";
import { bigMockAutoList } from "utils/mocks";
import { Page } from "components/Page";
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
import { AutomationData } from "types/automations";
import { createMockAuto } from "utils/mocks";
import * as dgconst from 'components/DAGSvgs/constants';
export default {
title: "App/AutomationList",
title: 'App/AutomationList',
component: AutomationList,
parameters: { actions: { argTypesRegex: "^on.*" } },
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
dims: DEFAULT_DIMS,
},
dims: dgconst.DEFAULT_DIMS
}
} as ComponentMeta<typeof AutomationList>;
const Template: ComponentStory<typeof AutomationList> = (args) => {
const [autos, setAutos] = useState(args.automations.data);
return (
<Page>
<AutomationList
{...args}
automations={{
...args.automations,
data: autos,
}}
onAdd={(a) => {
args.onAdd(a);
setAutos([...autos, a]);
}}
onRemove={(i) => {
args.onRemove(i);
setAutos([...autos.slice(0, i), ...autos.slice(i + 1)]);
}}
onUpdate={(i, a) => {
args.onUpdate(i, a);
setAutos([...autos.slice(0, i), a, ...autos.slice(i + 1)]);
}}
/>
</Page>
);
};
const make = (autos: AutomationData[]) => {
const NewTemp = Template.bind({});
NewTemp.args = {
...NewTemp.args,
automations: {
data: autos,
params: {
offset: 0,
limit: 100,
},
totalItems: autos.length,
},
};
const Template: ComponentStory<typeof AutomationList> = args => {
const [autos, setAutos] = useState(args.automations)
return <div className="page">
<AutomationList {...args} automations={autos}
onAdd={a => {
args.onAdd(a);
setAutos([...autos, a]);
}}
onRemove={i => {
args.onRemove(i);
setAutos([
...autos.slice(0, i),
...autos.slice(i + 1),
]);
}}
onUpdate={(i, a) => {
args.onUpdate(i, a);
setAutos([
...autos.slice(0, i),
a,
...autos.slice(i + 1),
]);
}}
/>
</div>
}
return NewTemp;
};
export const EmptyStart = Template.bind({})
EmptyStart.args = {
...EmptyStart.args,
automations: [],
}
export const EmptyStart = make([]);
export const FewAutos = make(bigMockAutoList);
export const BadAutmations = make([
{
metadata: {
alias: "Set Thermostat to 76 at 8am",
description: "",
mode: "single",
} as any,
trigger: [
{
at: "08:00:00",
platform: "time",
},
],
condition: [
{
condition: "state",
entity_id: "climate.thermostat",
state: "cool",
},
],
sequence: [
{
data: {
temperature: 76,
},
service: "climate.set_temperature",
target: {
entity_id: "climate.thermostat",
},
},
],
tags: {},
},
{
condition: [],
tags: {},
metadata: {
id: "Bad Choose Example",
alias: "Bad Choose",
description: "Example Metadata",
trigger_variables: {
wowo: "!",
},
mode: "single",
},
trigger: [],
sequence: [
{
choose: [],
},
] as any,
},
{
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Bad Trigger",
description: "Example Metadata",
trigger_variables: {
wowo: "!",
},
mode: "single",
},
trigger: ["haha I am a string"] as any,
sequence: [],
},
{
condition: [],
tags: {},
metadata: {} as any,
trigger: [],
sequence: [],
},
]);
export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = (
args
) => {
const [autos, setAutos] = useState(args.automations.data);
return (
<Page>
<AutomationList
{...args}
automations={{
...args.automations,
data: autos,
}}
onAdd={(a) => {
window.setTimeout(() => {
args.onAdd(a);
setAutos([...autos, a]);
}, 10000);
}}
onRemove={(i) => {
window.setTimeout(() => {
args.onRemove(i);
setAutos([...autos.slice(0, i), ...autos.slice(i + 1)]);
}, 10000);
}}
onUpdate={(i, a) => {
window.setTimeout(() => {
args.onUpdate(i, a);
setAutos([...autos.slice(0, i), a, ...autos.slice(i + 1)]);
}, 10000);
}}
/>
</Page>
);
};
FewAutosWithSlowLoader.args = {
...FewAutosWithSlowLoader.args,
automations: {
data: bigMockAutoList,
params: {
limit: 100,
offset: 0,
},
totalItems: 100,
},
};
export const FewAutos = Template.bind({})
FewAutos.args = {
...FewAutos.args,
automations: [
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
createMockAuto({ "Type": "Climate" }),
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
createMockAuto({ "Room": "Office", "Type": "Lights" }),
createMockAuto({ "Room": "Office" }),
createMockAuto(),
],
}
@@ -5,18 +5,15 @@
}
.automation-list-box--body {
overflow-y: auto;
overflow-x: hidden;
overflow: auto;
height: 100%;
flex: 1;
user-select: none;
}
.automation-list-box--body>* {
.automation-list-box--body > * {
padding-top: 0.5em;
padding-bottom: 0.5em;
}
.automation-list-box--body--group {
display: flex;
flex-direction: column;
@@ -24,38 +21,79 @@
border-radius: 10px;
padding-bottom: 0.5em;
border-width: 1px;
border-bottom-style: solid;
border-color: var(--mui-grey-400);
border-bottom-style: solid ;
border-color: white;
}
.automation-list-box--body--group.other {
border-color: var(--mui-success-main);
}
.automation-list-box--body--group.other>b {
color: var(--mui-success-light);
}
.automation-list-box--body--group>.automation-list-box--body--group {
border-left-style: solid;
.automation-list-box--body--group > .automation-list-box--body--group {
border-left-style: solid ;
border-top-left-radius: 0;
margin-left: 0.75em;
padding-left: 0.5em;
}
.automation-list-box--body--group>b {
.automation-list-box--body--group > b {
width: 100%;
cursor: pointer;
padding: 0.1em;
}
.automation-list-box--body--group>b:hover,
.automation-list-box--body--group.selected>b {
background-color: var(--mui-grey-700);
color: var(--mui-secondary-contrastText);
.automation-list-box--body--group > b:hover {
background-color: var(--secondary-accent);
color: var(--secondary);
}
.automation-list-box--body--item:hover {
background-color: var(--primary-accent);
color: var(--primary);
}
.automation-list-box--body--item:hover > .automation-list-box--body--item--tags > span {
border-color: var(--primary);
}
.automation-list-box--body--item {
padding-left: 1em;
cursor: pointer;
display: flex;
justify-content: left;
align-items: flex-start;
gap: 1em;
flex-wrap: wrap;
}
.automation-list-box--body--item::before {
content: "⊚ ";
}
.automation-list-box--body--item--title {
display: flex;
flex-direction: column;
padding-left: 0.25em;
flex: 1;
}
.automation-list-box--body--item--title > b {
font-size: 1em;
}
.automation-list-box--body--item--title > span, .automation-list-box--body--item--title > b > span {
font-size: 0.75em;
}
.automation-list-box--body--item > button {
padding: 0.25em !important;
margin: 0.5em !important;
}
.automation-list-box--body--item--tags {
flex: 1;
display: flex;
flex-wrap: wrap;
font-size: 0.75em;
justify-content: left;
align-items: flex-start;
overflow: auto;
max-height: 100%;
gap: 0.25em;
}
.automation-list-box--body--item--tags > span {
border-color: var(--primary-accent);
border-style: solid;
border-width: 1px;
border-radius: 0.5em;
padding: 0.1em 0.5em;
}
.automation-list-box--bottom {
margin-top: 0.5em;
margin-bottom: 0.5em;
@@ -64,21 +102,8 @@
justify-content: space-around;
align-items: center;
}
.automation-list-box--bottom>.automation-list-box--bottom--add {
background-color: var(--mui-primary-main);
color: var(--mui-primary-contrastText);
.automation-list-box--bottom > button {
background-color: #070;
color: var(--primary-accent);
padding: 0.5em 2em;
}
.automation-list-box--bottom>.automation-list-box--bottom--add:hover {
color: var(--mui-primary-light);
}
.automation-list-box--bottom--load svg {
color: var(--mui-primary-main);
}
.automation-list-box--bottom--load.less svg {
transform: rotate(180deg);
}
@@ -2,78 +2,43 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react";
import { AutomationListBox } from "./AutomationListBox";
import { createMockAuto } from "utils/mocks";
import { Page } from "components/Page";
import { CookiesProvider } from "react-cookie";
import { makeTagDB } from "./TagDB";
import { AutomationData } from "types/automations";
export default {
title: "App/AutomationList/Box",
title: 'App/AutomationList/Box',
component: AutomationListBox,
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {},
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
}
} as ComponentMeta<typeof AutomationListBox>;
const Template: ComponentStory<typeof AutomationListBox> = (args) => {
const [selected, setSelected] = useState(args.selected);
return (
<Page>
<CookiesProvider>
<AutomationListBox
{...args}
tagsDB={makeTagDB(args.automations.data)}
automations={args.automations}
selected={selected}
onSelectAutomation={(i) => {
setSelected(i);
args.onSelectAutomation(i);
}}
/>
</CookiesProvider>
</Page>
);
};
const make = (autos: AutomationData[]) => {
const NewTemp = Template.bind({});
NewTemp.args = {
...NewTemp.args,
automations: {
data: autos,
params: {
offset: 0,
limit: 100,
},
totalItems: autos.length,
},
};
const Template: ComponentStory<typeof AutomationListBox> = args => {
const [autos, setAutos] = useState(args.automations)
console.log({ args })
return <div className="page">
<AutomationListBox {...args} automations={autos} />
</div>
}
return NewTemp;
};
export const EmptyStart = Template.bind({})
EmptyStart.args = {
...EmptyStart.args,
automations: [],
}
export const EmptyStart = make([]);
export const FewAutos = make([
createMockAuto({
Room: "Bathroom",
Type: "Lights",
NewDevice: "Yes",
Remote: "No",
Floor: "1",
}),
createMockAuto({ Room: "Bathroom", Type: "Climate" }),
createMockAuto({ Room: "Living Room", Type: "Climate" }),
createMockAuto({ Type: "Climate" }),
createMockAuto({ Type: "Lights", Routine: "Myself" }),
createMockAuto({ Routine: "DNS", Type: "SSL" }),
createMockAuto({ Room: "Bedroom", Type: "Lights", Routine: "Baby" }),
createMockAuto({ Room: "Office", Type: "Lights" }),
createMockAuto({ Room: "Office" }),
createMockAuto(),
]);
export const OneAuto = make([
createMockAuto({
Type: "Climate",
}),
]);
export const FewAutos = Template.bind({})
FewAutos.args = {
...FewAutos.args,
automations: [
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
createMockAuto({ "Type": "Climate" }),
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
createMockAuto({ "Room": "Office", "Type": "Lights" }),
createMockAuto({ "Room": "Office" }),
createMockAuto(),
],
}
@@ -1,22 +1,101 @@
import { getTagList } from "./AutomationListBox";
import { createMockAuto } from "utils/mocks";
import { groupAutomations, getTagList } from './AutomationListBox';
import { AutomationData } from 'types/automations/index';
import { createMockAuto } from 'utils/mocks';
test("getTagList", () => {
expect(
getTagList([
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
])
).toStrictEqual([]);
test('group automations', () => {
const automations: AutomationData[] = [
{
condition: [],
metadata: {
id: '1',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Living Room',
"Type": 'Lights'
},
sequence: [],
trigger: [],
},
{
condition: [],
metadata: {
id: '2',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Living Room',
"Type": 'Climate'
},
sequence: [],
trigger: [],
},
{
condition: [],
metadata: {
id: '3',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Kitchen',
"Type": 'Climate'
},
sequence: [],
trigger: [],
},
];
expect(groupAutomations(automations, [0, 1], ['Room', "Type"])).toStrictEqual({
"Living Room": {
"Lights": [0],
"Climate": [1],
},
"Kitchen": {
"Climate": [2],
}
})
expect(groupAutomations(automations, [1, 0], ['Room', "Type"])).toStrictEqual({
"Lights": {
"Living Room": [0],
},
"Climate": {
"Living Room": [1],
"Kitchen": [2]
}
})
expect(groupAutomations(automations, [1], ['Room', "Type"])).toStrictEqual({
"Lights": [0],
"Climate": [1, 2]
})
expect(groupAutomations(automations, [0], ['Room', "Type"])).toStrictEqual({
"Living Room": [0, 1],
"Kitchen": [2]
})
expect(
getTagList([
createMockAuto({ Room: "Kitchen", Area: "Oven" }),
createMockAuto({ Room: "Attic" }),
createMockAuto({ Room: "Office" }),
createMockAuto({ Area: "Balcony" }),
expect(groupAutomations(automations, [], ['Room', "Type"])).toStrictEqual([
0, 1, 2
])
).toStrictEqual(["Room", "Area"]);
});
test('getTagList', () => {
expect(getTagList([
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
])).toStrictEqual([])
expect(getTagList([
createMockAuto({ "Room": "Kitchen", "Area": "Oven" }),
createMockAuto({ "Room": "Attic" }),
createMockAuto({ "Room": "Office" }),
createMockAuto({ "Area": "Balcony" }),
])).toStrictEqual(["Room", "Area"])
})
@@ -1,195 +1,185 @@
import "./AutomationListBox.css";
import { FC, useState } from "react";
import { FC, useState } from 'react';
import { AutomationData } from "types/automations";
import InputMultiSelect from "components/Inputs/InputMultiSelect";
import InputText from "components/Inputs/InputText";
import { Button } from "components/Inputs/Button";
import { makeGrouping } from "./automationGrouper";
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
import { useCookies } from "react-cookie";
import { TagDB } from "components/AutomationList/TagDB";
// import { ButtonIcon } from "components/Icons/ButtonIcons";
// import ReadMoreOutlinedIcon from "@mui/icons-material/ReadMoreOutlined";
import { ListData, ListParams } from "apiService/types";
import Chip from "@mui/material/Chip";
import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
import { TrashIcon } from "components/Icons";
export type AutomationListBoxProps = {
automations: ListData<AutomationData>;
selected: number;
onSelectAutomation: (i: number) => void;
onRemove: (i: number) => void;
onAdd: () => void;
onUpdateTags: (id: string, tags: Record<string, string>) => void;
onUpdate: (a: AutomationData, i: number) => void;
onLoadMore: (p: ListParams) => void;
tagsDB: TagDB;
};
const useAutomationListBoxState = () => {
const [
cookies,
setCookies,
// eslint-disable-next-line
_,
] = useCookies(["albSearchText", "albSelected"]);
let initialSelected = [];
try {
initialSelected = JSON.parse(cookies.albSelected);
if (!Array.isArray(initialSelected)) {
initialSelected = [initialSelected];
}
initialSelected = initialSelected.map(Number);
// eslint-disable-next-line
} catch (_) {}
const [searchText, setSearchText] = useState(cookies.albSearchText ?? "");
const [selectedTagIdx, setSelectedTagIdx] =
useState<number[]>(initialSelected);
export type Props = {
automations: AutomationData[];
onSelectAutomation: (i: number) => void;
onRemove: (i: number) => void;
onAdd: () => void;
}
return {
searchText,
setSearchText(v: string) {
setSearchText(v);
setCookies("albSearchText", v);
},
setSelectedTagIdx(n: number[]) {
setSelectedTagIdx(n);
setCookies("albSelected", JSON.stringify(n));
},
selectedTagIdx,
};
};
export const AutomationListBox: FC<AutomationListBoxProps> = ({
automations: {
data: automations,
// params: autoParams,
totalItems: totalAutomations,
},
selected,
onSelectAutomation,
onAdd,
onRemove,
// onLoadMore,
onUpdateTags,
tagsDB,
onUpdate,
}) => {
const tags = getTagList(automations);
const { searchText, setSearchText, selectedTagIdx, setSelectedTagIdx } =
useAutomationListBoxState();
const filteredAutomations = filterAutomations(
export const AutomationListBox: FC<Props> = ({
automations,
searchText.toLowerCase()
);
const grouping = makeGrouping(
filteredAutomations.map(([a, _]) => a),
selectedTagIdx.map((i) => tags[i]),
selected
);
onSelectAutomation,
onAdd,
onRemove,
}) => {
return (
<div className="automation-list-box">
<div className="automation-list-box--nav">
<InputText label="Search" value={searchText} onChange={setSearchText} />
<InputMultiSelect
label="Tags"
selected={selectedTagIdx}
onChange={setSelectedTagIdx}
options={tags}
max={3}
/>
</div>
<div className="automation-list-box--body">
<AutomationListBoxGroup
events={{
onSelectAutomation,
onRemove,
}}
autos={filteredAutomations}
grouping={grouping}
selectedAutomationIdx={selected}
tagsDB={tagsDB}
onSave={onUpdate}
/>
</div>
<div className="automation-list-box--bottom">
<Button className="automation-list-box--bottom--add" onClick={onAdd}>
Add
</Button>
{automations.length < totalAutomations ? (
<>
<Chip
label={`Only loaded ${automations.length} out of ${totalAutomations}`}
variant="outlined"
color="warning"
icon={<InfoOutlinedIcon />}
onClick={() =>
window.open(
"https://github.com/asosnovsky/Shortumation/issues/78",
"_blank"
)
}
const tags = getTagList(automations);
const [searchText, setSearchText] = useState('');
const [selected, setSelected] = useState<number[]>([]);
const filteredAutomations = filterAutomations(automations, searchText, selected, tags);
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selected, tags);
return <div className="automation-list-box">
<div className="automation-list-box--nav">
<InputText
label="Search"
value={searchText}
onChange={setSearchText}
/>
<small>support for more is not yet implemented</small>
</>
) : (
""
)}
{/* {autoParams.offset > 0 && (
<ButtonIcon
borderless
className="automation-list-box--bottom--load less"
icon={<ReadMoreOutlinedIcon />}
onClick={() => onLoadMore()}
<InputMultiSelect
label="Tags"
selected={selected}
onChange={setSelected}
options={tags}
max={3}
/>
)} */}
{/* {filteredAutomations.length} out of {totalAutomations} */}
{/* {autoParams.offset + automations.length < totalAutomations && (
<ButtonIcon
borderless
className="automation-list-box--bottom--load more"
icon={<ReadMoreOutlinedIcon />}
/>
)} */}
</div>
</div>
<div className="automation-list-box--body">
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove)}
</div>
<div className="automation-list-box--bottom">
<Button onClick={onAdd}>Add</Button>
<span>Showing Automations: {filteredAutomations.length} out of {automations.length}</span>
</div>
</div>
);
};
}
export const getTagList = (autos: AutomationData[]): string[] =>
Object.keys(
autos
.map((a) => Object.keys(a.tags))
.reduce((all: any, keys) => {
export const getTagList = (autos: AutomationData[]): string[] => Object.keys(autos
.map(a => Object.keys(a.tags))
.reduce((all: any, keys) => {
for (const k of keys) {
all[k] = 1;
all[k] = 1
}
return all;
}, {})
);
}, {}))
const filterAutomations = (
autos: AutomationData[],
searchText: string
): Array<[AutomationData, number]> =>
autos
.map<[AutomationData, number]>((a, i) => [a, i])
.filter(([a, i]) => {
if (!a.metadata) {
return true;
}
if (searchText.length > 0) {
const filterAutomations = (autos: AutomationData[], searchText: string, selected: number[], tags: string[]): Array<[AutomationData, number]> => autos.map<[AutomationData, number]>((a, i) => [a, i]).filter(([a, i]) => {
if (searchText.length > 0) {
if (
!(
(a.metadata.description ?? "")
.toLocaleLowerCase()
.includes(searchText) ||
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
)
!(
a.metadata.description.toLocaleLowerCase().includes(searchText) ||
a.metadata.alias.toLocaleLowerCase().includes(searchText)
)
) {
return false;
return false
}
}
return true;
});
}
if (selected.length > 0) {
for (const i of selected) {
if (!a.tags[tags[i]]) {
return false
}
}
}
return true
})
export const groupAutomations = (
autos: AutomationData[],
selected: number[],
tags: string[],
) => {
if (selected.length === 0) {
return autos.map((_, i) => i);
}
const out: any = {};
for (let ai = 0; ai < autos.length; ai++) {
const a = autos[ai];
let where = out;
let tag: string = '';
let lastKey: string | null = null;
for (const i of selected) {
tag = tags[i];
if (lastKey !== null) {
where = where[lastKey]
}
if (!where[a.tags[tag]]) {
where[a.tags[tag]] = {}
}
lastKey = a.tags[tag]
}
if (lastKey !== null) {
if (!where[lastKey] || !Array.isArray(where[lastKey])) {
where[lastKey] = []
}
where[lastKey].push(ai)
}
}
return out;
}
const convertGroupsToItems = (
groups: any,
autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void,
) => {
if (Array.isArray(groups)) {
return groups.map(i => {
const [auto, autoIndex] = autos[i];
return <div
key={i}
className="automation-list-box--body--item"
title={`Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`}
onClick={() => onSelectAutomation(autoIndex)}
>
<div
className="automation-list-box--body--item--title"
>
<b>{auto.metadata.alias.slice(0, 15)} <span>({auto.metadata.id.slice(0, 5)})</span></b>
<span>{auto.metadata.description.slice(0, 25)}</span>
<div
className="automation-list-box--body--item--tags"
>
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
<b>{tagName}:</b> {auto.tags[tagName]}
</span>)}
</div>
</div>
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
</div>
})
} else {
return Object.keys(groups).map(groupName => {
return <AutomationListBoxGroup
key={groupName}
groupName={groupName}
groups={groups[groupName]}
autos={autos}
onSelectAutomation={onSelectAutomation}
onRemove={onRemove}
/>
})
}
}
const AutomationListBoxGroup: FC<{
groupName: string,
groups: any,
autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void;
}> = ({
groupName,
groups,
autos,
onSelectAutomation,
onRemove,
}) => {
const [open, setOpen] = useState(false);
return <div className="automation-list-box--body--group">
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove)}
</div>
}
Loaded 100 of 332 files, more files were not shown because too many files have changed in this diff. Show more