Compare commits

...
144 Commits
Author SHA1 Message Date
ari 7333f9e159 added manual build 2022-05-17 22:15:06 -04:00
ari 809095f8e0 added edge tag 2022-05-17 22:14:38 -04:00
ari 8942693a32 added a manual build 2022-05-17 22:13:57 -04:00
ari db49ed02ed updated tsc 2022-05-17 22:10:08 -04:00
ari cce2e03053 fixed up trigger issues 2022-05-17 22:03:22 -04:00
ari 4509a224a9 minor style patch 2022-05-17 21:51:20 -04:00
ari 7f8b75fa02 added installation instructions 2022-05-17 21:46:47 -04:00
ari d2c5310b93 new version release 2022-05-17 21:31:10 -04:00
ari a19db93c37 support for malformed automations 2022-05-17 20:48:43 -04:00
ari 6c57408f27 making PRs don't trigger deployments 2022-05-17 12:20:28 -04:00
ari b9a77746c0 updated changelog 2022-05-17 12:19:34 -04:00
ari f1ffab13be fixed up unittest 2022-05-17 12:18:15 -04:00
Ari Sosnovsky 52fcfd9271 Merge pull request #9 from issy/main 2022-05-17 07:50:30 -04:00
Issy Szemeti f435bb70aa Spelling 2022-05-17 11:05:41 +01:00
root 2598c23fd2 no local host 2022-05-16 23:56:47 -04:00
Ari Sosnovsky 070dc7c871 Update config.yaml 2022-05-16 22:51:12 -04:00
Ari Sosnovsky 3d70f04e60 Update CHANGELOG.md 2022-05-16 22:50:53 -04:00
ari cf29d9d61c added build ways 2022-05-16 22:03:27 -04:00
ari 2245fd556b removed logs 2022-05-16 21:54:22 -04:00
ari f50f22190e mobile mode 2022-05-16 21:50:05 -04:00
ari b342088b96 fixed up tsc error 2022-05-16 19:37:32 -04:00
ari c0c0d3181c v0.1.5 2022-05-16 19:27:03 -04:00
ari cf013cc342 fixed up styles 2022-05-16 19:27:03 -04:00
Ari Sosnovsky 23b869d43e Update README.md 2022-05-16 19:07:14 -04:00
Ari Sosnovsky e333e80ea3 Update README.md 2022-05-16 16:03:45 -04:00
Ari Sosnovsky 996e23038f Update README.md 2022-05-16 16:01:46 -04:00
ari 0be03b1536 updating api routing 2022-05-16 15:38:13 -04:00
ari dc726ff184 consolidated 2022-05-16 12:58:39 -04:00
ari 7e5885a34d added manual 2022-05-16 12:46:14 -04:00
ari 38396c4d98 added manual 2022-05-16 12:45:31 -04:00
ari ea832884f1 fixed deploy 2022-05-16 12:45:02 -04:00
ari ea14cd4239 trying autogenerated release 2022-05-16 12:44:25 -04:00
ari 4e19bdf4c4 changed up paths 2022-05-16 12:43:12 -04:00
Ari Sosnovsky 75c5870e00 Update config.yaml 2022-05-16 12:03:26 -04:00
Ari Sosnovsky 4b75ac9199 Update README.md 2022-05-16 11:14:11 -04:00
Ari Sosnovsky fd3780f5bc Update CHANGELOG.md 2022-05-16 11:13:49 -04:00
ari 035ac0c898 prepping 0.1.2 2022-05-16 11:05:17 -04:00
ari b331e4c5a0 using setup python instead of container 2022-05-16 11:03:56 -04:00
ari b9fb49fd32 updated test ci 2022-05-16 11:02:27 -04:00
ari a33a18c102 updated tests 2022-05-16 10:58:54 -04:00
ari defa0ce787 updated test yaml 2022-05-16 10:52:56 -04:00
ari b17e4c75b3 ran linters 2022-05-16 10:42:47 -04:00
ari ef5e66a8f1 fixed test cases 2022-05-16 10:29:05 -04:00
ari edc65da14b added cancel last run 2022-05-15 17:12:58 -04:00
ari 1ee34b234d new version 2022-05-15 17:11:38 -04:00
ari cf178e23d0 updated version 2022-05-15 17:09:34 -04:00
ari 7caac74d2d updated latest 2022-05-15 17:08:33 -04:00
ari 8b9d400a4d names 2022-05-15 16:47:43 -04:00
ari c830f35ee4 correct version 2022-05-15 16:45:08 -04:00
ari 7ac92fb98e neater job names in actions 2022-05-15 16:42:43 -04:00
ari 88ad07aabc cleaned up workflow names 2022-05-15 16:39:49 -04:00
ari 80e98d4a28 cleaned up actions 2022-05-15 16:39:20 -04:00
ari 1a2a78b1e8 setting init to false 2022-05-15 16:38:01 -04:00
ari 5c99308fa6 trying build 2022-05-15 16:24:37 -04:00
ari 0e63bb5b25 updated config 2022-05-15 16:21:29 -04:00
ari b0dd9dfddc trying ha builder 2022-05-15 16:15:03 -04:00
ari 33eae5e027 trying ha builder 2022-05-15 16:13:03 -04:00
ari 6372ec77f7 trying ha builder 2022-05-15 16:08:42 -04:00
ari c9e6bb78da build main when push 2022-05-15 16:03:57 -04:00
ari a7ec4da5cd more correct commands for deploy 2022-05-15 16:03:36 -04:00
ari 0d29642703 redoing deploy 2022-05-15 15:54:50 -04:00
ari 80121c9ee8 extracting the version correctly 2022-05-14 17:26:16 -04:00
ari 1c5bff7c47 building v0.0.15 2022-05-14 17:22:40 -04:00
ari 2af528db36 gh workflow 2022-05-14 17:19:41 -04:00
ari 9dc4c9c59f gh workflow 2022-05-14 17:05:27 -04:00
ari e2c669dcf2 gh workflow 2022-05-14 17:04:45 -04:00
ari d33df7f532 gh workflow 2022-05-14 17:04:23 -04:00
ari 48cb1207b2 gh workflow 2022-05-14 17:04:00 -04:00
ari 36cfcd625b gh workflow 2022-05-14 17:03:05 -04:00
ari 56d5ca3d08 github workflow 2022-05-14 17:01:57 -04:00
ari 06eb6e27b7 github workflow 2022-05-14 17:01:17 -04:00
ari b1a86f3bf0 0.0.14 2022-05-13 17:26:44 -04:00
ari a626a89ed3 cleand up webapp for building 2022-05-13 17:26:44 -04:00
ari 3526fbd9ee updated api 2022-05-13 17:26:44 -04:00
ari 4cfc429980 cleaned up styling for editor 2022-05-13 17:26:44 -04:00
ari bfc95db6f6 cleaned up multinode stlying 2022-05-13 17:26:44 -04:00
ari 8d804add13 cleaned up styling 2022-05-13 17:26:44 -04:00
ari 2db116ad9b fixed test 2022-05-13 17:26:44 -04:00
ari 6981eddb49 Added Gear Icon 2022-05-13 17:26:44 -04:00
ari c118ccc99b no more $smType in webapp 2022-05-13 17:26:44 -04:00
ari 429dfd5b50 removed $smType for conditions and trigger 2022-05-13 17:26:44 -04:00
ari 49fea3fabd cleaned up types 2022-05-13 17:26:44 -04:00
Ari Sosnovsky 38b0aecffa Update README.md 2022-05-05 17:23:48 -04:00
ari b76dc672f3 v0.0.13 2022-05-05 15:21:08 -04:00
ari 6821bb8714 cleaned up 2022-05-05 15:20:08 -04:00
ari c256400518 fixed up styling for autos 2022-05-05 15:03:33 -04:00
ari 634f3e9219 automation editor fixed up 2022-05-05 13:57:44 -04:00
ari a56c7ff964 stable editor 2022-05-05 13:48:51 -04:00
ari b29596fe78 added add node to end of flow 2022-05-01 21:14:24 -04:00
ari 1620d04624 stable flow 2022-05-01 20:55:04 -04:00
ari 1ed1e63330 aligned graph 2022-04-30 23:10:04 -04:00
ari 7ae50e634a removed numerics 2022-04-30 22:52:26 -04:00
ari 56d68d9065 choose flow 2022-04-30 22:51:51 -04:00
ari 468a022582 dagflow triggers 2022-04-27 19:28:09 -04:00
Ari Sosnovsky 5dcd17ad17 Merge pull request #7 from asosnovsky/dependabot/npm_and_yarn/webapp/node-fetch-2.6.7
Bump node-fetch from 2.6.6 to 2.6.7 in /webapp
2022-04-27 17:02:05 -04:00
ari b1df6aebe2 better on click 2022-04-27 17:01:01 -04:00
ari b98d4a8812 tag mod 2022-04-27 17:00:55 -04:00
Ari Sosnovsky 58379ebfc8 Update README.md 2022-04-26 23:18:48 -04:00
ari 41059b4974 better samples 2022-04-26 23:17:44 -04:00
ari af600aaf57 fixed build issues 2022-04-26 23:02:38 -04:00
ari 738712e946 preparing release 2022-04-26 23:02:38 -04:00
dependabot[bot] 7a278c856a Bump node-fetch from 2.6.6 to 2.6.7 in /webapp
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.6...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-27 02:16:24 +00:00
Ari Sosnovsky 3c64550d10 Merge pull request #4 from asosnovsky/dependabot/npm_and_yarn/webapp/async-2.6.4
Bump async from 2.6.3 to 2.6.4 in /webapp
2022-04-26 22:15:54 -04:00
Ari Sosnovsky beff46aeff Merge pull request #5 from asosnovsky/dependabot/npm_and_yarn/webapp/follow-redirects-1.14.9
Bump follow-redirects from 1.13.2 to 1.14.9 in /webapp
2022-04-26 22:15:46 -04:00
Ari Sosnovsky 7f3173684d Merge pull request #6 from asosnovsky/dependabot/npm_and_yarn/webapp/postcss-7.0.36
Bump postcss from 7.0.35 to 7.0.36 in /webapp
2022-04-26 22:15:37 -04:00
ari 8a06a1674b added details route 2022-04-26 22:11:14 -04:00
ari 3e28974abf fixred tag scrolling 2022-04-26 21:49:39 -04:00
ari 19ea12a70e Tag management 2022-04-25 14:37:41 -04:00
dependabot[bot] f30ba7286b Bump async from 2.6.3 to 2.6.4 in /webapp
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-24 20:15:56 +00:00
dependabot[bot] 2617febece Bump postcss from 7.0.35 to 7.0.36 in /webapp
Bumps [postcss](https://github.com/postcss/postcss) from 7.0.35 to 7.0.36.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/7.0.35...7.0.36)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-24 19:38:35 +00:00
ari 81bd15436e fixed typos + uppd storybook 2022-04-24 15:37:30 -04:00
ari 4b3028355d nicer edit style 2022-04-23 23:10:17 -04:00
ari 46209564f0 matching tag definitions 2022-04-23 22:07:11 -04:00
ari bd3cfdf859 updated api makefile 2022-04-23 22:00:08 -04:00
ari 44ad46cff3 clean up 2022-04-23 18:10:20 -04:00
ari baada590c5 updated api for tag support 2022-04-22 12:51:57 -04:00
ari 4f78e42699 full tag support on UI 2022-04-20 22:08:04 -04:00
dependabot[bot] 43c3438b2f Bump follow-redirects from 1.13.2 to 1.14.9 in /webapp
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.13.2 to 1.14.9.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.13.2...v1.14.9)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-21 01:51:41 +00:00
ari 7ea923a050 automation list box finidhed 2022-04-20 21:50:02 -04:00
ari afc67a17ec automation list box 2022-04-20 15:40:26 -04:00
ari 248660ff30 input multi select styling bug 2022-04-19 22:14:49 -04:00
ari 3314d111d6 cleaned up debugging and testing 2022-04-19 22:14:38 -04:00
ari b368be0ff4 latest work 2022-04-19 16:23:33 -04:00
ari acb12e73e8 multiselect numbered 2022-04-18 20:00:22 -04:00
ari 9e9cea9269 better FE error handling 2022-04-18 18:03:00 -04:00
ari b329e3f594 added a proper exposed config folder to ensure tests can be re-ran 2022-04-15 15:50:45 -04:00
ari e9cbacbc92 added a proper exposed config folder to ensure tests can be re-ran 2022-04-15 15:50:45 -04:00
ari 5e345d20e5 - clean up
- origins
2022-04-15 15:50:33 -04:00
Ari Sosnovsky f6af594a8f Merge pull request #3 from asosnovsky/dependabot/npm_and_yarn/webapp/url-parse-1.5.10
Bump url-parse from 1.5.1 to 1.5.10 in /webapp
2022-04-13 22:16:25 -04:00
Ari Sosnovsky ff7dee0879 Merge branch 'main' into dependabot/npm_and_yarn/webapp/url-parse-1.5.10 2022-04-13 22:16:10 -04:00
ari d250018c9a v0.0.11 2022-04-13 22:15:03 -04:00
ari 95af6392ba fixed styling 2022-04-13 22:14:24 -04:00
ari fedc6c889a added lazy saving 2022-04-13 22:06:38 -04:00
ari 77c338eb90 v0.0.10 2022-04-13 16:54:37 -04:00
ari 967508c29e added zoomability 2022-04-13 16:53:04 -04:00
ari 93fe26e787 proper zoom level 2022-04-13 16:20:12 -04:00
dependabot[bot] 5a6f79a0d6 Bump url-parse from 1.5.1 to 1.5.10 in /webapp
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.1...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-13 19:41:01 +00:00
Ari Sosnovsky b1c5bce584 Create codeql-analysis.yml 2022-04-13 15:35:36 -04:00
ari 50ba9f3d6b added version increment in yaml 2022-04-13 15:34:33 -04:00
ari d54ac4a779 changelog 2022-04-13 15:32:04 -04:00
Ari Sosnovsky 045af7bfdb Update README.md 2022-04-13 15:19:40 -04:00
Ari Sosnovsky 8639ac8646 Update FUNDING.yml 2022-04-13 15:17:34 -04:00
Ari Sosnovsky 682bbf799b Update README.md 2022-04-13 15:14:45 -04:00
Ari Sosnovsky 8cee78b5aa Create FUNDING.yml 2022-04-13 15:05:48 -04:00
193 changed files with 19798 additions and 92071 deletions

No files matched your search

+13
View File
@@ -0,0 +1,13 @@
# These are supported funding model platforms
github: #[asosnovsky]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: arisosnovsky
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: asosnovsky
otechie: # Replace with a single Otechie username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+34
View File
@@ -0,0 +1,34 @@
name: Manual Build
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on:
workflow_dispatch:
version:
type: string
jobs:
build:
runs-on: ubuntu-latest
name: Build & Publish ${{ github.event.inputs.version }} / ${{ matrix.arch }}
strategy:
matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build & Push to Dockerhub
uses: home-assistant/builder@2022.03.1
with:
args: |
--${{ matrix.arch }} \
--version ${{ github.event.inputs.version }} \
--additional-tag edge \
--target .
+75
View File
@@ -0,0 +1,75 @@
# 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: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
with:
access_token: ${{ github.token }}
- 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
+77
View File
@@ -0,0 +1,77 @@
name: Deploy
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on:
workflow_dispatch:
push:
branch: [main]
paths:
- 'config.yaml'
jobs:
metadata:
runs-on: ubuntu-latest
name: Metadata
outputs:
version: ${{ steps.version.outputs.VERSION }}
changlelog: ${{ steps.changlelog.outputs.CHANGELOG }}
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Get Version
id: version
shell: bash
run: |
echo ::set-output name=VERSION::$(cat config.yaml | sed -nr 's/version: (.*)/\1/p')
- name: Get Changelog
id: changlelog
shell: bash
run: |
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
build:
runs-on: ubuntu-latest
name: Build & Publish ${{ matrix.arch }}
needs:
- metadata
strategy:
matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
uses: home-assistant/builder@2022.03.1
with:
args: |
--${{ matrix.arch }} \
--target .
publish:
runs-on: ubuntu-latest
needs:
- metadata
- build
name: Publish Github Release
steps:
- name: Publish Release ${{ needs.metadata.outputs.version }}
uses: actions/github-script@v6
env:
VERSION: ${{ needs.metadata.outputs.version }}
CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
with:
script: |
github.rest.repos.createRelease({
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: process.env.VERSION,
body: process.env.CHANGELOG,
});
+80
View File
@@ -0,0 +1,80 @@
name: Test
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on:
workflow_dispatch:
push:
branch: [main]
pull_request:
branches: [main]
jobs:
build:
runs-on: ubuntu-latest
name: Build Test for ${{ matrix.arch }}
strategy:
matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
with:
all_but_latest: true
access_token: ${{ github.token }}
- name: Check out repository
uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: ${{ matrix.arch }}
uses: home-assistant/builder@2022.03.1
with:
args: |
--test \
--${{ matrix.arch }} \
--target .
python:
name: "Python Tests"
runs-on: ubuntu-latest
strategy:
matrix:
action: [lint, coverage, security-checks]
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: 3.9
- name: Install Dependencies
run: cd api && make setup
- name: Echo dependencies
run: cd api && ./venv/bin/pip freeze
- name: Running ${{ matrix.action }}
run: cd api && make ${{ matrix.action }}
nodejs:
name: "NodeJs Tests"
runs-on: ubuntu-latest
strategy:
matrix:
action: [test:ci, tsc:ci, build]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
cache: 'yarn'
cache-dependency-path: webapp/yarn.lock
- name: Install Dependencies
run: cd webapp && yarn install
- name: Run Tests
run: cd webapp && yarn ${{ matrix.action }}
+1
View File
@@ -0,0 +1 @@
.vscode/*.log
+11 -2
View File
@@ -1,3 +1,12 @@
{ {
"python.formatting.provider": "black" "python.formatting.provider": "black",
} "python.testing.unittestArgs": [
"-v",
"-s",
"./api/tests",
"-p",
"*test_*.py"
],
"python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": true
}
+55
View File
@@ -0,0 +1,55 @@
# Changelog
## [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
## [0.0.14] - Using vanila ha yaml
- Supporing vanilla out of the box HA yaml as oppose to parsing them (no more $smType)
- Conditions have now a more a explicit node
## [0.0.13] - Better Styling with react-flow
- Fixed up styling (using react-flow)
- cleaned up some button styles
## [0.0.12] - Tags
- Added tag management system for automations
## [0.0.11] - Zoom
- Added lazy saving
## [0.0.10] - Zoom
- Introducing Zoom!
## [0.0.9] - First Working Version
- Instalable verion via github
- Initial POC done
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+4 -3
View File
@@ -13,7 +13,8 @@ RUN apk add --no-cache \
npm \ npm \
build-base \ build-base \
python3-dev python3-dev
RUN pip install -U wheel setuptools pip RUN pip install -U wheel setuptools pip && \
npm i -g yarn
# <--- Python Dependencies --> # <--- Python Dependencies -->
COPY api/setup.py /app/setup.py COPY api/setup.py /app/setup.py
@@ -22,8 +23,8 @@ RUN pip install . /app
# <--- Webapp Build --> # <--- Webapp Build -->
COPY webapp/ /app/web-builder COPY webapp/ /app/web-builder
RUN cd /app/web-builder && \ RUN cd /app/web-builder && \
npm install && \ yarn && \
npm run build && \ yarn build && \
cp -r /app/web-builder/build /app/web && \ cp -r /app/web-builder/build /app/web && \
rm -rf /app/web-builder rm -rf /app/web-builder
+7 -1
View File
@@ -1,7 +1,13 @@
DC=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
local_run: build:
$(DC) build $(DC) build
push:
$(DC) push
local_run:
$(MAKE) build
$(DC) up -d $(DC) up -d
sleep 1 sleep 1
$(DC) ps $(DC) ps
+42 -2
View File
@@ -1,15 +1,55 @@
# Shortumation # Shortumation
A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/). A better way to write automations in home-assistant without having to install and run a seperate automation engine!
![image](https://user-images.githubusercontent.com/7451445/168672575-fb19997d-fe9b-4192-96b0-733b62519797.png)
![image](https://user-images.githubusercontent.com/7451445/168672840-71ceaa8a-2bee-443e-9150-5b0f03b05d08.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/).
## Features ## Features
- [X] View your automations & scripts in a visual graph - [X] View your automations & scripts in a visual graph
- [X] See all automations in one common view - [X] See all automations in one common view
- [X] Automation Manager - [X] Automation Manager
- [X] Tags for automation organization
- [ ] Script Manager - [ ] Script Manager
- [ ] Use secrets and global parameters - [ ] Use secrets and global parameters
- [ ] Autocomplete fields for entities/devices - [ ] Autocomplete fields for entities/devices
- [ ] Autocomplete fields for template editor - [ ] Autocomplete fields for template editor
- [ ] Autocomplete fields for referencing scripts - [ ] 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 you automations to run you have to have an additional component running and executing the automations. Shortumation simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database)
**Which HA Installation does this support?**
> Currently this is only tested on HA OS. However, you should be able to get it working supervised installations as well (as they support addons). If you want to make it work for Container or Core, you will need to do some additional leg-work and I welcome a PR to get this working (it should be just a matter of mounting the `/config` path to the container running the images in this repo).
**Which version of HA does this require?**
> Since I am working on this project on my own, I can only test it against my own HA installations at home, and I tend to keep things as up to date as possible. The lowest version of HA this was tested on is `core-2022.5.4`
+17
View File
@@ -0,0 +1,17 @@
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:16)
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:27)
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:31)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:12)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:9)
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:16)
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:17)
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:6)
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:7)
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
logger # unused variable (/home/ari/Projects/Shortumation/api/src/logger.py:16)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:13)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:30)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:54)
+2 -3
View File
@@ -8,10 +8,9 @@ setup:
python3 -m venv $(VENV_FOLDER) python3 -m venv $(VENV_FOLDER)
$(PIP) install wheel==0.35.1 $(PIP) install wheel==0.35.1
$(PIP) install .[dev] $(PIP) install .[dev]
$(VENV_BIN)/pre-commit install
lint: lint:
$(VENV_BIN)/vulture --exclude src $(VENV_BIN)/vulture src .vulture_whitelist
$(MAKE) lint-project $(MAKE) lint-project
$(MAKE) lint-tests $(MAKE) lint-tests
@@ -44,4 +43,4 @@ clean:
run-local: run-local:
rm -f web rm -f web
ln -s ../webapp/build web ln -s ../webapp/build web
USE_EXAMPLE_REPO=1 uvicorn src.app:app --reload USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload
+12
View File
@@ -29,3 +29,15 @@ exclude = '''
[tool.coverage.run] [tool.coverage.run]
omit = ["./venv/*", "tests/*"] omit = ["./venv/*", "tests/*"]
[[tool.mypy.overrides]]
module = "decouple.*"
ignore_missing_imports = true
[[tool.mypy.overrides]]
module = "ruamel.*"
ignore_missing_imports = true
[[tool.mypy.overrides]]
module = "tests.*"
ignore_missing_imports = true
+1 -1
View File
@@ -14,7 +14,7 @@ setuptools.setup(
"dev": [ "dev": [
"mypy==0.910", "mypy==0.910",
"mypy-extensions==0.4.3", "mypy-extensions==0.4.3",
"black==21.7b0", "black==22.3.0",
"bandit==1.7.0", "bandit==1.7.0",
"isort==5.9.3", "isort==5.9.3",
"coverage==5.5", "coverage==5.5",
+13 -3
View File
@@ -1,8 +1,11 @@
from fastapi import FastAPI from fastapi import FastAPI
from fastapi.middleware.cors import CORSMiddleware
from fastapi.staticfiles import StaticFiles from fastapi.staticfiles import StaticFiles
from src.automations.manager import AutomationManager from src.automations.manager import AutomationManager
from src.env import ROOT_FOLDER from src.env import ORIGIN, ROOT_FOLDER
from .routes import ping, automations
from .routes import automations, details, ping
def make_app(automation_mgr: AutomationManager) -> FastAPI: def make_app(automation_mgr: AutomationManager) -> FastAPI:
@@ -18,7 +21,14 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
) )
else: else:
print("WARN: could not find web folder") print("WARN: could not find web folder")
app.add_middleware(
CORSMiddleware,
allow_origins=ORIGIN,
allow_credentials=True,
allow_methods=["*"],
allow_headers=["*"],
)
app.include_router(ping.router, prefix="/ping") app.include_router(ping.router, prefix="/ping")
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations") 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 return app
+4 -3
View File
@@ -1,5 +1,5 @@
from fastapi import APIRouter, HTTPException from fastapi import APIRouter, HTTPException
from src.automations.manager import AutomationManager
from src.api.types import ( from src.api.types import (
DeleteAutoRequest, DeleteAutoRequest,
ListData, ListData,
@@ -7,6 +7,7 @@ from src.api.types import (
UpdateAutoRequest, UpdateAutoRequest,
) )
from src.automations.errors import FailedDeletion from src.automations.errors import FailedDeletion
from src.automations.manager import AutomationManager
from src.automations.types import AutomationData from src.automations.types import AutomationData
@@ -24,11 +25,11 @@ def make_automation_router(automations: AutomationManager) -> APIRouter:
), ),
) )
@router.post("") @router.post("/item")
def upsert_auto(body: UpdateAutoRequest): def upsert_auto(body: UpdateAutoRequest):
automations.update(body.index, body.data) automations.update(body.index, body.data)
@router.delete("") @router.delete("/item")
def delete_auto(body: DeleteAutoRequest): def delete_auto(body: DeleteAutoRequest):
try: try:
automations.delete(body.index) automations.delete(body.index)
+21
View File
@@ -0,0 +1,21 @@
from datetime import datetime
from fastapi import APIRouter
from src.env import BUILD_VERSION
from src.hass_config import HassConfig
def make_details_router(hass_config: HassConfig) -> APIRouter:
router = APIRouter()
@router.get("/")
def read_ping():
return {
"version": BUILD_VERSION,
"config": hass_config.get_configuration_path(),
"tags": hass_config.get_automation_tags_path(),
"autos": hass_config.get_automation_path(),
}
return router
+2 -1
View File
@@ -1,6 +1,7 @@
from fastapi import APIRouter
from datetime import datetime from datetime import datetime
from fastapi import APIRouter
from src.env import BUILD_VERSION from src.env import BUILD_VERSION
router = APIRouter() router = APIRouter()
+4 -2
View File
@@ -1,8 +1,10 @@
from typing import Generic, List, TypeVar from typing import Generic, List, TypeVar
from pydantic import BaseModel from pydantic import BaseModel
from pydantic.fields import Field from pydantic.fields import Field
from pydantic.generics import GenericModel from pydantic.generics import GenericModel
from src.automations.types import AutomationData
from src.automations.types import ExtenededAutomationData
DataT = TypeVar("DataT") DataT = TypeVar("DataT")
@@ -20,7 +22,7 @@ class ListData(GenericModel, Generic[DataT]):
class UpdateAutoRequest(BaseModel): class UpdateAutoRequest(BaseModel):
index: int = Field(description="Index of the automation to update") index: int = Field(description="Index of the automation to update")
data: AutomationData data: ExtenededAutomationData
class DeleteAutoRequest(BaseModel): class DeleteAutoRequest(BaseModel):
+1 -1
View File
@@ -1,6 +1,6 @@
from src.api.app import make_app
from src.automations.manager import AutomationManager from src.automations.manager import AutomationManager
from src.hass_config import find_hass_config from src.hass_config import find_hass_config
from src.api.app import make_app
hass_config = find_hass_config() hass_config = find_hass_config()
app = make_app(AutomationManager(hass_config)) app = make_app(AutomationManager(hass_config))
+45 -23
View File
@@ -1,15 +1,18 @@
from itertools import chain from typing import Any, Iterator, Union
from typing import Iterable, Iterator
from pydantic.error_wrappers import ValidationError from pydantic.error_wrappers import ValidationError
from src.json_serializer import normalize_obj from src.json_serializer import normalize_obj
from .types import AutomationData, AutomationMetdata
from .parsers import _parse_actions
from .errors import InvalidAutomationFile from .errors import InvalidAutomationFile
from .types import AutomationMetdata, ExtenededAutomationData
# Single loader # Single loader
def load_automation( def load_automation(
automations_raw_data: Iterable[dict], auto_raw: dict,
) -> Iterator[AutomationData]: tags: dict,
) -> Iterator[ExtenededAutomationData]:
"""Converts an automation dictionary loaded directly from the config into """Converts an automation dictionary loaded directly from the config into
several python typed objects several python typed objects
@@ -17,22 +20,41 @@ def load_automation(
automations_raw_data (Iterable[dict]) automations_raw_data (Iterable[dict])
Returns: Returns:
Iterator[AutomationData] Iterator[ExtenededAutomationData]
""" """
for auto_raw in automations_raw_data: try:
try: yield ExtenededAutomationData(
yield AutomationData( metadata=AutomationMetdata.parse_obj(auto_raw),
metadata=AutomationMetdata.parse_obj(auto_raw), condition=ifempty_or_null_then_list(load_conditions(auto_raw.get("condition", []))),
sequence=list( sequence=ifempty_or_null_then_list(load_conditions(auto_raw.get("action", []))),
_parse_actions( trigger=ifempty_or_null_then_list(normalize_obj(auto_raw.get("trigger", []))),
chain( tags=tags,
auto_raw.get("condition", []), )
auto_raw.get("action", []), except ValidationError as err:
) raise InvalidAutomationFile from err
)
),
trigger=[normalize_obj(obj) for obj in auto_raw.get("trigger", [])], def ifempty_or_null_then_list(obj: Any):
) if not isinstance(obj, list):
except ValidationError as err: return []
raise InvalidAutomationFile from err 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)]
def ensure_condition_dictionary(c: Union[str, dict]):
c = normalize_obj(c)
if isinstance(c, str):
return {"condition": "template", "value_template": c}
elif isinstance(c, dict):
return c
raise InvalidAutomationFile(f"Invalid type for condition object {c}")
+11 -4
View File
@@ -1,7 +1,9 @@
from typing import Iterator, List, Optional from typing import Iterator, List, Optional
from src.automations.errors import FailedDeletion from src.automations.errors import FailedDeletion
from src.automations.types import AutomationData from src.automations.types import AutomationData, ExtenededAutomationData
from src.hass_config.loader import HassConfig from src.hass_config.loader import HassConfig
from .loader import load_automation from .loader import load_automation
@@ -14,21 +16,24 @@ class AutomationManager:
offset: int = 0, offset: int = 0,
limit: int = 10, limit: int = 10,
) -> Iterator[AutomationData]: ) -> Iterator[AutomationData]:
tags = self.hass_config.automation_tags
for i, auto in enumerate(self.hass_config.automations): for i, auto in enumerate(self.hass_config.automations):
if i < offset: if i < offset:
continue continue
if i >= offset + limit: if i >= offset + limit:
break break
yield from load_automation([auto]) yield from load_automation(auto, tags.get(i, {}))
def get(self, index: int) -> Optional[AutomationData]: def get(self, index: int) -> Optional[AutomationData]:
tags = self.hass_config.automation_tags
if index >= 0: if index >= 0:
for i, auto in enumerate(self.hass_config.automations): for i, auto in enumerate(self.hass_config.automations):
if i == index: if i == index:
return next(load_automation(([auto]))) return next(load_automation(auto, tags.get(i, {})))
return None return None
def update(self, index: int, automation: AutomationData): def update(self, index: int, automation: ExtenededAutomationData):
tags = self.hass_config.automation_tags
automations: List[dict] = [] automations: List[dict] = []
updated = False updated = False
for i, orig_auto in enumerate(self.hass_config.automations): for i, orig_auto in enumerate(self.hass_config.automations):
@@ -39,7 +44,9 @@ class AutomationManager:
automations.append(orig_auto) automations.append(orig_auto)
if not updated: if not updated:
automations.append(automation.to_primitive()) automations.append(automation.to_primitive())
tags[index] = automation.tags
self.hass_config.save_automations(automations) self.hass_config.save_automations(automations)
self.hass_config.save_tags(tags)
def delete(self, index: int): def delete(self, index: int):
automations: List[dict] = [] automations: List[dict] = []
-88
View File
@@ -1,88 +0,0 @@
from typing import Iterable, Union
from src.json_serializer import json_dumps, normalize_obj
from src.yaml_serializer.types import SecretValue, NOT_IMPLEMENTED_SV_MSG
from .types import AutomationActionNode, AutomationConditionNode
def _parse_actions(
raw_actions: Iterable[Union[dict, str]]
) -> Iterable[Union[AutomationActionNode, AutomationConditionNode]]:
for raw_c in raw_actions:
action_type = "unknown"
if isinstance(raw_c, str):
yield from _parse_conditions([raw_c])
continue
elif isinstance(raw_c, dict):
if raw_c.get("condition"):
yield from _parse_conditions([raw_c])
continue
elif raw_c.get("service"):
action_type = "service"
action_data = normalize_obj(raw_c)
elif raw_c.get("repeat"):
action_type = "repeat"
repeat_data = raw_c.pop("repeat")
action_data = {
**raw_c,
"repeat": {
"count": repeat_data.get("count", 0),
"sequence": list(_parse_actions(repeat_data.get("sequence", []))),
},
}
elif raw_c.get("wait_template"):
action_type = "wait"
action_data = normalize_obj(raw_c)
elif raw_c.get("event"):
action_type = "event"
action_data = normalize_obj(raw_c)
elif raw_c.get("type") and raw_c.get("device_id"):
action_type = "device"
action_data = normalize_obj(raw_c)
elif raw_c.get("choose"):
action_type = "choose"
choose_data = raw_c.pop("choose")
default_data = raw_c.pop("default", [])
action_data = {
**raw_c,
"choose": [
{
"conditions": list(_parse_conditions(option.get("conditions", []))),
"sequence": list(_parse_actions(option.get("sequence", []))),
}
for option in choose_data
],
"default": list(_parse_actions(default_data)),
}
else:
action_data = normalize_obj(raw_c)
yield AutomationActionNode(
action=action_type,
action_data=action_data,
)
def _parse_conditions(
raw_conditions: Iterable[Union[dict, str]]
) -> Iterable[AutomationConditionNode]:
for raw_c in raw_conditions:
if isinstance(raw_c, str):
yield AutomationConditionNode(
condition="template",
condition_data={"value_template": raw_c},
)
elif isinstance(raw_c, SecretValue):
yield AutomationConditionNode(
condition="template",
condition_data={"value_template": NOT_IMPLEMENTED_SV_MSG},
)
elif isinstance(raw_c, dict):
condition = raw_c.pop("condition")
yield AutomationConditionNode(
condition=condition,
condition_data=normalize_obj(raw_c),
)
else:
yield AutomationConditionNode(
condition="template",
condition_data=json_dumps(raw_c),
)
+14
View File
@@ -0,0 +1,14 @@
from pathlib import Path
from typing import Dict
from src.yaml_serializer import dump_yaml, load_yaml
class TagManager(Dict[int, Dict[str, str]]):
def save(self, path: Path):
path.write_text(dump_yaml(dict(self)))
@classmethod
def load(cls, path: Path):
with path.open("r") as fp:
return cls(load_yaml(fp))
+12 -27
View File
@@ -1,27 +1,7 @@
from typing import Dict, List, Literal, Optional, Union from typing import Dict, List, Literal, Optional, Union
from pydantic.fields import Field
from pydantic import BaseModel from pydantic import BaseModel
from pydantic.fields import Field
class AutomationConditionNode(BaseModel):
condition: str
condition_data: dict
node_type: Literal["condition"] = Field(alias="$smType", default="condition")
def to_primitive(self):
return {
**self.condition_data,
"condition": self.condition,
}
class AutomationActionNode(BaseModel):
action: str
action_data: dict
node_type: Literal["action"] = Field(alias="$smType", default="action")
def to_primitive(self):
return self.action_data
class AutomationMetdata(BaseModel): class AutomationMetdata(BaseModel):
@@ -29,18 +9,23 @@ class AutomationMetdata(BaseModel):
alias: Optional[str] = None alias: Optional[str] = None
description: Optional[str] = None description: Optional[str] = None
trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None
mode: Literal["single", "restart", "queued", "parallel"] = "single" mode: str = "single"
class AutomationData(BaseModel): class AutomationData(BaseModel):
metadata: AutomationMetdata metadata: AutomationMetdata
trigger: List[dict] = [] trigger: List[dict] = []
sequence: List[Union[AutomationConditionNode, AutomationActionNode]] = [] condition: List[dict] = []
sequence: List[dict] = []
def to_primitive(self): def to_primitive(self):
return { return {
**self.metadata.dict(), **self.metadata.dict(exclude_unset=True, exclude_none=True),
"trigger": self.trigger, "trigger": self.trigger,
"condition": [], "condition": self.condition,
"action": [action.to_primitive() for action in self.sequence], "action": self.sequence,
} }
class ExtenededAutomationData(AutomationData):
tags: Dict[str, str] = Field(default_factory=dict)
+2 -1
View File
@@ -1,7 +1,8 @@
from decouple import config
from pathlib import Path from pathlib import Path
from decouple import Csv, config
ROOT_FOLDER = Path(__file__).parent.parent.absolute() ROOT_FOLDER = Path(__file__).parent.parent.absolute()
BUILD_VERSION = config("BUILD_VERSION", "0.0.0") BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
LOG_LEVEL = config("LOG_LEVEL", "INFO") LOG_LEVEL = config("LOG_LEVEL", "INFO")
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
+9 -5
View File
@@ -1,7 +1,8 @@
import os import os
from typing import cast
from decouple import config
from pathlib import Path from pathlib import Path
from decouple import config
from .loader import HassConfig from .loader import HassConfig
@@ -11,10 +12,13 @@ def find_hass_config() -> HassConfig:
print("using USE_EXAMPLE_REPO") print("using USE_EXAMPLE_REPO")
from tests.utils import create_copy_of_example_config from tests.utils import create_copy_of_example_config
return HassConfig(create_copy_of_example_config()) path = create_copy_of_example_config()
print("|-> ", path)
return HassConfig(path)
if "HASSIO_TOKEN" in os.environ: config_dir = Path("/config")
return HassConfig(Path("/config")) if config_dir.is_dir():
return HassConfig(config_dir)
"""Put together the default configuration directory based on the OS.""" """Put together the default configuration directory based on the OS."""
data_dir = Path(config("APPDATA", None) if os.name == "nt" else os.path.expanduser("~")) data_dir = Path(config("APPDATA", None) if os.name == "nt" else os.path.expanduser("~"))
+18 -1
View File
@@ -1,8 +1,10 @@
from pathlib import Path from pathlib import Path
from typing import List, Optional from typing import List, Optional
from src.yaml_serializer import load_yaml, dump_yaml from src.automations.tags import TagManager
from src.yaml_serializer import dump_yaml, load_yaml
from src.yaml_serializer.types import IncludedYaml from src.yaml_serializer.types import IncludedYaml
from .errors import MissingFile from .errors import MissingFile
@@ -25,6 +27,18 @@ class HassConfig:
raise MissingFile("automations.yaml") from err raise MissingFile("automations.yaml") from err
return self.configurations["automation"] return self.configurations["automation"]
@property
def automation_tags(self) -> TagManager:
tag_path = self.get_automation_tags_path()
if not tag_path.exists():
tag_path.parent.mkdir(parents=True, exist_ok=True)
return TagManager()
else:
return TagManager.load(tag_path)
def get_automation_tags_path(self) -> Path:
return self.root_path / ".shortumations" / "tags.yaml"
def get_configuration_path(self) -> Path: def get_configuration_path(self) -> Path:
return self.root_path / "configuration.yaml" return self.root_path / "configuration.yaml"
@@ -50,3 +64,6 @@ class HassConfig:
self.get_configuration_path().write_text( self.get_configuration_path().write_text(
dump_yaml({**self.configurations, "automation": automations}) dump_yaml({**self.configurations, "automation": automations})
) )
def save_tags(self, tags: TagManager):
tags.save(self.get_automation_tags_path())
+2 -1
View File
@@ -1,5 +1,5 @@
import json import json
from typing import Any from typing import Any, List
def json_dumps(obj: Any) -> str: def json_dumps(obj: Any) -> str:
@@ -34,6 +34,7 @@ def normalize_obj(obj: Any) -> Any:
or isinstance(obj, int) or isinstance(obj, int)
or isinstance(obj, float) or isinstance(obj, float)
or isinstance(obj, bool) or isinstance(obj, bool)
or obj is None
): ):
return obj return obj
else: else:
+2 -1
View File
@@ -1,5 +1,6 @@
import io import io
from typing import Any, Union, TextIO from typing import Any, TextIO, Union
from src.yaml_serializer.base_yaml import yaml from src.yaml_serializer.base_yaml import yaml
+6 -1
View File
@@ -1,5 +1,10 @@
from ruamel.yaml import YAML from ruamel.yaml import YAML
from src.yaml_serializer.types import IncludedYaml, IncludedYamlDir, SecretValue
from src.yaml_serializer.types import (
IncludedYaml,
IncludedYamlDir,
SecretValue,
)
yaml = YAML() yaml = YAML()
yaml.register_class(IncludedYaml) yaml.register_class(IncludedYaml)
+1
View File
@@ -1,4 +1,5 @@
from typing import NamedTuple from typing import NamedTuple
from ruamel.yaml.nodes import Node from ruamel.yaml.nodes import Node
from ruamel.yaml.representer import BaseRepresenter from ruamel.yaml.representer import BaseRepresenter
@@ -0,0 +1,15 @@
- id: '1652069225859'
alias: 'Climate - Pref temperature '
description: ''
trigger:
- platform: state
entity_id: input_number.preferred_temperature
condition: []
action:
- service: climate.set_temperature
data:
temperature:
'[object Object]':
target:
entity_id: climate.main_floor
mode: single
@@ -0,0 +1,2 @@
# empty configuration file
cloud:
@@ -0,0 +1,77 @@
0:
Type: HA
1:
Type: HA
2:
Type: Button
Room: Living
3:
Type: Button
Room: Kitchen
4:
Type: Button
Room: Kitchen
5:
Type: Button
Room: Kitchen
6:
Type: Button
Room: Kitchen
7:
Type: Button
Room: Living
8:
Type: Button
Room: Baby
9:
Type: Button
Room: Baby
10:
Type: Button
Room: Baby
11:
Type: Routine
Room: Baby
12:
Type: Routine
Room: Baby
13:
Type: Window
Room: Office
14:
Type: Door
Room: Balcony
15:
Type: Routine
16:
Type: Button
Room: Baby
17:
Type: Routine
18:
Type: Routine
19:
Type: Door
Room: Bedroom
20:
Type: Ensure Power
21:
Type: Ensure Power
22:
Type: Motion
Room: Office
23:
Type: Routine
Room: Baby
24:
Type: Climate
Climate: Heat
25:
Type: Climate
Climate: Time
26:
Type: Routine
27:
Type: Button
Room: Bedroom
BadOne: yes
+841
View File
@@ -0,0 +1,841 @@
- id: '1616887975473'
alias: Home Assistant Off
description: ''
trigger:
- platform: homeassistant
event: shutdown
condition: []
action:
- device_id: das2qdasdasdasadaasd
domain: mobile_app
type: notify
title: Hassio Status
message: Hassio Is turning off...
mode: single
- id: '1616888026264'
alias: Home Assistant On
description: ''
trigger:
- platform: homeassistant
event: start
condition: []
action:
- device_id: das2qdasdasdasadaasd
domain: mobile_app
type: notify
title: Hassio Status
message: Home assistant is up!
mode: single
- id: '1619371298367'
alias: Living Room Button - Single Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_short_press
subtype: remote_button_short_press
condition: []
action:
- service: light.toggle
data: {}
target:
area_id: dining_table
mode: single
- id: '1620239986670'
alias: Kitchen Button - Short Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_short_press
subtype: remote_button_short_press
condition: []
action:
- service: light.toggle
data: {}
target:
entity_id: light.switch_kitchen
mode: single
- id: '1620324780561'
alias: Kitchen Island Button - Single Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_short_press
subtype: remote_button_short_press
condition: []
action:
- type: toggle
device_id: das2qdasdasdasadaasd
entity_id: light.switch_island
domain: light
mode: single
- id: '1621352850204'
alias: Kitchen Button - Double Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_double_press
subtype: remote_button_double_press
condition: []
action:
- type: toggle
device_id: das2qdasdasdasadaasd
entity_id: light.switch_island
domain: light
mode: single
- id: '1622210698281'
alias: Kitchen Button - Long Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_long_press
subtype: remote_button_long_press
condition: []
action:
- choose:
- conditions:
- condition: numeric_state
entity_id: light.switch_kitchen
attribute: brightness
above: '200'
sequence:
- service: light.turn_on
data:
brightness: 50
target:
entity_id: light.switch_kitchen
default:
- service: light.turn_on
data:
brightness: 255
target:
entity_id: light.switch_kitchen
mode: single
- id: '1622769811245'
alias: Living Room Button - Double Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_double_press
subtype: remote_button_double_press
condition: []
action:
- service: light.toggle
data:
brightness: 255
target:
entity_id: light.switch_living
mode: single
- id: '1623430479201'
alias: Bedroom Button - Single Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_short_press
subtype: remote_button_short_press
condition: []
action:
- type: toggle
device_id: das2qdasdasdasadaasd
entity_id: light.bulb_ari_lamp
domain: light
mode: single
- id: '1623642118976'
alias: Bedroom Button - Double Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_double_press
subtype: remote_button_double_press
condition: []
action:
- service: script.turn_all_lights_off
mode: single
- id: '1624640900951'
alias: Baby Button - Double Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_double_press
subtype: remote_button_double_press
condition: []
action:
- service: media_player.play_media
target:
entity_id: media_player.baby_bedroom_dot
data:
media_content_id: Baby Sleep Music
media_content_type: SPOTIFY
mode: single
- id: '1628024070687'
alias: Baby Light Setting - Night
description: ''
trigger:
- platform: time
at: '20:35:00'
condition: []
action:
- service: zwave_js.set_config_parameter
data:
parameter: '5'
value: '15'
target:
area_id: bedroom
- condition: state
entity_id: light.switch_baby
state: 'on'
- service: light.turn_on
data:
transition: 5
brightness_pct: 15
target:
area_id: bedroom
- service: light.turn_on
target:
area_id: bedroom
data:
brightness_pct: 25
mode: single
- id: '1628024123214'
alias: Baby Light Setting - Day
description: ''
trigger:
- platform: time
at: 07:00:00
condition: []
action:
- service: zwave_js.set_config_parameter
data:
value: '100'
parameter: '5'
target:
area_id: bedroom
- condition: state
entity_id: light.switch_baby
state: 'on'
- service: light.turn_on
data:
transition: 5
brightness_pct: 50
target:
area_id: bedroom
mode: single
- id: '1628444671951'
alias: Office Window Opened
description: ''
trigger:
- type: opened
platform: device
device_id: das2qdasdasdasadaasd
entity_id: binary_sensor.window_office
domain: binary_sensor
condition:
- condition: time
after: '21:00'
- condition: state
entity_id: alarm_control_panel.home_alarm
state: armed_away
action:
- service: notify.mobile_app_levas_phone
data:
message: Window is opened in office
mode: single
- id: '1629309267204'
alias: On Balcony Door Open
description: ''
trigger:
- type: opened
platform: device
device_id: das2qdasdasdasadaasd
entity_id: binary_sensor.door_balcony
domain: binary_sensor
condition: []
action:
- service: switch.turn_on
target:
area_id: balcony
data: {}
- service: light.turn_on
target:
area_id: balcony
data: {}
- repeat:
until:
- type: is_not_open
condition: device
device_id: das2qdasdasdasadaasd
entity_id: binary_sensor.door_balcony
domain: binary_sensor
sequence:
- delay:
hours: 0
minutes: 5
seconds: 0
milliseconds: 0
- service: switch.turn_off
target:
device_id:
- das2qdasdasdasadaasd
- sad2q3qdewqdasdadasdas
area_id: balcony
data: {}
mode: single
- id: '1629422438707'
alias: Vita Night Light
description: ''
trigger:
- platform: time
at: input_datetime.vita_night_pump_time
condition:
- condition: and
conditions:
- condition: time
after: input_datetime.vita_night_pump_time
before: 00:00:00
- condition: time
after: 00:00:00
before: 06:00:00
action:
- service: light.turn_on
target:
entity_id: light.bulb_staircase
area_id: living_room
data:
brightness_pct: 40
transition: 15
mode: single
- id: '1634497376234'
alias: Baby Button - Long Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_long_press
subtype: remote_button_long_press
condition: []
action:
- service: media_player.media_pause
target:
device_id: das2qdasdasdasadaasd
- type: turn_off
device_id: das2qdasdasdasadaasd
entity_id: light.switch_baby
domain: light
mode: single
- id: '1635539262562'
alias: On Home Enter
description: ''
trigger:
- platform: zone
entity_id: person.ari
zone: zone.home_2
event: enter
condition:
- condition: not
conditions:
- condition: state
entity_id: alarm_control_panel.home_alarm
state: disarmed
action:
- service: alarm_control_panel.alarm_disarm
target:
entity_id: alarm_control_panel.home_alarm
data:
code: '8012'
- condition: state
entity_id: light.switch_living
state: 'off'
- wait_template: '{{ states("binary_sensor.door_main") == "on" }}'
timeout: 00:10:00
- service: light.turn_on
target:
area_id: living_room
data:
transition: 5
brightness: 255
mode: single
- id: '1636428429596'
alias: Night - On TV off
description: Auto runs things when we go to sleep
trigger:
- platform: time
at: '22:30:00'
- platform: device
device_id: das2qdasdasdasadaasd
domain: media_player
entity_id: media_player.ari_s_fire_tv
type: turned_off
- platform: device
device_id: das2qdasdasdasadaasd
domain: media_player
entity_id: media_player.living_room_firetv
type: turned_off
- platform: numeric_state
entity_id: sensor.analog_input_living_room_tv
below: '1'
condition:
- condition: time
before: 07:00:00
after: '21:00:00'
- condition: numeric_state
entity_id: sensor.analog_input_living_room_tv
below: '1'
- condition: state
entity_id: input_boolean.night_automation_ran
state: 'off'
action:
- service: switch.turn_off
data: {}
target:
area_id:
- dining_table
- office
- living_room
- service: light.turn_off
target:
entity_id:
- light.switch_kitchen
- light.switch_island
- light.switch_dining_chandelier
- light.switch_office_hallway
- switch.light_office
area_id:
- dining_table
- kitchen
data:
transition: 5
- service: light.turn_on
data:
transition: 10
brightness_pct: 50
target:
entity_id: light.switch_living
- service: light.turn_on
data:
brightness_pct: 47
kelvin: 4600
target:
entity_id:
- light.bulb_ari_lamp
- light.bulb_ari_lamp_philip
device_id: das2qdasdasdasadaasd
- service: input_boolean.turn_on
data: {}
target:
entity_id: input_boolean.night_automation_ran
- wait_template: '{{ states("light.bulb_ari_lamp") == "off" }}'
- service: script.turn_all_lights_off
data: {}
mode: single
- id: '1639500650865'
alias: Main Bedroom - Closet Door - Toggle
description: ''
trigger:
- platform: state
entity_id: binary_sensor.door_main_bedroom_closet
condition: []
action:
- choose:
- conditions:
- condition: template
value_template: '{{ trigger.to_state.attributes.contact }}'
sequence:
- service: light.turn_off
target:
entity_id:
- light.bulb_closet
default:
- service: light.turn_on
target:
entity_id:
- light.bulb_closet
data:
transition: 3
mode: single
- id: '1641617168123'
alias: Ensure On
description: ''
trigger:
- platform: device
type: turned_off
device_id: das2qdasdasdasadaasd
entity_id: switch.power_washer
domain: switch
- platform: device
type: turned_off
device_id: das2qdasdasdasadaasd
entity_id: switch.plug_living_room_tv
domain: switch
condition: []
action:
- type: turn_on
device_id: das2qdasdasdasadaasd
entity_id: switch.power_washer
domain: switch
- type: turn_on
device_id: das2qdasdasdasadaasd
entity_id: switch.plug_living_room_tv
domain: switch
mode: single
- id: '1648071019802'
alias: 'Keep Bug Light On '
description: Keeps living room bug lamp on
trigger:
- platform: device
type: turned_off
device_id: das2qdasdasdasadaasd
entity_id: switch.plug_buglamp_indoor
domain: switch
condition: []
action:
- type: turn_on
device_id: das2qdasdasdasadaasd
entity_id: switch.plug_buglamp_indoor
domain: switch
mode: single
- id: '1649426399020'
alias: Office Motion
description: Turn lights on or off when motion is detected
trigger:
- platform: state
entity_id: binary_sensor.motion_office_inv
for:
hours: 0
minutes: 0
seconds: 0
condition:
- condition: time
before: '18:00:00'
after: 06:00:00
weekday:
- mon
- tue
- wed
- thu
- fri
action:
- choose:
- conditions:
- condition: state
entity_id: binary_sensor.motion_office_inv
state: 'on'
sequence:
- type: turn_on
device_id: das2qdasdasdasadaasd
entity_id: switch.light_office
domain: switch
default:
- type: turn_off
device_id: das2qdasdasdasadaasd
entity_id: switch.light_office
domain: switch
mode: single
- id: '1649432254675'
alias: Baby Light Setting
description: Controls max brightness on the baby light
trigger:
- platform: time
at: 07:00:00
- platform: time
at: '20:30:00'
condition: []
action:
- choose:
- conditions:
- condition: time
before: 07:00:00
after: '20:30:00'
sequence:
- service: zwave_js.set_config_parameter
data:
parameter: '5'
value: '15'
target:
area_id: bedroom
- condition: state
entity_id: light.switch_baby
state: 'on'
- service: light.turn_on
data:
transition: 5
brightness_pct: 15
target:
area_id: bedroom
- service: light.turn_on
target:
area_id: bedroom
data:
brightness_pct: 25
default:
- service: zwave_js.set_config_parameter
data:
value: '100'
parameter: '5'
target:
area_id: bedroom
- condition: state
entity_id: light.switch_baby
state: 'on'
- service: light.turn_on
data:
transition: 5
brightness_pct: 50
target:
area_id: bedroom
mode: single
- id: '1649726828269'
alias: Climate Heat Mode Settings
description: Ensures that the climate is always in sync with the house settings
trigger:
- platform: state
entity_id: climate.main_floor
id: main
- platform: state
entity_id: climate.second_floor
id: second
- platform: state
entity_id: input_boolean.thermostats_house_is_heating
id: setting
condition: []
action:
- choose:
- conditions:
- condition: template
value_template: '{{ trigger.id == "setting" }}'
sequence:
- service: climate.turn_off
data: {}
target:
device_id:
- das2qdasdasdasadaasd
- 32424rsafdsafsasq2341
- conditions:
- condition: state
entity_id: input_boolean.thermostats_house_is_heating
state: 'on'
sequence:
- choose:
- conditions:
- condition: and
conditions:
- condition: template
value_template: '{{ trigger.to_state.state != ''heat'' }}'
- condition: template
value_template: '{{ trigger.to_state.state != ''off'' }}'
sequence:
- service: climate.set_hvac_mode
data:
hvac_mode: heat
target:
entity_id: '{{ trigger.entity_id }}'
default:
- choose:
- conditions:
- condition: and
conditions:
- condition: template
value_template: '{{ trigger.to_state.state != ''cool'' }}'
- condition: template
value_template: '{{ trigger.to_state.state != ''off'' }}'
sequence:
- service: climate.set_hvac_mode
data:
hvac_mode: cool
target:
entity_id: '{{ trigger.entity_id }}'
mode: single
- id: '1649727810678'
alias: Climate Timing
description: ''
trigger:
- platform: time
at: 01:00:00
id: night
- platform: time
at: 06:00:00
id: day
condition: []
action:
- choose:
- conditions:
- condition: template
value_template: '{{ trigger.id == "night" }}'
sequence:
- service: climate.turn_off
data: {}
target:
area_id:
- living_room
- main_bedroom
default:
- choose:
- conditions:
- condition: state
entity_id: input_boolean.thermostats_house_is_heating
state: 'on'
sequence:
- service: climate.set_hvac_mode
data:
hvac_mode: heat
target:
area_id:
- living_room
- main_bedroom
default:
- service: climate.set_hvac_mode
data:
hvac_mode: cool
target:
area_id:
- living_room
- main_bedroom
- service: climate.set_temperature
data:
temperature: 23.5
target:
area_id:
- living_room
- main_bedroom
mode: single
- id: '1649820885714'
alias: Turn off Night Auto Ran
description: ''
trigger:
- platform: time
at: 07:00:00
condition: []
action:
- service: input_boolean.turn_off
data: {}
target:
entity_id: input_boolean.night_automation_ran
mode: single
- id: '1649947692702'
alias: Bed Remote
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_short_press
subtype: turn_on
id: turn_on
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_short_press
subtype: turn_off
id: turn_off
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_short_press
subtype: dim_up
id: dim_up
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_short_press
subtype: dim_down
id: dim_down
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_double_press
subtype: turn_on
id: up_dbclk
condition: []
action:
- choose:
- conditions:
- condition: trigger
id: turn_off
sequence:
- type: turn_off
device_id: das2qdasdasdasadaasd
entity_id: light.bulb_ari_lamp
domain: light
- conditions:
- condition: trigger
id: turn_on
sequence:
- service: light.turn_on
data:
color_temp: 153
brightness_pct: 100
target:
device_id: das2qdasdasdasadaasd
- conditions:
- condition: trigger
id: dim_up
sequence:
- device_id: das2qdasdasdasadaasd
domain: light
entity_id: light.bulb_ari_lamp
type: brightness_increase
- conditions:
- condition: trigger
id: dim_down
sequence:
- device_id: das2qdasdasdasadaasd
domain: light
entity_id: light.bulb_ari_lamp
type: brightness_decrease
- conditions:
- condition: trigger
id: up_dbclk
sequence:
- service: light.turn_on
data:
color_temp: 500
brightness_pct: 100
target:
device_id: das2qdasdasdasadaasd
default: []
mode: single
- 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
@@ -0,0 +1,2 @@
# empty configuration file
cloud:
Submodule api/tests/samples/example_config_folder deleted from 2f2c69d6db.
+227 -17
View File
@@ -1,8 +1,15 @@
from unittest import TestCase from unittest import TestCase
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from ruamel.yaml import YAML
from src.api.app import make_app from src.api.app import make_app
from src.automations.types import AutomationData, AutomationMetdata from src.automations.types import (
from tests.utils import get_example_automation_loader AutomationData,
AutomationMetdata,
ExtenededAutomationData,
)
from tests.utils import HA_CONFIG2_EXAMPLE, get_example_automation_loader
class BaseTestCase(TestCase): class BaseTestCase(TestCase):
@@ -16,6 +23,9 @@ class BaseTestCase(TestCase):
class automation_list_tests(BaseTestCase): class automation_list_tests(BaseTestCase):
test_params = {"total": 32, "subtest2_found_items": 7, "subtest1_found_items": 10}
def test_get_list_of_everything(self): def test_get_list_of_everything(self):
data = self.client.post( data = self.client.post(
"/automations/list", "/automations/list",
@@ -33,8 +43,8 @@ class automation_list_tests(BaseTestCase):
"limit": 50, "limit": 50,
}, },
) )
self.assertEqual(d["totalItems"], 31) self.assertEqual(d["totalItems"], self.test_params["total"])
self.assertEqual(len(d["data"]), 31) self.assertEqual(len(d["data"]), self.test_params["total"])
def test_subset1(self): def test_subset1(self):
data = self.client.post( data = self.client.post(
@@ -53,8 +63,8 @@ class automation_list_tests(BaseTestCase):
"limit": 10, "limit": 10,
}, },
) )
self.assertEqual(d["totalItems"], 31) self.assertEqual(d["totalItems"], self.test_params["total"])
self.assertEqual(len(d["data"]), 10) self.assertEqual(len(d["data"]), self.test_params["subtest1_found_items"])
def test_subset2(self): def test_subset2(self):
data = self.client.post( data = self.client.post(
@@ -73,32 +83,48 @@ class automation_list_tests(BaseTestCase):
"limit": 10, "limit": 10,
}, },
) )
self.assertEqual(d["totalItems"], 31) self.assertEqual(d["totalItems"], self.test_params["total"])
self.assertEqual(len(d["data"]), 6) self.assertEqual(len(d["data"]), self.test_params["subtest2_found_items"])
class automation2_lists_tests(automation_list_tests):
test_params = {
"total": 1,
"subtest2_found_items": 0,
"subtest1_found_items": 1,
}
def setUp(self) -> None:
(
self.config_folder,
self.hass_config,
self.automation_loader,
) = get_example_automation_loader(HA_CONFIG2_EXAMPLE)
self.client = TestClient(make_app(self.automation_loader))
class automation_update_tests(BaseTestCase): class automation_update_tests(BaseTestCase):
def test_insert_new(self): def test_insert_new(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
self.assertEqual(resp.json()["totalItems"], 31) self.assertEqual(resp.json()["totalItems"], 32)
resp = self.client.post( resp = self.client.post(
"/automations", "/automations/item",
json={ json={
"index": 33, "index": 33,
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(), "data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
}, },
) )
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 31}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 32})
data = resp.json() data = resp.json()
self.assertEqual(data["totalItems"], 32) self.assertEqual(data["totalItems"], 33)
self.assertEqual(data["data"][0]["metadata"]["id"], "testme") self.assertEqual(data["data"][0]["metadata"]["id"], "testme")
def test_update_some(self): def test_update_some(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
original_auto = resp.json()["data"][0] original_auto = resp.json()["data"][0]
resp = self.client.post( resp = self.client.post(
"/automations", "/automations/item",
json={ json={
"index": 20, "index": 20,
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(), "data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
@@ -108,19 +134,203 @@ class automation_update_tests(BaseTestCase):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
new_auto = resp.json()["data"][0] new_auto = resp.json()["data"][0]
self.assertNotEqual(original_auto, new_auto) self.assertNotEqual(original_auto, new_auto)
self.assertEqual(AutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto) self.assertEqual(
ExtenededAutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto
)
def test_consistent_standard_1(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 15})
original_auto = resp.json()["data"][0]
original_auto["metadata"]["alias"] = "I CHANGED!"
resp = self.client.post(
"/automations/item",
json={
"index": 15,
"data": original_auto,
},
)
self.assertEqual(resp.status_code, 200)
with (self.config_folder / "automations.yaml").open("r") as fp:
disk_data = dict(YAML().load(fp)[15])
trigger = list(map(dict, disk_data.pop("trigger")))
condition = disk_data.pop("condition")
action = list(map(dict, disk_data.pop("action")))
self.assertDictEqual(
disk_data,
{"id": "1629422438707", "alias": "I CHANGED!", "description": "", "mode": "single"},
)
self.assertListEqual(
trigger, [{"platform": "time", "at": "input_datetime.vita_night_pump_time"}]
)
self.assertListEqual(
condition,
[
{
"conditions": [
{
"condition": "time",
"after": "input_datetime.vita_night_pump_time",
"before": "00:00:00",
},
{"condition": "time", "after": "00:00:00", "before": "06:00:00"},
],
"condition": "and",
},
],
)
self.assertListEqual(
action,
[
{
"service": "light.turn_on",
"target": {"entity_id": "light.bulb_staircase", "area_id": "living_room"},
"data": {"brightness_pct": 40, "transition": 15},
}
],
)
def test_consistent_standard_2(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 27})
original_auto = resp.json()["data"][0]
original_auto["metadata"]["alias"] = "I CHANGED!"
resp = self.client.post(
"/automations/item",
json={
"index": 27,
"data": original_auto,
},
)
self.assertEqual(resp.status_code, 200)
with (self.config_folder / "automations.yaml").open("r") as fp:
disk_data = dict(YAML().load(fp)[27])
trigger = list(map(dict, disk_data.pop("trigger")))
condition = disk_data.pop("condition")
action = list(map(dict, disk_data.pop("action")))
self.assertDictEqual(
disk_data,
{"id": "1649947692702", "alias": "I CHANGED!", "description": "", "mode": "single"},
)
self.assertListEqual(
trigger,
[
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_on",
"id": "turn_on",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_off",
"id": "turn_off",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_up",
"id": "dim_up",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_down",
"id": "dim_down",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_double_press",
"subtype": "turn_on",
"id": "up_dbclk",
},
],
)
self.assertListEqual(condition, [])
self.assertListEqual(
action,
[
{
"choose": [
{
"conditions": [{"condition": "trigger", "id": "turn_off"}],
"sequence": [
{
"type": "turn_off",
"device_id": "das2qdasdasdasadaasd",
"entity_id": "light.bulb_ari_lamp",
"domain": "light",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "turn_on"}],
"sequence": [
{
"service": "light.turn_on",
"data": {"color_temp": 153, "brightness_pct": 100},
"target": {"device_id": "das2qdasdasdasadaasd"},
}
],
},
{
"conditions": [{"condition": "trigger", "id": "dim_up"}],
"sequence": [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_increase",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "dim_down"}],
"sequence": [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_decrease",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "up_dbclk"}],
"sequence": [
{
"service": "light.turn_on",
"data": {"color_temp": 500, "brightness_pct": 100},
"target": {"device_id": "das2qdasdasdasadaasd"},
}
],
},
],
"default": [],
}
],
)
class automation_delete_tests(BaseTestCase): class automation_delete_tests(BaseTestCase):
def test_delete_some(self): def test_delete_some(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
self.assertEqual(resp.json()["totalItems"], 31) self.assertEqual(resp.json()["totalItems"], 32)
resp = self.client.delete( resp = self.client.delete(
"/automations", "/automations/item",
json={ json={
"index": 20, "index": 20,
}, },
) )
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
self.assertEqual(resp.json()["totalItems"], 30) self.assertEqual(resp.json()["totalItems"], 31)
+37 -45
View File
@@ -1,45 +1,37 @@
from unittest import TestCase from unittest import TestCase
from src.automations.types import (
AutomationActionNode,
AutomationConditionNode,
AutomationData,
AutomationMetdata,
)
from src.automations.loader import load_automation from src.automations.loader import load_automation
from src.yaml_serializer.types import ( from src.automations.types import AutomationMetdata, ExtenededAutomationData
SecretValue, from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
NOT_IMPLEMENTED_SV_MSG,
)
class loader_tests(TestCase): class loader_tests(TestCase):
def test_load_automation_runs(self): def test_load_automation_runs(self):
auto = list( auto = list(
load_automation( load_automation(
[ {
{ "id": "1616887975473",
"id": "1616887975473", "alias": "Home Assistant Off",
"alias": "Home Assistant Off", "description": "",
"description": "", "trigger": [{"platform": "homeassistant", "event": "shutdown"}],
"trigger": [{"platform": "homeassistant", "event": "shutdown"}], "condition": ["states(time.time) >= '10:00:00'"],
"condition": ["states(time.time) >= '10:00:00'"], "action": [
"action": [ {
{ "device_id": SecretValue("my_mobile_phone", "..."),
"device_id": SecretValue("my_mobile_phone", "..."), "domain": "mobile_app",
"domain": "mobile_app", "type": "notify",
"type": "notify", "title": "Hassio Status",
"title": "Hassio Status", "message": "Hassio Is turning off...",
"message": "Hassio Is turning off...", }
} ],
], "mode": "single",
"mode": "single", },
} {},
]
) )
) )
self.assertEqual( self.assertEqual(
auto[0], auto[0],
AutomationData( ExtenededAutomationData(
metadata=AutomationMetdata( metadata=AutomationMetdata(
id="1616887975473", id="1616887975473",
alias="Home Assistant Off", alias="Home Assistant Off",
@@ -47,21 +39,21 @@ class loader_tests(TestCase):
mode="single", mode="single",
), ),
trigger=[{"platform": "homeassistant", "event": "shutdown"}], trigger=[{"platform": "homeassistant", "event": "shutdown"}],
sequence=[ condition=[
AutomationConditionNode( {
condition="template", "condition": "template",
condition_data={"value_template": "states(time.time) >= '10:00:00'"}, "value_template": "states(time.time) >= '10:00:00'",
), }
AutomationActionNode(
action="device",
action_data={
"device_id": NOT_IMPLEMENTED_SV_MSG,
"domain": "mobile_app",
"type": "notify",
"title": "Hassio Status",
"message": "Hassio Is turning off...",
},
),
], ],
sequence=[
{
"device_id": NOT_IMPLEMENTED_SV_MSG,
"domain": "mobile_app",
"type": "notify",
"title": "Hassio Status",
"message": "Hassio Is turning off...",
}
],
tags={},
), ),
) )
+19 -18
View File
@@ -1,6 +1,7 @@
from unittest import TestCase from unittest import TestCase
from src.automations.errors import FailedDeletion, InvalidAutomationFile from src.automations.errors import FailedDeletion, InvalidAutomationFile
from src.automations.types import AutomationData, AutomationMetdata from src.automations.types import AutomationMetdata, ExtenededAutomationData
from tests.utils import ( from tests.utils import (
get_dummy_automation_loader, get_dummy_automation_loader,
get_example_automation_loader, get_example_automation_loader,
@@ -23,11 +24,11 @@ class manager_tests(TestCase):
_, _, loader = get_example_automation_loader() _, _, loader = get_example_automation_loader()
self.assertIsNone(loader.get(-1)) self.assertIsNone(loader.get(-1))
self.assertIsNone(loader.get(1_000)) self.assertIsNone(loader.get(1_000))
self.assertIsNone(loader.get(31)) self.assertIsNone(loader.get(33))
def test_length(self): def test_length(self):
_, _, loader = get_example_automation_loader() _, _, loader = get_example_automation_loader()
self.assertEqual(loader.get_total_items(), 31) self.assertEqual(loader.get_total_items(), 32)
def test_bad_automations_file(self): def test_bad_automations_file(self):
folder, _, manager = get_dummy_automation_loader( folder, _, manager = get_dummy_automation_loader(
@@ -43,41 +44,41 @@ class manager_tests(TestCase):
[], [],
automation_in_conifguration_mode="none", automation_in_conifguration_mode="none",
) )
manager.update(1, AutomationData(metadata=AutomationMetdata(id="test1"))) manager.update(1, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
auto = manager.get(0) auto = manager.get(0)
self.assertIsNotNone(auto) self.assertIsNotNone(auto)
self.assertEqual(auto.metadata.id, "test1") # type: ignore self.assertEqual(auto.metadata.id, "test1") # type: ignore
def test_create_automation_with_example_folder(self): def test_create_automation_with_example_folder(self):
_, _, manager = get_example_automation_loader() _, _, manager = get_example_automation_loader()
self.assertEqual(manager.get_total_items(), 31)
manager.update(32, AutomationData(metadata=AutomationMetdata(id="test1")))
auto = manager.get(31)
self.assertIsNotNone(auto)
self.assertEqual(manager.get_total_items(), 32) self.assertEqual(manager.get_total_items(), 32)
manager.update(40, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
auto = manager.get(32)
self.assertIsNotNone(auto)
self.assertEqual(manager.get_total_items(), 33)
self.assertEqual(auto.metadata.id, "test1") # type: ignore self.assertEqual(auto.metadata.id, "test1") # type: ignore
def test_update_automation(self): def test_update_automation(self):
_, _, manager = get_dummy_automation_loader( _, _, manager = get_dummy_automation_loader(
[ [
AutomationData(metadata=AutomationMetdata(id="test1")), ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
AutomationData(metadata=AutomationMetdata(id="test2")), ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
AutomationData(metadata=AutomationMetdata(id="test3")), ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
], ],
automation_in_conifguration_mode="none", automation_in_conifguration_mode="none",
) )
auto = manager.get(0) auto = manager.get(0)
self.assertEqual(auto.metadata.id, "test1") # type: ignore self.assertEqual(auto.metadata.id, "test1") # type: ignore
manager.update(0, AutomationData(metadata=AutomationMetdata(id="toaster-7"))) manager.update(0, ExtenededAutomationData(metadata=AutomationMetdata(id="toaster-7")))
auto = manager.get(0) auto = manager.get(0)
self.assertEqual(auto.metadata.id, "toaster-7") # type: ignore self.assertEqual(auto.metadata.id, "toaster-7") # type: ignore
def test_delete_automation(self): def test_delete_automation(self):
_, _, manager = get_dummy_automation_loader( _, _, manager = get_dummy_automation_loader(
[ [
AutomationData(metadata=AutomationMetdata(id="test1")), ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
AutomationData(metadata=AutomationMetdata(id="test2")), ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
AutomationData(metadata=AutomationMetdata(id="test3")), ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
], ],
automation_in_conifguration_mode="none", automation_in_conifguration_mode="none",
) )
@@ -90,9 +91,9 @@ class manager_tests(TestCase):
def test_failed_deletion_automation(self): def test_failed_deletion_automation(self):
_, _, manager = get_dummy_automation_loader( _, _, manager = get_dummy_automation_loader(
[ [
AutomationData(metadata=AutomationMetdata(id="test1")), ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
AutomationData(metadata=AutomationMetdata(id="test2")), ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
AutomationData(metadata=AutomationMetdata(id="test3")), ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
], ],
automation_in_conifguration_mode="none", automation_in_conifguration_mode="none",
) )
@@ -1,222 +0,0 @@
from unittest import TestCase
from src.automations.types import (
AutomationActionNode,
AutomationConditionNode,
)
from src.automations.parsers import (
_parse_conditions,
_parse_actions,
)
from src.yaml_serializer.types import (
SecretValue,
NOT_IMPLEMENTED_SV_MSG,
)
class parser_tests(TestCase):
def test_various_condition_types(self):
raw_conditions = [
{"condition": "template", "value_template": "silly logic here"},
"silly logic here",
{"condition": "time", "after": "10:00:00", "weekday": ["mon", "tue"]},
{"condition": "what is this?", "wuba": "dub"},
SecretValue("supersecretcondition", "rm -rf ./*"),
]
expected_process = [
AutomationConditionNode(
condition="template",
condition_data={"value_template": "silly logic here"},
),
AutomationConditionNode(
condition="template",
condition_data={"value_template": "silly logic here"},
),
AutomationConditionNode(
condition="time",
condition_data={"after": "10:00:00", "weekday": ["mon", "tue"]},
),
AutomationConditionNode(
condition="what is this?",
condition_data={"wuba": "dub"},
),
AutomationConditionNode(
condition="template",
condition_data={"value_template": NOT_IMPLEMENTED_SV_MSG},
),
]
for expected, parsed in zip(expected_process, _parse_conditions(raw_conditions)):
self.assertEqual(parsed, expected)
def test_various_action_types(self):
raw_conditions = [
{"condition": "template", "value_template": "silly logic here"},
"silly logic here",
{"condition": "time", "after": "10:00:00", "weekday": ["mon", "tue"]},
{
"service": "light.turn_on",
"target": ["light.kitchen"],
"data": {"brightness": 10},
},
{"something": "is wrong"},
{
"alias": "Doing amazing things!",
"repeat": {
"count": 1000,
"sequence": [
"conditionA",
{
"wait_template": "states('light.kitchen') == 'off",
"timeout": 10,
},
{
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
],
},
},
{"event": "custom-event", "event_data": "wow"},
{
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
{
"alias": "Doing amazing things!",
"choose": [
{
"conditions": [
r"{{ states('switch.plug_out_bug_lamp') == 'unavailable'}}",
],
"sequence": [
"conditionA",
{
"wait_template": "states('light.kitchen') == 'off",
"timeout": 10,
},
{
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
],
}
],
"default": [{"event": "nope", "event_data": {}}],
},
]
expected_process = [
AutomationConditionNode(
condition="template",
condition_data={"value_template": "silly logic here"},
),
AutomationConditionNode(
condition="template",
condition_data={"value_template": "silly logic here"},
),
AutomationConditionNode(
condition="time",
condition_data={"after": "10:00:00", "weekday": ["mon", "tue"]},
),
AutomationActionNode(
action="service",
action_data={
"service": "light.turn_on",
"target": ["light.kitchen"],
"data": {"brightness": 10},
},
),
AutomationActionNode(action="unknown", action_data={"something": "is wrong"}),
AutomationActionNode(
action="repeat",
action_data={
"alias": "Doing amazing things!",
"repeat": {
"count": 1000,
"sequence": [
AutomationConditionNode(
condition="template",
condition_data={"value_template": "conditionA"},
),
AutomationActionNode(
action="wait",
action_data={
"wait_template": "states('light.kitchen') == 'off",
"timeout": 10,
},
),
AutomationActionNode(
action="device",
action_data={
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
),
],
},
},
),
AutomationActionNode(
action="event",
action_data={"event": "custom-event", "event_data": "wow"},
),
AutomationActionNode(
action="device",
action_data={
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
),
AutomationActionNode(
action="choose",
action_data={
"alias": "Doing amazing things!",
"choose": [
{
"conditions": [
AutomationConditionNode(
condition="template",
condition_data={
"value_template": r"{{ states('switch.plug_out_bug_lamp') == 'unavailable'}}"
},
)
],
"sequence": [
AutomationConditionNode(
condition="template",
condition_data={"value_template": "conditionA"},
),
AutomationActionNode(
action="wait",
action_data={
"wait_template": "states('light.kitchen') == 'off",
"timeout": 10,
},
),
AutomationActionNode(
action="device",
action_data={
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
),
],
}
],
"default": [
AutomationActionNode(
action="event",
action_data={"event": "nope", "event_data": {}},
)
],
},
),
]
for expected, parsed in zip(expected_process, _parse_actions(raw_conditions)):
self.assertEqual(parsed, expected)
@@ -0,0 +1,17 @@
from pathlib import Path
from tempfile import mktemp
from unittest import TestCase
from src.automations.tags import TagManager
class tag_tests(TestCase):
def test_load_and_save(self):
tmp_file = Path(mktemp()).with_suffix(".yml")
tags = TagManager()
tags[0] = {"Room": "Kitchen", "Type": "Lights"}
tags[1] = {}
tags.save(tmp_file)
loaded_tags = TagManager.load(tmp_file)
assert loaded_tags.keys() == tags.keys()
@@ -1,4 +1,5 @@
from unittest import TestCase from unittest import TestCase
from src.automations.types import AutomationData, AutomationMetdata from src.automations.types import AutomationData, AutomationMetdata
from src.hass_config.errors import MissingFile from src.hass_config.errors import MissingFile
from src.hass_config.loader import HassConfig from src.hass_config.loader import HassConfig
+5 -3
View File
@@ -1,11 +1,13 @@
import json import json
from unittest import TestCase from unittest import TestCase
from ruamel.yaml.scalarstring import ScalarString
from ruamel.yaml.scalarint import ScalarInt
from ruamel.yaml.scalarbool import ScalarBoolean from ruamel.yaml.scalarbool import ScalarBoolean
from ruamel.yaml.scalarfloat import ScalarFloat from ruamel.yaml.scalarfloat import ScalarFloat
from src.yaml_serializer.types import SecretValue, NOT_IMPLEMENTED_SV_MSG from ruamel.yaml.scalarint import ScalarInt
from ruamel.yaml.scalarstring import ScalarString
from src.json_serializer import json_dumps from src.json_serializer import json_dumps
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
class json_serializer_tests(TestCase): class json_serializer_tests(TestCase):
+4 -5
View File
@@ -1,14 +1,13 @@
import io import io
from unittest import TestCase from unittest import TestCase
from src.yaml_serializer import (
dump_yaml, from src.yaml_serializer import dump_yaml, load_yaml
load_yaml,
)
from src.yaml_serializer.types import ( from src.yaml_serializer.types import (
IncludedYaml, IncludedYaml,
SecretValue,
IncludedYamlDir, IncludedYamlDir,
SecretValue,
) )
from tests.utils import SAMPLES_FOLDER
class dumping_yamls_tests(TestCase): class dumping_yamls_tests(TestCase):
+10 -7
View File
@@ -1,32 +1,35 @@
from pathlib import Path
from shutil import copytree from shutil import copytree
from tempfile import mkdtemp from tempfile import mkdtemp
from pathlib import Path
from typing import List, Literal, Optional, Tuple from typing import List, Literal, Optional, Tuple
from src.automations.manager import AutomationManager from src.automations.manager import AutomationManager
from src.automations.types import AutomationData from src.automations.types import AutomationData
from src.hass_config.loader import HassConfig from src.hass_config.loader import HassConfig
from src.yaml_serializer import dump_yaml from src.yaml_serializer import dump_yaml
from src.yaml_serializer.types import IncludedYaml from src.yaml_serializer.types import IncludedYaml
THIS_FOLDER = Path(__file__).parent THIS_FOLDER = Path(__file__).parent
SAMPLES_FOLDER = THIS_FOLDER / "samples" SAMPLES_FOLDER = THIS_FOLDER / "samples"
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "example_config_folder" HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
def get_example_automation_loader() -> Tuple[Path, HassConfig, AutomationManager]: def get_example_automation_loader(
config_to_copy: Path = HA_CONFIG_EXAMPLE,
) -> Tuple[Path, HassConfig, AutomationManager]:
"""Creates an example automation loader from the samples folder """Creates an example automation loader from the samples folder
Returns: Returns:
Tuple[Path, HassConfig, AutomationManager] Tuple[Path, HassConfig, AutomationManager]
""" """
root_folder = create_copy_of_example_config() root_folder = create_copy_of_example_config(config_to_copy)
hass_config = HassConfig(root_folder) hass_config = HassConfig(root_folder)
automation_loader = AutomationManager(hass_config) automation_loader = AutomationManager(hass_config)
return root_folder, hass_config, automation_loader return root_folder, hass_config, automation_loader
def create_copy_of_example_config() -> Path: def create_copy_of_example_config(config_to_copy: Path = HA_CONFIG_EXAMPLE) -> Path:
"""Creates a copy of the example config folder """Creates a copy of the example config folder
Returns: Returns:
@@ -34,7 +37,7 @@ def create_copy_of_example_config() -> Path:
""" """
root_folder = Path(mkdtemp()) root_folder = Path(mkdtemp())
root_folder.rmdir() root_folder.rmdir()
copytree(HA_CONFIG_EXAMPLE, root_folder) copytree(config_to_copy, root_folder)
return root_folder return root_folder
+6 -4
View File
@@ -1,16 +1,18 @@
name: Shortumation name: Shortumation
version: 0.0.8 version: 0.1.9
slug: shortumation slug: shortumation
image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation" url: "https://github.com/asosnovsky/Shortumation"
description: "A homeassitant addon which provides better UI for automations & scripts." description: "A homeassitant addon which provides better UI for automations & scripts."
arch: arch:
- armhf
- armv7
- aarch64 - aarch64
- amd64 - amd64
- armhf
- armv7
- i386 - i386
startup: application startup: application
boot: auto boot: auto
init: false
ingress: true ingress: true
ingress_port: 8000 ingress_port: 8000
ingress_entry: "web/" ingress_entry: "web/"
@@ -18,7 +20,7 @@ panel_icon: mdi:home-automation
hassio_role: manager hassio_role: manager
privileged: privileged:
- SYS_RAWIO - SYS_RAWIO
host_network: true host_network: false
auth_api: true auth_api: true
map: map:
- config:rw - config:rw
+1 -1
View File
@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
addon: addon:
image: "asosnovsky/shortumation:${ARCH:-amd64}-${BUILD_TAG:-latest}" image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-latest}"
build: build:
context: "./" context: "./"
dockerfile: "./Dockerfile" dockerfile: "./Dockerfile"
+21
View File
@@ -0,0 +1,21 @@
version: '3'
services:
homeassistant:
container_name: homeassistant
image: "ghcr.io/home-assistant/home-assistant:stable"
volumes:
- config:/config
restart: unless-stopped
privileged: true
network_mode: host
shortumation:
# make sure to replace the ARCH with whatever system you are running!
image: "asosnovsky/shortumation-${ARCH:-amd64}:latest"
volumes:
- config:/config
ports:
- 8081:8000
volumes:
config:
+13
View File
@@ -0,0 +1,13 @@
0:
Type: Generic
1:
Type: Generic
2:
Type: Climate
Room: House
4: {}
3:
Type: Vent
Room: Bathroom
Floor: First
5: {}
+16 -2
View File
@@ -25,6 +25,8 @@
- id: '1616888026264' - id: '1616888026264'
alias: Home Assistant On alias: Home Assistant On
description: '' description: ''
trigger_variables:
mode: single
trigger: trigger:
- platform: homeassistant - platform: homeassistant
event: start event: start
@@ -38,15 +40,27 @@
- id: shortu-2 - id: shortu-2
alias: Neat trick alias: Neat trick
description: '' description: ''
trigger_variables:
mode: queued mode: queued
trigger: [] trigger: []
condition: [] condition: []
action: action:
- alias: Choose - alias: Choose
default: [] default:
- condition: and
alias: ''
conditions:
- condition: or
conditions: []
choose: [] choose: []
- service: lights.turn_on - service: lights.turn_on
target: target:
entity: bear entity: bear
data: {} data: {}
- id: shortu-3
alias: Bathroom Vent
description: Turn the vent on when the humidity is high or it's smelly
trigger_variables:
mode: single
trigger: []
condition: []
action: []
+2 -6
View File
@@ -19,11 +19,7 @@
"env": { "env": {
"CI": "true" "CI": "true"
}, },
"disableOptimisticBPs": true, "disableOptimisticBPs": true
"jasmineExplorer.nodeArgv": [
"-r",
"ts-node/register"
]
} }
] ]
} }
-75200
View File
File diff suppressed because it is too large. Load diff
+19 -9
View File
@@ -8,13 +8,14 @@
"@types/node": "^12.0.0", "@types/node": "^12.0.0",
"@types/react": "^17.0.0", "@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0", "@types/react-dom": "^17.0.0",
"chroma-js": "^2.1.2",
"jss": "^10.8.2", "jss": "^10.8.2",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-flow-renderer": "^10.1.2",
"react-jss": "^10.8.2", "react-jss": "^10.8.2",
"react-router-dom": "6", "react-router-dom": "6",
"react-scripts": "4.0.3", "react-scripts": "4.0.3",
"superstruct": "^0.15.4",
"theming": "^3.3.0", "theming": "^3.3.0",
"typescript": "^4.1.2", "typescript": "^4.1.2",
"web-vitals": "^1.0.1", "web-vitals": "^1.0.1",
@@ -23,7 +24,11 @@
"scripts": { "scripts": {
"start": "react-scripts start", "start": "react-scripts start",
"build": "react-scripts build", "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": "react-scripts test",
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
"eject": "react-scripts eject", "eject": "react-scripts eject",
"storybook": "start-storybook -p 6006 -s public", "storybook": "start-storybook -p 6006 -s public",
"build-storybook": "build-storybook -s public" "build-storybook": "build-storybook -s public"
@@ -57,18 +62,23 @@
] ]
}, },
"devDependencies": { "devDependencies": {
"@storybook/addon-actions": "^6.4.22",
"@storybook/addon-essentials": "^6.4.22",
"@storybook/addon-links": "^6.4.22",
"@storybook/addon-queryparams": "^6.2.9",
"@storybook/node-logger": "^6.4.22",
"@storybook/preset-create-react-app": "^3.2.0",
"@storybook/react": "^6.4.22",
"@testing-library/jest-dom": "^5.11.4", "@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0", "@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10", "@testing-library/user-event": "^12.1.10",
"@storybook/addon-actions": "^6.3.12",
"@storybook/addon-essentials": "^6.3.12",
"@storybook/addon-links": "^6.3.12",
"@storybook/addon-queryparams": "^6.2.9",
"@storybook/node-logger": "^6.3.12",
"@storybook/preset-create-react-app": "^3.2.0",
"@storybook/react": "^6.3.12",
"@types/chroma-js": "^2.1.3", "@types/chroma-js": "^2.1.3",
"@types/js-yaml": "^4.0.5", "@types/js-yaml": "^4.0.5",
"jest-environment-jsdom": "^27.5.1",
"ts-node": "^10.4.0" "ts-node": "^10.4.0"
} },
"moduleDirectories": [
"node_modules",
"src"
]
} }
+8 -5
View File
@@ -2,16 +2,19 @@ import './App.css';
import { Routes, Route, BrowserRouter } from "react-router-dom"; import { Routes, Route, BrowserRouter } from "react-router-dom";
import { AutomationRoute } from 'routes/automation'; import { AutomationRoute } from 'routes/automation';
import { useConnectedApiService } from 'apiService'; import { useConnectedApiService } from 'apiService';
import { ErrorBoundary } from 'components/ErrorBoundary';
function App() { function App() {
const api = useConnectedApiService(); const api = useConnectedApiService();
return ( return (
<div className="app"> <div className="app">
<BrowserRouter> <ErrorBoundary>
<Routes> <BrowserRouter>
<Route path="*" element={<AutomationRoute api={api} />} /> <Routes>
</Routes> <Route path="*" element={<AutomationRoute api={api} />} />
</BrowserRouter> </Routes>
</BrowserRouter>
</ErrorBoundary>
</div> </div>
); );
} }
+5 -5
View File
@@ -1,7 +1,7 @@
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
import { API } from "./base"; import { API } from "./base";
import { ListData, ListParams } from "./types"; import { ListData, ListParams } from "./types";
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths'; import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
export const makeAutomationAPI = (api: API) => ({ export const makeAutomationAPI = (api: API) => ({
@@ -14,19 +14,19 @@ export const makeAutomationAPI = (api: API) => ({
}); });
return data; return data;
}, },
async update({index, auto}: {index: number, auto: AutomationData}) { async update({ index, auto }: { index: number, auto: AutomationData }) {
return await api.makeCall({ return await api.makeCall({
path: AUTOMTAION_ROOT, path: AUTOMTAION_ITEM,
data: { data: {
index, index,
data: auto data: auto
}, },
}) })
}, },
async remove({index}: {index: number}) { async remove({ index }: { index: number }) {
return await api.makeCall({ return await api.makeCall({
method: "DELETE", method: "DELETE",
path: AUTOMTAION_ROOT, path: AUTOMTAION_ITEM,
data: { data: {
index, index,
} }
+19 -5
View File
@@ -1,14 +1,15 @@
import { APIRequest, APIResponse } from './types'; import { APIRequest, APIResponse } from './types';
export interface API { export interface API {
makeCall: <Res = any, Req = any>(req: APIRequest<Req>) => Promise<APIResponse<Res>>; makeCall: <Res = any, Req = any>(req: APIRequest<Req>) => Promise<APIResponse<Res>>;
} }
export const makeRemoteAPI = (baseURL: string): API => ({ export const makeRemoteAPI = (baseURL: string): API => ({
async makeCall({ async makeCall({
path, path,
method = "POST", method = "POST",
data={} data = {}
}) { }) {
try {
const reply = await fetch(baseURL + path, { const reply = await fetch(baseURL + path, {
method, method,
headers: { headers: {
@@ -30,5 +31,18 @@ export const makeRemoteAPI = (baseURL: string): API => ({
console.error(response) console.error(response)
} }
return response return response
} catch (err) {
console.error(err)
let error = String(err)
if (err instanceof Error) {
error += ` ${err.stack}`
}
return {
ok: false,
error,
}
} }
}
}) })
+5 -4
View File
@@ -8,17 +8,18 @@ export const useAPIService = (
) => { ) => {
// state // state
const [state, setState] = useDefaultApiState(); const [state, setState] = useDefaultApiState();
const {reload, wrapCall} = makeReloadAutomations(automationAPI, state, setState); const { reload, wrapCall } = makeReloadAutomations(automationAPI, state, setState);
// initial load of autos // initial load of autos
useEffect(() => { useEffect(() => {
reload(); reload();
// eslint-disable-next-line
}, []); }, []);
return { return {
state, state,
removeAutomation: wrapCall(automationAPI.remove), removeAutomation: wrapCall(automationAPI.remove),
updateAutomation: wrapCall(automationAPI.update), updateAutomation: wrapCall(automationAPI.update),
} }
} }
+4 -2
View File
@@ -2,13 +2,15 @@ import { AutomationData } from 'types/automations';
import { makeAutomationAPI } from './automations'; import { makeAutomationAPI } from './automations';
import { makeRemoteAPI } from "./base"; import { makeRemoteAPI } from "./base";
import { useAPIService } from './core'; import { useAPIService } from './core';
import {useMockAPI} from "./mock"; import { useMockAPI } from "./mock";
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i); const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
export const useConnectedApiService = () => useAPIService( export const useConnectedApiService = () => useAPIService(
makeAutomationAPI(makeRemoteAPI( makeAutomationAPI(makeRemoteAPI(
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations" process.env.NODE_ENV === 'development' ?
"http://localhost:8000/automations" :
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
)) ))
); );
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService( export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
+3 -3
View File
@@ -1,7 +1,7 @@
import { useRef } from 'react'; import { useRef } from 'react';
import { AutomationData } from 'types/automations'; import { AutomationData } from 'types/automations';
import { API } from './base'; import { API } from './base';
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths'; import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
export const useMockAPI = ( export const useMockAPI = (
@@ -26,7 +26,7 @@ export const useMockAPI = (
})) }))
} as any } as any
} }
if (path === AUTOMTAION_ROOT) { if (path === AUTOMTAION_ITEM) {
if (method === 'POST') { if (method === 'POST') {
const { index, data: auto } = data as any; const { index, data: auto } = data as any;
if (index >= automationsRef.current.length) { if (index >= automationsRef.current.length) {
@@ -37,7 +37,7 @@ export const useMockAPI = (
auto, auto,
...automationsRef.current.slice(index + 1) ...automationsRef.current.slice(index + 1)
]; ];
} }
return { return {
ok: true, ok: true,
data: {} data: {}
+1
View File
@@ -2,3 +2,4 @@
export const AUTOMTAION_ROOT = '/' as const; export const AUTOMTAION_ROOT = '/' as const;
export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const; export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const;
export const AUTOMTAION_ITEM = `${AUTOMTAION_ROOT}item` as const;
@@ -1,18 +1,84 @@
.automation-editor--info-box { .automation-editor--info-box {
min-width : 25px; height: 100%;
padding-left : 10px; padding-left: 10px;
padding-right : 10px; padding-right: 10px;
display : flex; display: flex;
flex-direction : column; flex-direction: column;
justify-content: flex-start; justify-content: flex-start;
overflow : auto; overflow: hidden;
padding-top : 5; position: relative;
padding-bottom : 10;
position : relative;
} }
/* .automation-editor--info-box.hide {} */ .automation-editor--info-box-inner {
height: 100%;
overflow: auto;
}
.automation-editor--info-box.show {
min-width: 20em;
}
.automation-editor--info-box.hide {
min-width: 1em;
}
.automation-editor--info-box.hide>.automation-editor--info-box-inner { .automation-editor--info-box.hide>.automation-editor--info-box-inner {
display: none; display: none;
} }
.automation-editor--info-box--tags {
padding: 0.25em 0.75em 1em 0.75em;
border-color: var(--primary-accent);
border-width: 1px;
border-style: ridge;
border-radius: 5px;
}
.automation-editor--info-box--tags>h1 {
font-size: 1.5em;
}
.automation-editor--info-box--tag {
display: flex;
justify-content: center;
align-items: center;
flex-wrap: wrap;
gap: 0.5em;
margin-bottom: 0.5em;
}
.automation-editor--info-box--tag>div {
margin: 0;
}
.automation-editor--info-box--tag>div>input {
max-width: 5em;
padding: 1em 0.25em 0.2em 0.25em;
}
.automation-editor--info-box--tag>button {
height: 1.25em;
width: 1.25em;
font-size: 1em;
display: flex;
justify-content: center;
align-items: center;
}
.automation-editor--info-box--tag--error {
width: 100%;
display: flex;
justify-content: center;
padding: 0;
}
.automation-editor--info-box--tag--error.hide {
height: 0;
opacity: 0;
display: none;
}
.automation-editor--info-box--tag--error.show {
height: fit-content;
opacity: 1;
}
@@ -3,29 +3,31 @@ import { useState } from "react";
import { AutoInfoBox } from "./AutoInfoBox"; import { AutoInfoBox } from "./AutoInfoBox";
export default { export default {
title: 'AutomationEditor/AutoInfoBox', title: 'App/AutomationList/Editor/InfoBox',
component: AutoInfoBox, component: AutoInfoBox,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: '^on.*' } },
} as ComponentMeta<typeof AutoInfoBox>; } as ComponentMeta<typeof AutoInfoBox>;
export const Basic: ComponentStory<typeof AutoInfoBox> = args => { export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
const [state, setState] = useState(args.metadata) const [[metadata, tags], setState] = useState([args.metadata, args.tags])
return ( return (
<div className="page"> <div className="page">
<AutoInfoBox <AutoInfoBox
className="" className=""
metadata={state} metadata={metadata}
onUpdate={up => { tags={tags}
args.onUpdate(up) onUpdate={(m, t) => {
setState(up) args.onUpdate(m, t)
setState([m, t])
}} }}
/> />
</div> </div>
) )
} }
Basic.args = { NoTags.args = {
...Basic.args, ...NoTags.args,
tags: [],
metadata: { metadata: {
id: "random", id: "random",
alias: "Random", alias: "Random",
@@ -34,5 +36,23 @@ Basic.args = {
'wowo': '!' 'wowo': '!'
}, },
mode: 'single', mode: 'single',
} },
}
export const SomeTags: ComponentStory<typeof AutoInfoBox> = NoTags.bind({})
SomeTags.args = {
...SomeTags.args,
tags: [
["Room", "Bathroom"],
["Type", "Climate"],
],
metadata: {
id: "2432asd23",
alias: "Bathroom Vent",
description: "Turn the vent when the humidity is high",
trigger_variables: {
'wowo': '!'
},
mode: 'single',
},
} }
@@ -1,28 +1,81 @@
import "./AutoInfoBox.css"; import "./AutoInfoBox.css";
import { AutomationMetadata } from "types/automations"; import { AutomationMetadata } from "types/automations";
import InputList from "components/Inputs/InputList"; import { InputList } from "components/Inputs/InputList";
import InputText from "components/Inputs/InputText"; import InputText from "components/Inputs/InputText";
import InputTextArea from "components/Inputs/InputTextArea"; import InputTextArea from "components/Inputs/InputTextArea";
import { FC } from "react"; import { FC, useRef, useState } from 'react';
import { AddIcon, TrashIcon } from "components/Icons";
import { Button } from "components/Inputs/Button";
interface Props { interface Props {
className: string; className: string;
metadata: AutomationMetadata; metadata: AutomationMetadata;
onUpdate: (m: AutomationMetadata) => void; tags: Array<[string, string]>;
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
} }
export const AutoInfoBox: FC<Props> = ({ export const AutoInfoBox: FC<Props> = ({
metadata, metadata,
tags,
onUpdate, onUpdate,
className, className,
children, children,
}) => { }) => {
// state
const [newTag, setNewTag] = useState<[string, string]>(["", ""])
const [[errorIndex, error], _setError] = useState<[number | 'new', string]>([-1, ""]);
const errorTimeoutId = useRef(-1);
// aliases // aliases
const setError = (index: number | 'new', msg: string) => {
_setError([index, msg])
if (errorTimeoutId.current >= 0) {
window.clearTimeout(errorTimeoutId.current);
}
errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000);
}
const onUpdateMetadata = <K extends keyof AutomationMetadata>(k: K) => (update: AutomationMetadata[K]) => onUpdate({ const onUpdateMetadata = <K extends keyof AutomationMetadata>(k: K) => (update: AutomationMetadata[K]) => onUpdate({
...metadata, ...metadata,
[k]: update [k]: update
}) }, tags);
const validTagName = (newName: string): string | undefined => {
if (newName.length <= 0) {
return "Name must be at least 1 character long"
}
// eslint-disable-next-line
for (const [name, _] of tags) {
if (name.trim() === newName.trim()) {
return `The tag '${name}' already exists`
}
}
}
const updateTagName = (newName: string, tagIndex: number) => {
const error = validTagName(newName);
if (error) {
return setError(tagIndex, error)
}
onUpdate(metadata, [
...tags.slice(0, tagIndex),
[newName, tags[tagIndex][1]],
...tags.slice(tagIndex + 1),
])
}
const onUpdateTags = (tagValue: string, tagIndex: number) => onUpdate(metadata, [
...tags.slice(0, tagIndex),
[tags[tagIndex][0], tagValue],
...tags.slice(tagIndex + 1),
])
const addNewTag = () => {
const error = validTagName(newTag[0]);
if (error) {
return setError('new', error)
}
onUpdate(metadata, tags.concat([newTag]));
setNewTag(['', '']);
}
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [
...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1),
])
// render // render
return <div className={`automation-editor--info-box ${className}`}> return <div className={`automation-editor--info-box ${className}`}>
<div className="automation-editor--info-box-inner"> <div className="automation-editor--info-box-inner">
@@ -40,6 +93,26 @@ export const AutoInfoBox: FC<Props> = ({
'restart' 'restart'
]} ]}
/> />
<div className="automation-editor--info-box--tags">
<h1>Tags</h1>
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag">
<Button onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button>
<InputText value={tagName} label="Name" onChange={v => updateTagName(v, tagIndex)} />
<InputText value={tagValue} label="Tag" onChange={v => onUpdateTags(v, tagIndex)} />
<span className={["automation-editor--info-box--tag--error", (errorIndex === tagIndex) ? "show" : "hide"].join(" ")}>
{error}
</span>
</div>)}
<hr />
<div className="automation-editor--info-box--tag">
<InputText value={newTag[0]} label="Name" onChange={v => setNewTag([v, newTag[1]])} onEnter={addNewTag} />
<InputText value={newTag[1]} label="Tag" onChange={v => setNewTag([newTag[0], v])} onEnter={addNewTag} />
<Button onClick={addNewTag} ><AddIcon /></Button>
<span className={["automation-editor--info-box--tag--error", (errorIndex === 'new') ? "show" : "hide"].join(" ")}>
{error}
</span>
</div>
</div>
</div> </div>
{children} {children}
</div> </div>
@@ -1,9 +1,77 @@
.automation-editor--info-icon { .automation-editor {
position: absolute; display: flex;
right : 10px; flex-direction: row;
z-index : 10; width: 100%;
height: 100%;
} }
.automation-editor--info-box.hide>.automation-editor--info-icon { .automation-editor-failures {
transform: rotate(180deg); display: flex;
flex-direction: column;
padding: 1em;
overflow: scroll;
height: 100%;
} }
.automation-editor--flow-wrapper {
flex: 1;
padding: 0 0.5em 0 0.5em;
max-height: 100%;
max-width: 100%;
display: flex;
flex-direction: column;
gap: 0.5em;
}
.automation-editor--flow-wrapper--toolbar {
display: flex;
flex-direction: row;
justify-content: flex-end;
}
.automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
height: 0;
opacity: 0;
overflow: hidden;
}
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
border-color: var(--change);
color: var(--change)
}
.automation-editor--flow-wrapper--toolbar--save-btn {
display: flex;
gap: 0.5em;
align-items: center;
padding: 0.25em;
}
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--flow {
border-color: var(--change);
}
.automation-editor--flow-wrapper--flow {
flex: 1;
border: 1px solid var(--secondary-accent);
margin: 0 0 0.5em 0;
z-index: 1;
}
.automation-editor--info-box {
position: relative;
}
.automation-editor--info-box--icon {
position: absolute;
right: 0em;
bottom: 0.5em;
z-index: 10;
}
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
transform: rotate(180deg);
z-index: 2;
}
@@ -1,23 +1,16 @@
import React from "react"; import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react'; import { ComponentMeta, ComponentStory } from '@storybook/react';
import { AutomationEditor } from './index'; import { AutomationEditor } from './index';
import { NODE_HEIGHT, NODE_WIDTH, DISTANCE_FACTOR, ADD_HEIGHT, ADD_WIDTH, CIRCLE_SIZE } from '../DAGSvgs/constants';
import { useState } from 'react'; import { useState } from 'react';
import * as dgconst from 'components/DAGSvgs/constants';
export default { export default {
title: 'AutomationEditor/AutomationEditor', title: 'App/AutomationList/Editor',
component: AutomationEditor, component: AutomationEditor,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: '^on.*' } },
args: { args: {
dims: { dims: dgconst.DEFAULT_DIMS
nodeHeight: NODE_HEIGHT,
nodeWidth: NODE_WIDTH,
addHeight: ADD_HEIGHT,
addWidth: ADD_WIDTH,
circleSize: CIRCLE_SIZE,
distanceFactor: DISTANCE_FACTOR,
}
} }
} as ComponentMeta<typeof AutomationEditor> } as ComponentMeta<typeof AutomationEditor>
@@ -27,15 +20,27 @@ const Template: ComponentStory<typeof AutomationEditor> = args => {
<AutomationEditor <AutomationEditor
{...args} {...args}
automation={state} automation={state}
onUpdate={setState} onUpdate={s => {
window.setTimeout(() => setState(s), 3000)
}}
/> />
</div> </div>
} }
export const Loading = Template.bind({});
export const Simple = Template.bind({}) export const Simple = Template.bind({})
Simple.args = { Simple.args = {
...Simple.args, ...Simple.args,
automation: { automation: {
condition: [],
tags: {
"Room": "Bathroom",
"For": "Toliet",
"Type": "Smell",
"Use": "Flushing"
},
metadata: { metadata: {
id: "random", id: "random",
alias: "Random", alias: "Random",
@@ -47,53 +52,38 @@ Simple.args = {
}, },
trigger: [ trigger: [
{ {
"$smType": undefined,
"platform": "numeric_state", "platform": "numeric_state",
"entity_id": "test", "entity_id": "test",
}, },
{ {
"$smType": undefined,
"platform": "homeassistant", "platform": "homeassistant",
"event": "start", "event": "start",
} }
], ],
sequence: [ sequence: [
{ {
$smType: "condition",
condition: 'and', condition: 'and',
condition_data: { conditions: [
conditions: [ {
{ condition: 'numeric_state',
$smType: 'condition', entity_id: 'sensor.temperature_kitchen',
condition: 'numeric_state', below: '15',
condition_data: { },
entity_id: 'sensor.temperature_kitchen', {
below: '15', condition: 'template',
} value_template: 'states(switch.kitchen_light) == "on"'
}, }
{ ]
$smType: "condition",
condition: 'template',
condition_data: {
value_template: 'states(switch.kitchen_light) == "on"'
}
}
]
}
}, },
{ {
$smType: "action", alias: "Start Music In Kitchen",
action: "service", service: 'media_player.play_media',
action_data: { target: {
alias: "Start Music In Kitchen", entity_id: "media_player.kitchen_dot"
service: 'media_player.play_media', },
target: { data: {
entity_id: "media_player.kitchen_dot" media_content_id: "Good Morning",
}, media_content_type: "SPOTIFY",
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
} }
} }
] ]
@@ -105,6 +95,8 @@ export const EmptyStart = Template.bind({})
EmptyStart.args = { EmptyStart.args = {
...EmptyStart.args, ...EmptyStart.args,
automation: { automation: {
condition: [],
tags: {},
metadata: { metadata: {
id: "random", id: "random",
alias: "Random", alias: "Random",
@@ -119,3 +111,63 @@ EmptyStart.args = {
sequence: [] 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
}
}
+117 -83
View File
@@ -1,109 +1,143 @@
import "./index.css"; import "./index.css";
import { DAGBoardElmDims } from "components/DAGSvgs/DAGBoard"; import { ArrowIcon, CheckMarkIcon } from "components/Icons";
import { ArrowIcon } from "components/Icons";
import { SequenceNodes } from "components/SequenceNodes";
import { FC, useState } from "react"; import { FC, useState } from "react";
import { AutomationData, AutomationSequenceNode } from "types/automations"; import { AutomationData } from "types/automations";
import useWindowSize from "utils/useWindowSize";
import { AutoInfoBox } from "./AutoInfoBox"; import { AutoInfoBox } from "./AutoInfoBox";
import { useEditorStyles } from "./styles";
import { computeTriggerPos, computeExtraField } from './positions';
import { chain } from "utils/iter";
import { AutomationTrigger } from 'types/automations/triggers';
import { Modal } from "components/Modal";
import { NodeEditor } from "components/NodeEditor";
import { ButtonIcon } from "components/Icons/ButtonIcons"; import { ButtonIcon } from "components/Icons/ButtonIcons";
import { Button } from "components/Inputs/Button";
import { useAutomatioEditorState, EditorData } from './state';
import { SafeDAGAutomationFlow } from "components/DAGFlow/safe";
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
import { MiniFailure } from 'types/validators/helper';
import InputYaml from "components/Inputs/InputYaml";
interface TriggerEditorModalState {
trigger: AutomationTrigger;
onSave: (node: AutomationTrigger) => void;
}
interface Props { interface Props {
automation: AutomationData; automation?: AutomationData;
dims: DAGBoardElmDims; dims: DAGAutomationFlowDims;
onUpdate: (auto: AutomationData) => void; onUpdate: (auto: AutomationData) => void;
} }
export const AutomationEditor: FC<Props> = ({ export const AutomationEditor: FC<Props> = ({
dims, dims,
automation, automation: propsAutos,
onUpdate, onUpdate: propsOnUpdate,
}) => { }) => {
// state // state
const { ratioWbh } = useWindowSize(); const {
const [closeInfo, setCloseInfo] = useState(false); state,
const [modalState, setModalState] = useState<null | TriggerEditorModalState>(null); updateSequence,
const { classes } = useEditorStyles({ updateTrigger,
closeInfo, updateMetadata,
horizontalMode: ratioWbh < 0.75 updateCondition,
}); validate,
save,
saveAndUpdate,
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
// alias const [closeInfo, setCloseInfo] = useState(false);
const updateSequence = (sequence: AutomationSequenceNode[]) => onUpdate({
...automation,
sequence,
});
const updateTriggers = (trigger: AutomationTrigger[]) => onUpdate({
...automation,
trigger,
});
// render // render
return <div className={classes.root}> if (state.status === 'loading') {
<Modal open={!!modalState}> return <div className="automation-editor loading">
{!!modalState && <NodeEditor Loading...
node={modalState.trigger} </div>
onClose={() => setModalState(null)} }
onSave={(n) => { if (state.status === 'invalid') {
modalState.onSave(n as any); return <ValidationBox
setModalState(null); failures={state.failures}
}} data={state.data}
allowedTypes={['trigger']} validate={validate}
/>} onSave={saveAndUpdate}
</Modal> />
}
return <div className="automation-editor">
<AutoInfoBox <AutoInfoBox
className={closeInfo ? "hide" : "show"} className={closeInfo ? "hide" : "show"}
metadata={automation.metadata} metadata={state.data.metadata}
onUpdate={metadata => onUpdate({ ...automation, metadata })} tags={state.data.tags}
onUpdate={updateMetadata}
> >
<ButtonIcon <ButtonIcon
className={`${classes.infoIcon} automation-editor--info-icon`} className="automation-editor--info-box--icon"
onClick={() => setCloseInfo(!closeInfo)} onClick={() => setCloseInfo(!closeInfo)}
title={closeInfo ? "Show Metadata" : "Hide Metadata"} title={closeInfo ? "Show Metadata" : "Hide Metadata"}
>{ArrowIcon}</ButtonIcon> >{ArrowIcon}</ButtonIcon>
</AutoInfoBox> </AutoInfoBox>
<SequenceNodes <div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
zoomLevel={1.5} <div className="automation-editor--flow-wrapper--toolbar">
startPoint={[2, 0.5]} <Button
dims={dims} className={"automation-editor--flow-wrapper--toolbar--save-btn"}
sequence={automation.sequence} onClick={save}
onChange={updateSequence} disabled={state.status !== 'changed'}
additionalElements={() => chain([ >
computeExtraField([1, 0.5], [2, 0.5]), Save <CheckMarkIcon color="#bf4" />
computeTriggerPos( </Button>
[0.5, 0.5], </div>
automation.trigger, <SafeDAGAutomationFlow
[1.5, 0.5], className="automation-editor--flow-wrapper--flow"
updateTriggers, sequence={state.data.sequence}
() => { trigger={state.data.trigger}
setModalState({ condition={state.data.condition}
trigger: { onSequenceUpdate={updateSequence}
$smType: "trigger", onTriggerUpdate={updateTrigger}
platform: "device", onConditionUpdate={updateCondition}
device_id: "", dims={dims}
domain: "", />
type: "", </div>
subtype: ""
},
onSave: (t) => updateTriggers([...automation.trigger, t])
});
},
(trigger, onSave) => setModalState({
trigger,
onSave,
})
),
])}
/>
</div> </div>
} }
export const ValidationBox: FC<{
failures: MiniFailure[]
validate: (d: any) => MiniFailure[] | null,
data: EditorData,
onSave: (d: EditorData) => void,
}> = props => {
const [{ failures, data }, setState] = useState({
failures: props.failures,
data: props.data,
});
const makeSave = <K extends keyof EditorData>(k: K) => (d: EditorData[K]) => {
const newData = {
...data,
[k]: d,
}
const newFails = props.validate(newData);
if (newFails) {
setState({
failures: newFails,
data: newData,
})
} else {
setState({
failures: [],
data: newData,
})
}
}
return <div className="automation-editor-failures">
<ul>
{failures.map((f, i) => <>
<li key={i}>
<b>{f.path}</b>:
<ul>
{f.message.map((m, j) => <li key={j}>
{m}
</li>)}
</ul>
</li>
</>)}
</ul>
<span>Please correct the automation file manually and then continue!</span>
<InputYaml label="Metadata" value={data.metadata} onChange={makeSave('metadata')} resizable />
<InputYaml label="Tags" value={data.tags} onChange={makeSave('tags')} resizable />
<InputYaml label="Trigger" value={data.trigger} onChange={makeSave('trigger')} resizable />
<InputYaml label="Condition" value={data.condition} onChange={makeSave('condition')} resizable />
<InputYaml label="Actions" value={data.sequence} onChange={makeSave('sequence')} resizable />
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>Save</Button>
</div>
}
@@ -1,78 +0,0 @@
import { DAGElement } from "components/DAGSvgs/DAGBoard";
import { Point } from "types/graphs";
import { AutomationTrigger } from 'types/automations/triggers';
import { avgPoints } from "utils/graph";
export function* computeTriggerPos(
startPoint: Point,
triggers: AutomationTrigger[],
toPath: Point,
onUpdate: (ts: AutomationTrigger[]) => void,
onAdd: () => void,
onEdit: (nt: AutomationTrigger, onSave: (ts: AutomationTrigger) => void) => void,
): Generator<DAGElement> {
// functions
const makeRemoveNode = (i: number) => () => onUpdate([
...triggers.slice(0, i),
...triggers.slice(i + 1),
]);
const updateNode = (n: AutomationTrigger, i: number) => onUpdate([
...triggers.slice(0, i),
n,
...triggers.slice(i + 1),
])
// main loop
for (let i = 0; i < triggers.length; i++) {
const node = triggers[i];
const nodeLoc: Point = [startPoint[0], startPoint[1] + i];
yield {
type: "node",
node,
loc: nodeLoc,
onRemove: makeRemoveNode(i),
onOpen: () => onEdit(node, up => updateNode(up, i))
}
yield {
type: "edge",
p1: nodeLoc,
p2: toPath,
direction: "1->2",
}
}
// if we had nothing to loop on
if (triggers.length === 0) {
yield {
type: "edge",
p1: [startPoint[0] - 0.25, startPoint[1] + triggers.length],
p2: toPath,
direction: "1->2",
}
}
// add circle
yield {
type: 'circle',
icon: 'add',
loc: [startPoint[0] + 0.25, startPoint[1] + triggers.length],
onAdd
}
}
export function* computeExtraField(
triggerEndPos: Point,
sequenceStartPos: Point,
): Generator<DAGElement> {
yield {
type: 'circle',
loc: avgPoints(triggerEndPos, sequenceStartPos),
icon: 'color',
color: 'blue',
}
yield {
type: 'edge',
p1: triggerEndPos,
p2: sequenceStartPos,
direction: '1->2',
}
}
@@ -0,0 +1,116 @@
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',
data: EditorData
} | {
status: 'loading'
} | {
status: 'invalid',
failures: MiniFailure[],
data: EditorData,
}
export type EditorStatus = EditorState['status'];
export const useAutomatioEditorState = (
automation: AutomationData | undefined,
onSave: (a: AutomationData) => void,
) => {
const [state, update] = useState<EditorState>({
status: "loading",
});
const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => (
data: D
) => ((state.status === 'changed') || (state.status === 'unchanged')) && update({
status: 'changed',
data: {
...state.data,
[name]: data,
}
})
const saveAndUpdate = (data: EditorData) => {
const cleanData = {
...data,
tags: data.tags.reduce((all, [tagName, tagValue]) => ({
...all,
[tagName.trim()]: tagValue.trim(),
}), {})
};
update({
status: "loading",
})
onSave(cleanData);
}
useEffect(() => {
if (automation) {
const failures = getFailures(automation, v.AutomationData);
if (failures) {
update({
status: 'invalid',
failures,
data: genEditorData(automation),
})
} else {
update({
status: 'unchanged',
data: genEditorData(automation),
})
}
}
}, [automation]);
return {
validate: (data: any) => getFailures(data, v.AutomationData),
updateTrigger: makeUpdate('trigger'),
updateSequence: makeUpdate('sequence'),
updateCondition: makeUpdate('condition'),
saveAndUpdate,
updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => {
if ((state.status === 'changed') || (state.status === 'unchanged')) {
update({
status: 'changed',
data: {
...state.data,
tags,
metadata,
}
})
}
},
save: () => {
if (state.status !== 'loading') {
saveAndUpdate(state.data)
}
},
get state() {
return state;
}
}
}
const genEditorData = (automation: AutomationData) => {
const {
metadata,
trigger,
sequence,
condition,
} = automation;
const tags: [string, string][] = Object.keys(automation.tags).map(tagName => [tagName, automation.tags[tagName]]);
return {
metadata,
trigger,
sequence,
condition,
tags,
}
}
@@ -1,24 +0,0 @@
import { createAppUseStyles } from "styles/theme";
export const useEditorStyles = createAppUseStyles<{
closeInfo: boolean;
horizontalMode: boolean;
}>(theme => ({
root: ({horizontalMode}) => ({
height: '100%',
width: '100%',
color: theme.primaryAccent,
display: 'flex',
flexDirection: horizontalMode ? 'column' : 'row',
}),
dag: {
borderWidth: 1,
borderStyle: 'solid',
borderColor: theme.secondaryAccent,
width: '100%',
},
infoIcon: ({horizontalMode}) => ({
bottom: horizontalMode ? '90%' : 10
})
}))
@@ -1,22 +1,16 @@
import "styles/root.css";
import { ComponentMeta, ComponentStory } from "@storybook/react"; import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react"; import { useState } from "react";
import { AutomationList } from "."; import { AutomationList } from ".";
import { NODE_HEIGHT, NODE_WIDTH, ADD_HEIGHT, ADD_WIDTH, CIRCLE_SIZE, DISTANCE_FACTOR } from 'components/DAGSvgs/constants';
import { createMockAuto } from "utils/mocks"; import { createMockAuto } from "utils/mocks";
import * as dgconst from 'components/DAGSvgs/constants';
export default { export default {
title: 'App/AutomationList', title: 'App/AutomationList',
component: AutomationList, component: AutomationList,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: '^on.*' } },
args: { args: {
dims: { dims: dgconst.DEFAULT_DIMS
nodeHeight: NODE_HEIGHT,
nodeWidth: NODE_WIDTH,
addHeight: ADD_HEIGHT,
addWidth: ADD_WIDTH,
circleSize: CIRCLE_SIZE,
distanceFactor: DISTANCE_FACTOR,
}
} }
} as ComponentMeta<typeof AutomationList>; } as ComponentMeta<typeof AutomationList>;
@@ -58,15 +52,261 @@ export const FewAutos = Template.bind({})
FewAutos.args = { FewAutos.args = {
...FewAutos.args, ...FewAutos.args,
automations: [ 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(), createMockAuto(),
createMockAuto(), {
createMockAuto(), "metadata": {
createMockAuto(), "id": "1649947692702",
createMockAuto(), "alias": "Bed Remote",
createMockAuto(), "description": "",
createMockAuto(), "trigger_variables": null,
createMockAuto(), "mode": "single"
createMockAuto(), },
createMockAuto(), "trigger": [
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_on",
"id": "turn_on"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_off",
"id": "turn_off"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_up",
"id": "dim_up"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_down",
"id": "dim_down"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_double_press",
"subtype": "turn_on",
"id": "up_dbclk"
}
],
"condition": [],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "turn_off"
}
],
"sequence": [
{
"type": "turn_off",
"device_id": "asdasdasdasdas",
"entity_id": "light.bulb_ari_lamp",
"domain": "light"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "turn_on"
}
],
"sequence": [
{
"service": "light.turn_on",
"data": {
"color_temp": 153,
"brightness_pct": 100
},
"target": {
"device_id": "asdasdasdasdas"
}
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "dim_up"
}
],
"sequence": [
{
"device_id": "asdasdasdasdas",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_increase"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "dim_down"
}
],
"sequence": [
{
"device_id": "asdasdasdasdas",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_decrease"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "up_dbclk"
}
],
"sequence": [
{
"service": "light.turn_on",
"data": {
"color_temp": 500,
"brightness_pct": 100
},
"target": {
"device_id": "asdasdasdasdas"
}
}
]
}
],
"default": []
}
],
"tags": {
"Type": "Remote",
"Room": "Bedroom"
}
},
{
"metadata": {
"id": "1641617168123",
"alias": "Ensure On",
"description": "",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"platform": "device",
"type": "turned_off",
"device_id": "tasdasdasdasdasdasda",
"entity_id": "switch.power_washer",
"domain": "switch"
},
{
"platform": "device",
"type": "turned_off",
"device_id": "dasdasdasdasdas",
"entity_id": "switch.plug_living_room_tv",
"domain": "switch"
}
],
"condition": [],
"sequence": [
{
"type": "turn_on",
"device_id": "tasdasdasdasdasdasda",
"entity_id": "switch.power_washer",
"domain": "switch"
},
{
"type": "turn_on",
"device_id": "dasdasdasdasdas",
"entity_id": "switch.plug_living_room_tv",
"domain": "switch"
}
],
"tags": {}
}
],
}
export const BadAutmations = Template.bind({})
BadAutmations.args = {
...BadAutmations.args,
automations: [
{
condition: [],
tags: {},
metadata: {
id: "Bad Choose Sequence",
alias: "Bad Choose",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
},
mode: 'single',
},
trigger: [],
sequence: [
{
choose: {}
}
] as any
},
{
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Bad Trigger",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
},
mode: 'single',
},
trigger: [
"haha I am a string"
] as any,
sequence: []
},
{
condition: [],
tags: {},
metadata: {
} as any,
trigger: [
],
sequence: []
}
], ],
} }
@@ -0,0 +1,124 @@
.automation-list-box {
display: flex;
flex-direction: column;
height: 100%;
}
.automation-list-box--body {
overflow: auto;
height: 100%;
flex: 1;
user-select: none;
}
.automation-list-box--body>* {
padding-top: 0.5em;
padding-bottom: 0.5em;
}
.automation-list-box--body--group {
display: flex;
flex-direction: column;
padding-left: 1em;
border-radius: 10px;
padding-bottom: 0.5em;
border-width: 1px;
border-bottom-style: solid;
border-color: white;
}
.automation-list-box--body--group>.automation-list-box--body--group {
border-left-style: solid;
border-top-left-radius: 0;
margin-left: 0.75em;
padding-left: 0.5em;
}
.automation-list-box--body--group>b {
width: 100%;
cursor: pointer;
padding: 0.1em;
}
.automation-list-box--body--group>b:hover {
background-color: var(--secondary-accent);
color: var(--secondary);
}
.automation-list-box--body--item:hover, .automation-list-box--body--item.selected {
background-color: var(--primary-accent);
color: var(--primary);
}
.automation-list-box--body--item:hover>.automation-list-box--body--item--tags>span {
border-color: var(--primary);
}
.automation-list-box--body--item {
padding-left: 1em;
cursor: pointer;
display: flex;
justify-content: left;
align-items: flex-start;
gap: 1em;
flex-wrap: wrap;
}
.automation-list-box--body--item::before {
content: "⊚ ";
}
.automation-list-box--body--item--title {
display: flex;
flex-direction: column;
padding-left: 0.25em;
flex: 1;
}
.automation-list-box--body--item--title>b {
font-size: 1em;
}
.automation-list-box--body--item--title>span, .automation-list-box--body--item--title>b>span {
font-size: 0.75em;
}
.automation-list-box--body--item>button {
padding: 0.25em !important;
margin: 0.5em !important;
}
.automation-list-box--body--item--tags {
flex: 1;
display: flex;
flex-wrap: wrap;
font-size: 0.75em;
justify-content: left;
align-items: flex-start;
overflow: auto;
max-height: 100%;
gap: 0.25em;
}
.automation-list-box--body--item--tags>span {
border-color: var(--primary-accent);
border-style: solid;
border-width: 1px;
border-radius: 0.5em;
padding: 0.1em 0.5em;
}
.automation-list-box--bottom {
margin-top: 0.5em;
margin-bottom: 0.5em;
display: flex;
flex-direction: column;
justify-content: space-around;
align-items: center;
}
.automation-list-box--bottom>button {
background-color: #070;
color: var(--primary-accent);
padding: 0.5em 2em;
}
@@ -0,0 +1,46 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react";
import { AutomationListBox } from "./AutomationListBox";
import { createMockAuto } from "utils/mocks";
export default {
title: 'App/AutomationList/Box',
component: AutomationListBox,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
}
} as ComponentMeta<typeof AutomationListBox>;
const Template: ComponentStory<typeof AutomationListBox> = args => {
const [selected, setSelected] = useState(args.selected)
return <div className="page">
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
setSelected(i)
args.onSelectAutomation(i)
}} />
</div>
}
export const EmptyStart = Template.bind({})
EmptyStart.args = {
...EmptyStart.args,
automations: [],
}
export const FewAutos = Template.bind({})
FewAutos.args = {
...FewAutos.args,
automations: [
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
createMockAuto({ "Type": "Climate" }),
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
createMockAuto({ "Room": "Office", "Type": "Lights" }),
createMockAuto({ "Room": "Office" }),
createMockAuto(),
],
}
@@ -0,0 +1,101 @@
import { groupAutomations, getTagList } from './AutomationListBox';
import { AutomationData } from 'types/automations/index';
import { createMockAuto } from 'utils/mocks';
test('group automations', () => {
const automations: AutomationData[] = [
{
condition: [],
metadata: {
id: '1',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Living Room',
"Type": 'Lights'
},
sequence: [],
trigger: [],
},
{
condition: [],
metadata: {
id: '2',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Living Room',
"Type": 'Climate'
},
sequence: [],
trigger: [],
},
{
condition: [],
metadata: {
id: '3',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Kitchen',
"Type": 'Climate'
},
sequence: [],
trigger: [],
},
];
expect(groupAutomations(automations, [0, 1], ['Room', "Type"])).toStrictEqual({
"Living Room": {
"Lights": [0],
"Climate": [1],
},
"Kitchen": {
"Climate": [2],
}
})
expect(groupAutomations(automations, [1, 0], ['Room', "Type"])).toStrictEqual({
"Lights": {
"Living Room": [0],
},
"Climate": {
"Living Room": [1],
"Kitchen": [2]
}
})
expect(groupAutomations(automations, [1], ['Room', "Type"])).toStrictEqual({
"Lights": [0],
"Climate": [1, 2]
})
expect(groupAutomations(automations, [0], ['Room', "Type"])).toStrictEqual({
"Living Room": [0, 1],
"Kitchen": [2]
})
expect(groupAutomations(automations, [], ['Room', "Type"])).toStrictEqual([
0, 1, 2
])
});
test('getTagList', () => {
expect(getTagList([
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
])).toStrictEqual([])
expect(getTagList([
createMockAuto({ "Room": "Kitchen", "Area": "Oven" }),
createMockAuto({ "Room": "Attic" }),
createMockAuto({ "Room": "Office" }),
createMockAuto({ "Area": "Balcony" }),
])).toStrictEqual(["Room", "Area"])
})
@@ -0,0 +1,211 @@
import "./AutomationListBox.css";
import { FC, useState } from 'react';
import { AutomationData, AutomationMetadata } from "types/automations";
import InputMultiSelect from "components/Inputs/InputMultiSelect";
import InputText from "components/Inputs/InputText";
import { Button } from "components/Inputs/Button";
import { TrashIcon } from "components/Icons";
export type Props = {
automations: AutomationData[];
selected: number;
onSelectAutomation: (i: number) => void;
onRemove: (i: number) => void;
onAdd: () => void;
}
export const AutomationListBox: FC<Props> = ({
automations,
selected,
onSelectAutomation,
onAdd,
onRemove,
}) => {
const tags = getTagList(automations);
const [searchText, setSearchText] = useState('');
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]);
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags);
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selectedTagIdx, tags);
return <div className="automation-list-box">
<div className="automation-list-box--nav">
<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">
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove, selected)}
</div>
<div className="automation-list-box--bottom">
<Button onClick={onAdd}>Add</Button>
<span>Showing Automations: {filteredAutomations.length} out of {automations.length}</span>
</div>
</div>
}
export const getTagList = (autos: AutomationData[]): string[] => Object.keys(autos
.map(a => Object.keys(a.tags))
.reduce((all: any, keys) => {
for (const k of keys) {
all[k] = 1
}
return all;
}, {}))
const filterAutomations = (autos: AutomationData[], searchText: string, selected: number[], tags: string[]): Array<[AutomationData, number]> => autos.map<[AutomationData, number]>((a, i) => [a, i]).filter(([a, i]) => {
if (!a.metadata) {
return true
}
if (searchText.length > 0) {
if (
!(
a.metadata.description.toLocaleLowerCase().includes(searchText) ||
a.metadata.alias.toLocaleLowerCase().includes(searchText)
)
) {
return false
}
}
if (selected.length > 0) {
for (const i of selected) {
if (!a.tags[tags[i]]) {
return false
}
}
}
return true
})
export const groupAutomations = (
autos: AutomationData[],
selected: number[],
tags: string[],
) => {
if (selected.length === 0) {
return autos.map((_, i) => i);
}
const out: any = {};
for (let ai = 0; ai < autos.length; ai++) {
const a = autos[ai];
let where = out;
let tag: string = '';
let lastKey: string | null = null;
for (const i of selected) {
tag = tags[i];
if (lastKey !== null) {
where = where[lastKey]
}
if (!where[a.tags[tag]]) {
where[a.tags[tag]] = {}
}
lastKey = a.tags[tag]
}
if (lastKey !== null) {
if (!where[lastKey] || !Array.isArray(where[lastKey])) {
where[lastKey] = []
}
where[lastKey].push(ai)
}
}
return out;
}
const convertGroupsToItems = (
groups: any,
autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void,
selected: number,
) => {
if (Array.isArray(groups)) {
return groups.map(i => {
const [auto, autoIndex] = autos[i];
let title = "BadAuto<<Missing Metadata>>"
if (auto.metadata) {
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`
}
return <div
key={i}
className={["automation-list-box--body--item", selected === autoIndex ? 'selected' : ''].join(' ')}
title={title}
onClick={() => onSelectAutomation(autoIndex)}
>
<MetadataBox metadata={auto.metadata} tags={auto.tags} />
<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}
selected={selected}
/>
})
}
}
export const MetadataBox: FC<{
metadata: AutomationMetadata,
tags: Record<string, string>,
}> = (auto) => {
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
if (auto.metadata) {
title = <>
<b>{String(auto.metadata.alias).slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
<span>{String(auto.metadata.description).slice(0, 25)}</span>
</>
}
return <div
className="automation-list-box--body--item--title"
>
{title}
<div
className="automation-list-box--body--item--tags"
>
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
<b>{tagName}:</b> {auto.tags[tagName]}
</span>)}
</div>
</div>
}
const AutomationListBoxGroup: FC<{
groupName: string,
groups: any,
autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void;
selected: number,
}> = ({
groupName,
groups,
autos,
onSelectAutomation,
onRemove,
selected,
}) => {
const [open, setOpen] = useState(false);
return <div className="automation-list-box--body--group">
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove, selected)}
</div>
}
@@ -1,31 +1,24 @@
import { ComponentMeta, ComponentStory } from "@storybook/react"; import { ComponentMeta, ComponentStory } from "@storybook/react";
import { ConnectedAutmationList } from "."; import { ConnectedAutomationList } from ".";
import { NODE_HEIGHT, NODE_WIDTH, ADD_HEIGHT, ADD_WIDTH, CIRCLE_SIZE, DISTANCE_FACTOR } from 'components/DAGSvgs/constants';
import { createMockAuto } from "utils/mocks"; import { createMockAuto } from "utils/mocks";
import { useMockApiService } from "apiService"; import { useMockApiService } from "apiService";
import { DEFAULT_DIMS } from 'components/DAGSvgs/constants';
export default { export default {
title: 'App/ConnectedAutmationList', title: 'App/AutomationList/Connected',
component: ConnectedAutmationList, component: ConnectedAutomationList,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: '^on.*' } },
args: { args: {
dims: { dims: DEFAULT_DIMS,
nodeHeight: NODE_HEIGHT,
nodeWidth: NODE_WIDTH,
addHeight: ADD_HEIGHT,
addWidth: ADD_WIDTH,
circleSize: CIRCLE_SIZE,
distanceFactor: DISTANCE_FACTOR,
},
initialAutomations: [], initialAutomations: [],
} }
} as ComponentMeta<typeof ConnectedAutmationList>; } as ComponentMeta<typeof ConnectedAutomationList>;
const Template: ComponentStory<any> = args => { const Template: ComponentStory<any> = args => {
const api = useMockApiService(args.initialAutomations); const api = useMockApiService(args.initialAutomations);
return <div className="page"> return <div className="page">
<ConnectedAutmationList <ConnectedAutomationList
{...args} {...args}
api={api} api={api}
/> />
@@ -0,0 +1,46 @@
/* root elements */
.automation-list--root {
width: 100%;
height: 100%;
display: flex;
flex-direction: row;
overflow: hidden;
}
.automation-list--list {
flex: 1;
max-width: 400px;
position: relative;
}
.automation-list--viewer {
overflow: hidden;
flex: 1;
}
/* list children: on hide */
.automation-list--list.hide>.automation-list-box {
width: 0;
opacity: 0;
}
.automation-list--list.hide {
min-width: 35px;
max-width: 35px;
}
.automation-list--list.hide>.automation-list--list-hide {
transform: rotate(180deg);
}
/* list children: normal */
.automation-list--list {
border-right: solid;
border-width: 1px;
}
.automation-list--list-hide {
position: absolute;
bottom: 0.5em;
right: 0.5em;
}
@@ -0,0 +1,70 @@
/* none-hidden */
.automation-list--root.mobile {
flex-direction: column;
}
.automation-list--root.mobile>.automation-list--list {
max-width: 100vw;
min-height: 100vh;
}
.automation-list--root.mobile .automation-editor {
flex-direction: column;
}
.automation-list--root.mobile .automation-list--list-hide {
transform: rotate(90deg);
left: 1.25em;
}
.automation-list--root.mobile .automation-editor--info-box {
min-width: 100vw;
min-height: calc(100vh - 5em);
max-width: 100vw;
max-height: calc(100vh - 5em);
padding: 0;
}
.automation-list--root.mobile .automation-editor--info-box-inner {
margin-top: 2.5em;
padding-left: 0.5em;
padding-right: 0.5em;
margin-bottom: 2em;
}
.automation-list--root.mobile .automation-editor--info-box--icon {
left: 1.25em;
bottom: 0em;
background-color: var(--primary);
transform: rotate(90deg);
}
/* list hide */
.automation-list--root.mobile .automation-list--list.hide {
width: 100vw;
min-height: 0;
max-height: 0;
}
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
transform: rotate(270deg);
position: fixed;
top: 0.75em;
z-index: 20;
}
/* info box hide */
.automation-list--root.mobile .automation-editor--info-box.hide {
width: 100vw;
min-height: 0;
max-height: 0;
}
.automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon {
transform: rotate(270deg);
position: fixed;
top: 0.75em;
background-color: var(--green-opaque);
z-index: 30;
}
+27 -25
View File
@@ -1,13 +1,15 @@
import "./styles.css"; import "./index.css";
import "./index.mobile.css";
import { AutomationEditor } from "components/AutomationEditor"; import { AutomationEditor } from "components/AutomationEditor";
import { Button } from "components/Inputs/Button";
import { FC, useState } from "react"; import { FC, useState } from "react";
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
import { DAGBoardElmDims } from 'components/DAGSvgs/DAGBoard'; import { defaultAutomation } from 'utils/defaults';
import { defaultAutomation } from '../../utils/defaults'; import { ArrowIcon } from "components/Icons";
import { ArrowIcon, TrashIcon } from "components/Icons";
import { ButtonIcon } from "components/Icons/ButtonIcons"; import { ButtonIcon } from "components/Icons/ButtonIcons";
import { ApiService } from "apiService/core"; import { ApiService } from "apiService/core";
import { AutomationListBox } from "./AutomationListBox";
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
import useWindowSize from "utils/useWindowSize";
interface AutomationListParams { interface AutomationListParams {
@@ -15,7 +17,7 @@ interface AutomationListParams {
onUpdate: (i: number, auto: AutomationData) => void; onUpdate: (i: number, auto: AutomationData) => void;
onAdd: (auto: AutomationData) => void; onAdd: (auto: AutomationData) => void;
onRemove: (i: number) => void; onRemove: (i: number) => void;
dims: DAGBoardElmDims; dims: DAGAutomationFlowDims;
} }
export const AutomationList: FC<AutomationListParams> = ({ export const AutomationList: FC<AutomationListParams> = ({
@@ -29,27 +31,27 @@ export const AutomationList: FC<AutomationListParams> = ({
// state // state
const [hideList, setHideList] = useState(false); const [hideList, setHideList] = useState(false);
const [current, setCurrent] = useState(0); const [current, setCurrent] = useState(0);
const { isMobile } = useWindowSize();
// alias // alias
const currentAuto = automations.length > 0 ? automations[current] : null; const currentAuto = automations.length > 0 ? automations[current] : null;
const automationListListCls = "automation-list--list" + (hideList ? " hide" : " show")
// render // render
return <div className="automation-list--root"> return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}>
<div className={automationListListCls}> <div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}>
<div className="automation-list--list-box"> <AutomationListBox
{automations.map((auto, i) => automations={automations}
<div key={i} className="automation-list--elm"> onAdd={() => {
<Button onClick={() => onRemove(i)} className="automation-list--elm-remove"><TrashIcon /></Button>
<Button onClick={() => setCurrent(i)}>
{auto.metadata.alias.slice(0, 15)} <br />
<span>{auto.metadata.description.slice(0, 25)}</span>
</Button>
</div>
)}
<Button onClick={() => {
onAdd(defaultAutomation(`shortu-${automations.length}`)); onAdd(defaultAutomation(`shortu-${automations.length}`));
setCurrent(automations.length) setCurrent(automations.length)
}}>Add</Button> }}
</div> onSelectAutomation={i => {
setCurrent(i);
if (isMobile) {
setHideList(true)
}
}}
selected={current}
onRemove={onRemove}
/>
<ButtonIcon <ButtonIcon
onClick={() => setHideList(!hideList)} onClick={() => setHideList(!hideList)}
className="automation-list--list-hide" className="automation-list--list-hide"
@@ -68,11 +70,11 @@ export const AutomationList: FC<AutomationListParams> = ({
</div> </div>
} }
interface ConnectedAutmationListParams { interface ConnectedAutomationListParams {
dims: DAGBoardElmDims; dims: DAGAutomationFlowDims;
api: ApiService; api: ApiService;
} }
export const ConnectedAutmationList: FC<ConnectedAutmationListParams> = ({ export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
api: { api: {
state: { state: {
automations, automations,
@@ -1,89 +0,0 @@
/* root elements */
.automation-list--root {
width : 100%;
height : 100%;
display : flex;
flex-direction: row;
overflow : hidden;
}
.automation-list--list {
flex : 1;
min-width: 200px;
max-width: 200px;
position : relative;
}
.automation-list--viewer {
/* flex: 6; */
min-width: 100%;
max-width: 100%;
}
/* list children: on hide */
.automation-list--list.hide>.automation-list--list-box {
display: none;
}
.automation-list--list.hide {
min-width: 35px;
max-width: 35px;
}
.automation-list--list.hide>.automation-list--list-hide {
transform: rotate(180deg);
}
/* list children: normal */
.automation-list--list {
border-right: solid;
border-width: 1px;
}
.automation-list--list-hide {
position: absolute;
bottom : 10px;
right : 5px;
}
.automation-list--list-box {
overflow : auto;
height : 100%;
display : flex;
flex-direction : column;
justify-content: flex-start;
align-items : center;
padding-top : 10px;
margin-bottom : 10px;
}
.automation-list--list-box>* {
margin-bottom: 10px;
}
.automation-list--list-box>:last-child {
background-color: #070;
color : white;
}
.automation-list--elm {
position: relative;
}
.automation-list--elm>button {
padding-left : 5px;
padding-right: 5px;
}
.automation-list--elm>button>span {
font-size: 0.75em;
}
.automation-list--elm>.automation-list--elm-remove {
position: absolute;
left : -10px;
top : 10%;
padding : 0;
margin : 0;
}
@@ -12,48 +12,32 @@ export default {
export const Basic: ComponentStory<typeof ConditionEditor> = args => { export const Basic: ComponentStory<typeof ConditionEditor> = args => {
const [state, setState] = useState<AutomationCondition>({ const [state, setState] = useState<AutomationCondition>({
"$smType": "condition",
"condition": "or", "condition": "or",
"condition_data": { "conditions": [
"conditions": [ {
{ "condition": "and",
"$smType": "condition", "conditions": [
"condition": "and", {
"condition_data": { "condition": "numeric_state",
"conditions": [
{
"$smType": "condition",
"condition": "numeric_state",
"condition_data": {
"entity_id": [
"sensor.kitchen_humidity"
],
"conditions": [],
"above": "40"
}
},
{
"$smType": "condition",
"condition": "template",
"condition_data": {
"value_template": "states('switch.kitchen') == 'on'"
}
}
]
}
},
{
"$smType": "condition",
"condition": "numeric_state",
"condition_data": {
"entity_id": [ "entity_id": [
"sensor.kitchen_temperature" "sensor.kitchen_humidity"
], ],
"above": "51" "above": "40"
},
{
"condition": "template",
"value_template": "states('switch.kitchen') == 'on'"
} }
} ]
] },
} {
"condition": "numeric_state",
"entity_id": [
"sensor.kitchen_temperature"
],
"above": "51"
}
]
}) })
return ( return (
<div className="page"> <div className="page">
@@ -3,7 +3,7 @@ import { FC, useState, useEffect } from 'react';
import { getConditionDefaultValues } from "utils/defaults"; import { getConditionDefaultValues } from "utils/defaults";
import { AutomationCondition } from "types/automations/conditions"; import { AutomationCondition } from "types/automations/conditions";
import { CheckMarkIcon, PencilIcon } from "components/Icons"; import { CheckMarkIcon, PencilIcon } from "components/Icons";
import InputList from "components/Inputs/InputList"; import { InputList } from "components/Inputs/InputList";
import InputYaml from "components/Inputs/InputYaml"; import InputYaml from "components/Inputs/InputYaml";
import { getEditor } from "./editorRender"; import { getEditor } from "./editorRender";
import { useStyles } from "./style"; import { useStyles } from "./style";
@@ -51,17 +51,10 @@ export const ConditionNode: FC<{
) { ) {
onUpdate({ onUpdate({
...condition, ...condition,
$smType: 'condition', conditions: condition.conditions.concat({
condition_data: { condition: 'or',
...condition.condition_data, conditions: []
conditions: condition.condition_data.conditions.concat({ })
$smType: 'condition',
condition: 'or',
condition_data: {
conditions: []
}
})
}
}) })
} }
} }
@@ -69,20 +62,10 @@ export const ConditionNode: FC<{
let childrenConditions: JSX.Element; let childrenConditions: JSX.Element;
if (effectiveDM) { if (effectiveDM) {
const Viewer = getViewer(condition); const Viewer = getViewer(condition);
childrenConditions = <Viewer condition={condition} onChange={data => { childrenConditions = <Viewer condition={condition} onChange={onUpdate} />
onUpdate({
...data,
$smType: 'condition',
})
}} />
} else { } else {
const Editor = getEditor(condition); const Editor = getEditor(condition);
childrenConditions = <Editor condition={condition} onChange={data => { childrenConditions = <Editor condition={condition} onChange={onUpdate} />
onUpdate({
...data,
$smType: 'condition',
})
}} />
} }
// styles // styles
let hasChildren = false; let hasChildren = false;
@@ -115,13 +98,10 @@ export const ConditionNode: FC<{
'trigger', 'trigger',
'zone', 'zone',
]} ]}
onChange={n => onUpdate({ onChange={(n: any) => onUpdate({
$smType: 'condition', ...getConditionDefaultValues(n),
...condition,
condition: n, condition: n,
condition_data: {
...getConditionDefaultValues(n),
...condition.condition_data,
}
} as any)} } as any)}
/> />
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}> {effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
@@ -134,11 +114,8 @@ export const ConditionNode: FC<{
<div className={classes.children}> <div className={classes.children}>
{yamlMode && <InputYaml {yamlMode && <InputYaml
label="" label=""
value={condition.condition_data} value={condition}
onChange={update => onUpdate({ onChange={update => onUpdate(update as any)}
...condition,
condition_data: update as any
})}
resizable resizable
/>} />}
{!yamlMode && childrenConditions} {!yamlMode && childrenConditions}
@@ -46,19 +46,13 @@ export const TemplateEditor: Editor<TemplateCondition> = ({
condition, condition,
}) => { }) => {
return <div> return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({ <InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition, ...condition,
condition_data: { alias
...condition.condition_data,
alias
}
})} /> })} />
<InputTextArea label="Template" value={condition.condition_data.value_template} onChange={value_template => onChange({ <InputTextArea label="Template" value={condition.value_template} onChange={value_template => onChange({
...condition, ...condition,
condition_data: { value_template
...condition.condition_data,
value_template
}
})} resizable /> })} resizable />
</div> </div>
} }
@@ -69,58 +63,40 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
condition, condition,
}) => { }) => {
return <div> return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({ <InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition, ...condition,
condition_data: { alias
...condition.condition_data,
alias
}
})} /> })} />
<InputEntity <InputEntity
value={condition.condition_data.entity_id} value={condition.entity_id}
onChange={entity_id => onChange({ onChange={entity_id => onChange({
...condition, ...condition,
condition_data: { entity_id
...condition.condition_data,
entity_id
}
})} })}
/> />
<InputText label="Attribute" value={condition.condition_data.attribute ?? ""} onChange={attribute => onChange({ <InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
...condition, ...condition,
condition_data: { attribute
...condition.condition_data,
attribute
}
})} /> })} />
<InputNumber <InputNumber
label="Above" label="Above"
value={condition.condition_data.above ? Number(condition.condition_data.above) : undefined} value={condition.above ? Number(condition.above) : undefined}
onChange={above => onChange({ onChange={above => onChange({
...condition, ...condition,
condition_data: { above: above ? String(above) : undefined,
...condition.condition_data,
above: above ? String(above) : undefined,
}
})} })}
/> />
<InputNumber <InputNumber
label="Below" label="Below"
value={condition.condition_data.below ? Number(condition.condition_data.below) : undefined} value={condition.below ? Number(condition.below) : undefined}
onChange={below => onChange({ onChange={below => onChange({
...condition, ...condition,
condition_data: { below: below ? String(below) : undefined,
...condition.condition_data,
below: below ? String(below) : undefined,
}
})} })}
/> />
<InputTextArea label="Template" value={condition.condition_data.value_template ?? ""} onChange={value_template => onChange({ <InputTextArea label="Template" value={condition.value_template ?? ""} onChange={value_template => onChange({
...condition, ...condition,
condition_data: { value_template
...condition.condition_data,
value_template
}
})} resizable /> })} resizable />
</div> </div>
} }
@@ -132,7 +108,7 @@ export const LogicViewer: Editor<LogicCondition> = ({
}) => { }) => {
return <> return <>
{condition.condition_data.conditions.map((c, i) => { {condition.conditions.map((c, i) => {
return <ConditionNode return <ConditionNode
key={i} key={i}
condition={c} condition={c}
@@ -151,50 +127,35 @@ export const StateEditor: Editor<StateCondition> = ({
condition, condition,
}) => { }) => {
return <div> return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({ <InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition, ...condition,
condition_data: { alias
...condition.condition_data,
alias
}
})} /> })} />
<InputEntity <InputEntity
value={condition.condition_data.entity_id} value={condition.entity_id}
onChange={entity_id => onChange({ onChange={entity_id => onChange({
...condition, ...condition,
condition_data: { entity_id
...condition.condition_data,
entity_id
}
})} })}
/> />
<InputText label="Attribute" value={condition.condition_data.attribute ?? ""} onChange={attribute => onChange({ <InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
...condition, ...condition,
condition_data: { attribute
...condition.condition_data,
attribute
}
})} /> })} />
<InputText <InputText
label="State" label="State"
value={String(condition.condition_data.state)} value={String(condition.state)}
onChange={state => onChange({ onChange={state => onChange({
...condition, ...condition,
condition_data: { state,
...condition.condition_data,
state,
}
})} })}
/> />
<InputTime <InputTime
label="For" label="For"
value={condition.condition_data.for} value={condition.for}
onChange={_for => onChange({ onChange={_for => onChange({
...condition, ...condition,
condition_data: { for: _for,
...condition.condition_data,
for: _for,
}
})} })}
/> />
</div> </div>
@@ -205,36 +166,27 @@ export const TimeEditor: Editor<TimeCondition> = ({
condition, condition,
}) => { }) => {
return <div> return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({ <InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition, ...condition,
condition_data: { alias
...condition.condition_data,
alias
}
})} /> })} />
<InputTime <InputTime
label="After" label="After"
value={condition.condition_data.after} value={condition.after}
onChange={after => onChange({ onChange={after => onChange({
...condition, ...condition,
condition_data: { after,
...condition.condition_data,
after,
}
})} })}
/> />
<InputTime <InputTime
label="Before" label="Before"
value={condition.condition_data.before} value={condition.before}
onChange={before => onChange({ onChange={before => onChange({
...condition, ...condition,
condition_data: { before,
...condition.condition_data,
before,
}
})} })}
/> />
<b>Weekday not support for no, use yaml for now</b> {condition.condition_data.weekday} <b>Weekday not support for no, use yaml for now</b> {condition.weekday}
</div> </div>
} }
@@ -243,19 +195,13 @@ export const TriggerEditor: Editor<TriggerCondition> = ({
condition, condition,
}) => { }) => {
return <div> return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({ <InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition, ...condition,
condition_data: { alias
...condition.condition_data,
alias
}
})} /> })} />
<InputText label="Trigger ID" value={condition.condition_data.id} onChange={id => onChange({ <InputText label="Trigger ID" value={condition.id} onChange={id => onChange({
...condition, ...condition,
condition_data: { id
...condition.condition_data,
id
}
})} /> })} />
</div> </div>
} }
@@ -265,39 +211,27 @@ export const ZoneEditor: Editor<ZoneCondition> = ({
condition, condition,
}) => { }) => {
return <div> return <div>
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({ <InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition, ...condition,
condition_data: { alias
...condition.condition_data,
alias
}
})} /> })} />
<InputText label="Zone" value={condition.condition_data.zone} onChange={zone => onChange({ <InputText label="Zone" value={condition.zone} onChange={zone => onChange({
...condition, ...condition,
condition_data: { zone
...condition.condition_data,
zone
}
})} /> })} />
<InputEntity <InputEntity
value={condition.condition_data.entity_id} value={condition.entity_id}
onChange={entity_id => onChange({ onChange={entity_id => onChange({
...condition, ...condition,
condition_data: { entity_id
...condition.condition_data,
entity_id
}
})} })}
/> />
<InputText <InputText
label="State" label="State"
value={String(condition.condition_data.state)} value={String(condition.state)}
onChange={state => onChange({ onChange={state => onChange({
...condition, ...condition,
condition_data: { state,
...condition.condition_data,
state,
}
})} })}
/> />
</div> </div>
@@ -27,11 +27,8 @@ const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }
export const TemplateViewer = Template.bind({}) export const TemplateViewer = Template.bind({})
TemplateViewer.args = { TemplateViewer.args = {
condition: { condition: {
$smType: 'condition',
condition: 'template', condition: 'template',
condition_data: { value_template: "states('switch.light_kitchen') == 'on'"
value_template: "states('switch.light_kitchen') == 'on'"
}
} as AutomationCondition, } as AutomationCondition,
} }
@@ -39,63 +36,42 @@ TemplateViewer.args = {
export const NumericStateViewer = Template.bind({}) export const NumericStateViewer = Template.bind({})
NumericStateViewer.args = { NumericStateViewer.args = {
condition: { condition: {
$smType: 'condition',
condition: "numeric_state", condition: "numeric_state",
condition_data: { entity_id: "sensor.humidity_kitchen",
entity_id: "sensor.humidity_kitchen", above: "10",
above: "10",
}
} as AutomationCondition, } as AutomationCondition,
} }
export const LogicCondition = Template.bind({}) export const LogicCondition = Template.bind({})
LogicCondition.args = { LogicCondition.args = {
condition: { condition: {
$smType: 'condition',
condition: 'or', condition: 'or',
condition_data: { conditions: [
conditions: [ {
{ condition: 'numeric_state',
$smType: 'condition', entity_id: 'sensor.humidity_kitchen',
condition: 'numeric_state', above: '60'
condition_data: { },
entity_id: 'sensor.humidity_kitchen', {
condition: 'numeric_state',
entity_id: 'sensor.humidity_living_room',
above: '60'
},
{
condition: 'and',
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.humidity_bedroom',
above: '60'
},
{
condition: 'numeric_state',
entity_id: 'sensor.humidity_bathroom',
above: '60' above: '60'
} }
}, ]
{ },
$smType: 'condition', ]
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.humidity_living_room',
above: '60'
}
},
{
$smType: 'condition',
condition: 'and',
condition_data: {
conditions: [
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.humidity_bedroom',
above: '60'
}
},
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.humidity_bathroom',
above: '60'
}
}
]
}
},
]
}
} as AutomationCondition, } as AutomationCondition,
} }
@@ -2,30 +2,24 @@ import { AutomationCondition, LogicCondition } from "types/automations/condition
export const genUpdateMethods = ( export const genUpdateMethods = (
condition: LogicCondition, condition: LogicCondition,
onChange: (c: LogicCondition) => void onChange: (c: LogicCondition) => void
) => (i: number) => ({ ) => (i: number) => ({
onUpdate: (update: AutomationCondition) => onChange({ onUpdate: (update: AutomationCondition) => onChange({
...condition, ...condition,
condition_data: { conditions: [
...condition.condition_data, ...condition.conditions.slice(0, i),
conditions: [ update,
...condition.condition_data.conditions.slice(0, i), ...condition.conditions.slice(i + 1)
update, ]
...condition.condition_data.conditions.slice(i+1)
]
}
}), }),
onDelete: (which: 'root' | number) => { onDelete: (which: 'root' | number) => {
if (which === 'root') { if (which === 'root') {
onChange({ onChange({
...condition, ...condition,
condition_data: { conditions: condition.conditions.slice(0, i).concat(
...condition.condition_data, condition.conditions.slice(i + 1)
conditions: condition.condition_data.conditions.slice(0, i).concat( )
condition.condition_data.conditions.slice(i+1)
)
}
}) })
} else { } else {
throw new Error("Not Implemented") throw new Error("Not Implemented")
+16 -18
View File
@@ -1,5 +1,4 @@
import { Styles } from "jss"; import { Styles } from "jss";
import Color from 'chroma-js';
import { createAppUseStyles } from "styles/theme"; import { createAppUseStyles } from "styles/theme";
export const useStyles = createAppUseStyles<{ export const useStyles = createAppUseStyles<{
@@ -26,9 +25,9 @@ export const useStyles = createAppUseStyles<{
padding: 0, padding: 0,
position: 'relative', position: 'relative',
display: 'flex', display: 'flex',
flexDirection: hasChildren? 'column' : 'row', flexDirection: hasChildren ? 'column' : 'row',
}), }),
title: ({hasChildren}) => ({ title: ({ hasChildren }) => ({
display: 'flex', display: 'flex',
border: hasChildren ? `1px solid ${theme.primaryAccent}` : 'none', border: hasChildren ? `1px solid ${theme.primaryAccent}` : 'none',
borderRadius: 10, borderRadius: 10,
@@ -36,7 +35,7 @@ export const useStyles = createAppUseStyles<{
borderBottomLeftRadius: 0, borderBottomLeftRadius: 0,
height: '100%', height: '100%',
}), }),
titleText: ({hasChildren}) => ({ titleText: ({ hasChildren }) => ({
background: theme.condition.primaryColor, background: theme.condition.primaryColor,
border: `1px solid ${theme.primaryAccent}`, border: `1px solid ${theme.primaryAccent}`,
borderRadius: 10, borderRadius: 10,
@@ -44,7 +43,6 @@ export const useStyles = createAppUseStyles<{
borderBottomRightRadius: 0, borderBottomRightRadius: 0,
borderBottomLeftRadius: hasChildren ? 0 : 10, borderBottomLeftRadius: hasChildren ? 0 : 10,
padding: 10, padding: 10,
maxWidth: 120,
minWidth: 30, minWidth: 30,
textOverflow: 'ellipsis', textOverflow: 'ellipsis',
textAlign: 'center', textAlign: 'center',
@@ -57,9 +55,10 @@ export const useStyles = createAppUseStyles<{
left: -35, left: -35,
top: 10, top: 10,
}, },
modifyBtn: ({hasChildren}) => ({ modifyBtn: ({ hasChildren }) => ({
// styling // styling
backgroundColor: theme.primary, backgroundColor: theme.green,
color: theme.primary,
fill: theme.primaryAccent, fill: theme.primaryAccent,
borderColor: theme.primaryAccent, borderColor: theme.primaryAccent,
borderWidth: 1, borderWidth: 1,
@@ -67,20 +66,19 @@ export const useStyles = createAppUseStyles<{
borderTopLeftRadius: 0, borderTopLeftRadius: 0,
borderBottomLeftRadius: 0, borderBottomLeftRadius: 0,
cursor: 'pointer', cursor: 'pointer',
// positioning // positioning
display: 'flex', display: 'flex',
justifyContent: 'center', justifyContent: 'center',
alignItems: 'center', alignItems: 'center',
padding: '0px 10px', padding: '0px 10px',
// position: hasChildren ? 'absolute' : 'block',
right: 1, right: 1,
top: 10, top: 10,
// on hover // on hover
"&:hover": { "&:hover": {
backgroundColor: Color(theme.primary).brighten().hex(), backgroundColor: theme.greenLight,
fill: Color(theme.primaryAccent).brighten().hex(), fill: theme.primaryAccentLight,
}, },
"&:hover $icon": { "&:hover $icon": {
transform: "rotate(90deg)" transform: "rotate(90deg)"
@@ -88,14 +86,14 @@ export const useStyles = createAppUseStyles<{
}), }),
icon: {}, icon: {},
deleteBtn, deleteBtn,
children: ({hasChildren}) => ({ children: ({ hasChildren }) => ({
flex: 1, flex: 1,
paddingLeft: hasChildren ? 50 : 10, paddingLeft: hasChildren ? 50 : 10,
paddingRight: hasChildren ? 0 : 10, paddingRight: hasChildren ? 0 : 10,
display: 'flex', display: 'flex',
flexDirection: 'column', flexDirection: 'column',
justifyContent: 'center', justifyContent: 'center',
border: `1px solid ${theme.primaryAccent}`, border: `1px solid ${theme.secondaryAccent}`,
borderBottomRightRadius: hasChildren ? 10 : 0, borderBottomRightRadius: hasChildren ? 10 : 0,
borderBottomLeftRadius: hasChildren ? 10 : 0, borderBottomLeftRadius: hasChildren ? 10 : 0,
minHeight: hasChildren ? undefined : '100%' minHeight: hasChildren ? undefined : '100%'
@@ -114,8 +112,8 @@ export const useStyles = createAppUseStyles<{
paddingRight: 20, paddingRight: 20,
cursor: 'pointer', cursor: 'pointer',
"&:hover": { "&:hover": {
backgroundColor: Color(theme.primary).brighten().hex(), backgroundColor: theme.primaryLight,
fill: Color(theme.primaryAccent).brighten().hex(), fill: theme.primaryAccentLight,
}, },
}, },
addBtn: { addBtn: {
@@ -131,8 +129,8 @@ export const useStyles = createAppUseStyles<{
paddingRight: 20, paddingRight: 20,
cursor: 'pointer', cursor: 'pointer',
"&:hover": { "&:hover": {
backgroundColor: Color(theme.primary).brighten().hex(), backgroundColor: theme.primaryLight,
fill: Color(theme.primaryAccent).brighten().hex(), fill: theme.primaryAccentLight,
}, },
} }
} }
@@ -34,7 +34,7 @@ export const LogicViewer: Viewer<LogicCondition> = ({
onChange, onChange,
}) => { }) => {
return <> return <>
{condition.condition_data.conditions.map((c, i) => { {condition.conditions.map((c, i) => {
return <ConditionNode key={i} condition={c} displayMode return <ConditionNode key={i} condition={c} displayMode
{...genUpdateMethods(condition, onChange)(i)} {...genUpdateMethods(condition, onChange)(i)}
/> />
@@ -0,0 +1,59 @@
import { FC } from "react";
import { AddIcon, TrashIcon } from '../Icons/index';
import { useCircleStyles } from './styles';
import { Handle, Position, XYPosition } from 'react-flow-renderer';
export interface DAGCircleProps {
onAdd?: () => void;
onRemove?: () => void;
size: number,
backgroundColor?: string;
disableSource?: boolean;
disableTarget?: boolean;
}
export const makeFlowCircle = (
circleId: string,
position: XYPosition,
data: DAGCircleProps,
) => ({
id: circleId,
type: 'dagcircle',
position,
data
})
export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
data: {
size,
onAdd,
onRemove,
backgroundColor,
disableSource = false,
disableTarget = false,
}
}) => {
const { classes } = useCircleStyles({
size,
hasOnFunction: !!onRemove || !!onAdd,
hasRemoveFunction: !!onRemove,
backgroundColor,
});
return <>
{!disableSource && <Handle type="source" position={Position.Right} />}
{!disableTarget && <Handle type="target" position={Position.Left} />}
<div className={classes.root}>
{
onAdd ?
<AddIcon
size={70} units="%"
className={classes.icon}
onClick={onAdd}
/>
: (backgroundColor || onRemove) ? "" : "else"
}
{onRemove ? <TrashIcon className={classes.trashIcon} onClick={onRemove} /> : <></>}
</div>
</>
}
+57
View File
@@ -0,0 +1,57 @@
import { PencilIcon } from "components/Icons"
import { NodeColor } from "types/graphs";
import { useNodeStyles } from "./styles";
import { Handle, Position } from 'react-flow-renderer';
import { FC } from "react";
export interface DAGNodeProps {
height: number;
width: number;
onXClick?: () => void;
onEditClick?: () => void;
color: NodeColor;
label: string;
hasInput?: boolean;
accentBackground?: boolean;
}
export const DAGNode: FC<{ data: DAGNodeProps }> = ({
data: {
label,
height,
width,
onXClick,
onEditClick = () => { },
color,
hasInput = false,
accentBackground = false,
},
}) => {
const { classes, theme } = useNodeStyles({
color,
nodeHeight: height,
nodeWidth: width,
accentBackground,
});
return <>
{hasInput && <Handle type="target" position={Position.Left} />}
<Handle type="source" position={Position.Right} />
<div className={classes.root}>
<div className={classes.inner}>
<div className={classes.leftEdge} onClick={onXClick}>
{!!onXClick && <button className={classes.buttonDelete}>X</button>}
</div>
<div className={classes.textWrap}>
<span className={classes.text} title={label}>
{label}
</span>
</div>
<div className={classes.rightEdge} onClick={onEditClick}>
<button className={classes.buttonEdit}>
<PencilIcon size={1.1} color={theme.green} />
</button>
</div>
</div>
</div>
</>
}
@@ -0,0 +1,52 @@
import { makeFlowCircle } from "./DAGCircle"
import { DAGAutomationFlowDims } from "./types"
import { XYPosition } from 'react-flow-renderer';
export const makeAddButton = (
id: string,
position: XYPosition,
{
circleSize,
}: DAGAutomationFlowDims,
onAdd: () => void,
disableTarget: boolean = true,
) => makeFlowCircle(
id,
position,
{
size: circleSize,
onAdd,
disableSource: true,
disableTarget,
}
)
export const makeConditionPoint = (
id: string,
position: XYPosition,
{
padding,
conditionWidth,
conditionHeight,
nodeWidth,
nodeHeight,
circleSize,
distanceFactor,
}: DAGAutomationFlowDims,
totalConditions: number,
onEditClick: () => void,
) => ({
id,
type: 'dagnode',
position,
data: {
size: circleSize,
color: 'lblue',
accentBackground: true,
label: `${totalConditions} Condition${totalConditions !== 1 ? 's' : ''}`,
height: conditionHeight,
width: conditionWidth,
hasInput: true,
onEditClick,
}
})
@@ -0,0 +1,212 @@
import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { DAGAutomationFlow } from '.';
import { useState } from 'react';
import * as dgconst from "components/DAGSvgs/constants";
export default {
title: 'DAGAutomationFlow/Viewer',
component: DAGAutomationFlow,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
dims: dgconst.DEFAULT_DIMS
}
} as ComponentMeta<typeof DAGAutomationFlow>
const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
const [state, setState] = useState({
trigger: args.trigger,
sequence: args.sequence,
condition: args.condition,
})
return <div className="page">
<DAGAutomationFlow
{...args}
{...state}
onTriggerUpdate={trigger => {
setState({ ...state, trigger })
}}
onSequenceUpdate={sequence => setState({ ...state, sequence })}
onConditionUpdate={condition => setState({ ...state, condition })}
/>
</div>
}
export const Simple = Template.bind({})
Simple.args = {
...Simple.args,
condition: [],
trigger: [
{
"platform": "numeric_state",
"entity_id": "test",
},
{
"platform": "homeassistant",
"event": "start",
}
],
sequence: [
{
condition: 'and',
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.temperature_kitchen',
below: '15',
},
{
condition: 'template',
value_template: 'states(switch.kitchen_light) == "on"'
}
]
},
{
alias: "Start Music In Kitchen",
service: 'media_player.play_media',
target: {
entity_id: "media_player.kitchen_dot"
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
}
]
}
export const Complex = Template.bind({})
Complex.args = {
...Complex.args,
condition: [],
trigger: [
{
"platform": "numeric_state",
"entity_id": "test",
},
{
"platform": "homeassistant",
"event": "start",
}
],
sequence: [
{
"condition": "and",
"conditions": [
{
"condition": "numeric_state",
"entity_id": "sensor.temperature_kitchen",
"below": "15"
},
{
"condition": "template",
"value_template": "states(switch.kitchen_light) == \"on\""
}
]
},
{
"alias": "Start Music In Kitchen",
"service": "media_player.play_media",
"target": {
"entity_id": "media_player.kitchen_dot"
},
"data": {
"media_content_id": "Good Morning",
"media_content_type": "SPOTIFY"
}
},
{
"choose": [
{
"conditions": [
{
"condition": "state",
"entity_id": "lights.bathroom",
"state": "off",
}
],
"sequence": [
{
"service": "light.turn_on",
"target": {
"entity_id": "lights.bathroom"
},
"data": {}
},
{
"alias": "Turn off bedroom",
"service": "light.turn_off",
"target": {
"entity_id": "lights.bedroom"
},
"data": {}
}
]
},
{
"conditions": [
{
"condition": "state",
"entity_id": "lights.bedroom",
"state": "off",
}
],
"sequence": [
{
"alias": "Turn on bedroom",
"service": "light.turn_on",
"target": {
"entity_id": "lights.bedroom"
},
"data": {}
},
{
"choose": [
{
"conditions": [],
"sequence": [
{
"choose": [],
"default": [],
}
]
}
],
"default": [
{
"choose": [],
"default": [],
}
],
}
]
}
],
"default": [
{
"service": "light.turn_off",
"target": {
"entity_id": "lights.bathroom"
},
"data": {}
}
]
},
{
"condition": "and",
"conditions": []
}
]
}
export const EmptyStart = Template.bind({})
EmptyStart.args = {
...EmptyStart.args,
condition: [],
trigger: [],
sequence: []
}
+144
View File
@@ -0,0 +1,144 @@
import { FC, useState } from "react";
import ReactFlow, { Controls } from 'react-flow-renderer';
import { AutomationSequenceNode } from "types/automations";
import { AutomationTrigger } from 'types/automations/triggers';
import { triggerToFlow } from "./triggerConvertor";
import { DAGNode } from "./DAGNode";
import { DAGAutomationFlowDims, FlowData, ModalState, UpdateModalState } from './types';
import { DAGCircle } from './DAGCircle';
import { sequenceToFlow } from "./sequenceConvertor";
import { makeSequenceUpdater } from "./updater";
import { NodeEditor } from "components/NodeEditor";
import { MultiNodeEditor } from "components/MultiNodeEditors";
import { Modal } from "components/Modal";
import { AutomationCondition } from "types/automations/conditions";
import { makeConditionPoint } from "./flowDataMods";
const nodeTypes = {
'dagnode': DAGNode,
'dagcircle': DAGCircle,
}
const makeOnEditAutomationConditions = (
conditions: AutomationCondition[],
updateConditions: (c: AutomationCondition[]) => void,
openModal: UpdateModalState,
) => () => openModal({
single: false,
node: conditions,
allowedTypes: ['condition'],
update: c => updateConditions(c as any),
})
export interface DAGAutomationFlowProps {
className?: string;
trigger: AutomationTrigger[];
condition: AutomationCondition[];
sequence: AutomationSequenceNode[];
dims: DAGAutomationFlowDims;
onTriggerUpdate: (t: AutomationTrigger[]) => void;
onSequenceUpdate: (s: AutomationSequenceNode[]) => void;
onConditionUpdate: (s: AutomationCondition[]) => void;
}
export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
className,
trigger,
condition,
sequence,
onTriggerUpdate,
onSequenceUpdate,
onConditionUpdate,
dims,
}) => {
// state
const [modalState, setModalState] = useState<ModalState | null>(null);
// modal
let modalBody = <></>
if (modalState) {
if (modalState.single) {
modalBody = <NodeEditor
node={modalState.node}
onClose={() => setModalState(null)}
onSave={n => { modalState.update(n as any); setModalState(null); }}
allowedTypes={modalState.allowedTypes}
saveBtnCreateText={modalState.saveBtnCreateText}
/>
} else {
modalBody = <MultiNodeEditor
sequence={modalState.node}
onClose={() => setModalState(null)}
onSave={(n) => modalState.update(n as any)}
allowedTypes={['condition']}
/>
}
}
// convert automation to flow data
const condPoint = makeConditionPoint('c', {
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y + dims.nodeHeight * 0.25
}, dims, condition.length, makeOnEditAutomationConditions(
condition,
onConditionUpdate,
setModalState,
));
const flowData: FlowData = {
nodes: [condPoint],
edges: [],
}
triggerToFlow(flowData, trigger, condPoint.id, dims, {
onAdd: () => onTriggerUpdate([
...trigger, {
platform: 'event',
event_type: '',
}
]),
onDelete: i => onTriggerUpdate([
...trigger.slice(0, i),
...trigger.slice(i + 1)
]),
onEdit: i => setModalState({
single: true,
node: trigger[i],
update: t => onTriggerUpdate([
...trigger.slice(0, i),
t,
...trigger.slice(i + 1)
]),
allowedTypes: ['trigger'],
})
});
sequenceToFlow(
flowData,
sequence,
condPoint.id,
{
...dims, padding: {
x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth,
y: dims.padding.y,
}
},
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
);
// render
return <>
<Modal open={!!modalState}>
{modalBody}
</Modal>
<ReactFlow
className={className}
nodeTypes={nodeTypes}
snapToGrid
onlyRenderVisibleElements
nodesConnectable={false}
nodesDraggable={false}
{...flowData}
>
<Controls />
</ReactFlow>
</>;
}
+4
View File
@@ -0,0 +1,4 @@
.dag-flow-safe {
height: 100%;
overflow: scroll;
}
+84
View File
@@ -0,0 +1,84 @@
import "./safe.css";
import { Component, ErrorInfo } from "react";
import { DAGAutomationFlow, DAGAutomationFlowProps } from ".";
import { AutomationSequenceNode } from "types/automations";
import { AutomationCondition } from "types/automations/conditions";
import { AutomationTrigger } from 'types/automations/triggers';
import InputYaml from "components/Inputs/InputYaml";
import { Button } from "components/Inputs/Button";
type GoodState = {
hasError: false;
}
type FailedStateData = {
sequence: AutomationSequenceNode[],
condition: AutomationCondition[],
trigger: AutomationTrigger[],
}
type FailedState = {
hasError: true,
error: any,
errorInfo?: ErrorInfo,
} & FailedStateData
type State = GoodState | FailedState
export class SafeDAGAutomationFlow extends Component<DAGAutomationFlowProps, State> {
state: State = {
hasError: false
}
componentDidCatch(error: Error, errorInfo: ErrorInfo) {
this.setState({
hasError: true,
error,
errorInfo,
sequence: this.props.sequence,
condition: this.props.condition,
trigger: this.props.trigger,
})
}
render() {
if (this.state.hasError) {
const makeSet = <K extends keyof FailedStateData>(k: K) => (d: FailedStateData[K]) => this.setState({
...this.state,
[k]: d,
});
const makeSave = <K extends keyof FailedStateData>(k: K) => () => {
if (!this.state.hasError) {
return
}
if (k === 'condition') {
this.props.onConditionUpdate(this.state.condition)
} else if (k === 'sequence') {
this.props.onSequenceUpdate(this.state.sequence)
} else if (k === 'trigger') {
this.props.onTriggerUpdate(this.state.trigger)
}
}
return <div className="dag-flow-safe">
<h1>An Error has occured.</h1>
<h1>Failed to Open Autmation!</h1>
Something is likely not configured in your automation properly.
<hr />
<h2>Error:</h2>
<h2>{String(this.state.error)}</h2>
<br />
{JSON.stringify(this.state.error, null, 4)}
{this.state.errorInfo && this.state.errorInfo.componentStack.split('\n').map((s, i) => <>
<span key={i}>{s}</span><br key={`br-${i}`} />
</>)}
<h2>Automation YAML</h2>
<InputYaml resizable label="Trigger" value={this.state.trigger} onChange={makeSet('trigger')} />
<Button onClick={makeSave('trigger')}>Save Triggers</Button>
<InputYaml resizable label="Condition" value={this.state.condition} onChange={makeSet('condition')} />
<Button onClick={makeSave('condition')}>Save Conditions</Button>
<InputYaml resizable label="Action" value={this.state.sequence} onChange={makeSet('sequence')} />
<Button onClick={makeSave('sequence')}>Save Actions</Button>
</div>
}
return <DAGAutomationFlow {...this.props} />;
}
}
@@ -0,0 +1,225 @@
import { AutomationSequenceNode } from 'types/automations';
import { DAGAutomationFlowDims, FlowData } from './types';
import { getDescriptionFromAutomationNode } from 'utils/formatting';
import { XYPosition } from 'react-flow-renderer';
import { ChooseAction } from 'types/automations/actions';
import { makeFlowCircle } from './DAGCircle';
import { createOnRemoveForChooseNode, SequenceUpdater } from './updater';
import { getNodeType } from 'utils/automations';
import { makeAddButton, makeConditionPoint } from './flowDataMods';
export const sequenceToFlow = (
flowData: FlowData,
sequence: AutomationSequenceNode[],
fromPoint: string,
dims: DAGAutomationFlowDims,
updater: SequenceUpdater,
prefix: string = "",
) => {
let lastPointId = fromPoint;
let lasPos: XYPosition | null = null;
// sequence
for (let i = 0; i < sequence.length; i++) {
const node = sequence[i];
const nodeId = `${prefix}n-${i}`;
let position: XYPosition;
if (lasPos) {
position = {
x: lasPos.x + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y
}
} else {
position = {
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2),
y: dims.padding.y
};
}
// draw node
if (getNodeType(node) === 'action') {
if ('choose' in node) {
position = addChooseNode(flowData, node, position, nodeId, dims, updater, i)
} else {
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i)
});
}
} else {
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i)
});
}
addEdge(flowData, lastPointId, nodeId, false)
lastPointId = nodeId;
lasPos = position;
}
// add button
const addCircle = makeAddButton(
`${prefix}-+`,
{
x: (
lasPos === null ?
dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) :
lasPos.x
) + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y + dims.circleSize / 4
},
dims,
updater.addNode,
false,
)
flowData.nodes.push(addCircle)
addEdge(flowData, lastPointId, addCircle.id, false)
return {
position: lasPos,
pointId: lastPointId,
};
}
const xyApply = (p1: XYPosition, p2: XYPosition, fcn: (a: number, b: number) => number): XYPosition => ({
x: fcn(p1.x, p2.x), y: fcn(p1.y, p2.y)
})
const addEdge = (flowData: FlowData, source: string, target: string, animated: boolean = false) => flowData.edges.push({
id: `${source}-${target}`,
source,
target,
animated,
})
const addSingleNode = (
flowData: FlowData,
node: AutomationSequenceNode,
position: XYPosition,
nodeId: string,
{
nodeHeight,
nodeWidth,
}: DAGAutomationFlowDims,
opts: {
onEditClick: () => void;
onXClick: () => void;
}
) => flowData.nodes.push({
id: nodeId,
type: 'dagnode',
data: {
label: getDescriptionFromAutomationNode(node),
height: nodeHeight,
width: nodeWidth,
color: getNodeType(node) === 'action' ? 'green' : 'blue',
hasInput: true,
...opts,
},
position,
});
const addChooseNode = (
flowData: FlowData,
node: ChooseAction,
position: XYPosition,
nodeId: string,
dims: DAGAutomationFlowDims,
updater: SequenceUpdater,
i: number,
) => {
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i),
});
let lastPos: XYPosition = position;
// conditions
node.choose.forEach(({ sequence, conditions }, j) => {
const sequenceId = `${nodeId}.${j}`;
// edit/delete circle
const circle = makeFlowCircle(`${sequenceId}>delete`, {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
}, {
size: dims.circleSize,
onRemove: createOnRemoveForChooseNode(
node,
d => updater.updateNode(i, d),
j,
),
})
flowData.nodes.push(circle)
addEdge(flowData, nodeId, circle.id, true)
const condNode = makeConditionPoint(
`${sequenceId}>cond`,
{
x: circle.position.x + dims.circleSize * dims.distanceFactor,
y: circle.position.y + dims.circleSize / 8,
},
dims,
conditions.length,
updater.makeOnEditConditionsForChooseNode(i, j)
);
flowData.nodes.push(condNode)
addEdge(flowData, circle.id, condNode.id, true)
// actual sub sequence
const lastPoint = sequenceToFlow(flowData, sequence, condNode.id, {
...dims,
padding: {
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
y: condNode.position.y - dims.conditionHeight / 2,
},
}, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`);
if (lastPoint.position) {
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
} else {
lastPos = xyApply(lastPos, { x: lastPos.x, y: lastPos.y + dims.nodeHeight * dims.distanceFactor }, Math.max)
}
})
const totalChildren = node.choose.length;
// add button
const addCirlce = makeAddButton(
`${nodeId}>add`,
{
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
},
dims,
() => updater.updateNode(i, {
...node,
choose: [
...node.choose,
{
sequence: [],
conditions: [],
}
]
}),
false,
);
flowData.nodes.push(addCirlce)
addEdge(flowData, nodeId, addCirlce.id, true)
// else
const elseCircle = makeFlowCircle(`${nodeId}>else`, {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2,
}, { size: dims.circleSize })
flowData.nodes.push(elseCircle)
addEdge(flowData, nodeId, elseCircle.id, true)
const lastPoint = sequenceToFlow(flowData, node.default, elseCircle.id, {
...dims,
padding: {
x: position.x - dims.nodeWidth,
y: elseCircle.position.y - dims.circleSize / 4,
},
}, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`)
if (lastPoint.position) {
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
} else {
lastPos = xyApply(lastPos, elseCircle.position, Math.max)
}
return lastPos
}
@@ -1,49 +1,12 @@
import { Styles } from "jss"; import { Styles } from "jss";
import Color from 'chroma-js';
import { createAppUseStyles } from "styles/theme"; import { createAppUseStyles } from "styles/theme";
import { Node } from "types/graphs"; import { NodeColor } from "types/graphs";
export const useBoardStyles = createAppUseStyles<{
boardHeight: number,
boardWidth: number,
}>(theme => ({
dag: {
borderWidth: 1,
borderStyle: 'solid',
borderColor: theme.secondaryAccent,
color: theme.primaryAccent,
background: theme.primary,
width: '100%',
height: '100%',
overflow: 'scroll'
},
svg: ({ boardHeight, boardWidth }) => ({
minHeight: `${boardHeight}px`,
minWidth: `${boardWidth}px`,
padding: 0,
margin: 0,
}),
circle: {
fill: Color(theme.secondary).set('rgb.b', 125).hex(),
},
infoBox: {
paddingLeft: '10px',
paddingRight: '10px',
display: 'flex',
flexDirection: 'column',
justifyContent: 'flex-start',
overflow: 'auto',
},
dagEdge: {
stroke: theme.secondaryAccent,
},
}))
export const useNodeStyles = createAppUseStyles<{ export const useNodeStyles = createAppUseStyles<{
color: Node['color'], color: NodeColor,
nodeHeight: number, nodeHeight: number,
nodeWidth: number, nodeWidth: number,
accentBackground: boolean,
}>(theme => { }>(theme => {
const edgeStyle: Styles = { const edgeStyle: Styles = {
flex: '1', flex: '1',
@@ -68,21 +31,22 @@ export const useNodeStyles = createAppUseStyles<{
cursor: 'pointer', cursor: 'pointer',
} }
return { return {
root: { root: ({ nodeHeight, nodeWidth }) => ({
display: 'flex', display: 'flex',
flexDirection: 'column', flexDirection: 'column',
justifyContent: 'flex-end', justifyContent: 'flex-end',
height: `100%`, height: nodeHeight,
maxHeight: `100%`, maxHeight: nodeHeight,
maxWidth: '100%', maxWidth: nodeWidth,
width: '100%', width: nodeWidth,
fontSize: 10, fontSize: 10,
}, }),
inner: ({ color }) => ({ inner: ({ color, accentBackground }) => ({
position: 'relative', position: 'relative',
display: 'flex', display: 'flex',
flexDirection: 'row', flexDirection: 'row',
backgroundColor: theme.secondary, backgroundColor: !accentBackground ? theme.secondary :
color === 'lblue' ? theme.condition.primaryColorOpaque : 'none',
borderRadius: '1em', borderRadius: '1em',
flex: 1, flex: 1,
height: `100%`, height: `100%`,
@@ -94,10 +58,11 @@ export const useNodeStyles = createAppUseStyles<{
borderTopStyle: 'solid', borderTopStyle: 'solid',
borderTopLeftRadius: '10px', borderTopLeftRadius: '10px',
borderTopRightRadius: '10px', borderTopRightRadius: '10px',
borderTopColor: color === 'red' ? Color(theme.secondary).set('rgb.r', 125).hex() : borderTopColor: color === 'red' ? theme.redAccent :
color === 'blue' ? Color(theme.secondary).set('rgb.b', 125).hex() : color === 'blue' ? theme.condition.primaryColor :
color === 'green' ? Color(theme.secondary).set('rgb.g', 125).hex() : color === 'green' ? theme.green :
'none' color === 'lblue' ? theme.condition.primaryAccent :
'none'
}), }),
textWrap: { textWrap: {
display: 'flex', display: 'flex',
@@ -149,13 +114,14 @@ export const useCircleStyles = createAppUseStyles<{
backgroundColor?: string, backgroundColor?: string,
}>(theme => ({ }>(theme => ({
root: ({ size, hasOnFunction, hasRemoveFunction, backgroundColor }) => { root: ({ size, hasOnFunction, hasRemoveFunction, backgroundColor }) => {
const baseColor = backgroundColor ? backgroundColor : Color(theme.primary).set('rgb.g', 100).hex(); const baseColor = backgroundColor ? backgroundColor : theme.green;
const hoverColor = (hasOnFunction && !hasRemoveFunction) ? Color(theme.primary).set('rgb.g', 150).hex() : baseColor const hoverColor = hasOnFunction ? theme.greenOpaque : baseColor
return { return {
backgroundColor: baseColor, backgroundColor: baseColor,
borderRadius: hasRemoveFunction ? 10 : 500, borderRadius: hasRemoveFunction ? 10 : 500,
height: size, height: size,
width: size, width: size,
color: theme.primary,
cursor: hasOnFunction ? "pointer" : 'default', cursor: hasOnFunction ? "pointer" : 'default',
"&:hover": { "&:hover": {
backgroundColor: hoverColor, backgroundColor: hoverColor,
@@ -166,18 +132,7 @@ export const useCircleStyles = createAppUseStyles<{
alignItems: 'center', alignItems: 'center',
} }
}, },
icon: {
"&:hover": {
borderRadius: 500,
background: Color(theme.primary).set('rgb.g', 150).hex(),
}
},
trashIcon: { trashIcon: {
padding: 1, padding: 1,
"&:hover": {
borderRadius: 500,
background: Color(theme.primary).set('rgb.g', 150).hex(),
cursor: 'pointer',
}
} }
})) }))
@@ -0,0 +1,52 @@
import { AutomationTrigger } from 'types/automations/triggers';
import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from './types';
import { makeAddButton } from './flowDataMods';
export const triggerToFlow = (
flowData: FlowData,
trigger: AutomationTrigger[],
toPoint: string,
dims: DAGAutomationFlowDims,
opts: TriggerMakerOptions,
) => {
const {
distanceFactor,
nodeHeight,
nodeWidth,
padding,
conditionHeight,
} = dims;
// convert all triggers to dag nodes
trigger.forEach((t, i) => {
const flowId = `t-${i}`;
flowData.nodes.push({
id: flowId,
type: 'dagnode',
data: {
label: t.alias ?? t.platform,
height: nodeHeight,
width: nodeWidth,
color: 'red',
onEditClick: () => opts.onEdit(i),
onXClick: () => opts.onDelete(i),
},
position: { x: padding.x, y: padding.y + nodeHeight * distanceFactor * i }
})
flowData.edges.push({
id: `e(${flowId})-(${toPoint})`,
source: flowId,
target: toPoint,
})
});
// create a 'add button'
flowData.nodes.push(makeAddButton(
'trigger-add',
{
x: padding.x + nodeWidth * 0.4,
y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length,
},
dims,
opts.onAdd
))
}
+46
View File
@@ -0,0 +1,46 @@
import { Edge, Node, XYPosition } from 'react-flow-renderer';
import { AutomationSequenceNode } from 'types/automations';
import { DAGCircleProps } from './DAGCircle';
import { DAGNodeProps } from './DAGNode';
import { AutomationTrigger } from 'types/automations/triggers';
import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
export type DAGAutomationFlowDims = {
padding: XYPosition;
nodeHeight: number;
nodeWidth: number;
conditionWidth: number;
conditionHeight: number;
circleSize: number;
distanceFactor: number;
}
export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | any>;
export type FlowData = {
nodes: DAGAutomationFlowNode[],
edges: Edge[],
}
export type TriggerMakerOptions = {
onAdd: () => void,
onEdit: (i: number) => void,
onDelete: (i: number) => void,
}
export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = (
s: ModalState<T>
) => void;
export type ModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = {
single: true,
node: T
update: (n: T) => void;
saveBtnCreateText?: boolean;
allowedTypes: MultiNodeEditorProps['allowedTypes'],
} | {
single: false,
node: AutomationSequenceNode[]
update: (n: AutomationSequenceNode[]) => void;
allowedTypes: ['condition']
}
Loaded 100 of 193 files, more files were not shown because too many files have changed in this diff. Show more