Compare commits
263
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
74cd85b0e8 | ||
|
|
c699d298bf | ||
|
|
ea45662ed9 | ||
|
|
67f5358f45 | ||
|
|
c40e441f33 | ||
|
|
a3ee13e8e3 | ||
|
|
a3fa409eda | ||
|
|
7ac7d60468 | ||
|
|
cb34db3c86 | ||
|
|
ea8697137a | ||
|
|
e9246a5b6c | ||
|
|
d121082d4f | ||
|
|
2605978b43 | ||
|
|
f5b21be26d | ||
|
|
582859b35b | ||
|
|
184734ee70 | ||
|
|
3a44057a40 | ||
|
|
ef02abe0cb | ||
|
|
1d52993253 | ||
|
|
50031c4868 | ||
|
|
b3dae6fea7 | ||
|
|
fd35938fcb | ||
|
|
649ee0f31e | ||
|
|
e7110dc97b | ||
|
|
dcf577f84c | ||
|
|
fabb5612d5 | ||
|
|
2958fa49f8 | ||
|
|
211f5d8be7 | ||
|
|
3dac905fda | ||
|
|
75d70b1133 | ||
|
|
47b0c89589 | ||
|
|
212349b4c0 | ||
|
|
a4789cf43e | ||
|
|
395a9d955e | ||
|
|
937a3f97c4 | ||
|
|
6bb18563b4 | ||
|
|
2a9ba678d3 | ||
|
|
38e362a469 | ||
|
|
b56b5fc184 | ||
|
|
1cce2d20f4 | ||
|
|
717fada35e | ||
|
|
ca4be32d63 | ||
|
|
ad4c1f66f2 | ||
|
|
4af6b1688a | ||
|
|
045ce75362 | ||
|
|
442a49da8b | ||
|
|
8e859ff191 | ||
|
|
3b1b88b404 | ||
|
|
8306686e4c | ||
|
|
6d67dd129c | ||
|
|
5086ecd993 | ||
|
|
bbb87ebf9e | ||
|
|
a1ca9d62b7 | ||
|
|
0e4e4783fa | ||
|
|
1719148c58 | ||
|
|
2ea96973ad | ||
|
|
a35e8e127f | ||
|
|
46a67b1395 | ||
|
|
6b465219a9 | ||
|
|
e769a8e798 | ||
|
|
d8a2dd53d5 | ||
|
|
4aedd9323b | ||
|
|
2fc984a3ae | ||
|
|
bbfc87a334 | ||
|
|
bbe6a5abf3 | ||
|
|
9dd23fd8e7 | ||
|
|
24b3beaf0a | ||
|
|
d55d86b177 | ||
|
|
32fc5bce07 | ||
|
|
45ace08cbe | ||
|
|
d4e2e2f1e5 | ||
|
|
50f1d2a42d | ||
|
|
58f18232b7 | ||
|
|
8bf25547eb | ||
|
|
07ab4b9089 | ||
|
|
89c7007612 | ||
|
|
de2307901b | ||
|
|
f392cf17fd | ||
|
|
595aa2dfa1 | ||
|
|
2d78319683 | ||
|
|
befe293f1c | ||
|
|
0b381a6e50 | ||
|
|
b4f46bec92 | ||
|
|
1661df888a | ||
|
|
0c5ef76f4b | ||
|
|
084a3585d0 | ||
|
|
2cb2e779d7 | ||
|
|
730c804c22 | ||
|
|
649c1fbdeb | ||
|
|
edb3dafe12 | ||
|
|
1d7b6e96c1 | ||
|
|
7483f2b65d | ||
|
|
e7dec306df | ||
|
|
f549993d3e | ||
|
|
d62c484f33 | ||
|
|
3cb6070aca | ||
|
|
e94151cf94 | ||
|
|
518563fddd | ||
|
|
34394feb9d | ||
|
|
e8b76039a9 | ||
|
|
8c1f29226b | ||
|
|
550795bf7f | ||
|
|
905a5ac4d7 | ||
|
|
d50674c8fe | ||
|
|
81f22ccd2a | ||
|
|
2b1b7526c3 | ||
|
|
6e534f446d | ||
|
|
b3b1126a12 | ||
|
|
cf9f24f41e | ||
|
|
897953b0db | ||
|
|
3fadcd94b6 | ||
|
|
a8229eb7bd | ||
|
|
72afaee719 | ||
|
|
9a171c880e | ||
|
|
7488ecc3ae | ||
|
|
d99512d6e5 | ||
|
|
e6e57be3ed | ||
|
|
47f57c313e | ||
|
|
dc3470fdf5 | ||
|
|
5bd5c5e445 | ||
|
|
869c23212b | ||
|
|
08f7ee2393 | ||
|
|
0088dd8448 | ||
|
|
4d9afbe26b | ||
|
|
9a43330501 | ||
|
|
6c78af45f6 | ||
|
|
1da9f44232 | ||
|
|
7b958f6c3b | ||
|
|
d08d091723 | ||
|
|
3371d6b95f | ||
|
|
c07e1aca49 | ||
|
|
cc2597c408 | ||
|
|
6da5a7592e | ||
|
|
fe4f0e9881 | ||
|
|
ff195796d8 | ||
|
|
fe2fd19be8 | ||
|
|
3b6b34f6e5 | ||
|
|
a39755d599 | ||
|
|
bb1d8c6492 | ||
|
|
8780d206c9 | ||
|
|
1d1d52480a | ||
|
|
ec7c28adba | ||
|
|
f120fcfd65 | ||
|
|
5e3e499c9d | ||
|
|
361bc9b7d6 | ||
|
|
4eccd75058 | ||
|
|
dc99d57964 | ||
|
|
7233c50492 | ||
|
|
e1fbb8103b | ||
|
|
7d28ffd761 | ||
|
|
a9905956d8 | ||
|
|
7836a5281a | ||
|
|
213dc1517d | ||
|
|
983753afe1 | ||
|
|
2da4d4b929 | ||
|
|
610a7c77b9 | ||
|
|
cd9bf9d8b7 | ||
|
|
3cb2725907 | ||
|
|
94ae295c9f | ||
|
|
f274f6281f | ||
|
|
d62835ba80 | ||
|
|
f7762b823b | ||
|
|
aa1fb2f499 | ||
|
|
ed07e35830 | ||
|
|
52ac28ffd2 | ||
|
|
ed9a5a9aa1 | ||
|
|
d6d47168e3 | ||
|
|
2f0f8f7dfe | ||
|
|
24093eb0b0 | ||
|
|
5a48007154 | ||
|
|
9a93b30f4b | ||
|
|
cdb12bfdcb | ||
|
|
f2e4b6802d | ||
|
|
b092d12dca | ||
|
|
dce5d0b260 | ||
|
|
e1c222aeb0 | ||
|
|
bd29cf6576 | ||
|
|
54f9b9c2f4 | ||
|
|
6722854700 | ||
|
|
939ec2dc99 | ||
|
|
4f05e64652 | ||
|
|
13ea3632e3 | ||
|
|
465e5a4268 | ||
|
|
eeaa64a8e7 | ||
|
|
3a1cee61b8 | ||
|
|
21dd880e37 | ||
|
|
218972ed5d | ||
|
|
451b3638bf | ||
|
|
3acbaf576d | ||
|
|
eaec599109 | ||
|
|
c6c1efddae | ||
|
|
ae352ff244 | ||
|
|
dde8d76772 | ||
|
|
34a4bd93bd | ||
|
|
7154f206b4 | ||
|
|
19a2d10a2f | ||
|
|
da699403df | ||
|
|
1496bc66ad | ||
|
|
debe48f2b4 | ||
|
|
4bada614b9 | ||
|
|
537bfe824b | ||
|
|
a25ec99cb1 | ||
|
|
8ac5bfdfed | ||
|
|
618a62affe | ||
|
|
1ce934fd54 | ||
|
|
ab8ecfeefb | ||
|
|
a32e365d86 | ||
|
|
04f3e6194f | ||
|
|
0b183353d3 | ||
|
|
0c9b0ec6e6 | ||
|
|
5bef962977 | ||
|
|
029df7932e | ||
|
|
6be6005531 | ||
|
|
326775848b | ||
|
|
736a6053ef | ||
|
|
f4a41331b1 | ||
|
|
15c97b81b4 | ||
|
|
0fc3ea6146 | ||
|
|
596c3363e7 | ||
|
|
529b5599e4 | ||
|
|
184d8a8584 | ||
|
|
f6ca454999 | ||
|
|
cdc5aa16b0 | ||
|
|
7b816c3fbf | ||
|
|
0cecae5faa | ||
|
|
c17783064c | ||
|
|
d824a93695 | ||
|
|
5207c48f8d | ||
|
|
b30f4ed59a | ||
|
|
e3a816f2c8 | ||
|
|
240f8faef7 | ||
|
|
651ba865b1 | ||
|
|
a3e9d19c45 | ||
|
|
942867d646 | ||
|
|
041c2f02d5 | ||
|
|
fb30d577aa | ||
|
|
c4a90fcd1c | ||
|
|
4c3b34195a | ||
|
|
78494ee74d | ||
|
|
d3fff074e5 | ||
|
|
0ee0a06737 | ||
|
|
61000f2ff1 | ||
|
|
ac1ee86cc7 | ||
|
|
c934a4afcb | ||
|
|
359958aada | ||
|
|
7a73af4434 | ||
|
|
55bb941399 | ||
|
|
afb765024d | ||
|
|
911f867518 | ||
|
|
25bb19dbe5 | ||
|
|
9960ce2909 | ||
|
|
c2fde70954 | ||
|
|
5ca9c4a361 | ||
|
|
c27f2d13f0 | ||
|
|
26c81effd6 | ||
|
|
e72c83b980 | ||
|
|
e222c42150 | ||
|
|
e7b88fc6f6 | ||
|
|
079f353dbf | ||
|
|
e6e51be5a5 | ||
|
|
3a6b21a117 | ||
|
|
f42df5a70f | ||
|
|
0c3e9b5ace |
No files matched your search
@@ -1,5 +1,4 @@
|
|||||||
webapp/node_modules
|
webapp/node_modules
|
||||||
webapp/build
|
|
||||||
webapp/.storybook
|
webapp/.storybook
|
||||||
webapp/.vscode
|
webapp/.vscode
|
||||||
webapp/.env.local
|
webapp/.env.local
|
||||||
|
|||||||
+92
-11
@@ -1,22 +1,70 @@
|
|||||||
name: "Manual Build"
|
name: Build
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
version:
|
version:
|
||||||
type: string
|
type: string
|
||||||
description: "Version Number"
|
description: "Version Number"
|
||||||
required: true
|
push:
|
||||||
|
branch: [main]
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
metadata:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
name: "${{ github.event.inputs.version }} / ${{ matrix.arch }}"
|
name: Metadata
|
||||||
strategy:
|
outputs:
|
||||||
matrix:
|
version: ${{ steps.version.outputs.VERSION }}
|
||||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Check out repository
|
- name: Check out repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- name: Get Version
|
||||||
|
id: version
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
if [ -z "${INPUT_VERSION}" ]; then
|
||||||
|
echo ::set-output name=VERSION::$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
|
||||||
|
else
|
||||||
|
echo ::set-output name=VERSION::${INPUT_VERSION}
|
||||||
|
fi
|
||||||
|
env:
|
||||||
|
INPUT_VERSION: ${{ github.event.inputs.version }}
|
||||||
|
- name: ${{ steps.version.outputs.VERSION }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
echo ${{ steps.version.outputs.VERSION }}
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
name: Build & Publish ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
||||||
|
if: github.event_name != 'pull_request'
|
||||||
|
needs:
|
||||||
|
- metadata
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
arch:
|
||||||
|
- "aarch64"
|
||||||
|
- "amd64"
|
||||||
|
- "armhf"
|
||||||
|
- "armv7"
|
||||||
|
- "i386"
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Cancel Previous Runs
|
||||||
|
uses: styfle/cancel-workflow-action@0.10.0
|
||||||
|
with:
|
||||||
|
all_but_latest: true
|
||||||
|
access_token: ${{ github.token }}
|
||||||
|
|
||||||
|
- name: Check out repository
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: Setup node
|
||||||
|
uses: actions/setup-node@v3
|
||||||
|
with:
|
||||||
|
node-version: 16
|
||||||
|
cache: "yarn"
|
||||||
|
cache-dependency-path: webapp/yarn.lock
|
||||||
|
|
||||||
- name: Login to DockerHub
|
- name: Login to DockerHub
|
||||||
uses: docker/login-action@v2.0.0
|
uses: docker/login-action@v2.0.0
|
||||||
@@ -24,10 +72,43 @@ jobs:
|
|||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Build & Push to Dockerhub
|
- name: "Save version number"
|
||||||
uses: home-assistant/builder@2022.03.1
|
run: echo "REACT_APP_BUILD_VERSION=${{ needs.metadata.outputs.version }}" > ./webapp/.env.production
|
||||||
|
|
||||||
|
- name: "Build Web"
|
||||||
|
run: cd webapp && yarn install && yarn build
|
||||||
|
|
||||||
|
- name: ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
||||||
|
uses: home-assistant/builder@2022.07.0
|
||||||
with:
|
with:
|
||||||
args: |
|
args: |
|
||||||
--${{ matrix.arch }} \
|
--${{ matrix.arch }} \
|
||||||
--version ${{ github.event.inputs.version }} \
|
--no-latest \
|
||||||
|
--version ${{ needs.metadata.outputs.version }} \
|
||||||
--target .
|
--target .
|
||||||
|
|
||||||
|
publish:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: "${{ github.event.inputs.version != '' }}"
|
||||||
|
needs:
|
||||||
|
- metadata
|
||||||
|
- deploy
|
||||||
|
name: Create Github Pre-Release
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
administration: write
|
||||||
|
steps:
|
||||||
|
- name: Pre-Release ${{ needs.metadata.outputs.version }}
|
||||||
|
uses: actions/github-script@v6
|
||||||
|
env:
|
||||||
|
VERSION: ${{ needs.metadata.outputs.version }}
|
||||||
|
CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
|
||||||
|
with:
|
||||||
|
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
script: |
|
||||||
|
github.rest.repos.createRelease({
|
||||||
|
owner: context.repo.owner,
|
||||||
|
repo: context.repo.repo,
|
||||||
|
tag_name: process.env.VERSION,
|
||||||
|
prerelease: true,
|
||||||
|
});
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
# 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
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
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)
|
|
||||||
|
|
||||||
publish:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs:
|
|
||||||
- metadata
|
|
||||||
name: Publish Github Release
|
|
||||||
steps:
|
|
||||||
- name: Publish Release ${{ needs.metadata.outputs.version }}
|
|
||||||
uses: actions/github-script@v6
|
|
||||||
env:
|
|
||||||
VERSION: ${{ needs.metadata.outputs.version }}
|
|
||||||
CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
|
|
||||||
with:
|
|
||||||
script: |
|
|
||||||
github.rest.repos.createRelease({
|
|
||||||
owner: context.repo.owner,
|
|
||||||
repo: context.repo.repo,
|
|
||||||
tag_name: process.env.VERSION,
|
|
||||||
});
|
|
||||||
@@ -1,12 +1,14 @@
|
|||||||
name: Test
|
name: Commit Tests
|
||||||
env:
|
|
||||||
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
|
||||||
push:
|
push:
|
||||||
branch: [main]
|
branch:
|
||||||
|
- main
|
||||||
|
paths:
|
||||||
|
- "webapp"
|
||||||
|
- "api"
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [main]
|
branch:
|
||||||
|
- main
|
||||||
jobs:
|
jobs:
|
||||||
metadata:
|
metadata:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@@ -42,7 +44,7 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v3
|
uses: actions/setup-python@v4
|
||||||
with:
|
with:
|
||||||
python-version: 3.9
|
python-version: 3.9
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
@@ -73,32 +75,3 @@ jobs:
|
|||||||
run: cd webapp && yarn install
|
run: cd webapp && yarn install
|
||||||
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
|
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
|
||||||
run: cd webapp && yarn ${{ matrix.action }}
|
run: cd webapp && yarn ${{ matrix.action }}
|
||||||
|
|
||||||
deploy:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
name: Build & Publish ${{ matrix.arch }}
|
|
||||||
needs:
|
|
||||||
- metadata
|
|
||||||
- nodejs
|
|
||||||
- python
|
|
||||||
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 }} \
|
|
||||||
--version ${{ needs.metadata.outputs.version }} \
|
|
||||||
--target .
|
|
||||||
@@ -1 +1,2 @@
|
|||||||
.vscode/*.log
|
.vscode/*.log
|
||||||
|
webapp/src/types/validators/index.test.ts
|
||||||
+66
-4
@@ -1,6 +1,70 @@
|
|||||||
# Changelog 
|
# Changelog 
|
||||||
|
|
||||||
## [0.1.14] - Material UI + Autocomplete v2
|
## [0.3.2] - Fixed Addon Image for arm-based devices
|
||||||
|
|
||||||
|
- Using hypercon instead of uvicorn (this losses the rust dependency which makes it easier to install on arm)
|
||||||
|
- Pre-building web assets outside of docker (this takes the image size down and speeds up instaltion of addon)
|
||||||
|
- Updated build scripts to actually fail installation when build/prep steps fail
|
||||||
|
- Ensured that builds for all architecture run successfully
|
||||||
|
- Re-worked github actions (quicker test phases)
|
||||||
|
|
||||||
|
## [0.3.1] - Increased Pagination + Restricted Repeat Node
|
||||||
|
|
||||||
|
- Increased pagination to display up to 10,000 autos for now
|
||||||
|
- Repeat node now has types
|
||||||
|
|
||||||
|
## [0.3.0] - Complete Refactor of Graphs
|
||||||
|
|
||||||
|
- Added visual support for
|
||||||
|
|
||||||
|
- Repeat Nodes
|
||||||
|
- Parallel Nodes
|
||||||
|
|
||||||
|
- Using collections for conditions & triggers
|
||||||
|
- Fixed several bugs with improper alerts
|
||||||
|
- Fixed graph breakage during zoom
|
||||||
|
- Support for enable/disable nodes in UI
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
## [0.1.22] - Many Visual improvements
|
||||||
|
|
||||||
|
- Deprecated several custom components in favor of mui.com
|
||||||
|
- Device Editor now has support for 99% of diplay types
|
||||||
|
- Condition Device is implemented
|
||||||
|
- Improved naming autogen for trigger & choose
|
||||||
|
|
||||||
|
## [0.1.21] - Service Editor
|
||||||
|
|
||||||
|
- first version of service editor
|
||||||
|
- reloading automations on save
|
||||||
|
|
||||||
|
## [0.1.20] - UI Bugfixes
|
||||||
|
|
||||||
|
- Using MUI elements for input time
|
||||||
|
- Added delay action / wait_on_triggers action
|
||||||
|
- Added enabled/disabled flag in node editor
|
||||||
|
- Optional flip vertical during desktop mode
|
||||||
|
- Fixed up modal clipping
|
||||||
|
|
||||||
|
## [0.1.19] - Vertical mobile mode
|
||||||
|
|
||||||
|
- in mobile mode we draw the graphs vertically now
|
||||||
|
|
||||||
|
## [0.1.17] - Websockets
|
||||||
|
|
||||||
|
- Connected to HA main websocket -- now we retrieve real-time information about
|
||||||
|
|
||||||
|
- Device names
|
||||||
|
- Entity names/ids
|
||||||
|
|
||||||
|
- Autocomplete for devices and entities
|
||||||
|
|
||||||
|
## [0.1.14] - Material UI + Autocomplete
|
||||||
|
|
||||||
- Brought some Material UI elements for input and text
|
- Brought some Material UI elements for input and text
|
||||||
- Autocomplete for tags
|
- Autocomplete for tags
|
||||||
@@ -20,7 +84,6 @@
|
|||||||
- Made the validators less strict in order to capture more edge cases that HA supports
|
- Made the validators less strict in order to capture more edge cases that HA supports
|
||||||
- Nicer auto-generated descriptions for some trigger nodes
|
- Nicer auto-generated descriptions for some trigger nodes
|
||||||
|
|
||||||
|
|
||||||
## [0.1.10] - More Bug Fixes
|
## [0.1.10] - More Bug Fixes
|
||||||
|
|
||||||
- Allowing null or undefined values for metadata fields
|
- Allowing null or undefined values for metadata fields
|
||||||
@@ -74,8 +137,7 @@
|
|||||||
## [0.0.9] - First Working Version
|
## [0.0.9] - First Working Version
|
||||||
|
|
||||||
- Instalable verion via github
|
- Instalable verion via github
|
||||||
- Initial POC done
|
- Initial POC done
|
||||||
|
|
||||||
|
|
||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
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).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
+7
-16
@@ -1,25 +1,20 @@
|
|||||||
# <--- Pre-Build Args -->
|
# <--- Pre-Build Args -->
|
||||||
ARG BUILD_ARCH
|
ARG BUILD_ARCH
|
||||||
|
|
||||||
# <--- Image Setup -->
|
# <--- Main Image -->
|
||||||
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
|
FROM python:3.9.13-slim-buster
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# <--- Post-Build Args -->
|
# <--- Post-Build Args -->
|
||||||
ARG BUILD_VERSION
|
ARG BUILD_VERSION
|
||||||
|
|
||||||
# <--- Environment Variables -->
|
# <--- Environment Variables -->
|
||||||
ENV HASSIO_TOKEN ""
|
|
||||||
ENV BUILD_VERSION $BUILD_VERSION
|
ENV BUILD_VERSION $BUILD_VERSION
|
||||||
ENV HASS_URL "http://supervisor/"
|
|
||||||
|
|
||||||
# <--- System Wide Dependencies -->
|
# <--- System Wide Dependencies -->
|
||||||
ENV LANG C.UTF-8
|
ENV LANG C.UTF-8
|
||||||
RUN apk add --no-cache \
|
RUN apt-get update -y && \
|
||||||
nodejs \
|
apt-get install -y gcc git build-essential libtool automake curl
|
||||||
npm \
|
|
||||||
build-base \
|
|
||||||
python3-dev
|
|
||||||
|
|
||||||
# <--- Scripts -->
|
# <--- Scripts -->
|
||||||
COPY docker/bin /app/bin
|
COPY docker/bin /app/bin
|
||||||
@@ -30,16 +25,12 @@ RUN /app/bin/prep.sh
|
|||||||
# <--- Python Dependencies -->
|
# <--- Python Dependencies -->
|
||||||
COPY api/setup.py /app/setup.py
|
COPY api/setup.py /app/setup.py
|
||||||
|
|
||||||
# <--- Webapp Build -->
|
|
||||||
COPY webapp/ /app/web-builder
|
|
||||||
RUN cd /app/web-builder && \
|
|
||||||
echo "REACT_APP_BUILD_VERSION=${BUILD_VERSION}" > /app/web-builder/.env.production
|
|
||||||
|
|
||||||
# <--- BUILD -->
|
# <--- BUILD -->
|
||||||
RUN /app/bin/build.sh /app /app/web-builder
|
RUN /app/bin/build.sh /app
|
||||||
|
|
||||||
# <--- Api Code -->
|
# <--- Api Code -->
|
||||||
COPY api/src /app/src
|
COPY api/src /app/src
|
||||||
|
COPY webapp/build /app/web
|
||||||
|
|
||||||
# <--- Ports -->
|
# <--- Ports -->
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
@@ -47,7 +38,7 @@ EXPOSE 8000
|
|||||||
# <--- Final -->
|
# <--- Final -->
|
||||||
LABEL \
|
LABEL \
|
||||||
io.hass.type="addon" \
|
io.hass.type="addon" \
|
||||||
io.hass.arch="armhf|aarch64|i386|amd64"
|
io.hass.arch="armhf|aarch64|i386|amd64|armv7"
|
||||||
|
|
||||||
ENTRYPOINT [ "/app/bin/run.sh" ]
|
ENTRYPOINT [ "/app/bin/run.sh" ]
|
||||||
CMD [ "/app" ]
|
CMD [ "/app" ]
|
||||||
|
|||||||
@@ -15,16 +15,17 @@ build-with-builder:
|
|||||||
-t /data
|
-t /data
|
||||||
|
|
||||||
build:
|
build:
|
||||||
|
cd webapp && yarn build
|
||||||
$(DC) build
|
$(DC) build
|
||||||
|
|
||||||
build-no-cache:
|
build-no-cache:
|
||||||
|
cd webapp && yarn buil
|
||||||
$(DC) build --no-cache
|
$(DC) build --no-cache
|
||||||
|
|
||||||
push:
|
push:
|
||||||
$(DC) push
|
$(DC) push
|
||||||
|
|
||||||
start:
|
start:
|
||||||
$(MAKE) build
|
|
||||||
$(DC) up -d
|
$(DC) up -d
|
||||||
sleep 1
|
sleep 1
|
||||||
$(DC) ps
|
$(DC) ps
|
||||||
|
|||||||
@@ -1,16 +1,39 @@
|
|||||||
# Shortumation 
|
# Shortumation 
|
||||||
|
|
||||||
[](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
|
[](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml)
|
||||||

|
|
||||||
| | Stable | amd64-edge | i386-edge | armv7-edge | aarch64-edge | armhf-edge |
|
| | Stable | Edge
|
||||||
| --- | --- | --- | --- | --- | --- | --- |
|
| --- | --- | ---
|
||||||
| Version |  |  |  |  |  |  |
|
| Version |  | 
|
||||||
|
|
||||||
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
|
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
|
||||||
|
|
||||||

|
Sort and organize your home-assistant automations using tags!
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
Utilize the auto-generated node descriptions to understand what your automation is doing! No more reading YAML to just understand what 1 node does!
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
|
||||||
|
More condense UI for service calls!
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
|
||||||
|
Visualize complex 'choose' or 'if/else' nodes
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
Visualize parallel nodes!
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
Visualize repeat nodes!
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
|
|
||||||
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
A [home-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/).
|
||||||
@@ -21,11 +44,11 @@ A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI
|
|||||||
- [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
|
- [X] Tags for automation organization
|
||||||
- [ ] Script Manager
|
- [X] Autocomplete fields for entities/devices
|
||||||
- [ ] Use secrets and global parameters
|
- [X] Visualize parallel/repeat/choose/if-else nodes
|
||||||
- [ ] Autocomplete fields for entities/devices
|
- [X] Autogenerate node names
|
||||||
- [ ] Autocomplete fields for template editor
|
- [ ] Clean error reporting
|
||||||
- [ ] Autocomplete fields for referencing scripts
|
- [ ] Script Editor
|
||||||
|
|
||||||
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
|
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
|
||||||
|
|
||||||
@@ -50,7 +73,7 @@ If this warning does not scare you or you still want to try things out, then tak
|
|||||||
|
|
||||||
**How is this different from Node-Red?**
|
**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)
|
> Node-Red is both an execution engine and an automation editor, which means that in order for your automations to run you have to have an additional component running and executing the automations. Shortumation simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database)
|
||||||
|
|
||||||
**Which HA Installation does this support?**
|
**Which HA Installation does this support?**
|
||||||
|
|
||||||
|
|||||||
+13
-16
@@ -1,17 +1,14 @@
|
|||||||
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:16)
|
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:17)
|
||||||
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:27)
|
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:28)
|
||||||
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:31)
|
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:32)
|
||||||
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:12)
|
read_details # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:10)
|
||||||
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:9)
|
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:10)
|
||||||
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:16)
|
websocket_endpoint # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/socket.py:9)
|
||||||
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:17)
|
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:18)
|
||||||
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:6)
|
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:19)
|
||||||
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:7)
|
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
|
||||||
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
|
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
|
||||||
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
|
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
|
||||||
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
|
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:11)
|
||||||
|
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:12)
|
||||||
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
|
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
-2
@@ -33,7 +33,7 @@ test:
|
|||||||
|
|
||||||
coverage:
|
coverage:
|
||||||
$(VENV_BIN)/coverage run -m unittest discover tests
|
$(VENV_BIN)/coverage run -m unittest discover tests
|
||||||
$(VENV_BIN)/coverage report -m --fail-under=90
|
$(VENV_BIN)/coverage report -m --fail-under=80
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
|
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
|
||||||
@@ -43,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 $(VENV_BIN)/uvicorn src.app:app --reload
|
USE_EXAMPLE_REPO=1 $(VENV_BIN)/hypercorn src.app:app --reload
|
||||||
+15
-14
@@ -5,24 +5,25 @@ setuptools.setup(
|
|||||||
python_requires=">=3.9",
|
python_requires=">=3.9",
|
||||||
install_requires=[
|
install_requires=[
|
||||||
"PyYAML==6.0",
|
"PyYAML==6.0",
|
||||||
"fastapi==0.70.0",
|
"fastapi==0.78.0",
|
||||||
"pydantic==1.8.2",
|
"pydantic==1.9.1",
|
||||||
"uvicorn[standard]==0.15.0",
|
"hypercorn==0.13.2",
|
||||||
"python-decouple==3.5",
|
"python-decouple==3.6",
|
||||||
|
"websockets==10.3"
|
||||||
],
|
],
|
||||||
extras_require={
|
extras_require={
|
||||||
"dev": [
|
"dev": [
|
||||||
"mypy==0.910",
|
"mypy==0.961",
|
||||||
"mypy-extensions==0.4.3",
|
"mypy-extensions==0.4.3",
|
||||||
"black==22.3.0",
|
"black==22.6.0",
|
||||||
"bandit==1.7.0",
|
"bandit==1.7.4",
|
||||||
"isort==5.9.3",
|
"isort==5.10.1",
|
||||||
"coverage==5.5",
|
"coverage==6.4.1",
|
||||||
"pre-commit==2.13.0",
|
"pre-commit==2.19.0",
|
||||||
"vulture==2.3",
|
"vulture==2.4",
|
||||||
"types-requests==2.25.6",
|
"types-requests==2.28.0",
|
||||||
"types-PyYAML==6.0.7",
|
"types-PyYAML==6.0.9",
|
||||||
"requests==2.27.0",
|
"requests==2.28.1",
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
+10
-5
@@ -3,16 +3,16 @@ 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 ORIGIN, ROOT_FOLDER
|
from src.env import API_PREFIX, ORIGIN, ROOT_FOLDER
|
||||||
|
|
||||||
from .routes import automations, details, ping
|
from .routes import automations, details, ping, socket
|
||||||
|
|
||||||
|
|
||||||
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
||||||
app = FastAPI()
|
app = FastAPI()
|
||||||
if (ROOT_FOLDER / "web").exists():
|
if (ROOT_FOLDER / "web").exists():
|
||||||
app.mount(
|
app.mount(
|
||||||
"/web",
|
f"{API_PREFIX}/web",
|
||||||
StaticFiles(
|
StaticFiles(
|
||||||
directory=ROOT_FOLDER / "web",
|
directory=ROOT_FOLDER / "web",
|
||||||
html=True,
|
html=True,
|
||||||
@@ -29,6 +29,11 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
|||||||
allow_headers=["*"],
|
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(
|
||||||
app.include_router(details.make_details_router(automation_mgr.hass_config), prefix="/details")
|
automations.make_automation_router(automation_mgr), prefix=f"{API_PREFIX}/automations"
|
||||||
|
)
|
||||||
|
app.include_router(
|
||||||
|
details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details"
|
||||||
|
)
|
||||||
|
app.include_router(socket.router, prefix=f"{API_PREFIX}/socket")
|
||||||
return app
|
return app
|
||||||
@@ -5,6 +5,7 @@ from src.api.types import (
|
|||||||
ListData,
|
ListData,
|
||||||
ListParams,
|
ListParams,
|
||||||
UpdateAutoRequest,
|
UpdateAutoRequest,
|
||||||
|
UpdateTags,
|
||||||
)
|
)
|
||||||
from src.automations.errors import FailedDeletion
|
from src.automations.errors import FailedDeletion
|
||||||
from src.automations.manager import AutomationManager
|
from src.automations.manager import AutomationManager
|
||||||
@@ -29,6 +30,10 @@ def make_automation_router(automations: AutomationManager) -> APIRouter:
|
|||||||
def upsert_auto(body: UpdateAutoRequest):
|
def upsert_auto(body: UpdateAutoRequest):
|
||||||
automations.update(body.index, body.data)
|
automations.update(body.index, body.data)
|
||||||
|
|
||||||
|
@router.post("/item/tags")
|
||||||
|
def update_tags(body: UpdateTags):
|
||||||
|
automations.update_tags(body.automation_id, body.tags)
|
||||||
|
|
||||||
@router.delete("/item")
|
@router.delete("/item")
|
||||||
def delete_auto(body: DeleteAutoRequest):
|
def delete_auto(body: DeleteAutoRequest):
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
from fastapi import APIRouter
|
from fastapi import APIRouter
|
||||||
|
|
||||||
from src.env import BUILD_VERSION, HASS_URL, HASSIO_TOKEN
|
from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
|
||||||
from src.hass_config import HassConfig
|
from src.hass_config import HassConfig
|
||||||
|
|
||||||
|
|
||||||
@@ -12,7 +12,7 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
|
|||||||
return {
|
return {
|
||||||
"version": BUILD_VERSION,
|
"version": BUILD_VERSION,
|
||||||
"hassio_token": HASSIO_TOKEN,
|
"hassio_token": HASSIO_TOKEN,
|
||||||
"hass_url": HASS_URL,
|
"hassio_url": HASSIO_WS,
|
||||||
"config": hass_config.get_configuration_path(),
|
"config": hass_config.get_configuration_path(),
|
||||||
"tags": hass_config.get_automation_tags_path(),
|
"tags": hass_config.get_automation_tags_path(),
|
||||||
"autos": hass_config.get_automation_path(),
|
"autos": hass_config.get_automation_path(),
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
import asyncio
|
||||||
|
import json
|
||||||
|
|
||||||
|
from fastapi import APIRouter, WebSocket, WebSocketDisconnect
|
||||||
|
|
||||||
|
from src.logger import get_logger
|
||||||
|
from src.ws_redirect import WSRedirector
|
||||||
|
|
||||||
|
router = APIRouter()
|
||||||
|
logger = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
@router.websocket("/api/websocket")
|
||||||
|
async def websocket_endpoint(websocket: WebSocket):
|
||||||
|
async def on_message(msg: str):
|
||||||
|
await websocket.send_text(msg)
|
||||||
|
|
||||||
|
conn = WSRedirector(
|
||||||
|
on_message=on_message,
|
||||||
|
)
|
||||||
|
|
||||||
|
async def wait_for_data():
|
||||||
|
while True:
|
||||||
|
try:
|
||||||
|
msg_str = await websocket.receive_text()
|
||||||
|
msg_d = json.loads(msg_str)
|
||||||
|
if msg_d.get("type") != "auth":
|
||||||
|
await conn.send(msg_str)
|
||||||
|
except WebSocketDisconnect:
|
||||||
|
logger.info("Websocket closed.")
|
||||||
|
await conn.close()
|
||||||
|
break
|
||||||
|
|
||||||
|
await websocket.accept()
|
||||||
|
|
||||||
|
await asyncio.gather(
|
||||||
|
conn.start(),
|
||||||
|
wait_for_data(),
|
||||||
|
)
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
from typing import Generic, List, TypeVar
|
from typing import Dict, Generic, List, TypeVar
|
||||||
|
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from pydantic.fields import Field
|
from pydantic.fields import Field
|
||||||
@@ -25,5 +25,10 @@ class UpdateAutoRequest(BaseModel):
|
|||||||
data: ExtenededAutomationData
|
data: ExtenededAutomationData
|
||||||
|
|
||||||
|
|
||||||
|
class UpdateTags(BaseModel):
|
||||||
|
automation_id: str = Field(description="Automation Id to update")
|
||||||
|
tags: Dict[str, str]
|
||||||
|
|
||||||
|
|
||||||
class DeleteAutoRequest(BaseModel):
|
class DeleteAutoRequest(BaseModel):
|
||||||
index: int = Field(description="Index of the automation to update")
|
index: int = Field(description="Index of the automation to update")
|
||||||
@@ -1,5 +1,8 @@
|
|||||||
class AutomationLoaderException(Exception):
|
class AutomationLoaderException(Exception):
|
||||||
pass
|
def __init__(self, *args: object, **kwargs) -> None:
|
||||||
|
super().__init__(
|
||||||
|
"".join(map(str, args)) + ",".join((f"{k}={v}" for k, v in kwargs.items())),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class InvalidAutomationFile(AutomationLoaderException):
|
class InvalidAutomationFile(AutomationLoaderException):
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
from typing import Iterator, List, Optional
|
from typing import Dict, Iterator, List, Optional
|
||||||
|
|
||||||
from src.automations.errors import FailedDeletion
|
from src.automations.errors import FailedDeletion, InvalidAutomationFile
|
||||||
from src.automations.types import AutomationData, ExtenededAutomationData
|
from src.automations.types import AutomationData, ExtenededAutomationData
|
||||||
from src.hass_config.loader import HassConfig
|
from src.hass_config.loader import HassConfig
|
||||||
|
|
||||||
@@ -22,32 +22,40 @@ class AutomationManager:
|
|||||||
continue
|
continue
|
||||||
if i >= offset + limit:
|
if i >= offset + limit:
|
||||||
break
|
break
|
||||||
yield from load_automation(auto, tags.get(i, {}))
|
yield from load_automation(auto, tags.get(auto.get("id", ""), {}))
|
||||||
|
|
||||||
def get(self, index: int) -> Optional[AutomationData]:
|
def get(self, index: int) -> Optional[ExtenededAutomationData]:
|
||||||
tags = self.hass_config.automation_tags
|
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 not isinstance(auto, dict):
|
||||||
|
raise InvalidAutomationFile(automation_index=i)
|
||||||
if i == index:
|
if i == index:
|
||||||
return next(load_automation(auto, tags.get(i, {})))
|
return next(load_automation(auto, tags.get(auto.get("id", ""), {})))
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def update(self, index: int, automation: ExtenededAutomationData):
|
def update(self, index: int, automation: ExtenededAutomationData):
|
||||||
tags = self.hass_config.automation_tags
|
tags = self.hass_config.automation_tags
|
||||||
automations: List[dict] = []
|
automations: List[dict] = []
|
||||||
updated = False
|
updated_index: Optional[int] = None
|
||||||
for i, orig_auto in enumerate(self.hass_config.automations):
|
for i, orig_auto in enumerate(self.hass_config.automations):
|
||||||
if i == index:
|
if i == index:
|
||||||
automations.append(automation.to_primitive())
|
automations.append(automation.to_primitive())
|
||||||
updated = True
|
updated_index = i
|
||||||
else:
|
else:
|
||||||
automations.append(orig_auto)
|
automations.append(orig_auto)
|
||||||
if not updated:
|
if updated_index is None:
|
||||||
automations.append(automation.to_primitive())
|
automations.append(automation.to_primitive())
|
||||||
tags[index] = automation.tags
|
updated_index = len(automations) - 1
|
||||||
|
tags[automation.metadata.id] = automation.tags
|
||||||
self.hass_config.save_automations(automations)
|
self.hass_config.save_automations(automations)
|
||||||
self.hass_config.save_tags(tags)
|
self.hass_config.save_tags(tags)
|
||||||
|
|
||||||
|
def update_tags(self, auto_id: str, tags: Dict[str, str]):
|
||||||
|
autos_tags = self.hass_config.automation_tags
|
||||||
|
autos_tags[auto_id] = tags
|
||||||
|
self.hass_config.save_tags(autos_tags)
|
||||||
|
|
||||||
def delete(self, index: int):
|
def delete(self, index: int):
|
||||||
automations: List[dict] = []
|
automations: List[dict] = []
|
||||||
deleted = False
|
deleted = False
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ from typing import Dict
|
|||||||
from src.yaml_serializer import dump_yaml, load_yaml
|
from src.yaml_serializer import dump_yaml, load_yaml
|
||||||
|
|
||||||
|
|
||||||
class TagManager(Dict[int, Dict[str, str]]):
|
class TagManager(Dict[str, Dict[str, str]]):
|
||||||
def save(self, path: Path):
|
def save(self, path: Path):
|
||||||
path.write_text(dump_yaml(dict(self)))
|
path.write_text(dump_yaml(dict(self)))
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
import argparse
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import Dict, List
|
||||||
|
|
||||||
|
import yaml
|
||||||
|
|
||||||
|
|
||||||
|
def convert_tags(automations: List[dict], tags: Dict[int, dict]) -> Dict[str, dict]:
|
||||||
|
converted = {}
|
||||||
|
for tagsIdx, tagValues in tags.items():
|
||||||
|
if tagsIdx < len(automations):
|
||||||
|
auto = automations[tagsIdx]
|
||||||
|
converted[auto["id"]] = tagValues
|
||||||
|
else:
|
||||||
|
print(f"WARN: tags index = {tagsIdx} is out of bounds")
|
||||||
|
return converted
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
parser = argparse.ArgumentParser()
|
||||||
|
parser.add_argument("-i", dest="input", required=True, type=Path)
|
||||||
|
args = parser.parse_args()
|
||||||
|
auto_path: Path = args.input / "automations.yaml"
|
||||||
|
tags_path: Path = args.input / ".shortumations" / "tags.yaml"
|
||||||
|
automations = yaml.safe_load(auto_path.read_text())
|
||||||
|
tags = yaml.safe_load(tags_path.read_text())
|
||||||
|
converted = convert_tags(automations, tags)
|
||||||
|
tags_path.write_text(yaml.dump(converted))
|
||||||
+3
-2
@@ -4,7 +4,8 @@ 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")
|
||||||
HASSIO_TOKEN = config("HASSIO_TOKEN", "")
|
HASSIO_TOKEN = config("SUPERVISOR_TOKEN", "")
|
||||||
HASS_URL = config("HASS_URL", "/")
|
HASSIO_WS = config("HASSIO_WS", "ws://supervisor/core/websocket")
|
||||||
LOG_LEVEL = config("LOG_LEVEL", "INFO")
|
LOG_LEVEL = config("LOG_LEVEL", "INFO")
|
||||||
|
API_PREFIX = config("API_PREFIX", "")
|
||||||
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
|
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
|
||||||
@@ -10,9 +10,12 @@ def find_hass_config() -> HassConfig:
|
|||||||
"""Try to find HASS config."""
|
"""Try to find HASS config."""
|
||||||
if config("USE_EXAMPLE_REPO", False, cast=bool):
|
if config("USE_EXAMPLE_REPO", False, cast=bool):
|
||||||
print("using USE_EXAMPLE_REPO")
|
print("using USE_EXAMPLE_REPO")
|
||||||
from tests.utils import create_copy_of_example_config
|
from tests.utils import (
|
||||||
|
HA_CONFIG3_EXAMPLE,
|
||||||
|
create_copy_of_example_config,
|
||||||
|
)
|
||||||
|
|
||||||
path = create_copy_of_example_config()
|
path = create_copy_of_example_config(HA_CONFIG3_EXAMPLE)
|
||||||
print("|-> ", path)
|
print("|-> ", path)
|
||||||
return HassConfig(path)
|
return HassConfig(path)
|
||||||
|
|
||||||
|
|||||||
@@ -14,3 +14,7 @@ else:
|
|||||||
logging.basicConfig(level=logging.NOTSET)
|
logging.basicConfig(level=logging.NOTSET)
|
||||||
|
|
||||||
logger = logging.getLogger()
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
def get_logger(name: str):
|
||||||
|
return logging.getLogger(name)
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
import asyncio
|
||||||
|
import json
|
||||||
|
from typing import Callable, Coroutine, Optional
|
||||||
|
|
||||||
|
from websockets.client import WebSocketClientProtocol, connect
|
||||||
|
from websockets.exceptions import ConnectionClosedOK
|
||||||
|
|
||||||
|
from src.env import HASSIO_TOKEN, HASSIO_WS
|
||||||
|
from src.logger import get_logger, logger
|
||||||
|
|
||||||
|
OnMessage = Callable[[str], Coroutine]
|
||||||
|
logger = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class WSRedirector:
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
on_message: OnMessage,
|
||||||
|
token: str = HASSIO_TOKEN,
|
||||||
|
host: str = HASSIO_WS,
|
||||||
|
) -> None:
|
||||||
|
self._host = host
|
||||||
|
self._token = token
|
||||||
|
self._on_message = on_message
|
||||||
|
self._client: Optional[WebSocketClientProtocol] = None
|
||||||
|
self._close: bool = False
|
||||||
|
|
||||||
|
@property
|
||||||
|
def is_closed(self):
|
||||||
|
return self._close
|
||||||
|
|
||||||
|
async def send(self, msg: str):
|
||||||
|
if self._client:
|
||||||
|
return await self._client.send(msg)
|
||||||
|
|
||||||
|
async def start(self):
|
||||||
|
async with connect(self._host) as websocket:
|
||||||
|
self._client = websocket
|
||||||
|
await websocket.send(json.dumps({"type": "auth", "access_token": self._token}))
|
||||||
|
while not self.is_closed:
|
||||||
|
try:
|
||||||
|
msg = await websocket.recv()
|
||||||
|
# logger.debug(f"HA MSG :--> {msg} {self.is_closed}")
|
||||||
|
await self.process_message(msg)
|
||||||
|
except ConnectionClosedOK:
|
||||||
|
pass
|
||||||
|
logger.info("Closing socket...")
|
||||||
|
await websocket.close()
|
||||||
|
logger.info("Closed socket")
|
||||||
|
|
||||||
|
async def process_message(self, msg: str):
|
||||||
|
await self._on_message(msg)
|
||||||
|
|
||||||
|
async def close(self):
|
||||||
|
self._close = True
|
||||||
|
await self._client.close()
|
||||||
|
|
||||||
|
def __del__(self):
|
||||||
|
asyncio.create_task(self.close())
|
||||||
@@ -9,12 +9,6 @@ from src.yaml_serializer.types import (
|
|||||||
|
|
||||||
class YamlSafeLoader(yaml.SafeLoader):
|
class YamlSafeLoader(yaml.SafeLoader):
|
||||||
pass
|
pass
|
||||||
# def compose_node(self, parent: yaml.nodes.Node, index: int) -> yaml.nodes.Node: # type: ignore[override]
|
|
||||||
# """Annotate a node with the first line it was seen."""
|
|
||||||
# last_line: int = self.line
|
|
||||||
# node: yaml.nodes.Node = super().compose_node(parent, index) # type: ignore[assignment]
|
|
||||||
# node.__line__ = last_line + 1 # type: ignore[attr-defined]
|
|
||||||
# return node
|
|
||||||
|
|
||||||
|
|
||||||
YamlSafeLoader.add_constructor("!include", IncludedYaml.from_yaml)
|
YamlSafeLoader.add_constructor("!include", IncludedYaml.from_yaml)
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
'1616887975473':
|
||||||
|
Type: HA
|
||||||
|
'1616888026264':
|
||||||
|
Type: HA
|
||||||
|
'1619371298367':
|
||||||
|
Room: Living
|
||||||
|
Type: Button
|
||||||
|
'1620239986670':
|
||||||
|
Room: Kitchen
|
||||||
|
Type: Button
|
||||||
|
'1620324780561':
|
||||||
|
Room: Kitchen
|
||||||
|
Type: Button
|
||||||
|
'1621352850204':
|
||||||
|
Room: Kitchen
|
||||||
|
Type: Button
|
||||||
|
'1622210698281':
|
||||||
|
Room: Kitchen
|
||||||
|
Type: Button
|
||||||
|
'1622769811245':
|
||||||
|
Room: Living
|
||||||
|
Type: Button
|
||||||
|
'1623430479201':
|
||||||
|
Room: Baby
|
||||||
|
Type: Button
|
||||||
|
'1623642118976':
|
||||||
|
Room: Baby
|
||||||
|
Type: Button
|
||||||
|
'1624640900951':
|
||||||
|
Room: Baby
|
||||||
|
Type: Button
|
||||||
|
'1628024070687':
|
||||||
|
Room: Baby
|
||||||
|
Type: Routine
|
||||||
|
'1628024123214':
|
||||||
|
Room: Baby
|
||||||
|
Type: Routine
|
||||||
|
'1628444671951':
|
||||||
|
Room: Office
|
||||||
|
Type: Window
|
||||||
|
'1629309267204':
|
||||||
|
Room: Balcony
|
||||||
|
Type: Door
|
||||||
|
'1629422438707':
|
||||||
|
Type: Routine
|
||||||
|
'1634497376234':
|
||||||
|
Room: Baby
|
||||||
|
Type: Button
|
||||||
|
'1635539262562':
|
||||||
|
Type: Routine
|
||||||
|
'1636428429596':
|
||||||
|
Type: Routine
|
||||||
|
'1639500650865':
|
||||||
|
Room: Bedroom
|
||||||
|
Type: Door
|
||||||
|
'1641617168123':
|
||||||
|
Type: Ensure Power
|
||||||
|
'1648071019802':
|
||||||
|
Type: Ensure Power
|
||||||
|
'1649426399020':
|
||||||
|
Room: Office
|
||||||
|
Type: Motion
|
||||||
|
'1649432254675':
|
||||||
|
Room: Baby
|
||||||
|
Type: Routine
|
||||||
|
'1649726828269':
|
||||||
|
Climate: Heat
|
||||||
|
Type: Climate
|
||||||
|
'1649727810678':
|
||||||
|
Climate: Time
|
||||||
|
Type: Climate
|
||||||
|
'1649820885714':
|
||||||
|
Type: Routine
|
||||||
|
'1649947692702':
|
||||||
|
BadOne: true
|
||||||
|
Room: Bedroom
|
||||||
|
Type: Button
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,2 @@
|
|||||||
|
# empty configuration file
|
||||||
|
cloud:
|
||||||
@@ -1,77 +1,77 @@
|
|||||||
0:
|
'1616887975473':
|
||||||
Type: HA
|
Type: HA
|
||||||
1:
|
'1616888026264':
|
||||||
Type: HA
|
Type: HA
|
||||||
2:
|
'1619371298367':
|
||||||
Type: Button
|
|
||||||
Room: Living
|
Room: Living
|
||||||
3:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1620239986670':
|
||||||
Room: Kitchen
|
Room: Kitchen
|
||||||
4:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1620324780561':
|
||||||
Room: Kitchen
|
Room: Kitchen
|
||||||
5:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1621352850204':
|
||||||
Room: Kitchen
|
Room: Kitchen
|
||||||
6:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1622210698281':
|
||||||
Room: Kitchen
|
Room: Kitchen
|
||||||
7:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1622769811245':
|
||||||
Room: Living
|
Room: Living
|
||||||
8:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1623430479201':
|
||||||
Room: Baby
|
Room: Baby
|
||||||
9:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1623642118976':
|
||||||
Room: Baby
|
Room: Baby
|
||||||
10:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1624640900951':
|
||||||
|
Room: Baby
|
||||||
|
Type: Button
|
||||||
|
'1628024070687':
|
||||||
Room: Baby
|
Room: Baby
|
||||||
11:
|
|
||||||
Type: Routine
|
Type: Routine
|
||||||
|
'1628024123214':
|
||||||
Room: Baby
|
Room: Baby
|
||||||
12:
|
|
||||||
Type: Routine
|
Type: Routine
|
||||||
Room: Baby
|
'1628444671951':
|
||||||
13:
|
Room: Office
|
||||||
Type: Window
|
Type: Window
|
||||||
Room: Office
|
'1629309267204':
|
||||||
14:
|
|
||||||
Type: Door
|
|
||||||
Room: Balcony
|
Room: Balcony
|
||||||
15:
|
|
||||||
Type: Routine
|
|
||||||
16:
|
|
||||||
Type: Button
|
|
||||||
Room: Baby
|
|
||||||
17:
|
|
||||||
Type: Routine
|
|
||||||
18:
|
|
||||||
Type: Routine
|
|
||||||
19:
|
|
||||||
Type: Door
|
Type: Door
|
||||||
Room: Bedroom
|
'1629422438707':
|
||||||
20:
|
|
||||||
Type: Ensure Power
|
|
||||||
21:
|
|
||||||
Type: Ensure Power
|
|
||||||
22:
|
|
||||||
Type: Motion
|
|
||||||
Room: Office
|
|
||||||
23:
|
|
||||||
Type: Routine
|
Type: Routine
|
||||||
|
'1634497376234':
|
||||||
Room: Baby
|
Room: Baby
|
||||||
24:
|
|
||||||
Type: Climate
|
|
||||||
Climate: Heat
|
|
||||||
25:
|
|
||||||
Type: Climate
|
|
||||||
Climate: Time
|
|
||||||
26:
|
|
||||||
Type: Routine
|
|
||||||
27:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1635539262562':
|
||||||
|
Type: Routine
|
||||||
|
'1636428429596':
|
||||||
|
Type: Routine
|
||||||
|
'1639500650865':
|
||||||
Room: Bedroom
|
Room: Bedroom
|
||||||
BadOne: yes
|
Type: Door
|
||||||
|
'1641617168123':
|
||||||
|
Type: Ensure Power
|
||||||
|
'1648071019802':
|
||||||
|
Type: Ensure Power
|
||||||
|
'1649426399020':
|
||||||
|
Room: Office
|
||||||
|
Type: Motion
|
||||||
|
'1649432254675':
|
||||||
|
Room: Baby
|
||||||
|
Type: Routine
|
||||||
|
'1649726828269':
|
||||||
|
Climate: Heat
|
||||||
|
Type: Climate
|
||||||
|
'1649727810678':
|
||||||
|
Climate: Time
|
||||||
|
Type: Climate
|
||||||
|
'1649820885714':
|
||||||
|
Type: Routine
|
||||||
|
'1649947692702':
|
||||||
|
BadOne: true
|
||||||
|
Room: Bedroom
|
||||||
|
Type: Button
|
||||||
@@ -100,3 +100,16 @@ class manager_tests(TestCase):
|
|||||||
self.assertEqual(manager.get_total_items(), 3)
|
self.assertEqual(manager.get_total_items(), 3)
|
||||||
with self.assertRaises(FailedDeletion):
|
with self.assertRaises(FailedDeletion):
|
||||||
manager.delete(10)
|
manager.delete(10)
|
||||||
|
|
||||||
|
def test_save_tags(self):
|
||||||
|
_, _, manager = get_dummy_automation_loader(
|
||||||
|
[
|
||||||
|
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
|
||||||
|
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
|
||||||
|
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
|
||||||
|
],
|
||||||
|
automation_in_conifguration_mode="none",
|
||||||
|
)
|
||||||
|
manager.update_tags("test1", {"room": "bathroom"})
|
||||||
|
auto = manager.get(0)
|
||||||
|
assert auto.tags == {"room": "bathroom"}
|
||||||
@@ -13,6 +13,7 @@ THIS_FOLDER = Path(__file__).parent
|
|||||||
SAMPLES_FOLDER = THIS_FOLDER / "samples"
|
SAMPLES_FOLDER = THIS_FOLDER / "samples"
|
||||||
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
|
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
|
||||||
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
|
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
|
||||||
|
HA_CONFIG3_EXAMPLE = SAMPLES_FOLDER / "config-3"
|
||||||
|
|
||||||
|
|
||||||
def get_example_automation_loader(
|
def get_example_automation_loader(
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import os
|
||||||
|
import yaml
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
print(Path().absolute())
|
||||||
|
|
||||||
|
CONFIG_YAML = Path("config.yaml").absolute()
|
||||||
|
CHANGELOG_MD = Path("CHANGELOG.md").absolute()
|
||||||
|
|
||||||
|
print(CONFIG_YAML)
|
||||||
|
print(CHANGELOG_MD)
|
||||||
|
|
||||||
|
version = os.environ["VERSION"]
|
||||||
|
version_name = os.environ["NAME"]
|
||||||
|
change = os.environ["CHANGELOG"].splitlines()
|
||||||
|
|
||||||
|
config = yaml.load(CONFIG_YAML.read_text(), yaml.Loader)
|
||||||
|
changelog = CHANGELOG_MD.read_text().splitlines()
|
||||||
|
|
||||||
|
with CHANGELOG_MD.open("w") as fp:
|
||||||
|
for i, log in enumerate(changelog):
|
||||||
|
if i == 2:
|
||||||
|
fp.write(f"## [{version}] - {version_name}\n\n")
|
||||||
|
for clog in change:
|
||||||
|
fp.write(f"- {clog.strip()}\n")
|
||||||
|
fp.write(log.strip() + "\n")
|
||||||
|
|
||||||
|
CONFIG_YAML.write_text(yaml.dump(config))
|
||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
name: Shortumation
|
name: Shortumation
|
||||||
version: v0.1.14
|
version: v0.3.2
|
||||||
slug: shortumation
|
slug: shortumation
|
||||||
image: ghcr.io/asosnovsky/shortumation-{arch}
|
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:
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
version: '3'
|
version: '3'
|
||||||
services:
|
services:
|
||||||
addon:
|
addon:
|
||||||
image: "ghcr.io/asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
|
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
|
||||||
build:
|
build:
|
||||||
context: "./"
|
context: "./"
|
||||||
dockerfile: "./Dockerfile"
|
dockerfile: "./Dockerfile"
|
||||||
|
|||||||
+4
-8
@@ -2,7 +2,7 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
api_location=${1}
|
api_location=${1}
|
||||||
web_location=${2}
|
# web_location=${2}
|
||||||
|
|
||||||
function install_yarn() {
|
function install_yarn() {
|
||||||
pushd $web_location
|
pushd $web_location
|
||||||
@@ -18,11 +18,7 @@ function install_py() {
|
|||||||
popd
|
popd
|
||||||
}
|
}
|
||||||
|
|
||||||
declare -i err=0 werr=0
|
install_py
|
||||||
install_py &
|
# install_yarn
|
||||||
install_yarn &
|
|
||||||
while wait -fn || werr=$?; ((werr != 127)); do
|
|
||||||
err=$werr
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "DONE BUILD"
|
echo "DONE BUILD"
|
||||||
+7
-8
@@ -2,18 +2,17 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
function prep_yarn() {
|
function prep_yarn() {
|
||||||
|
curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n
|
||||||
|
ln -s /usr/bin/nodejs /usr/bin/node
|
||||||
|
bash n lts
|
||||||
npm i -g yarn
|
npm i -g yarn
|
||||||
}
|
}
|
||||||
|
|
||||||
function prep_py() {
|
function prep_py() {
|
||||||
pip install -U wheel setuptools pip
|
pip install -U wheel setuptools pip Cython
|
||||||
}
|
}
|
||||||
|
|
||||||
declare -i err=0 werr=0
|
prep_py
|
||||||
prep_py &
|
# prep_yarn
|
||||||
prep_yarn &
|
|
||||||
while wait -fn || werr=$?; ((werr != 127)); do
|
|
||||||
err=$werr
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "DONE PREP"
|
echo "DONE PREP"
|
||||||
+1
-1
@@ -7,4 +7,4 @@ echo "--------------------"
|
|||||||
echo "BUILD_VERSION = "$BUILD_VERSION
|
echo "BUILD_VERSION = "$BUILD_VERSION
|
||||||
echo $(python --version)
|
echo $(python --version)
|
||||||
echo "--------------------"
|
echo "--------------------"
|
||||||
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
|
python -m hypercorn src.app:app -b "0.0.0.0:8000"
|
||||||
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"extends": ["config:base"],
|
||||||
|
"schedule": ["every month"],
|
||||||
|
"packageRules": [
|
||||||
|
{
|
||||||
|
"matchDepTypes": ["devDependencies"],
|
||||||
|
"matchUpdateTypes": ["patch", "minor"],
|
||||||
|
"groupName": "devDependencies (non-major)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
Vendored
+59
@@ -0,0 +1,59 @@
|
|||||||
|
{
|
||||||
|
"version": "2.0.0",
|
||||||
|
"tasks": [
|
||||||
|
{
|
||||||
|
"type": "npm",
|
||||||
|
"script": "tsc",
|
||||||
|
"problemMatcher": [],
|
||||||
|
"label": "npm: tsc",
|
||||||
|
"detail": "tsc -w",
|
||||||
|
"presentation": {
|
||||||
|
"reveal": "always",
|
||||||
|
"panel": "shared"
|
||||||
|
},
|
||||||
|
"runOptions": {
|
||||||
|
"runOn": "folderOpen"
|
||||||
|
},
|
||||||
|
"group": "test"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "npm",
|
||||||
|
"script": "test",
|
||||||
|
"problemMatcher": [],
|
||||||
|
"label": "npm: test",
|
||||||
|
"detail": "test",
|
||||||
|
"presentation": {
|
||||||
|
"reveal": "always",
|
||||||
|
"panel": "shared"
|
||||||
|
},
|
||||||
|
"runOptions": {
|
||||||
|
"runOn": "folderOpen"
|
||||||
|
},
|
||||||
|
"group": "test",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "npm",
|
||||||
|
"script": "storybook",
|
||||||
|
"problemMatcher": [],
|
||||||
|
"label": "npm: storybook",
|
||||||
|
"detail": "start-storybook -p 6006 -s public",
|
||||||
|
"promptOnClose": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "npm",
|
||||||
|
"script": "build",
|
||||||
|
"problemMatcher": [],
|
||||||
|
"label": "npm: build",
|
||||||
|
"detail": "react-scripts build",
|
||||||
|
"group": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "npm",
|
||||||
|
"script": "start",
|
||||||
|
"problemMatcher": [],
|
||||||
|
"label": "npm: start",
|
||||||
|
"detail": "react-scripts start",
|
||||||
|
"promptOnClose": true
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
+48
-44
@@ -4,32 +4,36 @@
|
|||||||
"private": true,
|
"private": true,
|
||||||
"homepage": ".",
|
"homepage": ".",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/react": "^11.9.0",
|
"@emotion/react": "11.9.3",
|
||||||
"@emotion/styled": "^11.8.1",
|
"@emotion/styled": "11.9.3",
|
||||||
"@mui/material": "^5.8.0",
|
"@mui/icons-material": "5.8.4",
|
||||||
"@mui/styles": "^5.8.0",
|
"@mui/material": "5.8.6",
|
||||||
"@types/jest": "^27.5.1",
|
"@mui/styles": "5.8.6",
|
||||||
"@types/node": "^17.0.36",
|
"@types/jest": "28.1.5",
|
||||||
"@types/react": "^18.0.9",
|
"@types/node": "17.0.36",
|
||||||
"@types/react-dom": "^18.0.5",
|
"@types/react": "18.0.15",
|
||||||
"@types/ws": "^8.5.3",
|
"@types/react-dom": "18.0.6",
|
||||||
"@uiw/react-codemirror": "^4.7.0",
|
"@types/ws": "8.5.3",
|
||||||
"autosuggest-highlight": "^3.2.1",
|
"@uiw/react-codemirror": "4.10.4",
|
||||||
"home-assistant-js-websocket": "^7.1.0",
|
"autosuggest-highlight": "3.3.2",
|
||||||
"jss": "^10.8.2",
|
"home-assistant-js-websocket": "7.1.0",
|
||||||
"notistack": "^2.0.5",
|
"jss": "10.9.0",
|
||||||
"react": "^18.1.0",
|
"material-ui-confirm": "3.0.4",
|
||||||
"react-dom": "^18.1.0",
|
"notistack": "2.0.5",
|
||||||
"react-flow-renderer": "^10.1.2",
|
"react": "18.2.0",
|
||||||
"react-jss": "^10.8.2",
|
"react-cookie": "4.1.1",
|
||||||
"react-router-dom": "6",
|
"react-dom": "18.2.0",
|
||||||
|
"react-flow-renderer": "10.3.8",
|
||||||
|
"react-imask": "6.4.2",
|
||||||
|
"react-jss": "10.9.0",
|
||||||
|
"react-router-dom": "6.3.0",
|
||||||
"react-scripts": "5.0.1",
|
"react-scripts": "5.0.1",
|
||||||
"superstruct": "^0.15.4",
|
"superstruct": "0.16.0",
|
||||||
"theming": "^3.3.0",
|
"theming": "3.3.0",
|
||||||
"typescript": "^4.1.2",
|
"typescript": "4.7.4",
|
||||||
"web-vitals": "^2.1.4",
|
"web-vitals": "2.1.4",
|
||||||
"ws": "^8.7.0",
|
"ws": "8.8.0",
|
||||||
"yarn": "^1.22.17"
|
"yarn": "1.22.19"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "react-scripts start",
|
"start": "react-scripts start",
|
||||||
@@ -72,25 +76,25 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@storybook/addon-actions": "^6.4.22",
|
"@storybook/addon-actions": "6.5.9",
|
||||||
"@storybook/addon-essentials": "^6.4.22",
|
"@storybook/addon-essentials": "6.5.9",
|
||||||
"@storybook/addon-links": "^6.4.22",
|
"@storybook/addon-links": "6.5.9",
|
||||||
"@storybook/addon-queryparams": "^6.2.9",
|
"@storybook/addon-queryparams": "6.2.9",
|
||||||
"@storybook/builder-webpack5": "^6.5.6",
|
"@storybook/builder-webpack5": "6.5.9",
|
||||||
"@storybook/manager-webpack5": "^6.5.6",
|
"@storybook/manager-webpack5": "6.5.9",
|
||||||
"@storybook/node-logger": "^6.4.22",
|
"@storybook/node-logger": "6.5.9",
|
||||||
"@storybook/preset-create-react-app": "^4.1.1",
|
"@storybook/preset-create-react-app": "4.1.2",
|
||||||
"@storybook/react": "^6.4.22",
|
"@storybook/react": "6.5.9",
|
||||||
"@testing-library/jest-dom": "^5.11.4",
|
"@testing-library/jest-dom": "5.16.4",
|
||||||
"@testing-library/react": "^13.3.0",
|
"@testing-library/react": "13.3.0",
|
||||||
"@testing-library/user-event": "^14.2.0",
|
"@testing-library/user-event": "14.2.1",
|
||||||
"@types/autosuggest-highlight": "^3.2.0",
|
"@types/autosuggest-highlight": "3.2.0",
|
||||||
"@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": "^28.1.0",
|
"jest-environment-jsdom": "28.1.2",
|
||||||
"ts-node": "^10.8.0",
|
"ts-node": "10.8.2",
|
||||||
"webpack": "^5.72.1",
|
"webpack": "5.73.0",
|
||||||
"webpack-dev-server": "^4.9.0"
|
"webpack-dev-server": "4.9.3"
|
||||||
},
|
},
|
||||||
"moduleDirectories": [
|
"moduleDirectories": [
|
||||||
"node_modules",
|
"node_modules",
|
||||||
|
|||||||
+8
-5
@@ -3,6 +3,7 @@ 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';
|
import { ErrorBoundary } from 'components/ErrorBoundary';
|
||||||
|
import { CookiesProvider } from "react-cookie";
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const api = useConnectedApiService();
|
const api = useConnectedApiService();
|
||||||
@@ -10,11 +11,13 @@ function App() {
|
|||||||
return (
|
return (
|
||||||
<div className="app">
|
<div className="app">
|
||||||
<ErrorBoundary>
|
<ErrorBoundary>
|
||||||
<BrowserRouter>
|
<CookiesProvider>
|
||||||
<Routes>
|
<BrowserRouter>
|
||||||
<Route path="*" element={<AutomationRoute api={api} />} />
|
<Routes>
|
||||||
</Routes>
|
<Route path="*" element={<AutomationRoute api={api} />} />
|
||||||
</BrowserRouter>
|
</Routes>
|
||||||
|
</BrowserRouter>
|
||||||
|
</CookiesProvider>
|
||||||
</ErrorBoundary>
|
</ErrorBoundary>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,27 +1,46 @@
|
|||||||
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_ITEM } from './paths';
|
import {
|
||||||
|
AUTOMTAION_LIST,
|
||||||
|
AUTOMTAION_ITEM,
|
||||||
|
AUTOMTAION_ITEM_TAGS,
|
||||||
|
} from "./paths";
|
||||||
|
|
||||||
export const makeAutomationAPI = (api: API) => ({
|
export const makeAutomationAPI = (api: API) => ({
|
||||||
async list({ offset, limit }: ListParams) {
|
async list({ offset, limit }: ListParams) {
|
||||||
const data = await api.makeCall<ListData<AutomationData>, ListParams>({
|
const data = await api.makeCall<ListData<AutomationData>, ListParams>({
|
||||||
path: AUTOMTAION_LIST,
|
path: AUTOMTAION_LIST,
|
||||||
data: {
|
data: {
|
||||||
offset, limit,
|
offset,
|
||||||
}
|
limit,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
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_ITEM,
|
path: AUTOMTAION_ITEM,
|
||||||
data: {
|
data: {
|
||||||
index,
|
index,
|
||||||
data: auto
|
data: auto,
|
||||||
},
|
},
|
||||||
})
|
});
|
||||||
|
},
|
||||||
|
async updateTags({
|
||||||
|
automation_id,
|
||||||
|
tags,
|
||||||
|
}: {
|
||||||
|
automation_id: string;
|
||||||
|
tags: Record<string, string>;
|
||||||
|
}) {
|
||||||
|
return await api.makeCall({
|
||||||
|
path: AUTOMTAION_ITEM_TAGS,
|
||||||
|
data: {
|
||||||
|
automation_id,
|
||||||
|
tags,
|
||||||
|
},
|
||||||
|
});
|
||||||
},
|
},
|
||||||
async remove({ index }: { index: number }) {
|
async remove({ index }: { index: number }) {
|
||||||
return await api.makeCall({
|
return await api.makeCall({
|
||||||
@@ -29,10 +48,9 @@ export const makeAutomationAPI = (api: API) => ({
|
|||||||
path: AUTOMTAION_ITEM,
|
path: AUTOMTAION_ITEM,
|
||||||
data: {
|
data: {
|
||||||
index,
|
index,
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
export type AutomationAPI = ReturnType<typeof makeAutomationAPI>;
|
export type AutomationAPI = ReturnType<typeof makeAutomationAPI>;
|
||||||
@@ -1,15 +1,16 @@
|
|||||||
import { useEffect } from 'react';
|
import { useEffect } from "react";
|
||||||
import { useDefaultApiState, makeReloadAutomations } from './util';
|
import { useDefaultApiState, makeReloadAutomations } from "./util";
|
||||||
import { AutomationAPI } from './automations';
|
import { AutomationAPI } from "./automations";
|
||||||
|
|
||||||
export type ApiService = ReturnType<typeof useAPIService>;
|
export type ApiService = ReturnType<typeof useAPIService>;
|
||||||
export const useAPIService = (
|
export const useAPIService = (automationAPI: AutomationAPI) => {
|
||||||
automationAPI: AutomationAPI
|
|
||||||
) => {
|
|
||||||
// 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(() => {
|
||||||
@@ -21,5 +22,6 @@ export const useAPIService = (
|
|||||||
state,
|
state,
|
||||||
removeAutomation: wrapCall(automationAPI.remove),
|
removeAutomation: wrapCall(automationAPI.remove),
|
||||||
updateAutomation: wrapCall(automationAPI.update),
|
updateAutomation: wrapCall(automationAPI.update),
|
||||||
}
|
updateTags: wrapCall(automationAPI.updateTags),
|
||||||
}
|
};
|
||||||
|
};
|
||||||
@@ -4,16 +4,15 @@ 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);
|
||||||
const baseURL = process.env.NODE_ENV === 'development' ?
|
const baseURL = new URL(
|
||||||
"http://localhost:8000" :
|
process.env.NODE_ENV === 'development' ?
|
||||||
(!locationPrefixWeb ? '' : locationPrefixWeb[1]);
|
`http://${window.location.hostname}:8000` :
|
||||||
|
window.location.origin + (!locationPrefixWeb ? '' : locationPrefixWeb[1])
|
||||||
export const remoteDetailsAPI = makeRemoteAPI(
|
|
||||||
baseURL + "/details"
|
|
||||||
);
|
);
|
||||||
|
export const wsURL = baseURL + "socket"
|
||||||
export const remoteAutoAPI = makeRemoteAPI(
|
export const remoteAutoAPI = makeRemoteAPI(
|
||||||
baseURL + "/automations"
|
baseURL + "automations"
|
||||||
);
|
);
|
||||||
export const useConnectedApiService = () => useAPIService(
|
export const useConnectedApiService = () => useAPIService(
|
||||||
makeAutomationAPI(remoteAutoAPI)
|
makeAutomationAPI(remoteAutoAPI)
|
||||||
|
|||||||
@@ -1,57 +1,93 @@
|
|||||||
import { useMockAPI } from "./mock"
|
import { useMockAPI } from "./mock";
|
||||||
import { makeAutomationAPI } from "./automations";
|
import { makeAutomationAPI } from "./automations";
|
||||||
import { createMockAuto } from '../utils/mocks';
|
import { createMockAuto } from "../utils/mocks";
|
||||||
|
import { AutomationData } from "types/automations";
|
||||||
|
|
||||||
const fakeUseRef = (a: any) => ({ current: a });
|
const fakeUseRef = (a: any) => ({ current: a });
|
||||||
|
|
||||||
test('mock api uses initial autos for initial population -- empty', async () => {
|
test("mock api uses initial autos for initial population -- empty", async () => {
|
||||||
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
|
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
|
||||||
const data = await mockApi.list({ limit: 10, offset: 0 });
|
const data = await mockApi.list({ limit: 10, offset: 0 });
|
||||||
expect(data.ok).toBe(true);
|
expect(data.ok).toBe(true);
|
||||||
expect((data as any).data.data).toHaveLength(0);
|
expect((data as any).data.data).toHaveLength(0);
|
||||||
expect((data as any).data.totalItems).toBe(0);
|
expect((data as any).data.totalItems).toBe(0);
|
||||||
})
|
});
|
||||||
|
|
||||||
test('mock api uses initial autos for initial population -- some data', async () => {
|
test("mock api uses initial autos for initial population -- some data", async () => {
|
||||||
const initials = [
|
const initials = [createMockAuto(), createMockAuto()];
|
||||||
createMockAuto(),
|
|
||||||
createMockAuto()
|
|
||||||
];
|
|
||||||
const mockApi = makeAutomationAPI(useMockAPI(initials, fakeUseRef as any));
|
const mockApi = makeAutomationAPI(useMockAPI(initials, fakeUseRef as any));
|
||||||
const data = await mockApi.list({ limit: 10, offset: 0 });
|
const data = await mockApi.list({ limit: 10, offset: 0 });
|
||||||
expect(data.ok).toBe(true);
|
expect(data.ok).toBe(true);
|
||||||
expect((data as any).data.data).toHaveLength(2);
|
expect((data as any).data.data).toHaveLength(2);
|
||||||
expect((data as any).data.totalItems).toBe(2);
|
expect((data as any).data.totalItems).toBe(2);
|
||||||
})
|
});
|
||||||
|
|
||||||
test('populate mock api with some data', async () => {
|
test("populate mock api with some data", async () => {
|
||||||
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
|
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
|
||||||
await mockApi.update({index: 0, auto: createMockAuto()})
|
await mockApi.update({ index: 0, auto: createMockAuto() });
|
||||||
let data = await mockApi.list({ limit: 10, offset: 0 });
|
let data = await mockApi.list({ limit: 10, offset: 0 });
|
||||||
expect(data.ok).toBe(true);
|
expect(data.ok).toBe(true);
|
||||||
expect((data as any).data.data).toHaveLength(1);
|
expect((data as any).data.data).toHaveLength(1);
|
||||||
expect((data as any).data.totalItems).toBe(1);
|
expect((data as any).data.totalItems).toBe(1);
|
||||||
await mockApi.update({index: 1, auto: createMockAuto()})
|
await mockApi.update({ index: 1, auto: createMockAuto() });
|
||||||
data = await mockApi.list({ limit: 10, offset: 0 });
|
data = await mockApi.list({ limit: 10, offset: 0 });
|
||||||
expect((data as any).data.data).toHaveLength(2);
|
expect((data as any).data.data).toHaveLength(2);
|
||||||
expect((data as any).data.totalItems).toBe(2);
|
expect((data as any).data.totalItems).toBe(2);
|
||||||
})
|
});
|
||||||
|
|
||||||
test('delete/update data from mock api', async () => {
|
test("delete/update data from mock api", async () => {
|
||||||
const mockApi = makeAutomationAPI(useMockAPI([
|
const mockApi = makeAutomationAPI(
|
||||||
createMockAuto(),
|
useMockAPI(
|
||||||
createMockAuto(),
|
[
|
||||||
createMockAuto(),
|
createMockAuto(),
|
||||||
createMockAuto(),
|
createMockAuto(),
|
||||||
createMockAuto(),
|
createMockAuto(),
|
||||||
], fakeUseRef as any));
|
createMockAuto(),
|
||||||
let data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data;
|
createMockAuto(),
|
||||||
|
],
|
||||||
|
fakeUseRef as any
|
||||||
|
)
|
||||||
|
);
|
||||||
|
let data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
|
||||||
const toBeEdited = data[0];
|
const toBeEdited = data[0];
|
||||||
toBeEdited.metadata.alias = "Bob is my uncle";
|
toBeEdited.metadata.alias = "Bob is my uncle";
|
||||||
await mockApi.update({index: 0, auto: toBeEdited})
|
await mockApi.update({ index: 0, auto: toBeEdited });
|
||||||
data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data;
|
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
|
||||||
expect(data[0].metadata.alias).toEqual("Bob is my uncle");
|
expect(data[0].metadata.alias).toEqual("Bob is my uncle");
|
||||||
await mockApi.remove({index: 0})
|
await mockApi.remove({ index: 0 });
|
||||||
data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data;
|
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
|
||||||
expect(data[0].metadata.alias === "Bob is my uncle").toEqual(false);
|
expect(data[0].metadata.alias === "Bob is my uncle").toEqual(false);
|
||||||
})
|
});
|
||||||
|
|
||||||
|
test("update tags from mock api", async () => {
|
||||||
|
const mockApi = makeAutomationAPI(
|
||||||
|
useMockAPI(
|
||||||
|
[
|
||||||
|
createMockAuto(),
|
||||||
|
createMockAuto(),
|
||||||
|
createMockAuto(),
|
||||||
|
createMockAuto(),
|
||||||
|
createMockAuto(),
|
||||||
|
],
|
||||||
|
fakeUseRef as any
|
||||||
|
)
|
||||||
|
);
|
||||||
|
let data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data
|
||||||
|
.data as AutomationData[];
|
||||||
|
const autoId = data[0].metadata.id;
|
||||||
|
expect(data[0].tags).toStrictEqual({});
|
||||||
|
mockApi.updateTags({
|
||||||
|
automation_id: autoId,
|
||||||
|
tags: {
|
||||||
|
room: "bathroom",
|
||||||
|
type: "popup",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data
|
||||||
|
.data as AutomationData[];
|
||||||
|
expect(data[0].metadata.id).toEqual(autoId);
|
||||||
|
expect(data[0].tags).toStrictEqual({
|
||||||
|
room: "bathroom",
|
||||||
|
type: "popup",
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,33 +1,34 @@
|
|||||||
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_ITEM } from './paths';
|
import {
|
||||||
|
AUTOMTAION_LIST,
|
||||||
|
AUTOMTAION_ITEM,
|
||||||
|
AUTOMTAION_ITEM_TAGS,
|
||||||
|
} from "./paths";
|
||||||
|
|
||||||
export const useMockAPI = (
|
export const useMockAPI = (
|
||||||
initialAutos: AutomationData[] = [],
|
initialAutos: AutomationData[] = [],
|
||||||
makeRef = useRef,
|
makeRef = useRef
|
||||||
): API => {
|
): API => {
|
||||||
const automationsRef = makeRef(initialAutos);
|
const automationsRef = makeRef(initialAutos);
|
||||||
return {
|
return {
|
||||||
async makeCall({
|
async makeCall({ path, method = "POST", data = {} }) {
|
||||||
path,
|
|
||||||
method = "POST",
|
|
||||||
data = {}
|
|
||||||
}) {
|
|
||||||
// console.debug("[[mockCall]]", method, path, data);
|
// console.debug("[[mockCall]]", method, path, data);
|
||||||
if (path === AUTOMTAION_LIST) {
|
if (path === AUTOMTAION_LIST) {
|
||||||
return {
|
return {
|
||||||
ok: true,
|
ok: true,
|
||||||
data: JSON.parse(JSON.stringify({
|
data: JSON.parse(
|
||||||
totalItems: automationsRef.current.length,
|
JSON.stringify({
|
||||||
params: { offset: 0, limit: 100 },
|
totalItems: automationsRef.current.length,
|
||||||
data: automationsRef.current,
|
params: { offset: 0, limit: 100 },
|
||||||
}))
|
data: automationsRef.current,
|
||||||
} as any
|
})
|
||||||
|
),
|
||||||
|
} as any;
|
||||||
}
|
}
|
||||||
if (path === AUTOMTAION_ITEM) {
|
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) {
|
||||||
automationsRef.current = [...automationsRef.current, auto];
|
automationsRef.current = [...automationsRef.current, auto];
|
||||||
@@ -35,29 +36,45 @@ export const useMockAPI = (
|
|||||||
automationsRef.current = [
|
automationsRef.current = [
|
||||||
...automationsRef.current.slice(0, index),
|
...automationsRef.current.slice(0, index),
|
||||||
auto,
|
auto,
|
||||||
...automationsRef.current.slice(index + 1)
|
...automationsRef.current.slice(index + 1),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
ok: true,
|
ok: true,
|
||||||
data: {}
|
data: {},
|
||||||
}
|
};
|
||||||
} else if (method === "DELETE") {
|
} else if (method === "DELETE") {
|
||||||
const { index } = data as any;
|
const { index } = data as any;
|
||||||
automationsRef.current = [
|
automationsRef.current = [
|
||||||
...automationsRef.current.slice(0, index),
|
...automationsRef.current.slice(0, index),
|
||||||
...automationsRef.current.slice(index + 1)
|
...automationsRef.current.slice(index + 1),
|
||||||
];
|
];
|
||||||
return {
|
return {
|
||||||
ok: true,
|
ok: true,
|
||||||
data: {}
|
data: {},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (path === AUTOMTAION_ITEM_TAGS) {
|
||||||
|
if (method === "POST") {
|
||||||
|
const { automation_id, tags } = data as any;
|
||||||
|
for (let i = 0; i < automationsRef.current.length; i++) {
|
||||||
|
const auto = automationsRef.current[i];
|
||||||
|
if (auto.metadata.id === automation_id) {
|
||||||
|
automationsRef.current[i].tags = JSON.parse(JSON.stringify(tags));
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
return {
|
||||||
|
ok: true,
|
||||||
|
data: {},
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
ok: false,
|
ok: false,
|
||||||
error: "PATH NOT FOUND " + method + ": " + path,
|
error: "PATH NOT FOUND " + method + ": " + path,
|
||||||
}
|
};
|
||||||
}
|
},
|
||||||
}
|
};
|
||||||
}
|
};
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
|
export const AUTOMTAION_ROOT = "/" as const;
|
||||||
|
|
||||||
export const AUTOMTAION_ROOT = '/' as const;
|
|
||||||
export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const;
|
export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const;
|
||||||
export const AUTOMTAION_ITEM = `${AUTOMTAION_ROOT}item` as const;
|
export const AUTOMTAION_ITEM = `${AUTOMTAION_ROOT}item` as const;
|
||||||
|
export const AUTOMTAION_ITEM_TAGS = `${AUTOMTAION_ITEM}/tags` as const;
|
||||||
@@ -1,42 +1,40 @@
|
|||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { ApiState } from "./types";
|
import { ApiState } from "./types";
|
||||||
import { AutomationAPI } from './automations';
|
import { AutomationAPI } from "./automations";
|
||||||
|
|
||||||
|
export const useDefaultApiState = () =>
|
||||||
|
useState<ApiState>({
|
||||||
export const useDefaultApiState = () => useState<ApiState>({
|
automations: { ready: false },
|
||||||
automations: {ready: false},
|
});
|
||||||
});
|
|
||||||
|
|
||||||
export const makeReloadAutomations = (
|
export const makeReloadAutomations = (
|
||||||
automationAPI: AutomationAPI,
|
automationAPI: AutomationAPI,
|
||||||
state: ApiState,
|
state: ApiState,
|
||||||
setState: (s: ApiState) => void,
|
setState: (s: ApiState) => void
|
||||||
) => {
|
) => {
|
||||||
const reload = async () => {
|
const reload = async () => {
|
||||||
let params = { offset: 0, limit: 100 };
|
let params = { offset: 0, limit: 10000 };
|
||||||
if (state.automations.ready && state.automations.ok) {
|
if (state.automations.ready && state.automations.ok) {
|
||||||
params = state.automations.data.params
|
params = state.automations.data.params;
|
||||||
}
|
}
|
||||||
const resp = await automationAPI.list(params);
|
const resp = await automationAPI.list(params);
|
||||||
setState({
|
setState({
|
||||||
...state, automations: {
|
...state,
|
||||||
ready: true,
|
automations: {
|
||||||
...resp,
|
ready: true,
|
||||||
}
|
...resp,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
const wrapCall = <
|
const wrapCall = <Call extends (a: any) => Promise<any>>(fcn: Call) => {
|
||||||
Call extends (a: any) => Promise<any>
|
|
||||||
>(fcn: Call) => {
|
|
||||||
return async (args: Parameters<Call>[0]): Promise<ReturnType<Call>> => {
|
return async (args: Parameters<Call>[0]): Promise<ReturnType<Call>> => {
|
||||||
const resp = await fcn(args);
|
const resp = await fcn(args);
|
||||||
await reload();
|
await reload();
|
||||||
return resp;
|
return resp;
|
||||||
}
|
};
|
||||||
}
|
};
|
||||||
return {
|
return {
|
||||||
reload,
|
reload,
|
||||||
wrapCall,
|
wrapCall,
|
||||||
}
|
};
|
||||||
}
|
};
|
||||||
@@ -1,34 +1,19 @@
|
|||||||
.automation-editor--info-box {
|
.automation-editor--info-box {
|
||||||
height: 100%;
|
|
||||||
padding-left: 10px;
|
|
||||||
padding-right: 10px;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: flex-start;
|
align-items: center;
|
||||||
overflow: hidden;
|
gap: 0.5em;
|
||||||
position: relative;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box-inner {
|
.automation-editor--info-box-inner {
|
||||||
height: 100%;
|
max-width: 95vw;
|
||||||
|
max-height: 90vh;
|
||||||
overflow: auto;
|
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 {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-editor--info-box--tags {
|
.automation-editor--info-box--tags {
|
||||||
padding: 0.25em 0.75em 1em 0.75em;
|
padding: 0.25em 0.75em 1em 0.75em;
|
||||||
border-color: var(--primary-accent);
|
border-color: var(--mui-grey-400);
|
||||||
border-width: 1px;
|
border-width: 1px;
|
||||||
border-style: ridge;
|
border-style: ridge;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
|
|||||||
@@ -1,40 +1,35 @@
|
|||||||
|
|
||||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
import { makeTagDB } from "components/AutomationList/TagDB";
|
import { makeTagDB } from "components/AutomationList/TagDB";
|
||||||
import { Page } from "components/Page";
|
import { Page } from "components/Page";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { AutoInfoBox } from "./AutoInfoBox";
|
import { AutoInfoBox } from "./AutoInfoBox";
|
||||||
import { defaultAutomation } from 'utils/defaults';
|
import { defaultAutomation } from "utils/defaults";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'App/AutomationList/Editor/InfoBox',
|
title: "App/AutomationList/Editor/InfoBox",
|
||||||
component: AutoInfoBox,
|
component: AutoInfoBox,
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||||
args: {
|
args: {
|
||||||
tagDB: makeTagDB([
|
tagDB: makeTagDB([defaultAutomation("test")]),
|
||||||
defaultAutomation("test")
|
},
|
||||||
])
|
|
||||||
}
|
|
||||||
} as ComponentMeta<typeof AutoInfoBox>;
|
} as ComponentMeta<typeof AutoInfoBox>;
|
||||||
|
|
||||||
|
export const NoTags: ComponentStory<typeof AutoInfoBox> = (args) => {
|
||||||
export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
|
const [[metadata, tags], setState] = useState([args.metadata, args.tags]);
|
||||||
const [[metadata, tags], setState] = useState([args.metadata, args.tags])
|
|
||||||
return (
|
return (
|
||||||
<Page>
|
<Page>
|
||||||
<AutoInfoBox
|
<AutoInfoBox
|
||||||
{...args}
|
{...args}
|
||||||
className=""
|
|
||||||
metadata={metadata}
|
metadata={metadata}
|
||||||
tags={tags}
|
tags={tags}
|
||||||
onUpdate={(m, t) => {
|
onUpdate={(m, t) => {
|
||||||
args.onUpdate(m, t)
|
args.onUpdate(m, t);
|
||||||
setState([m, t])
|
setState([m, t]);
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</Page>
|
</Page>
|
||||||
)
|
);
|
||||||
}
|
};
|
||||||
NoTags.args = {
|
NoTags.args = {
|
||||||
...NoTags.args,
|
...NoTags.args,
|
||||||
tags: [],
|
tags: [],
|
||||||
@@ -43,13 +38,13 @@ NoTags.args = {
|
|||||||
alias: "Random",
|
alias: "Random",
|
||||||
description: "Example Metadata",
|
description: "Example Metadata",
|
||||||
trigger_variables: {
|
trigger_variables: {
|
||||||
'wowo': '!'
|
wowo: "!",
|
||||||
},
|
},
|
||||||
mode: 'single',
|
mode: "single",
|
||||||
},
|
},
|
||||||
}
|
};
|
||||||
|
|
||||||
export const SomeTags: ComponentStory<typeof AutoInfoBox> = NoTags.bind({})
|
export const SomeTags: ComponentStory<typeof AutoInfoBox> = NoTags.bind({});
|
||||||
SomeTags.args = {
|
SomeTags.args = {
|
||||||
...SomeTags.args,
|
...SomeTags.args,
|
||||||
tags: [
|
tags: [
|
||||||
@@ -61,8 +56,8 @@ SomeTags.args = {
|
|||||||
alias: "Bathroom Vent",
|
alias: "Bathroom Vent",
|
||||||
description: "Turn the vent when the humidity is high",
|
description: "Turn the vent when the humidity is high",
|
||||||
trigger_variables: {
|
trigger_variables: {
|
||||||
'wowo': '!'
|
wowo: "!",
|
||||||
},
|
},
|
||||||
mode: 'single',
|
mode: "single",
|
||||||
},
|
},
|
||||||
}
|
};
|
||||||
@@ -2,14 +2,13 @@ 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 { FC, ReactNode, useRef, useState } from 'react';
|
import { FC, ReactNode, useRef, useState } from "react";
|
||||||
import { AddIcon, TrashIcon } from "components/Icons";
|
import { AddIcon, TrashIcon } from "components/Icons";
|
||||||
import { Button } from "components/Inputs/Button";
|
|
||||||
import InputAutoText from "components/Inputs/InputAutoText";
|
import InputAutoText from "components/Inputs/InputAutoText";
|
||||||
import { TagDB } from "components/AutomationList/TagDB";
|
import { TagDB } from "components/AutomationList/TagDB";
|
||||||
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
className: string;
|
|
||||||
metadata: AutomationMetadata;
|
metadata: AutomationMetadata;
|
||||||
tags: Array<[string, string]>;
|
tags: Array<[string, string]>;
|
||||||
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
|
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
|
||||||
@@ -20,127 +19,158 @@ export const AutoInfoBox: FC<Props> = ({
|
|||||||
metadata,
|
metadata,
|
||||||
tags,
|
tags,
|
||||||
onUpdate,
|
onUpdate,
|
||||||
className,
|
|
||||||
children,
|
children,
|
||||||
tagDB,
|
tagDB,
|
||||||
}) => {
|
}) => {
|
||||||
// state
|
// state
|
||||||
const [newTag, setNewTag] = useState<[string, string]>(["", ""])
|
const [newTag, setNewTag] = useState<[string, string]>(["", ""]);
|
||||||
const [[errorIndex, error], _setError] = useState<[number | 'new', string]>([-1, ""]);
|
const [[errorIndex, error], _setError] = useState<[number | "new", string]>([
|
||||||
|
-1,
|
||||||
|
"",
|
||||||
|
]);
|
||||||
const errorTimeoutId = useRef(-1);
|
const errorTimeoutId = useRef(-1);
|
||||||
|
|
||||||
// aliases
|
// aliases
|
||||||
const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n));
|
const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n));
|
||||||
const setError = (index: number | 'new', msg: string) => {
|
const setError = (index: number | "new", msg: string) => {
|
||||||
_setError([index, msg])
|
_setError([index, msg]);
|
||||||
if (errorTimeoutId.current >= 0) {
|
if (errorTimeoutId.current >= 0) {
|
||||||
window.clearTimeout(errorTimeoutId.current);
|
window.clearTimeout(errorTimeoutId.current);
|
||||||
}
|
}
|
||||||
errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000);
|
errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000);
|
||||||
}
|
};
|
||||||
const onUpdateMetadata = <K extends keyof AutomationMetadata>(k: K) => (update: AutomationMetadata[K]) => onUpdate({
|
const onUpdateMetadata =
|
||||||
...metadata,
|
<K extends keyof AutomationMetadata>(k: K) =>
|
||||||
[k]: update
|
(update: AutomationMetadata[K]) =>
|
||||||
}, tags);
|
onUpdate(
|
||||||
|
{
|
||||||
|
...metadata,
|
||||||
|
[k]: update,
|
||||||
|
},
|
||||||
|
tags
|
||||||
|
);
|
||||||
const validTagName = (newName: string): string | undefined => {
|
const validTagName = (newName: string): string | undefined => {
|
||||||
if (newName.length <= 0) {
|
if (newName.length <= 0) {
|
||||||
return "Name must be at least 1 character long"
|
return "Name must be at least 1 character long";
|
||||||
}
|
}
|
||||||
// eslint-disable-next-line
|
// eslint-disable-next-line
|
||||||
for (const [name, _] of tags) {
|
for (const [name, _] of tags) {
|
||||||
if (name.trim() === newName.trim()) {
|
if (name.trim() === newName.trim()) {
|
||||||
return `The tag '${name}' already exists`
|
return `The tag '${name}' already exists`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
const updateTagName = (newName: string, tagIndex: number) => {
|
const updateTagName = (newName: string, tagIndex: number) => {
|
||||||
const error = validTagName(newName);
|
const error = validTagName(newName);
|
||||||
if (error) {
|
if (error) {
|
||||||
return setError(tagIndex, error)
|
return setError(tagIndex, error);
|
||||||
}
|
}
|
||||||
onUpdate(metadata, [
|
onUpdate(metadata, [
|
||||||
...tags.slice(0, tagIndex),
|
...tags.slice(0, tagIndex),
|
||||||
[newName, tags[tagIndex][1]],
|
[newName, tags[tagIndex][1]],
|
||||||
...tags.slice(tagIndex + 1),
|
...tags.slice(tagIndex + 1),
|
||||||
])
|
]);
|
||||||
}
|
};
|
||||||
const onUpdateTags = (tagValue: string, tagIndex: number) => onUpdate(metadata, [
|
const onUpdateTags = (tagValue: string, tagIndex: number) =>
|
||||||
...tags.slice(0, tagIndex),
|
onUpdate(metadata, [
|
||||||
[tags[tagIndex][0], tagValue],
|
...tags.slice(0, tagIndex),
|
||||||
...tags.slice(tagIndex + 1),
|
[tags[tagIndex][0], tagValue],
|
||||||
])
|
...tags.slice(tagIndex + 1),
|
||||||
|
]);
|
||||||
const addNewTag = () => {
|
const addNewTag = () => {
|
||||||
const error = validTagName(newTag[0]);
|
const error = validTagName(newTag[0]);
|
||||||
if (error) {
|
if (error) {
|
||||||
return setError('new', error)
|
return setError("new", error);
|
||||||
}
|
}
|
||||||
onUpdate(metadata, tags.concat([
|
onUpdate(
|
||||||
newTag.map(x => x.trim()) as [string, string]
|
metadata,
|
||||||
]));
|
tags.concat([newTag.map((x) => x.trim()) as [string, string]])
|
||||||
setNewTag(['', '']);
|
);
|
||||||
}
|
setNewTag(["", ""]);
|
||||||
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [
|
};
|
||||||
...tags.slice(0, tagIndex),
|
const onRemoveTag = (tagIndex: number) =>
|
||||||
...tags.slice(tagIndex + 1),
|
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-inner">
|
<div className="automation-editor--info-box">
|
||||||
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} />
|
<div className="automation-editor--info-box-inner">
|
||||||
<InputText label="Name" value={metadata.alias ?? ""} onChange={onUpdateMetadata('alias')} />
|
<InputText
|
||||||
<InputText multiline label="Description" value={metadata.description ?? ""} onChange={onUpdateMetadata('description')} />
|
label="ID"
|
||||||
<InputList
|
value={metadata.id}
|
||||||
label="Mode"
|
onChange={onUpdateMetadata("id")}
|
||||||
current={metadata.mode}
|
/>
|
||||||
onChange={onUpdateMetadata('mode')}
|
<InputText
|
||||||
options={[
|
label="Name"
|
||||||
'parallel',
|
value={metadata.alias ?? ""}
|
||||||
'single',
|
onChange={onUpdateMetadata("alias")}
|
||||||
'queued',
|
/>
|
||||||
'restart'
|
<InputText
|
||||||
]}
|
multiline
|
||||||
/>
|
label="Description"
|
||||||
<div className="automation-editor--info-box--tags">
|
value={metadata.description ?? ""}
|
||||||
<h1>Tags</h1>
|
onChange={onUpdateMetadata("description")}
|
||||||
<div className="automation-editor--info-box--tag-list">
|
/>
|
||||||
{tags.map(([tagName, tagValue], tagIndex) => <div key={tagIndex} className="automation-editor--info-box--tag">
|
<InputList
|
||||||
|
label="Mode"
|
||||||
|
current={metadata.mode}
|
||||||
|
onChange={onUpdateMetadata("mode")}
|
||||||
|
options={["parallel", "single", "queued", "restart"]}
|
||||||
|
/>
|
||||||
|
<div className="automation-editor--info-box--tags">
|
||||||
|
<h1>Tags</h1>
|
||||||
|
<div className="automation-editor--info-box--tag-list">
|
||||||
|
{tags.map(([tagName, tagValue], tagIndex) => (
|
||||||
|
<div key={tagIndex} className="automation-editor--info-box--tag">
|
||||||
|
<InputAutoText
|
||||||
|
value={tagName}
|
||||||
|
label="Name"
|
||||||
|
onChange={(v) => updateTagName(v, tagIndex)}
|
||||||
|
options={foundNewTagNames}
|
||||||
|
error={errorIndex === tagIndex ? error : undefined}
|
||||||
|
/>
|
||||||
|
<InputAutoText
|
||||||
|
value={tagValue}
|
||||||
|
label="Tag"
|
||||||
|
onChange={(v) => onUpdateTags(v, tagIndex)}
|
||||||
|
options={tagDB.getTagValues(tagName)}
|
||||||
|
error={errorIndex === tagIndex ? error : undefined}
|
||||||
|
/>
|
||||||
|
<ButtonIcon
|
||||||
|
className="automation-editor--info-box--tag--trash"
|
||||||
|
onClick={() => onRemoveTag(tagIndex)}
|
||||||
|
icon={<TrashIcon />}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<hr />
|
||||||
|
<div className="automation-editor--info-box--tag">
|
||||||
<InputAutoText
|
<InputAutoText
|
||||||
value={tagName}
|
value={newTag[0]}
|
||||||
label="Name"
|
label="Name"
|
||||||
onChange={v => updateTagName(v, tagIndex)}
|
onChange={(v) => setNewTag([v, newTag[1]])}
|
||||||
options={foundNewTagNames}
|
options={foundNewTagNames}
|
||||||
error={errorIndex === tagIndex ? error : undefined}
|
error={errorIndex === "new" ? error : undefined}
|
||||||
/>
|
/>
|
||||||
<InputAutoText
|
<InputAutoText
|
||||||
value={tagValue}
|
value={newTag[1]}
|
||||||
label="Tag"
|
label="Tag"
|
||||||
onChange={v => onUpdateTags(v, tagIndex)}
|
onChange={(v) => setNewTag([newTag[0], v])}
|
||||||
options={tagDB.getTagValues(tagName)}
|
options={tagDB.getTagValues(newTag[0])}
|
||||||
error={errorIndex === tagIndex ? error : undefined}
|
error={errorIndex === "new" ? error : undefined}
|
||||||
/>
|
/>
|
||||||
<Button className="automation-editor--info-box--tag--trash" onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button>
|
<ButtonIcon
|
||||||
</div>)}
|
className="automation-editor--info-box--tag--add"
|
||||||
</div>
|
onClick={addNewTag}
|
||||||
<hr />
|
icon={<AddIcon />}
|
||||||
<div className="automation-editor--info-box--tag">
|
/>
|
||||||
<InputAutoText
|
</div>
|
||||||
value={newTag[0]}
|
|
||||||
label="Name"
|
|
||||||
onChange={v => setNewTag([v, newTag[1]])}
|
|
||||||
options={foundNewTagNames}
|
|
||||||
error={errorIndex === 'new' ? error : undefined}
|
|
||||||
/>
|
|
||||||
<InputAutoText
|
|
||||||
value={newTag[1]}
|
|
||||||
label="Tag"
|
|
||||||
onChange={v => setNewTag([newTag[0], v])}
|
|
||||||
options={tagDB.getTagValues(newTag[0])}
|
|
||||||
error={errorIndex === 'new' ? error : undefined}
|
|
||||||
/>
|
|
||||||
<Button className="automation-editor--info-box--tag--add" onClick={addNewTag} ><AddIcon /></Button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{children}
|
||||||
</div>
|
</div>
|
||||||
{children}
|
);
|
||||||
</div>
|
};
|
||||||
}
|
|
||||||
@@ -28,18 +28,55 @@
|
|||||||
.automation-editor--flow-wrapper--toolbar {
|
.automation-editor--flow-wrapper--toolbar {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
justify-content: flex-end;
|
gap: 0.25em;
|
||||||
|
justify-content: space-between;
|
||||||
|
margin-top: 0.25em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
|
.automation-editor--flow-wrapper--toolbar--title {
|
||||||
height: 0;
|
display: flex;
|
||||||
opacity: 0;
|
flex-direction: row;
|
||||||
|
justify-content: flex-start;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.25em;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--flow-wrapper--toolbar--title--text .id {
|
||||||
|
font-size: 0.75em;
|
||||||
|
max-width: 15em;
|
||||||
|
padding: 0;
|
||||||
|
margin: 0;
|
||||||
|
white-space: break-word;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
padding-bottom: 0.25em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
|
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--title--text {
|
||||||
border-color: var(--change);
|
min-width: 5em;
|
||||||
color: var(--change)
|
}
|
||||||
|
|
||||||
|
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--modes {
|
||||||
|
min-width: 6em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--modes .MuiSelect-select {
|
||||||
|
padding-left: 0.25em;
|
||||||
|
padding-right: 0.25em;
|
||||||
|
padding-top: 1.15em;
|
||||||
|
padding-bottom: 0.25em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--modes .MuiInputLabel-root {
|
||||||
|
font-size: 0.9em;
|
||||||
|
left: -0.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor.changed .automation-editor--flow-wrapper--toolbar--save-btn,
|
||||||
|
.automation-editor--info-box--buttons.changed .automation-editor--flow-wrapper--toolbar--save-btn {
|
||||||
|
border-color: var(--mui-success-light);
|
||||||
|
color: var(--mui-success-light);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -50,13 +87,13 @@
|
|||||||
padding: 0.25em;
|
padding: 0.25em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--flow {
|
.automation-editor--flow-wrapper.changed>.dag-graphboard {
|
||||||
border-color: var(--change);
|
border-color: var(--mui-success-light);
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--flow-wrapper--flow {
|
.dag-graphboard {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
border: 1px solid var(--secondary-accent);
|
border: 1px solid var(--mui-grey-700);
|
||||||
margin: 0 0 0.5em 0;
|
margin: 0 0 0.5em 0;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
}
|
}
|
||||||
@@ -65,18 +102,6 @@
|
|||||||
position: relative;
|
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-editor.loading .mock-list {
|
.automation-editor.loading .mock-list {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 0;
|
left: 0;
|
||||||
@@ -97,4 +122,9 @@
|
|||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--info-box--buttons {
|
||||||
|
display: flex;
|
||||||
|
gap: 1em;
|
||||||
}
|
}
|
||||||
@@ -1,100 +1,100 @@
|
|||||||
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 { useState } from 'react';
|
import { useState } from "react";
|
||||||
import * as dgconst from 'components/DAGFlow/constants';
|
|
||||||
import { Page } from "components/Page";
|
import { Page } from "components/Page";
|
||||||
import { makeTagDB } from "components/AutomationList/TagDB";
|
import { makeTagDB } from "components/AutomationList/TagDB";
|
||||||
|
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'App/AutomationList/Editor',
|
title: "App/AutomationList/Editor",
|
||||||
component: AutomationEditor,
|
component: AutomationEditor,
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||||
args: {
|
args: {
|
||||||
dims: dgconst.DEFAULT_DIMS,
|
dims: DEFAULT_DIMS,
|
||||||
}
|
},
|
||||||
} as ComponentMeta<typeof AutomationEditor>
|
} as ComponentMeta<typeof AutomationEditor>;
|
||||||
|
|
||||||
const Template: ComponentStory<typeof AutomationEditor> = args => {
|
const Template: ComponentStory<typeof AutomationEditor> = (args) => {
|
||||||
const [state, setState] = useState(args.automation)
|
const [state, setState] = useState(args.automation);
|
||||||
return <Page>
|
return (
|
||||||
<AutomationEditor
|
<Page>
|
||||||
{...args}
|
<AutomationEditor
|
||||||
tagDB={makeTagDB(state ? [state] : [])}
|
{...args}
|
||||||
automation={state}
|
tagDB={makeTagDB(state ? [state] : [])}
|
||||||
onUpdate={s => {
|
automation={state}
|
||||||
window.setTimeout(() => setState(s), 3000)
|
onUpdate={(s) => {
|
||||||
}}
|
window.setTimeout(() => setState(s), 3000);
|
||||||
/>
|
}}
|
||||||
</Page>
|
/>
|
||||||
}
|
</Page>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const Loading = Template.bind({});
|
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: [],
|
condition: [],
|
||||||
tags: {
|
tags: {
|
||||||
"Room": "Bathroom",
|
Room: "Bathroom",
|
||||||
"For": "Toliet",
|
For: "Toliet",
|
||||||
"Type": "Smell",
|
Type: "Smell",
|
||||||
"Use": "Flushing"
|
Use: "Flushing",
|
||||||
},
|
},
|
||||||
metadata: {
|
metadata: {
|
||||||
id: "random",
|
id:
|
||||||
|
"random" + String(Date.now()) + String(Date.now()) + String(Date.now()),
|
||||||
alias: "Random",
|
alias: "Random",
|
||||||
description: "Example Metadata",
|
description: "Example Metadata",
|
||||||
trigger_variables: {
|
trigger_variables: {
|
||||||
'wowo': '!'
|
wowo: "!",
|
||||||
},
|
},
|
||||||
mode: 'single',
|
mode: "single",
|
||||||
},
|
},
|
||||||
trigger: [
|
trigger: [
|
||||||
{
|
{
|
||||||
"platform": "numeric_state",
|
platform: "numeric_state",
|
||||||
"entity_id": "test",
|
entity_id: "test",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"platform": "homeassistant",
|
platform: "homeassistant",
|
||||||
"event": "start",
|
event: "start",
|
||||||
}
|
},
|
||||||
],
|
],
|
||||||
sequence: [
|
sequence: [
|
||||||
{
|
{
|
||||||
condition: 'and',
|
condition: "and",
|
||||||
conditions: [
|
conditions: [
|
||||||
{
|
{
|
||||||
condition: 'numeric_state',
|
condition: "numeric_state",
|
||||||
entity_id: 'sensor.temperature_kitchen',
|
entity_id: "sensor.temperature_kitchen",
|
||||||
below: '15',
|
below: "15",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
condition: 'template',
|
condition: "template",
|
||||||
value_template: 'states(switch.kitchen_light) == "on"'
|
value_template: 'states(switch.kitchen_light) == "on"',
|
||||||
}
|
},
|
||||||
]
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
alias: "Start Music In Kitchen",
|
alias: "Start Music In Kitchen",
|
||||||
service: 'media_player.play_media',
|
service: "media_player.play_media",
|
||||||
target: {
|
target: {
|
||||||
entity_id: "media_player.kitchen_dot"
|
entity_id: "media_player.kitchen_dot",
|
||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
media_content_id: "Good Morning",
|
media_content_id: "Good Morning",
|
||||||
media_content_type: "SPOTIFY",
|
media_content_type: "SPOTIFY",
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
]
|
],
|
||||||
}
|
},
|
||||||
}
|
};
|
||||||
|
|
||||||
|
export const EmptyStart = Template.bind({});
|
||||||
export const EmptyStart = Template.bind({})
|
|
||||||
EmptyStart.args = {
|
EmptyStart.args = {
|
||||||
...EmptyStart.args,
|
...EmptyStart.args,
|
||||||
automation: {
|
automation: {
|
||||||
@@ -105,31 +105,28 @@ EmptyStart.args = {
|
|||||||
alias: "Random",
|
alias: "Random",
|
||||||
description: "Example Metadata",
|
description: "Example Metadata",
|
||||||
trigger_variables: {
|
trigger_variables: {
|
||||||
'wowo': '!'
|
wowo: "!",
|
||||||
},
|
},
|
||||||
mode: 'single',
|
mode: "single",
|
||||||
},
|
},
|
||||||
trigger: [
|
trigger: [],
|
||||||
],
|
sequence: [],
|
||||||
sequence: []
|
},
|
||||||
}
|
};
|
||||||
}
|
|
||||||
|
|
||||||
export const BadAutomationInvalidMetadata = Template.bind({})
|
export const BadAutomationInvalidMetadata = Template.bind({});
|
||||||
BadAutomationInvalidMetadata.args = {
|
BadAutomationInvalidMetadata.args = {
|
||||||
...BadAutomationInvalidMetadata.args,
|
...BadAutomationInvalidMetadata.args,
|
||||||
automation: {
|
automation: {
|
||||||
condition: [],
|
condition: [],
|
||||||
tags: {},
|
tags: {},
|
||||||
metadata: {
|
metadata: {} as any,
|
||||||
} as any,
|
trigger: [],
|
||||||
trigger: [
|
sequence: [],
|
||||||
],
|
},
|
||||||
sequence: []
|
};
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export const BadAutomationInvalidTriggers = Template.bind({})
|
export const BadAutomationInvalidTriggers = Template.bind({});
|
||||||
BadAutomationInvalidTriggers.args = {
|
BadAutomationInvalidTriggers.args = {
|
||||||
...BadAutomationInvalidTriggers.args,
|
...BadAutomationInvalidTriggers.args,
|
||||||
automation: {
|
automation: {
|
||||||
@@ -140,18 +137,16 @@ BadAutomationInvalidTriggers.args = {
|
|||||||
alias: "Random",
|
alias: "Random",
|
||||||
description: "Example Metadata",
|
description: "Example Metadata",
|
||||||
trigger_variables: {
|
trigger_variables: {
|
||||||
'wowo': '!'
|
wowo: "!",
|
||||||
},
|
},
|
||||||
mode: 'single',
|
mode: "single",
|
||||||
},
|
},
|
||||||
trigger: [
|
trigger: ["haha I am a string"] as any,
|
||||||
"haha I am a string"
|
sequence: [],
|
||||||
] as any,
|
},
|
||||||
sequence: []
|
};
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export const BadAutomationInvalidSequence = Template.bind({})
|
export const BadAutomationInvalidSequence = Template.bind({});
|
||||||
BadAutomationInvalidSequence.args = {
|
BadAutomationInvalidSequence.args = {
|
||||||
...BadAutomationInvalidSequence.args,
|
...BadAutomationInvalidSequence.args,
|
||||||
automation: {
|
automation: {
|
||||||
@@ -162,15 +157,89 @@ BadAutomationInvalidSequence.args = {
|
|||||||
alias: "Bad Choose Sequence",
|
alias: "Bad Choose Sequence",
|
||||||
description: "Example Metadata",
|
description: "Example Metadata",
|
||||||
trigger_variables: {
|
trigger_variables: {
|
||||||
'wowo': '!'
|
wowo: "!",
|
||||||
},
|
},
|
||||||
mode: 'single',
|
mode: "single",
|
||||||
},
|
},
|
||||||
trigger: [],
|
trigger: [],
|
||||||
sequence: [
|
sequence: [
|
||||||
{
|
{
|
||||||
choose: {}
|
choose: {},
|
||||||
}
|
},
|
||||||
] as any
|
] as any,
|
||||||
}
|
},
|
||||||
}
|
};
|
||||||
|
|
||||||
|
export const RepeatExample = Template.bind({});
|
||||||
|
RepeatExample.args = {
|
||||||
|
...RepeatExample.args,
|
||||||
|
automation: {
|
||||||
|
metadata: {
|
||||||
|
id: "1654976151462",
|
||||||
|
alias: "Get out of baby room",
|
||||||
|
description: "",
|
||||||
|
mode: "single",
|
||||||
|
},
|
||||||
|
trigger: [
|
||||||
|
{
|
||||||
|
type: "opened",
|
||||||
|
platform: "device",
|
||||||
|
device_id: "9b33663d2700da8efe0c31c946448f77",
|
||||||
|
entity_id: "binary_sensor.door_baby",
|
||||||
|
domain: "binary_sensor",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
condition: [],
|
||||||
|
sequence: [
|
||||||
|
{
|
||||||
|
service: "notify.mobile_app_levas_phone",
|
||||||
|
data: {
|
||||||
|
message: "Someone is in Korie’s room!!!",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
repeat: {
|
||||||
|
while: [
|
||||||
|
{
|
||||||
|
type: "is_open",
|
||||||
|
condition: "device",
|
||||||
|
device_id: "9b33663d2700da8efe0c31c946448f77",
|
||||||
|
entity_id: "binary_sensor.door_baby",
|
||||||
|
domain: "binary_sensor",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
sequence: [
|
||||||
|
{
|
||||||
|
service: "notify.alexa_media",
|
||||||
|
data: {
|
||||||
|
message:
|
||||||
|
"Get the fuck out of the baby’s bedroom you sick fuck! This room belongs to Korie! Close the door! I said close. The. Door!",
|
||||||
|
data: null,
|
||||||
|
type: "tts",
|
||||||
|
target: "media_player.baby_bedroom_dot",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
delay: {
|
||||||
|
hours: 0,
|
||||||
|
minutes: 0,
|
||||||
|
seconds: 7,
|
||||||
|
milliseconds: 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
service: "light.turn_off",
|
||||||
|
target: {
|
||||||
|
entity_id: ["light.switch_baby"],
|
||||||
|
},
|
||||||
|
data: {
|
||||||
|
flash: "short",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
tags: {},
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -1,22 +1,28 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
import { ArrowIcon, CheckMarkIcon } from "components/Icons";
|
import Icon from "@mui/material/Icon";
|
||||||
|
import { CheckMarkIcon } from "components/Icons";
|
||||||
import { FC, useState } from "react";
|
import { FC, useState } from "react";
|
||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
|
import { Modal } from "components/Modal";
|
||||||
import { AutoInfoBox } from "./AutoInfoBox";
|
import { AutoInfoBox } from "./AutoInfoBox";
|
||||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
import ModeEditOutlineTwoToneIcon from "@mui/icons-material/ModeEditOutlineTwoTone";
|
||||||
import { Button } from "components/Inputs/Button";
|
import { Button } from "components/Inputs/Button";
|
||||||
import { useAutomatioEditorState, EditorData } from './state';
|
import { useAutomatioEditorState, EditorData } from "./state";
|
||||||
import { SafeDAGAutomationFlow } from "components/DAGFlow/safe";
|
import { MiniFailure } from "types/validators/helper";
|
||||||
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
|
|
||||||
import { MiniFailure } from 'types/validators/helper';
|
|
||||||
import InputYaml from "components/Inputs/InputYaml";
|
import InputYaml from "components/Inputs/InputYaml";
|
||||||
import { TagDB } from "components/AutomationList/TagDB";
|
import { TagDB } from "components/AutomationList/TagDB";
|
||||||
import Skeleton from "@mui/material/Skeleton";
|
import Skeleton from "@mui/material/Skeleton";
|
||||||
import LinearProgress from "@mui/material/LinearProgress";
|
import LinearProgress from "@mui/material/LinearProgress";
|
||||||
|
import { useCookies } from "react-cookie";
|
||||||
|
import { DAGDims } from "components/DAGGraph/elements/types";
|
||||||
|
import { DAGAutomationGraph } from "components/DAGGraph";
|
||||||
|
import { InputList } from "components/Inputs/InputList";
|
||||||
|
import { InputTextView } from "components/Inputs/InputTextView";
|
||||||
|
import { ControlButton } from "react-flow-renderer";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
automation?: AutomationData;
|
automation?: AutomationData;
|
||||||
dims: DAGAutomationFlowDims;
|
dims: DAGDims;
|
||||||
onUpdate: (auto: AutomationData) => void;
|
onUpdate: (auto: AutomationData) => void;
|
||||||
tagDB: TagDB;
|
tagDB: TagDB;
|
||||||
}
|
}
|
||||||
@@ -37,117 +43,253 @@ export const AutomationEditor: FC<Props> = ({
|
|||||||
save,
|
save,
|
||||||
saveAndUpdate,
|
saveAndUpdate,
|
||||||
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
|
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
|
||||||
|
const [infoBoxOpen, setInfoBox] = useState(false);
|
||||||
const [closeInfo, setCloseInfo] = useState(false);
|
const [
|
||||||
|
{ ckFlipped },
|
||||||
|
setCookies,
|
||||||
|
// eslint-disable-next-line
|
||||||
|
_,
|
||||||
|
] = useCookies(["ckFlipped"]);
|
||||||
|
// alias
|
||||||
|
const flipped = dims.flipped ? true : ckFlipped === "1";
|
||||||
|
const setFlipped = (v: boolean) => setCookies("ckFlipped", v ? "1" : "0");
|
||||||
// render
|
// render
|
||||||
if (state.status === 'loading') {
|
if (state.status === "loading") {
|
||||||
return <div className="automation-editor loading">
|
return (
|
||||||
<LinearProgress className="linear-loader" />
|
<div className="automation-editor loading">
|
||||||
<Skeleton className="mock-list" variant="rectangular" />
|
<LinearProgress className="linear-loader" />
|
||||||
<Skeleton className="mock-graph" variant="rectangular" />
|
<Skeleton className="mock-list" variant="rectangular" />
|
||||||
</div>
|
<Skeleton className="mock-graph" variant="rectangular" />
|
||||||
}
|
|
||||||
if (state.status === 'invalid') {
|
|
||||||
return <ValidationBox
|
|
||||||
failures={state.failures}
|
|
||||||
data={state.data}
|
|
||||||
validate={validate}
|
|
||||||
onSave={saveAndUpdate}
|
|
||||||
/>
|
|
||||||
}
|
|
||||||
return <div className="automation-editor">
|
|
||||||
{state.status === 'saving' && <LinearProgress className="linear-loader" />}
|
|
||||||
<AutoInfoBox
|
|
||||||
className={closeInfo ? "hide" : "show"}
|
|
||||||
metadata={state.data.metadata}
|
|
||||||
tags={state.data.tags}
|
|
||||||
onUpdate={updateMetadata}
|
|
||||||
tagDB={tagDB}
|
|
||||||
>
|
|
||||||
<ButtonIcon
|
|
||||||
className="automation-editor--info-box--icon"
|
|
||||||
onClick={() => setCloseInfo(!closeInfo)}
|
|
||||||
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
|
|
||||||
Icon={ArrowIcon}
|
|
||||||
/>
|
|
||||||
</AutoInfoBox>
|
|
||||||
|
|
||||||
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
|
|
||||||
<div className="automation-editor--flow-wrapper--toolbar">
|
|
||||||
<Button
|
|
||||||
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
|
|
||||||
onClick={save}
|
|
||||||
disabled={state.status !== 'changed'}
|
|
||||||
>
|
|
||||||
Save <CheckMarkIcon color="#bf4" />
|
|
||||||
</Button>
|
|
||||||
</div>
|
</div>
|
||||||
<SafeDAGAutomationFlow
|
);
|
||||||
className="automation-editor--flow-wrapper--flow"
|
}
|
||||||
sequence={state.data.sequence}
|
if (state.status === "invalid") {
|
||||||
trigger={state.data.trigger}
|
return (
|
||||||
condition={state.data.condition}
|
<ValidationBox
|
||||||
onSequenceUpdate={updateSequence}
|
failures={state.failures}
|
||||||
onTriggerUpdate={updateTrigger}
|
data={state.data}
|
||||||
onConditionUpdate={updateCondition}
|
validate={validate}
|
||||||
dims={dims}
|
onSave={saveAndUpdate}
|
||||||
/>
|
/>
|
||||||
</div>
|
);
|
||||||
</div>
|
}
|
||||||
}
|
return (
|
||||||
|
<div className={["automation-editor", state.status].join(" ")}>
|
||||||
|
{state.status === "saving" && (
|
||||||
|
<LinearProgress className="linear-loader" />
|
||||||
|
)}
|
||||||
|
<Modal open={infoBoxOpen}>
|
||||||
|
<AutoInfoBox
|
||||||
|
metadata={state.data.metadata}
|
||||||
|
tags={state.data.tags}
|
||||||
|
onUpdate={updateMetadata}
|
||||||
|
tagDB={tagDB}
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
className={[
|
||||||
|
"automation-editor--info-box--buttons",
|
||||||
|
state.status,
|
||||||
|
].join(" ")}
|
||||||
|
>
|
||||||
|
<Button onClick={() => setInfoBox(false)}>Close</Button>
|
||||||
|
<Button
|
||||||
|
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
|
||||||
|
onClick={save}
|
||||||
|
disabled={state.status !== "changed"}
|
||||||
|
>
|
||||||
|
Save <CheckMarkIcon color="#bf4" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</AutoInfoBox>
|
||||||
|
</Modal>
|
||||||
|
|
||||||
|
<div
|
||||||
|
className={["automation-editor--flow-wrapper", state.status].join(" ")}
|
||||||
|
>
|
||||||
|
<div className="automation-editor--flow-wrapper--toolbar">
|
||||||
|
<div className="automation-editor--flow-wrapper--toolbar--title">
|
||||||
|
<span className="automation-editor--flow-wrapper--toolbar--title--text">
|
||||||
|
<div className="id">{state.data.metadata.id}</div>
|
||||||
|
<InputTextView
|
||||||
|
value={state.data.metadata.alias ?? ""}
|
||||||
|
placeholder="Name"
|
||||||
|
onChange={(alias) =>
|
||||||
|
updateMetadata(
|
||||||
|
{
|
||||||
|
...state.data.metadata,
|
||||||
|
alias,
|
||||||
|
},
|
||||||
|
state.data.tags
|
||||||
|
)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
<InputList
|
||||||
|
fullWidth={false}
|
||||||
|
label="Mode"
|
||||||
|
className="automation-editor--flow-wrapper--toolbar--modes"
|
||||||
|
current={{
|
||||||
|
id: state.data.metadata.mode,
|
||||||
|
label: "",
|
||||||
|
}}
|
||||||
|
onChange={({ id }) =>
|
||||||
|
updateMetadata(
|
||||||
|
{
|
||||||
|
...state.data.metadata,
|
||||||
|
mode: id,
|
||||||
|
},
|
||||||
|
state.data.tags
|
||||||
|
)
|
||||||
|
}
|
||||||
|
getKey={({ id }) => id}
|
||||||
|
getDescription={({ label }) => label}
|
||||||
|
options={[
|
||||||
|
{
|
||||||
|
id: "single",
|
||||||
|
label: "Do not start a new run. Issue a warning.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "parallel",
|
||||||
|
label:
|
||||||
|
"Start a new, independent run in parallel with previous runs.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "queued",
|
||||||
|
label:
|
||||||
|
"Start a new run after all previous runs complete. Runs are guaranteed to execute in the order they were queued.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "restart",
|
||||||
|
label: "Start a new run after first stopping previous run.",
|
||||||
|
},
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
<InputTextView
|
||||||
|
className="description"
|
||||||
|
value={state.data.metadata.description ?? ""}
|
||||||
|
placeholder="Description"
|
||||||
|
onChange={(description) =>
|
||||||
|
updateMetadata(
|
||||||
|
{
|
||||||
|
...state.data.metadata,
|
||||||
|
description,
|
||||||
|
},
|
||||||
|
state.data.tags
|
||||||
|
)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{!dims.flipped && (
|
||||||
|
<Button
|
||||||
|
className={"automation-editor--flow-wrapper--toolbar--flip-btn"}
|
||||||
|
onClick={() => setFlipped(!flipped)}
|
||||||
|
>
|
||||||
|
<Icon>{flipped ? "flip_to_front" : "flip_to_back"}</Icon>
|
||||||
|
Flip
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
<Button
|
||||||
|
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
|
||||||
|
onClick={save}
|
||||||
|
disabled={state.status !== "changed"}
|
||||||
|
>
|
||||||
|
Save <CheckMarkIcon color="#bf4" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
<DAGAutomationGraph
|
||||||
|
sequence={state.data.sequence}
|
||||||
|
trigger={state.data.trigger}
|
||||||
|
condition={state.data.condition}
|
||||||
|
onSequenceUpdate={updateSequence}
|
||||||
|
onTriggerUpdate={updateTrigger}
|
||||||
|
onConditionUpdate={updateCondition}
|
||||||
|
isFlipped={flipped}
|
||||||
|
additionalControls={
|
||||||
|
<ControlButton onClick={() => setInfoBox(!infoBoxOpen)}>
|
||||||
|
<ModeEditOutlineTwoToneIcon />
|
||||||
|
</ControlButton>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const ValidationBox: FC<{
|
export const ValidationBox: FC<{
|
||||||
failures: MiniFailure[]
|
failures: MiniFailure[];
|
||||||
validate: (d: any) => MiniFailure[] | null,
|
validate: (d: any) => MiniFailure[] | null;
|
||||||
data: EditorData,
|
data: EditorData;
|
||||||
onSave: (d: EditorData) => void,
|
onSave: (d: EditorData) => void;
|
||||||
}> = props => {
|
}> = (props) => {
|
||||||
|
|
||||||
const [{ failures, data }, setState] = useState({
|
const [{ failures, data }, setState] = useState({
|
||||||
failures: props.failures,
|
failures: props.failures,
|
||||||
data: props.data,
|
data: props.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
const makeSave = <K extends keyof EditorData>(k: K) => (d: EditorData[K]) => {
|
const makeSave =
|
||||||
const newData = {
|
<K extends keyof EditorData>(k: K) =>
|
||||||
...data,
|
(d: EditorData[K]) => {
|
||||||
[k]: d,
|
const newData = {
|
||||||
}
|
...data,
|
||||||
const newFails = props.validate(newData);
|
[k]: d,
|
||||||
if (newFails) {
|
};
|
||||||
setState({
|
const newFails = props.validate(newData);
|
||||||
failures: newFails,
|
if (newFails) {
|
||||||
data: newData,
|
setState({
|
||||||
})
|
failures: newFails,
|
||||||
} else {
|
data: newData,
|
||||||
setState({
|
});
|
||||||
failures: [],
|
} else {
|
||||||
data: newData,
|
setState({
|
||||||
})
|
failures: [],
|
||||||
}
|
data: newData,
|
||||||
}
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return <div className="automation-editor-failures">
|
return (
|
||||||
<ul>
|
<div className="automation-editor-failures">
|
||||||
{failures.map((f, i) => <>
|
<ul>
|
||||||
<li key={i}>
|
{failures.map((f, i) => (
|
||||||
<b>{f.path}</b>:
|
<>
|
||||||
<ul>
|
<li key={i}>
|
||||||
{f.message.map((m, j) => <li key={j}>
|
<b>{f.path}</b>:
|
||||||
{m}
|
<ul>
|
||||||
</li>)}
|
{f.message.map((m, j) => (
|
||||||
</ul>
|
<li key={j}>{m}</li>
|
||||||
</li>
|
))}
|
||||||
</>)}
|
</ul>
|
||||||
</ul>
|
</li>
|
||||||
<span>Please correct the automation file manually and then continue!</span>
|
</>
|
||||||
<InputYaml label="Metadata" value={data.metadata} onChange={makeSave('metadata')} />
|
))}
|
||||||
<InputYaml label="Tags" value={data.tags} onChange={makeSave('tags')} />
|
</ul>
|
||||||
<InputYaml label="Trigger" value={data.trigger} onChange={makeSave('trigger')} />
|
<span>
|
||||||
<InputYaml label="Condition" value={data.condition} onChange={makeSave('condition')} />
|
Please correct the automation file manually and then continue!
|
||||||
<InputYaml label="Actions" value={data.sequence} onChange={makeSave('sequence')} />
|
</span>
|
||||||
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>Save</Button>
|
<InputYaml
|
||||||
</div>
|
label="Metadata"
|
||||||
}
|
value={data.metadata}
|
||||||
|
onChange={makeSave("metadata")}
|
||||||
|
/>
|
||||||
|
<InputYaml label="Tags" value={data.tags} onChange={makeSave("tags")} />
|
||||||
|
<InputYaml
|
||||||
|
label="Trigger"
|
||||||
|
value={data.trigger}
|
||||||
|
onChange={makeSave("trigger")}
|
||||||
|
/>
|
||||||
|
<InputYaml
|
||||||
|
label="Condition"
|
||||||
|
value={data.condition}
|
||||||
|
onChange={makeSave("condition")}
|
||||||
|
/>
|
||||||
|
<InputYaml
|
||||||
|
label="Actions"
|
||||||
|
value={data.sequence}
|
||||||
|
onChange={makeSave("sequence")}
|
||||||
|
/>
|
||||||
|
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>
|
||||||
|
Save
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -3,178 +3,185 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
|
|||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { AutomationList } from ".";
|
import { AutomationList } from ".";
|
||||||
import { bigMockAutoList } from "utils/mocks";
|
import { bigMockAutoList } from "utils/mocks";
|
||||||
import * as dgconst from 'components/DAGFlow/constants';
|
|
||||||
import { Page } from "components/Page";
|
import { Page } from "components/Page";
|
||||||
|
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
|
||||||
|
import { AutomationData } from "types/automations";
|
||||||
|
|
||||||
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: dgconst.DEFAULT_DIMS
|
dims: DEFAULT_DIMS,
|
||||||
}
|
},
|
||||||
} as ComponentMeta<typeof AutomationList>;
|
} as ComponentMeta<typeof AutomationList>;
|
||||||
|
|
||||||
|
const Template: ComponentStory<typeof AutomationList> = (args) => {
|
||||||
const Template: ComponentStory<typeof AutomationList> = args => {
|
const [autos, setAutos] = useState(args.automations.data);
|
||||||
const [autos, setAutos] = useState(args.automations)
|
return (
|
||||||
return <Page>
|
<Page>
|
||||||
<AutomationList {...args} automations={autos}
|
<AutomationList
|
||||||
onAdd={a => {
|
{...args}
|
||||||
args.onAdd(a);
|
automations={{
|
||||||
setAutos([...autos, a]);
|
...args.automations,
|
||||||
}}
|
data: autos,
|
||||||
onRemove={i => {
|
}}
|
||||||
args.onRemove(i);
|
onAdd={(a) => {
|
||||||
setAutos([
|
|
||||||
...autos.slice(0, i),
|
|
||||||
...autos.slice(i + 1),
|
|
||||||
]);
|
|
||||||
}}
|
|
||||||
onUpdate={(i, a) => {
|
|
||||||
args.onUpdate(i, a);
|
|
||||||
setAutos([
|
|
||||||
...autos.slice(0, i),
|
|
||||||
a,
|
|
||||||
...autos.slice(i + 1),
|
|
||||||
]);
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</Page>
|
|
||||||
}
|
|
||||||
|
|
||||||
export const EmptyStart = Template.bind({})
|
|
||||||
EmptyStart.args = {
|
|
||||||
...EmptyStart.args,
|
|
||||||
automations: [],
|
|
||||||
}
|
|
||||||
|
|
||||||
export const FewAutos = Template.bind({})
|
|
||||||
FewAutos.args = {
|
|
||||||
...FewAutos.args,
|
|
||||||
automations: bigMockAutoList,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export const BadAutmations = Template.bind({})
|
|
||||||
BadAutmations.args = {
|
|
||||||
...BadAutmations.args,
|
|
||||||
automations: [
|
|
||||||
{
|
|
||||||
"metadata": {
|
|
||||||
"alias": "Set Thermostat to 76 at 8am",
|
|
||||||
"description": "",
|
|
||||||
"mode": "single",
|
|
||||||
} as any,
|
|
||||||
"trigger": [
|
|
||||||
{
|
|
||||||
"at": "08:00:00",
|
|
||||||
"platform": "time"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"condition": [
|
|
||||||
{
|
|
||||||
"condition": "state",
|
|
||||||
"entity_id": "climate.thermostat",
|
|
||||||
"state": "cool"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"sequence": [
|
|
||||||
{
|
|
||||||
"data": {
|
|
||||||
"temperature": 76
|
|
||||||
},
|
|
||||||
"service": "climate.set_temperature",
|
|
||||||
"target": {
|
|
||||||
"entity_id": "climate.thermostat"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"tags": {},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
condition: [],
|
|
||||||
tags: {},
|
|
||||||
metadata: {
|
|
||||||
id: "Bad Choose Sequence",
|
|
||||||
alias: "Bad Choose",
|
|
||||||
description: "Example Metadata",
|
|
||||||
trigger_variables: {
|
|
||||||
'wowo': '!'
|
|
||||||
},
|
|
||||||
mode: 'single',
|
|
||||||
},
|
|
||||||
trigger: [],
|
|
||||||
sequence: [
|
|
||||||
{
|
|
||||||
choose: {}
|
|
||||||
}
|
|
||||||
] as any
|
|
||||||
},
|
|
||||||
{
|
|
||||||
condition: [],
|
|
||||||
tags: {},
|
|
||||||
metadata: {
|
|
||||||
id: "random",
|
|
||||||
alias: "Bad Trigger",
|
|
||||||
description: "Example Metadata",
|
|
||||||
trigger_variables: {
|
|
||||||
'wowo': '!'
|
|
||||||
},
|
|
||||||
mode: 'single',
|
|
||||||
},
|
|
||||||
trigger: [
|
|
||||||
"haha I am a string"
|
|
||||||
] as any,
|
|
||||||
sequence: []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
condition: [],
|
|
||||||
tags: {},
|
|
||||||
metadata: {
|
|
||||||
} as any,
|
|
||||||
trigger: [
|
|
||||||
],
|
|
||||||
sequence: []
|
|
||||||
}
|
|
||||||
],
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = args => {
|
|
||||||
const [autos, setAutos] = useState(args.automations)
|
|
||||||
return <Page>
|
|
||||||
<AutomationList {...args} automations={autos}
|
|
||||||
onAdd={a => {
|
|
||||||
window.setTimeout(() => {
|
|
||||||
args.onAdd(a);
|
args.onAdd(a);
|
||||||
setAutos([...autos, a]);
|
setAutos([...autos, a]);
|
||||||
}, 10000)
|
}}
|
||||||
}}
|
onRemove={(i) => {
|
||||||
onRemove={i => {
|
|
||||||
window.setTimeout(() => {
|
|
||||||
args.onRemove(i);
|
args.onRemove(i);
|
||||||
setAutos([
|
setAutos([...autos.slice(0, i), ...autos.slice(i + 1)]);
|
||||||
...autos.slice(0, i),
|
}}
|
||||||
...autos.slice(i + 1),
|
onUpdate={(i, a) => {
|
||||||
]);
|
|
||||||
}, 10000)
|
|
||||||
}}
|
|
||||||
onUpdate={(i, a) => {
|
|
||||||
window.setTimeout(() => {
|
|
||||||
args.onUpdate(i, a);
|
args.onUpdate(i, a);
|
||||||
setAutos([
|
setAutos([...autos.slice(0, i), a, ...autos.slice(i + 1)]);
|
||||||
...autos.slice(0, i),
|
}}
|
||||||
a,
|
/>
|
||||||
...autos.slice(i + 1),
|
</Page>
|
||||||
]);
|
);
|
||||||
}, 10000)
|
};
|
||||||
}}
|
|
||||||
/>
|
const make = (autos: AutomationData[]) => {
|
||||||
</Page>
|
const NewTemp = Template.bind({});
|
||||||
}
|
NewTemp.args = {
|
||||||
|
...NewTemp.args,
|
||||||
|
automations: {
|
||||||
|
data: autos,
|
||||||
|
params: {
|
||||||
|
offset: 0,
|
||||||
|
limit: 100,
|
||||||
|
},
|
||||||
|
totalItems: autos.length,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
return NewTemp;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const EmptyStart = make([]);
|
||||||
|
|
||||||
|
export const FewAutos = make(bigMockAutoList);
|
||||||
|
|
||||||
|
export const BadAutmations = make([
|
||||||
|
{
|
||||||
|
metadata: {
|
||||||
|
alias: "Set Thermostat to 76 at 8am",
|
||||||
|
description: "",
|
||||||
|
mode: "single",
|
||||||
|
} as any,
|
||||||
|
trigger: [
|
||||||
|
{
|
||||||
|
at: "08:00:00",
|
||||||
|
platform: "time",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
condition: [
|
||||||
|
{
|
||||||
|
condition: "state",
|
||||||
|
entity_id: "climate.thermostat",
|
||||||
|
state: "cool",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
sequence: [
|
||||||
|
{
|
||||||
|
data: {
|
||||||
|
temperature: 76,
|
||||||
|
},
|
||||||
|
service: "climate.set_temperature",
|
||||||
|
target: {
|
||||||
|
entity_id: "climate.thermostat",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
tags: {},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
condition: [],
|
||||||
|
tags: {},
|
||||||
|
metadata: {
|
||||||
|
id: "Bad Choose Example",
|
||||||
|
alias: "Bad Choose",
|
||||||
|
description: "Example Metadata",
|
||||||
|
trigger_variables: {
|
||||||
|
wowo: "!",
|
||||||
|
},
|
||||||
|
mode: "single",
|
||||||
|
},
|
||||||
|
trigger: [],
|
||||||
|
sequence: [
|
||||||
|
{
|
||||||
|
choose: [],
|
||||||
|
},
|
||||||
|
] as any,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
condition: [],
|
||||||
|
tags: {},
|
||||||
|
metadata: {
|
||||||
|
id: "random",
|
||||||
|
alias: "Bad Trigger",
|
||||||
|
description: "Example Metadata",
|
||||||
|
trigger_variables: {
|
||||||
|
wowo: "!",
|
||||||
|
},
|
||||||
|
mode: "single",
|
||||||
|
},
|
||||||
|
trigger: ["haha I am a string"] as any,
|
||||||
|
sequence: [],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
condition: [],
|
||||||
|
tags: {},
|
||||||
|
metadata: {} as any,
|
||||||
|
trigger: [],
|
||||||
|
sequence: [],
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = (
|
||||||
|
args
|
||||||
|
) => {
|
||||||
|
const [autos, setAutos] = useState(args.automations.data);
|
||||||
|
return (
|
||||||
|
<Page>
|
||||||
|
<AutomationList
|
||||||
|
{...args}
|
||||||
|
automations={{
|
||||||
|
...args.automations,
|
||||||
|
data: autos,
|
||||||
|
}}
|
||||||
|
onAdd={(a) => {
|
||||||
|
window.setTimeout(() => {
|
||||||
|
args.onAdd(a);
|
||||||
|
setAutos([...autos, a]);
|
||||||
|
}, 10000);
|
||||||
|
}}
|
||||||
|
onRemove={(i) => {
|
||||||
|
window.setTimeout(() => {
|
||||||
|
args.onRemove(i);
|
||||||
|
setAutos([...autos.slice(0, i), ...autos.slice(i + 1)]);
|
||||||
|
}, 10000);
|
||||||
|
}}
|
||||||
|
onUpdate={(i, a) => {
|
||||||
|
window.setTimeout(() => {
|
||||||
|
args.onUpdate(i, a);
|
||||||
|
setAutos([...autos.slice(0, i), a, ...autos.slice(i + 1)]);
|
||||||
|
}, 10000);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Page>
|
||||||
|
);
|
||||||
|
};
|
||||||
FewAutosWithSlowLoader.args = {
|
FewAutosWithSlowLoader.args = {
|
||||||
...FewAutosWithSlowLoader.args,
|
...FewAutosWithSlowLoader.args,
|
||||||
automations: bigMockAutoList,
|
automations: {
|
||||||
}
|
data: bigMockAutoList,
|
||||||
|
params: {
|
||||||
|
limit: 100,
|
||||||
|
offset: 0,
|
||||||
|
},
|
||||||
|
totalItems: 100,
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -25,15 +25,15 @@
|
|||||||
padding-bottom: 0.5em;
|
padding-bottom: 0.5em;
|
||||||
border-width: 1px;
|
border-width: 1px;
|
||||||
border-bottom-style: solid;
|
border-bottom-style: solid;
|
||||||
border-color: var(--primary-accent);
|
border-color: var(--mui-grey-400);
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--group.other {
|
.automation-list-box--body--group.other {
|
||||||
border-color: var(--green);
|
border-color: var(--mui-success-main);
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--group.other>b {
|
.automation-list-box--body--group.other>b {
|
||||||
color: var(--change);
|
color: var(--mui-success-light);
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--group>.automation-list-box--body--group {
|
.automation-list-box--body--group>.automation-list-box--body--group {
|
||||||
@@ -51,72 +51,10 @@
|
|||||||
|
|
||||||
.automation-list-box--body--group>b:hover,
|
.automation-list-box--body--group>b:hover,
|
||||||
.automation-list-box--body--group.selected>b {
|
.automation-list-box--body--group.selected>b {
|
||||||
background-color: var(--secondary-accent);
|
background-color: var(--mui-grey-700);
|
||||||
color: var(--secondary);
|
color: var(--mui-secondary-contrastText);
|
||||||
}
|
}
|
||||||
|
|
||||||
.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 {
|
.automation-list-box--bottom {
|
||||||
margin-top: 0.5em;
|
margin-top: 0.5em;
|
||||||
@@ -127,8 +65,20 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--bottom>button {
|
.automation-list-box--bottom>.automation-list-box--bottom--add {
|
||||||
background-color: #070;
|
background-color: var(--mui-primary-main);
|
||||||
color: var(--primary-accent);
|
color: var(--mui-primary-contrastText);
|
||||||
padding: 0.5em 2em;
|
padding: 0.5em 2em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--bottom>.automation-list-box--bottom--add:hover {
|
||||||
|
color: var(--mui-primary-light);
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--bottom--load svg {
|
||||||
|
color: var(--mui-primary-main);
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--bottom--load.less svg {
|
||||||
|
transform: rotate(180deg);
|
||||||
}
|
}
|
||||||
@@ -3,45 +3,77 @@ import { useState } from "react";
|
|||||||
import { AutomationListBox } from "./AutomationListBox";
|
import { AutomationListBox } from "./AutomationListBox";
|
||||||
import { createMockAuto } from "utils/mocks";
|
import { createMockAuto } from "utils/mocks";
|
||||||
import { Page } from "components/Page";
|
import { Page } from "components/Page";
|
||||||
|
import { CookiesProvider } from "react-cookie";
|
||||||
|
import { makeTagDB } from "./TagDB";
|
||||||
|
import { AutomationData } from "types/automations";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'App/AutomationList/Box',
|
title: "App/AutomationList/Box",
|
||||||
component: AutomationListBox,
|
component: AutomationListBox,
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||||
args: {
|
args: {},
|
||||||
}
|
|
||||||
} as ComponentMeta<typeof AutomationListBox>;
|
} as ComponentMeta<typeof AutomationListBox>;
|
||||||
|
|
||||||
|
const Template: ComponentStory<typeof AutomationListBox> = (args) => {
|
||||||
|
const [selected, setSelected] = useState(args.selected);
|
||||||
|
return (
|
||||||
|
<Page>
|
||||||
|
<CookiesProvider>
|
||||||
|
<AutomationListBox
|
||||||
|
{...args}
|
||||||
|
tagsDB={makeTagDB(args.automations.data)}
|
||||||
|
automations={args.automations}
|
||||||
|
selected={selected}
|
||||||
|
onSelectAutomation={(i) => {
|
||||||
|
setSelected(i);
|
||||||
|
args.onSelectAutomation(i);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</CookiesProvider>
|
||||||
|
</Page>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
const Template: ComponentStory<typeof AutomationListBox> = args => {
|
const make = (autos: AutomationData[]) => {
|
||||||
const [selected, setSelected] = useState(args.selected)
|
const NewTemp = Template.bind({});
|
||||||
return <Page>
|
NewTemp.args = {
|
||||||
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
|
...NewTemp.args,
|
||||||
setSelected(i)
|
automations: {
|
||||||
args.onSelectAutomation(i)
|
data: autos,
|
||||||
}} />
|
params: {
|
||||||
</Page>
|
offset: 0,
|
||||||
}
|
limit: 100,
|
||||||
|
},
|
||||||
|
totalItems: autos.length,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
export const EmptyStart = Template.bind({})
|
return NewTemp;
|
||||||
EmptyStart.args = {
|
};
|
||||||
...EmptyStart.args,
|
|
||||||
automations: [],
|
|
||||||
}
|
|
||||||
|
|
||||||
export const FewAutos = Template.bind({})
|
export const EmptyStart = make([]);
|
||||||
FewAutos.args = {
|
|
||||||
...FewAutos.args,
|
export const FewAutos = make([
|
||||||
automations: [
|
createMockAuto({
|
||||||
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
|
Room: "Bathroom",
|
||||||
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
|
Type: "Lights",
|
||||||
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
|
NewDevice: "Yes",
|
||||||
createMockAuto({ "Type": "Climate" }),
|
Remote: "No",
|
||||||
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
|
Floor: "1",
|
||||||
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
|
}),
|
||||||
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
|
createMockAuto({ Room: "Bathroom", Type: "Climate" }),
|
||||||
createMockAuto({ "Room": "Office", "Type": "Lights" }),
|
createMockAuto({ Room: "Living Room", Type: "Climate" }),
|
||||||
createMockAuto({ "Room": "Office" }),
|
createMockAuto({ Type: "Climate" }),
|
||||||
createMockAuto(),
|
createMockAuto({ Type: "Lights", Routine: "Myself" }),
|
||||||
],
|
createMockAuto({ Routine: "DNS", Type: "SSL" }),
|
||||||
}
|
createMockAuto({ Room: "Bedroom", Type: "Lights", Routine: "Baby" }),
|
||||||
|
createMockAuto({ Room: "Office", Type: "Lights" }),
|
||||||
|
createMockAuto({ Room: "Office" }),
|
||||||
|
createMockAuto(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
export const OneAuto = make([
|
||||||
|
createMockAuto({
|
||||||
|
Type: "Climate",
|
||||||
|
}),
|
||||||
|
]);
|
||||||
@@ -1,31 +1,22 @@
|
|||||||
import { getTagList } from './AutomationListBox';
|
import { getTagList } from "./AutomationListBox";
|
||||||
import { createMockAuto } from 'utils/mocks';
|
import { createMockAuto } from "utils/mocks";
|
||||||
|
|
||||||
// const makeDummy = (id: string, tags: Record<string, string>) => ({
|
test("getTagList", () => {
|
||||||
// condition: [],
|
expect(
|
||||||
// metadata: {
|
getTagList([
|
||||||
// id,
|
createMockAuto(),
|
||||||
// alias: '',
|
createMockAuto(),
|
||||||
// description: '',
|
createMockAuto(),
|
||||||
// mode: 'single',
|
createMockAuto(),
|
||||||
// },
|
])
|
||||||
// tags,
|
).toStrictEqual([]);
|
||||||
// sequence: [],
|
|
||||||
// trigger: [],
|
|
||||||
// })
|
|
||||||
|
|
||||||
test('getTagList', () => {
|
expect(
|
||||||
expect(getTagList([
|
getTagList([
|
||||||
createMockAuto(),
|
createMockAuto({ Room: "Kitchen", Area: "Oven" }),
|
||||||
createMockAuto(),
|
createMockAuto({ Room: "Attic" }),
|
||||||
createMockAuto(),
|
createMockAuto({ Room: "Office" }),
|
||||||
createMockAuto(),
|
createMockAuto({ Area: "Balcony" }),
|
||||||
])).toStrictEqual([])
|
])
|
||||||
|
).toStrictEqual(["Room", "Area"]);
|
||||||
expect(getTagList([
|
});
|
||||||
createMockAuto({ "Room": "Kitchen", "Area": "Oven" }),
|
|
||||||
createMockAuto({ "Room": "Attic" }),
|
|
||||||
createMockAuto({ "Room": "Office" }),
|
|
||||||
createMockAuto({ "Area": "Balcony" }),
|
|
||||||
])).toStrictEqual(["Room", "Area"])
|
|
||||||
})
|
|
||||||
@@ -1,95 +1,195 @@
|
|||||||
import "./AutomationListBox.css";
|
import "./AutomationListBox.css";
|
||||||
import { FC, useState } from 'react';
|
import { FC, useState } from "react";
|
||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import InputMultiSelect from "components/Inputs/InputMultiSelect";
|
import InputMultiSelect from "components/Inputs/InputMultiSelect";
|
||||||
import InputText from "components/Inputs/InputText";
|
import InputText from "components/Inputs/InputText";
|
||||||
import { Button } from "components/Inputs/Button";
|
import { Button } from "components/Inputs/Button";
|
||||||
import { makeGrouping } from "./automationGrouper";
|
import { makeGrouping } from "./automationGrouper";
|
||||||
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
|
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
|
||||||
|
import { useCookies } from "react-cookie";
|
||||||
|
import { TagDB } from "components/AutomationList/TagDB";
|
||||||
|
// import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
|
// import ReadMoreOutlinedIcon from "@mui/icons-material/ReadMoreOutlined";
|
||||||
|
import { ListData, ListParams } from "apiService/types";
|
||||||
|
import Chip from "@mui/material/Chip";
|
||||||
|
import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
|
||||||
|
|
||||||
|
export type AutomationListBoxProps = {
|
||||||
|
automations: ListData<AutomationData>;
|
||||||
|
selected: number;
|
||||||
|
onSelectAutomation: (i: number) => void;
|
||||||
|
onRemove: (i: number) => void;
|
||||||
|
onAdd: () => void;
|
||||||
|
onUpdateTags: (id: string, tags: Record<string, string>) => void;
|
||||||
|
onUpdate: (a: AutomationData, i: number) => void;
|
||||||
|
onLoadMore: (p: ListParams) => void;
|
||||||
|
tagsDB: TagDB;
|
||||||
|
};
|
||||||
|
|
||||||
export type Props = {
|
const useAutomationListBoxState = () => {
|
||||||
automations: AutomationData[];
|
const [
|
||||||
selected: number;
|
cookies,
|
||||||
onSelectAutomation: (i: number) => void;
|
setCookies,
|
||||||
onRemove: (i: number) => void;
|
// eslint-disable-next-line
|
||||||
onAdd: () => void;
|
_,
|
||||||
}
|
] = useCookies(["albSearchText", "albSelected"]);
|
||||||
|
let initialSelected = [];
|
||||||
|
try {
|
||||||
|
initialSelected = JSON.parse(cookies.albSelected);
|
||||||
|
if (!Array.isArray(initialSelected)) {
|
||||||
|
initialSelected = [initialSelected];
|
||||||
|
}
|
||||||
|
initialSelected = initialSelected.map(Number);
|
||||||
|
// eslint-disable-next-line
|
||||||
|
} catch (_) {}
|
||||||
|
const [searchText, setSearchText] = useState(cookies.albSearchText ?? "");
|
||||||
|
const [selectedTagIdx, setSelectedTagIdx] =
|
||||||
|
useState<number[]>(initialSelected);
|
||||||
|
|
||||||
export const AutomationListBox: FC<Props> = ({
|
return {
|
||||||
automations,
|
searchText,
|
||||||
selected,
|
setSearchText(v: string) {
|
||||||
onSelectAutomation,
|
setSearchText(v);
|
||||||
onAdd,
|
setCookies("albSearchText", v);
|
||||||
onRemove,
|
},
|
||||||
|
setSelectedTagIdx(n: number[]) {
|
||||||
|
setSelectedTagIdx(n);
|
||||||
|
setCookies("albSelected", JSON.stringify(n));
|
||||||
|
},
|
||||||
|
selectedTagIdx,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export const AutomationListBox: FC<AutomationListBoxProps> = ({
|
||||||
|
automations: {
|
||||||
|
data: automations,
|
||||||
|
// params: autoParams,
|
||||||
|
totalItems: totalAutomations,
|
||||||
|
},
|
||||||
|
selected,
|
||||||
|
onSelectAutomation,
|
||||||
|
onAdd,
|
||||||
|
onRemove,
|
||||||
|
// onLoadMore,
|
||||||
|
onUpdateTags,
|
||||||
|
tagsDB,
|
||||||
|
onUpdate,
|
||||||
}) => {
|
}) => {
|
||||||
|
const tags = getTagList(automations);
|
||||||
|
const { searchText, setSearchText, selectedTagIdx, setSelectedTagIdx } =
|
||||||
|
useAutomationListBoxState();
|
||||||
|
const filteredAutomations = filterAutomations(
|
||||||
|
automations,
|
||||||
|
searchText.toLowerCase()
|
||||||
|
);
|
||||||
|
const grouping = makeGrouping(
|
||||||
|
filteredAutomations.map(([a, _]) => a),
|
||||||
|
selectedTagIdx.map((i) => tags[i]),
|
||||||
|
selected
|
||||||
|
);
|
||||||
|
|
||||||
const tags = getTagList(automations);
|
return (
|
||||||
const [searchText, setSearchText] = useState('');
|
<div className="automation-list-box">
|
||||||
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]);
|
<div className="automation-list-box--nav">
|
||||||
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags);
|
<InputText label="Search" value={searchText} onChange={setSearchText} />
|
||||||
const grouping = makeGrouping(
|
<InputMultiSelect
|
||||||
filteredAutomations.map(([a, _]) => a),
|
label="Tags"
|
||||||
selectedTagIdx.map(i => tags[i]),
|
selected={selectedTagIdx}
|
||||||
selected,
|
onChange={setSelectedTagIdx}
|
||||||
)
|
options={tags}
|
||||||
|
max={3}
|
||||||
return <div className="automation-list-box">
|
/>
|
||||||
<div className="automation-list-box--nav">
|
</div>
|
||||||
<InputText
|
<div className="automation-list-box--body">
|
||||||
label="Search"
|
<AutomationListBoxGroup
|
||||||
value={searchText}
|
events={{
|
||||||
onChange={setSearchText}
|
onSelectAutomation,
|
||||||
|
onRemove,
|
||||||
|
}}
|
||||||
|
autos={filteredAutomations}
|
||||||
|
grouping={grouping}
|
||||||
|
selectedAutomationIdx={selected}
|
||||||
|
tagsDB={tagsDB}
|
||||||
|
onSave={onUpdate}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="automation-list-box--bottom">
|
||||||
|
<Button className="automation-list-box--bottom--add" onClick={onAdd}>
|
||||||
|
Add
|
||||||
|
</Button>
|
||||||
|
{automations.length < totalAutomations ? (
|
||||||
|
<>
|
||||||
|
<Chip
|
||||||
|
label={`Only loaded ${automations.length} out of ${totalAutomations}`}
|
||||||
|
variant="outlined"
|
||||||
|
color="warning"
|
||||||
|
icon={<InfoOutlinedIcon />}
|
||||||
|
onClick={() =>
|
||||||
|
window.open(
|
||||||
|
"https://github.com/asosnovsky/Shortumation/issues/78",
|
||||||
|
"_blank"
|
||||||
|
)
|
||||||
|
}
|
||||||
/>
|
/>
|
||||||
<InputMultiSelect
|
<small>support for more is not yet implemented</small>
|
||||||
label="Tags"
|
</>
|
||||||
selected={selectedTagIdx}
|
) : (
|
||||||
onChange={setSelectedTagIdx}
|
""
|
||||||
options={tags}
|
)}
|
||||||
max={3}
|
{/* {autoParams.offset > 0 && (
|
||||||
|
<ButtonIcon
|
||||||
|
borderless
|
||||||
|
className="automation-list-box--bottom--load less"
|
||||||
|
icon={<ReadMoreOutlinedIcon />}
|
||||||
|
onClick={() => onLoadMore()}
|
||||||
/>
|
/>
|
||||||
</div>
|
)} */}
|
||||||
<div className="automation-list-box--body">
|
{/* {filteredAutomations.length} out of {totalAutomations} */}
|
||||||
<AutomationListBoxGroup
|
{/* {autoParams.offset + automations.length < totalAutomations && (
|
||||||
events={{
|
<ButtonIcon
|
||||||
onSelectAutomation,
|
borderless
|
||||||
onRemove
|
className="automation-list-box--bottom--load more"
|
||||||
}}
|
icon={<ReadMoreOutlinedIcon />}
|
||||||
autos={filteredAutomations}
|
|
||||||
grouping={grouping}
|
|
||||||
selectedAutomationIdx={selected}
|
|
||||||
/>
|
/>
|
||||||
</div>
|
)} */}
|
||||||
<div className="automation-list-box--bottom">
|
</div>
|
||||||
<Button onClick={onAdd}>Add</Button>
|
|
||||||
<span>Showing Automations: {filteredAutomations.length} out of {automations.length}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
}
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getTagList = (autos: AutomationData[]): string[] =>
|
||||||
export const getTagList = (autos: AutomationData[]): string[] => Object.keys(autos
|
Object.keys(
|
||||||
.map(a => Object.keys(a.tags))
|
autos
|
||||||
.reduce((all: any, keys) => {
|
.map((a) => Object.keys(a.tags))
|
||||||
|
.reduce((all: any, keys) => {
|
||||||
for (const k of keys) {
|
for (const k of keys) {
|
||||||
all[k] = 1
|
all[k] = 1;
|
||||||
}
|
}
|
||||||
return all;
|
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]) => {
|
const filterAutomations = (
|
||||||
if (!a.metadata) {
|
autos: AutomationData[],
|
||||||
return true
|
searchText: string
|
||||||
}
|
): Array<[AutomationData, number]> =>
|
||||||
if (searchText.length > 0) {
|
autos
|
||||||
|
.map<[AutomationData, number]>((a, i) => [a, i])
|
||||||
|
.filter(([a, i]) => {
|
||||||
|
if (!a.metadata) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (searchText.length > 0) {
|
||||||
if (
|
if (
|
||||||
!(
|
!(
|
||||||
(a.metadata.description ?? "").toLocaleLowerCase().includes(searchText) ||
|
(a.metadata.description ?? "")
|
||||||
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
|
.toLocaleLowerCase()
|
||||||
)
|
.includes(searchText) ||
|
||||||
|
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
|
||||||
|
)
|
||||||
) {
|
) {
|
||||||
return false
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true
|
return true;
|
||||||
})
|
});
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
.automation-list-box--body--item:hover, .automation-list-box--body--item.selected {
|
||||||
|
outline-color: var(--mui-grey-400);
|
||||||
|
outline-style: solid;
|
||||||
|
outline-width: 1px;
|
||||||
|
background-color: var(--mui-secondary-contrastText);
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item:hover>.automation-list-box--body--item--tags>span {
|
||||||
|
border-color: var(--mui-common-black);
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item--tags--add:hover {
|
||||||
|
border-color: var(--mui-common-black);
|
||||||
|
color: var(--mui-grey-400);
|
||||||
|
background-color: var(--mui-secondary-contrastText);
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item {
|
||||||
|
padding-left: 1em;
|
||||||
|
cursor: pointer;
|
||||||
|
display: flex;
|
||||||
|
gap: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item::before {
|
||||||
|
content: "⊚ ";
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item--buttons {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
height: 100%;
|
||||||
|
gap: 0.25em;
|
||||||
|
margin: 0.5em
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item--buttons>button {
|
||||||
|
padding: 0.25em;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item--buttons .save {
|
||||||
|
color: var(--mui-success-light)
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item--buttons .save:hover {
|
||||||
|
color: var(--mui-success-main)
|
||||||
|
}
|
||||||
@@ -1,141 +1,257 @@
|
|||||||
|
import "./AutomationListBoxGroup.css";
|
||||||
|
|
||||||
import { TrashIcon } from "components/Icons";
|
import { TrashIcon } from "components/Icons";
|
||||||
import { Button } from "components/Inputs/Button";
|
|
||||||
import { MetadataBox } from "./AutomationMetadataBox";
|
import { MetadataBox } from "./AutomationMetadataBox";
|
||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import { AutomationGrouping } from "./automationGrouper";
|
import { AutomationGrouping } from "./automationGrouper";
|
||||||
import { FC, useState } from "react";
|
import { FC, useEffect, useState } from "react";
|
||||||
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
|
import { TagDB } from "./TagDB";
|
||||||
|
import Save from "@mui/icons-material/Save";
|
||||||
|
|
||||||
export type AutomationListBoxEvents = {
|
export type AutomationListBoxEvents = {
|
||||||
onSelectAutomation: (i: number) => void,
|
onSelectAutomation: (i: number) => void;
|
||||||
onRemove: (i: number) => void,
|
onRemove: (i: number) => void;
|
||||||
}
|
};
|
||||||
export type AutomationListBoxGroups = {
|
export type AutomationListBoxGroups = {
|
||||||
grouping: AutomationGrouping,
|
grouping: AutomationGrouping;
|
||||||
currentNode: number,
|
currentNode: number;
|
||||||
}
|
};
|
||||||
export type AutomationListBoxProps = {
|
export type AutomationListBoxProps = {
|
||||||
events: AutomationListBoxEvents,
|
events: AutomationListBoxEvents;
|
||||||
groups: AutomationListBoxGroups,
|
groups: AutomationListBoxGroups;
|
||||||
autos: Array<[AutomationData, number]>,
|
autos: Array<[AutomationData, number]>;
|
||||||
selectedAutomationIdx: number,
|
selectedAutomationIdx: number;
|
||||||
};
|
};
|
||||||
export type AutomationListBoxGroupProps = {
|
export type AutomationListBoxGroupProps = {
|
||||||
events: AutomationListBoxEvents,
|
events: AutomationListBoxEvents;
|
||||||
grouping: AutomationGrouping,
|
grouping: AutomationGrouping;
|
||||||
autos: Array<[AutomationData, number]>,
|
autos: Array<[AutomationData, number]>;
|
||||||
selectedAutomationIdx: number,
|
selectedAutomationIdx: number;
|
||||||
}
|
tagsDB: TagDB;
|
||||||
|
onSave: (a: AutomationData, i: number) => void;
|
||||||
|
};
|
||||||
export const AutomationListBoxGroup: FC<AutomationListBoxGroupProps> = ({
|
export const AutomationListBoxGroup: FC<AutomationListBoxGroupProps> = ({
|
||||||
events, grouping, autos, selectedAutomationIdx,
|
events,
|
||||||
|
grouping,
|
||||||
|
autos,
|
||||||
|
selectedAutomationIdx,
|
||||||
|
tagsDB,
|
||||||
|
onSave,
|
||||||
}) => {
|
}) => {
|
||||||
if (grouping.top.length === 1) {
|
if (grouping.top.length === 1) {
|
||||||
return <>
|
return (
|
||||||
{convertGroupsToItems(autos, {
|
<>
|
||||||
grouping, currentNode: grouping.top[0],
|
{convertGroupsToItems(
|
||||||
}, events, selectedAutomationIdx)}
|
autos,
|
||||||
</>
|
{
|
||||||
} else {
|
grouping,
|
||||||
return <>
|
currentNode: grouping.top[0],
|
||||||
{grouping.top.map(groupIdx => <AutomationListBoxGroupItem
|
},
|
||||||
key={groupIdx}
|
events,
|
||||||
autos={autos}
|
selectedAutomationIdx,
|
||||||
groups={{
|
tagsDB,
|
||||||
grouping,
|
onSave
|
||||||
currentNode: groupIdx
|
)}
|
||||||
}}
|
</>
|
||||||
events={events}
|
);
|
||||||
selectedAutomationIdx={selectedAutomationIdx}
|
} else {
|
||||||
/>)}
|
return (
|
||||||
</>
|
<>
|
||||||
}
|
{grouping.top.map((groupIdx) => (
|
||||||
}
|
<AutomationListBoxGroupItem
|
||||||
|
|
||||||
export const convertGroupsToItems = (
|
|
||||||
autos: Array<[AutomationData, number]>,
|
|
||||||
{ grouping, currentNode }: AutomationListBoxGroups,
|
|
||||||
events: AutomationListBoxEvents,
|
|
||||||
selectedAutomationIdx: number,
|
|
||||||
) => {
|
|
||||||
const automations = grouping.getAutomations(currentNode);
|
|
||||||
if (automations.length > 0) {
|
|
||||||
return automations.map(autoIndex =>
|
|
||||||
<AutomationListBoxItem
|
|
||||||
key={`${autoIndex}-${autos[autoIndex][1]}`}
|
|
||||||
events={events}
|
|
||||||
auto={autos[autoIndex]}
|
|
||||||
isSelected={selectedAutomationIdx === autos[autoIndex][1]}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
const subgroups = grouping.getSubGroups(currentNode);
|
|
||||||
if (subgroups.length > 0) {
|
|
||||||
return subgroups.map(groupIdx => <AutomationListBoxGroupItem
|
|
||||||
key={groupIdx}
|
key={groupIdx}
|
||||||
autos={autos}
|
autos={autos}
|
||||||
groups={{
|
groups={{
|
||||||
grouping,
|
grouping,
|
||||||
currentNode: groupIdx
|
currentNode: groupIdx,
|
||||||
}}
|
}}
|
||||||
events={events}
|
events={events}
|
||||||
selectedAutomationIdx={selectedAutomationIdx}
|
selectedAutomationIdx={selectedAutomationIdx}
|
||||||
/>)
|
tagsDB={tagsDB}
|
||||||
}
|
onSave={onSave}
|
||||||
return <></>
|
/>
|
||||||
}
|
))}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const convertGroupsToItems = (
|
||||||
|
autos: Array<[AutomationData, number]>,
|
||||||
|
{ grouping, currentNode }: AutomationListBoxGroups,
|
||||||
|
events: AutomationListBoxEvents,
|
||||||
|
selectedAutomationIdx: number,
|
||||||
|
tagsDB: TagDB,
|
||||||
|
onSave: (a: AutomationData, i: number) => void
|
||||||
|
) => {
|
||||||
|
const automations = grouping.getAutomations(currentNode);
|
||||||
|
if (automations.length > 0) {
|
||||||
|
return automations.map((autoIndex) => (
|
||||||
|
<AutomationListBoxItem
|
||||||
|
key={`${autoIndex}-${autos[autoIndex][1]}`}
|
||||||
|
events={events}
|
||||||
|
auto={autos[autoIndex]}
|
||||||
|
isSelected={selectedAutomationIdx === autos[autoIndex][1]}
|
||||||
|
tagsDB={tagsDB}
|
||||||
|
onSave={(a) => onSave(a, autoIndex)}
|
||||||
|
/>
|
||||||
|
));
|
||||||
|
}
|
||||||
|
const subgroups = grouping.getSubGroups(currentNode);
|
||||||
|
if (subgroups.length > 0) {
|
||||||
|
return subgroups.map((groupIdx) => (
|
||||||
|
<AutomationListBoxGroupItem
|
||||||
|
key={groupIdx}
|
||||||
|
autos={autos}
|
||||||
|
groups={{
|
||||||
|
grouping,
|
||||||
|
currentNode: groupIdx,
|
||||||
|
}}
|
||||||
|
events={events}
|
||||||
|
selectedAutomationIdx={selectedAutomationIdx}
|
||||||
|
tagsDB={tagsDB}
|
||||||
|
onSave={onSave}
|
||||||
|
/>
|
||||||
|
));
|
||||||
|
}
|
||||||
|
return <></>;
|
||||||
|
};
|
||||||
|
|
||||||
export const AutomationListBoxGroupItem: FC<{
|
export const AutomationListBoxGroupItem: FC<{
|
||||||
events: AutomationListBoxEvents,
|
events: AutomationListBoxEvents;
|
||||||
groups: AutomationListBoxGroups,
|
groups: AutomationListBoxGroups;
|
||||||
autos: Array<[AutomationData, number]>,
|
autos: Array<[AutomationData, number]>;
|
||||||
selectedAutomationIdx: number,
|
selectedAutomationIdx: number;
|
||||||
}> = ({
|
tagsDB: TagDB;
|
||||||
autos, groups, events, selectedAutomationIdx,
|
onSave: (a: AutomationData, i: number) => void;
|
||||||
}) => {
|
}> = ({ autos, groups, events, selectedAutomationIdx, tagsDB, onSave }) => {
|
||||||
const groupData = groups.grouping.getData(groups.currentNode);
|
const groupData = groups.grouping.getData(groups.currentNode);
|
||||||
const automations = groups.grouping.getAutomations(groups.currentNode);
|
const automations = groups.grouping.getAutomations(groups.currentNode);
|
||||||
const [open, setOpen] = useState(false);
|
const [open, setOpen] = useState(false);
|
||||||
const isOther = groupData.isOther;
|
const isOther = groupData.isOther;
|
||||||
const openIcon = !open ? "⊕" : "⊖";
|
const openIcon = !open ? "⊕" : "⊖";
|
||||||
const total = isOther ? <small>
|
const total = isOther ? (
|
||||||
{automations.length} automation{automations.length !== 1 ? 's' : ''} {groupData.isOther ? "" : "(untagged)"}
|
<small>
|
||||||
</small> : <></>
|
{automations.length} automation{automations.length !== 1 ? "s" : ""}{" "}
|
||||||
return <div className={[
|
{groupData.isOther ? "" : "(untagged)"}
|
||||||
"automation-list-box--body--group",
|
</small>
|
||||||
isOther ? 'other' : '',
|
) : (
|
||||||
groupData.selected ? 'selected' : '',
|
<></>
|
||||||
].join(' ')}>
|
);
|
||||||
<b onClick={() => setOpen(!open)}>{groupData.name} {openIcon} {total}</b>
|
return (
|
||||||
{open && convertGroupsToItems(autos, groups, events, selectedAutomationIdx)}
|
<div
|
||||||
</div>
|
className={[
|
||||||
}
|
"automation-list-box--body--group",
|
||||||
|
isOther ? "other" : "",
|
||||||
|
groupData.selected ? "selected" : "",
|
||||||
|
].join(" ")}
|
||||||
|
>
|
||||||
|
<b onClick={() => setOpen(!open)}>
|
||||||
|
{groupData.name} {openIcon} {total}
|
||||||
|
</b>
|
||||||
|
{open &&
|
||||||
|
convertGroupsToItems(
|
||||||
|
autos,
|
||||||
|
groups,
|
||||||
|
events,
|
||||||
|
selectedAutomationIdx,
|
||||||
|
tagsDB,
|
||||||
|
onSave
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const AutomationListBoxItem: FC<{
|
export const AutomationListBoxItem: FC<{
|
||||||
auto: [AutomationData, number],
|
auto: [AutomationData, number];
|
||||||
isSelected: boolean,
|
isSelected: boolean;
|
||||||
events: AutomationListBoxEvents,
|
events: AutomationListBoxEvents;
|
||||||
|
tagsDB: TagDB;
|
||||||
|
onSave: (a: AutomationData) => void;
|
||||||
}> = ({
|
}> = ({
|
||||||
events: {
|
events: { onRemove, onSelectAutomation },
|
||||||
onRemove,
|
auto: [auto, autoIndex],
|
||||||
onSelectAutomation,
|
isSelected,
|
||||||
},
|
tagsDB,
|
||||||
auto: [
|
onSave,
|
||||||
auto, autoIndex
|
|
||||||
],
|
|
||||||
isSelected,
|
|
||||||
}) => {
|
}) => {
|
||||||
let title = "BadAuto<<Missing Metadata>>"
|
// state
|
||||||
if (auto.metadata) {
|
const [{ tags, isModified, alias }, setState] = useState({
|
||||||
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`
|
isModified: false,
|
||||||
}
|
tags: Object.entries(auto.tags),
|
||||||
return <div
|
alias: auto.metadata.alias ?? "",
|
||||||
key={autoIndex}
|
});
|
||||||
className={["automation-list-box--body--item", isSelected ? 'selected' : ''].join(' ')}
|
|
||||||
title={title}
|
// effects
|
||||||
onClick={() => onSelectAutomation(autoIndex)}
|
useEffect(() => {
|
||||||
>
|
setState({
|
||||||
<MetadataBox metadata={auto.metadata} tags={auto.tags} />
|
isModified: false,
|
||||||
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
|
tags: Object.entries(auto.tags),
|
||||||
</div>
|
alias: auto.metadata.alias ?? "",
|
||||||
}
|
});
|
||||||
|
}, [auto]);
|
||||||
|
|
||||||
|
// alias
|
||||||
|
const setAlias = (a: string) =>
|
||||||
|
setState({
|
||||||
|
isModified: true,
|
||||||
|
tags,
|
||||||
|
alias: a,
|
||||||
|
});
|
||||||
|
const setTags = (t: [string, string][]) =>
|
||||||
|
setState({
|
||||||
|
isModified: true,
|
||||||
|
tags: t,
|
||||||
|
alias,
|
||||||
|
});
|
||||||
|
// sub elements
|
||||||
|
let title = "BadAuto<<Missing Metadata>>";
|
||||||
|
if (auto.metadata) {
|
||||||
|
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
// render
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={autoIndex}
|
||||||
|
className={[
|
||||||
|
"automation-list-box--body--item",
|
||||||
|
isSelected ? "selected" : "",
|
||||||
|
isModified ? "modded" : "",
|
||||||
|
].join(" ")}
|
||||||
|
title={title}
|
||||||
|
onClick={() => onSelectAutomation(autoIndex)}
|
||||||
|
>
|
||||||
|
<MetadataBox
|
||||||
|
metadata={{
|
||||||
|
...auto.metadata,
|
||||||
|
alias,
|
||||||
|
}}
|
||||||
|
tags={tags}
|
||||||
|
tagsDB={tagsDB}
|
||||||
|
onTagUpdate={setTags}
|
||||||
|
onAliasUpdate={setAlias}
|
||||||
|
/>
|
||||||
|
<div className="automation-list-box--body--item--buttons">
|
||||||
|
{isModified && (
|
||||||
|
<ButtonIcon
|
||||||
|
className="save"
|
||||||
|
icon={<Save />}
|
||||||
|
onClick={() =>
|
||||||
|
onSave({
|
||||||
|
...auto,
|
||||||
|
tags: Object.fromEntries(tags),
|
||||||
|
metadata: {
|
||||||
|
...auto.metadata,
|
||||||
|
alias,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<ButtonIcon onClick={() => onRemove(autoIndex)} icon={<TrashIcon />} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,101 @@
|
|||||||
|
.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;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.25em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item--title .input-text-view span {
|
||||||
|
max-height: 1.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item--title>span, .automation-list-box--body--item--title>b>span {
|
||||||
|
font-size: 0.75em;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.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(--mui-grey-400);
|
||||||
|
border-style: solid;
|
||||||
|
border-width: 1px;
|
||||||
|
border-radius: 0.5em;
|
||||||
|
padding: 0.1em 0.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item--tags--item {
|
||||||
|
color: white;
|
||||||
|
border-color: white;
|
||||||
|
border-style: solid;
|
||||||
|
border-width: 1px;
|
||||||
|
border-radius: 0.5em;
|
||||||
|
padding: 0.1em 0.5em;
|
||||||
|
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
gap: 0.25em;
|
||||||
|
max-width: min-content;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item--tags--item>.text:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item--tags--item>.text {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item--tags--item>.text .MuiFilledInput-root {
|
||||||
|
padding: 0;
|
||||||
|
min-width: 6em;
|
||||||
|
max-width: 10em;
|
||||||
|
background-color: var(--mui-common-black);
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item--tags--item>.text .icon {
|
||||||
|
position: absolute;
|
||||||
|
right: 0.5em;
|
||||||
|
top: 0.5em;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item--tags--item>.text .icon:hover {
|
||||||
|
background-color: var(--mui-grey-400);
|
||||||
|
border-radius: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item--tags--item>.text .icon:hover svg {
|
||||||
|
fill: var(--mui-common-black);
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item--tags--item .delete {
|
||||||
|
font-size: 1em;
|
||||||
|
color: var(--mui-error-light);
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item--tags--item .delete:hover {
|
||||||
|
color: var(--mui-error-dark);
|
||||||
|
outline: 1px solid var(--mui-error-dark);
|
||||||
|
border-radius: 20px;
|
||||||
|
}
|
||||||
@@ -1,27 +1,181 @@
|
|||||||
import { FC } from "react"
|
import "./AutomationMetadataBox.css";
|
||||||
import { AutomationMetadata } from "types/automations"
|
import { CheckMarkIcon } from "components/Icons";
|
||||||
|
import { FC, useState } from "react";
|
||||||
|
import { AutomationMetadata } from "types/automations";
|
||||||
|
import { InputAutoComplete } from "components/Inputs/InputAutoComplete";
|
||||||
|
import { TagDB } from "./TagDB";
|
||||||
|
import DeleteIcon from "@mui/icons-material/ClearTwoTone";
|
||||||
|
import { InputTextView } from "components/Inputs/InputTextView";
|
||||||
|
|
||||||
export const MetadataBox: FC<{
|
export const MetadataBox: FC<{
|
||||||
metadata: AutomationMetadata,
|
metadata: AutomationMetadata;
|
||||||
tags: Record<string, string>,
|
onAliasUpdate: (t: string) => void;
|
||||||
}> = (auto) => {
|
onTagUpdate: (t: [string, string][]) => void;
|
||||||
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
|
tags: [string, string][];
|
||||||
if (auto.metadata) {
|
tagsDB: TagDB;
|
||||||
title = <>
|
}> = ({ tags, onTagUpdate, onAliasUpdate, tagsDB, metadata }) => {
|
||||||
<b>{String(auto.metadata.alias ?? "").slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
|
// state
|
||||||
<span>{String(auto.metadata.description ?? "").slice(0, 25)}</span>
|
const [newTag, setNewTag] = useState<
|
||||||
</>
|
| {
|
||||||
}
|
on: false;
|
||||||
return <div
|
}
|
||||||
className="automation-list-box--body--item--title"
|
| {
|
||||||
>
|
on: true;
|
||||||
{title}
|
name: string;
|
||||||
<div
|
value: string;
|
||||||
className="automation-list-box--body--item--tags"
|
}
|
||||||
>
|
>({ on: false });
|
||||||
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
|
// alias
|
||||||
<b>{tagName}:</b> {auto.tags[tagName]}
|
const tagOptions = tagsDB.getTagNames(tags.map((t) => t[0]));
|
||||||
</span>)}
|
|
||||||
</div>
|
// render
|
||||||
|
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>;
|
||||||
|
if (metadata) {
|
||||||
|
title = (
|
||||||
|
<>
|
||||||
|
<b className="text">
|
||||||
|
<InputTextView
|
||||||
|
value={metadata.alias ?? ""}
|
||||||
|
onChange={onAliasUpdate}
|
||||||
|
/>
|
||||||
|
<span>({String(metadata.id).slice(0, 10)})</span>
|
||||||
|
</b>
|
||||||
|
<span>{String(metadata.description ?? "").slice(0, 25)}</span>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<div className="automation-list-box--body--item--title">
|
||||||
|
{title}
|
||||||
|
<div className="automation-list-box--body--item--tags">
|
||||||
|
{tags.map(([tagName, tagValue], tagIndex) => (
|
||||||
|
<MetadataBoxTag
|
||||||
|
options={[tagOptions, tagsDB.getTagValues(tagName)]}
|
||||||
|
key={tagIndex}
|
||||||
|
value={[tagName, tagValue]}
|
||||||
|
onDelete={() =>
|
||||||
|
onTagUpdate([
|
||||||
|
...tags.slice(0, tagIndex),
|
||||||
|
...tags.slice(tagIndex + 1),
|
||||||
|
])
|
||||||
|
}
|
||||||
|
onChange={([newName, newValue]) =>
|
||||||
|
onTagUpdate([
|
||||||
|
...tags.slice(0, tagIndex),
|
||||||
|
[newName, newValue],
|
||||||
|
...tags.slice(tagIndex + 1),
|
||||||
|
])
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
{newTag.on ? (
|
||||||
|
<MetadataBoxTag
|
||||||
|
options={[tagOptions, tagsDB.getTagValues(newTag.name)]}
|
||||||
|
key="new"
|
||||||
|
value={[newTag.name, newTag.value]}
|
||||||
|
initialState={true}
|
||||||
|
onChange={([name, value]) => {
|
||||||
|
setNewTag({
|
||||||
|
on: true,
|
||||||
|
name,
|
||||||
|
value,
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
onToggle={(em) => {
|
||||||
|
if (!em) {
|
||||||
|
if (newTag.name.trim() !== "" && newTag.value.trim() !== "") {
|
||||||
|
onTagUpdate(tags.concat([[newTag.name, newTag.value]]));
|
||||||
|
setNewTag({
|
||||||
|
on: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
setNewTag({
|
||||||
|
on: false,
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<span
|
||||||
|
className="automation-list-box--body--item--tags--add"
|
||||||
|
onClick={() =>
|
||||||
|
setNewTag({
|
||||||
|
on: true,
|
||||||
|
name: "",
|
||||||
|
value: "",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
>
|
||||||
|
+
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const MetadataBoxTag: FC<{
|
||||||
|
value: [string, string];
|
||||||
|
onChange: (t: [string, string]) => void;
|
||||||
|
options: [string[], string[]];
|
||||||
|
initialState?: boolean;
|
||||||
|
onToggle?: (em: boolean) => void;
|
||||||
|
onDelete?: () => void;
|
||||||
|
}> = (props) => {
|
||||||
|
const [editMode, setEditMode] = useState(
|
||||||
|
props.initialState ? props.initialState : false
|
||||||
|
);
|
||||||
|
const toggle = () => {
|
||||||
|
if (editMode) {
|
||||||
|
if (props.value[0].trim() === "" || props.value[1].trim() === "") {
|
||||||
|
props.onToggle && props.onToggle(true);
|
||||||
|
return setEditMode(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
props.onToggle && props.onToggle(!editMode);
|
||||||
|
setEditMode(!editMode);
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<span className="automation-list-box--body--item--tags--item">
|
||||||
|
{props.onDelete && (
|
||||||
|
<DeleteIcon onClick={props.onDelete} className="delete" />
|
||||||
|
)}
|
||||||
|
{editMode ? (
|
||||||
|
<InputAutoComplete
|
||||||
|
multiple={false}
|
||||||
|
className="text"
|
||||||
|
disableChips
|
||||||
|
options={props.options[0]}
|
||||||
|
label=""
|
||||||
|
value={props.value[0]}
|
||||||
|
onEnter={toggle}
|
||||||
|
onChange={(v) => props.onChange([v ?? "", props.value[1]])}
|
||||||
|
onlyShowLabel
|
||||||
|
endAdornment={<CheckMarkIcon className="icon" onClick={toggle} />}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<b className="text" onClick={toggle}>
|
||||||
|
{props.value[0]}:
|
||||||
|
</b>
|
||||||
|
)}
|
||||||
|
{editMode ? (
|
||||||
|
<InputAutoComplete
|
||||||
|
multiple={false}
|
||||||
|
className="text"
|
||||||
|
disableChips
|
||||||
|
options={props.options[1]}
|
||||||
|
label=""
|
||||||
|
value={props.value[1]}
|
||||||
|
onEnter={toggle}
|
||||||
|
onChange={(v) => props.onChange([props.value[0], v ?? ""])}
|
||||||
|
onlyShowLabel
|
||||||
|
endAdornment={<CheckMarkIcon className="icon" onClick={toggle} />}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<span className="text" onClick={toggle}>
|
||||||
|
{props.value[1]}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
import { MetadataBoxTag } from "./AutomationMetadataBox";
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: "App/AutomationList/Box",
|
||||||
|
component: MetadataBoxTag,
|
||||||
|
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||||
|
args: {
|
||||||
|
value: ["Type", "Climate"],
|
||||||
|
options: [[], []],
|
||||||
|
},
|
||||||
|
} as ComponentMeta<typeof MetadataBoxTag>;
|
||||||
|
|
||||||
|
export const BoxTag: ComponentStory<typeof MetadataBoxTag> = (args) => {
|
||||||
|
const [state, setState] = useState(args.value);
|
||||||
|
return (
|
||||||
|
<Page>
|
||||||
|
<MetadataBoxTag
|
||||||
|
options={args.options}
|
||||||
|
value={state}
|
||||||
|
onChange={(v) => {
|
||||||
|
setState(v);
|
||||||
|
args.onChange(v);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Page>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -2,34 +2,31 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
|
|||||||
import { ConnectedAutomationList } from ".";
|
import { ConnectedAutomationList } from ".";
|
||||||
import { createMockAuto } from "utils/mocks";
|
import { createMockAuto } from "utils/mocks";
|
||||||
import { useMockApiService } from "apiService";
|
import { useMockApiService } from "apiService";
|
||||||
import { DEFAULT_DIMS } from 'components/DAGFlow/constants';
|
|
||||||
import { Page } from "components/Page";
|
import { Page } from "components/Page";
|
||||||
|
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'App/AutomationList/Connected',
|
title: "App/AutomationList/MockConnected",
|
||||||
component: ConnectedAutomationList,
|
component: ConnectedAutomationList,
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||||
args: {
|
args: {
|
||||||
dims: DEFAULT_DIMS,
|
dims: DEFAULT_DIMS,
|
||||||
initialAutomations: [],
|
initialAutomations: [],
|
||||||
}
|
},
|
||||||
} as ComponentMeta<typeof ConnectedAutomationList>;
|
} 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 <Page>
|
return (
|
||||||
<ConnectedAutomationList
|
<Page>
|
||||||
{...args}
|
<ConnectedAutomationList {...args} api={api} />
|
||||||
api={api}
|
</Page>
|
||||||
/>
|
);
|
||||||
</Page>
|
};
|
||||||
}
|
|
||||||
|
|
||||||
export const EmptyStart = Template.bind({})
|
export const EmptyStart = Template.bind({});
|
||||||
|
|
||||||
|
export const FewAutos = Template.bind({});
|
||||||
export const FewAutos = Template.bind({})
|
|
||||||
FewAutos.args = {
|
FewAutos.args = {
|
||||||
...FewAutos.args,
|
...FewAutos.args,
|
||||||
initialAutomations: [
|
initialAutomations: [
|
||||||
@@ -44,21 +41,23 @@ FewAutos.args = {
|
|||||||
createMockAuto(),
|
createMockAuto(),
|
||||||
createMockAuto(),
|
createMockAuto(),
|
||||||
],
|
],
|
||||||
}
|
};
|
||||||
|
|
||||||
export const Loading: ComponentStory<any> = args => {
|
export const Loading: ComponentStory<any> = (args) => {
|
||||||
const api = useMockApiService(args.initialAutomations);
|
const api = useMockApiService(args.initialAutomations);
|
||||||
return <Page>
|
return (
|
||||||
<ConnectedAutomationList
|
<Page>
|
||||||
{...args}
|
<ConnectedAutomationList
|
||||||
api={{
|
{...args}
|
||||||
...api,
|
api={{
|
||||||
state: {
|
...api,
|
||||||
"automations": {
|
state: {
|
||||||
"ready": false
|
automations: {
|
||||||
}
|
ready: false,
|
||||||
}
|
},
|
||||||
}}
|
},
|
||||||
/>
|
}}
|
||||||
</Page>
|
/>
|
||||||
}
|
</Page>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -2,23 +2,25 @@ import { AutomationData } from "types/automations";
|
|||||||
|
|
||||||
export type TagDB = ReturnType<typeof makeTagDB>;
|
export type TagDB = ReturnType<typeof makeTagDB>;
|
||||||
export const makeTagDB = (automations: AutomationData[]) => {
|
export const makeTagDB = (automations: AutomationData[]) => {
|
||||||
const allTags: Record<string, Set<string>> = {};
|
const allTags: Record<string, Set<string>> = {};
|
||||||
automations.forEach(({ tags }) =>
|
automations.forEach(({ tags }) =>
|
||||||
Object.keys(tags).forEach(tagName => {
|
Object.keys(tags).forEach((tagName) => {
|
||||||
const tagValue = tags[tagName];
|
const tagValue = tags[tagName];
|
||||||
if (!allTags[tagName]) {
|
if (!allTags[tagName]) {
|
||||||
allTags[tagName] = new Set()
|
allTags[tagName] = new Set();
|
||||||
}
|
}
|
||||||
allTags[tagName].add(tagValue);
|
allTags[tagName].add(tagValue);
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
const allTagNames = Object.keys(allTags);
|
const allTagNames = Object.keys(allTags);
|
||||||
return {
|
return {
|
||||||
getTagNames(myTags: string[]): string[] {
|
getTagNames(myTags: string[]): string[] {
|
||||||
return allTagNames.filter(n => !myTags.includes(n)).sort()
|
return allTagNames.filter((n) => !myTags.includes(n)).sort();
|
||||||
},
|
},
|
||||||
getTagValues(tagName: string): string[] {
|
getTagValues(tagName: string): string[] {
|
||||||
return allTags[tagName] ? Array.from(allTags[tagName].values()).sort() : [];
|
return allTags[tagName]
|
||||||
}
|
? Array.from(allTags[tagName].values()).sort()
|
||||||
}
|
: [];
|
||||||
}
|
},
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -50,6 +50,7 @@
|
|||||||
|
|
||||||
.automation-list--list.hide>.automation-list--list-hide {
|
.automation-list--list.hide>.automation-list--list-hide {
|
||||||
transform: rotate(180deg);
|
transform: rotate(180deg);
|
||||||
|
left: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* list children: normal */
|
/* list children: normal */
|
||||||
@@ -58,8 +59,10 @@
|
|||||||
border-width: 1px;
|
border-width: 1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list--list-hide {
|
.automation-list--list .automation-list--list-hide {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 0.5em;
|
bottom: 0em;
|
||||||
right: 0.5em;
|
left: 0.5em;
|
||||||
|
max-width: 1.5em;
|
||||||
|
max-height: 1.5em;
|
||||||
}
|
}
|
||||||
@@ -14,29 +14,7 @@
|
|||||||
|
|
||||||
.automation-list--root.mobile .automation-list--list-hide {
|
.automation-list--root.mobile .automation-list--list-hide {
|
||||||
transform: rotate(90deg);
|
transform: rotate(90deg);
|
||||||
left: 1.25em;
|
left: 0.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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -50,21 +28,11 @@
|
|||||||
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
|
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
|
||||||
transform: rotate(270deg);
|
transform: rotate(270deg);
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0.75em;
|
top: 0.5em;
|
||||||
z-index: 20;
|
z-index: 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* info box hide */
|
.automation-list--root.mobile .automation-editor--flow-wrapper>.automation-editor--flow-wrapper--toolbar .input-text-view,
|
||||||
.automation-list--root.mobile .automation-editor--info-box.hide {
|
.automation-list--root.mobile .automation-editor--flow-wrapper>.automation-editor--flow-wrapper--toolbar .id {
|
||||||
width: 100vw;
|
display: none;
|
||||||
min-height: 0;
|
|
||||||
max-height: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon {
|
|
||||||
transform: rotate(270deg);
|
|
||||||
position: fixed;
|
|
||||||
top: 0.75em;
|
|
||||||
background-color: var(--green-opaque);
|
|
||||||
z-index: 30;
|
|
||||||
}
|
}
|
||||||
@@ -1,110 +1,213 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
import "./index.mobile.css";
|
import "./index.mobile.css";
|
||||||
import { AutomationEditor } from "components/AutomationEditor";
|
import { AutomationEditor } from "components/AutomationEditor";
|
||||||
import { FC, ReactNode, useState } from "react";
|
import { FC, ReactNode, useState, useRef, useEffect } from "react";
|
||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import { defaultAutomation } from 'utils/defaults';
|
import { defaultAutomation } from "utils/defaults";
|
||||||
import { ArrowIcon } 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 { AutomationListBox } from "./AutomationListBox";
|
||||||
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
|
|
||||||
import useWindowSize from "utils/useWindowSize";
|
import useWindowSize from "utils/useWindowSize";
|
||||||
import { makeTagDB } from "./TagDB";
|
import { makeTagDB } from "./TagDB";
|
||||||
import LinearProgress from "@mui/material/LinearProgress";
|
import LinearProgress from "@mui/material/LinearProgress";
|
||||||
import CircularProgress from "@mui/material/CircularProgress";
|
import CircularProgress from "@mui/material/CircularProgress";
|
||||||
|
import { useCookies } from "react-cookie";
|
||||||
|
import { useHA } from "haService";
|
||||||
|
import { ArrowBack } from "@mui/icons-material";
|
||||||
|
import { useSnackbar } from "notistack";
|
||||||
|
import { DAGDims } from "components/DAGGraph/elements/types";
|
||||||
|
import { ListData, ListParams } from "apiService/types";
|
||||||
|
|
||||||
interface AutomationListParams {
|
interface AutomationListParams {
|
||||||
automations: AutomationData[];
|
automations: ListData<AutomationData>;
|
||||||
onUpdate: (i: number, auto: AutomationData) => void;
|
onUpdate: (i: number, auto: AutomationData) => void;
|
||||||
|
onUpdateTags: (id: string, tags: Record<string, string>) => void;
|
||||||
onAdd: (auto: AutomationData) => void;
|
onAdd: (auto: AutomationData) => void;
|
||||||
onRemove: (i: number) => void;
|
onRemove: (i: number) => void;
|
||||||
dims: DAGAutomationFlowDims;
|
onLoadMore: (p: ListParams) => void;
|
||||||
|
dims: DAGDims;
|
||||||
children?: ReactNode;
|
children?: ReactNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const useAutomationListState = () => {
|
||||||
|
const [
|
||||||
|
cookies,
|
||||||
|
setCookies,
|
||||||
|
// eslint-disable-next-line
|
||||||
|
_,
|
||||||
|
] = useCookies(["alCurrent"]);
|
||||||
|
let initialCurrent = 0;
|
||||||
|
try {
|
||||||
|
initialCurrent = Number(cookies.alCurrent ?? "0");
|
||||||
|
} catch (_) {}
|
||||||
|
|
||||||
|
const [hideList, setHideList] = useState(false);
|
||||||
|
const [current, setCurrent] = useState(initialCurrent);
|
||||||
|
|
||||||
|
return {
|
||||||
|
hideList,
|
||||||
|
setHideList,
|
||||||
|
current,
|
||||||
|
setCurrent(i: number) {
|
||||||
|
setCurrent(i);
|
||||||
|
setCookies("alCurrent", String(i));
|
||||||
|
},
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
export const AutomationList: FC<AutomationListParams> = ({
|
export const AutomationList: FC<AutomationListParams> = ({
|
||||||
automations,
|
automations,
|
||||||
|
onLoadMore,
|
||||||
onUpdate,
|
onUpdate,
|
||||||
|
onUpdateTags,
|
||||||
onAdd,
|
onAdd,
|
||||||
onRemove,
|
onRemove,
|
||||||
dims,
|
dims,
|
||||||
children,
|
children,
|
||||||
}) => {
|
}) => {
|
||||||
// state
|
// state
|
||||||
const [hideList, setHideList] = useState(false);
|
const snackbr = useSnackbar();
|
||||||
const [current, setCurrent] = useState(0);
|
const { hideList, setHideList, current, setCurrent } =
|
||||||
|
useAutomationListState();
|
||||||
const { isMobile } = useWindowSize();
|
const { isMobile } = useWindowSize();
|
||||||
|
const firstRender = useRef(true);
|
||||||
// alias
|
// alias
|
||||||
const currentAuto = automations.length > 0 ? automations[current] : null;
|
const currentAuto =
|
||||||
const tagDB = makeTagDB(automations);
|
automations.data.length > 0
|
||||||
|
? automations.data[current - automations.params.offset]
|
||||||
|
: null;
|
||||||
|
const tagDB = makeTagDB(automations.data);
|
||||||
|
// effect
|
||||||
|
useEffect(() => {
|
||||||
|
if (firstRender.current) {
|
||||||
|
snackbr.enqueueSnackbar("Saved.", { variant: "info" });
|
||||||
|
}
|
||||||
|
firstRender.current = true;
|
||||||
|
// eslint-disable-next-line
|
||||||
|
}, [automations]);
|
||||||
// render
|
// render
|
||||||
return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}>
|
return (
|
||||||
<div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}>
|
<div
|
||||||
<AutomationListBox
|
className={["automation-list--root", isMobile ? "mobile" : ""].join(" ")}
|
||||||
automations={automations}
|
>
|
||||||
onAdd={() => {
|
<div
|
||||||
onAdd(defaultAutomation(String(Date.now())));
|
className={["automation-list--list", hideList ? "hide" : "show"].join(
|
||||||
setCurrent(automations.length)
|
" "
|
||||||
}}
|
)}
|
||||||
onSelectAutomation={i => {
|
>
|
||||||
setCurrent(i);
|
<AutomationListBox
|
||||||
if (isMobile) {
|
automations={automations}
|
||||||
setHideList(true)
|
onUpdate={(a, i) => onUpdate(i, a)}
|
||||||
}
|
onUpdateTags={onUpdateTags}
|
||||||
}}
|
onAdd={() => {
|
||||||
selected={current}
|
onAdd(defaultAutomation(String(Date.now())));
|
||||||
onRemove={onRemove}
|
setCurrent(automations.data.length);
|
||||||
/>
|
if (isMobile) {
|
||||||
<ButtonIcon
|
setHideList(true);
|
||||||
onClick={() => setHideList(!hideList)}
|
}
|
||||||
className="automation-list--list-hide"
|
}}
|
||||||
Icon={ArrowIcon}
|
onSelectAutomation={(i) => {
|
||||||
/>
|
setCurrent(i);
|
||||||
|
if (isMobile) {
|
||||||
|
setHideList(true);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
onLoadMore={onLoadMore}
|
||||||
|
selected={current}
|
||||||
|
onRemove={onRemove}
|
||||||
|
tagsDB={tagDB}
|
||||||
|
/>
|
||||||
|
<ButtonIcon
|
||||||
|
onClick={() => setHideList(!hideList)}
|
||||||
|
className="automation-list--list-hide"
|
||||||
|
icon={<ArrowBack />}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="automation-list--viewer">
|
||||||
|
{currentAuto ? (
|
||||||
|
<AutomationEditor
|
||||||
|
automation={currentAuto}
|
||||||
|
onUpdate={(a) => onUpdate(current, a)}
|
||||||
|
dims={{
|
||||||
|
...dims,
|
||||||
|
flipped: isMobile,
|
||||||
|
}}
|
||||||
|
tagDB={tagDB}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<></>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{children}
|
||||||
</div>
|
</div>
|
||||||
<div className="automation-list--viewer">
|
);
|
||||||
{currentAuto ? <AutomationEditor
|
};
|
||||||
automation={currentAuto}
|
|
||||||
onUpdate={a => onUpdate(current, a)}
|
|
||||||
dims={dims}
|
|
||||||
tagDB={tagDB}
|
|
||||||
/> : <></>}
|
|
||||||
</div>
|
|
||||||
{children}
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ConnectedAutomationListParams {
|
interface ConnectedAutomationListParams {
|
||||||
dims: DAGAutomationFlowDims;
|
dims: DAGDims;
|
||||||
api: ApiService;
|
api: ApiService;
|
||||||
}
|
}
|
||||||
export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
|
export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
|
||||||
api: {
|
api: {
|
||||||
state: {
|
state: { automations },
|
||||||
automations,
|
...methods
|
||||||
},
|
|
||||||
removeAutomation,
|
|
||||||
updateAutomation,
|
|
||||||
},
|
},
|
||||||
dims
|
dims,
|
||||||
}) => {
|
}) => {
|
||||||
|
const { reloadAutomations } = useHA();
|
||||||
|
const [saving, setSaving] = useState(false);
|
||||||
|
const updateTags = async (id: string, tags: Record<string, string>) => {
|
||||||
|
const resp = await methods.updateTags({
|
||||||
|
automation_id: id,
|
||||||
|
tags,
|
||||||
|
});
|
||||||
|
setSaving(true);
|
||||||
|
await reloadAutomations();
|
||||||
|
setSaving(false);
|
||||||
|
return resp;
|
||||||
|
};
|
||||||
|
const removeAutomation = async (args: any) => {
|
||||||
|
const resp = await methods.removeAutomation(args);
|
||||||
|
setSaving(true);
|
||||||
|
await reloadAutomations();
|
||||||
|
setSaving(false);
|
||||||
|
return resp;
|
||||||
|
};
|
||||||
|
const updateAutomation = async (args: any) => {
|
||||||
|
const resp = await methods.updateAutomation(args);
|
||||||
|
setSaving(true);
|
||||||
|
await reloadAutomations();
|
||||||
|
setSaving(false);
|
||||||
|
return resp;
|
||||||
|
};
|
||||||
|
|
||||||
if (!automations.ready) {
|
if (!automations.ready) {
|
||||||
return <div className="automation-list--root loading">
|
return (
|
||||||
<LinearProgress />
|
<div className="automation-list--root loading">
|
||||||
<div className="automation-list--circle-loader">
|
<LinearProgress />
|
||||||
<CircularProgress />
|
<div className="automation-list--circle-loader">
|
||||||
|
<CircularProgress />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
);
|
||||||
}
|
}
|
||||||
if (!automations.ok) {
|
if (!automations.ok) {
|
||||||
return <span>Error {automations.error}</span>
|
return <span>Error {automations.error}</span>;
|
||||||
}
|
}
|
||||||
return <AutomationList
|
return (
|
||||||
dims={dims}
|
<>
|
||||||
automations={automations.data.data}
|
{saving && <LinearProgress />}
|
||||||
onAdd={auto => updateAutomation({ auto, index: automations.data.totalItems + 1 })}
|
<AutomationList
|
||||||
onRemove={index => removeAutomation({ index })}
|
dims={dims}
|
||||||
onUpdate={(index, auto) => updateAutomation({ index, auto })}
|
automations={automations.data}
|
||||||
/>
|
onUpdateTags={updateTags}
|
||||||
}
|
onLoadMore={() => {}}
|
||||||
|
onAdd={(auto) =>
|
||||||
|
updateAutomation({ auto, index: automations.data.totalItems + 1 })
|
||||||
|
}
|
||||||
|
onRemove={(index) => removeAutomation({ index })}
|
||||||
|
onUpdate={(index, auto) => updateAutomation({ index, auto })}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
|
||||||
import { useState } from "react";
|
|
||||||
import { ConditionEditor } from ".";
|
|
||||||
import { AutomationCondition } from 'types/automations/conditions';
|
|
||||||
import { Page } from "components/Page";
|
|
||||||
|
|
||||||
export default {
|
|
||||||
title: 'ConditionEditor',
|
|
||||||
component: ConditionEditor,
|
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
|
||||||
} as ComponentMeta<typeof ConditionEditor>;
|
|
||||||
|
|
||||||
|
|
||||||
export const Basic: ComponentStory<typeof ConditionEditor> = args => {
|
|
||||||
const [state, setState] = useState<AutomationCondition>({
|
|
||||||
"condition": "or",
|
|
||||||
"conditions": [
|
|
||||||
{
|
|
||||||
"condition": "and",
|
|
||||||
"conditions": [
|
|
||||||
{
|
|
||||||
"condition": "numeric_state",
|
|
||||||
"entity_id": [
|
|
||||||
"sensor.kitchen_humidity"
|
|
||||||
],
|
|
||||||
"above": "40"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"condition": "template",
|
|
||||||
"value_template": "states('switch.kitchen') == 'on'"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"condition": "numeric_state",
|
|
||||||
"entity_id": [
|
|
||||||
"sensor.kitchen_temperature"
|
|
||||||
],
|
|
||||||
"above": "51"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
})
|
|
||||||
return (
|
|
||||||
<Page>
|
|
||||||
<ConditionEditor
|
|
||||||
onUpdate={setState}
|
|
||||||
onDelete={() => { }}
|
|
||||||
condition={state}
|
|
||||||
/>
|
|
||||||
</Page>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,133 +0,0 @@
|
|||||||
import { Classes } from "jss";
|
|
||||||
import { FC, useState, useEffect } from 'react';
|
|
||||||
import { getConditionDefaultValues } from "utils/defaults";
|
|
||||||
import { AutomationCondition } from "types/automations/conditions";
|
|
||||||
import { CheckMarkIcon, PencilIcon } from "components/Icons";
|
|
||||||
import { InputList } from "components/Inputs/InputList";
|
|
||||||
import InputYaml from "components/Inputs/InputYaml";
|
|
||||||
import { getEditor } from "./editorRender";
|
|
||||||
import { useStyles } from "./style";
|
|
||||||
import { getViewer } from "./viewRender";
|
|
||||||
import useWindowSize from "utils/useWindowSize";
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export const ConditionNode: FC<{
|
|
||||||
condition: AutomationCondition;
|
|
||||||
displayMode: boolean;
|
|
||||||
showDelete?: boolean;
|
|
||||||
onDelete?: (which: 'root' | number) => void;
|
|
||||||
onUpdate?: (data: AutomationCondition) => void;
|
|
||||||
children?: (props: {
|
|
||||||
classes: Classes<string>
|
|
||||||
}) => JSX.Element,
|
|
||||||
}> = ({
|
|
||||||
condition,
|
|
||||||
showDelete = false,
|
|
||||||
displayMode = true,
|
|
||||||
onDelete = () => { },
|
|
||||||
onUpdate = () => { },
|
|
||||||
children = () => { },
|
|
||||||
}) => {
|
|
||||||
// state
|
|
||||||
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
|
|
||||||
const [yamlMode, setYamlMode] = useState(false);
|
|
||||||
const { isMobile } = useWindowSize();
|
|
||||||
// alias
|
|
||||||
const effectiveDM = internalDisplayMode || yamlMode;
|
|
||||||
// effect
|
|
||||||
useEffect(() => {
|
|
||||||
setInternalDisplayMode(displayMode);
|
|
||||||
}, [displayMode])
|
|
||||||
useEffect(() => {
|
|
||||||
if (yamlMode) {
|
|
||||||
setInternalDisplayMode(true);
|
|
||||||
}
|
|
||||||
}, [yamlMode])
|
|
||||||
// alias
|
|
||||||
const onAddChild = () => {
|
|
||||||
if (
|
|
||||||
(condition.condition === 'and') ||
|
|
||||||
(condition.condition === 'or') ||
|
|
||||||
(condition.condition === 'not')
|
|
||||||
) {
|
|
||||||
onUpdate({
|
|
||||||
...condition,
|
|
||||||
conditions: condition.conditions.concat({
|
|
||||||
condition: 'or',
|
|
||||||
conditions: []
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// children
|
|
||||||
let childrenConditions: JSX.Element;
|
|
||||||
if (effectiveDM) {
|
|
||||||
const Viewer = getViewer(condition);
|
|
||||||
childrenConditions = <Viewer condition={condition} onChange={onUpdate} />
|
|
||||||
} else {
|
|
||||||
const Editor = getEditor(condition);
|
|
||||||
childrenConditions = <Editor condition={condition} onChange={onUpdate} />
|
|
||||||
}
|
|
||||||
// styles
|
|
||||||
let hasChildren = false;
|
|
||||||
if (condition.condition === "not") {
|
|
||||||
hasChildren = true
|
|
||||||
} else if (condition.condition === 'and') {
|
|
||||||
hasChildren = true
|
|
||||||
} else if (condition.condition === 'or') {
|
|
||||||
hasChildren = true
|
|
||||||
}
|
|
||||||
const { classes } = useStyles({ hasChildren, isMobile });
|
|
||||||
|
|
||||||
// components
|
|
||||||
const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) =>
|
|
||||||
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
|
|
||||||
|
|
||||||
return <div className={classes.root}>
|
|
||||||
<>
|
|
||||||
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
|
|
||||||
<div className={classes.title}>
|
|
||||||
<InputList
|
|
||||||
label=""
|
|
||||||
className={classes.titleText}
|
|
||||||
current={condition.condition}
|
|
||||||
options={[
|
|
||||||
'or', 'not', 'and',
|
|
||||||
'template',
|
|
||||||
'numeric_state',
|
|
||||||
'state',
|
|
||||||
'time',
|
|
||||||
'trigger',
|
|
||||||
'zone',
|
|
||||||
]}
|
|
||||||
onChange={(n: any) => onUpdate({
|
|
||||||
...getConditionDefaultValues(n),
|
|
||||||
...condition,
|
|
||||||
condition: n,
|
|
||||||
} as any)}
|
|
||||||
/>
|
|
||||||
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
|
|
||||||
{yamlMode ? 'visual' : 'yaml'}
|
|
||||||
</button>}
|
|
||||||
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
|
|
||||||
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
|
|
||||||
</button>}
|
|
||||||
</div>
|
|
||||||
<div className={classes.children}>
|
|
||||||
{yamlMode && <InputYaml
|
|
||||||
label=""
|
|
||||||
value={condition}
|
|
||||||
onChange={update => onUpdate(update as any)}
|
|
||||||
/>}
|
|
||||||
<div className={classes.conditionWrap}>
|
|
||||||
{!yamlMode && childrenConditions}
|
|
||||||
</div>
|
|
||||||
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
|
|
||||||
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
|
|
||||||
</div>}
|
|
||||||
</div>
|
|
||||||
{children({ classes })}
|
|
||||||
</>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
.condition-node-base {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
max-height: 85vh;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node-base--list {
|
||||||
|
max-width: 10em;
|
||||||
|
width: 7em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node-base--body {
|
||||||
|
flex: 1;
|
||||||
|
min-height: 1.5em;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.condition-node-base--body--children.view {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
min-height: calc(100% - 1px);
|
||||||
|
max-height: calc(100% - 1px);
|
||||||
|
background-color: var(--mui-secondary-contrastText);
|
||||||
|
border-color: var(--mui-grey-700);
|
||||||
|
border-bottom-style: solid;
|
||||||
|
border-width: 1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node-base--body .input-yaml {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node-base--body {
|
||||||
|
overflow: auto;
|
||||||
|
max-width: 100vw;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node-base--body .condition-node-base--body--children {
|
||||||
|
flex: 1;
|
||||||
|
padding-left: 0.5em;
|
||||||
|
max-width: 100vw;
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node-base.is-edited>.condition-node-base--body {
|
||||||
|
max-height: calc(100%-2px-1em);
|
||||||
|
max-width: calc(100vw-2px-1em);
|
||||||
|
min-width: 15em;
|
||||||
|
border-color: var(--mui-success-main);
|
||||||
|
border-style: solid;
|
||||||
|
border-width: 1px;
|
||||||
|
margin: 0.25em;
|
||||||
|
padding: 0.25em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node--logic-viewer--add {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
padding: 0.5em;
|
||||||
|
background-color: var(--mui-secondary-contrastText);
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node--time-editor {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.25em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node--time-editor--ba {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
justify-content: flex-start;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.5em;
|
||||||
|
padding-top: 1.5em;
|
||||||
|
padding-bottom: 0.25em;
|
||||||
|
position: relative;
|
||||||
|
width: fit-content;
|
||||||
|
max-width: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node--time-editor--ba button.remove {
|
||||||
|
padding: 0.25em;
|
||||||
|
min-width: fit-content;
|
||||||
|
color: var(--mui-error-light);
|
||||||
|
border-color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node--time-editor--ba button.remove:hover {
|
||||||
|
border-color: var(--mui-error-light);
|
||||||
|
border-radius: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node--time-editor--ba .label {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0.2em;
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
.condition-node-base.mobile {
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node-base.mobile .condition-node-base--list {
|
||||||
|
flex-direction: row;
|
||||||
|
display: flex;
|
||||||
|
min-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node-base.mobile .condition-node-base--body {
|
||||||
|
min-height: 3em;
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node-base.mobile .condition-node-base--body.edit {
|
||||||
|
max-height: 500px;
|
||||||
|
}
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
import { useState } from "react";
|
||||||
|
import { AutomationCondition } from "types/automations/conditions";
|
||||||
|
import { ConditionNodeBase } from "./ConditionNodeBase";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: "ConditionEditor/NodeBase",
|
||||||
|
component: ConditionNodeBase,
|
||||||
|
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||||
|
} as ComponentMeta<typeof ConditionNodeBase>;
|
||||||
|
|
||||||
|
const Template: ComponentStory<typeof ConditionNodeBase> = ({
|
||||||
|
condition,
|
||||||
|
...args
|
||||||
|
}) => {
|
||||||
|
const [data, setData] = useState(condition);
|
||||||
|
return (
|
||||||
|
<Page>
|
||||||
|
<ConditionNodeBase
|
||||||
|
{...args}
|
||||||
|
condition={data}
|
||||||
|
onUpdate={(data) => {
|
||||||
|
setData(data);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Page>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const TemplateViewer = Template.bind({});
|
||||||
|
TemplateViewer.args = {
|
||||||
|
condition: {
|
||||||
|
condition: "template",
|
||||||
|
value_template: "states('switch.light_kitchen') == 'on'",
|
||||||
|
} as AutomationCondition,
|
||||||
|
};
|
||||||
|
|
||||||
|
export const MultipleThings = Template.bind({});
|
||||||
|
MultipleThings.args = {
|
||||||
|
condition: {
|
||||||
|
condition: "or",
|
||||||
|
conditions: [
|
||||||
|
{
|
||||||
|
condition: "and",
|
||||||
|
conditions: [
|
||||||
|
{
|
||||||
|
condition: "numeric_state",
|
||||||
|
entity_id: ["sensor.kitchen_humidity"],
|
||||||
|
above: "40",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
condition: "template",
|
||||||
|
value_template: "states('switch.kitchen') == 'on'",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
condition: "numeric_state",
|
||||||
|
entity_id: ["sensor.kitchen_temperature"],
|
||||||
|
above: "51",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
} as AutomationCondition,
|
||||||
|
};
|
||||||
@@ -0,0 +1,130 @@
|
|||||||
|
import "./ConditionNodeBase.css";
|
||||||
|
import "./ConditionNodeBase.mobile.css";
|
||||||
|
|
||||||
|
import { InputList } from "components/Inputs/InputList";
|
||||||
|
import { FC, useState } from "react";
|
||||||
|
import { AutomationCondition } from "types/automations/conditions";
|
||||||
|
import { getSubTypeList } from "utils/automations";
|
||||||
|
import { getConditionDefaultValues } from "utils/defaults";
|
||||||
|
import { useHA } from "haService";
|
||||||
|
import InputYaml from "components/Inputs/InputYaml";
|
||||||
|
import { getViewer } from "./viewRender";
|
||||||
|
import { getEditor } from "./editorRender";
|
||||||
|
import useWindowSize from "utils/useWindowSize";
|
||||||
|
import { ConditionNodeSettings } from "./ConditionNodeSettings";
|
||||||
|
|
||||||
|
export type ConditionNodeBaseProps = {
|
||||||
|
condition: AutomationCondition;
|
||||||
|
onDelete?: () => void;
|
||||||
|
onUpdate: (data: AutomationCondition) => void;
|
||||||
|
disableDelete?: boolean;
|
||||||
|
initialViewMode?: ConditionNodeBaseViewMode;
|
||||||
|
};
|
||||||
|
export type ConditionNodeBaseViewMode = "edit" | "yaml" | "view";
|
||||||
|
export const ConditionNodeBase: FC<ConditionNodeBaseProps> = (props) => {
|
||||||
|
// state
|
||||||
|
const ha = useHA();
|
||||||
|
const { isMobile } = useWindowSize();
|
||||||
|
const [{ isEdited, condition }, setCondition] = useState<{
|
||||||
|
isEdited: boolean;
|
||||||
|
condition: AutomationCondition;
|
||||||
|
}>({
|
||||||
|
isEdited: false,
|
||||||
|
condition: props.condition,
|
||||||
|
});
|
||||||
|
const [mode, setMode] = useState<ConditionNodeBaseViewMode>(
|
||||||
|
props.initialViewMode ?? "view"
|
||||||
|
);
|
||||||
|
// alias
|
||||||
|
const updateCondition = (data: any) =>
|
||||||
|
setCondition({
|
||||||
|
isEdited: true,
|
||||||
|
condition: data,
|
||||||
|
});
|
||||||
|
|
||||||
|
// children
|
||||||
|
let childrenConditions: JSX.Element;
|
||||||
|
if (mode === "view") {
|
||||||
|
const Viewer = getViewer(condition);
|
||||||
|
childrenConditions = (
|
||||||
|
<Viewer
|
||||||
|
condition={condition}
|
||||||
|
onChange={updateCondition}
|
||||||
|
namer={ha.namer}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
const Editor = getEditor(condition);
|
||||||
|
childrenConditions = (
|
||||||
|
<Editor
|
||||||
|
condition={condition}
|
||||||
|
onChange={updateCondition}
|
||||||
|
ha={ha}
|
||||||
|
initialViewMode="edit"
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
// icons
|
||||||
|
const icons = (
|
||||||
|
<ConditionNodeSettings
|
||||||
|
onDelete={props.onDelete}
|
||||||
|
onModeSwitch={setMode}
|
||||||
|
onSave={() => {
|
||||||
|
props.onUpdate(condition);
|
||||||
|
setCondition({
|
||||||
|
isEdited: false,
|
||||||
|
condition,
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
mode={mode}
|
||||||
|
isEdited={isEdited}
|
||||||
|
disableDelete={props.disableDelete ?? false}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
// render
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className={[
|
||||||
|
"condition-node-base",
|
||||||
|
isMobile ? "mobile" : "",
|
||||||
|
isEdited ? "is-edited" : "",
|
||||||
|
].join(" ")}
|
||||||
|
>
|
||||||
|
<div className="condition-node-base--list">
|
||||||
|
<InputList
|
||||||
|
label=""
|
||||||
|
className="condition-node-base--list--select"
|
||||||
|
current={condition.condition}
|
||||||
|
options={getSubTypeList("condition")}
|
||||||
|
onChange={(n: any) =>
|
||||||
|
setCondition({
|
||||||
|
isEdited: true,
|
||||||
|
condition: {
|
||||||
|
...getConditionDefaultValues(n),
|
||||||
|
condition: n,
|
||||||
|
},
|
||||||
|
} as any)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
{isMobile && icons}
|
||||||
|
</div>
|
||||||
|
<div className={["condition-node-base--body", mode].join(" ")}>
|
||||||
|
{mode === "yaml" ? (
|
||||||
|
<InputYaml
|
||||||
|
key="yaml"
|
||||||
|
label=""
|
||||||
|
value={condition}
|
||||||
|
onChange={updateCondition}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<div
|
||||||
|
className={["condition-node-base--body--children", mode].join(" ")}
|
||||||
|
>
|
||||||
|
{childrenConditions}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{!isMobile && icons}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
.condition-node--settings {
|
||||||
|
width: 4em;
|
||||||
|
display: flex;
|
||||||
|
gap: 0.5em;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node--settings--icons {
|
||||||
|
display: inline-block;
|
||||||
|
max-width: 5em;
|
||||||
|
max-height: 5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node--settings--wrap {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
min-width: 5em;
|
||||||
|
min-height: 5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node--settings button.Mui-disabled {
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node--settings .speed-dial, .condition-node--settings .speed-dial--icon {
|
||||||
|
min-height: 2.5em;
|
||||||
|
height: 2.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node--settings .speed-dial--button {
|
||||||
|
max-width: 4em;
|
||||||
|
max-height: 4em;
|
||||||
|
height: 4em;
|
||||||
|
width: 4em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-node--settings .speed-dial--button:hover button {
|
||||||
|
background-color: var(--mui-grey-700);
|
||||||
|
}
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
import "./ConditionNodeSettings.css";
|
||||||
|
|
||||||
|
import { FC } from "react";
|
||||||
|
|
||||||
|
import CodeOutlinedIcon from "@mui/icons-material/CodeOutlined";
|
||||||
|
import CodeOffOutlinedIcon from "@mui/icons-material/CodeOffOutlined";
|
||||||
|
import EditOutlinedIcon from "@mui/icons-material/EditOutlined";
|
||||||
|
import SaveIcon from "@mui/icons-material/Save";
|
||||||
|
import EditOffIcon from "@mui/icons-material/EditOff";
|
||||||
|
import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
|
||||||
|
import SettingsApplicationsIcon from "@mui/icons-material/SettingsApplications";
|
||||||
|
|
||||||
|
import { ButtonIcon, ButtonIconProps } from "components/Icons/ButtonIcons";
|
||||||
|
import { SpeedDial } from "components/SpeedDial";
|
||||||
|
|
||||||
|
export type ConditionNodeSettingsProps = {
|
||||||
|
mode: ConditionNodeViewMode;
|
||||||
|
onModeSwitch: (m: ConditionNodeViewMode) => void;
|
||||||
|
isEdited: boolean;
|
||||||
|
disableDelete: boolean;
|
||||||
|
onDelete?: () => void;
|
||||||
|
onSave: () => void;
|
||||||
|
};
|
||||||
|
export type ConditionNodeViewMode = "edit" | "yaml" | "view";
|
||||||
|
export const ConditionNodeSettings: FC<ConditionNodeSettingsProps> = (
|
||||||
|
props
|
||||||
|
) => {
|
||||||
|
// alias
|
||||||
|
const showDelete = !props.disableDelete && !!props.onDelete;
|
||||||
|
const createModeSwitch = (m: ConditionNodeViewMode) => () => {
|
||||||
|
if (props.mode === m) {
|
||||||
|
props.onModeSwitch("view");
|
||||||
|
} else {
|
||||||
|
props.onModeSwitch(m);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
const buttons: Array<ButtonIconProps> = [
|
||||||
|
{
|
||||||
|
color: "success",
|
||||||
|
onClick: createModeSwitch("edit"),
|
||||||
|
icon: props.mode === "edit" ? <EditOffIcon /> : <EditOutlinedIcon />,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
icon:
|
||||||
|
props.mode === "yaml" ? <CodeOffOutlinedIcon /> : <CodeOutlinedIcon />,
|
||||||
|
onClick: createModeSwitch("yaml"),
|
||||||
|
color: "info",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
if (showDelete) {
|
||||||
|
buttons.push({
|
||||||
|
color: "error",
|
||||||
|
icon: <DeleteForeverIcon />,
|
||||||
|
onClick: props.onDelete,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
// render
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className={[
|
||||||
|
"condition-node--settings",
|
||||||
|
props.isEdited ? "edited" : "",
|
||||||
|
].join(" ")}
|
||||||
|
>
|
||||||
|
<SpeedDial
|
||||||
|
icon={<ButtonIcon icon={<SettingsApplicationsIcon />} />}
|
||||||
|
direction="left"
|
||||||
|
>
|
||||||
|
{buttons.map((opt, i) => (
|
||||||
|
<ButtonIcon key={i} {...opt} />
|
||||||
|
))}
|
||||||
|
</SpeedDial>
|
||||||
|
{props.isEdited && (
|
||||||
|
<ButtonIcon
|
||||||
|
key={"save"}
|
||||||
|
icon={<SaveIcon />}
|
||||||
|
color="success"
|
||||||
|
disabled={!props.isEdited}
|
||||||
|
onClick={props.onSave}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,216 +1,414 @@
|
|||||||
import { FC } from "react";
|
import { FC, useState } from "react";
|
||||||
import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions';
|
import {
|
||||||
|
AutomationCondition,
|
||||||
|
DeviceCondition,
|
||||||
|
LogicCondition,
|
||||||
|
NumericCondition,
|
||||||
|
StateCondition,
|
||||||
|
TemplateCondition,
|
||||||
|
TimeCondition,
|
||||||
|
TriggerCondition,
|
||||||
|
ZoneCondition,
|
||||||
|
} from "types/automations/conditions";
|
||||||
import InputNumber from "components/Inputs/InputNumber";
|
import InputNumber from "components/Inputs/InputNumber";
|
||||||
import InputText from "components/Inputs/InputText";
|
import InputText from "components/Inputs/InputText";
|
||||||
import { InputEntity } from "components/Inputs/InputEntities";
|
import { InputEntity } from "components/Inputs/InputEntities";
|
||||||
import { ConditionNode } from "./ConditionNode";
|
import {
|
||||||
|
ConditionNodeBase,
|
||||||
|
ConditionNodeBaseViewMode,
|
||||||
|
} from "./ConditionNodeBase";
|
||||||
import { genUpdateMethods } from "./nestedUpdater";
|
import { genUpdateMethods } from "./nestedUpdater";
|
||||||
import InputTime from "components/Inputs/InputTime";
|
import { InputTime } from "components/Inputs/InputTime";
|
||||||
import InputYaml from "components/Inputs/InputYaml";
|
import InputYaml from "components/Inputs/InputYaml";
|
||||||
|
import { HAService } from "haService";
|
||||||
|
import { DeviceEditor } from "components/DeviceEditor";
|
||||||
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
|
import AddIcon from "@mui/icons-material/Add";
|
||||||
|
import { getEntityDomains } from "utils/automations";
|
||||||
|
import { InputAutoComplete } from "components/Inputs/InputAutoComplete";
|
||||||
|
import { InputTimeEntity } from "components/Inputs/InputTimeEntity";
|
||||||
|
import { prettyName } from "utils/formatting";
|
||||||
|
import { InputList } from "components/Inputs/InputList";
|
||||||
|
import { Button } from "components/Inputs/Button";
|
||||||
|
import { RemoveCircle } from "@mui/icons-material";
|
||||||
|
|
||||||
|
interface Editor<C extends AutomationCondition>
|
||||||
interface Editor<C extends AutomationCondition> extends FC<{
|
extends FC<{
|
||||||
condition: C,
|
condition: C;
|
||||||
onChange: (condition: C) => void;
|
onChange: (condition: C) => void;
|
||||||
}> { }
|
ha: HAService;
|
||||||
|
initialViewMode: ConditionNodeBaseViewMode;
|
||||||
|
}> {}
|
||||||
|
|
||||||
export const getEditor = (condition: AutomationCondition): Editor<any> => {
|
export const getEditor = (condition: AutomationCondition): Editor<any> => {
|
||||||
switch (condition.condition) {
|
switch (condition.condition) {
|
||||||
case 'template':
|
case "template":
|
||||||
return TemplateEditor;
|
return TemplateEditor;
|
||||||
case 'and':
|
case "and":
|
||||||
return LogicViewer;
|
return LogicViewer;
|
||||||
case 'or':
|
case "or":
|
||||||
return LogicViewer;
|
return LogicViewer;
|
||||||
case 'not':
|
case "not":
|
||||||
return LogicViewer;
|
return LogicViewer;
|
||||||
case 'numeric_state':
|
case "device":
|
||||||
|
return DeviceConditionEditor;
|
||||||
|
case "numeric_state":
|
||||||
return NumericStateEditor;
|
return NumericStateEditor;
|
||||||
case 'state':
|
case "state":
|
||||||
return StateEditor;
|
return StateEditor;
|
||||||
case 'time':
|
case "time":
|
||||||
return TimeEditor;
|
return TimeEditor;
|
||||||
case 'trigger':
|
case "trigger":
|
||||||
return TriggerEditor;
|
return TriggerEditor;
|
||||||
case 'zone':
|
case "zone":
|
||||||
return ZoneEditor;
|
return ZoneEditor;
|
||||||
default:
|
default:
|
||||||
return () => <div>Not Ready</div>
|
return () => <div>Not Ready</div>;
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
export const TemplateEditor: Editor<TemplateCondition> = ({
|
export const TemplateEditor: Editor<TemplateCondition> = ({
|
||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <>
|
return (
|
||||||
<InputYaml label="Template" value={condition.value_template} onChange={value_template => onChange({
|
<>
|
||||||
...condition,
|
<InputYaml
|
||||||
value_template
|
label="Template"
|
||||||
})} />
|
value={condition.value_template}
|
||||||
</>
|
onChange={(value_template) =>
|
||||||
}
|
onChange({
|
||||||
|
...condition,
|
||||||
|
value_template,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const DeviceConditionEditor: Editor<DeviceCondition> = ({
|
||||||
|
onChange,
|
||||||
|
condition,
|
||||||
|
ha: {
|
||||||
|
deviceExtras: { useDeviceConditionCapalities, useDeviceConditions },
|
||||||
|
},
|
||||||
|
}) => {
|
||||||
|
return (
|
||||||
|
<DeviceEditor
|
||||||
|
type="condition"
|
||||||
|
state={condition}
|
||||||
|
setState={(data) =>
|
||||||
|
onChange({
|
||||||
|
condition: "device",
|
||||||
|
...data,
|
||||||
|
} as any)
|
||||||
|
}
|
||||||
|
options={useDeviceConditions(
|
||||||
|
condition.device_id
|
||||||
|
? {
|
||||||
|
deviceId: condition.device_id,
|
||||||
|
}
|
||||||
|
: undefined
|
||||||
|
)}
|
||||||
|
caps={useDeviceConditionCapalities(condition as any)}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const NumericStateEditor: Editor<NumericCondition> = ({
|
export const NumericStateEditor: Editor<NumericCondition> = ({
|
||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <>
|
return (
|
||||||
<InputEntity
|
<>
|
||||||
value={condition.entity_id}
|
<InputEntity
|
||||||
multiple
|
value={condition.entity_id}
|
||||||
onChange={entity_id => onChange({
|
multiple
|
||||||
...condition,
|
onChange={(entity_id) =>
|
||||||
entity_id
|
onChange({
|
||||||
})}
|
...condition,
|
||||||
/>
|
entity_id,
|
||||||
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
|
})
|
||||||
...condition,
|
}
|
||||||
attribute
|
/>
|
||||||
})} />
|
<InputText
|
||||||
<InputNumber
|
label="Attribute"
|
||||||
label="Above"
|
value={condition.attribute ?? ""}
|
||||||
value={condition.above ? Number(condition.above) : undefined}
|
onChange={(attribute) =>
|
||||||
onChange={above => onChange({
|
onChange({
|
||||||
...condition,
|
...condition,
|
||||||
above: above ? String(above) : undefined,
|
attribute,
|
||||||
})}
|
})
|
||||||
/>
|
}
|
||||||
<InputNumber
|
/>
|
||||||
label="Below"
|
<InputNumber
|
||||||
value={condition.below ? Number(condition.below) : undefined}
|
label="Above"
|
||||||
onChange={below => onChange({
|
value={condition.above ? Number(condition.above) : undefined}
|
||||||
...condition,
|
onChange={(above) =>
|
||||||
below: below ? String(below) : undefined,
|
onChange({
|
||||||
})}
|
...condition,
|
||||||
/>
|
above: above ? String(above) : undefined,
|
||||||
<InputYaml label="Template" value={condition.value_template ?? ""} onChange={value_template => onChange({
|
})
|
||||||
...condition,
|
}
|
||||||
value_template
|
/>
|
||||||
})} />
|
<InputNumber
|
||||||
</>
|
label="Below"
|
||||||
}
|
value={condition.below ? Number(condition.below) : undefined}
|
||||||
|
onChange={(below) =>
|
||||||
|
onChange({
|
||||||
|
...condition,
|
||||||
|
below: below ? String(below) : undefined,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<InputYaml
|
||||||
|
label="Template"
|
||||||
|
value={condition.value_template ?? ""}
|
||||||
|
onChange={(value_template) =>
|
||||||
|
onChange({
|
||||||
|
...condition,
|
||||||
|
value_template,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const LogicViewer: Editor<LogicCondition> = ({
|
export const LogicViewer: Editor<LogicCondition> = ({
|
||||||
condition,
|
condition,
|
||||||
onChange,
|
onChange,
|
||||||
|
initialViewMode,
|
||||||
}) => {
|
}) => {
|
||||||
|
return (
|
||||||
return <>
|
<>
|
||||||
{condition.conditions.map((c, i) => {
|
{condition.conditions.map((c, i) => {
|
||||||
return <ConditionNode
|
return (
|
||||||
key={i}
|
<ConditionNodeBase
|
||||||
condition={c}
|
key={i}
|
||||||
displayMode={false}
|
condition={c}
|
||||||
{...genUpdateMethods(condition, onChange)(i)}
|
{...genUpdateMethods(condition, onChange)(i)}
|
||||||
showDelete
|
disableDelete={false}
|
||||||
/>
|
initialViewMode={initialViewMode}
|
||||||
})}
|
/>
|
||||||
</>
|
);
|
||||||
}
|
})}
|
||||||
|
<div className="condition-node--logic-viewer--add">
|
||||||
|
<ButtonIcon
|
||||||
|
icon={<AddIcon />}
|
||||||
|
onClick={() =>
|
||||||
|
onChange({
|
||||||
|
condition: condition.condition,
|
||||||
|
conditions: [
|
||||||
|
...(condition.conditions ?? []),
|
||||||
|
{
|
||||||
|
condition: "device",
|
||||||
|
device_id: "",
|
||||||
|
domain: "",
|
||||||
|
type: "",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const StateEditor: Editor<StateCondition> = ({
|
export const StateEditor: Editor<StateCondition> = ({
|
||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
|
ha,
|
||||||
}) => {
|
}) => {
|
||||||
return <>
|
const restrictToDomain =
|
||||||
<InputEntity
|
!condition.entity_id || condition.entity_id.length === 0
|
||||||
value={condition.entity_id}
|
? undefined
|
||||||
multiple
|
: getEntityDomains(condition.entity_id);
|
||||||
onChange={entity_id => onChange({
|
|
||||||
...condition,
|
|
||||||
entity_id
|
|
||||||
})}
|
|
||||||
/>
|
|
||||||
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
|
|
||||||
...condition,
|
|
||||||
attribute
|
|
||||||
})} />
|
|
||||||
<InputText
|
|
||||||
label="State"
|
|
||||||
value={String(condition.state)}
|
|
||||||
onChange={state => onChange({
|
|
||||||
...condition,
|
|
||||||
state,
|
|
||||||
})}
|
|
||||||
/>
|
|
||||||
<InputTime
|
|
||||||
label="For"
|
|
||||||
value={condition.for}
|
|
||||||
onChange={_for => onChange({
|
|
||||||
...condition,
|
|
||||||
for: _for,
|
|
||||||
})}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
|
|
||||||
export const TimeEditor: Editor<TimeCondition> = ({
|
return (
|
||||||
onChange,
|
<>
|
||||||
condition,
|
<InputEntity
|
||||||
}) => {
|
restrictToDomain={restrictToDomain}
|
||||||
return <>
|
value={condition.entity_id}
|
||||||
<InputTime
|
multiple
|
||||||
label="After"
|
onChange={(entity_id) =>
|
||||||
value={condition.after}
|
onChange({
|
||||||
onChange={after => onChange({
|
...condition,
|
||||||
...condition,
|
entity_id,
|
||||||
after,
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<InputAutoComplete
|
||||||
|
label="Attribute"
|
||||||
|
value={condition.attribute ?? ""}
|
||||||
|
options={ha.entities.getAttributes(condition.entity_id)}
|
||||||
|
multiple={false}
|
||||||
|
onChange={(attribute) =>
|
||||||
|
onChange({
|
||||||
|
...condition,
|
||||||
|
attribute: attribute ?? undefined,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<InputText
|
||||||
|
label="State"
|
||||||
|
value={String(condition.state)}
|
||||||
|
placeholder={ha.entities
|
||||||
|
.getStates(condition.entity_id, condition.attribute)
|
||||||
|
.join(" or ")}
|
||||||
|
onChange={(state) =>
|
||||||
|
onChange({
|
||||||
|
...condition,
|
||||||
|
state,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<InputTime
|
||||||
|
label="For"
|
||||||
|
value={condition.for}
|
||||||
|
onChange={(_for) =>
|
||||||
|
onChange({
|
||||||
|
...condition,
|
||||||
|
for: _for,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
type TimeEditorShows = "after" | "before" | "weekday";
|
||||||
|
export const TimeEditor: Editor<TimeCondition> = ({ onChange, condition }) => {
|
||||||
|
const [shows, setShows] = useState<TimeEditorShows[]>(
|
||||||
|
Object.keys(condition).filter((k) =>
|
||||||
|
["after", "before", "weekday"].includes(k)
|
||||||
|
) as any
|
||||||
|
);
|
||||||
|
return (
|
||||||
|
<div className="condition-node--time-editor">
|
||||||
|
{shows.map((show) => {
|
||||||
|
if (show === "after" || show === "before") {
|
||||||
|
return (
|
||||||
|
<div className="condition-node--time-editor--ba" key={show}>
|
||||||
|
<b className="label">{prettyName(show)}</b>
|
||||||
|
<InputTimeEntity
|
||||||
|
value={condition[show] ?? ""}
|
||||||
|
onChange={(v) =>
|
||||||
|
onChange({
|
||||||
|
...condition,
|
||||||
|
[show]: v,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<Button
|
||||||
|
className="remove"
|
||||||
|
onClick={() => {
|
||||||
|
setShows(shows.filter((k) => k !== show));
|
||||||
|
const upd = { ...condition };
|
||||||
|
delete upd[show];
|
||||||
|
onChange({ ...upd });
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<RemoveCircle />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<InputAutoComplete
|
||||||
|
label="Weekday"
|
||||||
|
value={condition.weekday ?? []}
|
||||||
|
multiple={true}
|
||||||
|
getID={(opt) => opt}
|
||||||
|
getLabel={(opt) => {
|
||||||
|
return {
|
||||||
|
mon: "Monday",
|
||||||
|
tue: "Tuesday",
|
||||||
|
wed: "Wednesday",
|
||||||
|
thu: "Thursday",
|
||||||
|
fri: "Friday",
|
||||||
|
sat: "Saturday",
|
||||||
|
sun: "Sunday",
|
||||||
|
}[opt];
|
||||||
|
}}
|
||||||
|
onChange={(weekday: any) =>
|
||||||
|
onChange({
|
||||||
|
...condition,
|
||||||
|
weekday: weekday ?? [],
|
||||||
|
})
|
||||||
|
}
|
||||||
|
options={["mon", "tue", "wed", "thu", "fri", "sat", "sun"]}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
})}
|
})}
|
||||||
/>
|
{shows.length < 3 && (
|
||||||
<InputTime
|
<InputList
|
||||||
label="Before"
|
className="condition-node--time-editor--new"
|
||||||
value={condition.before}
|
label="Option"
|
||||||
onChange={before => onChange({
|
options={["after", "before", "weekday"].filter(
|
||||||
...condition,
|
(k: any) => !shows.includes(k)
|
||||||
before,
|
)}
|
||||||
})}
|
onChange={(k: any) => {
|
||||||
/>
|
setShows(shows.concat([k]));
|
||||||
<b>Weekday not support for no, use yaml for now</b> {condition.weekday}
|
}}
|
||||||
</>
|
/>
|
||||||
}
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const TriggerEditor: Editor<TriggerCondition> = ({
|
export const TriggerEditor: Editor<TriggerCondition> = ({
|
||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <>
|
return (
|
||||||
<InputText label="Trigger ID" value={condition.id} onChange={id => onChange({
|
<>
|
||||||
...condition,
|
<InputText
|
||||||
id
|
label="Trigger ID"
|
||||||
})} />
|
value={condition.id}
|
||||||
</>
|
onChange={(id) =>
|
||||||
}
|
onChange({
|
||||||
|
...condition,
|
||||||
|
id,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const ZoneEditor: Editor<ZoneCondition> = ({
|
export const ZoneEditor: Editor<ZoneCondition> = ({ onChange, condition }) => {
|
||||||
onChange,
|
return (
|
||||||
condition,
|
<>
|
||||||
}) => {
|
<InputEntity
|
||||||
return <>
|
label="Zone"
|
||||||
<InputText label="Zone" value={condition.zone} onChange={zone => onChange({
|
value={condition.zone ?? []}
|
||||||
...condition,
|
multiple
|
||||||
zone
|
onChange={(zone) =>
|
||||||
})} />
|
onChange({
|
||||||
<InputEntity
|
...condition,
|
||||||
value={condition.entity_id}
|
zone: zone ?? [],
|
||||||
multiple
|
})
|
||||||
onChange={entity_id => onChange({
|
}
|
||||||
...condition,
|
restrictToDomain={["zone"]}
|
||||||
entity_id
|
/>
|
||||||
})}
|
<InputEntity
|
||||||
/>
|
label="Entity with Location"
|
||||||
<InputText
|
value={condition.entity_id}
|
||||||
label="State"
|
multiple
|
||||||
value={String(condition.state)}
|
onChange={(entity_id) =>
|
||||||
onChange={state => onChange({
|
onChange({
|
||||||
...condition,
|
...condition,
|
||||||
state,
|
entity_id,
|
||||||
})}
|
})
|
||||||
/>
|
}
|
||||||
</>
|
restrictToDomain={["person", "device_tracker"]}
|
||||||
}
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -6,73 +6,140 @@ import { AutomationCondition } from "types/automations/conditions";
|
|||||||
import { ConditionEditor } from ".";
|
import { ConditionEditor } from ".";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'ConditionEditor',
|
title: "ConditionEditor",
|
||||||
component: ConditionEditor,
|
component: ConditionEditor,
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||||
|
args: {
|
||||||
|
initialViewMode: "edit",
|
||||||
|
},
|
||||||
} as ComponentMeta<typeof ConditionEditor>;
|
} as ComponentMeta<typeof ConditionEditor>;
|
||||||
|
|
||||||
|
const Template: ComponentStory<typeof ConditionEditor> = ({
|
||||||
const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }) => {
|
condition,
|
||||||
|
...args
|
||||||
|
}) => {
|
||||||
const [data, setData] = useState(condition);
|
const [data, setData] = useState(condition);
|
||||||
return <Page>
|
return (
|
||||||
<ConditionEditor {...args}
|
<Page>
|
||||||
condition={data}
|
<ConditionEditor
|
||||||
onUpdate={data => {
|
{...args}
|
||||||
setData(data)
|
condition={data}
|
||||||
}}
|
onUpdate={(data) => {
|
||||||
/>
|
setData(data);
|
||||||
</Page>
|
}}
|
||||||
}
|
/>
|
||||||
|
</Page>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const TemplateViewer = Template.bind({})
|
export const TemplateViewer = Template.bind({});
|
||||||
TemplateViewer.args = {
|
TemplateViewer.args = {
|
||||||
condition: {
|
condition: {
|
||||||
condition: 'template',
|
condition: "template",
|
||||||
value_template: "states('switch.light_kitchen') == 'on'"
|
value_template: "states('switch.light_kitchen') == 'on'",
|
||||||
} as AutomationCondition,
|
} as AutomationCondition,
|
||||||
}
|
};
|
||||||
|
|
||||||
|
export const NumericStateViewer = Template.bind({});
|
||||||
export const NumericStateViewer = Template.bind({})
|
|
||||||
NumericStateViewer.args = {
|
NumericStateViewer.args = {
|
||||||
condition: {
|
condition: {
|
||||||
condition: "numeric_state",
|
condition: "numeric_state",
|
||||||
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: {
|
||||||
condition: 'or',
|
condition: "or",
|
||||||
conditions: [
|
conditions: [
|
||||||
{
|
{
|
||||||
condition: 'numeric_state',
|
condition: "numeric_state",
|
||||||
entity_id: 'sensor.humidity_kitchen',
|
entity_id: "sensor.humidity_kitchen",
|
||||||
above: '60'
|
above: "60",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
condition: 'numeric_state',
|
condition: "numeric_state",
|
||||||
entity_id: 'sensor.humidity_living_room',
|
entity_id: "sensor.humidity_living_room",
|
||||||
above: '60'
|
above: "60",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
condition: 'and',
|
condition: "and",
|
||||||
conditions: [
|
conditions: [
|
||||||
{
|
{
|
||||||
condition: 'numeric_state',
|
condition: "numeric_state",
|
||||||
entity_id: 'sensor.humidity_bedroom',
|
entity_id: "sensor.humidity_bedroom",
|
||||||
above: '60'
|
above: "60",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
condition: 'numeric_state',
|
condition: "numeric_state",
|
||||||
entity_id: 'sensor.humidity_bathroom',
|
entity_id: "sensor.humidity_bathroom",
|
||||||
above: '60'
|
above: "60",
|
||||||
}
|
},
|
||||||
]
|
],
|
||||||
},
|
},
|
||||||
]
|
],
|
||||||
} as AutomationCondition,
|
} as AutomationCondition,
|
||||||
}
|
};
|
||||||
|
export const TimeCondition = Template.bind({});
|
||||||
|
TimeCondition.args = {
|
||||||
|
condition: {
|
||||||
|
condition: "or",
|
||||||
|
conditions: [
|
||||||
|
{
|
||||||
|
condition: "time",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
condition: "time",
|
||||||
|
after: "10:00:00",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
condition: "time",
|
||||||
|
before: "input_datetime.test",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
condition: "time",
|
||||||
|
weekday: ["fri"],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
} as AutomationCondition,
|
||||||
|
};
|
||||||
|
|
||||||
|
export const MultipleConditions: ComponentStory<typeof ConditionEditor> = (
|
||||||
|
args
|
||||||
|
) => {
|
||||||
|
const [state, setState] = useState<AutomationCondition>({
|
||||||
|
condition: "or",
|
||||||
|
conditions: [
|
||||||
|
{
|
||||||
|
condition: "and",
|
||||||
|
conditions: [
|
||||||
|
{
|
||||||
|
condition: "numeric_state",
|
||||||
|
entity_id: ["sensor.kitchen_humidity"],
|
||||||
|
above: "40",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
condition: "template",
|
||||||
|
value_template: "states('switch.kitchen') == 'on'",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
condition: "numeric_state",
|
||||||
|
entity_id: ["sensor.kitchen_temperature"],
|
||||||
|
above: "51",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
return (
|
||||||
|
<Page>
|
||||||
|
<ConditionEditor
|
||||||
|
onUpdate={setState}
|
||||||
|
onDelete={() => {}}
|
||||||
|
condition={state}
|
||||||
|
/>
|
||||||
|
</Page>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,27 +1,24 @@
|
|||||||
import { FC } from "react";
|
import { FC } from "react";
|
||||||
import { AutomationCondition } from "types/automations/conditions";
|
import { AutomationCondition } from "types/automations/conditions";
|
||||||
import { ConditionNode } from "./ConditionNode";
|
import { ConditionNodeBase } from "./ConditionNodeBase";
|
||||||
|
import { ConditionNodeViewMode } from "./ConditionNodeSettings";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export const ConditionEditor: FC<{
|
export const ConditionEditor: FC<{
|
||||||
condition: AutomationCondition;
|
condition: AutomationCondition;
|
||||||
onDelete: (which: 'root' | number) => void;
|
onDelete: () => void;
|
||||||
onUpdate: (data: AutomationCondition) => void;
|
onUpdate: (data: AutomationCondition) => void;
|
||||||
}> = ({
|
initialViewMode?: ConditionNodeViewMode;
|
||||||
condition,
|
}> = ({ condition, onDelete, onUpdate, initialViewMode }) => {
|
||||||
onDelete,
|
// state
|
||||||
onUpdate,
|
return (
|
||||||
}) => {
|
<ConditionNodeBase
|
||||||
// state
|
|
||||||
return <ConditionNode
|
|
||||||
condition={condition}
|
condition={condition}
|
||||||
onDelete={onDelete}
|
onDelete={onDelete}
|
||||||
onUpdate={update => {
|
onUpdate={(update) => {
|
||||||
onUpdate(update)
|
onUpdate(update);
|
||||||
}}
|
}}
|
||||||
displayMode
|
disableDelete={true}
|
||||||
showDelete={false}
|
initialViewMode={initialViewMode}
|
||||||
/>
|
/>
|
||||||
}
|
);
|
||||||
|
};
|
||||||
@@ -1,28 +1,26 @@
|
|||||||
import { AutomationCondition, LogicCondition } from "types/automations/conditions";
|
import {
|
||||||
|
AutomationCondition,
|
||||||
|
LogicCondition,
|
||||||
|
} from "types/automations/conditions";
|
||||||
|
|
||||||
|
export const genUpdateMethods =
|
||||||
export const genUpdateMethods = (
|
(condition: LogicCondition, onChange: (c: LogicCondition) => void) =>
|
||||||
condition: LogicCondition,
|
(i: number) => ({
|
||||||
onChange: (c: LogicCondition) => void
|
onUpdate: (update: AutomationCondition) =>
|
||||||
) => (i: number) => ({
|
onChange({
|
||||||
onUpdate: (update: AutomationCondition) => onChange({
|
|
||||||
...condition,
|
...condition,
|
||||||
conditions: [
|
conditions: [
|
||||||
...condition.conditions.slice(0, i),
|
...condition.conditions.slice(0, i),
|
||||||
update,
|
update,
|
||||||
...condition.conditions.slice(i + 1)
|
...condition.conditions.slice(i + 1),
|
||||||
]
|
],
|
||||||
}),
|
}),
|
||||||
onDelete: (which: 'root' | number) => {
|
onDelete: () => {
|
||||||
if (which === 'root') {
|
onChange({
|
||||||
onChange({
|
...condition,
|
||||||
...condition,
|
conditions: condition.conditions
|
||||||
conditions: condition.conditions.slice(0, i).concat(
|
.slice(0, i)
|
||||||
condition.conditions.slice(i + 1)
|
.concat(condition.conditions.slice(i + 1)),
|
||||||
)
|
});
|
||||||
})
|
},
|
||||||
} else {
|
});
|
||||||
throw new Error("Not Implemented")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
@@ -1,142 +0,0 @@
|
|||||||
import { Styles } from "jss";
|
|
||||||
import { createAppUseStyles } from "styles/theme";
|
|
||||||
|
|
||||||
export const useStyles = createAppUseStyles<{
|
|
||||||
hasChildren: boolean,
|
|
||||||
isMobile: boolean,
|
|
||||||
}>(theme => {
|
|
||||||
const deleteBtn: Styles = {
|
|
||||||
borderRadius: '10px',
|
|
||||||
borderStyle: 'none',
|
|
||||||
padding: '0',
|
|
||||||
margin: '0',
|
|
||||||
background: theme.red,
|
|
||||||
width: '30px',
|
|
||||||
height: '15px',
|
|
||||||
fontSize: '10px',
|
|
||||||
textAlign: 'center',
|
|
||||||
cursor: 'pointer',
|
|
||||||
"&:hover": {
|
|
||||||
background: theme.redAccent,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
root: ({ hasChildren, isMobile }) => ({
|
|
||||||
background: theme.primary,
|
|
||||||
padding: 0,
|
|
||||||
position: 'relative',
|
|
||||||
display: 'flex',
|
|
||||||
flexDirection: isMobile ? 'column' : hasChildren ? 'column' : 'row',
|
|
||||||
}),
|
|
||||||
title: ({ hasChildren }) => ({
|
|
||||||
display: 'flex',
|
|
||||||
border: hasChildren ? `1px solid ${theme.primaryAccent}` : 'none',
|
|
||||||
borderRadius: 10,
|
|
||||||
borderBottomRightRadius: 0,
|
|
||||||
borderBottomLeftRadius: 0,
|
|
||||||
height: '100%',
|
|
||||||
}),
|
|
||||||
titleText: ({ hasChildren }) => ({
|
|
||||||
background: theme.condition.primaryColor,
|
|
||||||
border: `1px solid ${theme.primaryAccent}`,
|
|
||||||
borderRadius: 10,
|
|
||||||
borderTopRightRadius: 0,
|
|
||||||
borderBottomRightRadius: 0,
|
|
||||||
borderBottomLeftRadius: hasChildren ? 0 : 10,
|
|
||||||
minWidth: '10em',
|
|
||||||
maxWidth: '30em',
|
|
||||||
textOverflow: 'ellipsis',
|
|
||||||
textAlign: 'center',
|
|
||||||
cursor: 'pointer',
|
|
||||||
color: theme.primaryAccent,
|
|
||||||
}),
|
|
||||||
deleteBtnRoot: {
|
|
||||||
...deleteBtn,
|
|
||||||
position: 'absolute',
|
|
||||||
left: -35,
|
|
||||||
top: 10,
|
|
||||||
},
|
|
||||||
modifyBtn: ({ hasChildren }) => ({
|
|
||||||
// styling
|
|
||||||
backgroundColor: theme.green,
|
|
||||||
color: theme.primary,
|
|
||||||
fill: theme.primaryAccent,
|
|
||||||
borderColor: theme.primaryAccent,
|
|
||||||
borderWidth: 1,
|
|
||||||
borderRadius: hasChildren ? 10 : 0,
|
|
||||||
borderTopLeftRadius: 0,
|
|
||||||
borderBottomLeftRadius: 0,
|
|
||||||
cursor: 'pointer',
|
|
||||||
|
|
||||||
// positioning
|
|
||||||
display: 'flex',
|
|
||||||
justifyContent: 'center',
|
|
||||||
alignItems: 'center',
|
|
||||||
padding: '0px 10px',
|
|
||||||
right: 1,
|
|
||||||
top: 10,
|
|
||||||
|
|
||||||
// on hover
|
|
||||||
"&:hover": {
|
|
||||||
backgroundColor: theme.greenLight,
|
|
||||||
fill: theme.primaryAccentLight,
|
|
||||||
},
|
|
||||||
"&:hover $icon": {
|
|
||||||
transform: "rotate(90deg)"
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
icon: {},
|
|
||||||
deleteBtn,
|
|
||||||
conditionWrap: {
|
|
||||||
overflow: 'auto',
|
|
||||||
},
|
|
||||||
children: ({ hasChildren }) => ({
|
|
||||||
flex: 1,
|
|
||||||
paddingLeft: hasChildren ? 50 : 10,
|
|
||||||
paddingRight: hasChildren ? 0 : 10,
|
|
||||||
display: 'flex',
|
|
||||||
flexDirection: 'column',
|
|
||||||
justifyContent: 'center',
|
|
||||||
border: `1px solid ${theme.secondaryAccent}`,
|
|
||||||
borderBottomRightRadius: hasChildren ? 10 : 0,
|
|
||||||
borderBottomLeftRadius: hasChildren ? 10 : 0,
|
|
||||||
minHeight: hasChildren ? undefined : '100%',
|
|
||||||
overflow: 'scroll'
|
|
||||||
}),
|
|
||||||
addBtnContainer: {
|
|
||||||
display: 'flex',
|
|
||||||
justifyContent: 'center',
|
|
||||||
},
|
|
||||||
yamlBtn: {
|
|
||||||
backgroundColor: theme.secondary,
|
|
||||||
borderWidth: 1,
|
|
||||||
borderStyle: 'solid',
|
|
||||||
borderColor: theme.secondaryAccent,
|
|
||||||
color: theme.secondaryAccent,
|
|
||||||
paddingLeft: 20,
|
|
||||||
paddingRight: 20,
|
|
||||||
cursor: 'pointer',
|
|
||||||
"&:hover": {
|
|
||||||
backgroundColor: theme.primaryLight,
|
|
||||||
fill: theme.primaryAccentLight,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
addBtn: {
|
|
||||||
backgroundColor: theme.secondary,
|
|
||||||
borderWidth: 1,
|
|
||||||
borderStyle: 'solid',
|
|
||||||
borderColor: theme.secondaryAccent,
|
|
||||||
color: theme.secondaryAccent,
|
|
||||||
borderRadius: 5,
|
|
||||||
marginTop: 5,
|
|
||||||
marginBottom: 5,
|
|
||||||
paddingLeft: 20,
|
|
||||||
paddingRight: 20,
|
|
||||||
cursor: 'pointer',
|
|
||||||
"&:hover": {
|
|
||||||
backgroundColor: theme.primaryLight,
|
|
||||||
fill: theme.primaryAccentLight,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
@@ -1,43 +1,53 @@
|
|||||||
import { FC } from "react";
|
import { FC } from "react";
|
||||||
import { AutomationCondition, LogicCondition } from "types/automations/conditions";
|
import {
|
||||||
import { getDescriptionFromAutomationNode } from "utils/formatting";
|
AutomationCondition,
|
||||||
import { ConditionNode } from "./ConditionNode";
|
LogicCondition,
|
||||||
|
} from "types/automations/conditions";
|
||||||
|
import { getDescriptionFromAutomationNode, Namer } from "utils/formatting";
|
||||||
|
import { ConditionNodeBase } from "./ConditionNodeBase";
|
||||||
import { genUpdateMethods } from "./nestedUpdater";
|
import { genUpdateMethods } from "./nestedUpdater";
|
||||||
|
|
||||||
|
interface Viewer<C extends AutomationCondition>
|
||||||
interface Viewer<C extends AutomationCondition> extends FC<{
|
extends FC<{
|
||||||
condition: C;
|
condition: C;
|
||||||
onChange: (condition: C) => void;
|
namer: Namer;
|
||||||
}> { }
|
onChange: (condition: C) => void;
|
||||||
|
}> {}
|
||||||
|
|
||||||
export const getViewer = (condition: AutomationCondition): Viewer<any> => {
|
export const getViewer = (condition: AutomationCondition): Viewer<any> => {
|
||||||
if (
|
if (
|
||||||
(condition.condition === 'and') ||
|
condition.condition === "and" ||
|
||||||
(condition.condition === 'or') ||
|
condition.condition === "or" ||
|
||||||
(condition.condition === 'not')
|
condition.condition === "not"
|
||||||
) {
|
) {
|
||||||
return LogicViewer
|
return LogicViewer;
|
||||||
}
|
}
|
||||||
return GenericViewer
|
return GenericViewer;
|
||||||
}
|
};
|
||||||
|
|
||||||
export const GenericViewer: Viewer<AutomationCondition> = ({
|
export const GenericViewer: Viewer<AutomationCondition> = ({
|
||||||
condition,
|
condition,
|
||||||
|
namer,
|
||||||
}) => {
|
}) => {
|
||||||
return <>
|
return <>{getDescriptionFromAutomationNode(condition, namer, true)}</>;
|
||||||
{getDescriptionFromAutomationNode(condition)}
|
};
|
||||||
</>
|
|
||||||
}
|
|
||||||
|
|
||||||
export const LogicViewer: Viewer<LogicCondition> = ({
|
export const LogicViewer: Viewer<LogicCondition> = ({
|
||||||
condition,
|
condition,
|
||||||
onChange,
|
onChange,
|
||||||
}) => {
|
}) => {
|
||||||
return <>
|
return (
|
||||||
{condition.conditions.map((c, i) => {
|
<>
|
||||||
return <ConditionNode key={i} condition={c} displayMode
|
{condition.conditions.map((c, i) => {
|
||||||
{...genUpdateMethods(condition, onChange)(i)}
|
return (
|
||||||
/>
|
<ConditionNodeBase
|
||||||
})}
|
key={i}
|
||||||
</>
|
condition={c}
|
||||||
}
|
// displayMode
|
||||||
|
{...genUpdateMethods(condition, onChange)(i)}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
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>
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
.dagnode-error {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
justify-content: flex-end;
|
|
||||||
font-size: 0.85em;
|
|
||||||
z-index: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dagnode-error.open .dagnode-error--inner {
|
|
||||||
align-items: flex-start;
|
|
||||||
padding-top: 1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dagnode-error--inner {
|
|
||||||
position: relative;
|
|
||||||
flex: 1;
|
|
||||||
|
|
||||||
/* internal positioning */
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.5em;
|
|
||||||
|
|
||||||
/* shape */
|
|
||||||
background-color: var(--error-dark);
|
|
||||||
border-radius: 1em;
|
|
||||||
height: 100%;
|
|
||||||
max-height: 100%;
|
|
||||||
max-width: 100%;
|
|
||||||
margin-top: 2.5px;
|
|
||||||
margin-bottom: 2.5px;
|
|
||||||
border-top-width: 1px;
|
|
||||||
border-top-style: solid;
|
|
||||||
border-top-left-radius: 10px;
|
|
||||||
border-top-right-radius: 10px;
|
|
||||||
border-top-color: var(--error);
|
|
||||||
}
|
|
||||||
|
|
||||||
.dagnode-error--inner:hover {
|
|
||||||
background-color: var(--error-accent);
|
|
||||||
cursor: default;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dagnode-error--inner--edit-icon:hover {
|
|
||||||
transform: rotate(180deg);
|
|
||||||
cursor: pointer;
|
|
||||||
background-color: var(--error);
|
|
||||||
padding: 0.5em;
|
|
||||||
border-radius: 10px;
|
|
||||||
height: 0.25em;
|
|
||||||
width: 0.25em;
|
|
||||||
}
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
|
|
||||||
|
|
||||||
import React from "react";
|
|
||||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
|
||||||
import { DAGAutomationFlow } from '.';
|
|
||||||
import * as dgconst from "components/DAGFlow/constants";
|
|
||||||
import ReactFlow, { Controls } from 'react-flow-renderer';
|
|
||||||
import { DAGErrorNode } from "./DAGErrorNode";
|
|
||||||
import { convertToFlowNode } from "./helpers";
|
|
||||||
import { Page } from "components/Page";
|
|
||||||
|
|
||||||
|
|
||||||
export default {
|
|
||||||
title: 'DAGAutomationFlow/Viewer/DAGErrorNode',
|
|
||||||
component: DAGAutomationFlow,
|
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
|
||||||
args: {
|
|
||||||
"height": dgconst.NODE_HEIGHT,
|
|
||||||
"width": dgconst.NODE_WIDTH,
|
|
||||||
}
|
|
||||||
} as ComponentMeta<typeof DAGErrorNode>
|
|
||||||
|
|
||||||
export const Examples: ComponentStory<typeof DAGErrorNode> = args => {
|
|
||||||
const nodes = ["1", "2", "3", "4"].map((id, i) => ({
|
|
||||||
"data": args,
|
|
||||||
"id": id,
|
|
||||||
"type": "mynode",
|
|
||||||
"position": {
|
|
||||||
"x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i,
|
|
||||||
"y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
return <Page>
|
|
||||||
<ReactFlow
|
|
||||||
defaultNodes={nodes}
|
|
||||||
nodeTypes={{
|
|
||||||
"mynode": convertToFlowNode(DAGErrorNode)
|
|
||||||
}}
|
|
||||||
snapToGrid
|
|
||||||
onlyRenderVisibleElements
|
|
||||||
nodesConnectable={false}
|
|
||||||
nodesDraggable={false}
|
|
||||||
>
|
|
||||||
<Controls />
|
|
||||||
</ReactFlow>
|
|
||||||
</Page>
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
import "./DAGErrorNode.css";
|
|
||||||
import { Handle, Position } from 'react-flow-renderer';
|
|
||||||
import { FC } from 'react';
|
|
||||||
import { InfoIcon, PencilIcon } from 'components/Icons';
|
|
||||||
|
|
||||||
|
|
||||||
export interface DAGErrorNodeProps {
|
|
||||||
height: number;
|
|
||||||
width: number;
|
|
||||||
hasInput?: boolean;
|
|
||||||
error?: any,
|
|
||||||
onEdit: () => void;
|
|
||||||
}
|
|
||||||
export const DAGErrorNode: FC<DAGErrorNodeProps> = ({
|
|
||||||
height, width, hasInput, error, onEdit
|
|
||||||
}) => {
|
|
||||||
// render
|
|
||||||
return <>
|
|
||||||
{hasInput && <Handle type="target" position={Position.Left} />}
|
|
||||||
<Handle type="source" position={Position.Right} />
|
|
||||||
<div className={["dagnode-error"].join(' ')} style={{
|
|
||||||
height,
|
|
||||||
width,
|
|
||||||
maxHeight: height,
|
|
||||||
maxWidth: width,
|
|
||||||
}}>
|
|
||||||
<div className={"dagnode-error--inner"} title={String(error)}>
|
|
||||||
<InfoIcon color="var(--error-light)" size={1.25} />
|
|
||||||
Invalid Node
|
|
||||||
<PencilIcon className="dagnode-error--inner--edit-icon" size={1.25} onClick={onEdit} />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
|
|
||||||
|
|
||||||
import React from "react";
|
|
||||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
|
||||||
import { DAGAutomationFlow } from '.';
|
|
||||||
import { useState } from 'react';
|
|
||||||
import * as dgconst from "components/DAGFlow/constants";
|
|
||||||
import ReactFlow, { Controls } from 'react-flow-renderer';
|
|
||||||
import { DAGNode } from "./DAGNode";
|
|
||||||
import { convertToFlowNode } from "./helpers";
|
|
||||||
import { Page } from "components/Page";
|
|
||||||
|
|
||||||
|
|
||||||
export default {
|
|
||||||
title: 'DAGAutomationFlow/Viewer/DAGNode',
|
|
||||||
component: DAGAutomationFlow,
|
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
|
||||||
args: {
|
|
||||||
"color": "lblue",
|
|
||||||
"height": dgconst.NODE_HEIGHT,
|
|
||||||
"width": dgconst.NODE_WIDTH,
|
|
||||||
"label": "test",
|
|
||||||
"hasInput": true,
|
|
||||||
}
|
|
||||||
} as ComponentMeta<typeof DAGNode>
|
|
||||||
|
|
||||||
export const Colors: ComponentStory<typeof DAGNode> = args => {
|
|
||||||
const nodes = ["blue", "red", "green", "lblue"].map((color, i) => ({
|
|
||||||
"data": { ...args, color },
|
|
||||||
"id": color,
|
|
||||||
"type": "mynode",
|
|
||||||
"position": { "x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i, "y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i }
|
|
||||||
}));
|
|
||||||
return <Page>
|
|
||||||
<ReactFlow
|
|
||||||
defaultNodes={nodes}
|
|
||||||
nodeTypes={{
|
|
||||||
"mynode": convertToFlowNode(DAGNode)
|
|
||||||
}}
|
|
||||||
snapToGrid
|
|
||||||
onlyRenderVisibleElements
|
|
||||||
nodesConnectable={false}
|
|
||||||
nodesDraggable={false}
|
|
||||||
>
|
|
||||||
<Controls />
|
|
||||||
</ReactFlow>
|
|
||||||
</Page>
|
|
||||||
}
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
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<DAGNodeProps> = ({
|
|
||||||
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>
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
|
|
||||||
|
|
||||||
export const NODE_WIDTH = 150 as const;
|
|
||||||
export const NODE_HEIGHT = 60 as const;
|
|
||||||
export const CONDITION_HEIGHT = 30 as const;
|
|
||||||
export const CONDITION_WIDTH = 120 as const;
|
|
||||||
export const CIRCLE_SIZE = 40 as const;
|
|
||||||
export const DISTANCE_FACTOR = 1.5 as const;
|
|
||||||
export const PADDING = 50 as const;
|
|
||||||
|
|
||||||
export const DEFAULT_DIMS = {
|
|
||||||
nodeHeight: NODE_HEIGHT,
|
|
||||||
nodeWidth: NODE_WIDTH,
|
|
||||||
conditionHeight: CONDITION_HEIGHT,
|
|
||||||
conditionWidth: CONDITION_WIDTH,
|
|
||||||
distanceFactor: DISTANCE_FACTOR,
|
|
||||||
circleSize: CIRCLE_SIZE,
|
|
||||||
padding: {
|
|
||||||
x: PADDING,
|
|
||||||
y: PADDING,
|
|
||||||
},
|
|
||||||
} as DAGAutomationFlowDims
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
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,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
import { FC } from 'react';
|
|
||||||
|
|
||||||
|
|
||||||
export const convertToFlowNode = <D extends {}>(
|
|
||||||
Component: FC<D>
|
|
||||||
): FC<{ data: D }> =>
|
|
||||||
({ data }) => {
|
|
||||||
return <Component {...data} />
|
|
||||||
}
|
|
||||||
@@ -1,234 +0,0 @@
|
|||||||
|
|
||||||
|
|
||||||
import React from "react";
|
|
||||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
|
||||||
import { DAGAutomationFlow } from '.';
|
|
||||||
import { useState } from 'react';
|
|
||||||
import * as dgconst from "components/DAGFlow/constants";
|
|
||||||
import { Page } from "components/Page";
|
|
||||||
|
|
||||||
|
|
||||||
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 <Page>
|
|
||||||
<DAGAutomationFlow
|
|
||||||
{...args}
|
|
||||||
{...state}
|
|
||||||
onTriggerUpdate={trigger => {
|
|
||||||
setState({ ...state, trigger })
|
|
||||||
}}
|
|
||||||
onSequenceUpdate={sequence => setState({ ...state, sequence })}
|
|
||||||
onConditionUpdate={condition => setState({ ...state, condition })}
|
|
||||||
/>
|
|
||||||
</Page>
|
|
||||||
}
|
|
||||||
|
|
||||||
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: []
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export const Errors = Template.bind({})
|
|
||||||
Errors.args = {
|
|
||||||
...Errors.args,
|
|
||||||
condition: [
|
|
||||||
{
|
|
||||||
"condition": "numeric_state",
|
|
||||||
} as any
|
|
||||||
],
|
|
||||||
trigger: [
|
|
||||||
{
|
|
||||||
"platform": "event",
|
|
||||||
} as any
|
|
||||||
],
|
|
||||||
sequence: [
|
|
||||||
{
|
|
||||||
"choose": {}
|
|
||||||
} as any
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,147 +0,0 @@
|
|||||||
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";
|
|
||||||
import { convertToFlowNode } from "./helpers";
|
|
||||||
import { DAGErrorNode } from "./DAGErrorNode";
|
|
||||||
|
|
||||||
const nodeTypes = {
|
|
||||||
'dagnode': convertToFlowNode(DAGNode),
|
|
||||||
'errornode': convertToFlowNode(DAGErrorNode),
|
|
||||||
'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}
|
|
||||||
isErrored={modalState.isError}
|
|
||||||
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>
|
|
||||||
</>;
|
|
||||||
}
|
|
||||||
Loaded 100 of 270 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user