Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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 | ||
|
|
bc773154c6 | ||
|
|
a530e5e6e0 | ||
|
|
1ad87c205d | ||
|
|
d45f72b168 | ||
|
|
0c7db09c32 | ||
|
|
2b1648eff2 | ||
|
|
06356b46e9 | ||
|
|
21fe64f4bf | ||
|
|
e22f64dd51 | ||
|
|
f1b24ec783 | ||
|
|
8a90b56ac3 | ||
|
|
7d111c853b | ||
|
|
0c72481729 | ||
|
|
996626f9af | ||
|
|
878035e748 | ||
|
|
cc930ee4ac | ||
|
|
169a2e9059 | ||
|
|
6275123071 | ||
|
|
0001c93792 | ||
|
|
90d3fa0587 | ||
|
|
938040e519 | ||
|
|
14b3132c64 | ||
|
|
17c79d7aab | ||
|
|
67cc57f068 | ||
|
|
a4743b0353 | ||
|
|
5efda5f3b2 | ||
|
|
7d7a788723 | ||
|
|
cdf67aa1a9 | ||
|
|
98133607ca | ||
|
|
5729b74c89 | ||
|
|
fb8eb4f38c | ||
|
|
21adcb6973 | ||
|
|
8a33d05ced | ||
|
|
334268b5ee | ||
|
|
3b7b17021f | ||
|
|
44c4ac12dd | ||
|
|
f8233dd6ab | ||
|
|
54f528deb4 | ||
|
|
eb363acf81 | ||
|
|
415acf06cc | ||
|
|
0325b8eec3 | ||
|
|
d184871217 | ||
|
|
0499feb61d | ||
|
|
0030920558 | ||
|
|
f62f139f55 | ||
|
|
2d80798ccb | ||
|
|
3da5e1c88c | ||
|
|
7df34bdf7f | ||
|
|
554528ace0 | ||
|
|
298a233a5f | ||
|
|
cbbc099384 | ||
|
|
48decb2e16 | ||
|
|
7afda7eb1c | ||
|
|
f6270c94f3 | ||
|
|
952dcba3ac | ||
|
|
25770e1c1d | ||
|
|
029a2dac9f | ||
|
|
8732ab8dda | ||
|
|
42ab6e5913 | ||
|
|
c28796872f | ||
|
|
40690293a8 | ||
|
|
621f43e5c8 | ||
|
|
f3496f9d32 | ||
|
|
409cf2b21a | ||
|
|
ef92261666 | ||
|
|
83edaf9bf8 | ||
|
|
f8efd895a9 | ||
|
|
da0d153b81 | ||
|
|
bcd262dd46 | ||
|
|
ea47b3e1eb | ||
|
|
5192c09681 | ||
|
|
d3adfaaacb | ||
|
|
c249a94b3d | ||
|
|
dce028d0bc | ||
|
|
7333f9e159 | ||
|
|
809095f8e0 | ||
|
|
8942693a32 | ||
|
|
db49ed02ed | ||
|
|
cce2e03053 | ||
|
|
4509a224a9 | ||
|
|
7f8b75fa02 | ||
|
|
d2c5310b93 | ||
|
|
a19db93c37 | ||
|
|
6c57408f27 | ||
|
|
b9a77746c0 | ||
|
|
f1ffab13be | ||
|
|
52fcfd9271 | ||
|
|
f435bb70aa | ||
|
|
2598c23fd2 | ||
|
|
070dc7c871 | ||
|
|
3d70f04e60 | ||
|
|
cf29d9d61c | ||
|
|
2245fd556b | ||
|
|
f50f22190e | ||
|
|
b342088b96 | ||
|
|
c0c0d3181c | ||
|
|
cf013cc342 | ||
|
|
23b869d43e | ||
|
|
e333e80ea3 | ||
|
|
996e23038f | ||
|
|
0be03b1536 | ||
|
|
dc726ff184 | ||
|
|
7e5885a34d | ||
|
|
38396c4d98 | ||
|
|
ea832884f1 | ||
|
|
ea14cd4239 | ||
|
|
4e19bdf4c4 | ||
|
|
75c5870e00 |
No files matched your search
@@ -2,3 +2,12 @@ webapp/node_modules
|
|||||||
webapp/build
|
webapp/build
|
||||||
webapp/.storybook
|
webapp/.storybook
|
||||||
webapp/.vscode
|
webapp/.vscode
|
||||||
|
webapp/.env.local
|
||||||
|
webapp/tmux.sh
|
||||||
|
api/.env
|
||||||
|
api/.coverage
|
||||||
|
api/venv
|
||||||
|
api/build
|
||||||
|
api/.mypy_cache
|
||||||
|
api/.vscode
|
||||||
|
api/.coverage
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
name: "Manual Build"
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
version:
|
||||||
|
type: string
|
||||||
|
description: "Version Number"
|
||||||
|
required: true
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
name: "${{ github.event.inputs.version }} / ${{ matrix.arch }}"
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: 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: Login to DockerHub
|
||||||
|
uses: docker/login-action@v2.0.0
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Build & Push to Dockerhub
|
||||||
|
uses: home-assistant/builder@2022.07.0
|
||||||
|
with:
|
||||||
|
args: |
|
||||||
|
--${{ matrix.arch }} \
|
||||||
|
--version ${{ github.event.inputs.version }} \
|
||||||
|
--target .
|
||||||
@@ -38,8 +38,9 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Cancel Previous Runs
|
- name: Cancel Previous Runs
|
||||||
uses: styfle/cancel-workflow-action@0.9.1
|
uses: styfle/cancel-workflow-action@0.10.0
|
||||||
with:
|
with:
|
||||||
|
all_but_latest: true
|
||||||
access_token: ${{ github.token }}
|
access_token: ${{ github.token }}
|
||||||
|
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
|
|||||||
@@ -1,30 +1,46 @@
|
|||||||
name: Deploy
|
name: Deploy
|
||||||
env:
|
on:
|
||||||
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
|
workflow_dispatch:
|
||||||
on:
|
push:
|
||||||
release:
|
branch: [main]
|
||||||
types: [published]
|
paths:
|
||||||
|
- "config.yaml"
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
metadata:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
name: ${{ matrix.arch }}
|
name: Metadata
|
||||||
strategy:
|
outputs:
|
||||||
matrix:
|
version: ${{ steps.version.outputs.VERSION }}
|
||||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
changlelog: ${{ steps.changlelog.outputs.CHANGELOG }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Check out repository
|
- name: Check out repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
- name: Get Version
|
||||||
|
id: version
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
echo ::set-output name=VERSION::$(cat config.yaml | sed -nr 's/version: (.*)/\1/p')
|
||||||
|
- name: Get Changelog
|
||||||
|
id: changlelog
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
|
||||||
|
|
||||||
- name: Login to DockerHub
|
publish:
|
||||||
uses: docker/login-action@v2.0.0
|
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:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
script: |
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
github.rest.repos.createRelease({
|
||||||
|
owner: context.repo.owner,
|
||||||
- name: ${{ github.ref }} / ${{ matrix.arch }}
|
repo: context.repo.repo,
|
||||||
uses: home-assistant/builder@2022.03.1
|
tag_name: process.env.VERSION,
|
||||||
with:
|
});
|
||||||
args: |
|
|
||||||
--${{ matrix.arch }} \
|
|
||||||
--target .
|
|
||||||
+85
-51
@@ -1,23 +1,93 @@
|
|||||||
name: Test
|
name: Tests
|
||||||
env:
|
on:
|
||||||
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
push:
|
push:
|
||||||
branch: [main]
|
branch:
|
||||||
|
- main
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [main]
|
branch:
|
||||||
|
- main
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
metadata:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
name: Build Test for ${{ matrix.arch }}
|
name: Metadata
|
||||||
|
outputs:
|
||||||
|
version: ${{ steps.version.outputs.VERSION }}
|
||||||
|
steps:
|
||||||
|
- name: Check out repository
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- name: Get Version
|
||||||
|
id: version
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
echo ::set-output name=VERSION::$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
|
||||||
|
- name: ${{ steps.version.outputs.VERSION }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
echo ${{ steps.version.outputs.VERSION }}
|
||||||
|
|
||||||
|
python:
|
||||||
|
name: "Python Tests"
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs:
|
||||||
|
- metadata
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
action:
|
||||||
|
- lint
|
||||||
|
- coverage
|
||||||
|
- security-checks
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- name: Set up Python
|
||||||
|
uses: actions/setup-python@v4
|
||||||
|
with:
|
||||||
|
python-version: 3.9
|
||||||
|
- name: Install Dependencies
|
||||||
|
run: cd api && make setup
|
||||||
|
- name: Echo dependencies
|
||||||
|
run: cd api && ./venv/bin/pip freeze
|
||||||
|
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
|
||||||
|
run: cd api && make ${{ matrix.action }}
|
||||||
|
|
||||||
|
nodejs:
|
||||||
|
name: "NodeJs Tests"
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs:
|
||||||
|
- metadata
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
action:
|
||||||
|
- "test:ci"
|
||||||
|
- "tsc:ci"
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- uses: actions/setup-node@v3
|
||||||
|
with:
|
||||||
|
node-version: 16
|
||||||
|
cache: "yarn"
|
||||||
|
cache-dependency-path: webapp/yarn.lock
|
||||||
|
- name: Install Dependencies
|
||||||
|
run: cd webapp && yarn install
|
||||||
|
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
|
||||||
|
run: cd webapp && yarn ${{ matrix.action }}
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
name: Build & Publish ${{ matrix.arch }}
|
||||||
|
if: github.event_name != 'pull_request'
|
||||||
|
needs:
|
||||||
|
- metadata
|
||||||
|
- nodejs
|
||||||
|
- python
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Cancel Previous Runs
|
- name: Cancel Previous Runs
|
||||||
uses: styfle/cancel-workflow-action@0.9.1
|
uses: styfle/cancel-workflow-action@0.10.0
|
||||||
with:
|
with:
|
||||||
all_but_latest: true
|
all_but_latest: true
|
||||||
access_token: ${{ github.token }}
|
access_token: ${{ github.token }}
|
||||||
@@ -31,47 +101,11 @@ jobs:
|
|||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
||||||
- name: ${{ matrix.arch }}
|
uses: home-assistant/builder@2022.07.0
|
||||||
uses: home-assistant/builder@2022.03.1
|
|
||||||
with:
|
with:
|
||||||
args: |
|
args: |
|
||||||
--test \
|
|
||||||
--${{ matrix.arch }} \
|
--${{ matrix.arch }} \
|
||||||
--target .
|
--no-latest \
|
||||||
python:
|
--version ${{ needs.metadata.outputs.version }} \
|
||||||
name: "Python Tests"
|
--target .
|
||||||
runs-on: ubuntu-latest
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
action: [lint, coverage, security-checks]
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v3
|
|
||||||
with:
|
|
||||||
python-version: 3.9
|
|
||||||
- name: Install Dependencies
|
|
||||||
run: cd api && make setup
|
|
||||||
- name: Echo dependencies
|
|
||||||
run: cd api && ./venv/bin/pip freeze
|
|
||||||
- name: Running ${{ matrix.action }}
|
|
||||||
run: cd api && make ${{ matrix.action }}
|
|
||||||
|
|
||||||
nodejs:
|
|
||||||
name: "NodeJs Tests"
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
- uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
cache: 'yarn'
|
|
||||||
cache-dependency-path: webapp/yarn.lock
|
|
||||||
- name: Install Dependencies
|
|
||||||
run: cd webapp && yarn install
|
|
||||||
- name: Run Tests
|
|
||||||
run: cd webapp && yarn test:ci
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
.vscode/*.log
|
||||||
Vendored
+4
-1
@@ -8,5 +8,8 @@
|
|||||||
"*test_*.py"
|
"*test_*.py"
|
||||||
],
|
],
|
||||||
"python.testing.pytestEnabled": false,
|
"python.testing.pytestEnabled": false,
|
||||||
"python.testing.unittestEnabled": true
|
"python.testing.unittestEnabled": true,
|
||||||
|
"yaml.schemas": {
|
||||||
|
"https://json.schemastore.org/github-action.json": ".github/workflows/*.yml"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+93
-3
@@ -1,4 +1,95 @@
|
|||||||
# Changelog -- [](https://badge.fury.io/gh/asosnovsky%2FShortumation)
|
# Changelog 
|
||||||
|
|
||||||
|
## [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
|
||||||
|
- Autocomplete for tags
|
||||||
|
- Using 'id' as alias for trigger (as it seems to break HA otherwise)
|
||||||
|
- Not using 'alias' for conditions, always auto-generating it (again, this used to break HA)
|
||||||
|
- Added missing `data` object to service-actions
|
||||||
|
|
||||||
|
## [0.1.13] - YAML
|
||||||
|
|
||||||
|
- Better YAML
|
||||||
|
- Rewrote yaml parser/loader to use pyyaml and safe mode
|
||||||
|
- Cleaned up description vs alias
|
||||||
|
|
||||||
|
## [0.1.12] - Less Intense Error Messages
|
||||||
|
|
||||||
|
- Added more node-based errors (this way it's easier to see where validations failed)
|
||||||
|
- Made the validators less strict in order to capture more edge cases that HA supports
|
||||||
|
- Nicer auto-generated descriptions for some trigger nodes
|
||||||
|
|
||||||
|
## [0.1.10] - More Bug Fixes
|
||||||
|
|
||||||
|
- Allowing null or undefined values for metadata fields
|
||||||
|
- Trigger.platform==time will now have the .at property better supported
|
||||||
|
|
||||||
|
## [0.1.9] - Fixed up invalid types for various triggers
|
||||||
|
|
||||||
|
- Some triggers had invalid types and were causing a false-positive validation
|
||||||
|
|
||||||
|
## [0.1.8] - Support for Malformed Automations
|
||||||
|
|
||||||
|
- API will no longer error out on missing values or invalid lists
|
||||||
|
- Frontend has support for displaying bad automations
|
||||||
|
|
||||||
|
## [0.1.6] - Mobile Mode
|
||||||
|
|
||||||
|
- Improved mobile mode
|
||||||
|
- Fixed up arrow styles due to typos
|
||||||
|
- Added selection color
|
||||||
|
|
||||||
## [0.1.2] - Docker Hub Images
|
## [0.1.2] - Docker Hub Images
|
||||||
|
|
||||||
@@ -33,8 +124,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).
|
||||||
+20
-16
@@ -1,11 +1,16 @@
|
|||||||
# <--- Build Args -->
|
# <--- Pre-Build Args -->
|
||||||
ARG BUILD_ARCH
|
ARG BUILD_ARCH
|
||||||
ARG BUILD_VERSION
|
|
||||||
|
|
||||||
# <--- Image Setup -->
|
# <--- Image Setup -->
|
||||||
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
|
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
# <--- Post-Build Args -->
|
||||||
|
ARG BUILD_VERSION
|
||||||
|
|
||||||
|
# <--- Environment Variables -->
|
||||||
|
ENV BUILD_VERSION $BUILD_VERSION
|
||||||
|
|
||||||
# <--- System Wide Dependencies -->
|
# <--- System Wide Dependencies -->
|
||||||
ENV LANG C.UTF-8
|
ENV LANG C.UTF-8
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
@@ -13,29 +18,26 @@ RUN apk add --no-cache \
|
|||||||
npm \
|
npm \
|
||||||
build-base \
|
build-base \
|
||||||
python3-dev
|
python3-dev
|
||||||
RUN pip install -U wheel setuptools pip && \
|
|
||||||
npm i -g yarn
|
# <--- Scripts -->
|
||||||
|
COPY docker/bin /app/bin
|
||||||
|
|
||||||
|
# <--- PREP -->
|
||||||
|
RUN /app/bin/prep.sh
|
||||||
|
|
||||||
# <--- Python Dependencies -->
|
# <--- Python Dependencies -->
|
||||||
COPY api/setup.py /app/setup.py
|
COPY api/setup.py /app/setup.py
|
||||||
RUN pip install . /app
|
|
||||||
|
|
||||||
# <--- Webapp Build -->
|
# <--- Webapp Build -->
|
||||||
COPY webapp/ /app/web-builder
|
COPY webapp/ /app/web-builder
|
||||||
RUN cd /app/web-builder && \
|
RUN cd /app/web-builder && \
|
||||||
yarn && \
|
echo "REACT_APP_BUILD_VERSION=${BUILD_VERSION}" > /app/web-builder/.env.production
|
||||||
yarn build && \
|
|
||||||
cp -r /app/web-builder/build /app/web && \
|
# <--- BUILD -->
|
||||||
rm -rf /app/web-builder
|
RUN /app/bin/build.sh /app /app/web-builder
|
||||||
|
|
||||||
# <--- Api Code -->
|
# <--- Api Code -->
|
||||||
COPY api/src /app/src
|
COPY api/src /app/src
|
||||||
COPY run.sh /app/run.sh
|
|
||||||
RUN chmod +x /app/run.sh
|
|
||||||
|
|
||||||
# <--- Environment Variables -->
|
|
||||||
ENV HASSIO_TOKEN ""
|
|
||||||
ENV BUILD_VERSION $BUILD_VERSION
|
|
||||||
|
|
||||||
# <--- Ports -->
|
# <--- Ports -->
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
@@ -45,5 +47,7 @@ LABEL \
|
|||||||
io.hass.type="addon" \
|
io.hass.type="addon" \
|
||||||
io.hass.arch="armhf|aarch64|i386|amd64"
|
io.hass.arch="armhf|aarch64|i386|amd64"
|
||||||
|
|
||||||
CMD [ "/app/run.sh" ]
|
ENTRYPOINT [ "/app/bin/run.sh" ]
|
||||||
|
CMD [ "/app" ]
|
||||||
|
|
||||||
|
LABEL org.opencontainers.image.source https://github.com/asosnovsky/Shortumation
|
||||||
@@ -1,24 +1,44 @@
|
|||||||
DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
|
BUILD_TAG=$(shell git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
|
||||||
|
DC=BUILD_TAG=${BUILD_TAG} docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
|
||||||
|
|
||||||
|
build-with-builder:
|
||||||
|
docker run \
|
||||||
|
--rm \
|
||||||
|
--privileged \
|
||||||
|
-v ~/.docker:/root/.docker \
|
||||||
|
-v /var/run/docker.sock:/var/run/docker.sock:ro \
|
||||||
|
-v ${PWD}:/data \
|
||||||
|
homeassistant/amd64-builder \
|
||||||
|
--amd64 \
|
||||||
|
--test \
|
||||||
|
--version ${BUILD_TAG} \
|
||||||
|
-t /data
|
||||||
|
|
||||||
build:
|
build:
|
||||||
$(DC) build
|
$(DC) build
|
||||||
|
|
||||||
|
build-no-cache:
|
||||||
|
$(DC) build --no-cache
|
||||||
|
|
||||||
push:
|
push:
|
||||||
$(DC) push
|
$(DC) push
|
||||||
|
|
||||||
local_run:
|
start:
|
||||||
$(MAKE) build
|
|
||||||
$(DC) up -d
|
$(DC) up -d
|
||||||
sleep 1
|
sleep 1
|
||||||
$(DC) ps
|
$(DC) ps
|
||||||
|
|
||||||
local_logs:
|
logs:
|
||||||
$(DC) logs -f
|
$(DC) logs -f
|
||||||
|
|
||||||
local_ps:
|
ps:
|
||||||
$(DC) ps
|
$(DC) ps
|
||||||
|
|
||||||
|
stop:
|
||||||
local_stop:
|
|
||||||
$(DC) stop
|
$(DC) stop
|
||||||
|
|
||||||
|
bash:
|
||||||
|
$(DC) exec addon bash
|
||||||
|
|
||||||
|
config:
|
||||||
|
$(DC) config
|
||||||
@@ -1,8 +1,42 @@
|
|||||||
# Shortumation [](https://badge.fury.io/gh/asosnovsky%2FShortumation)
|
# Shortumation 
|
||||||
|
|
||||||

|
[](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
|
||||||
|

|
||||||
|
| | Stable | Edge
|
||||||
|
| --- | --- | ---
|
||||||
|
| Version |  | 
|
||||||
|
|
||||||
A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
|
||||||
|
|
||||||
|
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/).
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
@@ -10,12 +44,41 @@ A [home-assistent 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).
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
### Addon
|
||||||
|
|
||||||
|
Add the repository URL under **Supervisor → Add-on store → ⋮ → Manage add-on repositories**:
|
||||||
|
|
||||||
|
https://github.com/asosnovsky/Shortumation
|
||||||
|
|
||||||
|
It should now appear in your `Add-on Store` and you should be able to install it!
|
||||||
|
|
||||||
|
### Containerized
|
||||||
|
|
||||||
|
Please note that this way of using Shortumation is **not future proof**, currently we use the `/config/automation.yaml` file as our source of truth for the automations. Which means that we do not need access to the HA API or Websockets. In future release you may need to configure some additional compomenents to enable this.
|
||||||
|
|
||||||
|
If this warning does not scare you or you still want to try things out, then take a look at the example [docker-compose.yaml](example/containerized/docker-compose.yaml).
|
||||||
|
|
||||||
|
|
||||||
|
## FAQ
|
||||||
|
|
||||||
|
**How is this different from Node-Red?**
|
||||||
|
|
||||||
|
> Node-Red is both an execution engine and an automation editor, which means that in order for you automations to run you have to have an additional component running and executing the automations. Shortumation simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database)
|
||||||
|
|
||||||
|
**Which HA Installation does this support?**
|
||||||
|
|
||||||
|
> Currently this is only tested on HA OS. However, you should be able to get it working supervised installations as well (as they support addons). If you want to make it work for Container or Core, you will need to do some additional leg-work and I welcome a PR to get this working (it should be just a matter of mounting the `/config` path to the container running the images in this repo).
|
||||||
|
|
||||||
|
**Which version of HA does this require?**
|
||||||
|
|
||||||
|
> Since I am working on this project on my own, I can only test it against my own HA installations at home, and I tend to keep things as up to date as possible. The lowest version of HA this was tested on is `core-2022.5.4`
|
||||||
+12
@@ -0,0 +1,12 @@
|
|||||||
|
# Security Policy
|
||||||
|
|
||||||
|
## Supported Versions
|
||||||
|
|
||||||
|
| Version | Supported |
|
||||||
|
| ------- | ------------------ |
|
||||||
|
| 0.1.x | :white_check_mark: |
|
||||||
|
|
||||||
|
|
||||||
|
## Reporting a Vulnerability
|
||||||
|
|
||||||
|
Please open an issue with the tag 'Vulnerability', and include your reasoning in it.
|
||||||
+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)
|
|
||||||
+1
-1
@@ -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
|
||||||
|
|||||||
+15
-14
@@ -4,24 +4,25 @@ import setuptools # type: ignore
|
|||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
python_requires=">=3.9",
|
python_requires=">=3.9",
|
||||||
install_requires=[
|
install_requires=[
|
||||||
"ruamel.yaml==0.17.17",
|
"PyYAML==6.0",
|
||||||
"fastapi==0.70.0",
|
"fastapi==0.78.0",
|
||||||
"pydantic==1.8.2",
|
"pydantic==1.9.1",
|
||||||
"uvicorn[standard]==0.15.0",
|
"uvicorn[standard]==0.18.2",
|
||||||
"python-decouple==3.5",
|
"python-decouple==3.6",
|
||||||
],
|
],
|
||||||
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",
|
||||||
"requests==2.27.0",
|
"types-PyYAML==6.0.9",
|
||||||
|
"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
|
||||||
@@ -25,11 +25,11 @@ def make_automation_router(automations: AutomationManager) -> APIRouter:
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
@router.post("")
|
@router.post("/item")
|
||||||
def upsert_auto(body: UpdateAutoRequest):
|
def upsert_auto(body: UpdateAutoRequest):
|
||||||
automations.update(body.index, body.data)
|
automations.update(body.index, body.data)
|
||||||
|
|
||||||
@router.delete("")
|
@router.delete("/item")
|
||||||
def delete_auto(body: DeleteAutoRequest):
|
def delete_auto(body: DeleteAutoRequest):
|
||||||
try:
|
try:
|
||||||
automations.delete(body.index)
|
automations.delete(body.index)
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
from datetime import datetime
|
|
||||||
|
|
||||||
from fastapi import APIRouter
|
from fastapi import APIRouter
|
||||||
|
|
||||||
from src.env import BUILD_VERSION
|
from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
|
||||||
from src.hass_config import HassConfig
|
from src.hass_config import HassConfig
|
||||||
|
|
||||||
|
|
||||||
@@ -10,9 +8,11 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
|
|||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|
||||||
@router.get("/")
|
@router.get("/")
|
||||||
def read_ping():
|
def read_details():
|
||||||
return {
|
return {
|
||||||
"version": BUILD_VERSION,
|
"version": BUILD_VERSION,
|
||||||
|
"hassio_token": HASSIO_TOKEN,
|
||||||
|
"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,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,4 +1,4 @@
|
|||||||
from typing import Iterator, Union
|
from typing import Any, Iterator, Union
|
||||||
|
|
||||||
from pydantic.error_wrappers import ValidationError
|
from pydantic.error_wrappers import ValidationError
|
||||||
|
|
||||||
@@ -26,18 +26,27 @@ def load_automation(
|
|||||||
try:
|
try:
|
||||||
yield ExtenededAutomationData(
|
yield ExtenededAutomationData(
|
||||||
metadata=AutomationMetdata.parse_obj(auto_raw),
|
metadata=AutomationMetdata.parse_obj(auto_raw),
|
||||||
condition=load_conditions(auto_raw.get("condition", [])),
|
condition=ifempty_or_null_then_list(load_conditions(auto_raw.get("condition", []))),
|
||||||
sequence=load_conditions(auto_raw.get("action", [])),
|
sequence=ifempty_or_null_then_list(load_conditions(auto_raw.get("action", []))),
|
||||||
trigger=normalize_obj(auto_raw.get("trigger", [])),
|
trigger=ifempty_or_null_then_list(normalize_obj(auto_raw.get("trigger", []))),
|
||||||
tags=tags,
|
tags=tags,
|
||||||
)
|
)
|
||||||
except ValidationError as err:
|
except ValidationError as err:
|
||||||
raise InvalidAutomationFile from err
|
raise InvalidAutomationFile from err
|
||||||
|
|
||||||
|
|
||||||
|
def ifempty_or_null_then_list(obj: Any):
|
||||||
|
if not isinstance(obj, list):
|
||||||
|
return []
|
||||||
|
else:
|
||||||
|
return obj
|
||||||
|
|
||||||
|
|
||||||
def load_conditions(conditions: Union[dict, list, str]):
|
def load_conditions(conditions: Union[dict, list, str]):
|
||||||
if isinstance(conditions, list):
|
if isinstance(conditions, list):
|
||||||
return list(map(ensure_condition_dictionary, conditions))
|
return list(map(ensure_condition_dictionary, conditions))
|
||||||
|
elif not conditions:
|
||||||
|
return []
|
||||||
else:
|
else:
|
||||||
return [ensure_condition_dictionary(conditions)]
|
return [ensure_condition_dictionary(conditions)]
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
from typing import Iterator, List, Optional
|
from typing import 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,29 +22,32 @@ 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[AutomationData]:
|
||||||
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)
|
||||||
|
|
||||||
|
|||||||
@@ -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)))
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
from typing import Dict, List, Literal, Optional, Union
|
from typing import Dict, List, Optional, Union
|
||||||
|
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from pydantic.fields import Field
|
from pydantic.fields import Field
|
||||||
@@ -9,7 +9,7 @@ class AutomationMetdata(BaseModel):
|
|||||||
alias: Optional[str] = None
|
alias: Optional[str] = None
|
||||||
description: Optional[str] = None
|
description: Optional[str] = None
|
||||||
trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None
|
trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None
|
||||||
mode: Literal["single", "restart", "queued", "parallel"] = "single"
|
mode: str = "single"
|
||||||
|
|
||||||
|
|
||||||
class AutomationData(BaseModel):
|
class AutomationData(BaseModel):
|
||||||
|
|||||||
@@ -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))
|
||||||
@@ -4,5 +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("SUPERVISOR_TOKEN", "")
|
||||||
|
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,9 @@ 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 create_copy_of_example_config, HA_CONFIG3_EXAMPLE
|
||||||
|
|
||||||
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())
|
||||||
@@ -1,7 +1,10 @@
|
|||||||
import io
|
import io
|
||||||
from typing import Any, TextIO, Union
|
from typing import Any, TextIO, Union
|
||||||
|
|
||||||
from src.yaml_serializer.base_yaml import yaml
|
import yaml
|
||||||
|
|
||||||
|
from src.yaml_serializer.dumper import YamlSafeDumper
|
||||||
|
from src.yaml_serializer.loader import YamlSafeLoader
|
||||||
|
|
||||||
|
|
||||||
def dump_yaml(obj: Any) -> str:
|
def dump_yaml(obj: Any) -> str:
|
||||||
@@ -14,7 +17,14 @@ def dump_yaml(obj: Any) -> str:
|
|||||||
str
|
str
|
||||||
"""
|
"""
|
||||||
stream = io.StringIO()
|
stream = io.StringIO()
|
||||||
yaml.dump(obj, stream)
|
yaml.dump( # nosec
|
||||||
|
obj,
|
||||||
|
stream,
|
||||||
|
default_flow_style=False,
|
||||||
|
allow_unicode=True,
|
||||||
|
sort_keys=False,
|
||||||
|
Dumper=YamlSafeDumper,
|
||||||
|
)
|
||||||
stream.seek(0)
|
stream.seek(0)
|
||||||
return stream.read()
|
return stream.read()
|
||||||
|
|
||||||
@@ -28,4 +38,4 @@ def load_yaml(yaml_stream: TextIO) -> Union[dict, list]:
|
|||||||
Returns:
|
Returns:
|
||||||
List[dict, list]
|
List[dict, list]
|
||||||
"""
|
"""
|
||||||
return yaml.load(yaml_stream)
|
return yaml.load(yaml_stream, Loader=YamlSafeLoader) # nosec
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
from ruamel.yaml import YAML
|
|
||||||
|
|
||||||
from src.yaml_serializer.types import (
|
|
||||||
IncludedYaml,
|
|
||||||
IncludedYamlDir,
|
|
||||||
SecretValue,
|
|
||||||
)
|
|
||||||
|
|
||||||
yaml = YAML()
|
|
||||||
yaml.register_class(IncludedYaml)
|
|
||||||
yaml.register_class(SecretValue)
|
|
||||||
yaml.register_class(IncludedYamlDir)
|
|
||||||
yaml.constructor.add_constructor("!include", IncludedYaml.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!secret", SecretValue.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!env_var", IncludedYamlDir.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!include_dir_list", IncludedYamlDir.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!include_dir_merge_list", IncludedYamlDir.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!include_dir_named", IncludedYamlDir.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!include_dir_merge_named", IncludedYamlDir.from_yaml)
|
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
import yaml
|
||||||
|
|
||||||
|
from src.yaml_serializer.types import (
|
||||||
|
IncludedYaml,
|
||||||
|
IncludedYamlDir,
|
||||||
|
SecretValue,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class YamlSafeDumper(yaml.SafeDumper):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
YamlSafeDumper.add_representer(IncludedYaml, IncludedYaml.to_yaml) # type: ignore
|
||||||
|
YamlSafeDumper.add_representer(SecretValue, SecretValue.to_yaml) # type: ignore
|
||||||
|
YamlSafeDumper.add_representer(IncludedYamlDir, IncludedYamlDir.to_yaml) # type: ignore
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
import yaml
|
||||||
|
|
||||||
|
from src.yaml_serializer.types import (
|
||||||
|
IncludedYaml,
|
||||||
|
IncludedYamlDir,
|
||||||
|
SecretValue,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class YamlSafeLoader(yaml.SafeLoader):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
YamlSafeLoader.add_constructor("!include", IncludedYaml.from_yaml)
|
||||||
|
YamlSafeLoader.add_constructor("!secret", SecretValue.from_yaml)
|
||||||
|
YamlSafeLoader.add_constructor("!env_var", IncludedYamlDir.from_yaml)
|
||||||
|
YamlSafeLoader.add_constructor("!include_dir_list", IncludedYamlDir.from_yaml)
|
||||||
|
YamlSafeLoader.add_constructor("!include_dir_merge_list", IncludedYamlDir.from_yaml)
|
||||||
|
YamlSafeLoader.add_constructor("!include_dir_named", IncludedYamlDir.from_yaml)
|
||||||
|
YamlSafeLoader.add_constructor("!include_dir_merge_named", IncludedYamlDir.from_yaml)
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
from typing import NamedTuple
|
from typing import NamedTuple
|
||||||
|
|
||||||
from ruamel.yaml.nodes import Node
|
from yaml.nodes import Node
|
||||||
from ruamel.yaml.representer import BaseRepresenter
|
from yaml.representer import BaseRepresenter
|
||||||
|
|
||||||
|
|
||||||
class IncludedYaml(NamedTuple):
|
class IncludedYaml(NamedTuple):
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -811,3 +811,31 @@
|
|||||||
device_id: das2qdasdasdasadaasd
|
device_id: das2qdasdasdasadaasd
|
||||||
default: []
|
default: []
|
||||||
mode: single
|
mode: single
|
||||||
|
- id: 'baddy-1'
|
||||||
|
alias: 'bad triggers'
|
||||||
|
description: ''
|
||||||
|
trigger: ""
|
||||||
|
condition: []
|
||||||
|
action: []
|
||||||
|
mode: single
|
||||||
|
- id: 'baddy-2'
|
||||||
|
alias: 'null things'
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
condition:
|
||||||
|
action:
|
||||||
|
mode: single
|
||||||
|
- id: 'baddy-3'
|
||||||
|
alias: 'big null things'
|
||||||
|
description:
|
||||||
|
trigger:
|
||||||
|
condition:
|
||||||
|
action:
|
||||||
|
mode: single
|
||||||
|
- id: 'bad mode'
|
||||||
|
alias: 'bade mode'
|
||||||
|
description: ""
|
||||||
|
trigger: []
|
||||||
|
condition: []
|
||||||
|
action: []
|
||||||
|
mode: bad
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
|
import yaml
|
||||||
from fastapi.testclient import TestClient
|
from fastapi.testclient import TestClient
|
||||||
from ruamel.yaml import YAML
|
|
||||||
|
|
||||||
from src.api.app import make_app
|
from src.api.app import make_app
|
||||||
from src.automations.types import (
|
from src.automations.types import (
|
||||||
@@ -24,7 +24,7 @@ class BaseTestCase(TestCase):
|
|||||||
|
|
||||||
class automation_list_tests(BaseTestCase):
|
class automation_list_tests(BaseTestCase):
|
||||||
|
|
||||||
test_params = {"total": 28, "subtest2_found_items": 3, "subtest1_found_items": 10}
|
test_params = {"total": 32, "subtest2_found_items": 7, "subtest1_found_items": 10}
|
||||||
|
|
||||||
def test_get_list_of_everything(self):
|
def test_get_list_of_everything(self):
|
||||||
data = self.client.post(
|
data = self.client.post(
|
||||||
@@ -106,25 +106,25 @@ class automation2_lists_tests(automation_list_tests):
|
|||||||
class automation_update_tests(BaseTestCase):
|
class automation_update_tests(BaseTestCase):
|
||||||
def test_insert_new(self):
|
def test_insert_new(self):
|
||||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
||||||
self.assertEqual(resp.json()["totalItems"], 28)
|
self.assertEqual(resp.json()["totalItems"], 32)
|
||||||
resp = self.client.post(
|
resp = self.client.post(
|
||||||
"/automations",
|
"/automations/item",
|
||||||
json={
|
json={
|
||||||
"index": 29,
|
"index": 33,
|
||||||
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
|
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(resp.status_code, 200)
|
self.assertEqual(resp.status_code, 200)
|
||||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 28})
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 32})
|
||||||
data = resp.json()
|
data = resp.json()
|
||||||
self.assertEqual(data["totalItems"], 29)
|
self.assertEqual(data["totalItems"], 33)
|
||||||
self.assertEqual(data["data"][0]["metadata"]["id"], "testme")
|
self.assertEqual(data["data"][0]["metadata"]["id"], "testme")
|
||||||
|
|
||||||
def test_update_some(self):
|
def test_update_some(self):
|
||||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
|
||||||
original_auto = resp.json()["data"][0]
|
original_auto = resp.json()["data"][0]
|
||||||
resp = self.client.post(
|
resp = self.client.post(
|
||||||
"/automations",
|
"/automations/item",
|
||||||
json={
|
json={
|
||||||
"index": 20,
|
"index": 20,
|
||||||
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
|
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
|
||||||
@@ -143,7 +143,7 @@ class automation_update_tests(BaseTestCase):
|
|||||||
original_auto = resp.json()["data"][0]
|
original_auto = resp.json()["data"][0]
|
||||||
original_auto["metadata"]["alias"] = "I CHANGED!"
|
original_auto["metadata"]["alias"] = "I CHANGED!"
|
||||||
resp = self.client.post(
|
resp = self.client.post(
|
||||||
"/automations",
|
"/automations/item",
|
||||||
json={
|
json={
|
||||||
"index": 15,
|
"index": 15,
|
||||||
"data": original_auto,
|
"data": original_auto,
|
||||||
@@ -151,7 +151,7 @@ class automation_update_tests(BaseTestCase):
|
|||||||
)
|
)
|
||||||
self.assertEqual(resp.status_code, 200)
|
self.assertEqual(resp.status_code, 200)
|
||||||
with (self.config_folder / "automations.yaml").open("r") as fp:
|
with (self.config_folder / "automations.yaml").open("r") as fp:
|
||||||
disk_data = dict(YAML().load(fp)[15])
|
disk_data = dict(yaml.safe_load(fp)[15])
|
||||||
trigger = list(map(dict, disk_data.pop("trigger")))
|
trigger = list(map(dict, disk_data.pop("trigger")))
|
||||||
condition = disk_data.pop("condition")
|
condition = disk_data.pop("condition")
|
||||||
action = list(map(dict, disk_data.pop("action")))
|
action = list(map(dict, disk_data.pop("action")))
|
||||||
@@ -194,7 +194,7 @@ class automation_update_tests(BaseTestCase):
|
|||||||
original_auto = resp.json()["data"][0]
|
original_auto = resp.json()["data"][0]
|
||||||
original_auto["metadata"]["alias"] = "I CHANGED!"
|
original_auto["metadata"]["alias"] = "I CHANGED!"
|
||||||
resp = self.client.post(
|
resp = self.client.post(
|
||||||
"/automations",
|
"/automations/item",
|
||||||
json={
|
json={
|
||||||
"index": 27,
|
"index": 27,
|
||||||
"data": original_auto,
|
"data": original_auto,
|
||||||
@@ -202,7 +202,7 @@ class automation_update_tests(BaseTestCase):
|
|||||||
)
|
)
|
||||||
self.assertEqual(resp.status_code, 200)
|
self.assertEqual(resp.status_code, 200)
|
||||||
with (self.config_folder / "automations.yaml").open("r") as fp:
|
with (self.config_folder / "automations.yaml").open("r") as fp:
|
||||||
disk_data = dict(YAML().load(fp)[27])
|
disk_data = dict(yaml.safe_load(fp)[27])
|
||||||
trigger = list(map(dict, disk_data.pop("trigger")))
|
trigger = list(map(dict, disk_data.pop("trigger")))
|
||||||
condition = disk_data.pop("condition")
|
condition = disk_data.pop("condition")
|
||||||
action = list(map(dict, disk_data.pop("action")))
|
action = list(map(dict, disk_data.pop("action")))
|
||||||
@@ -324,13 +324,13 @@ class automation_update_tests(BaseTestCase):
|
|||||||
class automation_delete_tests(BaseTestCase):
|
class automation_delete_tests(BaseTestCase):
|
||||||
def test_delete_some(self):
|
def test_delete_some(self):
|
||||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
||||||
self.assertEqual(resp.json()["totalItems"], 28)
|
self.assertEqual(resp.json()["totalItems"], 32)
|
||||||
resp = self.client.delete(
|
resp = self.client.delete(
|
||||||
"/automations",
|
"/automations/item",
|
||||||
json={
|
json={
|
||||||
"index": 20,
|
"index": 20,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(resp.status_code, 200)
|
self.assertEqual(resp.status_code, 200)
|
||||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
||||||
self.assertEqual(resp.json()["totalItems"], 27)
|
self.assertEqual(resp.json()["totalItems"], 31)
|
||||||
@@ -24,11 +24,11 @@ class manager_tests(TestCase):
|
|||||||
_, _, loader = get_example_automation_loader()
|
_, _, loader = get_example_automation_loader()
|
||||||
self.assertIsNone(loader.get(-1))
|
self.assertIsNone(loader.get(-1))
|
||||||
self.assertIsNone(loader.get(1_000))
|
self.assertIsNone(loader.get(1_000))
|
||||||
self.assertIsNone(loader.get(31))
|
self.assertIsNone(loader.get(33))
|
||||||
|
|
||||||
def test_length(self):
|
def test_length(self):
|
||||||
_, _, loader = get_example_automation_loader()
|
_, _, loader = get_example_automation_loader()
|
||||||
self.assertEqual(loader.get_total_items(), 28)
|
self.assertEqual(loader.get_total_items(), 32)
|
||||||
|
|
||||||
def test_bad_automations_file(self):
|
def test_bad_automations_file(self):
|
||||||
folder, _, manager = get_dummy_automation_loader(
|
folder, _, manager = get_dummy_automation_loader(
|
||||||
@@ -51,11 +51,11 @@ class manager_tests(TestCase):
|
|||||||
|
|
||||||
def test_create_automation_with_example_folder(self):
|
def test_create_automation_with_example_folder(self):
|
||||||
_, _, manager = get_example_automation_loader()
|
_, _, manager = get_example_automation_loader()
|
||||||
self.assertEqual(manager.get_total_items(), 28)
|
self.assertEqual(manager.get_total_items(), 32)
|
||||||
manager.update(32, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
|
manager.update(40, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
|
||||||
auto = manager.get(28)
|
auto = manager.get(32)
|
||||||
self.assertIsNotNone(auto)
|
self.assertIsNotNone(auto)
|
||||||
self.assertEqual(manager.get_total_items(), 29)
|
self.assertEqual(manager.get_total_items(), 33)
|
||||||
self.assertEqual(auto.metadata.id, "test1") # type: ignore
|
self.assertEqual(auto.metadata.id, "test1") # type: ignore
|
||||||
|
|
||||||
def test_update_automation(self):
|
def test_update_automation(self):
|
||||||
|
|||||||
@@ -1,11 +1,6 @@
|
|||||||
import json
|
import json
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from ruamel.yaml.scalarbool import ScalarBoolean
|
|
||||||
from ruamel.yaml.scalarfloat import ScalarFloat
|
|
||||||
from ruamel.yaml.scalarint import ScalarInt
|
|
||||||
from ruamel.yaml.scalarstring import ScalarString
|
|
||||||
|
|
||||||
from src.json_serializer import json_dumps
|
from src.json_serializer import json_dumps
|
||||||
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
||||||
|
|
||||||
@@ -34,25 +29,3 @@ class json_serializer_tests(TestCase):
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_convert_ruamel_types(self):
|
|
||||||
self.assertEqual(
|
|
||||||
json_dumps(
|
|
||||||
{
|
|
||||||
"int": ScalarInt(1),
|
|
||||||
"float": ScalarFloat(1.3),
|
|
||||||
"bool": ScalarBoolean(False),
|
|
||||||
"list": [1, ScalarString("w")],
|
|
||||||
"tup": (1, ScalarString("w")),
|
|
||||||
}
|
|
||||||
),
|
|
||||||
json.dumps(
|
|
||||||
{
|
|
||||||
"int": 1,
|
|
||||||
"float": 1.3,
|
|
||||||
"bool": 0,
|
|
||||||
"list": [1, "w"],
|
|
||||||
"tup": (1, "w"),
|
|
||||||
},
|
|
||||||
),
|
|
||||||
)
|
|
||||||
@@ -19,21 +19,29 @@ class dumping_yamls_tests(TestCase):
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
self.assertEqual(yaml, "automations: !include automations.yaml\n")
|
self.assertEqual(yaml, "automations: !include 'automations.yaml'\n")
|
||||||
|
|
||||||
def test_dumping_secrets(self):
|
def test_dumping_secrets(self):
|
||||||
yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")})
|
yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")})
|
||||||
self.assertEqual(yaml, "google_password: !secret gpass\n")
|
self.assertEqual(yaml, "google_password: !secret 'gpass'\n")
|
||||||
|
|
||||||
def test_dumping_stub(self):
|
def test_dumping_stub(self):
|
||||||
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")})
|
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")})
|
||||||
self.assertEqual(yaml, "sensor: !include_dir_list sensors/*yaml\n")
|
self.assertEqual(yaml, "sensor: !include_dir_list 'sensors/*yaml'\n")
|
||||||
|
|
||||||
def test_load_stub(self):
|
def test_load_stub(self):
|
||||||
yaml_obj = load_yaml(
|
yaml_obj = load_yaml(
|
||||||
io.StringIO(
|
io.StringIO(
|
||||||
"""
|
"""
|
||||||
name: cool
|
name: cool
|
||||||
|
date: "10:00"
|
||||||
|
bools:
|
||||||
|
- "yes"
|
||||||
|
- "no"
|
||||||
|
- true
|
||||||
|
- false
|
||||||
|
bobIsNull:
|
||||||
|
bobIsNull2: null
|
||||||
google_password: !secret gpass
|
google_password: !secret gpass
|
||||||
sensor: !include_dir_list sensors/*yaml
|
sensor: !include_dir_list sensors/*yaml
|
||||||
automations: !include automations.yaml
|
automations: !include automations.yaml
|
||||||
@@ -44,6 +52,10 @@ class dumping_yamls_tests(TestCase):
|
|||||||
dict(yaml_obj),
|
dict(yaml_obj),
|
||||||
{
|
{
|
||||||
"name": "cool",
|
"name": "cool",
|
||||||
|
"date": "10:00",
|
||||||
|
"bools": ["yes", "no", True, False],
|
||||||
|
"bobIsNull": None,
|
||||||
|
"bobIsNull2": None,
|
||||||
"google_password": SecretValue("gpass", "n/a"),
|
"google_password": SecretValue("gpass", "n/a"),
|
||||||
"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"),
|
"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"),
|
||||||
"automations": IncludedYaml("automations.yaml"),
|
"automations": IncludedYaml("automations.yaml"),
|
||||||
@@ -51,8 +63,17 @@ class dumping_yamls_tests(TestCase):
|
|||||||
)
|
)
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
dump_yaml(yaml_obj),
|
dump_yaml(yaml_obj),
|
||||||
"name: cool\n"
|
"""name: cool
|
||||||
"google_password: !secret gpass\n"
|
date: '10:00'
|
||||||
"sensor: !include_dir_list sensors/*yaml\n"
|
bools:
|
||||||
f"automations: !include automations.yaml\n",
|
- 'yes'
|
||||||
|
- 'no'
|
||||||
|
- true
|
||||||
|
- false
|
||||||
|
bobIsNull: null
|
||||||
|
bobIsNull2: null
|
||||||
|
google_password: !secret 'gpass'
|
||||||
|
sensor: !include_dir_list 'sensors/*yaml'
|
||||||
|
automations: !include 'automations.yaml'
|
||||||
|
""",
|
||||||
)
|
)
|
||||||
@@ -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))
|
||||||
+6
-7
@@ -1,5 +1,5 @@
|
|||||||
name: Shortumation
|
name: Shortumation
|
||||||
version: 0.1.2
|
version: v0.3.0
|
||||||
slug: shortumation
|
slug: shortumation
|
||||||
image: asosnovsky/shortumation-{arch}
|
image: asosnovsky/shortumation-{arch}
|
||||||
url: "https://github.com/asosnovsky/Shortumation"
|
url: "https://github.com/asosnovsky/Shortumation"
|
||||||
@@ -16,16 +16,15 @@ init: false
|
|||||||
ingress: true
|
ingress: true
|
||||||
ingress_port: 8000
|
ingress_port: 8000
|
||||||
ingress_entry: "web/"
|
ingress_entry: "web/"
|
||||||
panel_icon: mdi:home-automation
|
homeassistant_api: true
|
||||||
hassio_role: manager
|
|
||||||
privileged:
|
|
||||||
- SYS_RAWIO
|
|
||||||
host_network: true
|
|
||||||
auth_api: true
|
auth_api: true
|
||||||
|
panel_icon: mdi:home-automation
|
||||||
|
hassio_role: homeassistant
|
||||||
|
host_network: false
|
||||||
map:
|
map:
|
||||||
- config:rw
|
- config:rw
|
||||||
options: {}
|
options: {}
|
||||||
ports:
|
ports:
|
||||||
8000/tcp: 8000
|
8000/tcp:
|
||||||
ports_description:
|
ports_description:
|
||||||
8000/tcp: Main port for the API & Web.
|
8000/tcp: Main port for the API & Web.
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
version: '3'
|
version: '3'
|
||||||
services:
|
services:
|
||||||
addon:
|
addon:
|
||||||
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-latest}"
|
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
|
||||||
build:
|
build:
|
||||||
context: "./"
|
context: "./"
|
||||||
dockerfile: "./Dockerfile"
|
dockerfile: "./Dockerfile"
|
||||||
args:
|
args:
|
||||||
- BUILD_ARCH=${ARCH:-amd64}
|
BUILD_ARCH: ${ARCH:-amd64}
|
||||||
|
BUILD_VERSION: ${BUILD_TAG:-edge}
|
||||||
@@ -3,5 +3,8 @@ services:
|
|||||||
addon:
|
addon:
|
||||||
volumes:
|
volumes:
|
||||||
- "./sample_config:/config"
|
- "./sample_config:/config"
|
||||||
|
- "./api/tests:/app/tests"
|
||||||
ports:
|
ports:
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
|
env_file:
|
||||||
|
- api/.env
|
||||||
Executable
+28
@@ -0,0 +1,28 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
api_location=${1}
|
||||||
|
web_location=${2}
|
||||||
|
|
||||||
|
function install_yarn() {
|
||||||
|
pushd $web_location
|
||||||
|
yarn
|
||||||
|
yarn build
|
||||||
|
cp -r $web_location/build $api_location/web
|
||||||
|
popd
|
||||||
|
}
|
||||||
|
|
||||||
|
function install_py() {
|
||||||
|
pushd $api_location
|
||||||
|
pip install . $api_location
|
||||||
|
popd
|
||||||
|
}
|
||||||
|
|
||||||
|
declare -i err=0 werr=0
|
||||||
|
install_py &
|
||||||
|
install_yarn &
|
||||||
|
while wait -fn || werr=$?; ((werr != 127)); do
|
||||||
|
err=$werr
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "DONE BUILD"
|
||||||
Executable
+19
@@ -0,0 +1,19 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
function prep_yarn() {
|
||||||
|
npm i -g yarn
|
||||||
|
}
|
||||||
|
|
||||||
|
function prep_py() {
|
||||||
|
pip install -U wheel setuptools pip
|
||||||
|
}
|
||||||
|
|
||||||
|
declare -i err=0 werr=0
|
||||||
|
prep_py &
|
||||||
|
prep_yarn &
|
||||||
|
while wait -fn || werr=$?; ((werr != 127)); do
|
||||||
|
err=$werr
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "DONE PREP"
|
||||||
Executable
+10
@@ -0,0 +1,10 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
api_location=${1}
|
||||||
|
|
||||||
|
pushd $api_location
|
||||||
|
echo "--------------------"
|
||||||
|
echo "BUILD_VERSION = "$BUILD_VERSION
|
||||||
|
echo $(python --version)
|
||||||
|
echo "--------------------"
|
||||||
|
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
version: '3'
|
||||||
|
services:
|
||||||
|
homeassistant:
|
||||||
|
container_name: homeassistant
|
||||||
|
image: "ghcr.io/home-assistant/home-assistant:stable"
|
||||||
|
volumes:
|
||||||
|
- config:/config
|
||||||
|
restart: unless-stopped
|
||||||
|
privileged: true
|
||||||
|
network_mode: host
|
||||||
|
|
||||||
|
shortumation:
|
||||||
|
# make sure to replace the ARCH with whatever system you are running!
|
||||||
|
image: "asosnovsky/shortumation-${ARCH:-amd64}:latest"
|
||||||
|
volumes:
|
||||||
|
- config:/config
|
||||||
|
ports:
|
||||||
|
- 8081:8000
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
config:
|
||||||
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)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
echo $(python --version)
|
|
||||||
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
0:
|
0:
|
||||||
Type: Generic
|
Type: Generic2
|
||||||
1:
|
1:
|
||||||
Type: Generic
|
Type: Generic
|
||||||
2:
|
2:
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
SKIP_PREFLIGHT_CHECK=true
|
SKIP_PREFLIGHT_CHECK=true
|
||||||
@@ -1,4 +1,7 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
|
'core': {
|
||||||
|
builder: 'webpack5'
|
||||||
|
},
|
||||||
"stories": [
|
"stories": [
|
||||||
"../src/**/*.stories.mdx",
|
"../src/**/*.stories.mdx",
|
||||||
"../src/**/*.stories.@(js|jsx|ts|tsx)"
|
"../src/**/*.stories.@(js|jsx|ts|tsx)"
|
||||||
@@ -8,5 +11,8 @@ module.exports = {
|
|||||||
"@storybook/addon-essentials",
|
"@storybook/addon-essentials",
|
||||||
"@storybook/preset-create-react-app",
|
"@storybook/preset-create-react-app",
|
||||||
"@storybook/addon-queryparams",
|
"@storybook/addon-queryparams",
|
||||||
]
|
],
|
||||||
|
"features": {
|
||||||
|
"emotionAlias": false,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
Vendored
+6
-13
@@ -2,24 +2,17 @@
|
|||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
{
|
||||||
"name": "Debug CRA Tests",
|
"name": "Debug Jest Tests",
|
||||||
"type": "node",
|
"type": "node",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts",
|
"runtimeArgs": [
|
||||||
"args": [
|
"--inspect-brk",
|
||||||
"test",
|
"${workspaceRoot}/node_modules/.bin/jest",
|
||||||
"--runInBand",
|
"--runInBand"
|
||||||
"--no-cache",
|
|
||||||
"--watchAll=false"
|
|
||||||
],
|
],
|
||||||
"cwd": "${workspaceRoot}",
|
|
||||||
"protocol": "inspector",
|
|
||||||
"console": "integratedTerminal",
|
"console": "integratedTerminal",
|
||||||
"internalConsoleOptions": "neverOpen",
|
"internalConsoleOptions": "neverOpen",
|
||||||
"env": {
|
"port": 9229
|
||||||
"CI": "true"
|
|
||||||
},
|
|
||||||
"disableOptimisticBPs": true
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
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
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
+52
-30
@@ -4,25 +4,42 @@
|
|||||||
"private": true,
|
"private": true,
|
||||||
"homepage": ".",
|
"homepage": ".",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/jest": "^26.0.15",
|
"@emotion/react": "11.9.3",
|
||||||
"@types/node": "^12.0.0",
|
"@emotion/styled": "11.9.3",
|
||||||
"@types/react": "^17.0.0",
|
"@mui/icons-material": "5.8.4",
|
||||||
"@types/react-dom": "^17.0.0",
|
"@mui/material": "5.8.6",
|
||||||
"jss": "^10.8.2",
|
"@mui/styles": "5.8.6",
|
||||||
"react": "^17.0.2",
|
"@types/jest": "28.1.5",
|
||||||
"react-dom": "^17.0.2",
|
"@types/node": "17.0.36",
|
||||||
"react-flow-renderer": "^10.1.2",
|
"@types/react": "18.0.14",
|
||||||
"react-jss": "^10.8.2",
|
"@types/react-dom": "18.0.6",
|
||||||
"react-router-dom": "6",
|
"@types/ws": "8.5.3",
|
||||||
"react-scripts": "4.0.3",
|
"@uiw/react-codemirror": "4.10.4",
|
||||||
"theming": "^3.3.0",
|
"autosuggest-highlight": "3.3.2",
|
||||||
"typescript": "^4.1.2",
|
"home-assistant-js-websocket": "7.1.0",
|
||||||
"web-vitals": "^1.0.1",
|
"jss": "10.9.0",
|
||||||
"yarn": "^1.22.17"
|
"material-ui-confirm": "3.0.4",
|
||||||
|
"notistack": "2.0.5",
|
||||||
|
"react": "18.2.0",
|
||||||
|
"react-cookie": "4.1.1",
|
||||||
|
"react-dom": "18.2.0",
|
||||||
|
"react-flow-renderer": "10.3.8",
|
||||||
|
"react-imask": "6.4.2",
|
||||||
|
"react-jss": "10.9.0",
|
||||||
|
"react-router-dom": "6.3.0",
|
||||||
|
"react-scripts": "5.0.1",
|
||||||
|
"superstruct": "0.16.0",
|
||||||
|
"theming": "3.3.0",
|
||||||
|
"typescript": "4.7.4",
|
||||||
|
"web-vitals": "2.1.4",
|
||||||
|
"ws": "8.8.0",
|
||||||
|
"yarn": "1.22.19"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "react-scripts start",
|
"start": "react-scripts start",
|
||||||
"build": "react-scripts build",
|
"build": "react-scripts build",
|
||||||
|
"tsc": "tsc -w",
|
||||||
|
"tsc:ci": "tsc",
|
||||||
"test:ci": "react-scripts test --ci=true --all --watchAll=false",
|
"test:ci": "react-scripts test --ci=true --all --watchAll=false",
|
||||||
"test": "react-scripts test",
|
"test": "react-scripts test",
|
||||||
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
|
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
|
||||||
@@ -59,23 +76,28 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"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/node-logger": "^6.4.22",
|
"@storybook/builder-webpack5": "6.5.9",
|
||||||
"@storybook/preset-create-react-app": "^3.2.0",
|
"@storybook/manager-webpack5": "6.5.9",
|
||||||
"@storybook/react": "^6.4.22",
|
"@storybook/node-logger": "6.5.9",
|
||||||
"@testing-library/jest-dom": "^5.11.4",
|
"@storybook/preset-create-react-app": "4.1.2",
|
||||||
"@testing-library/react": "^11.1.0",
|
"@storybook/react": "6.5.9",
|
||||||
"@testing-library/user-event": "^12.1.10",
|
"@testing-library/jest-dom": "5.16.4",
|
||||||
"@types/chroma-js": "^2.1.3",
|
"@testing-library/react": "13.3.0",
|
||||||
"@types/js-yaml": "^4.0.5",
|
"@testing-library/user-event": "14.2.1",
|
||||||
"jest-environment-jsdom": "^27.5.1",
|
"@types/autosuggest-highlight": "3.2.0",
|
||||||
"ts-node": "^10.4.0"
|
"@types/chroma-js": "2.1.3",
|
||||||
|
"@types/js-yaml": "4.0.5",
|
||||||
|
"jest-environment-jsdom": "28.1.2",
|
||||||
|
"ts-node": "10.8.2",
|
||||||
|
"webpack": "5.73.0",
|
||||||
|
"webpack-dev-server": "4.9.3"
|
||||||
},
|
},
|
||||||
"moduleDirectories": [
|
"moduleDirectories": [
|
||||||
"node_modules",
|
"node_modules",
|
||||||
"src"
|
"src"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
+9
-5
@@ -3,17 +3,21 @@ 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();
|
||||||
|
|
||||||
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,7 +1,7 @@
|
|||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import { API } from "./base";
|
import { API } from "./base";
|
||||||
import { ListData, ListParams } from "./types";
|
import { ListData, ListParams } from "./types";
|
||||||
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths';
|
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
|
||||||
|
|
||||||
|
|
||||||
export const makeAutomationAPI = (api: API) => ({
|
export const makeAutomationAPI = (api: API) => ({
|
||||||
@@ -14,19 +14,19 @@ export const makeAutomationAPI = (api: API) => ({
|
|||||||
});
|
});
|
||||||
return data;
|
return data;
|
||||||
},
|
},
|
||||||
async update({index, auto}: {index: number, auto: AutomationData}) {
|
async update({ index, auto }: { index: number, auto: AutomationData }) {
|
||||||
return await api.makeCall({
|
return await api.makeCall({
|
||||||
path: AUTOMTAION_ROOT,
|
path: AUTOMTAION_ITEM,
|
||||||
data: {
|
data: {
|
||||||
index,
|
index,
|
||||||
data: auto
|
data: auto
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
async remove({index}: {index: number}) {
|
async remove({ index }: { index: number }) {
|
||||||
return await api.makeCall({
|
return await api.makeCall({
|
||||||
method: "DELETE",
|
method: "DELETE",
|
||||||
path: AUTOMTAION_ROOT,
|
path: AUTOMTAION_ITEM,
|
||||||
data: {
|
data: {
|
||||||
index,
|
index,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,13 +10,16 @@ export const makeRemoteAPI = (baseURL: string): API => ({
|
|||||||
data = {}
|
data = {}
|
||||||
}) {
|
}) {
|
||||||
try {
|
try {
|
||||||
const reply = await fetch(baseURL + path, {
|
const payload: RequestInit = {
|
||||||
method,
|
method,
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/json"
|
"Content-Type": "application/json"
|
||||||
},
|
},
|
||||||
body: JSON.stringify(data),
|
};
|
||||||
});
|
if (method !== 'GET') {
|
||||||
|
payload["body"] = JSON.stringify(data);
|
||||||
|
}
|
||||||
|
const reply = await fetch(baseURL + path, payload);
|
||||||
let response: APIResponse<any>;
|
let response: APIResponse<any>;
|
||||||
if (reply.status === 200) {
|
if (reply.status === 200) {
|
||||||
response = {
|
response = {
|
||||||
|
|||||||
@@ -4,15 +4,18 @@ 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);
|
||||||
console.log(process.env)
|
const baseURL = new URL(
|
||||||
|
process.env.NODE_ENV === 'development' ?
|
||||||
|
`http://${window.location.hostname}:8000` :
|
||||||
|
window.location.origin + (!locationPrefixWeb ? '' : locationPrefixWeb[1])
|
||||||
|
);
|
||||||
|
export const wsURL = baseURL + "socket"
|
||||||
|
export const remoteAutoAPI = makeRemoteAPI(
|
||||||
|
baseURL + "automations"
|
||||||
|
);
|
||||||
export const useConnectedApiService = () => useAPIService(
|
export const useConnectedApiService = () => useAPIService(
|
||||||
makeAutomationAPI(makeRemoteAPI(
|
makeAutomationAPI(remoteAutoAPI)
|
||||||
process.env.NODE_ENV === 'development' ?
|
|
||||||
"http://localhost:8000/automations" :
|
|
||||||
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
|
|
||||||
))
|
|
||||||
);
|
);
|
||||||
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
|
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
|
||||||
makeAutomationAPI(useMockAPI(initialAutos))
|
makeAutomationAPI(useMockAPI(initialAutos))
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { useRef } from 'react';
|
import { useRef } from 'react';
|
||||||
import { AutomationData } from 'types/automations';
|
import { AutomationData } from 'types/automations';
|
||||||
import { API } from './base';
|
import { API } from './base';
|
||||||
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths';
|
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
|
||||||
|
|
||||||
|
|
||||||
export const useMockAPI = (
|
export const useMockAPI = (
|
||||||
@@ -15,7 +15,7 @@ export const useMockAPI = (
|
|||||||
method = "POST",
|
method = "POST",
|
||||||
data = {}
|
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,
|
||||||
@@ -26,7 +26,7 @@ export const useMockAPI = (
|
|||||||
}))
|
}))
|
||||||
} as any
|
} as any
|
||||||
}
|
}
|
||||||
if (path === AUTOMTAION_ROOT) {
|
if (path === AUTOMTAION_ITEM) {
|
||||||
if (method === 'POST') {
|
if (method === 'POST') {
|
||||||
const { index, data: auto } = data as any;
|
const { index, data: auto } = data as any;
|
||||||
if (index >= automationsRef.current.length) {
|
if (index >= automationsRef.current.length) {
|
||||||
@@ -37,7 +37,7 @@ export const useMockAPI = (
|
|||||||
auto,
|
auto,
|
||||||
...automationsRef.current.slice(index + 1)
|
...automationsRef.current.slice(index + 1)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
ok: true,
|
ok: true,
|
||||||
data: {}
|
data: {}
|
||||||
|
|||||||
@@ -2,3 +2,4 @@
|
|||||||
|
|
||||||
export const AUTOMTAION_ROOT = '/' as const;
|
export const AUTOMTAION_ROOT = '/' as const;
|
||||||
export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const;
|
export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const;
|
||||||
|
export const AUTOMTAION_ITEM = `${AUTOMTAION_ROOT}item` as const;
|
||||||
@@ -7,7 +7,7 @@ export interface ListParams {
|
|||||||
}
|
}
|
||||||
export type APIRequest<D> = {
|
export type APIRequest<D> = {
|
||||||
path: string;
|
path: string;
|
||||||
method?: "POST" | "DELETE",
|
method?: "POST" | "DELETE" | "GET",
|
||||||
data?: D;
|
data?: D;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -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,
|
||||||
}
|
};
|
||||||
}
|
};
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box.show {
|
.automation-editor--info-box.show {
|
||||||
min-width: 25em;
|
min-width: 20em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box.hide {
|
.automation-editor--info-box.hide {
|
||||||
@@ -28,12 +28,19 @@
|
|||||||
|
|
||||||
.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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.automation-editor--info-box--tag-list {
|
||||||
|
max-height: 30vh;
|
||||||
|
overflow-y: scroll;
|
||||||
|
padding-left: 0.25em;
|
||||||
|
padding-right: 0.25em;
|
||||||
|
}
|
||||||
|
|
||||||
.automation-editor--info-box--tags>h1 {
|
.automation-editor--info-box--tags>h1 {
|
||||||
font-size: 1.5em;
|
font-size: 1.5em;
|
||||||
}
|
}
|
||||||
@@ -49,6 +56,7 @@
|
|||||||
|
|
||||||
.automation-editor--info-box--tag>div {
|
.automation-editor--info-box--tag>div {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box--tag>div>input {
|
.automation-editor--info-box--tag>div>input {
|
||||||
@@ -56,29 +64,11 @@
|
|||||||
padding: 1em 0.25em 0.2em 0.25em;
|
padding: 1em 0.25em 0.2em 0.25em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box--tag>button {
|
.automation-editor--info-box--tag--trash, .automation-editor--info-box--tag--add {
|
||||||
height: 1.25em;
|
height: 2em;
|
||||||
width: 1.25em;
|
width: 2em;
|
||||||
font-size: 1em;
|
font-size: 1em;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
|
||||||
|
|
||||||
.automation-editor--info-box--tag--error {
|
|
||||||
width: 100%;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-editor--info-box--tag--error.hide {
|
|
||||||
height: 0;
|
|
||||||
opacity: 0;
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-editor--info-box--tag--error.show {
|
|
||||||
height: fit-content;
|
|
||||||
opacity: 1;
|
|
||||||
}
|
}
|
||||||
@@ -1,19 +1,29 @@
|
|||||||
|
|
||||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { makeTagDB } from "components/AutomationList/TagDB";
|
||||||
|
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';
|
||||||
|
|
||||||
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: {
|
||||||
|
tagDB: makeTagDB([
|
||||||
|
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 (
|
||||||
<div className="page">
|
<Page>
|
||||||
<AutoInfoBox
|
<AutoInfoBox
|
||||||
|
{...args}
|
||||||
className=""
|
className=""
|
||||||
metadata={metadata}
|
metadata={metadata}
|
||||||
tags={tags}
|
tags={tags}
|
||||||
@@ -22,7 +32,7 @@ export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
|
|||||||
setState([m, t])
|
setState([m, t])
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</Page>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
NoTags.args = {
|
NoTags.args = {
|
||||||
|
|||||||
@@ -2,16 +2,19 @@ import "./AutoInfoBox.css";
|
|||||||
import { AutomationMetadata } from "types/automations";
|
import { AutomationMetadata } from "types/automations";
|
||||||
import { InputList } from "components/Inputs/InputList";
|
import { InputList } from "components/Inputs/InputList";
|
||||||
import InputText from "components/Inputs/InputText";
|
import InputText from "components/Inputs/InputText";
|
||||||
import InputTextArea from "components/Inputs/InputTextArea";
|
import { FC, ReactNode, useRef, useState } from "react";
|
||||||
import { FC, 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 { TagDB } from "components/AutomationList/TagDB";
|
||||||
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
className: string;
|
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;
|
||||||
|
tagDB: TagDB;
|
||||||
|
children?: ReactNode;
|
||||||
}
|
}
|
||||||
export const AutoInfoBox: FC<Props> = ({
|
export const AutoInfoBox: FC<Props> = ({
|
||||||
metadata,
|
metadata,
|
||||||
@@ -19,101 +22,157 @@ export const AutoInfoBox: FC<Props> = ({
|
|||||||
onUpdate,
|
onUpdate,
|
||||||
className,
|
className,
|
||||||
children,
|
children,
|
||||||
|
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 setError = (index: number | 'new', msg: string) => {
|
const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n));
|
||||||
_setError([index, msg])
|
const setError = (index: number | "new", msg: string) => {
|
||||||
|
_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([newTag]));
|
onUpdate(
|
||||||
setNewTag(['', '']);
|
metadata,
|
||||||
}
|
tags.concat([newTag.map((x) => x.trim()) as [string, string]])
|
||||||
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [
|
);
|
||||||
...tags.slice(0, tagIndex),
|
setNewTag(["", ""]);
|
||||||
...tags.slice(tagIndex + 1),
|
};
|
||||||
])
|
const onRemoveTag = (tagIndex: number) =>
|
||||||
|
onUpdate(metadata, [
|
||||||
|
...tags.slice(0, tagIndex),
|
||||||
|
...tags.slice(tagIndex + 1),
|
||||||
|
]);
|
||||||
// render
|
// render
|
||||||
return <div className={`automation-editor--info-box ${className}`}>
|
return (
|
||||||
<div className="automation-editor--info-box-inner">
|
<div className={`automation-editor--info-box ${className}`}>
|
||||||
<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
|
||||||
<InputTextArea 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")}
|
||||||
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag">
|
/>
|
||||||
<Button onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button>
|
<InputList
|
||||||
<InputText value={tagName} label="Name" onChange={v => updateTagName(v, tagIndex)} />
|
label="Mode"
|
||||||
<InputText value={tagValue} label="Tag" onChange={v => onUpdateTags(v, tagIndex)} />
|
current={metadata.mode}
|
||||||
<span className={["automation-editor--info-box--tag--error", (errorIndex === tagIndex) ? "show" : "hide"].join(" ")}>
|
onChange={onUpdateMetadata("mode")}
|
||||||
{error}
|
options={["parallel", "single", "queued", "restart"]}
|
||||||
</span>
|
/>
|
||||||
</div>)}
|
<div className="automation-editor--info-box--tags">
|
||||||
<hr />
|
<h1>Tags</h1>
|
||||||
<div className="automation-editor--info-box--tag">
|
<div className="automation-editor--info-box--tag-list">
|
||||||
<InputText value={newTag[0]} label="Name" onChange={v => setNewTag([v, newTag[1]])} onEnter={addNewTag} />
|
{tags.map(([tagName, tagValue], tagIndex) => (
|
||||||
<InputText value={newTag[1]} label="Tag" onChange={v => setNewTag([newTag[0], v])} onEnter={addNewTag} />
|
<div key={tagIndex} className="automation-editor--info-box--tag">
|
||||||
<Button onClick={addNewTag} ><AddIcon /></Button>
|
<InputAutoText
|
||||||
<span className={["automation-editor--info-box--tag--error", (errorIndex === 'new') ? "show" : "hide"].join(" ")}>
|
value={tagName}
|
||||||
{error}
|
label="Name"
|
||||||
</span>
|
onChange={(v) => updateTagName(v, tagIndex)}
|
||||||
|
options={foundNewTagNames}
|
||||||
|
error={errorIndex === tagIndex ? error : undefined}
|
||||||
|
/>
|
||||||
|
<InputAutoText
|
||||||
|
value={tagValue}
|
||||||
|
label="Tag"
|
||||||
|
onChange={(v) => onUpdateTags(v, tagIndex)}
|
||||||
|
options={tagDB.getTagValues(tagName)}
|
||||||
|
error={errorIndex === tagIndex ? error : undefined}
|
||||||
|
/>
|
||||||
|
<ButtonIcon
|
||||||
|
className="automation-editor--info-box--tag--trash"
|
||||||
|
onClick={() => onRemoveTag(tagIndex)}
|
||||||
|
icon={<TrashIcon />}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<hr />
|
||||||
|
<div className="automation-editor--info-box--tag">
|
||||||
|
<InputAutoText
|
||||||
|
value={newTag[0]}
|
||||||
|
label="Name"
|
||||||
|
onChange={(v) => setNewTag([v, newTag[1]])}
|
||||||
|
options={foundNewTagNames}
|
||||||
|
error={errorIndex === "new" ? error : undefined}
|
||||||
|
/>
|
||||||
|
<InputAutoText
|
||||||
|
value={newTag[1]}
|
||||||
|
label="Tag"
|
||||||
|
onChange={(v) => setNewTag([newTag[0], v])}
|
||||||
|
options={tagDB.getTagValues(newTag[0])}
|
||||||
|
error={errorIndex === "new" ? error : undefined}
|
||||||
|
/>
|
||||||
|
<ButtonIcon
|
||||||
|
className="automation-editor--info-box--tag--add"
|
||||||
|
onClick={addNewTag}
|
||||||
|
icon={<AddIcon />}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{children}
|
||||||
</div>
|
</div>
|
||||||
{children}
|
);
|
||||||
</div>
|
};
|
||||||
}
|
|
||||||
@@ -1,10 +1,19 @@
|
|||||||
.automation-editor {
|
.automation-editor {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
position: relative;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.automation-editor-failures {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
padding: 1em;
|
||||||
|
overflow: scroll;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
.automation-editor--flow-wrapper {
|
.automation-editor--flow-wrapper {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
padding: 0 0.5em 0 0.5em;
|
padding: 0 0.5em 0 0.5em;
|
||||||
@@ -19,18 +28,14 @@
|
|||||||
.automation-editor--flow-wrapper--toolbar {
|
.automation-editor--flow-wrapper--toolbar {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
|
gap: 0.25em;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
}
|
margin-top: 0.25em;
|
||||||
|
|
||||||
.automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
|
|
||||||
height: 0;
|
|
||||||
opacity: 0;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
|
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
|
||||||
border-color: var(--change);
|
border-color: var(--mui-success-light);
|
||||||
color: var(--change)
|
color: var(--mui-success-light)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -41,13 +46,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;
|
||||||
}
|
}
|
||||||
@@ -56,14 +61,39 @@
|
|||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box--icon {
|
.automation-editor .automation-editor--info-box--icon {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0em;
|
left: 0.25em;
|
||||||
bottom: 0.5em;
|
bottom: 0em;
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
|
max-width: 1.5em;
|
||||||
|
max-height: 1.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
|
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
|
||||||
transform: rotate(180deg);
|
transform: rotate(180deg);
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
|
left: 0.1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor.loading .mock-list {
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
width: 40%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.automation-editor.loading .mock-graph {
|
||||||
|
position: absolute;
|
||||||
|
left: 40%;
|
||||||
|
width: 60%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor .linear-loader {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
||||||
@@ -1,97 +1,99 @@
|
|||||||
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/DAGSvgs/constants';
|
import { Page } from "components/Page";
|
||||||
|
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 <div className="page">
|
return (
|
||||||
<AutomationEditor
|
<Page>
|
||||||
{...args}
|
<AutomationEditor
|
||||||
automation={state}
|
{...args}
|
||||||
onUpdate={s => {
|
tagDB={makeTagDB(state ? [state] : [])}
|
||||||
window.setTimeout(() => setState(s), 3000)
|
automation={state}
|
||||||
}}
|
onUpdate={(s) => {
|
||||||
/>
|
window.setTimeout(() => setState(s), 3000);
|
||||||
</div>
|
}}
|
||||||
}
|
/>
|
||||||
|
</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",
|
||||||
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: {
|
||||||
@@ -102,12 +104,141 @@ EmptyStart.args = {
|
|||||||
alias: "Random",
|
alias: "Random",
|
||||||
description: "Example Metadata",
|
description: "Example Metadata",
|
||||||
trigger_variables: {
|
trigger_variables: {
|
||||||
'wowo': '!'
|
wowo: "!",
|
||||||
},
|
},
|
||||||
mode: 'single',
|
mode: "single",
|
||||||
|
},
|
||||||
|
trigger: [],
|
||||||
|
sequence: [],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export const BadAutomationInvalidMetadata = Template.bind({});
|
||||||
|
BadAutomationInvalidMetadata.args = {
|
||||||
|
...BadAutomationInvalidMetadata.args,
|
||||||
|
automation: {
|
||||||
|
condition: [],
|
||||||
|
tags: {},
|
||||||
|
metadata: {} as any,
|
||||||
|
trigger: [],
|
||||||
|
sequence: [],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export const BadAutomationInvalidTriggers = Template.bind({});
|
||||||
|
BadAutomationInvalidTriggers.args = {
|
||||||
|
...BadAutomationInvalidTriggers.args,
|
||||||
|
automation: {
|
||||||
|
condition: [],
|
||||||
|
tags: {},
|
||||||
|
metadata: {
|
||||||
|
id: "random",
|
||||||
|
alias: "Random",
|
||||||
|
description: "Example Metadata",
|
||||||
|
trigger_variables: {
|
||||||
|
wowo: "!",
|
||||||
|
},
|
||||||
|
mode: "single",
|
||||||
|
},
|
||||||
|
trigger: ["haha I am a string"] as any,
|
||||||
|
sequence: [],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export const BadAutomationInvalidSequence = Template.bind({});
|
||||||
|
BadAutomationInvalidSequence.args = {
|
||||||
|
...BadAutomationInvalidSequence.args,
|
||||||
|
automation: {
|
||||||
|
condition: [],
|
||||||
|
tags: {},
|
||||||
|
metadata: {
|
||||||
|
id: "random",
|
||||||
|
alias: "Bad Choose Sequence",
|
||||||
|
description: "Example Metadata",
|
||||||
|
trigger_variables: {
|
||||||
|
wowo: "!",
|
||||||
|
},
|
||||||
|
mode: "single",
|
||||||
|
},
|
||||||
|
trigger: [],
|
||||||
|
sequence: [
|
||||||
|
{
|
||||||
|
choose: {},
|
||||||
|
},
|
||||||
|
] as any,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export const RepeatExample = Template.bind({});
|
||||||
|
RepeatExample.args = {
|
||||||
|
...RepeatExample.args,
|
||||||
|
automation: {
|
||||||
|
metadata: {
|
||||||
|
id: "1654976151462",
|
||||||
|
alias: "Get out of baby room",
|
||||||
|
description: "",
|
||||||
|
mode: "single",
|
||||||
},
|
},
|
||||||
trigger: [
|
trigger: [
|
||||||
|
{
|
||||||
|
type: "opened",
|
||||||
|
platform: "device",
|
||||||
|
device_id: "9b33663d2700da8efe0c31c946448f77",
|
||||||
|
entity_id: "binary_sensor.door_baby",
|
||||||
|
domain: "binary_sensor",
|
||||||
|
},
|
||||||
],
|
],
|
||||||
sequence: []
|
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,23 +1,33 @@
|
|||||||
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 { AutoInfoBox } from "./AutoInfoBox";
|
import { AutoInfoBox } from "./AutoInfoBox";
|
||||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
import { Button } from "components/Inputs/Button";
|
import { Button } from "components/Inputs/Button";
|
||||||
import { useAutomatioEditorState } from "./state";
|
import { useAutomatioEditorState, EditorData } from "./state";
|
||||||
import { DAGAutomationFlow } from "components/DAGFlow";
|
import { MiniFailure } from "types/validators/helper";
|
||||||
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
|
import InputYaml from "components/Inputs/InputYaml";
|
||||||
|
import { TagDB } from "components/AutomationList/TagDB";
|
||||||
|
import Skeleton from "@mui/material/Skeleton";
|
||||||
|
import LinearProgress from "@mui/material/LinearProgress";
|
||||||
|
import { ArrowBack } from "@mui/icons-material";
|
||||||
|
import { useCookies } from "react-cookie";
|
||||||
|
import { DAGDims } from "components/DAGGraph/elements/types";
|
||||||
|
import { DAGAutomationGraph } from "components/DAGGraph";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
automation?: AutomationData;
|
automation?: AutomationData;
|
||||||
dims: DAGAutomationFlowDims;
|
dims: DAGDims;
|
||||||
onUpdate: (auto: AutomationData) => void;
|
onUpdate: (auto: AutomationData) => void;
|
||||||
|
tagDB: TagDB;
|
||||||
}
|
}
|
||||||
export const AutomationEditor: FC<Props> = ({
|
export const AutomationEditor: FC<Props> = ({
|
||||||
dims,
|
dims,
|
||||||
automation: propsAutos,
|
automation: propsAutos,
|
||||||
onUpdate: propsOnUpdate,
|
onUpdate: propsOnUpdate,
|
||||||
|
tagDB,
|
||||||
}) => {
|
}) => {
|
||||||
// state
|
// state
|
||||||
const {
|
const {
|
||||||
@@ -26,51 +36,171 @@ export const AutomationEditor: FC<Props> = ({
|
|||||||
updateTrigger,
|
updateTrigger,
|
||||||
updateMetadata,
|
updateMetadata,
|
||||||
updateCondition,
|
updateCondition,
|
||||||
|
validate,
|
||||||
save,
|
save,
|
||||||
|
saveAndUpdate,
|
||||||
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
|
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
|
||||||
|
|
||||||
const [closeInfo, setCloseInfo] = 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 (
|
||||||
Loading...
|
<div className="automation-editor loading">
|
||||||
</div>
|
<LinearProgress className="linear-loader" />
|
||||||
}
|
<Skeleton className="mock-list" variant="rectangular" />
|
||||||
return <div className="automation-editor">
|
<Skeleton className="mock-graph" variant="rectangular" />
|
||||||
<AutoInfoBox
|
|
||||||
className={closeInfo ? "hide" : "show"}
|
|
||||||
metadata={state.data.metadata}
|
|
||||||
tags={state.data.tags}
|
|
||||||
onUpdate={updateMetadata}
|
|
||||||
>
|
|
||||||
<ButtonIcon
|
|
||||||
className="automation-editor--info-box--icon"
|
|
||||||
onClick={() => setCloseInfo(!closeInfo)}
|
|
||||||
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
|
|
||||||
>{ArrowIcon}</ButtonIcon>
|
|
||||||
</AutoInfoBox>
|
|
||||||
|
|
||||||
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
|
|
||||||
<div className="automation-editor--flow-wrapper--toolbar">
|
|
||||||
<Button
|
|
||||||
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
|
|
||||||
onClick={save}
|
|
||||||
disabled={state.status !== 'changed'}
|
|
||||||
>
|
|
||||||
Save <CheckMarkIcon color="#bf4" />
|
|
||||||
</Button>
|
|
||||||
</div>
|
</div>
|
||||||
<DAGAutomationFlow
|
);
|
||||||
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}
|
||||||
/>
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
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"}
|
||||||
|
color="success"
|
||||||
|
icon={<ArrowBack />}
|
||||||
|
/>
|
||||||
|
</AutoInfoBox>
|
||||||
|
|
||||||
|
<div
|
||||||
|
className={["automation-editor--flow-wrapper", state.status].join(" ")}
|
||||||
|
>
|
||||||
|
<div className="automation-editor--flow-wrapper--toolbar">
|
||||||
|
{!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}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
);
|
||||||
}
|
};
|
||||||
|
|
||||||
|
export const ValidationBox: FC<{
|
||||||
|
failures: MiniFailure[];
|
||||||
|
validate: (d: any) => MiniFailure[] | null;
|
||||||
|
data: EditorData;
|
||||||
|
onSave: (d: EditorData) => void;
|
||||||
|
}> = (props) => {
|
||||||
|
const [{ failures, data }, setState] = useState({
|
||||||
|
failures: props.failures,
|
||||||
|
data: props.data,
|
||||||
|
});
|
||||||
|
|
||||||
|
const makeSave =
|
||||||
|
<K extends keyof EditorData>(k: K) =>
|
||||||
|
(d: EditorData[K]) => {
|
||||||
|
const newData = {
|
||||||
|
...data,
|
||||||
|
[k]: d,
|
||||||
|
};
|
||||||
|
const newFails = props.validate(newData);
|
||||||
|
if (newFails) {
|
||||||
|
setState({
|
||||||
|
failures: newFails,
|
||||||
|
data: newData,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
setState({
|
||||||
|
failures: [],
|
||||||
|
data: newData,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="automation-editor-failures">
|
||||||
|
<ul>
|
||||||
|
{failures.map((f, i) => (
|
||||||
|
<>
|
||||||
|
<li key={i}>
|
||||||
|
<b>{f.path}</b>:
|
||||||
|
<ul>
|
||||||
|
{f.message.map((m, j) => (
|
||||||
|
<li key={j}>{m}</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
</>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
<span>
|
||||||
|
Please correct the automation file manually and then continue!
|
||||||
|
</span>
|
||||||
|
<InputYaml
|
||||||
|
label="Metadata"
|
||||||
|
value={data.metadata}
|
||||||
|
onChange={makeSave("metadata")}
|
||||||
|
/>
|
||||||
|
<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>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,13 +1,19 @@
|
|||||||
import { useState, useEffect } from 'react';
|
import { useState, useEffect } from 'react';
|
||||||
import { AutomationData, AutomationMetadata } from "types/automations";
|
import { AutomationData, AutomationMetadata } from "types/automations";
|
||||||
|
import * as v from "types/validators/autmation";
|
||||||
|
import { getFailures } from "types/validators/helper";
|
||||||
|
import { MiniFailure } from '../../types/validators/helper';
|
||||||
|
|
||||||
export type EditorData = ReturnType<typeof genEditorData>;
|
export type EditorData = ReturnType<typeof genEditorData>;
|
||||||
export type EditorState = {
|
export type EditorState = {
|
||||||
status: 'unchanged' | 'changed',
|
status: 'unchanged' | 'changed' | 'saving',
|
||||||
data: EditorData
|
data: EditorData
|
||||||
} | {
|
} | {
|
||||||
status: 'loading'
|
status: 'loading'
|
||||||
|
} | {
|
||||||
|
status: 'invalid',
|
||||||
|
failures: MiniFailure[],
|
||||||
|
data: EditorData,
|
||||||
}
|
}
|
||||||
export type EditorStatus = EditorState['status'];
|
export type EditorStatus = EditorState['status'];
|
||||||
|
|
||||||
@@ -20,7 +26,7 @@ export const useAutomatioEditorState = (
|
|||||||
});
|
});
|
||||||
const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => (
|
const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => (
|
||||||
data: D
|
data: D
|
||||||
) => state.status !== 'loading' && update({
|
) => ((state.status === 'changed') || (state.status === 'unchanged')) && update({
|
||||||
status: 'changed',
|
status: 'changed',
|
||||||
data: {
|
data: {
|
||||||
...state.data,
|
...state.data,
|
||||||
@@ -28,21 +34,47 @@ export const useAutomatioEditorState = (
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const saveAndUpdate = (data: EditorData) => {
|
||||||
|
const cleanData = {
|
||||||
|
...data,
|
||||||
|
tags: data.tags.reduce((all, [tagName, tagValue]) => ({
|
||||||
|
...all,
|
||||||
|
[tagName.trim()]: tagValue.trim(),
|
||||||
|
}), {})
|
||||||
|
};
|
||||||
|
update({
|
||||||
|
status: "saving",
|
||||||
|
data,
|
||||||
|
})
|
||||||
|
onSave(cleanData);
|
||||||
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (automation) {
|
if (automation) {
|
||||||
update({
|
const failures = getFailures(automation, v.AutomationData);
|
||||||
status: 'unchanged',
|
if (failures) {
|
||||||
data: genEditorData(automation),
|
update({
|
||||||
})
|
status: 'invalid',
|
||||||
|
failures,
|
||||||
|
data: genEditorData(automation),
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
update({
|
||||||
|
status: 'unchanged',
|
||||||
|
data: genEditorData(automation),
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}, [automation]);
|
}, [automation]);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
validate: (data: any) => getFailures(data, v.AutomationData),
|
||||||
updateTrigger: makeUpdate('trigger'),
|
updateTrigger: makeUpdate('trigger'),
|
||||||
updateSequence: makeUpdate('sequence'),
|
updateSequence: makeUpdate('sequence'),
|
||||||
updateCondition: makeUpdate('condition'),
|
updateCondition: makeUpdate('condition'),
|
||||||
|
saveAndUpdate,
|
||||||
updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => {
|
updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => {
|
||||||
if (state.status !== 'loading') {
|
if ((state.status === 'changed') || (state.status === 'unchanged')) {
|
||||||
update({
|
update({
|
||||||
status: 'changed',
|
status: 'changed',
|
||||||
data: {
|
data: {
|
||||||
@@ -55,17 +87,7 @@ export const useAutomatioEditorState = (
|
|||||||
},
|
},
|
||||||
save: () => {
|
save: () => {
|
||||||
if (state.status !== 'loading') {
|
if (state.status !== 'loading') {
|
||||||
const data = {
|
saveAndUpdate(state.data)
|
||||||
...state.data,
|
|
||||||
tags: state.data.tags.reduce((all, [tagName, tagValue]) => ({
|
|
||||||
...all,
|
|
||||||
[tagName]: tagValue,
|
|
||||||
}), {})
|
|
||||||
};
|
|
||||||
update({
|
|
||||||
status: "loading",
|
|
||||||
})
|
|
||||||
onSave(data);
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
get state() {
|
get state() {
|
||||||
|
|||||||
@@ -2,65 +2,186 @@ import "styles/root.css";
|
|||||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { AutomationList } from ".";
|
import { AutomationList } from ".";
|
||||||
import { createMockAuto } from "utils/mocks";
|
import { bigMockAutoList } from "utils/mocks";
|
||||||
import * as dgconst from 'components/DAGSvgs/constants';
|
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 [autos, setAutos] = useState(args.automations.data);
|
||||||
|
return (
|
||||||
|
<Page>
|
||||||
|
<AutomationList
|
||||||
|
{...args}
|
||||||
|
automations={{
|
||||||
|
...args.automations,
|
||||||
|
data: autos,
|
||||||
|
}}
|
||||||
|
onAdd={(a) => {
|
||||||
|
args.onAdd(a);
|
||||||
|
setAutos([...autos, a]);
|
||||||
|
}}
|
||||||
|
onRemove={(i) => {
|
||||||
|
args.onRemove(i);
|
||||||
|
setAutos([...autos.slice(0, i), ...autos.slice(i + 1)]);
|
||||||
|
}}
|
||||||
|
onUpdate={(i, a) => {
|
||||||
|
args.onUpdate(i, a);
|
||||||
|
setAutos([...autos.slice(0, i), a, ...autos.slice(i + 1)]);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Page>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
const Template: ComponentStory<typeof AutomationList> = args => {
|
const make = (autos: AutomationData[]) => {
|
||||||
const [autos, setAutos] = useState(args.automations)
|
const NewTemp = Template.bind({});
|
||||||
return <div className="page">
|
NewTemp.args = {
|
||||||
<AutomationList {...args} automations={autos}
|
...NewTemp.args,
|
||||||
onAdd={a => {
|
automations: {
|
||||||
args.onAdd(a);
|
data: autos,
|
||||||
setAutos([...autos, a]);
|
params: {
|
||||||
}}
|
offset: 0,
|
||||||
onRemove={i => {
|
limit: 100,
|
||||||
args.onRemove(i);
|
},
|
||||||
setAutos([
|
totalItems: autos.length,
|
||||||
...autos.slice(0, i),
|
},
|
||||||
...autos.slice(i + 1),
|
};
|
||||||
]);
|
|
||||||
}}
|
|
||||||
onUpdate={(i, a) => {
|
|
||||||
args.onUpdate(i, a);
|
|
||||||
setAutos([
|
|
||||||
...autos.slice(0, i),
|
|
||||||
a,
|
|
||||||
...autos.slice(i + 1),
|
|
||||||
]);
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
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(bigMockAutoList);
|
||||||
automations: [
|
|
||||||
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
|
export const BadAutmations = make([
|
||||||
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
|
{
|
||||||
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
|
metadata: {
|
||||||
createMockAuto({ "Type": "Climate" }),
|
alias: "Set Thermostat to 76 at 8am",
|
||||||
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
|
description: "",
|
||||||
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
|
mode: "single",
|
||||||
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
|
} as any,
|
||||||
createMockAuto({ "Room": "Office", "Type": "Lights" }),
|
trigger: [
|
||||||
createMockAuto({ "Room": "Office" }),
|
{
|
||||||
createMockAuto(),
|
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.data);
|
||||||
|
return (
|
||||||
|
<Page>
|
||||||
|
<AutomationList
|
||||||
|
{...args}
|
||||||
|
automations={{
|
||||||
|
...args.automations,
|
||||||
|
data: autos,
|
||||||
|
}}
|
||||||
|
onAdd={(a) => {
|
||||||
|
window.setTimeout(() => {
|
||||||
|
args.onAdd(a);
|
||||||
|
setAutos([...autos, a]);
|
||||||
|
}, 10000);
|
||||||
|
}}
|
||||||
|
onRemove={(i) => {
|
||||||
|
window.setTimeout(() => {
|
||||||
|
args.onRemove(i);
|
||||||
|
setAutos([...autos.slice(0, i), ...autos.slice(i + 1)]);
|
||||||
|
}, 10000);
|
||||||
|
}}
|
||||||
|
onUpdate={(i, a) => {
|
||||||
|
window.setTimeout(() => {
|
||||||
|
args.onUpdate(i, a);
|
||||||
|
setAutos([...autos.slice(0, i), a, ...autos.slice(i + 1)]);
|
||||||
|
}, 10000);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Page>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
FewAutosWithSlowLoader.args = {
|
||||||
|
...FewAutosWithSlowLoader.args,
|
||||||
|
automations: {
|
||||||
|
data: bigMockAutoList,
|
||||||
|
params: {
|
||||||
|
limit: 100,
|
||||||
|
offset: 0,
|
||||||
|
},
|
||||||
|
totalItems: 100,
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -5,15 +5,18 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body {
|
.automation-list-box--body {
|
||||||
overflow: auto;
|
overflow-y: auto;
|
||||||
|
overflow-x: hidden;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
.automation-list-box--body > * {
|
|
||||||
|
.automation-list-box--body>* {
|
||||||
padding-top: 0.5em;
|
padding-top: 0.5em;
|
||||||
padding-bottom: 0.5em;
|
padding-bottom: 0.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--group {
|
.automation-list-box--body--group {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -21,79 +24,38 @@
|
|||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
padding-bottom: 0.5em;
|
padding-bottom: 0.5em;
|
||||||
border-width: 1px;
|
border-width: 1px;
|
||||||
border-bottom-style: solid ;
|
border-bottom-style: solid;
|
||||||
border-color: white;
|
border-color: var(--mui-grey-400);
|
||||||
}
|
}
|
||||||
.automation-list-box--body--group > .automation-list-box--body--group {
|
|
||||||
border-left-style: solid ;
|
.automation-list-box--body--group.other {
|
||||||
|
border-color: var(--mui-success-main);
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--group.other>b {
|
||||||
|
color: var(--mui-success-light);
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--group>.automation-list-box--body--group {
|
||||||
|
border-left-style: solid;
|
||||||
border-top-left-radius: 0;
|
border-top-left-radius: 0;
|
||||||
margin-left: 0.75em;
|
margin-left: 0.75em;
|
||||||
padding-left: 0.5em;
|
padding-left: 0.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--group > b {
|
.automation-list-box--body--group>b {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
padding: 0.1em;
|
padding: 0.1em;
|
||||||
}
|
}
|
||||||
.automation-list-box--body--group > b:hover {
|
|
||||||
background-color: var(--secondary-accent);
|
.automation-list-box--body--group>b:hover,
|
||||||
color: var(--secondary);
|
.automation-list-box--body--group.selected>b {
|
||||||
|
background-color: var(--mui-grey-700);
|
||||||
|
color: var(--mui-secondary-contrastText);
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--item:hover {
|
|
||||||
background-color: var(--primary-accent);
|
|
||||||
color: var(--primary);
|
|
||||||
}
|
|
||||||
.automation-list-box--body--item:hover > .automation-list-box--body--item--tags > span {
|
|
||||||
border-color: var(--primary);
|
|
||||||
}
|
|
||||||
.automation-list-box--body--item {
|
|
||||||
padding-left: 1em;
|
|
||||||
cursor: pointer;
|
|
||||||
display: flex;
|
|
||||||
justify-content: left;
|
|
||||||
align-items: flex-start;
|
|
||||||
gap: 1em;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
}
|
|
||||||
.automation-list-box--body--item::before {
|
|
||||||
content: "⊚ ";
|
|
||||||
}
|
|
||||||
.automation-list-box--body--item--title {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
padding-left: 0.25em;
|
|
||||||
flex: 1;
|
|
||||||
}
|
|
||||||
.automation-list-box--body--item--title > b {
|
|
||||||
font-size: 1em;
|
|
||||||
}
|
|
||||||
.automation-list-box--body--item--title > span, .automation-list-box--body--item--title > b > span {
|
|
||||||
font-size: 0.75em;
|
|
||||||
}
|
|
||||||
.automation-list-box--body--item > button {
|
|
||||||
padding: 0.25em !important;
|
|
||||||
margin: 0.5em !important;
|
|
||||||
}
|
|
||||||
.automation-list-box--body--item--tags {
|
|
||||||
flex: 1;
|
|
||||||
display: flex;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
font-size: 0.75em;
|
|
||||||
justify-content: left;
|
|
||||||
align-items: flex-start;
|
|
||||||
overflow: auto;
|
|
||||||
max-height: 100%;
|
|
||||||
gap: 0.25em;
|
|
||||||
}
|
|
||||||
.automation-list-box--body--item--tags > span {
|
|
||||||
border-color: var(--primary-accent);
|
|
||||||
border-style: solid;
|
|
||||||
border-width: 1px;
|
|
||||||
border-radius: 0.5em;
|
|
||||||
padding: 0.1em 0.5em;
|
|
||||||
}
|
|
||||||
.automation-list-box--bottom {
|
.automation-list-box--bottom {
|
||||||
margin-top: 0.5em;
|
margin-top: 0.5em;
|
||||||
margin-bottom: 0.5em;
|
margin-bottom: 0.5em;
|
||||||
@@ -102,8 +64,21 @@
|
|||||||
justify-content: space-around;
|
justify-content: space-around;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
.automation-list-box--bottom > button {
|
|
||||||
background-color: #070;
|
.automation-list-box--bottom>.automation-list-box--bottom--add {
|
||||||
color: var(--primary-accent);
|
background-color: var(--mui-primary-main);
|
||||||
|
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);
|
||||||
}
|
}
|
||||||
@@ -2,43 +2,78 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
|
|||||||
import { useState } from "react";
|
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 { 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 [autos, setAutos] = useState(args.automations)
|
const NewTemp = Template.bind({});
|
||||||
console.log({ args })
|
NewTemp.args = {
|
||||||
return <div className="page">
|
...NewTemp.args,
|
||||||
<AutomationListBox {...args} automations={autos} />
|
automations: {
|
||||||
</div>
|
data: autos,
|
||||||
}
|
params: {
|
||||||
|
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,101 +1,22 @@
|
|||||||
import { groupAutomations, getTagList } from './AutomationListBox';
|
import { getTagList } from "./AutomationListBox";
|
||||||
import { AutomationData } from 'types/automations/index';
|
import { createMockAuto } from "utils/mocks";
|
||||||
import { createMockAuto } from 'utils/mocks';
|
|
||||||
|
|
||||||
test('group automations', () => {
|
test("getTagList", () => {
|
||||||
const automations: AutomationData[] = [
|
expect(
|
||||||
{
|
getTagList([
|
||||||
condition: [],
|
createMockAuto(),
|
||||||
metadata: {
|
createMockAuto(),
|
||||||
id: '1',
|
createMockAuto(),
|
||||||
alias: '',
|
createMockAuto(),
|
||||||
description: '',
|
|
||||||
mode: 'single',
|
|
||||||
},
|
|
||||||
tags: {
|
|
||||||
"Room": 'Living Room',
|
|
||||||
"Type": 'Lights'
|
|
||||||
},
|
|
||||||
sequence: [],
|
|
||||||
trigger: [],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
condition: [],
|
|
||||||
metadata: {
|
|
||||||
id: '2',
|
|
||||||
alias: '',
|
|
||||||
description: '',
|
|
||||||
mode: 'single',
|
|
||||||
},
|
|
||||||
tags: {
|
|
||||||
"Room": 'Living Room',
|
|
||||||
"Type": 'Climate'
|
|
||||||
},
|
|
||||||
sequence: [],
|
|
||||||
trigger: [],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
condition: [],
|
|
||||||
metadata: {
|
|
||||||
id: '3',
|
|
||||||
alias: '',
|
|
||||||
description: '',
|
|
||||||
mode: 'single',
|
|
||||||
},
|
|
||||||
tags: {
|
|
||||||
"Room": 'Kitchen',
|
|
||||||
"Type": 'Climate'
|
|
||||||
},
|
|
||||||
sequence: [],
|
|
||||||
trigger: [],
|
|
||||||
},
|
|
||||||
];
|
|
||||||
expect(groupAutomations(automations, [0, 1], ['Room', "Type"])).toStrictEqual({
|
|
||||||
"Living Room": {
|
|
||||||
"Lights": [0],
|
|
||||||
"Climate": [1],
|
|
||||||
},
|
|
||||||
"Kitchen": {
|
|
||||||
"Climate": [2],
|
|
||||||
}
|
|
||||||
})
|
|
||||||
expect(groupAutomations(automations, [1, 0], ['Room', "Type"])).toStrictEqual({
|
|
||||||
"Lights": {
|
|
||||||
"Living Room": [0],
|
|
||||||
},
|
|
||||||
"Climate": {
|
|
||||||
"Living Room": [1],
|
|
||||||
"Kitchen": [2]
|
|
||||||
}
|
|
||||||
})
|
|
||||||
expect(groupAutomations(automations, [1], ['Room', "Type"])).toStrictEqual({
|
|
||||||
"Lights": [0],
|
|
||||||
"Climate": [1, 2]
|
|
||||||
})
|
|
||||||
expect(groupAutomations(automations, [0], ['Room', "Type"])).toStrictEqual({
|
|
||||||
"Living Room": [0, 1],
|
|
||||||
"Kitchen": [2]
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
expect(groupAutomations(automations, [], ['Room', "Type"])).toStrictEqual([
|
|
||||||
0, 1, 2
|
|
||||||
])
|
])
|
||||||
|
).toStrictEqual([]);
|
||||||
|
|
||||||
|
expect(
|
||||||
|
getTagList([
|
||||||
|
createMockAuto({ Room: "Kitchen", Area: "Oven" }),
|
||||||
|
createMockAuto({ Room: "Attic" }),
|
||||||
|
createMockAuto({ Room: "Office" }),
|
||||||
|
createMockAuto({ Area: "Balcony" }),
|
||||||
|
])
|
||||||
|
).toStrictEqual(["Room", "Area"]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
test('getTagList', () => {
|
|
||||||
expect(getTagList([
|
|
||||||
createMockAuto(),
|
|
||||||
createMockAuto(),
|
|
||||||
createMockAuto(),
|
|
||||||
createMockAuto(),
|
|
||||||
])).toStrictEqual([])
|
|
||||||
|
|
||||||
expect(getTagList([
|
|
||||||
createMockAuto({ "Room": "Kitchen", "Area": "Oven" }),
|
|
||||||
createMockAuto({ "Room": "Attic" }),
|
|
||||||
createMockAuto({ "Room": "Office" }),
|
|
||||||
createMockAuto({ "Area": "Balcony" }),
|
|
||||||
])).toStrictEqual(["Room", "Area"])
|
|
||||||
})
|
|
||||||
@@ -1,185 +1,193 @@
|
|||||||
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 { TrashIcon } from "components/Icons";
|
import { makeGrouping } from "./automationGrouper";
|
||||||
|
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
|
||||||
|
import { useCookies } from "react-cookie";
|
||||||
|
import { TagDB } from "components/AutomationList/TagDB";
|
||||||
|
// import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
|
// import ReadMoreOutlinedIcon from "@mui/icons-material/ReadMoreOutlined";
|
||||||
|
import { ListData, ListParams } from "apiService/types";
|
||||||
|
import Chip from "@mui/material/Chip";
|
||||||
|
import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
|
||||||
|
|
||||||
|
export type AutomationListBoxProps = {
|
||||||
|
automations: ListData<AutomationData>;
|
||||||
|
selected: number;
|
||||||
|
onSelectAutomation: (i: number) => void;
|
||||||
|
onRemove: (i: number) => void;
|
||||||
|
onAdd: () => void;
|
||||||
|
onUpdate: (a: AutomationData, i: number) => void;
|
||||||
|
onLoadMore: (p: ListParams) => void;
|
||||||
|
tagsDB: TagDB;
|
||||||
|
};
|
||||||
|
|
||||||
export type Props = {
|
const useAutomationListBoxState = () => {
|
||||||
automations: AutomationData[];
|
const [
|
||||||
onSelectAutomation: (i: number) => void;
|
cookies,
|
||||||
onRemove: (i: number) => void;
|
setCookies,
|
||||||
onAdd: () => void;
|
// eslint-disable-next-line
|
||||||
}
|
_,
|
||||||
|
] = useCookies(["albSearchText", "albSelected"]);
|
||||||
|
let initialSelected = [];
|
||||||
|
try {
|
||||||
|
initialSelected = JSON.parse(cookies.albSelected);
|
||||||
|
if (!Array.isArray(initialSelected)) {
|
||||||
|
initialSelected = [initialSelected];
|
||||||
|
}
|
||||||
|
initialSelected = initialSelected.map(Number);
|
||||||
|
// eslint-disable-next-line
|
||||||
|
} catch (_) {}
|
||||||
|
const [searchText, setSearchText] = useState(cookies.albSearchText ?? "");
|
||||||
|
const [selectedTagIdx, setSelectedTagIdx] =
|
||||||
|
useState<number[]>(initialSelected);
|
||||||
|
|
||||||
export const AutomationListBox: FC<Props> = ({
|
return {
|
||||||
automations,
|
searchText,
|
||||||
onSelectAutomation,
|
setSearchText(v: string) {
|
||||||
onAdd,
|
setSearchText(v);
|
||||||
onRemove,
|
setCookies("albSearchText", v);
|
||||||
|
},
|
||||||
|
setSelectedTagIdx(n: number[]) {
|
||||||
|
setSelectedTagIdx(n);
|
||||||
|
setCookies("albSelected", JSON.stringify(n));
|
||||||
|
},
|
||||||
|
selectedTagIdx,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export const AutomationListBox: FC<AutomationListBoxProps> = ({
|
||||||
|
automations: {
|
||||||
|
data: automations,
|
||||||
|
params: autoParams,
|
||||||
|
totalItems: totalAutomations,
|
||||||
|
},
|
||||||
|
selected,
|
||||||
|
onSelectAutomation,
|
||||||
|
onAdd,
|
||||||
|
onRemove,
|
||||||
|
onLoadMore,
|
||||||
|
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 [selected, setSelected] = useState<number[]>([]);
|
<div className="automation-list-box--nav">
|
||||||
const filteredAutomations = filterAutomations(automations, searchText, selected, tags);
|
<InputText label="Search" value={searchText} onChange={setSearchText} />
|
||||||
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selected, tags);
|
<InputMultiSelect
|
||||||
|
label="Tags"
|
||||||
return <div className="automation-list-box">
|
selected={selectedTagIdx}
|
||||||
<div className="automation-list-box--nav">
|
onChange={setSelectedTagIdx}
|
||||||
<InputText
|
options={tags}
|
||||||
label="Search"
|
max={3}
|
||||||
value={searchText}
|
/>
|
||||||
onChange={setSearchText}
|
</div>
|
||||||
|
<div className="automation-list-box--body">
|
||||||
|
<AutomationListBoxGroup
|
||||||
|
events={{
|
||||||
|
onSelectAutomation,
|
||||||
|
onRemove,
|
||||||
|
}}
|
||||||
|
autos={filteredAutomations}
|
||||||
|
grouping={grouping}
|
||||||
|
selectedAutomationIdx={selected}
|
||||||
|
tagsDB={tagsDB}
|
||||||
|
onSave={onUpdate}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="automation-list-box--bottom">
|
||||||
|
<Button className="automation-list-box--bottom--add" onClick={onAdd}>
|
||||||
|
Add
|
||||||
|
</Button>
|
||||||
|
{automations.length < totalAutomations ? (
|
||||||
|
<>
|
||||||
|
<Chip
|
||||||
|
label={`Only loaded ${automations.length} out of ${totalAutomations}`}
|
||||||
|
variant="outlined"
|
||||||
|
color="warning"
|
||||||
|
icon={<InfoOutlinedIcon />}
|
||||||
|
onClick={() =>
|
||||||
|
window.open(
|
||||||
|
"https://github.com/asosnovsky/Shortumation/issues/78",
|
||||||
|
"_blank"
|
||||||
|
)
|
||||||
|
}
|
||||||
/>
|
/>
|
||||||
<InputMultiSelect
|
<small>support for more is not yet implemented</small>
|
||||||
label="Tags"
|
</>
|
||||||
selected={selected}
|
) : (
|
||||||
onChange={setSelected}
|
""
|
||||||
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} */}
|
||||||
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove)}
|
{/* {autoParams.offset + automations.length < totalAutomations && (
|
||||||
</div>
|
<ButtonIcon
|
||||||
<div className="automation-list-box--bottom">
|
borderless
|
||||||
<Button onClick={onAdd}>Add</Button>
|
className="automation-list-box--bottom--load more"
|
||||||
<span>Showing Automations: {filteredAutomations.length} out of {automations.length}</span>
|
icon={<ReadMoreOutlinedIcon />}
|
||||||
</div>
|
/>
|
||||||
|
)} */}
|
||||||
|
</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 (searchText.length > 0) {
|
autos: AutomationData[],
|
||||||
|
searchText: string
|
||||||
|
): Array<[AutomationData, number]> =>
|
||||||
|
autos
|
||||||
|
.map<[AutomationData, number]>((a, i) => [a, i])
|
||||||
|
.filter(([a, i]) => {
|
||||||
|
if (!a.metadata) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (searchText.length > 0) {
|
||||||
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (selected.length > 0) {
|
return true;
|
||||||
for (const i of selected) {
|
});
|
||||||
if (!a.tags[tags[i]]) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
export const groupAutomations = (
|
|
||||||
autos: AutomationData[],
|
|
||||||
selected: number[],
|
|
||||||
tags: string[],
|
|
||||||
) => {
|
|
||||||
if (selected.length === 0) {
|
|
||||||
return autos.map((_, i) => i);
|
|
||||||
}
|
|
||||||
const out: any = {};
|
|
||||||
for (let ai = 0; ai < autos.length; ai++) {
|
|
||||||
const a = autos[ai];
|
|
||||||
let where = out;
|
|
||||||
let tag: string = '';
|
|
||||||
let lastKey: string | null = null;
|
|
||||||
for (const i of selected) {
|
|
||||||
tag = tags[i];
|
|
||||||
if (lastKey !== null) {
|
|
||||||
where = where[lastKey]
|
|
||||||
}
|
|
||||||
if (!where[a.tags[tag]]) {
|
|
||||||
where[a.tags[tag]] = {}
|
|
||||||
}
|
|
||||||
lastKey = a.tags[tag]
|
|
||||||
}
|
|
||||||
if (lastKey !== null) {
|
|
||||||
if (!where[lastKey] || !Array.isArray(where[lastKey])) {
|
|
||||||
where[lastKey] = []
|
|
||||||
}
|
|
||||||
where[lastKey].push(ai)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
const convertGroupsToItems = (
|
|
||||||
groups: any,
|
|
||||||
autos: Array<[AutomationData, number]>,
|
|
||||||
onSelectAutomation: (i: number) => void,
|
|
||||||
onRemove: (i: number) => void,
|
|
||||||
) => {
|
|
||||||
if (Array.isArray(groups)) {
|
|
||||||
return groups.map(i => {
|
|
||||||
const [auto, autoIndex] = autos[i];
|
|
||||||
return <div
|
|
||||||
key={i}
|
|
||||||
className="automation-list-box--body--item"
|
|
||||||
title={`Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`}
|
|
||||||
onClick={() => onSelectAutomation(autoIndex)}
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
className="automation-list-box--body--item--title"
|
|
||||||
>
|
|
||||||
<b>{auto.metadata.alias.slice(0, 15)} <span>({auto.metadata.id.slice(0, 5)})</span></b>
|
|
||||||
<span>{auto.metadata.description.slice(0, 25)}</span>
|
|
||||||
<div
|
|
||||||
className="automation-list-box--body--item--tags"
|
|
||||||
>
|
|
||||||
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
|
|
||||||
<b>{tagName}:</b> {auto.tags[tagName]}
|
|
||||||
</span>)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
|
|
||||||
</div>
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
return Object.keys(groups).map(groupName => {
|
|
||||||
return <AutomationListBoxGroup
|
|
||||||
key={groupName}
|
|
||||||
groupName={groupName}
|
|
||||||
groups={groups[groupName]}
|
|
||||||
autos={autos}
|
|
||||||
onSelectAutomation={onSelectAutomation}
|
|
||||||
onRemove={onRemove}
|
|
||||||
/>
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const AutomationListBoxGroup: FC<{
|
|
||||||
groupName: string,
|
|
||||||
groups: any,
|
|
||||||
autos: Array<[AutomationData, number]>,
|
|
||||||
onSelectAutomation: (i: number) => void,
|
|
||||||
onRemove: (i: number) => void;
|
|
||||||
}> = ({
|
|
||||||
groupName,
|
|
||||||
groups,
|
|
||||||
autos,
|
|
||||||
onSelectAutomation,
|
|
||||||
onRemove,
|
|
||||||
}) => {
|
|
||||||
const [open, setOpen] = useState(false);
|
|
||||||
return <div className="automation-list-box--body--group">
|
|
||||||
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
|
|
||||||
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove)}
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
@@ -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)
|
||||||
|
}
|
||||||
@@ -0,0 +1,240 @@
|
|||||||
|
import "./AutomationListBoxGroup.css";
|
||||||
|
|
||||||
|
import { TrashIcon } from "components/Icons";
|
||||||
|
import { MetadataBox } from "./AutomationMetadataBox";
|
||||||
|
import { AutomationData } from "types/automations";
|
||||||
|
import { AutomationGrouping } from "./automationGrouper";
|
||||||
|
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 = {
|
||||||
|
onSelectAutomation: (i: number) => void;
|
||||||
|
onRemove: (i: number) => void;
|
||||||
|
};
|
||||||
|
export type AutomationListBoxGroups = {
|
||||||
|
grouping: AutomationGrouping;
|
||||||
|
currentNode: number;
|
||||||
|
};
|
||||||
|
export type AutomationListBoxProps = {
|
||||||
|
events: AutomationListBoxEvents;
|
||||||
|
groups: AutomationListBoxGroups;
|
||||||
|
autos: Array<[AutomationData, number]>;
|
||||||
|
selectedAutomationIdx: number;
|
||||||
|
};
|
||||||
|
export type AutomationListBoxGroupProps = {
|
||||||
|
events: AutomationListBoxEvents;
|
||||||
|
grouping: AutomationGrouping;
|
||||||
|
autos: Array<[AutomationData, number]>;
|
||||||
|
selectedAutomationIdx: number;
|
||||||
|
tagsDB: TagDB;
|
||||||
|
onSave: (a: AutomationData, i: number) => void;
|
||||||
|
};
|
||||||
|
export const AutomationListBoxGroup: FC<AutomationListBoxGroupProps> = ({
|
||||||
|
events,
|
||||||
|
grouping,
|
||||||
|
autos,
|
||||||
|
selectedAutomationIdx,
|
||||||
|
tagsDB,
|
||||||
|
onSave,
|
||||||
|
}) => {
|
||||||
|
if (grouping.top.length === 1) {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{convertGroupsToItems(
|
||||||
|
autos,
|
||||||
|
{
|
||||||
|
grouping,
|
||||||
|
currentNode: grouping.top[0],
|
||||||
|
},
|
||||||
|
events,
|
||||||
|
selectedAutomationIdx,
|
||||||
|
tagsDB,
|
||||||
|
onSave
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{grouping.top.map((groupIdx) => (
|
||||||
|
<AutomationListBoxGroupItem
|
||||||
|
key={groupIdx}
|
||||||
|
autos={autos}
|
||||||
|
groups={{
|
||||||
|
grouping,
|
||||||
|
currentNode: groupIdx,
|
||||||
|
}}
|
||||||
|
events={events}
|
||||||
|
selectedAutomationIdx={selectedAutomationIdx}
|
||||||
|
tagsDB={tagsDB}
|
||||||
|
onSave={onSave}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
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<{
|
||||||
|
events: AutomationListBoxEvents;
|
||||||
|
groups: AutomationListBoxGroups;
|
||||||
|
autos: Array<[AutomationData, number]>;
|
||||||
|
selectedAutomationIdx: number;
|
||||||
|
tagsDB: TagDB;
|
||||||
|
onSave: (a: AutomationData, i: number) => void;
|
||||||
|
}> = ({ autos, groups, events, selectedAutomationIdx, tagsDB, onSave }) => {
|
||||||
|
const groupData = groups.grouping.getData(groups.currentNode);
|
||||||
|
const automations = groups.grouping.getAutomations(groups.currentNode);
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
const isOther = groupData.isOther;
|
||||||
|
const openIcon = !open ? "⊕" : "⊖";
|
||||||
|
const total = isOther ? (
|
||||||
|
<small>
|
||||||
|
{automations.length} automation{automations.length !== 1 ? "s" : ""}{" "}
|
||||||
|
{groupData.isOther ? "" : "(untagged)"}
|
||||||
|
</small>
|
||||||
|
) : (
|
||||||
|
<></>
|
||||||
|
);
|
||||||
|
return (
|
||||||
|
<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<{
|
||||||
|
auto: [AutomationData, number];
|
||||||
|
isSelected: boolean;
|
||||||
|
events: AutomationListBoxEvents;
|
||||||
|
tagsDB: TagDB;
|
||||||
|
onSave: (a: AutomationData) => void;
|
||||||
|
}> = ({
|
||||||
|
events: { onRemove, onSelectAutomation },
|
||||||
|
auto: [auto, autoIndex],
|
||||||
|
isSelected,
|
||||||
|
tagsDB,
|
||||||
|
onSave,
|
||||||
|
}) => {
|
||||||
|
// state
|
||||||
|
const [{ tags, isModified }, setState] = useState({
|
||||||
|
isModified: false,
|
||||||
|
tags: Object.entries(auto.tags),
|
||||||
|
});
|
||||||
|
|
||||||
|
// effects
|
||||||
|
useEffect(() => {
|
||||||
|
setState({
|
||||||
|
isModified: false,
|
||||||
|
tags: Object.entries(auto.tags),
|
||||||
|
});
|
||||||
|
}, [auto]);
|
||||||
|
|
||||||
|
// alias
|
||||||
|
const setTags = (t: [string, string][]) =>
|
||||||
|
setState({
|
||||||
|
isModified: true,
|
||||||
|
tags: t,
|
||||||
|
});
|
||||||
|
// 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}
|
||||||
|
tags={tags}
|
||||||
|
tagsDB={tagsDB}
|
||||||
|
onUpdate={setTags}
|
||||||
|
/>
|
||||||
|
<div className="automation-list-box--body--item--buttons">
|
||||||
|
{isModified && (
|
||||||
|
<ButtonIcon
|
||||||
|
className="save"
|
||||||
|
icon={<Save />}
|
||||||
|
onClick={() =>
|
||||||
|
onSave({
|
||||||
|
...auto,
|
||||||
|
tags: Object.fromEntries(tags),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<ButtonIcon onClick={() => onRemove(autoIndex)} icon={<TrashIcon />} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
.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--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);
|
||||||
|
}
|
||||||
@@ -0,0 +1,151 @@
|
|||||||
|
import "./AutomationMetadataBox.css";
|
||||||
|
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";
|
||||||
|
|
||||||
|
export const MetadataBox: FC<{
|
||||||
|
metadata: AutomationMetadata;
|
||||||
|
onUpdate: (t: [string, string][]) => void;
|
||||||
|
tags: [string, string][];
|
||||||
|
tagsDB: TagDB;
|
||||||
|
}> = ({ tags, onUpdate, tagsDB, metadata }) => {
|
||||||
|
// state
|
||||||
|
const [newTag, setNewTag] = useState<
|
||||||
|
| {
|
||||||
|
on: false;
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
on: true;
|
||||||
|
name: string;
|
||||||
|
value: string;
|
||||||
|
}
|
||||||
|
>({ on: false });
|
||||||
|
// alias
|
||||||
|
const tagOptions = tagsDB.getTagNames(tags.map((t) => t[0]));
|
||||||
|
|
||||||
|
// render
|
||||||
|
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>;
|
||||||
|
if (metadata) {
|
||||||
|
title = (
|
||||||
|
<>
|
||||||
|
<b>
|
||||||
|
{String(metadata.alias ?? "").slice(0, 15)}{" "}
|
||||||
|
<span>({String(metadata.id).slice(0, 5)})</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]}
|
||||||
|
onChange={([newName, newValue]) =>
|
||||||
|
onUpdate([
|
||||||
|
...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, true]}
|
||||||
|
onChange={([name, value]) => {
|
||||||
|
if (name.trim() !== "" && value.trim() !== "") {
|
||||||
|
setNewTag({
|
||||||
|
on: false,
|
||||||
|
});
|
||||||
|
onUpdate([...tags, [name, value]]);
|
||||||
|
} else {
|
||||||
|
setNewTag({
|
||||||
|
on: true,
|
||||||
|
name,
|
||||||
|
value,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{!newTag.on && (
|
||||||
|
<span
|
||||||
|
className="automation-list-box--body--item--tags--add"
|
||||||
|
onClick={() =>
|
||||||
|
setNewTag({
|
||||||
|
on: true,
|
||||||
|
name: "",
|
||||||
|
value: "",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
>
|
||||||
|
+
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const MetadataBoxTag: FC<{
|
||||||
|
value: [string, string];
|
||||||
|
onChange: (t: [string, string]) => void;
|
||||||
|
options: [string[], string[]];
|
||||||
|
initialState?: [boolean, boolean];
|
||||||
|
}> = (props) => {
|
||||||
|
const [[editMode1, editMode2], setEditMode] = useState(
|
||||||
|
props.initialState ? props.initialState : [false, false]
|
||||||
|
);
|
||||||
|
const toggle1 = () => setEditMode([!editMode1, editMode2]);
|
||||||
|
const toggle2 = () => setEditMode([editMode1, !editMode2]);
|
||||||
|
return (
|
||||||
|
<span className="automation-list-box--body--item--tags--item">
|
||||||
|
{editMode1 ? (
|
||||||
|
<InputAutoComplete
|
||||||
|
multiple={false}
|
||||||
|
className="text"
|
||||||
|
disableChips
|
||||||
|
options={props.options[0]}
|
||||||
|
label=""
|
||||||
|
value={props.value[0]}
|
||||||
|
onEnter={toggle1}
|
||||||
|
onChange={(v) => props.onChange([v ?? "", props.value[1]])}
|
||||||
|
onlyShowLabel
|
||||||
|
endAdornment={<CheckMarkIcon className="icon" onClick={toggle1} />}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<b className="text" onClick={toggle1}>
|
||||||
|
{props.value[0]}:
|
||||||
|
</b>
|
||||||
|
)}
|
||||||
|
{editMode2 ? (
|
||||||
|
<InputAutoComplete
|
||||||
|
multiple={false}
|
||||||
|
className="text"
|
||||||
|
disableChips
|
||||||
|
options={props.options[1]}
|
||||||
|
label=""
|
||||||
|
value={props.value[1]}
|
||||||
|
onEnter={toggle2}
|
||||||
|
onChange={(v) => props.onChange([props.value[0], v ?? ""])}
|
||||||
|
onlyShowLabel
|
||||||
|
endAdornment={<CheckMarkIcon className="icon" onClick={toggle2} />}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<span className="text" onClick={toggle2}>
|
||||||
|
{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,33 +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/DAGSvgs/constants';
|
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 <div className="page">
|
return (
|
||||||
<ConnectedAutomationList
|
<Page>
|
||||||
{...args}
|
<ConnectedAutomationList {...args} api={api} />
|
||||||
api={api}
|
</Page>
|
||||||
/>
|
);
|
||||||
</div>
|
};
|
||||||
}
|
|
||||||
|
|
||||||
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: [
|
||||||
@@ -43,4 +41,23 @@ FewAutos.args = {
|
|||||||
createMockAuto(),
|
createMockAuto(),
|
||||||
createMockAuto(),
|
createMockAuto(),
|
||||||
],
|
],
|
||||||
}
|
};
|
||||||
|
|
||||||
|
export const Loading: ComponentStory<any> = (args) => {
|
||||||
|
const api = useMockApiService(args.initialAutomations);
|
||||||
|
return (
|
||||||
|
<Page>
|
||||||
|
<ConnectedAutomationList
|
||||||
|
{...args}
|
||||||
|
api={{
|
||||||
|
...api,
|
||||||
|
state: {
|
||||||
|
automations: {
|
||||||
|
ready: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Page>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import { AutomationData } from "types/automations";
|
||||||
|
|
||||||
|
export type TagDB = ReturnType<typeof makeTagDB>;
|
||||||
|
export const makeTagDB = (automations: AutomationData[]) => {
|
||||||
|
const allTags: Record<string, Set<string>> = {};
|
||||||
|
automations.forEach(({ tags }) =>
|
||||||
|
Object.keys(tags).forEach((tagName) => {
|
||||||
|
const tagValue = tags[tagName];
|
||||||
|
if (!allTags[tagName]) {
|
||||||
|
allTags[tagName] = new Set();
|
||||||
|
}
|
||||||
|
allTags[tagName].add(tagValue);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
const allTagNames = Object.keys(allTags);
|
||||||
|
return {
|
||||||
|
getTagNames(myTags: string[]): string[] {
|
||||||
|
return allTagNames.filter((n) => !myTags.includes(n)).sort();
|
||||||
|
},
|
||||||
|
getTagValues(tagName: string): string[] {
|
||||||
|
return allTags[tagName]
|
||||||
|
? Array.from(allTags[tagName].values()).sort()
|
||||||
|
: [];
|
||||||
|
},
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
import { makeGrouping } from "./automationGrouper";
|
||||||
|
import { AutomationData } from 'types/automations/index';
|
||||||
|
import { bigMockAutoList, createMockAuto } from 'utils/mocks';
|
||||||
|
|
||||||
|
const automations: AutomationData[] = [
|
||||||
|
createMockAuto({
|
||||||
|
"Room": 'Living Room',
|
||||||
|
"Type": 'Lights'
|
||||||
|
}),
|
||||||
|
createMockAuto({
|
||||||
|
"Room": 'Living Room',
|
||||||
|
"Type": 'Climate'
|
||||||
|
}),
|
||||||
|
createMockAuto({
|
||||||
|
"Room": 'Kitchen',
|
||||||
|
"Type": 'Climate'
|
||||||
|
}),
|
||||||
|
createMockAuto({
|
||||||
|
"Type": 'Climate'
|
||||||
|
}),
|
||||||
|
createMockAuto({
|
||||||
|
"Room": 'Living Room'
|
||||||
|
}),
|
||||||
|
createMockAuto({}),
|
||||||
|
];
|
||||||
|
|
||||||
|
test('no grouping', () => {
|
||||||
|
const grouped = makeGrouping(automations, [], 0);
|
||||||
|
expect(grouped.top).toStrictEqual([0])
|
||||||
|
expect(grouped.getAutomations(0)).toStrictEqual([0, 1, 2, 3, 4, 5])
|
||||||
|
});
|
||||||
|
test('1 grouping', () => {
|
||||||
|
const grouped = makeGrouping(automations, ["Room"], 0);
|
||||||
|
expect(grouped.top).toHaveLength(3);
|
||||||
|
expect(grouped.getAutomations(0)).toStrictEqual([0, 1, 4])
|
||||||
|
expect(grouped.getAutomations(1)).toStrictEqual([2])
|
||||||
|
expect(grouped.getAutomations(2)).toStrictEqual([3, 5])
|
||||||
|
});
|
||||||
|
test('2 groupings', () => {
|
||||||
|
const grouped = makeGrouping(automations, ["Room", "Type"], 0);
|
||||||
|
expect(grouped.top).toHaveLength(3);
|
||||||
|
expect(grouped.getAutomations(grouped.top[0])).toHaveLength(0)
|
||||||
|
expect(grouped.getSubGroups(grouped.top[0])).toHaveLength(3)
|
||||||
|
expect(grouped.getAutomations(grouped.top[1])).toHaveLength(0)
|
||||||
|
expect(grouped.getSubGroups(grouped.top[1])).toHaveLength(1)
|
||||||
|
expect(grouped.getAutomations(grouped.top[2])).toHaveLength(2)
|
||||||
|
expect(grouped.getSubGroups(grouped.top[2])).toHaveLength(0)
|
||||||
|
});
|
||||||
|
test('bigAutoList groupings has not duplicate ids', () => {
|
||||||
|
const grouped = makeGrouping(bigMockAutoList, ['Room', "Remote"], 0);
|
||||||
|
const flattenAndCount = (gid: number): Record<number, number[]> => {
|
||||||
|
const subgroups = grouped.getSubGroups(gid);
|
||||||
|
if (subgroups.length > 0) {
|
||||||
|
return flattenAndConsolidate(subgroups)
|
||||||
|
} else {
|
||||||
|
return grouped.getAutomations(gid).reduce((sum: Record<number, number[]>, b) => {
|
||||||
|
sum[b] = (sum[b] ?? []).concat(gid)
|
||||||
|
return sum
|
||||||
|
}, {})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const flattenAndConsolidate = (gids: number[]): Record<number, number[]> => gids.map(flattenAndCount).reduce((a, b) => {
|
||||||
|
for (const k of Object.keys(b).map(Number)) {
|
||||||
|
a[k] = (a[k] ?? []).concat(b[k])
|
||||||
|
}
|
||||||
|
return a
|
||||||
|
}, {})
|
||||||
|
const countedAutos = flattenAndConsolidate(grouped.top)
|
||||||
|
for (const key of Object.keys(countedAutos).map(Number)) {
|
||||||
|
expect(countedAutos[key]).toHaveLength(1)
|
||||||
|
}
|
||||||
|
})
|
||||||
@@ -0,0 +1,130 @@
|
|||||||
|
import { AutomationData } from "types/automations";
|
||||||
|
|
||||||
|
const makeGrouper = () => {
|
||||||
|
const groupIdNames: string[] = []
|
||||||
|
const groupSubGroups: Array<Set<number>> = []
|
||||||
|
const groupAutomations: number[][] = []
|
||||||
|
const groupData: Array<{
|
||||||
|
name: string;
|
||||||
|
selected: boolean;
|
||||||
|
isOther: boolean;
|
||||||
|
isTop: boolean;
|
||||||
|
}> = [];
|
||||||
|
const topGroups: number[] = [];
|
||||||
|
|
||||||
|
return {
|
||||||
|
groupIdNames,
|
||||||
|
groupSubGroups,
|
||||||
|
groupAutomations,
|
||||||
|
groupData,
|
||||||
|
topGroups,
|
||||||
|
addNew(groupId: string, groupName: string, theChosenOne: boolean, isTopLevel: boolean, isOther: boolean = false): number {
|
||||||
|
groupIdNames.push(groupId);
|
||||||
|
groupSubGroups.push(new Set());
|
||||||
|
groupAutomations.push([]);
|
||||||
|
groupData.push({
|
||||||
|
name: groupName,
|
||||||
|
selected: theChosenOne,
|
||||||
|
isTop: isTopLevel,
|
||||||
|
isOther
|
||||||
|
})
|
||||||
|
const groupIdx = groupIdNames.length - 1;
|
||||||
|
if (isTopLevel) {
|
||||||
|
topGroups.push(groupIdx);
|
||||||
|
}
|
||||||
|
return groupIdx;
|
||||||
|
},
|
||||||
|
updateGroup(
|
||||||
|
groupIdx: number,
|
||||||
|
update: {
|
||||||
|
isChosen: boolean,
|
||||||
|
lastGroupIdx: number | null,
|
||||||
|
autoIdx: number | null,
|
||||||
|
}
|
||||||
|
) {
|
||||||
|
if (update.isChosen) {
|
||||||
|
groupData[groupIdx].selected = true;
|
||||||
|
}
|
||||||
|
if (update.lastGroupIdx !== null) {
|
||||||
|
groupSubGroups[update.lastGroupIdx].add(groupIdx);
|
||||||
|
}
|
||||||
|
if (update.autoIdx !== null) {
|
||||||
|
groupAutomations[groupIdx].push(update.autoIdx)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export type AutomationGrouping = ReturnType<typeof makeGrouping>;
|
||||||
|
export const makeGrouping = (
|
||||||
|
autos: AutomationData[],
|
||||||
|
selectedTags: string[],
|
||||||
|
selectedAutomationIdx: number,
|
||||||
|
) => {
|
||||||
|
const grouper = makeGrouper();
|
||||||
|
|
||||||
|
if (selectedTags.length === 0) {
|
||||||
|
grouper.addNew("$", "", selectedAutomationIdx >= 0, true, true)
|
||||||
|
grouper.groupAutomations = [autos.map((_, i) => i)];
|
||||||
|
} else {
|
||||||
|
autos.forEach((auto, autoIdx) => {
|
||||||
|
const theChosenOne = selectedAutomationIdx === autoIdx;
|
||||||
|
let lastGroupIdx: number | null = null;
|
||||||
|
let lastGroupId: string = "$";
|
||||||
|
for (let ti = 0; ti < selectedTags.length; ti++) {
|
||||||
|
const isTopLevel = ti === 0;
|
||||||
|
const selTag = selectedTags[ti];
|
||||||
|
if (selTag in auto.tags) {
|
||||||
|
const groupName = auto.tags[selTag];
|
||||||
|
const groupId = `${lastGroupId}>${selTag}:${groupName}`;
|
||||||
|
let groupIdx = grouper.groupIdNames.indexOf(groupId);
|
||||||
|
if (groupIdx < 0) {
|
||||||
|
groupIdx = grouper.addNew(groupId, groupName, theChosenOne, isTopLevel);
|
||||||
|
}
|
||||||
|
grouper.updateGroup(groupIdx, {
|
||||||
|
isChosen: theChosenOne,
|
||||||
|
lastGroupIdx,
|
||||||
|
autoIdx: ti === selectedTags.length - 1 ? autoIdx : null,
|
||||||
|
})
|
||||||
|
lastGroupIdx = groupIdx;
|
||||||
|
lastGroupId = groupId;
|
||||||
|
} else {
|
||||||
|
const groupId = `${lastGroupId}>${selTag}:$`;
|
||||||
|
let groupIdx = grouper.groupIdNames.indexOf(groupId);
|
||||||
|
if (groupIdx < 0) {
|
||||||
|
groupIdx = grouper.addNew(groupId, "", theChosenOne, isTopLevel, true);
|
||||||
|
}
|
||||||
|
grouper.updateGroup(groupIdx, {
|
||||||
|
isChosen: theChosenOne,
|
||||||
|
lastGroupIdx,
|
||||||
|
autoIdx,
|
||||||
|
})
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const sortGroupIds = (groupIds: number[]) => groupIds.sort((a, b) => {
|
||||||
|
const adata = grouper.groupData[a];
|
||||||
|
const bdata = grouper.groupData[b];
|
||||||
|
if (adata.isOther) {
|
||||||
|
return 1
|
||||||
|
} else {
|
||||||
|
return adata.name > bdata.name ? -1 : 1
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return {
|
||||||
|
top: sortGroupIds(grouper.topGroups),
|
||||||
|
getSubGroups(groupIdx: number) {
|
||||||
|
return sortGroupIds(Array.from(grouper.groupSubGroups[groupIdx].values()))
|
||||||
|
},
|
||||||
|
getAutomations(groupIdx: number) {
|
||||||
|
return grouper.groupAutomations[groupIdx]
|
||||||
|
},
|
||||||
|
getData(groupIdx: number) {
|
||||||
|
return grouper.groupData[groupIdx]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -9,7 +9,6 @@
|
|||||||
|
|
||||||
.automation-list--list {
|
.automation-list--list {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
min-width: 400px;
|
|
||||||
max-width: 400px;
|
max-width: 400px;
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
@@ -19,6 +18,25 @@
|
|||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Loading state */
|
||||||
|
.automation-list--root.loading {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.loading>* {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.loading .automation-list--circle-loader {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
|
||||||
/* list children: on hide */
|
/* list children: on hide */
|
||||||
.automation-list--list.hide>.automation-list-box {
|
.automation-list--list.hide>.automation-list-box {
|
||||||
width: 0;
|
width: 0;
|
||||||
@@ -32,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 */
|
||||||
@@ -40,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;
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
/* none-hidden */
|
||||||
|
.automation-list--root.mobile {
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.mobile>.automation-list--list {
|
||||||
|
max-width: 100vw;
|
||||||
|
min-height: 100vh;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.mobile .automation-editor {
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.mobile .automation-list--list-hide {
|
||||||
|
transform: rotate(90deg);
|
||||||
|
left: 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: 0.5em;
|
||||||
|
bottom: 0em;
|
||||||
|
background-color: var(--mui-common-black);
|
||||||
|
transform: rotate(90deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* list hide */
|
||||||
|
.automation-list--root.mobile .automation-list--list.hide {
|
||||||
|
width: 100vw;
|
||||||
|
min-height: 0;
|
||||||
|
max-height: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
|
||||||
|
transform: rotate(270deg);
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
z-index: 5;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* info box hide */
|
||||||
|
.automation-list--root.mobile .automation-editor--info-box.hide {
|
||||||
|
width: 100vw;
|
||||||
|
min-height: 0;
|
||||||
|
max-height: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon {
|
||||||
|
transform: rotate(270deg);
|
||||||
|
position: fixed;
|
||||||
|
top: 0em;
|
||||||
|
left: 0.25em;
|
||||||
|
z-index: 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.automation-list--root.mobile .automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
|
||||||
|
height: 0;
|
||||||
|
opacity: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
@@ -1,25 +1,62 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
|
import "./index.mobile.css";
|
||||||
import { AutomationEditor } from "components/AutomationEditor";
|
import { AutomationEditor } from "components/AutomationEditor";
|
||||||
import { FC, useState } from "react";
|
import { FC, 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 { makeTagDB } from "./TagDB";
|
||||||
|
import LinearProgress from "@mui/material/LinearProgress";
|
||||||
|
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;
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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,
|
||||||
onAdd,
|
onAdd,
|
||||||
onRemove,
|
onRemove,
|
||||||
@@ -27,66 +64,127 @@ export const AutomationList: FC<AutomationListParams> = ({
|
|||||||
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 firstRender = useRef(true);
|
||||||
// alias
|
// alias
|
||||||
const currentAuto = automations.length > 0 ? automations[current] : null;
|
const currentAuto =
|
||||||
const automationListListCls = "automation-list--list" + (hideList ? " hide" : " show")
|
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">
|
return (
|
||||||
<div className={automationListListCls}>
|
<div
|
||||||
<AutomationListBox
|
className={["automation-list--root", isMobile ? "mobile" : ""].join(" ")}
|
||||||
automations={automations}
|
>
|
||||||
onAdd={() => {
|
<div
|
||||||
onAdd(defaultAutomation(`shortu-${automations.length}`));
|
className={["automation-list--list", hideList ? "hide" : "show"].join(
|
||||||
setCurrent(automations.length)
|
" "
|
||||||
}}
|
)}
|
||||||
onSelectAutomation={setCurrent}
|
|
||||||
onRemove={onRemove}
|
|
||||||
/>
|
|
||||||
<ButtonIcon
|
|
||||||
onClick={() => setHideList(!hideList)}
|
|
||||||
className="automation-list--list-hide"
|
|
||||||
>
|
>
|
||||||
{ArrowIcon}
|
<AutomationListBox
|
||||||
</ButtonIcon>
|
automations={automations}
|
||||||
|
onUpdate={(a, i) => onUpdate(i, a)}
|
||||||
|
onAdd={() => {
|
||||||
|
onAdd(defaultAutomation(String(Date.now())));
|
||||||
|
setCurrent(automations.data.length);
|
||||||
|
if (isMobile) {
|
||||||
|
setHideList(true);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
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}
|
|
||||||
/> : <></>}
|
|
||||||
</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 removeAutomation = async (args: any) => {
|
||||||
|
const resp = await methods.removeAutomation(args);
|
||||||
|
await reloadAutomations();
|
||||||
|
return resp;
|
||||||
|
};
|
||||||
|
const updateAutomation = async (args: any) => {
|
||||||
|
const resp = await methods.updateAutomation(args);
|
||||||
|
await reloadAutomations();
|
||||||
|
return resp;
|
||||||
|
};
|
||||||
if (!automations.ready) {
|
if (!automations.ready) {
|
||||||
return <span>Loading...</span>
|
return (
|
||||||
|
<div className="automation-list--root loading">
|
||||||
|
<LinearProgress />
|
||||||
|
<div className="automation-list--circle-loader">
|
||||||
|
<CircularProgress />
|
||||||
|
</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}
|
<AutomationList
|
||||||
automations={automations.data.data}
|
dims={dims}
|
||||||
onAdd={auto => updateAutomation({ auto, index: automations.data.totalItems + 1 })}
|
automations={automations.data}
|
||||||
onRemove={index => removeAutomation({ index })}
|
onLoadMore={() => {}}
|
||||||
onUpdate={(index, auto) => updateAutomation({ index, auto })}
|
onAdd={(auto) =>
|
||||||
/>
|
updateAutomation({ auto, index: automations.data.totalItems + 1 })
|
||||||
}
|
}
|
||||||
|
onRemove={(index) => removeAutomation({ index })}
|
||||||
|
onUpdate={(index, auto) => updateAutomation({ index, auto })}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
|
||||||
import { useState } from "react";
|
|
||||||
import { ConditionEditor } from ".";
|
|
||||||
import { AutomationCondition } from 'types/automations/conditions';
|
|
||||||
|
|
||||||
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 (
|
|
||||||
<div className="page">
|
|
||||||
<ConditionEditor
|
|
||||||
onUpdate={setState}
|
|
||||||
onDelete={() => { }}
|
|
||||||
condition={state}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,128 +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";
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
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);
|
|
||||||
// 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 });
|
|
||||||
|
|
||||||
// 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)}
|
|
||||||
resizable
|
|
||||||
/>}
|
|
||||||
{!yamlMode && childrenConditions}
|
|
||||||
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
|
|
||||||
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
|
|
||||||
</div>}
|
|
||||||
</div>
|
|
||||||
{children({ classes })}
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
.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);
|
||||||
|
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);
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
Loaded 100 of 304 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user