Compare commits

..
164 Commits
Author SHA1 Message Date
renovate[bot] 4aedd9323b Update dependency @types/jest to v28.1.5 (#74)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-07-15 11:08:29 -04:00
renovate[bot] 2fc984a3ae Update dependency @types/react-dom to v18.0.6 (#76)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-07-15 11:08:06 -04:00
renovate[bot] bbfc87a334 Update dependency autosuggest-highlight to v3.3.2 (#77)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-07-15 11:07:56 -04:00
ari bbe6a5abf3 better support for repeats 2022-07-15 11:07:02 -04:00
Ari Sosnovsky 9dd23fd8e7 Update README.md 2022-07-14 22:50:12 -04:00
Ari Sosnovsky 24b3beaf0a Update README.md 2022-07-14 22:42:06 -04:00
Ari Sosnovsky d55d86b177 Update CHANGELOG.md 2022-07-14 22:37:45 -04:00
Ari Sosnovsky 32fc5bce07 v0.3.0 2022-07-14 22:35:44 -04:00
ari 45ace08cbe parallel nodes 2022-07-14 17:50:37 -04:00
ari d4e2e2f1e5 Initial support for parallel 2022-07-14 16:09:17 -04:00
ari 50f1d2a42d clean up 2022-07-14 16:02:14 -04:00
ari 58f18232b7 fixed breakage 2022-07-14 16:01:54 -04:00
ari 8bf25547eb stop action 2022-07-14 15:43:12 -04:00
ari 07ab4b9089 condition + repeat node 2022-07-14 15:24:35 -04:00
ari 89c7007612 choose options 2022-07-13 15:03:22 -04:00
ari de2307901b repeat node initial support 2022-07-13 10:52:56 -04:00
ari f392cf17fd fixed typing for repeat 2022-07-12 22:04:13 -04:00
ari 595aa2dfa1 using new board 2022-07-12 21:28:45 -04:00
ari 2d78319683 choose no longer asks for missing values 2022-07-12 21:15:34 -04:00
ari befe293f1c expandable choose node 2022-07-12 21:12:03 -04:00
ari 0b381a6e50 renamed state to outputstate 2022-07-12 20:33:31 -04:00
ari b4f46bec92 zoom groups 2022-07-12 20:31:00 -04:00
ari 1661df888a state updater for choosenodes 2022-07-12 20:25:20 -04:00
ari 0c5ef76f4b fixed up styling for choose 2022-07-12 18:47:18 -04:00
ari 084a3585d0 hack for board zoom 2022-07-11 21:09:28 -04:00
ari 2cb2e779d7 refactor of graph pt2 2022-07-11 17:12:49 -04:00
ari 730c804c22 hacking nodes 2022-07-10 14:18:53 -04:00
ari 649c1fbdeb add in tooltip 2022-07-10 14:13:31 -04:00
ari edb3dafe12 sequence node drawing v1 2022-07-10 13:37:11 -04:00
ari 1d7b6e96c1 resizeable collection nodes 2022-07-10 13:12:37 -04:00
ari 7483f2b65d removed dead tests 2022-07-10 13:00:22 -04:00
ari e7dec306df flipped trigger + condition
createMode for condition editor
2022-07-10 12:59:33 -04:00
ari f549993d3e abstsracted away sequence node collections
added generic action updaters
2022-07-10 12:40:44 -04:00
ari d62c484f33 refactor of dagflow start 2022-07-09 19:22:04 -04:00
ari 3cb6070aca clean up 2022-07-05 23:02:17 -04:00
ari e94151cf94 renamed tests 2022-07-05 22:59:33 -04:00
ari 518563fddd fixed tests 2022-07-05 22:51:12 -04:00
ari 34394feb9d add to middle 2022-07-05 22:51:12 -04:00
renovate[bot] e8b76039a9 Update home-assistant/builder action to v2022.07.0 (#70)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-07-04 23:48:10 -04:00
ari 8c1f29226b cleaner nodes 2022-07-04 22:45:34 -04:00
ari 550795bf7f clean up 2022-07-04 22:40:20 -04:00
ari 905a5ac4d7 using more of mui colors 2022-07-04 22:38:55 -04:00
ari d50674c8fe passing mui colors to css 2022-07-04 22:24:48 -04:00
ari 81f22ccd2a modifiable tags 2022-07-04 22:06:21 -04:00
renovate[bot] 2b1b7526c3 Update dependency @uiw/react-codemirror to v4.10.4 (#68) 2022-07-03 14:22:56 -04:00
renovate[bot] 6e534f446d Update dependency autosuggest-highlight to v3.3.0 (#69) 2022-07-03 14:21:29 -04:00
renovate[bot] b3b1126a12 Pin dependency material-ui-confirm to 3.0.4 (#67) 2022-07-03 14:21:20 -04:00
renovate[bot] cf9f24f41e Update devDependencies (non-major) (#65) 2022-07-02 15:19:08 -04:00
renovate[bot] 897953b0db Update dependency yarn to v1.22.19 (#66) 2022-07-02 15:18:37 -04:00
renovate[bot] 3fadcd94b6 Update dependency @types/jest to v28.1.4 (#61) 2022-07-02 15:18:10 -04:00
ari a8229eb7bd - removed multi node
- updated tag updater
2022-07-01 14:28:18 -04:00
ari 72afaee719 fixed up renovate 2022-07-01 14:10:35 -04:00
ari 9a171c880e updated messages 2022-06-30 20:37:51 -04:00
ari 7488ecc3ae onSave 2022-06-30 20:37:51 -04:00
ari d99512d6e5 description for condition: time 2022-06-30 20:37:51 -04:00
renovate[bot]andAri Sosnovsky e6e57be3ed Update dependency jest-environment-jsdom to v28.1.2 (#63)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-06-30 20:31:45 -04:00
ari 47f57c313e removed all window.confirm 2022-06-29 21:20:37 -04:00
ari dc3470fdf5 enabled/disabled 2022-06-29 20:56:46 -04:00
ari 5bd5c5e445 enable/disable node 2022-06-29 17:37:17 -04:00
ari 869c23212b desc to trigger zone 2022-06-29 17:04:39 -04:00
ari 08f7ee2393 zone description 2022-06-29 16:42:03 -04:00
ari 0088dd8448 cleaned up options styles 2022-06-29 16:34:59 -04:00
ari 4d9afbe26b cleaned up styles for node display 2022-06-29 15:07:55 -04:00
ari 9a43330501 schedule 2022-06-29 13:34:09 -04:00
renovate[bot] 6c78af45f6 Update dependency requests to v2.28.1 (#62)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-29 16:36:28 +00:00
renovate[bot] 1da9f44232 Update dependency uvicorn to v0.18.2 (#58)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-29 12:31:53 -04:00
ari 7b958f6c3b updated renovate 2022-06-29 12:27:11 -04:00
ari d08d091723 updated actions 2022-06-29 12:20:38 -04:00
ari 3371d6b95f updated actions 2022-06-29 12:20:28 -04:00
ari c07e1aca49 cleand up lint errors 2022-06-29 12:14:26 -04:00
ari cc2597c408 rebuilt condition editor 2022-06-29 12:12:05 -04:00
ari 6da5a7592e extracted speeddial 2022-06-29 12:12:05 -04:00
renovate[bot] fe4f0e9881 Update dependency coverage to v6 (#56) 2022-06-29 06:28:41 -04:00
renovate[bot] ff195796d8 Update dependency @types/jest to v28 (#55) 2022-06-29 06:28:24 -04:00
renovate[bot] fe2fd19be8 Update actions/setup-python action to v4 (#54) 2022-06-29 06:28:15 -04:00
renovate[bot] 3b6b34f6e5 Update styfle/cancel-workflow-action action to v0.10.0 (#57) 2022-06-29 06:28:01 -04:00
renovate[bot] a39755d599 Update dependency black to v22.6.0 (#60) 2022-06-29 06:27:44 -04:00
renovate[bot] bb1d8c6492 Update react monorepo to v18.2.0 (#53) 2022-06-28 23:26:51 -04:00
renovate[bot] 8780d206c9 Update material-ui monorepo to v5.8.6 (#59) 2022-06-28 23:26:08 -04:00
ari 1d1d52480a converted tags example 2022-06-27 19:15:03 -04:00
ari ec7c28adba using automation id instead of idx for tags 2022-06-25 23:04:03 -04:00
ari f120fcfd65 fixed up yaml 2022-06-25 22:51:57 -04:00
ari 5e3e499c9d removed more unused 2022-06-25 22:23:44 -04:00
ari 361bc9b7d6 fixed up unsued 2022-06-25 22:22:41 -04:00
ari 4eccd75058 moved the edit to the tooltip 2022-06-25 22:22:13 -04:00
renovate[bot] dc99d57964 Update dependency types-PyYAML to v6.0.9 (#51)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:11:28 -04:00
renovate[bot] 7233c50492 Update storybook monorepo to v6.5.9 (#36)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:10:29 -04:00
renovate[bot] e1fbb8103b Update home-assistant/builder action to v2022.06.2 (#52)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:09:35 -04:00
renovate[bot] 7d28ffd761 Update material-ui monorepo (#35)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:09:11 -04:00
renovate[bot] a9905956d8 Update dependency requests to v2.28.0 (#44)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:08:29 -04:00
renovate[bot]andAri Sosnovsky 7836a5281a Update dependency @uiw/react-codemirror to v4.9.4 (#37)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-06-25 22:07:59 -04:00
renovate[bot] 213dc1517d Update dependency superstruct to v0.16.0 (#45)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:07:32 -04:00
renovate[bot] 983753afe1 Update dependency ws to v8.8.0 (#50)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:07:20 -04:00
renovate[bot] 2da4d4b929 Update dependency webpack to v5.73.0 (#49)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:06:59 -04:00
renovate[bot] 610a7c77b9 Update dependency python-decouple to v3.6 (#43)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:05:55 -04:00
renovate[bot] cd9bf9d8b7 Update dependency pydantic to v1.9.1 (#42)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:05:32 -04:00
renovate[bot] 3cb2725907 Update dependency types-requests to v2.28.0 (#46)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:05:11 -04:00
renovate[bot] 94ae295c9f Update dependency uvicorn to v0.18.1 (#47)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-24 20:46:05 -04:00
renovate[bot] f274f6281f Update dependency vulture to v2.4 (#48)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-24 20:45:54 -04:00
ari d62835ba80 updated actions 2022-06-24 20:44:54 -04:00
renovate[bot] f7762b823b Update dependency pre-commit to v2.19.0 (#41)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-23 22:58:55 -04:00
renovate[bot] aa1fb2f499 Update dependency mypy to v0.961 (#40)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-23 22:58:37 -04:00
renovate[bot] ed07e35830 Update dependency isort to v5.10.1 (#39)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-23 22:58:21 -04:00
renovate[bot] 52ac28ffd2 Update dependency fastapi to v0.78.0 (#38)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-23 22:58:05 -04:00
renovate[bot] ed9a5a9aa1 Update jest monorepo (#34)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-23 22:56:38 -04:00
ari d6d47168e3 more lightweight test for prs 2022-06-22 21:51:14 -04:00
renovate[bot] 2f0f8f7dfe Update dependency @storybook/preset-create-react-app to v4.1.2 (#22)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-22 21:37:53 -04:00
renovate[bot]andAri Sosnovsky 24093eb0b0 Update dependency bandit to v1.7.4 (#26)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-06-22 21:37:34 -04:00
renovate[bot]andAri Sosnovsky 5a48007154 Update dependency types-PyYAML to v6.0.8 (#29)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-06-22 21:37:15 -04:00
renovate[bot] 9a93b30f4b Update dependency typescript to v4.7.4 (#30)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-22 21:36:54 -04:00
renovate[bot]andAri Sosnovsky cdb12bfdcb Update emotion monorepo to v11.9.3 (#33)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-06-22 21:36:15 -04:00
renovate[bot]andAri Sosnovsky f2e4b6802d Update dependency @testing-library/user-event to v14.2.1 (#24)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-06-22 21:33:59 -04:00
renovate[bot]andAri Sosnovsky b092d12dca Update dependency @types/react to v18.0.14 (#25)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-06-22 21:33:37 -04:00
renovate[bot] dce5d0b260 Update dependency ts-node to v10.8.1 (#28)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-22 21:33:07 -04:00
renovate[bot] e1c222aeb0 Update dependency webpack-dev-server to v4.9.2 (#31)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-22 21:31:40 -04:00
renovate[bot] bd29cf6576 Pin dependencies (#21)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-22 21:27:15 -04:00
renovate[bot] 54f9b9c2f4 Update dependency react-flow-renderer to v10.3.8 (#27) 2022-06-22 21:23:42 -04:00
ari 6722854700 complex movements 2022-06-22 21:22:10 -04:00
renovate[bot] 939ec2dc99 Configure Renovate (#20)
Add renovate.json

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-21 20:36:05 -04:00
ari 4f05e64652 fixed device editor issue 2022-06-19 15:51:14 -04:00
ari 13ea3632e3 0.1.22 2022-06-19 14:20:16 -04:00
ari 465e5a4268 clean up 2022-06-19 14:02:16 -04:00
ari eeaa64a8e7 flipped cookies 2022-06-19 14:01:53 -04:00
ari 3a1cee61b8 fixed up unittest 2022-06-19 13:56:21 -04:00
ari 21dd880e37 updated choose name 2022-06-19 13:55:51 -04:00
ari 218972ed5d fixxed typo 2022-06-19 13:39:03 -04:00
ari 451b3638bf cleaned up styles a bit 2022-06-19 13:38:43 -04:00
ari 3acbaf576d fixerd up event 2022-06-19 03:14:06 -04:00
ari eaec599109 auto jump into new automation in mobile mode 2022-06-19 02:59:56 -04:00
ari c6c1efddae removing input area for now 2022-06-19 02:55:19 -04:00
ari ae352ff244 entity dispay 2022-06-19 02:11:25 -04:00
ari dde8d76772 entity filter by integration 2022-06-19 02:06:51 -04:00
ari 34a4bd93bd better saving for yaml editor 2022-06-19 01:04:02 -04:00
ari 7154f206b4 updated inputyaml 2022-06-19 00:53:01 -04:00
ari 19a2d10a2f fixed typing error 2022-06-19 00:31:54 -04:00
ari da699403df added boolean to serviceeditor
helpertext
2022-06-19 00:29:39 -04:00
ari 1496bc66ad device editor working with special caps 2022-06-18 23:23:08 -04:00
ari debe48f2b4 renamed unit test 2022-06-17 22:22:49 -04:00
ari 4bada614b9 better name for device trigger 2022-06-17 22:22:37 -04:00
ari 537bfe824b clean up unused 2022-06-17 17:47:03 -04:00
ari a25ec99cb1 fixed unittests 2022-06-17 17:46:31 -04:00
ari 8ac5bfdfed typing errror 2022-06-17 17:45:41 -04:00
ari 618a62affe added condition editor for device 2022-06-17 17:45:14 -04:00
ari 1ce934fd54 generic device editor 2022-06-17 16:56:51 -04:00
ari ab8ecfeefb updated zone condition 2022-06-17 16:26:54 -04:00
ari a32e365d86 target device & action device v2 2022-06-17 16:06:51 -04:00
ari 04f3e6194f generic ha extras 2022-06-17 14:57:14 -04:00
ari 0b183353d3 prettier names 2022-06-17 14:34:37 -04:00
ari 0c9b0ec6e6 clean up 2022-06-17 14:25:48 -04:00
ari 5bef962977 fixed up service editor 2022-06-17 14:23:15 -04:00
ari 029df7932e device action builder 2022-06-17 13:37:25 -04:00
ari 6be6005531 reordered what shows up 2022-06-16 21:25:21 -04:00
ari 326775848b trigger state autofill 2022-06-16 21:23:28 -04:00
ari 736a6053ef always pretty list 2022-06-16 20:39:11 -04:00
ari f4a41331b1 clean up 2022-06-16 17:25:34 -04:00
ari 15c97b81b4 input area 2022-06-16 17:24:31 -04:00
ari 0fc3ea6146 selector.select 2022-06-15 10:43:14 -04:00
ari 596c3363e7 fixed up unit of measure 2022-06-14 22:01:21 -04:00
ari 529b5599e4 input number unit 2022-06-14 21:57:39 -04:00
ari 184d8a8584 added entity input for service target 2022-06-14 21:57:39 -04:00
Ari Sosnovsky f6ca454999 Update config.yaml 2022-06-14 18:17:56 -04:00
Ari Sosnovsky cdc5aa16b0 Update CHANGELOG.md 2022-06-14 18:17:28 -04:00
ari 7b816c3fbf v1 of service editor 2022-06-14 15:06:02 -04:00
ari 0cecae5faa reloading autos 2022-06-13 19:26:55 -04:00
203 changed files with 13098 additions and 7025 deletions

No files matched your search

+7 -1
View File
@@ -15,6 +15,12 @@ jobs:
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
@@ -25,7 +31,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build & Push to Dockerhub
uses: home-assistant/builder@2022.03.1
uses: home-assistant/builder@2022.07.0
with:
args: |
--${{ matrix.arch }} \
+2 -1
View File
@@ -38,8 +38,9 @@ jobs:
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
uses: styfle/cancel-workflow-action@0.10.0
with:
all_but_latest: true
access_token: ${{ github.token }}
- name: Checkout repository
+14 -8
View File
@@ -1,12 +1,11 @@
name: Test
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
name: Tests
on:
workflow_dispatch:
push:
branch: [main]
branch:
- main
pull_request:
branches: [main]
branch:
- main
jobs:
metadata:
runs-on: ubuntu-latest
@@ -42,7 +41,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Install Dependencies
@@ -77,6 +76,7 @@ jobs:
deploy:
runs-on: ubuntu-latest
name: Build & Publish ${{ matrix.arch }}
if: github.event_name != 'pull_request'
needs:
- metadata
- nodejs
@@ -86,6 +86,12 @@ jobs:
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
@@ -96,7 +102,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
uses: home-assistant/builder@2022.03.1
uses: home-assistant/builder@2022.07.0
with:
args: |
--${{ matrix.arch }} \
+34 -6
View File
@@ -1,5 +1,35 @@
# Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge)
## [0.3.0] - Complete Refactor of Graphs
- Added visual support for
* Repeat Nodes
* Parallel Nodes
- Using collections for conditions & triggers
- Fixed several bugs with improper alerts
- Fixed graph breakage during zoom
- Support for enable/disable nodes in UI
![image](https://user-images.githubusercontent.com/7451445/179135734-8d7ca46d-7e6f-4975-abc3-de86a48de0c0.png)
![image](https://user-images.githubusercontent.com/7451445/179135790-a5e77e2b-6d42-4810-a27b-ff4d165e99ec.png)
![image](https://user-images.githubusercontent.com/7451445/179135916-8083aab5-bee1-4d27-b19d-9e000ca012f9.png)
## [0.1.22] - Many Visual improvements
- Deprecated several custom components in favor of mui.com
- Device Editor now has support for 99% of diplay types
- Condition Device is implemented
- Improved naming autogen for trigger & choose
## [0.1.21] - Service Editor
- first version of service editor
- reloading automations on save
## [0.1.20] - UI Bugfixes
- Using MUI elements for input time
@@ -15,9 +45,9 @@
## [0.1.17] - Websockets
- Connected to HA main websocket -- now we retrieve real-time information about
* Device names
* Entity names/ids
- Device names
- Entity names/ids
- Autocomplete for devices and entities
@@ -41,7 +71,6 @@
- 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
@@ -95,8 +124,7 @@
## [0.0.9] - First Working Version
- Instalable verion via github
- Initial POC done
- Initial POC done
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+29 -6
View File
@@ -8,9 +8,32 @@
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
![image](https://user-images.githubusercontent.com/7451445/170770378-122c6722-993d-40ac-801d-387cfaccd41f.png)
Sort and organize your home-assistant automations using tags!
![image](https://user-images.githubusercontent.com/7451445/179136346-cf04a8c0-ac4e-44b2-b9fe-806824864660.png)
Utilize the auto-generated node descriptions to understand what your automation is doing! No more reading YAML to just understand what 1 node does!
![image](https://user-images.githubusercontent.com/7451445/179137357-455260f3-2cdd-44ca-ae62-084ed7c59ebd.png)
More condense UI for service calls!
![image](https://user-images.githubusercontent.com/7451445/179137126-93601ea9-435f-4c4f-8f21-0d09cd61c7a2.png)
Visualize complex 'choose' or 'if/else' nodes
![image](https://user-images.githubusercontent.com/7451445/179135734-8d7ca46d-7e6f-4975-abc3-de86a48de0c0.png)
Visualize parallel nodes!
![image](https://user-images.githubusercontent.com/7451445/179136706-695912d7-e223-42d9-a27b-f330b021a56a.png)
Visualize repeat nodes!
![image](https://user-images.githubusercontent.com/7451445/179135790-a5e77e2b-6d42-4810-a27b-ff4d165e99ec.png)
![image](https://user-images.githubusercontent.com/7451445/170770572-fd38950a-b6b4-4b49-8c94-fb0a5f3008ce.png)
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
@@ -22,10 +45,10 @@ A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI
- [X] Automation Manager
- [X] Tags for automation organization
- [X] Autocomplete fields for entities/devices
- [ ] Script Manager
- [ ] Use secrets and global parameters
- [ ] Autocomplete fields for template editor
- [ ] Autocomplete fields for referencing scripts
- [X] Visualize parallel/repeat/choose/if-else nodes
- [X] Autogenerate node names
- [ ] Clean error reporting
- [ ] Script Editor
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
+14 -14
View File
@@ -5,24 +5,24 @@ setuptools.setup(
python_requires=">=3.9",
install_requires=[
"PyYAML==6.0",
"fastapi==0.70.0",
"pydantic==1.8.2",
"uvicorn[standard]==0.15.0",
"python-decouple==3.5",
"fastapi==0.78.0",
"pydantic==1.9.1",
"uvicorn[standard]==0.18.2",
"python-decouple==3.6",
],
extras_require={
"dev": [
"mypy==0.910",
"mypy==0.961",
"mypy-extensions==0.4.3",
"black==22.3.0",
"bandit==1.7.0",
"isort==5.9.3",
"coverage==5.5",
"pre-commit==2.13.0",
"vulture==2.3",
"types-requests==2.25.6",
"types-PyYAML==6.0.7",
"requests==2.27.0",
"black==22.6.0",
"bandit==1.7.4",
"isort==5.10.1",
"coverage==6.4.1",
"pre-commit==2.19.0",
"vulture==2.4",
"types-requests==2.28.0",
"types-PyYAML==6.0.9",
"requests==2.28.1",
],
},
)
+4 -1
View File
@@ -1,5 +1,8 @@
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):
+10 -7
View File
@@ -1,6 +1,6 @@
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.hass_config.loader import HassConfig
@@ -22,29 +22,32 @@ class AutomationManager:
continue
if i >= offset + limit:
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]:
tags = self.hass_config.automation_tags
if index >= 0:
for i, auto in enumerate(self.hass_config.automations):
if not isinstance(auto, dict):
raise InvalidAutomationFile(automation_index=i)
if i == index:
return next(load_automation(auto, tags.get(i, {})))
return next(load_automation(auto, tags.get(auto.get("id", ""), {})))
return None
def update(self, index: int, automation: ExtenededAutomationData):
tags = self.hass_config.automation_tags
automations: List[dict] = []
updated = False
updated_index: Optional[int] = None
for i, orig_auto in enumerate(self.hass_config.automations):
if i == index:
automations.append(automation.to_primitive())
updated = True
updated_index = i
else:
automations.append(orig_auto)
if not updated:
if updated_index is None:
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_tags(tags)
+1 -1
View File
@@ -4,7 +4,7 @@ from typing import Dict
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):
path.write_text(dump_yaml(dict(self)))
+28
View File
@@ -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))
-6
View File
@@ -9,12 +9,6 @@ from src.yaml_serializer.types import (
class YamlSafeLoader(yaml.SafeLoader):
pass
# def compose_node(self, parent: yaml.nodes.Node, index: int) -> yaml.nodes.Node: # type: ignore[override]
# """Annotate a node with the first line it was seen."""
# last_line: int = self.line
# node: yaml.nodes.Node = super().compose_node(parent, index) # type: ignore[assignment]
# node.__line__ = last_line + 1 # type: ignore[attr-defined]
# return node
YamlSafeLoader.add_constructor("!include", IncludedYaml.from_yaml)
@@ -1,77 +1,77 @@
0:
'1616887975473':
Type: HA
1:
'1616888026264':
Type: HA
2:
Type: Button
'1619371298367':
Room: Living
3:
Type: Button
'1620239986670':
Room: Kitchen
4:
Type: Button
'1620324780561':
Room: Kitchen
5:
Type: Button
'1621352850204':
Room: Kitchen
6:
Type: Button
'1622210698281':
Room: Kitchen
7:
Type: Button
'1622769811245':
Room: Living
8:
Type: Button
'1623430479201':
Room: Baby
9:
Type: Button
'1623642118976':
Room: Baby
10:
Type: Button
'1624640900951':
Room: Baby
Type: Button
'1628024070687':
Room: Baby
11:
Type: Routine
'1628024123214':
Room: Baby
12:
Type: Routine
Room: Baby
13:
'1628444671951':
Room: Office
Type: Window
Room: Office
14:
Type: Door
'1629309267204':
Room: Balcony
15:
Type: Routine
16:
Type: Button
Room: Baby
17:
Type: Routine
18:
Type: Routine
19:
Type: Door
Room: Bedroom
20:
Type: Ensure Power
21:
Type: Ensure Power
22:
Type: Motion
Room: Office
23:
'1629422438707':
Type: Routine
'1634497376234':
Room: Baby
24:
Type: Climate
Climate: Heat
25:
Type: Climate
Climate: Time
26:
Type: Routine
27:
Type: Button
'1635539262562':
Type: Routine
'1636428429596':
Type: Routine
'1639500650865':
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
+1 -1
View File
@@ -1,5 +1,5 @@
name: Shortumation
version: v0.1.20
version: v0.3.0
slug: shortumation
image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation"
+11
View File
@@ -0,0 +1,11 @@
{
"extends": ["config:base"],
"schedule": ["every month"],
"packageRules": [
{
"matchDepTypes": ["devDependencies"],
"matchUpdateTypes": ["patch", "minor"],
"groupName": "devDependencies (non-major)"
}
]
}
+48 -47
View File
@@ -4,35 +4,36 @@
"private": true,
"homepage": ".",
"dependencies": {
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
"@mui/icons-material": "^5.8.3",
"@mui/material": "^5.8.0",
"@mui/styles": "^5.8.0",
"@types/jest": "^27.5.1",
"@types/node": "^17.0.36",
"@types/react": "^18.0.9",
"@types/react-dom": "^18.0.5",
"@types/ws": "^8.5.3",
"@uiw/react-codemirror": "^4.7.0",
"autosuggest-highlight": "^3.2.1",
"home-assistant-js-websocket": "^7.1.0",
"jss": "^10.8.2",
"notistack": "^2.0.5",
"react": "^18.1.0",
"react-cookie": "^4.1.1",
"react-dom": "^18.1.0",
"react-flow-renderer": "^10.1.2",
"react-imask": "^6.4.2",
"react-jss": "^10.8.2",
"react-router-dom": "6",
"@emotion/react": "11.9.3",
"@emotion/styled": "11.9.3",
"@mui/icons-material": "5.8.4",
"@mui/material": "5.8.6",
"@mui/styles": "5.8.6",
"@types/jest": "28.1.5",
"@types/node": "17.0.36",
"@types/react": "18.0.14",
"@types/react-dom": "18.0.6",
"@types/ws": "8.5.3",
"@uiw/react-codemirror": "4.10.4",
"autosuggest-highlight": "3.3.2",
"home-assistant-js-websocket": "7.1.0",
"jss": "10.9.0",
"material-ui-confirm": "3.0.4",
"notistack": "2.0.5",
"react": "18.2.0",
"react-cookie": "4.1.1",
"react-dom": "18.2.0",
"react-flow-renderer": "10.3.8",
"react-imask": "6.4.2",
"react-jss": "10.9.0",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1",
"superstruct": "^0.15.4",
"theming": "^3.3.0",
"typescript": "^4.1.2",
"web-vitals": "^2.1.4",
"ws": "^8.7.0",
"yarn": "^1.22.17"
"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": {
"start": "react-scripts start",
@@ -75,25 +76,25 @@
]
},
"devDependencies": {
"@storybook/addon-actions": "^6.4.22",
"@storybook/addon-essentials": "^6.4.22",
"@storybook/addon-links": "^6.4.22",
"@storybook/addon-queryparams": "^6.2.9",
"@storybook/builder-webpack5": "^6.5.6",
"@storybook/manager-webpack5": "^6.5.6",
"@storybook/node-logger": "^6.4.22",
"@storybook/preset-create-react-app": "^4.1.1",
"@storybook/react": "^6.4.22",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^14.2.0",
"@types/autosuggest-highlight": "^3.2.0",
"@types/chroma-js": "^2.1.3",
"@types/js-yaml": "^4.0.5",
"jest-environment-jsdom": "^28.1.0",
"ts-node": "^10.8.0",
"webpack": "^5.72.1",
"webpack-dev-server": "^4.9.0"
"@storybook/addon-actions": "6.5.9",
"@storybook/addon-essentials": "6.5.9",
"@storybook/addon-links": "6.5.9",
"@storybook/addon-queryparams": "6.2.9",
"@storybook/builder-webpack5": "6.5.9",
"@storybook/manager-webpack5": "6.5.9",
"@storybook/node-logger": "6.5.9",
"@storybook/preset-create-react-app": "4.1.2",
"@storybook/react": "6.5.9",
"@testing-library/jest-dom": "5.16.4",
"@testing-library/react": "13.3.0",
"@testing-library/user-event": "14.2.1",
"@types/autosuggest-highlight": "3.2.0",
"@types/chroma-js": "2.1.3",
"@types/js-yaml": "4.0.5",
"jest-environment-jsdom": "28.1.2",
"ts-node": "10.8.2",
"webpack": "5.73.0",
"webpack-dev-server": "4.9.3"
},
"moduleDirectories": [
"node_modules",
+3 -3
View File
@@ -5,7 +5,7 @@ import { AutomationAPI } from './automations';
export const useDefaultApiState = () => useState<ApiState>({
automations: {ready: false},
automations: { ready: false },
});
export const makeReloadAutomations = (
@@ -21,8 +21,8 @@ export const makeReloadAutomations = (
const resp = await automationAPI.list(params);
setState({
...state, automations: {
ready: true,
...resp,
ready: true,
...resp,
}
});
}
@@ -28,7 +28,7 @@
.automation-editor--info-box--tags {
padding: 0.25em 0.75em 1em 0.75em;
border-color: var(--primary-accent);
border-color: var(--mui-grey-400);
border-width: 1px;
border-style: ridge;
border-radius: 5px;
@@ -2,11 +2,11 @@ import "./AutoInfoBox.css";
import { AutomationMetadata } from "types/automations";
import { InputList } from "components/Inputs/InputList";
import InputText from "components/Inputs/InputText";
import { FC, ReactNode, useRef, useState } from 'react';
import { FC, ReactNode, useRef, useState } from "react";
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 {
className: string;
@@ -25,122 +25,154 @@ export const AutoInfoBox: FC<Props> = ({
tagDB,
}) => {
// state
const [newTag, setNewTag] = useState<[string, string]>(["", ""])
const [[errorIndex, error], _setError] = useState<[number | 'new', string]>([-1, ""]);
const [newTag, setNewTag] = useState<[string, string]>(["", ""]);
const [[errorIndex, error], _setError] = useState<[number | "new", string]>([
-1,
"",
]);
const errorTimeoutId = useRef(-1);
// aliases
const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n));
const setError = (index: number | 'new', msg: string) => {
_setError([index, msg])
const setError = (index: number | "new", msg: string) => {
_setError([index, msg]);
if (errorTimeoutId.current >= 0) {
window.clearTimeout(errorTimeoutId.current);
}
errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000);
}
const onUpdateMetadata = <K extends keyof AutomationMetadata>(k: K) => (update: AutomationMetadata[K]) => onUpdate({
...metadata,
[k]: update
}, tags);
};
const onUpdateMetadata =
<K extends keyof AutomationMetadata>(k: K) =>
(update: AutomationMetadata[K]) =>
onUpdate(
{
...metadata,
[k]: update,
},
tags
);
const validTagName = (newName: string): string | undefined => {
if (newName.length <= 0) {
return "Name must be at least 1 character long"
return "Name must be at least 1 character long";
}
// eslint-disable-next-line
for (const [name, _] of tags) {
if (name.trim() === newName.trim()) {
return `The tag '${name}' already exists`
return `The tag '${name}' already exists`;
}
}
}
};
const updateTagName = (newName: string, tagIndex: number) => {
const error = validTagName(newName);
if (error) {
return setError(tagIndex, error)
return setError(tagIndex, error);
}
onUpdate(metadata, [
...tags.slice(0, tagIndex),
[newName, tags[tagIndex][1]],
...tags.slice(tagIndex + 1),
])
}
const onUpdateTags = (tagValue: string, tagIndex: number) => onUpdate(metadata, [
...tags.slice(0, tagIndex),
[tags[tagIndex][0], tagValue],
...tags.slice(tagIndex + 1),
])
]);
};
const onUpdateTags = (tagValue: string, tagIndex: number) =>
onUpdate(metadata, [
...tags.slice(0, tagIndex),
[tags[tagIndex][0], tagValue],
...tags.slice(tagIndex + 1),
]);
const addNewTag = () => {
const error = validTagName(newTag[0]);
if (error) {
return setError('new', error)
return setError("new", error);
}
onUpdate(metadata, tags.concat([
newTag.map(x => x.trim()) as [string, string]
]));
setNewTag(['', '']);
}
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [
...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1),
])
onUpdate(
metadata,
tags.concat([newTag.map((x) => x.trim()) as [string, string]])
);
setNewTag(["", ""]);
};
const onRemoveTag = (tagIndex: number) =>
onUpdate(metadata, [
...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1),
]);
// render
return <div className={`automation-editor--info-box ${className}`}>
<div className="automation-editor--info-box-inner">
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} />
<InputText label="Name" value={metadata.alias ?? ""} onChange={onUpdateMetadata('alias')} />
<InputText multiline label="Description" value={metadata.description ?? ""} onChange={onUpdateMetadata('description')} />
<InputList
label="Mode"
current={metadata.mode}
onChange={onUpdateMetadata('mode')}
options={[
'parallel',
'single',
'queued',
'restart'
]}
/>
<div className="automation-editor--info-box--tags">
<h1>Tags</h1>
<div className="automation-editor--info-box--tag-list">
{tags.map(([tagName, tagValue], tagIndex) => <div key={tagIndex} className="automation-editor--info-box--tag">
return (
<div className={`automation-editor--info-box ${className}`}>
<div className="automation-editor--info-box-inner">
<InputText
label="ID"
value={metadata.id}
onChange={onUpdateMetadata("id")}
/>
<InputText
label="Name"
value={metadata.alias ?? ""}
onChange={onUpdateMetadata("alias")}
/>
<InputText
multiline
label="Description"
value={metadata.description ?? ""}
onChange={onUpdateMetadata("description")}
/>
<InputList
label="Mode"
current={metadata.mode}
onChange={onUpdateMetadata("mode")}
options={["parallel", "single", "queued", "restart"]}
/>
<div className="automation-editor--info-box--tags">
<h1>Tags</h1>
<div className="automation-editor--info-box--tag-list">
{tags.map(([tagName, tagValue], tagIndex) => (
<div key={tagIndex} className="automation-editor--info-box--tag">
<InputAutoText
value={tagName}
label="Name"
onChange={(v) => updateTagName(v, tagIndex)}
options={foundNewTagNames}
error={errorIndex === tagIndex ? error : undefined}
/>
<InputAutoText
value={tagValue}
label="Tag"
onChange={(v) => onUpdateTags(v, tagIndex)}
options={tagDB.getTagValues(tagName)}
error={errorIndex === tagIndex ? error : undefined}
/>
<ButtonIcon
className="automation-editor--info-box--tag--trash"
onClick={() => onRemoveTag(tagIndex)}
icon={<TrashIcon />}
/>
</div>
))}
</div>
<hr />
<div className="automation-editor--info-box--tag">
<InputAutoText
value={tagName}
value={newTag[0]}
label="Name"
onChange={v => updateTagName(v, tagIndex)}
onChange={(v) => setNewTag([v, newTag[1]])}
options={foundNewTagNames}
error={errorIndex === tagIndex ? error : undefined}
error={errorIndex === "new" ? error : undefined}
/>
<InputAutoText
value={tagValue}
value={newTag[1]}
label="Tag"
onChange={v => onUpdateTags(v, tagIndex)}
options={tagDB.getTagValues(tagName)}
error={errorIndex === tagIndex ? error : undefined}
onChange={(v) => setNewTag([newTag[0], v])}
options={tagDB.getTagValues(newTag[0])}
error={errorIndex === "new" ? error : undefined}
/>
<Button className="automation-editor--info-box--tag--trash" onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button>
</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}
/>
<Button className="automation-editor--info-box--tag--add" onClick={addNewTag} ><AddIcon /></Button>
<ButtonIcon
className="automation-editor--info-box--tag--add"
onClick={addNewTag}
icon={<AddIcon />}
/>
</div>
</div>
</div>
{children}
</div>
{children}
</div>
}
);
};
@@ -34,8 +34,8 @@
}
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
border-color: var(--change);
color: var(--change)
border-color: var(--mui-success-light);
color: var(--mui-success-light)
}
@@ -46,13 +46,13 @@
padding: 0.25em;
}
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--flow {
border-color: var(--change);
.automation-editor--flow-wrapper.changed>.dag-graphboard {
border-color: var(--mui-success-light);
}
.automation-editor--flow-wrapper--flow {
.dag-graphboard {
flex: 1;
border: 1px solid var(--secondary-accent);
border: 1px solid var(--mui-grey-700);
margin: 0 0 0.5em 0;
z-index: 1;
}
@@ -61,16 +61,19 @@
position: relative;
}
.automation-editor--info-box--icon {
.automation-editor .automation-editor--info-box--icon {
position: absolute;
right: 0em;
bottom: 0.5em;
left: 0.25em;
bottom: 0em;
z-index: 10;
max-width: 1.5em;
max-height: 1.5em;
}
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
transform: rotate(180deg);
z-index: 2;
left: 0.1em;
}
.automation-editor.loading .mock-list {
@@ -1,100 +1,99 @@
import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { AutomationEditor } from './index';
import { useState } from 'react';
import * as dgconst from 'components/DAGFlow/constants';
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { AutomationEditor } from "./index";
import { useState } from "react";
import { Page } from "components/Page";
import { makeTagDB } from "components/AutomationList/TagDB";
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
export default {
title: 'App/AutomationList/Editor',
title: "App/AutomationList/Editor",
component: AutomationEditor,
parameters: { actions: { argTypesRegex: '^on.*' } },
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
dims: dgconst.DEFAULT_DIMS,
}
} as ComponentMeta<typeof AutomationEditor>
dims: DEFAULT_DIMS,
},
} as ComponentMeta<typeof AutomationEditor>;
const Template: ComponentStory<typeof AutomationEditor> = args => {
const [state, setState] = useState(args.automation)
return <Page>
<AutomationEditor
{...args}
tagDB={makeTagDB(state ? [state] : [])}
automation={state}
onUpdate={s => {
window.setTimeout(() => setState(s), 3000)
}}
/>
</Page>
}
const Template: ComponentStory<typeof AutomationEditor> = (args) => {
const [state, setState] = useState(args.automation);
return (
<Page>
<AutomationEditor
{...args}
tagDB={makeTagDB(state ? [state] : [])}
automation={state}
onUpdate={(s) => {
window.setTimeout(() => setState(s), 3000);
}}
/>
</Page>
);
};
export const Loading = Template.bind({});
export const Simple = Template.bind({})
export const Simple = Template.bind({});
Simple.args = {
...Simple.args,
automation: {
condition: [],
tags: {
"Room": "Bathroom",
"For": "Toliet",
"Type": "Smell",
"Use": "Flushing"
Room: "Bathroom",
For: "Toliet",
Type: "Smell",
Use: "Flushing",
},
metadata: {
id: "random",
alias: "Random",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
wowo: "!",
},
mode: 'single',
mode: "single",
},
trigger: [
{
"platform": "numeric_state",
"entity_id": "test",
platform: "numeric_state",
entity_id: "test",
},
{
"platform": "homeassistant",
"event": "start",
}
platform: "homeassistant",
event: "start",
},
],
sequence: [
{
condition: 'and',
condition: "and",
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.temperature_kitchen',
below: '15',
condition: "numeric_state",
entity_id: "sensor.temperature_kitchen",
below: "15",
},
{
condition: 'template',
value_template: 'states(switch.kitchen_light) == "on"'
}
]
condition: "template",
value_template: 'states(switch.kitchen_light) == "on"',
},
],
},
{
alias: "Start Music In Kitchen",
service: 'media_player.play_media',
service: "media_player.play_media",
target: {
entity_id: "media_player.kitchen_dot"
entity_id: "media_player.kitchen_dot",
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
}
]
}
}
},
},
],
},
};
export const EmptyStart = Template.bind({})
export const EmptyStart = Template.bind({});
EmptyStart.args = {
...EmptyStart.args,
automation: {
@@ -105,31 +104,28 @@ EmptyStart.args = {
alias: "Random",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
wowo: "!",
},
mode: 'single',
mode: "single",
},
trigger: [
],
sequence: []
}
}
trigger: [],
sequence: [],
},
};
export const BadAutomationInvalidMetadata = Template.bind({})
export const BadAutomationInvalidMetadata = Template.bind({});
BadAutomationInvalidMetadata.args = {
...BadAutomationInvalidMetadata.args,
automation: {
condition: [],
tags: {},
metadata: {
} as any,
trigger: [
],
sequence: []
}
}
metadata: {} as any,
trigger: [],
sequence: [],
},
};
export const BadAutomationInvalidTriggers = Template.bind({})
export const BadAutomationInvalidTriggers = Template.bind({});
BadAutomationInvalidTriggers.args = {
...BadAutomationInvalidTriggers.args,
automation: {
@@ -140,18 +136,16 @@ BadAutomationInvalidTriggers.args = {
alias: "Random",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
wowo: "!",
},
mode: 'single',
mode: "single",
},
trigger: [
"haha I am a string"
] as any,
sequence: []
}
}
trigger: ["haha I am a string"] as any,
sequence: [],
},
};
export const BadAutomationInvalidSequence = Template.bind({})
export const BadAutomationInvalidSequence = Template.bind({});
BadAutomationInvalidSequence.args = {
...BadAutomationInvalidSequence.args,
automation: {
@@ -162,15 +156,89 @@ BadAutomationInvalidSequence.args = {
alias: "Bad Choose Sequence",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
wowo: "!",
},
mode: 'single',
mode: "single",
},
trigger: [],
sequence: [
{
choose: {}
}
] as any
}
}
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: [
{
type: "opened",
platform: "device",
device_id: "9b33663d2700da8efe0c31c946448f77",
entity_id: "binary_sensor.door_baby",
domain: "binary_sensor",
},
],
condition: [],
sequence: [
{
service: "notify.mobile_app_levas_phone",
data: {
message: "Someone is in Korie’s room!!!",
},
},
{
repeat: {
while: [
{
type: "is_open",
condition: "device",
device_id: "9b33663d2700da8efe0c31c946448f77",
entity_id: "binary_sensor.door_baby",
domain: "binary_sensor",
},
],
sequence: [
{
service: "notify.alexa_media",
data: {
message:
"Get the fuck out of the baby’s bedroom you sick fuck! This room belongs to Korie! Close the door! I said close. The. Door!",
data: null,
type: "tts",
target: "media_player.baby_bedroom_dot",
},
},
{
delay: {
hours: 0,
minutes: 0,
seconds: 7,
milliseconds: 0,
},
},
],
},
},
{
service: "light.turn_off",
target: {
entity_id: ["light.switch_baby"],
},
data: {
flash: "short",
},
},
],
tags: {},
},
};
+161 -126
View File
@@ -1,23 +1,25 @@
import "./index.css";
import Icon from '@mui/material/Icon';
import { ArrowIcon, CheckMarkIcon } from "components/Icons";
import { FC, useEffect, useState } from "react";
import Icon from "@mui/material/Icon";
import { CheckMarkIcon } from "components/Icons";
import { FC, useState } from "react";
import { AutomationData } from "types/automations";
import { AutoInfoBox } from "./AutoInfoBox";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import { Button } from "components/Inputs/Button";
import { useAutomatioEditorState, EditorData } from './state';
import { SafeDAGAutomationFlow } from "components/DAGFlow/safe";
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
import { MiniFailure } from 'types/validators/helper';
import { useAutomatioEditorState, EditorData } from "./state";
import { MiniFailure } from "types/validators/helper";
import InputYaml from "components/Inputs/InputYaml";
import { TagDB } from "components/AutomationList/TagDB";
import Skeleton from "@mui/material/Skeleton";
import LinearProgress from "@mui/material/LinearProgress";
import { ArrowBack } from "@mui/icons-material";
import { useCookies } from "react-cookie";
import { DAGDims } from "components/DAGGraph/elements/types";
import { DAGAutomationGraph } from "components/DAGGraph";
interface Props {
automation?: AutomationData;
dims: DAGAutomationFlowDims;
dims: DAGDims;
onUpdate: (auto: AutomationData) => void;
tagDB: TagDB;
}
@@ -39,133 +41,166 @@ export const AutomationEditor: FC<Props> = ({
saveAndUpdate,
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
const [closeInfo, setCloseInfo] = useState(false);
const [flipped, setFlipped] = useState(dims.flipped);
// effect
useEffect(() => {
if (dims.flipped !== flipped) {
setFlipped(dims.flipped)
}
}, [dims.flipped])
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
if (state.status === 'loading') {
return <div className="automation-editor loading">
<LinearProgress className="linear-loader" />
<Skeleton className="mock-list" variant="rectangular" />
<Skeleton className="mock-graph" variant="rectangular" />
</div>
}
if (state.status === 'invalid') {
return <ValidationBox
failures={state.failures}
data={state.data}
validate={validate}
onSave={saveAndUpdate}
/>
}
return <div className="automation-editor">
{state.status === 'saving' && <LinearProgress className="linear-loader" />}
<AutoInfoBox
className={closeInfo ? "hide" : "show"}
metadata={state.data.metadata}
tags={state.data.tags}
onUpdate={updateMetadata}
tagDB={tagDB}
>
<ButtonIcon
className="automation-editor--info-box--icon"
onClick={() => setCloseInfo(!closeInfo)}
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
Icon={ArrowIcon}
/>
</AutoInfoBox>
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
<div className="automation-editor--flow-wrapper--toolbar">
{!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>
if (state.status === "loading") {
return (
<div className="automation-editor loading">
<LinearProgress className="linear-loader" />
<Skeleton className="mock-list" variant="rectangular" />
<Skeleton className="mock-graph" variant="rectangular" />
</div>
<SafeDAGAutomationFlow
className="automation-editor--flow-wrapper--flow"
sequence={state.data.sequence}
trigger={state.data.trigger}
condition={state.data.condition}
onSequenceUpdate={updateSequence}
onTriggerUpdate={updateTrigger}
onConditionUpdate={updateCondition}
dims={{
...dims,
flipped,
}}
);
}
if (state.status === "invalid") {
return (
<ValidationBox
failures={state.failures}
data={state.data}
validate={validate}
onSave={saveAndUpdate}
/>
</div>
</div>
}
);
}
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>
);
};
export const ValidationBox: FC<{
failures: MiniFailure[]
validate: (d: any) => MiniFailure[] | null,
data: EditorData,
onSave: (d: EditorData) => void,
}> = props => {
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,
})
}
}
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>
}
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>
);
};
@@ -3,95 +3,89 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react";
import { AutomationList } from ".";
import { bigMockAutoList } from "utils/mocks";
import * as dgconst from 'components/DAGFlow/constants';
import { Page } from "components/Page";
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
export default {
title: 'App/AutomationList',
title: "App/AutomationList",
component: AutomationList,
parameters: { actions: { argTypesRegex: '^on.*' } },
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
dims: dgconst.DEFAULT_DIMS
}
dims: DEFAULT_DIMS,
},
} as ComponentMeta<typeof AutomationList>;
const Template: ComponentStory<typeof AutomationList> = (args) => {
const [autos, setAutos] = useState(args.automations);
return (
<Page>
<AutomationList
{...args}
automations={autos}
onAdd={(a) => {
args.onAdd(a);
setAutos([...autos, a]);
}}
onRemove={(i) => {
args.onRemove(i);
setAutos([...autos.slice(0, i), ...autos.slice(i + 1)]);
}}
onUpdate={(i, a) => {
args.onUpdate(i, a);
setAutos([...autos.slice(0, i), a, ...autos.slice(i + 1)]);
}}
/>
</Page>
);
};
const Template: ComponentStory<typeof AutomationList> = args => {
const [autos, setAutos] = useState(args.automations)
return <Page>
<AutomationList {...args} automations={autos}
onAdd={a => {
args.onAdd(a);
setAutos([...autos, a]);
}}
onRemove={i => {
args.onRemove(i);
setAutos([
...autos.slice(0, i),
...autos.slice(i + 1),
]);
}}
onUpdate={(i, a) => {
args.onUpdate(i, a);
setAutos([
...autos.slice(0, i),
a,
...autos.slice(i + 1),
]);
}}
/>
</Page>
}
export const EmptyStart = Template.bind({})
export const EmptyStart = Template.bind({});
EmptyStart.args = {
...EmptyStart.args,
automations: [],
}
};
export const FewAutos = Template.bind({})
export const FewAutos = Template.bind({});
FewAutos.args = {
...FewAutos.args,
automations: bigMockAutoList,
}
};
export const BadAutmations = Template.bind({})
export const BadAutmations = Template.bind({});
BadAutmations.args = {
...BadAutmations.args,
automations: [
{
"metadata": {
"alias": "Set Thermostat to 76 at 8am",
"description": "",
"mode": "single",
metadata: {
alias: "Set Thermostat to 76 at 8am",
description: "",
mode: "single",
} as any,
"trigger": [
trigger: [
{
"at": "08:00:00",
"platform": "time"
}
at: "08:00:00",
platform: "time",
},
],
"condition": [
condition: [
{
"condition": "state",
"entity_id": "climate.thermostat",
"state": "cool"
}
condition: "state",
entity_id: "climate.thermostat",
state: "cool",
},
],
"sequence": [
sequence: [
{
"data": {
"temperature": 76
data: {
temperature: 76,
},
"service": "climate.set_temperature",
"target": {
"entity_id": "climate.thermostat"
}
}
service: "climate.set_temperature",
target: {
entity_id: "climate.thermostat",
},
},
],
"tags": {},
tags: {},
},
{
condition: [],
@@ -101,16 +95,16 @@ BadAutmations.args = {
alias: "Bad Choose",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
wowo: "!",
},
mode: 'single',
mode: "single",
},
trigger: [],
sequence: [
{
choose: {}
}
] as any
choose: {},
},
] as any,
},
{
condition: [],
@@ -120,61 +114,55 @@ BadAutmations.args = {
alias: "Bad Trigger",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
wowo: "!",
},
mode: 'single',
mode: "single",
},
trigger: [
"haha I am a string"
] as any,
sequence: []
trigger: ["haha I am a string"] as any,
sequence: [],
},
{
condition: [],
tags: {},
metadata: {
} as any,
trigger: [
],
sequence: []
}
metadata: {} as any,
trigger: [],
sequence: [],
},
],
}
};
export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = args => {
const [autos, setAutos] = useState(args.automations)
return <Page>
<AutomationList {...args} automations={autos}
onAdd={a => {
window.setTimeout(() => {
args.onAdd(a);
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>
}
export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = (
args
) => {
const [autos, setAutos] = useState(args.automations);
return (
<Page>
<AutomationList
{...args}
automations={autos}
onAdd={(a) => {
window.setTimeout(() => {
args.onAdd(a);
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: bigMockAutoList,
}
};
@@ -25,15 +25,15 @@
padding-bottom: 0.5em;
border-width: 1px;
border-bottom-style: solid;
border-color: var(--primary-accent);
border-color: var(--mui-grey-400);
}
.automation-list-box--body--group.other {
border-color: var(--green);
border-color: var(--mui-success-main);
}
.automation-list-box--body--group.other>b {
color: var(--change);
color: var(--mui-success-light);
}
.automation-list-box--body--group>.automation-list-box--body--group {
@@ -51,72 +51,10 @@
.automation-list-box--body--group>b:hover,
.automation-list-box--body--group.selected>b {
background-color: var(--secondary-accent);
color: var(--secondary);
background-color: var(--mui-grey-700);
color: var(--mui-secondary-contrastText);
}
.automation-list-box--body--item:hover, .automation-list-box--body--item.selected {
background-color: var(--primary-accent);
color: var(--primary);
}
.automation-list-box--body--item:hover>.automation-list-box--body--item--tags>span {
border-color: var(--primary);
}
.automation-list-box--body--item {
padding-left: 1em;
cursor: pointer;
display: flex;
justify-content: left;
align-items: flex-start;
gap: 1em;
flex-wrap: wrap;
}
.automation-list-box--body--item::before {
content: "⊚ ";
}
.automation-list-box--body--item--title {
display: flex;
flex-direction: column;
padding-left: 0.25em;
flex: 1;
}
.automation-list-box--body--item--title>b {
font-size: 1em;
}
.automation-list-box--body--item--title>span, .automation-list-box--body--item--title>b>span {
font-size: 0.75em;
}
.automation-list-box--body--item>button {
padding: 0.25em !important;
margin: 0.5em !important;
}
.automation-list-box--body--item--tags {
flex: 1;
display: flex;
flex-wrap: wrap;
font-size: 0.75em;
justify-content: left;
align-items: flex-start;
overflow: auto;
max-height: 100%;
gap: 0.25em;
}
.automation-list-box--body--item--tags>span {
border-color: var(--primary-accent);
border-style: solid;
border-width: 1px;
border-radius: 0.5em;
padding: 0.1em 0.5em;
}
.automation-list-box--bottom {
margin-top: 0.5em;
@@ -129,6 +67,6 @@
.automation-list-box--bottom>button {
background-color: #070;
color: var(--primary-accent);
color: var(--mui-grey-400);
padding: 0.5em 2em;
}
@@ -4,47 +4,70 @@ import { AutomationListBox } from "./AutomationListBox";
import { createMockAuto } from "utils/mocks";
import { Page } from "components/Page";
import { CookiesProvider } from "react-cookie";
import { makeTagDB } from "./TagDB";
export default {
title: 'App/AutomationList/Box',
title: "App/AutomationList/Box",
component: AutomationListBox,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
}
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {},
} as ComponentMeta<typeof AutomationListBox>;
const Template: ComponentStory<typeof AutomationListBox> = (args) => {
const [selected, setSelected] = useState(args.selected);
return (
<Page>
<CookiesProvider>
<AutomationListBox
{...args}
tagsDB={makeTagDB(args.automations)}
automations={args.automations}
selected={selected}
onSelectAutomation={(i) => {
setSelected(i);
args.onSelectAutomation(i);
}}
/>
</CookiesProvider>
</Page>
);
};
const Template: ComponentStory<typeof AutomationListBox> = args => {
const [selected, setSelected] = useState(args.selected)
return <Page>
<CookiesProvider>
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
setSelected(i)
args.onSelectAutomation(i)
}} />
</CookiesProvider>
</Page>
}
export const EmptyStart = Template.bind({})
export const EmptyStart = Template.bind({});
EmptyStart.args = {
...EmptyStart.args,
automations: [],
}
};
export const FewAutos = Template.bind({})
export const FewAutos = Template.bind({});
FewAutos.args = {
...FewAutos.args,
automations: [
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
createMockAuto({ "Type": "Climate" }),
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
createMockAuto({ "Room": "Office", "Type": "Lights" }),
createMockAuto({ "Room": "Office" }),
createMockAuto({
Room: "Bathroom",
Type: "Lights",
NewDevice: "Yes",
Remote: "No",
Floor: "1",
}),
createMockAuto({ Room: "Bathroom", Type: "Climate" }),
createMockAuto({ Room: "Living Room", Type: "Climate" }),
createMockAuto({ Type: "Climate" }),
createMockAuto({ Type: "Lights", Routine: "Myself" }),
createMockAuto({ Routine: "DNS", Type: "SSL" }),
createMockAuto({ Room: "Bedroom", Type: "Lights", Routine: "Baby" }),
createMockAuto({ Room: "Office", Type: "Lights" }),
createMockAuto({ Room: "Office" }),
createMockAuto(),
],
}
};
export const OneAuto = Template.bind({});
OneAuto.args = {
...OneAuto.args,
automations: [
createMockAuto({
Type: "Climate",
}),
],
};
@@ -1,31 +1,22 @@
import { getTagList } from './AutomationListBox';
import { createMockAuto } from 'utils/mocks';
import { getTagList } from "./AutomationListBox";
import { createMockAuto } from "utils/mocks";
// const makeDummy = (id: string, tags: Record<string, string>) => ({
// condition: [],
// metadata: {
// id,
// alias: '',
// description: '',
// mode: 'single',
// },
// tags,
// sequence: [],
// trigger: [],
// })
test("getTagList", () => {
expect(
getTagList([
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
])
).toStrictEqual([]);
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"])
})
expect(
getTagList([
createMockAuto({ Room: "Kitchen", Area: "Oven" }),
createMockAuto({ Room: "Attic" }),
createMockAuto({ Room: "Office" }),
createMockAuto({ Area: "Balcony" }),
])
).toStrictEqual(["Room", "Area"]);
});
@@ -1,5 +1,5 @@
import "./AutomationListBox.css";
import { FC, useState } from 'react';
import { FC, useState } from "react";
import { AutomationData } from "types/automations";
import InputMultiSelect from "components/Inputs/InputMultiSelect";
import InputText from "components/Inputs/InputText";
@@ -7,122 +7,143 @@ import { Button } from "components/Inputs/Button";
import { makeGrouping } from "./automationGrouper";
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
import { useCookies } from "react-cookie";
import { TagDB } from "components/AutomationList/TagDB";
export type Props = {
automations: AutomationData[];
selected: number;
onSelectAutomation: (i: number) => void;
onRemove: (i: number) => void;
onAdd: () => void;
}
export type AutomationListBoxProps = {
automations: AutomationData[];
selected: number;
onSelectAutomation: (i: number) => void;
onRemove: (i: number) => void;
onAdd: () => void;
onUpdate: (a: AutomationData, i: number) => void;
tagsDB: TagDB;
};
const useAutomationListBoxState = () => {
const [cookies, setCookies, _] = 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);
return {
searchText,
setSearchText(v: string) {
setSearchText(v)
setCookies('albSearchText', v)
},
setSelectedTagIdx(n: number[]) {
setSelectedTagIdx(n)
setCookies('albSelected', JSON.stringify(n))
},
selectedTagIdx,
const [
cookies,
setCookies,
// eslint-disable-next-line
_,
] = useCookies(["albSearchText", "albSelected"]);
let initialSelected = [];
try {
initialSelected = JSON.parse(cookies.albSelected);
if (!Array.isArray(initialSelected)) {
initialSelected = [initialSelected];
}
}
initialSelected = initialSelected.map(Number);
// eslint-disable-next-line
} catch (_) {}
const [searchText, setSearchText] = useState(cookies.albSearchText ?? "");
const [selectedTagIdx, setSelectedTagIdx] =
useState<number[]>(initialSelected);
export const AutomationListBox: FC<Props> = ({
automations,
selected,
onSelectAutomation,
onAdd,
onRemove,
return {
searchText,
setSearchText(v: string) {
setSearchText(v);
setCookies("albSearchText", v);
},
setSelectedTagIdx(n: number[]) {
setSelectedTagIdx(n);
setCookies("albSelected", JSON.stringify(n));
},
selectedTagIdx,
};
};
export const AutomationListBox: FC<AutomationListBoxProps> = ({
automations,
selected,
onSelectAutomation,
onAdd,
onRemove,
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);
const {
searchText,
setSearchText,
selectedTagIdx,
setSelectedTagIdx,
} = useAutomationListBoxState();
const filteredAutomations = filterAutomations(automations, searchText.toLowerCase(), selectedTagIdx, tags);
const grouping = makeGrouping(
filteredAutomations.map(([a, _]) => a),
selectedTagIdx.map(i => tags[i]),
selected,
)
return <div className="automation-list-box">
<div className="automation-list-box--nav">
<InputText
label="Search"
value={searchText}
onChange={setSearchText}
/>
<InputMultiSelect
label="Tags"
selected={selectedTagIdx}
onChange={setSelectedTagIdx}
options={tags}
max={3}
/>
</div>
<div className="automation-list-box--body">
<AutomationListBoxGroup
events={{
onSelectAutomation,
onRemove
}}
autos={filteredAutomations}
grouping={grouping}
selectedAutomationIdx={selected}
/>
</div>
<div className="automation-list-box--bottom">
<Button onClick={onAdd}>Add</Button>
<span>Showing Automations: {filteredAutomations.length} out of {automations.length}</span>
</div>
return (
<div className="automation-list-box">
<div className="automation-list-box--nav">
<InputText label="Search" value={searchText} onChange={setSearchText} />
<InputMultiSelect
label="Tags"
selected={selectedTagIdx}
onChange={setSelectedTagIdx}
options={tags}
max={3}
/>
</div>
<div className="automation-list-box--body">
<AutomationListBoxGroup
events={{
onSelectAutomation,
onRemove,
}}
autos={filteredAutomations}
grouping={grouping}
selectedAutomationIdx={selected}
tagsDB={tagsDB}
onSave={onUpdate}
/>
</div>
<div className="automation-list-box--bottom">
<Button onClick={onAdd}>Add</Button>
<span>
Showing Automations: {filteredAutomations.length} out of{" "}
{automations.length}
</span>
</div>
</div>
}
);
};
export const getTagList = (autos: AutomationData[]): string[] => Object.keys(autos
.map(a => Object.keys(a.tags))
.reduce((all: any, keys) => {
export const getTagList = (autos: AutomationData[]): string[] =>
Object.keys(
autos
.map((a) => Object.keys(a.tags))
.reduce((all: any, keys) => {
for (const k of keys) {
all[k] = 1
all[k] = 1;
}
return all;
}, {}))
}, {})
);
const filterAutomations = (autos: AutomationData[], searchText: string, selected: number[], tags: string[]): Array<[AutomationData, number]> => autos.map<[AutomationData, number]>((a, i) => [a, i]).filter(([a, i]) => {
if (!a.metadata) {
return true
}
if (searchText.length > 0) {
const filterAutomations = (
autos: AutomationData[],
searchText: string
): Array<[AutomationData, number]> =>
autos
.map<[AutomationData, number]>((a, i) => [a, i])
.filter(([a, i]) => {
if (!a.metadata) {
return true;
}
if (searchText.length > 0) {
if (
!(
(a.metadata.description ?? "").toLocaleLowerCase().includes(searchText) ||
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
)
!(
(a.metadata.description ?? "")
.toLocaleLowerCase()
.includes(searchText) ||
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
)
) {
return false
return false;
}
}
return true
})
}
return true;
});
@@ -0,0 +1,50 @@
.automation-list-box--body--item:hover, .automation-list-box--body--item.selected {
outline-color: var(--mui-grey-400);
outline-style: solid;
outline-width: 1px;
background-color: var(--mui-secondary-contrastText);
}
.automation-list-box--body--item:hover>.automation-list-box--body--item--tags>span {
border-color: var(--mui-common-black);
}
.automation-list-box--body--item--tags--add:hover {
border-color: var(--mui-common-black);
color: var(--mui-grey-400);
background-color: var(--mui-secondary-contrastText);
}
.automation-list-box--body--item {
padding-left: 1em;
cursor: pointer;
display: flex;
gap: 1em;
}
.automation-list-box--body--item::before {
content: "⊚ ";
}
.automation-list-box--body--item--buttons {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
height: 100%;
gap: 0.25em;
margin: 0.5em
}
.automation-list-box--body--item--buttons>button {
padding: 0.25em;
margin: 0;
}
.automation-list-box--body--item--buttons .save {
color: var(--mui-success-light)
}
.automation-list-box--body--item--buttons .save:hover {
color: var(--mui-success-main)
}
@@ -1,141 +1,240 @@
import "./AutomationListBoxGroup.css";
import { TrashIcon } from "components/Icons";
import { Button } from "components/Inputs/Button";
import { MetadataBox } from "./AutomationMetadataBox";
import { AutomationData } from "types/automations";
import { AutomationGrouping } from "./automationGrouper";
import { FC, useState } from "react";
import { FC, useEffect, useState } from "react";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import { TagDB } from "./TagDB";
import Save from "@mui/icons-material/Save";
export type AutomationListBoxEvents = {
onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void,
}
onSelectAutomation: (i: number) => void;
onRemove: (i: number) => void;
};
export type AutomationListBoxGroups = {
grouping: AutomationGrouping,
currentNode: number,
}
grouping: AutomationGrouping;
currentNode: number;
};
export type AutomationListBoxProps = {
events: AutomationListBoxEvents,
groups: AutomationListBoxGroups,
autos: Array<[AutomationData, number]>,
selectedAutomationIdx: number,
events: AutomationListBoxEvents;
groups: AutomationListBoxGroups;
autos: Array<[AutomationData, number]>;
selectedAutomationIdx: number;
};
export type AutomationListBoxGroupProps = {
events: AutomationListBoxEvents,
grouping: AutomationGrouping,
autos: Array<[AutomationData, number]>,
selectedAutomationIdx: number,
}
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,
events,
grouping,
autos,
selectedAutomationIdx,
tagsDB,
onSave,
}) => {
if (grouping.top.length === 1) {
return <>
{convertGroupsToItems(autos, {
grouping, currentNode: grouping.top[0],
}, events, selectedAutomationIdx)}
</>
} else {
return <>
{grouping.top.map(groupIdx => <AutomationListBoxGroupItem
key={groupIdx}
autos={autos}
groups={{
grouping,
currentNode: groupIdx
}}
events={events}
selectedAutomationIdx={selectedAutomationIdx}
/>)}
</>
}
}
export const convertGroupsToItems = (
autos: Array<[AutomationData, number]>,
{ grouping, currentNode }: AutomationListBoxGroups,
events: AutomationListBoxEvents,
selectedAutomationIdx: number,
) => {
const automations = grouping.getAutomations(currentNode);
if (automations.length > 0) {
return automations.map(autoIndex =>
<AutomationListBoxItem
key={`${autoIndex}-${autos[autoIndex][1]}`}
events={events}
auto={autos[autoIndex]}
isSelected={selectedAutomationIdx === autos[autoIndex][1]}
/>
)
}
const subgroups = grouping.getSubGroups(currentNode);
if (subgroups.length > 0) {
return subgroups.map(groupIdx => <AutomationListBoxGroupItem
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
grouping,
currentNode: groupIdx,
}}
events={events}
selectedAutomationIdx={selectedAutomationIdx}
/>)
}
return <></>
}
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,
}> = ({
autos, groups, events, selectedAutomationIdx,
}) => {
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)}
</div>
}
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,
auto: [AutomationData, number];
isSelected: boolean;
events: AutomationListBoxEvents;
tagsDB: TagDB;
onSave: (a: AutomationData) => void;
}> = ({
events: {
onRemove,
onSelectAutomation,
},
auto: [
auto, autoIndex
],
isSelected,
events: { onRemove, onSelectAutomation },
auto: [auto, autoIndex],
isSelected,
tagsDB,
onSave,
}) => {
let title = "BadAuto<<Missing Metadata>>"
if (auto.metadata) {
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`
}
return <div
key={autoIndex}
className={["automation-list-box--body--item", isSelected ? 'selected' : ''].join(' ')}
title={title}
onClick={() => onSelectAutomation(autoIndex)}
>
<MetadataBox metadata={auto.metadata} tags={auto.tags} />
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
</div>
}
// 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);
}
@@ -1,27 +1,151 @@
import { FC } from "react"
import { AutomationMetadata } from "types/automations"
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,
tags: Record<string, string>,
}> = (auto) => {
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
if (auto.metadata) {
title = <>
<b>{String(auto.metadata.alias ?? "").slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
<span>{String(auto.metadata.description ?? "").slice(0, 25)}</span>
</>
}
return <div
className="automation-list-box--body--item--title"
>
{title}
<div
className="automation-list-box--body--item--tags"
>
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
<b>{tagName}:</b> {auto.tags[tagName]}
</span>)}
</div>
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,34 +2,31 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { ConnectedAutomationList } from ".";
import { createMockAuto } from "utils/mocks";
import { useMockApiService } from "apiService";
import { DEFAULT_DIMS } from 'components/DAGFlow/constants';
import { Page } from "components/Page";
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
export default {
title: 'App/AutomationList/Connected',
title: "App/AutomationList/Connected",
component: ConnectedAutomationList,
parameters: { actions: { argTypesRegex: '^on.*' } },
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
dims: DEFAULT_DIMS,
initialAutomations: [],
}
},
} as ComponentMeta<typeof ConnectedAutomationList>;
const Template: ComponentStory<any> = args => {
const Template: ComponentStory<any> = (args) => {
const api = useMockApiService(args.initialAutomations);
return <Page>
<ConnectedAutomationList
{...args}
api={api}
/>
</Page>
}
return (
<Page>
<ConnectedAutomationList {...args} api={api} />
</Page>
);
};
export const EmptyStart = Template.bind({})
export const EmptyStart = Template.bind({});
export const FewAutos = Template.bind({})
export const FewAutos = Template.bind({});
FewAutos.args = {
...FewAutos.args,
initialAutomations: [
@@ -44,21 +41,23 @@ FewAutos.args = {
createMockAuto(),
createMockAuto(),
],
}
};
export const Loading: ComponentStory<any> = args => {
export const Loading: ComponentStory<any> = (args) => {
const api = useMockApiService(args.initialAutomations);
return <Page>
<ConnectedAutomationList
{...args}
api={{
...api,
state: {
"automations": {
"ready": false
}
}
}}
/>
</Page>
}
return (
<Page>
<ConnectedAutomationList
{...args}
api={{
...api,
state: {
automations: {
ready: false,
},
},
}}
/>
</Page>
);
};
+22 -20
View File
@@ -2,23 +2,25 @@ 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() : [];
}
}
}
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()
: [];
},
};
};
@@ -50,6 +50,7 @@
.automation-list--list.hide>.automation-list--list-hide {
transform: rotate(180deg);
left: 0;
}
/* list children: normal */
@@ -58,8 +59,10 @@
border-width: 1px;
}
.automation-list--list-hide {
.automation-list--list .automation-list--list-hide {
position: absolute;
bottom: 0.5em;
right: 0.5em;
bottom: 0em;
left: 0.5em;
max-width: 1.5em;
max-height: 1.5em;
}
@@ -14,7 +14,7 @@
.automation-list--root.mobile .automation-list--list-hide {
transform: rotate(90deg);
left: 1.25em;
left: 0.25em;
}
.automation-list--root.mobile .automation-editor--info-box {
@@ -33,9 +33,9 @@
}
.automation-list--root.mobile .automation-editor--info-box--icon {
left: 1.25em;
left: 0.5em;
bottom: 0em;
background-color: var(--primary);
background-color: var(--mui-common-black);
transform: rotate(90deg);
}
@@ -50,8 +50,8 @@
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
transform: rotate(270deg);
position: fixed;
top: 0.75em;
z-index: 20;
top: 0;
z-index: 5;
}
/* info box hide */
@@ -64,9 +64,9 @@
.automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon {
transform: rotate(270deg);
position: fixed;
top: 0.75em;
background-color: var(--green-opaque);
z-index: 30;
top: 0em;
left: 0.25em;
z-index: 10;
}
+121 -74
View File
@@ -1,37 +1,42 @@
import "./index.css";
import "./index.mobile.css";
import { AutomationEditor } from "components/AutomationEditor";
import { FC, ReactNode, useState } from "react";
import { FC, ReactNode, useState, useRef, useEffect } from "react";
import { AutomationData } from "types/automations";
import { defaultAutomation } from 'utils/defaults';
import { ArrowIcon } from "components/Icons";
import { defaultAutomation } from "utils/defaults";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import { ApiService } from "apiService/core";
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 { 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";
interface AutomationListParams {
automations: AutomationData[];
onUpdate: (i: number, auto: AutomationData) => void;
onAdd: (auto: AutomationData) => void;
onRemove: (i: number) => void;
dims: DAGAutomationFlowDims;
dims: DAGDims;
children?: ReactNode;
}
export const useAutomationListState = () => {
const [cookies, setCookies, _] = useCookies(['alCurrent']);
const [
cookies,
setCookies,
// eslint-disable-next-line
_,
] = useCookies(["alCurrent"]);
let initialCurrent = 0;
try {
initialCurrent = Number(cookies.alCurrent ?? '0');
// eslint-disable-next-line
} catch (_) { }
initialCurrent = Number(cookies.alCurrent ?? "0");
} catch (_) {}
const [hideList, setHideList] = useState(false);
const [current, setCurrent] = useState(initialCurrent);
@@ -41,11 +46,11 @@ export const useAutomationListState = () => {
setHideList,
current,
setCurrent(i: number) {
setCurrent(i)
setCookies('alCurrent', String(i))
}
}
}
setCurrent(i);
setCookies("alCurrent", String(i));
},
};
};
export const AutomationList: FC<AutomationListParams> = ({
automations,
@@ -56,80 +61,122 @@ export const AutomationList: FC<AutomationListParams> = ({
children,
}) => {
// state
const { hideList, setHideList, current, setCurrent } = useAutomationListState();
const snackbr = useSnackbar();
const { hideList, setHideList, current, setCurrent } =
useAutomationListState();
const { isMobile } = useWindowSize();
const firstRender = useRef(true);
// alias
const currentAuto = automations.length > 0 ? automations[current] : null;
const tagDB = makeTagDB(automations);
// effect
useEffect(() => {
if (firstRender.current) {
snackbr.enqueueSnackbar("Saved.", { variant: "info" });
}
firstRender.current = true;
// eslint-disable-next-line
}, [automations]);
// render
return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}>
<div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}>
<AutomationListBox
automations={automations}
onAdd={() => {
onAdd(defaultAutomation(String(Date.now())));
setCurrent(automations.length)
}}
onSelectAutomation={i => {
setCurrent(i);
if (isMobile) {
setHideList(true)
}
}}
selected={current}
onRemove={onRemove}
/>
<ButtonIcon
onClick={() => setHideList(!hideList)}
className="automation-list--list-hide"
Icon={ArrowIcon}
/>
return (
<div
className={["automation-list--root", isMobile ? "mobile" : ""].join(" ")}
>
<div
className={["automation-list--list", hideList ? "hide" : "show"].join(
" "
)}
>
<AutomationListBox
automations={automations}
onUpdate={(a, i) => onUpdate(i, a)}
onAdd={() => {
onAdd(defaultAutomation(String(Date.now())));
setCurrent(automations.length);
if (isMobile) {
setHideList(true);
}
}}
onSelectAutomation={(i) => {
setCurrent(i);
if (isMobile) {
setHideList(true);
}
}}
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 className="automation-list--viewer">
{currentAuto ? <AutomationEditor
automation={currentAuto}
onUpdate={a => onUpdate(current, a)}
dims={{
...dims,
flipped: isMobile
}}
tagDB={tagDB}
/> : <></>}
</div>
{children}
</div>
}
);
};
interface ConnectedAutomationListParams {
dims: DAGAutomationFlowDims;
dims: DAGDims;
api: ApiService;
}
export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
api: {
state: {
automations,
},
removeAutomation,
updateAutomation,
state: { automations },
...methods
},
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) {
return <div className="automation-list--root loading">
<LinearProgress />
<div className="automation-list--circle-loader">
<CircularProgress />
return (
<div className="automation-list--root loading">
<LinearProgress />
<div className="automation-list--circle-loader">
<CircularProgress />
</div>
</div>
</div>
);
}
if (!automations.ok) {
return <span>Error {automations.error}</span>
return <span>Error {automations.error}</span>;
}
return <AutomationList
dims={dims}
automations={automations.data.data}
onAdd={auto => updateAutomation({ auto, index: automations.data.totalItems + 1 })}
onRemove={index => removeAutomation({ index })}
onUpdate={(index, auto) => updateAutomation({ index, auto })}
/>
}
return (
<AutomationList
dims={dims}
automations={automations.data.data}
onAdd={(auto) =>
updateAutomation({ auto, index: automations.data.totalItems + 1 })
}
onRemove={(index) => removeAutomation({ index })}
onUpdate={(index, auto) => updateAutomation({ index, auto })}
/>
);
};
@@ -1,52 +0,0 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react";
import { ConditionEditor } from ".";
import { AutomationCondition } from 'types/automations/conditions';
import { Page } from "components/Page";
export default {
title: 'ConditionEditor',
component: ConditionEditor,
parameters: { actions: { argTypesRegex: '^on.*' } },
} as ComponentMeta<typeof ConditionEditor>;
export const Basic: ComponentStory<typeof ConditionEditor> = args => {
const [state, setState] = useState<AutomationCondition>({
"condition": "or",
"conditions": [
{
"condition": "and",
"conditions": [
{
"condition": "numeric_state",
"entity_id": [
"sensor.kitchen_humidity"
],
"above": "40"
},
{
"condition": "template",
"value_template": "states('switch.kitchen') == 'on'"
}
]
},
{
"condition": "numeric_state",
"entity_id": [
"sensor.kitchen_temperature"
],
"above": "51"
}
]
})
return (
<Page>
<ConditionEditor
onUpdate={setState}
onDelete={() => { }}
condition={state}
/>
</Page>
)
}
@@ -1,135 +0,0 @@
import { Classes } from "jss";
import { FC, useState, useEffect } from 'react';
import { getConditionDefaultValues } from "utils/defaults";
import { AutomationCondition } from "types/automations/conditions";
import { CheckMarkIcon, PencilIcon } from "components/Icons";
import { InputList } from "components/Inputs/InputList";
import InputYaml from "components/Inputs/InputYaml";
import { getEditor } from "./editorRender";
import { useStyles } from "./style";
import { getViewer } from "./viewRender";
import useWindowSize from "utils/useWindowSize";
import { useHA } from "haService";
export const ConditionNode: FC<{
condition: AutomationCondition;
displayMode: boolean;
showDelete?: boolean;
onDelete?: (which: 'root' | number) => void;
onUpdate?: (data: AutomationCondition) => void;
children?: (props: {
classes: Classes<string>
}) => JSX.Element,
}> = ({
condition,
showDelete = false,
displayMode = true,
onDelete = () => { },
onUpdate = () => { },
children = () => { },
}) => {
// state
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
const [yamlMode, setYamlMode] = useState(false);
const { isMobile } = useWindowSize();
const { namer } = useHA();
// 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} namer={namer} />
} else {
const Editor = getEditor(condition);
childrenConditions = <Editor condition={condition} onChange={onUpdate} />
}
// styles
let hasChildren = false;
if (condition.condition === "not") {
hasChildren = true
} else if (condition.condition === 'and') {
hasChildren = true
} else if (condition.condition === 'or') {
hasChildren = true
}
const { classes } = useStyles({ hasChildren, isMobile });
// components
const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) =>
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
return <div className={classes.root}>
<>
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
<div className={classes.title}>
<InputList
label=""
className={classes.titleText}
current={condition.condition}
options={[
'or', 'not', 'and',
'template',
'numeric_state',
'state',
'time',
'trigger',
'zone',
]}
onChange={(n: any) => onUpdate({
...getConditionDefaultValues(n),
...condition,
condition: n,
} as any)}
/>
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
{yamlMode ? 'visual' : 'yaml'}
</button>}
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
</button>}
</div>
<div className={classes.children}>
{yamlMode && <InputYaml
label=""
value={condition}
onChange={update => onUpdate(update as any)}
/>}
<div className={classes.conditionWrap}>
{!yamlMode && childrenConditions}
</div>
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
</div>}
</div>
{children({ classes })}
</>
</div>
}
@@ -0,0 +1,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;
}
@@ -0,0 +1,65 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react";
import { AutomationCondition } from "types/automations/conditions";
import { ConditionNodeBase } from "./ConditionNodeBase";
export default {
title: "ConditionEditor/NodeBase",
component: ConditionNodeBase,
parameters: { actions: { argTypesRegex: "^on.*" } },
} as ComponentMeta<typeof ConditionNodeBase>;
const Template: ComponentStory<typeof ConditionNodeBase> = ({
condition,
...args
}) => {
const [data, setData] = useState(condition);
return (
<Page>
<ConditionNodeBase
{...args}
condition={data}
onUpdate={(data) => {
setData(data);
}}
/>
</Page>
);
};
export const TemplateViewer = Template.bind({});
TemplateViewer.args = {
condition: {
condition: "template",
value_template: "states('switch.light_kitchen') == 'on'",
} as AutomationCondition,
};
export const MultipleThings = Template.bind({});
MultipleThings.args = {
condition: {
condition: "or",
conditions: [
{
condition: "and",
conditions: [
{
condition: "numeric_state",
entity_id: ["sensor.kitchen_humidity"],
above: "40",
},
{
condition: "template",
value_template: "states('switch.kitchen') == 'on'",
},
],
},
{
condition: "numeric_state",
entity_id: ["sensor.kitchen_temperature"],
above: "51",
},
],
} as AutomationCondition,
};
@@ -0,0 +1,125 @@
import "./ConditionNodeBase.css";
import "./ConditionNodeBase.mobile.css";
import { InputList } from "components/Inputs/InputList";
import { FC, useState } from "react";
import { AutomationCondition } from "types/automations/conditions";
import { getSubTypeList } from "utils/automations";
import { getConditionDefaultValues } from "utils/defaults";
import { useHA } from "haService";
import InputYaml from "components/Inputs/InputYaml";
import { getViewer } from "./viewRender";
import { getEditor } from "./editorRender";
import useWindowSize from "utils/useWindowSize";
import { ConditionNodeSettings } from "./ConditionNodeSettings";
export type ConditionNodeBaseProps = {
condition: AutomationCondition;
onDelete?: () => void;
onUpdate: (data: AutomationCondition) => void;
disableDelete?: boolean;
initialViewMode?: ConditionNodeBaseViewMode;
};
export type ConditionNodeBaseViewMode = "edit" | "yaml" | "view";
export const ConditionNodeBase: FC<ConditionNodeBaseProps> = (props) => {
// state
const ha = useHA();
const { isMobile } = useWindowSize();
const [{ isEdited, condition }, setCondition] = useState<{
isEdited: boolean;
condition: AutomationCondition;
}>({
isEdited: false,
condition: props.condition,
});
const [mode, setMode] = useState<ConditionNodeBaseViewMode>(
props.initialViewMode ?? "view"
);
// alias
const updateCondition = (data: any) =>
setCondition({
isEdited: true,
condition: data,
});
// children
let childrenConditions: JSX.Element;
if (mode === "view") {
const Viewer = getViewer(condition);
childrenConditions = (
<Viewer
condition={condition}
onChange={updateCondition}
namer={ha.namer}
/>
);
} else {
const Editor = getEditor(condition);
childrenConditions = (
<Editor condition={condition} onChange={updateCondition} ha={ha} />
);
}
// icons
const icons = (
<ConditionNodeSettings
onDelete={props.onDelete}
onModeSwitch={setMode}
onSave={() => {
props.onUpdate(condition);
setCondition({
isEdited: false,
condition,
});
}}
mode={mode}
isEdited={isEdited}
disableDelete={props.disableDelete ?? false}
/>
);
// render
return (
<div
className={[
"condition-node-base",
isMobile ? "mobile" : "",
isEdited ? "is-edited" : "",
].join(" ")}
>
<div className="condition-node-base--list">
<InputList
label=""
className="condition-node-base--list--select"
current={condition.condition}
options={getSubTypeList("condition")}
onChange={(n: any) =>
setCondition({
isEdited: true,
condition: {
...getConditionDefaultValues(n),
condition: n,
},
} as any)
}
/>
{isMobile && icons}
</div>
<div className={["condition-node-base--body", mode].join(" ")}>
{mode === "yaml" ? (
<InputYaml
key="yaml"
label=""
value={condition}
onChange={updateCondition}
/>
) : (
<div
className={["condition-node-base--body--children", mode].join(" ")}
>
{childrenConditions}
</div>
)}
{!isMobile && icons}
</div>
</div>
);
};
@@ -0,0 +1,43 @@
.condition-node--settings {
width: 4em;
display: flex;
gap: 0.5em;
flex-direction: column;
justify-content: center;
align-items: center;
}
.condition-node--settings--icons {
display: inline-block;
max-width: 5em;
max-height: 5em;
}
.condition-node--settings--wrap {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
min-width: 5em;
min-height: 5em;
}
.condition-node--settings button.Mui-disabled {
cursor: not-allowed;
}
.condition-node--settings .speed-dial, .condition-node--settings .speed-dial--icon {
min-height: 2.5em;
height: 2.5em;
}
.condition-node--settings .speed-dial--button {
max-width: 4em;
max-height: 4em;
height: 4em;
width: 4em;
}
.condition-node--settings .speed-dial--button:hover button {
background-color: var(--mui-grey-700);
}
@@ -0,0 +1,82 @@
import "./ConditionNodeSettings.css";
import { ButtonIcon, ButtonIconProps } from "components/Icons/ButtonIcons";
import CodeOutlinedIcon from "@mui/icons-material/CodeOutlined";
import CodeOffOutlinedIcon from "@mui/icons-material/CodeOffOutlined";
import EditOutlinedIcon from "@mui/icons-material/EditOutlined";
import SaveIcon from "@mui/icons-material/Save";
import EditOffIcon from "@mui/icons-material/EditOff";
import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
import SettingsApplicationsIcon from "@mui/icons-material/SettingsApplications";
import { FC } from "react";
import { SpeedDial } from "components/SpeedDial";
export type ConditionNodeSettingsProps = {
mode: ConditionNodeViewMode;
onModeSwitch: (m: ConditionNodeViewMode) => void;
isEdited: boolean;
disableDelete: boolean;
onDelete?: () => void;
onSave: () => void;
};
export type ConditionNodeViewMode = "edit" | "yaml" | "view";
export const ConditionNodeSettings: FC<ConditionNodeSettingsProps> = (
props
) => {
// alias
const showDelete = !props.disableDelete && !!props.onDelete;
const createModeSwitch = (m: ConditionNodeViewMode) => () => {
if (props.mode === m) {
props.onModeSwitch("view");
} else {
props.onModeSwitch(m);
}
};
const buttons: Array<ButtonIconProps> = [
{
color: "success",
onClick: createModeSwitch("edit"),
icon: props.mode === "edit" ? <EditOffIcon /> : <EditOutlinedIcon />,
},
{
icon:
props.mode === "yaml" ? <CodeOffOutlinedIcon /> : <CodeOutlinedIcon />,
onClick: createModeSwitch("yaml"),
color: "info",
},
];
if (showDelete) {
buttons.push({
color: "error",
icon: <DeleteForeverIcon />,
onClick: props.onDelete,
});
}
// render
return (
<div
className={[
"condition-node--settings",
props.isEdited ? "edited" : "",
].join(" ")}
>
<SpeedDial
icon={<ButtonIcon icon={<SettingsApplicationsIcon />} />}
direction="left"
>
{buttons.map((opt, i) => (
<ButtonIcon key={i} {...opt} />
))}
</SpeedDial>
{props.isEdited && (
<ButtonIcon
key={"save"}
icon={<SaveIcon />}
color="success"
disabled={!props.isEdited}
onClick={props.onSave}
/>
)}
</div>
);
};
@@ -1,216 +1,344 @@
import { FC } from "react";
import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions';
import {
AutomationCondition,
DeviceCondition,
LogicCondition,
NumericCondition,
StateCondition,
TemplateCondition,
TimeCondition,
TriggerCondition,
ZoneCondition,
} from "types/automations/conditions";
import InputNumber from "components/Inputs/InputNumber";
import InputText from "components/Inputs/InputText";
import { InputEntity } from "components/Inputs/InputEntities";
import { ConditionNode } from "./ConditionNode";
import { ConditionNodeBase } from "./ConditionNodeBase";
import { genUpdateMethods } from "./nestedUpdater";
import { InputTime } from "components/Inputs/InputTime";
import InputYaml from "components/Inputs/InputYaml";
import { HAService } from "haService";
import { DeviceEditor } from "components/DeviceEditor";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import AddIcon from "@mui/icons-material/Add";
interface Editor<C extends AutomationCondition> extends FC<{
condition: C,
onChange: (condition: C) => void;
}> { }
interface Editor<C extends AutomationCondition>
extends FC<{
condition: C;
onChange: (condition: C) => void;
ha: HAService;
}> {}
export const getEditor = (condition: AutomationCondition): Editor<any> => {
switch (condition.condition) {
case 'template':
case "template":
return TemplateEditor;
case 'and':
case "and":
return LogicViewer;
case 'or':
case "or":
return LogicViewer;
case 'not':
case "not":
return LogicViewer;
case 'numeric_state':
case "device":
return DeviceConditionEditor;
case "numeric_state":
return NumericStateEditor;
case 'state':
case "state":
return StateEditor;
case 'time':
case "time":
return TimeEditor;
case 'trigger':
case "trigger":
return TriggerEditor;
case 'zone':
case "zone":
return ZoneEditor;
default:
return () => <div>Not Ready</div>
return () => <div>Not Ready</div>;
}
}
};
export const TemplateEditor: Editor<TemplateCondition> = ({
onChange,
condition,
}) => {
return <>
<InputYaml label="Template" value={condition.value_template} onChange={value_template => onChange({
...condition,
value_template
})} />
</>
}
return (
<>
<InputYaml
label="Template"
value={condition.value_template}
onChange={(value_template) =>
onChange({
...condition,
value_template,
})
}
/>
</>
);
};
export const DeviceConditionEditor: Editor<DeviceCondition> = ({
onChange,
condition,
ha: {
deviceExtras: { useDeviceConditionCapalities, useDeviceConditions },
},
}) => {
return (
<DeviceEditor
type="condition"
state={condition}
setState={(data) =>
onChange({
condition: "device",
...data,
} as any)
}
options={useDeviceConditions(
condition.device_id
? {
deviceId: condition.device_id,
}
: undefined
)}
caps={useDeviceConditionCapalities(condition as any)}
/>
);
};
export const NumericStateEditor: Editor<NumericCondition> = ({
onChange,
condition,
}) => {
return <>
<InputEntity
value={condition.entity_id}
multiple
onChange={entity_id => onChange({
...condition,
entity_id
})}
/>
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
...condition,
attribute
})} />
<InputNumber
label="Above"
value={condition.above ? Number(condition.above) : undefined}
onChange={above => onChange({
...condition,
above: above ? String(above) : undefined,
})}
/>
<InputNumber
label="Below"
value={condition.below ? Number(condition.below) : undefined}
onChange={below => onChange({
...condition,
below: below ? String(below) : undefined,
})}
/>
<InputYaml label="Template" value={condition.value_template ?? ""} onChange={value_template => onChange({
...condition,
value_template
})} />
</>
}
return (
<>
<InputEntity
value={condition.entity_id}
multiple
onChange={(entity_id) =>
onChange({
...condition,
entity_id,
})
}
/>
<InputText
label="Attribute"
value={condition.attribute ?? ""}
onChange={(attribute) =>
onChange({
...condition,
attribute,
})
}
/>
<InputNumber
label="Above"
value={condition.above ? Number(condition.above) : undefined}
onChange={(above) =>
onChange({
...condition,
above: above ? String(above) : undefined,
})
}
/>
<InputNumber
label="Below"
value={condition.below ? Number(condition.below) : undefined}
onChange={(below) =>
onChange({
...condition,
below: below ? String(below) : undefined,
})
}
/>
<InputYaml
label="Template"
value={condition.value_template ?? ""}
onChange={(value_template) =>
onChange({
...condition,
value_template,
})
}
/>
</>
);
};
export const LogicViewer: Editor<LogicCondition> = ({
condition,
onChange,
}) => {
return <>
{condition.conditions.map((c, i) => {
return <ConditionNode
key={i}
condition={c}
displayMode={false}
{...genUpdateMethods(condition, onChange)(i)}
showDelete
/>
})}
</>
}
return (
<>
{condition.conditions.map((c, i) => {
return (
<ConditionNodeBase
key={i}
condition={c}
{...genUpdateMethods(condition, onChange)(i)}
disableDelete={false}
/>
);
})}
<div className="condition-node--logic-viewer--add">
<ButtonIcon
icon={<AddIcon />}
onClick={() =>
onChange({
condition: condition.condition,
conditions: [
...(condition.conditions ?? []),
{
condition: "device",
device_id: "",
domain: "",
type: "",
},
],
})
}
/>
</div>
</>
);
};
export const StateEditor: Editor<StateCondition> = ({
onChange,
condition,
}) => {
return <>
<InputEntity
value={condition.entity_id}
multiple
onChange={entity_id => onChange({
...condition,
entity_id
})}
/>
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
...condition,
attribute
})} />
<InputText
label="State"
value={String(condition.state)}
onChange={state => onChange({
...condition,
state,
})}
/>
<InputTime
label="For"
value={condition.for}
onChange={_for => onChange({
...condition,
for: _for,
})}
/>
</>
}
return (
<>
<InputEntity
value={condition.entity_id}
multiple
onChange={(entity_id) =>
onChange({
...condition,
entity_id,
})
}
/>
<InputText
label="Attribute"
value={condition.attribute ?? ""}
onChange={(attribute) =>
onChange({
...condition,
attribute,
})
}
/>
<InputText
label="State"
value={String(condition.state)}
onChange={(state) =>
onChange({
...condition,
state,
})
}
/>
<InputTime
label="For"
value={condition.for}
onChange={(_for) =>
onChange({
...condition,
for: _for,
})
}
/>
</>
);
};
export const TimeEditor: Editor<TimeCondition> = ({
onChange,
condition,
}) => {
return <>
<InputTime
label="After"
value={condition.after}
onChange={after => onChange({
...condition,
after,
})}
/>
<InputTime
label="Before"
value={condition.before}
onChange={before => onChange({
...condition,
before,
})}
/>
<b>Weekday not support for no, use yaml for now</b> {condition.weekday}
</>
}
export const TimeEditor: Editor<TimeCondition> = ({ onChange, condition }) => {
return (
<>
<InputTime
label="After"
value={condition.after}
onChange={(after) =>
onChange({
...condition,
after,
})
}
/>
<InputTime
label="Before"
value={condition.before}
onChange={(before) =>
onChange({
...condition,
before,
})
}
/>
<b>Weekday not support for no, use yaml for now</b> {condition.weekday}
</>
);
};
export const TriggerEditor: Editor<TriggerCondition> = ({
onChange,
condition,
}) => {
return <>
<InputText label="Trigger ID" value={condition.id} onChange={id => onChange({
...condition,
id
})} />
</>
}
return (
<>
<InputText
label="Trigger ID"
value={condition.id}
onChange={(id) =>
onChange({
...condition,
id,
})
}
/>
</>
);
};
export const ZoneEditor: Editor<ZoneCondition> = ({
onChange,
condition,
}) => {
return <>
<InputText label="Zone" value={condition.zone} onChange={zone => onChange({
...condition,
zone
})} />
<InputEntity
value={condition.entity_id}
multiple
onChange={entity_id => onChange({
...condition,
entity_id
})}
/>
<InputText
label="State"
value={String(condition.state)}
onChange={state => onChange({
...condition,
state,
})}
/>
</>
}
export const ZoneEditor: Editor<ZoneCondition> = ({ onChange, condition }) => {
return (
<>
<InputEntity
label="Zone"
value={condition.zone}
multiple={false}
onChange={(zone) =>
onChange({
...condition,
zone: zone ?? "",
})
}
restrictToDomain={["zone"]}
/>
<InputEntity
label="Entity with Location"
value={condition.entity_id}
multiple
onChange={(entity_id) =>
onChange({
...condition,
entity_id,
})
}
restrictToDomain={["person", "device_tracker"]}
/>
<InputText
label="State"
value={String(condition.state)}
onChange={(state) =>
onChange({
...condition,
state,
})
}
/>
</>
);
};
@@ -6,73 +6,114 @@ import { AutomationCondition } from "types/automations/conditions";
import { ConditionEditor } from ".";
export default {
title: 'ConditionEditor',
title: "ConditionEditor",
component: ConditionEditor,
parameters: { actions: { argTypesRegex: '^on.*' } },
parameters: { actions: { argTypesRegex: "^on.*" } },
} as ComponentMeta<typeof ConditionEditor>;
const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }) => {
const Template: ComponentStory<typeof ConditionEditor> = ({
condition,
...args
}) => {
const [data, setData] = useState(condition);
return <Page>
<ConditionEditor {...args}
condition={data}
onUpdate={data => {
setData(data)
}}
/>
</Page>
}
return (
<Page>
<ConditionEditor
{...args}
condition={data}
onUpdate={(data) => {
setData(data);
}}
/>
</Page>
);
};
export const TemplateViewer = Template.bind({})
export const TemplateViewer = Template.bind({});
TemplateViewer.args = {
condition: {
condition: 'template',
value_template: "states('switch.light_kitchen') == 'on'"
condition: "template",
value_template: "states('switch.light_kitchen') == 'on'",
} as AutomationCondition,
}
};
export const NumericStateViewer = Template.bind({})
export const NumericStateViewer = Template.bind({});
NumericStateViewer.args = {
condition: {
condition: "numeric_state",
entity_id: "sensor.humidity_kitchen",
above: "10",
} as AutomationCondition,
}
};
export const LogicCondition = Template.bind({})
export const LogicCondition = Template.bind({});
LogicCondition.args = {
condition: {
condition: 'or',
condition: "or",
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.humidity_kitchen',
above: '60'
condition: "numeric_state",
entity_id: "sensor.humidity_kitchen",
above: "60",
},
{
condition: 'numeric_state',
entity_id: 'sensor.humidity_living_room',
above: '60'
condition: "numeric_state",
entity_id: "sensor.humidity_living_room",
above: "60",
},
{
condition: 'and',
condition: "and",
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.humidity_bedroom',
above: '60'
condition: "numeric_state",
entity_id: "sensor.humidity_bedroom",
above: "60",
},
{
condition: 'numeric_state',
entity_id: 'sensor.humidity_bathroom',
above: '60'
}
]
condition: "numeric_state",
entity_id: "sensor.humidity_bathroom",
above: "60",
},
],
},
]
],
} as AutomationCondition,
}
};
export const MultipleConditions: ComponentStory<typeof ConditionEditor> = (
args
) => {
const [state, setState] = useState<AutomationCondition>({
condition: "or",
conditions: [
{
condition: "and",
conditions: [
{
condition: "numeric_state",
entity_id: ["sensor.kitchen_humidity"],
above: "40",
},
{
condition: "template",
value_template: "states('switch.kitchen') == 'on'",
},
],
},
{
condition: "numeric_state",
entity_id: ["sensor.kitchen_temperature"],
above: "51",
},
],
});
return (
<Page>
<ConditionEditor
onUpdate={setState}
onDelete={() => {}}
condition={state}
/>
</Page>
);
};
+14 -17
View File
@@ -1,27 +1,24 @@
import { FC } from "react";
import { AutomationCondition } from "types/automations/conditions";
import { ConditionNode } from "./ConditionNode";
import { ConditionNodeBase } from "./ConditionNodeBase";
import { ConditionNodeViewMode } from "./ConditionNodeSettings";
export const ConditionEditor: FC<{
condition: AutomationCondition;
onDelete: (which: 'root' | number) => void;
onDelete: () => void;
onUpdate: (data: AutomationCondition) => void;
}> = ({
condition,
onDelete,
onUpdate,
}) => {
// state
return <ConditionNode
initialViewMode?: ConditionNodeViewMode;
}> = ({ condition, onDelete, onUpdate, initialViewMode }) => {
// state
return (
<ConditionNodeBase
condition={condition}
onDelete={onDelete}
onUpdate={update => {
onUpdate(update)
onUpdate={(update) => {
onUpdate(update);
}}
displayMode
showDelete={false}
disableDelete={true}
initialViewMode={initialViewMode}
/>
}
);
};
@@ -1,28 +1,26 @@
import { AutomationCondition, LogicCondition } from "types/automations/conditions";
import {
AutomationCondition,
LogicCondition,
} from "types/automations/conditions";
export const genUpdateMethods = (
condition: LogicCondition,
onChange: (c: LogicCondition) => void
) => (i: number) => ({
onUpdate: (update: AutomationCondition) => onChange({
export const genUpdateMethods =
(condition: LogicCondition, onChange: (c: LogicCondition) => void) =>
(i: number) => ({
onUpdate: (update: AutomationCondition) =>
onChange({
...condition,
conditions: [
...condition.conditions.slice(0, i),
update,
...condition.conditions.slice(i + 1)
]
}),
onDelete: (which: 'root' | number) => {
if (which === 'root') {
onChange({
...condition,
conditions: condition.conditions.slice(0, i).concat(
condition.conditions.slice(i + 1)
)
})
} else {
throw new Error("Not Implemented")
}
}
})
...condition.conditions.slice(0, i),
update,
...condition.conditions.slice(i + 1),
],
}),
onDelete: () => {
onChange({
...condition,
conditions: condition.conditions
.slice(0, i)
.concat(condition.conditions.slice(i + 1)),
});
},
});
@@ -1,142 +0,0 @@
import { Styles } from "jss";
import { createAppUseStyles } from "styles/theme";
export const useStyles = createAppUseStyles<{
hasChildren: boolean,
isMobile: boolean,
}>(theme => {
const deleteBtn: Styles = {
borderRadius: '10px',
borderStyle: 'none',
padding: '0',
margin: '0',
background: theme.red,
width: '30px',
height: '15px',
fontSize: '10px',
textAlign: 'center',
cursor: 'pointer',
"&:hover": {
background: theme.redAccent,
}
}
return {
root: ({ hasChildren, isMobile }) => ({
background: theme.primary,
padding: 0,
position: 'relative',
display: 'flex',
flexDirection: isMobile ? 'column' : hasChildren ? 'column' : 'row',
}),
title: ({ hasChildren }) => ({
display: 'flex',
border: hasChildren ? `1px solid ${theme.primaryAccent}` : 'none',
borderRadius: 10,
borderBottomRightRadius: 0,
borderBottomLeftRadius: 0,
height: '100%',
}),
titleText: ({ hasChildren }) => ({
background: theme.condition.primaryColor,
border: `1px solid ${theme.primaryAccent}`,
borderRadius: 10,
borderTopRightRadius: 0,
borderBottomRightRadius: 0,
borderBottomLeftRadius: hasChildren ? 0 : 10,
minWidth: '10em',
maxWidth: '30em',
textOverflow: 'ellipsis',
textAlign: 'center',
cursor: 'pointer',
color: theme.primaryAccent,
}),
deleteBtnRoot: {
...deleteBtn,
position: 'absolute',
left: -35,
top: 10,
},
modifyBtn: ({ hasChildren }) => ({
// styling
backgroundColor: theme.green,
color: theme.primary,
fill: theme.primaryAccent,
borderColor: theme.primaryAccent,
borderWidth: 1,
borderRadius: hasChildren ? 10 : 0,
borderTopLeftRadius: 0,
borderBottomLeftRadius: 0,
cursor: 'pointer',
// positioning
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
padding: '0px 10px',
right: 1,
top: 10,
// on hover
"&:hover": {
backgroundColor: theme.greenLight,
fill: theme.primaryAccentLight,
},
"&:hover $icon": {
transform: "rotate(90deg)"
}
}),
icon: {},
deleteBtn,
conditionWrap: {
overflow: 'auto',
},
children: ({ hasChildren }) => ({
flex: 1,
paddingLeft: hasChildren ? 50 : 10,
paddingRight: hasChildren ? 0 : 10,
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
border: `1px solid ${theme.secondaryAccent}`,
borderBottomRightRadius: hasChildren ? 10 : 0,
borderBottomLeftRadius: hasChildren ? 10 : 0,
minHeight: hasChildren ? undefined : '100%',
overflow: 'scroll'
}),
addBtnContainer: {
display: 'flex',
justifyContent: 'center',
},
yamlBtn: {
backgroundColor: theme.secondary,
borderWidth: 1,
borderStyle: 'solid',
borderColor: theme.secondaryAccent,
color: theme.secondaryAccent,
paddingLeft: 20,
paddingRight: 20,
cursor: 'pointer',
"&:hover": {
backgroundColor: theme.primaryLight,
fill: theme.primaryAccentLight,
},
},
addBtn: {
backgroundColor: theme.secondary,
borderWidth: 1,
borderStyle: 'solid',
borderColor: theme.secondaryAccent,
color: theme.secondaryAccent,
borderRadius: 5,
marginTop: 5,
marginBottom: 5,
paddingLeft: 20,
paddingRight: 20,
cursor: 'pointer',
"&:hover": {
backgroundColor: theme.primaryLight,
fill: theme.primaryAccentLight,
},
}
}
})
@@ -1,45 +1,53 @@
import { FC } from "react";
import { AutomationCondition, LogicCondition } from "types/automations/conditions";
import {
AutomationCondition,
LogicCondition,
} from "types/automations/conditions";
import { getDescriptionFromAutomationNode, Namer } from "utils/formatting";
import { ConditionNode } from "./ConditionNode";
import { ConditionNodeBase } from "./ConditionNodeBase";
import { genUpdateMethods } from "./nestedUpdater";
interface Viewer<C extends AutomationCondition> extends FC<{
condition: C;
namer: Namer;
onChange: (condition: C) => void;
}> { }
interface Viewer<C extends AutomationCondition>
extends FC<{
condition: C;
namer: Namer;
onChange: (condition: C) => void;
}> {}
export const getViewer = (condition: AutomationCondition): Viewer<any> => {
if (
(condition.condition === 'and') ||
(condition.condition === 'or') ||
(condition.condition === 'not')
condition.condition === "and" ||
condition.condition === "or" ||
condition.condition === "not"
) {
return LogicViewer
return LogicViewer;
}
return GenericViewer
}
return GenericViewer;
};
export const GenericViewer: Viewer<AutomationCondition> = ({
condition,
namer,
}) => {
return <>
{getDescriptionFromAutomationNode(condition, namer)}
</>
}
return <>{getDescriptionFromAutomationNode(condition, namer, true)}</>;
};
export const LogicViewer: Viewer<LogicCondition> = ({
condition,
onChange,
}) => {
return <>
{condition.conditions.map((c, i) => {
return <ConditionNode key={i} condition={c} displayMode
{...genUpdateMethods(condition, onChange)(i)}
/>
})}
</>
}
return (
<>
{condition.conditions.map((c, i) => {
return (
<ConditionNodeBase
key={i}
condition={c}
// displayMode
{...genUpdateMethods(condition, onChange)(i)}
/>
);
})}
</>
);
};
@@ -1,61 +0,0 @@
import { FC } from "react";
import { AddIcon, TrashIcon } from '../Icons/index';
import { useCircleStyles } from './styles';
import { Handle, Position, XYPosition } from 'react-flow-renderer';
export interface DAGCircleProps {
onAdd?: () => void;
onRemove?: () => void;
size: number,
backgroundColor?: string;
disableSource?: boolean;
disableTarget?: boolean;
flipped: boolean;
}
export const makeFlowCircle = (
circleId: string,
position: XYPosition,
data: DAGCircleProps,
) => ({
id: circleId,
type: 'dagcircle',
position,
data
})
export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
data: {
size,
onAdd,
onRemove,
backgroundColor,
disableSource = false,
disableTarget = false,
flipped,
}
}) => {
const { classes } = useCircleStyles({
size,
hasOnFunction: !!onRemove || !!onAdd,
hasRemoveFunction: !!onRemove,
backgroundColor,
});
return <>
{!disableSource && <Handle type="source" position={flipped ? Position.Bottom : Position.Right} />}
{!disableTarget && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<div className={classes.root}>
{
onAdd ?
<AddIcon
size={70} units="%"
className={classes.icon}
onClick={onAdd}
/>
: (backgroundColor || onRemove) ? "" : "else"
}
{onRemove ? <TrashIcon className={classes.trashIcon} onClick={onRemove} /> : <></>}
</div>
</>
}
@@ -1,53 +0,0 @@
.dagnode-error {
display: flex;
flex-direction: column;
justify-content: flex-end;
font-size: 0.85em;
z-index: 0;
}
.dagnode-error.open .dagnode-error--inner {
align-items: flex-start;
padding-top: 1em;
}
.dagnode-error--inner {
position: relative;
flex: 1;
/* internal positioning */
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
gap: 0.5em;
/* shape */
background-color: var(--error-dark);
border-radius: 1em;
height: 100%;
max-height: 100%;
max-width: 100%;
margin-top: 2.5px;
margin-bottom: 2.5px;
border-top-width: 1px;
border-top-style: solid;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
border-top-color: var(--error);
}
.dagnode-error--inner:hover {
background-color: var(--error-accent);
cursor: default;
}
.dagnode-error--inner--edit-icon:hover {
transform: rotate(180deg);
cursor: pointer;
background-color: var(--error);
padding: 0.5em;
border-radius: 10px;
height: 0.25em;
width: 0.25em;
}
@@ -1,47 +0,0 @@
import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { DAGAutomationFlow } from '.';
import * as dgconst from "components/DAGFlow/constants";
import ReactFlow, { Controls } from 'react-flow-renderer';
import { DAGErrorNode } from "./DAGErrorNode";
import { convertToFlowNode } from "./helpers";
import { Page } from "components/Page";
export default {
title: 'DAGAutomationFlow/Viewer/DAGErrorNode',
component: DAGAutomationFlow,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
"height": dgconst.NODE_HEIGHT,
"width": dgconst.NODE_WIDTH,
}
} as ComponentMeta<typeof DAGErrorNode>
export const Examples: ComponentStory<typeof DAGErrorNode> = args => {
const nodes = ["1", "2", "3", "4"].map((id, i) => ({
"data": args,
"id": id,
"type": "mynode",
"position": {
"x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i,
"y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i
}
}));
return <Page>
<ReactFlow
defaultNodes={nodes}
nodeTypes={{
"mynode": convertToFlowNode(DAGErrorNode)
}}
snapToGrid
onlyRenderVisibleElements
nodesConnectable={false}
nodesDraggable={false}
>
<Controls />
</ReactFlow>
</Page>
}
@@ -1,34 +0,0 @@
import "./DAGErrorNode.css";
import { Handle, Position } from 'react-flow-renderer';
import { FC } from 'react';
import { InfoIcon, PencilIcon } from 'components/Icons';
export interface DAGErrorNodeProps {
height: number;
width: number;
flipped: boolean;
hasInput?: boolean;
error?: any,
onEdit: () => void;
}
export const DAGErrorNode: FC<DAGErrorNodeProps> = ({
height, width, hasInput, error, onEdit, flipped
}) => {
// render
return <>
{hasInput && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<Handle type="source" position={flipped ? Position.Bottom : Position.Right} />
<div className={["dagnode-error"].join(' ')} style={{
height,
width,
maxHeight: height,
maxWidth: width,
}}>
<div className={"dagnode-error--inner"} title={String(error)}>
<InfoIcon color="var(--error-light)" size={1.25} />
Invalid Node
<PencilIcon className="dagnode-error--inner--edit-icon" size={1.25} onClick={onEdit} />
</div>
</div>
</>
}
@@ -1,48 +0,0 @@
import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { DAGAutomationFlow } from '.';
import { useState } from 'react';
import * as dgconst from "components/DAGFlow/constants";
import ReactFlow, { Controls } from 'react-flow-renderer';
import { DAGNode } from "./DAGNode";
import { convertToFlowNode } from "./helpers";
import { Page } from "components/Page";
export default {
title: 'DAGAutomationFlow/Viewer/DAGNode',
component: DAGAutomationFlow,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
"color": "lblue",
"height": dgconst.NODE_HEIGHT,
"width": dgconst.NODE_WIDTH,
"label": "test",
"hasInput": true,
}
} as ComponentMeta<typeof DAGNode>
export const Colors: ComponentStory<typeof DAGNode> = args => {
const nodes = ["blue", "red", "green", "lblue"].map((color, i) => ({
"data": { ...args, color },
"id": color,
"type": "mynode",
"position": { "x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i, "y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i }
}));
return <Page>
<ReactFlow
defaultNodes={nodes}
nodeTypes={{
"mynode": convertToFlowNode(DAGNode)
}}
snapToGrid
onlyRenderVisibleElements
nodesConnectable={false}
nodesDraggable={false}
>
<Controls />
</ReactFlow>
</Page>
}
-57
View File
@@ -1,57 +0,0 @@
import { PencilIcon } from "components/Icons"
import { NodeColor } from "types/graphs";
import { useNodeStyles } from "./styles";
import { Handle, Position } from 'react-flow-renderer';
import { FC } from "react";
export interface DAGNodeProps {
height: number;
width: number;
onXClick?: () => void;
onEditClick?: () => void;
color: NodeColor;
label: string;
hasInput?: boolean;
accentBackground?: boolean;
flipped: boolean;
}
export const DAGNode: FC<DAGNodeProps> = ({
label,
height,
width,
onXClick,
onEditClick = () => { },
color,
hasInput = false,
accentBackground = false,
flipped,
}) => {
const { classes, theme } = useNodeStyles({
color,
nodeHeight: height,
nodeWidth: width,
accentBackground,
});
return <>
{hasInput && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<Handle type="source" position={flipped ? Position.Bottom : Position.Right} />
<div className={classes.root}>
<div className={classes.inner}>
<div className={classes.leftEdge} onClick={onXClick}>
{!!onXClick && <button className={classes.buttonDelete}>X</button>}
</div>
<div className={classes.textWrap}>
<span className={classes.text} title={label}>
{label}
</span>
</div>
<div className={classes.rightEdge} onClick={onEditClick}>
<button className={classes.buttonEdit}>
<PencilIcon size={1.1} color={theme.green} />
</button>
</div>
</div>
</div>
</>
}
@@ -1,23 +0,0 @@
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
export const NODE_WIDTH = 150 as const;
export const NODE_HEIGHT = 60 as const;
export const CONDITION_HEIGHT = 30 as const;
export const CONDITION_WIDTH = 120 as const;
export const CIRCLE_SIZE = 40 as const;
export const DISTANCE_FACTOR = 1.5 as const;
export const PADDING = 50 as const;
export const DEFAULT_DIMS = {
nodeHeight: NODE_HEIGHT,
nodeWidth: NODE_WIDTH,
conditionHeight: CONDITION_HEIGHT,
conditionWidth: CONDITION_WIDTH,
distanceFactor: DISTANCE_FACTOR,
circleSize: CIRCLE_SIZE,
padding: {
x: PADDING,
y: PADDING,
},
flipped: false,
} as DAGAutomationFlowDims
@@ -1,51 +0,0 @@
import { DAGCircleProps, makeFlowCircle } from "./DAGCircle"
import { DAGAutomationFlowDims } from "./types"
import { Node, XYPosition } from 'react-flow-renderer';
import { DAGNodeProps } from "./DAGNode";
export const makeAddButton = (
id: string,
position: XYPosition,
{
circleSize,
flipped,
}: DAGAutomationFlowDims,
onAdd: () => void,
disableTarget: boolean = true,
): Node<DAGCircleProps> => makeFlowCircle(
id,
position,
{
flipped,
size: circleSize,
onAdd,
disableSource: true,
disableTarget,
}
)
export const makeConditionPoint = (
id: string,
position: XYPosition,
{
conditionWidth,
conditionHeight,
flipped,
}: DAGAutomationFlowDims,
totalConditions: number,
onEditClick: () => void,
): Node<DAGNodeProps> => ({
id,
type: 'dagnode',
position,
data: {
color: 'lblue',
accentBackground: true,
label: `${totalConditions} Condition${totalConditions !== 1 ? 's' : ''}`,
height: conditionHeight,
width: conditionWidth,
hasInput: true,
onEditClick,
flipped,
}
})
@@ -1,9 +0,0 @@
import { FC } from 'react';
export const convertToFlowNode = <D extends {}>(
Component: FC<D>
): FC<{ data: D }> =>
({ data }) => {
return <Component {...data} />
}
@@ -1,263 +0,0 @@
import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { DAGAutomationFlow } from '.';
import { useState } from 'react';
import * as dgconst from "components/DAGFlow/constants";
import { Page } from "components/Page";
export default {
title: 'DAGAutomationFlow/Viewer',
component: DAGAutomationFlow,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
dims: dgconst.DEFAULT_DIMS
}
} as ComponentMeta<typeof DAGAutomationFlow>
const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
const [state, setState] = useState({
trigger: args.trigger,
sequence: args.sequence,
condition: args.condition,
})
return <Page>
<DAGAutomationFlow
{...args}
{...state}
onTriggerUpdate={trigger => {
setState({ ...state, trigger })
}}
onSequenceUpdate={sequence => setState({ ...state, sequence })}
onConditionUpdate={condition => setState({ ...state, condition })}
/>
</Page>
}
export const Simple = Template.bind({})
Simple.args = {
...Simple.args,
condition: [],
trigger: [
{
"platform": "numeric_state",
"entity_id": "test",
},
{
"platform": "homeassistant",
"event": "start",
}
],
sequence: [
{
condition: 'and',
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.temperature_kitchen',
below: '15',
},
{
condition: 'template',
value_template: 'states(switch.kitchen_light) == "on"'
}
]
},
{
alias: "Start Music In Kitchen",
service: 'media_player.play_media',
target: {
entity_id: "media_player.kitchen_dot"
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
}
]
}
export const Complex = Template.bind({})
Complex.args = {
...Complex.args,
condition: [],
trigger: [
{
"platform": "numeric_state",
"entity_id": "test",
},
{
"platform": "homeassistant",
"event": "start",
},
{
"bad": "node"
} as any
],
sequence: [
{
"condition": "and",
"conditions": [
{
"condition": "numeric_state",
"entity_id": "sensor.temperature_kitchen",
"below": "15"
},
{
"condition": "template",
"value_template": "states(switch.kitchen_light) == \"on\""
}
]
},
{
"alias": "Start Music In Kitchen",
"service": "media_player.play_media",
"target": {
"entity_id": "media_player.kitchen_dot"
},
"data": {
"media_content_id": "Good Morning",
"media_content_type": "SPOTIFY"
}
},
{
"alias": "Bad Node",
},
{
"choose": [
{
"conditions": [
{
"condition": "state",
"entity_id": "lights.bathroom",
"state": "off",
}
],
"sequence": [
{
"service": "light.turn_on",
"target": {
"entity_id": "lights.bathroom"
},
"data": {}
},
{
"alias": "Turn off bedroom",
"service": "light.turn_off",
"target": {
"entity_id": "lights.bedroom"
},
"data": {}
}
]
},
{
"conditions": [
{
"condition": "state",
"entity_id": "lights.bedroom",
"state": "off",
}
],
"sequence": [
{
"alias": "Turn on bedroom",
"service": "light.turn_on",
"target": {
"entity_id": "lights.bedroom"
},
"data": {}
},
{
"choose": [
{
"conditions": [],
"sequence": [
{
"choose": [],
"default": [],
}
]
}
],
"default": [
{
"choose": [],
"default": [],
}
],
}
]
}
],
"default": [
{
"service": "light.turn_off",
"target": {
"entity_id": "lights.bathroom"
},
"data": {}
}
]
},
{
"condition": "and",
"conditions": []
}
]
}
export const EmptyStart = Template.bind({})
EmptyStart.args = {
...EmptyStart.args,
condition: [],
trigger: [],
sequence: []
}
export const Errors = Template.bind({})
Errors.args = {
...Errors.args,
condition: [
{
"condition": "numeric_state",
} as any
],
trigger: [
{
"platform": "event",
} as any
],
sequence: [
{
"choose": {}
} as any
]
}
export const ComplexFlipped = Complex.bind({})
ComplexFlipped.args = {
...Complex.args,
dims: {
...dgconst.DEFAULT_DIMS,
...Complex.args.dims,
flipped: true,
}
}
export const SimpleFlipped = Simple.bind({})
SimpleFlipped.args = {
...Simple.args,
dims: {
...dgconst.DEFAULT_DIMS,
...Complex.args.dims,
flipped: true,
}
}
-170
View File
@@ -1,170 +0,0 @@
import { FC, useState } from "react";
import ReactFlow, { Controls } from 'react-flow-renderer';
import { AutomationSequenceNode } from "types/automations";
import { AutomationTrigger } from 'types/automations/triggers';
import { triggerToFlow } from "./triggerConvertor";
import { DAGNode } from "./DAGNode";
import { DAGAutomationFlowDims, FlowData, ModalState, UpdateModalState } from './types';
import { DAGCircle } from './DAGCircle';
import { sequenceToFlow } from "./sequenceConvertor";
import { makeSequenceUpdater } from "./updater";
import { NodeEditor } from "components/NodeEditor";
import { MultiNodeEditor } from "components/MultiNodeEditors";
import { Modal } from "components/Modal";
import { AutomationCondition } from "types/automations/conditions";
import { makeConditionPoint } from "./flowDataMods";
import { convertToFlowNode } from "./helpers";
import { DAGErrorNode } from "./DAGErrorNode";
import { useHA } from "haService";
const nodeTypes = {
'dagnode': convertToFlowNode(DAGNode),
'errornode': convertToFlowNode(DAGErrorNode),
'dagcircle': DAGCircle,
}
const makeOnEditAutomationConditions = (
conditions: AutomationCondition[],
updateConditions: (c: AutomationCondition[]) => void,
openModal: UpdateModalState,
) => () => openModal({
single: false,
node: conditions,
allowedTypes: ['condition'],
update: c => updateConditions(c as any),
})
export interface DAGAutomationFlowProps {
className?: string;
trigger: AutomationTrigger[];
condition: AutomationCondition[];
sequence: AutomationSequenceNode[];
dims: DAGAutomationFlowDims;
onTriggerUpdate: (t: AutomationTrigger[]) => void;
onSequenceUpdate: (s: AutomationSequenceNode[]) => void;
onConditionUpdate: (s: AutomationCondition[]) => void;
}
export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
className,
trigger,
condition,
sequence,
onTriggerUpdate,
onSequenceUpdate,
onConditionUpdate,
dims,
}) => {
// state
const [modalState, setModalState] = useState<ModalState | null>(null);
const { namer, } = useHA();
// modal
let modalBody = <></>
if (modalState) {
if (modalState.single) {
modalBody = <NodeEditor
node={modalState.node}
isErrored={modalState.isError}
onClose={() => setModalState(null)}
onSave={n => {
modalState.update(n as any);
setModalState(null);
}}
allowedTypes={modalState.allowedTypes}
saveBtnCreateText={modalState.saveBtnCreateText}
/>
} else {
modalBody = <MultiNodeEditor
sequence={modalState.node}
onClose={() => setModalState(null)}
onSave={(n) => modalState.update(n as any)}
allowedTypes={['condition']}
/>
}
}
// convert automation to flow data
const condPoint = makeConditionPoint(
'c', dims.flipped ? {
y: dims.padding.y + dims.nodeHeight * dims.distanceFactor,
x: dims.padding.x + dims.nodeWidth * 0.25
} : {
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y + dims.nodeHeight * 0.25
}, dims, condition.length, makeOnEditAutomationConditions(
condition,
onConditionUpdate,
setModalState,
));
const flowData: FlowData = {
nodes: [condPoint],
edges: [],
}
triggerToFlow(flowData, trigger, condPoint.id, dims, {
namer,
onAdd: () => onTriggerUpdate([
...trigger, {
platform: 'event',
event_type: '',
}
]),
onDelete: i => onTriggerUpdate([
...trigger.slice(0, i),
...trigger.slice(i + 1)
]),
onEdit: i => setModalState({
single: true,
node: trigger[i],
update: t => onTriggerUpdate([
...trigger.slice(0, i),
t,
...trigger.slice(i + 1)
]),
allowedTypes: ['trigger'],
})
});
sequenceToFlow(
flowData,
sequence,
condPoint.id,
{
...dims, padding: dims.flipped ? {
y: condPoint.position.y - dims.nodeHeight - dims.conditionHeight,
x: dims.padding.x,
} : {
x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth,
y: dims.padding.y,
}
},
namer,
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
);
// this fixes some strange edge drawing issue
flowData.edges = flowData.edges.map(e => ({
...e,
"source": `${e.source}-${dims.flipped}`,
"target": `${e.target}-${dims.flipped}`,
}))
flowData.nodes = flowData.nodes.map(n => ({
...n,
id: `${n.id}-${dims.flipped}`
}))
// render
return <>
<Modal open={!!modalState}>
{modalBody}
</Modal>
<ReactFlow
className={className}
nodeTypes={nodeTypes}
snapToGrid
onlyRenderVisibleElements
nodesConnectable={false}
nodesDraggable={false}
{...flowData}
>
<Controls />
</ReactFlow>
</>;
}
-4
View File
@@ -1,4 +0,0 @@
.dag-flow-safe {
height: 100%;
overflow: scroll;
}
-84
View File
@@ -1,84 +0,0 @@
import "./safe.css";
import { Component, ErrorInfo } from "react";
import { DAGAutomationFlow, DAGAutomationFlowProps } from ".";
import { AutomationSequenceNode } from "types/automations";
import { AutomationCondition } from "types/automations/conditions";
import { AutomationTrigger } from 'types/automations/triggers';
import InputYaml from "components/Inputs/InputYaml";
import { Button } from "components/Inputs/Button";
type GoodState = {
hasError: false;
}
type FailedStateData = {
sequence: AutomationSequenceNode[],
condition: AutomationCondition[],
trigger: AutomationTrigger[],
}
type FailedState = {
hasError: true,
error: any,
errorInfo?: ErrorInfo,
} & FailedStateData
type State = GoodState | FailedState
export class SafeDAGAutomationFlow extends Component<DAGAutomationFlowProps, State> {
state: State = {
hasError: false
}
componentDidCatch(error: Error, errorInfo: ErrorInfo) {
this.setState({
hasError: true,
error,
errorInfo,
sequence: this.props.sequence,
condition: this.props.condition,
trigger: this.props.trigger,
})
}
render() {
if (this.state.hasError) {
const makeSet = <K extends keyof FailedStateData>(k: K) => (d: FailedStateData[K]) => this.setState({
...this.state,
[k]: d,
});
const makeSave = <K extends keyof FailedStateData>(k: K) => () => {
if (!this.state.hasError) {
return
}
if (k === 'condition') {
this.props.onConditionUpdate(this.state.condition)
} else if (k === 'sequence') {
this.props.onSequenceUpdate(this.state.sequence)
} else if (k === 'trigger') {
this.props.onTriggerUpdate(this.state.trigger)
}
}
return <div className="dag-flow-safe">
<h1>An Error has occured.</h1>
<h1>Failed to Open Autmation!</h1>
Something is likely not configured in your automation properly.
<hr />
<h2>Error:</h2>
<h2>{String(this.state.error)}</h2>
<br />
{JSON.stringify(this.state.error, null, 4)}
{this.state.errorInfo && this.state.errorInfo.componentStack.split('\n').map((s, i) => <>
<span key={i}>{s}</span><br key={`br-${i}`} />
</>)}
<h2>Automation YAML</h2>
<InputYaml label="Trigger" value={this.state.trigger} onChange={makeSet('trigger')} />
<Button onClick={makeSave('trigger')}>Save Triggers</Button>
<InputYaml label="Condition" value={this.state.condition} onChange={makeSet('condition')} />
<Button onClick={makeSave('condition')}>Save Conditions</Button>
<InputYaml label="Action" value={this.state.sequence} onChange={makeSet('sequence')} />
<Button onClick={makeSave('sequence')}>Save Actions</Button>
</div>
}
return <DAGAutomationFlow {...this.props} />;
}
}
@@ -1,312 +0,0 @@
import { AutomationSequenceNode } from 'types/automations';
import { DAGAutomationFlowDims, FlowData } from './types';
import { getDescriptionFromAutomationNode, Namer } from 'utils/formatting';
import { XYPosition } from 'react-flow-renderer';
import { ChooseAction } from 'types/automations/actions';
import { makeFlowCircle } from './DAGCircle';
import { createOnRemoveForChooseNode, SequenceUpdater } from './updater';
import { getNodeType } from 'utils/automations';
import { makeAddButton, makeConditionPoint } from './flowDataMods';
export const sequenceToFlow = (
flowData: FlowData,
sequence: AutomationSequenceNode[],
fromPoint: string,
dims: DAGAutomationFlowDims,
namer: Namer,
updater: SequenceUpdater,
prefix: string = "",
) => {
let lastPointId = fromPoint;
let lasPos: XYPosition | null = null;
// sequence
for (let i = 0; i < sequence.length; i++) {
const node = sequence[i];
const nodeId = `${prefix}n-${i}`;
let position: XYPosition;
if (lasPos) {
position = dims.flipped ? {
y: lasPos.y + dims.nodeHeight * dims.distanceFactor,
x: dims.padding.x
} : {
x: lasPos.x + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y
}
} else {
position = dims.flipped ? {
y: dims.padding.y + dims.nodeHeight * dims.distanceFactor * (i + 2),
x: dims.padding.x
} : {
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2),
y: dims.padding.y
};
}
// draw node
if (getNodeType(node) === 'action') {
if ('choose' in node) {
try {
const out = addChooseNode(node, position, nodeId, dims, namer, updater, i);
position = out.lastPos
flowData = mergeFlowDatas(flowData, out.flowData);
} catch (err) {
console.error(err)
addErrorNode(flowData, nodeId, position, dims, err, updater.makeOnEditForBadNode(i));
}
} else {
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i),
namer,
});
}
} else {
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i),
namer,
});
}
addEdge(flowData, lastPointId, nodeId, false)
lastPointId = nodeId;
lasPos = position;
}
// add button
const addCircle = makeAddButton(
`${prefix}-+`,
dims.flipped ? {
y: (
lasPos === null ?
dims.padding.y + dims.nodeHeight * dims.distanceFactor * (sequence.length + 1) :
lasPos.y
) + dims.nodeHeight * dims.distanceFactor,
x: dims.padding.x + dims.circleSize * 1.5
} : {
x: (
lasPos === null ?
dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) :
lasPos.x
) + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y + dims.circleSize / 4
},
dims,
updater.addNode,
false,
)
flowData.nodes.push(addCircle)
addEdge(flowData, lastPointId, addCircle.id, false)
return {
position: lasPos,
pointId: lastPointId,
};
}
const xyApply = (p1: XYPosition, p2: XYPosition, fcn: (a: number, b: number) => number): XYPosition => ({
x: fcn(p1.x, p2.x), y: fcn(p1.y, p2.y)
})
const addEdge = (flowData: FlowData, source: string, target: string, animated: boolean = false) => flowData.edges.push({
id: `${source}-${target}`,
source,
target,
animated,
})
const addSingleNode = (
flowData: FlowData,
node: AutomationSequenceNode,
position: XYPosition,
nodeId: string,
{
flipped,
nodeHeight,
nodeWidth,
}: DAGAutomationFlowDims,
opts: {
onEditClick: () => void;
onXClick: () => void;
namer: Namer;
}
) => flowData.nodes.push({
id: nodeId,
type: 'dagnode',
data: {
label: getDescriptionFromAutomationNode(node, opts.namer),
height: nodeHeight,
width: nodeWidth,
color: getNodeType(node) === 'action' ? 'green' : 'blue',
hasInput: true,
flipped,
...opts,
},
position,
});
const addErrorNode = (
flowData: FlowData,
nodeId: string,
position: XYPosition,
{
nodeHeight,
nodeWidth,
}: DAGAutomationFlowDims,
error: any,
onEdit: () => void,
hasInput: boolean = true,
) => flowData.nodes.push({
id: nodeId,
type: 'errornode',
position,
data: {
height: nodeHeight,
width: nodeWidth,
hasInput,
onEdit,
error,
}
})
const addChooseNode = (
node: ChooseAction,
position: XYPosition,
nodeId: string,
dims: DAGAutomationFlowDims,
namer: Namer,
updater: SequenceUpdater,
i: number,
) => {
const flowData: FlowData = {
nodes: [],
edges: [],
};
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i),
namer,
});
let lastPos: XYPosition = position;
// conditions
node.choose.forEach(({ sequence, conditions }, j) => {
const sequenceId = `${nodeId}.${j}`;
// edit/delete circle
const circle = makeFlowCircle(`${sequenceId}>delete`, dims.flipped ? {
y: position.y + dims.nodeHeight * dims.distanceFactor,
x: lastPos.x + dims.nodeWidth * dims.distanceFactor,
} : {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
}, {
flipped: dims.flipped,
size: dims.circleSize,
onRemove: createOnRemoveForChooseNode(
node,
d => updater.updateNode(i, d),
j,
),
})
flowData.nodes.push(circle)
addEdge(flowData, nodeId, circle.id, true)
const condNode = makeConditionPoint(
`${sequenceId}>cond`,
dims.flipped ? {
y: circle.position.y + dims.circleSize * dims.distanceFactor,
x: circle.position.x - dims.circleSize,
} : {
x: circle.position.x + dims.circleSize * dims.distanceFactor,
y: circle.position.y + dims.circleSize / 8,
},
dims,
conditions.length,
updater.makeOnEditConditionsForChooseNode(i, j)
);
flowData.nodes.push(condNode)
addEdge(flowData, circle.id, condNode.id, true)
// actual sub sequence
const lastPoint = sequenceToFlow(flowData, sequence, condNode.id, {
...dims,
padding: dims.flipped ? {
y: condNode.position.y - dims.nodeHeight * dims.distanceFactor,
x: condNode.position.x - dims.conditionHeight / 2,
} : {
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
y: condNode.position.y - dims.conditionHeight / 2,
},
}, namer, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`);
if (lastPoint.position) {
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
} else {
lastPos = xyApply(lastPos, dims.flipped ? {
y: lastPos.y,
x: lastPos.x + dims.nodeWidth * dims.distanceFactor
} : {
x: lastPos.x,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor
}, Math.max)
}
})
const totalChildren = node.choose.length;
// add button
const addCirlce = makeAddButton(
`${nodeId}>add`,
dims.flipped ? {
y: position.y + dims.nodeHeight * dims.distanceFactor,
x: lastPos.x + dims.nodeWidth * dims.distanceFactor,
} : {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
},
dims,
() => updater.updateNode(i, {
...node,
choose: [
...node.choose,
{
sequence: [],
conditions: [],
}
]
}),
false,
);
flowData.nodes.push(addCirlce)
addEdge(flowData, nodeId, addCirlce.id, true)
// else
const elseCircle = makeFlowCircle(`${nodeId}>else`, dims.flipped ? {
y: position.y + dims.nodeHeight * dims.distanceFactor,
x: lastPos.x + dims.nodeWidth * dims.distanceFactor * 2,
} : {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2,
}, { size: dims.circleSize, flipped: dims.flipped })
flowData.nodes.push(elseCircle)
addEdge(flowData, nodeId, elseCircle.id, true)
const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, {
...dims,
padding: dims.flipped ? {
y: position.y,
x: elseCircle.position.x - 1.4 * dims.circleSize,
} : {
x: position.x - dims.nodeWidth,
y: elseCircle.position.y - dims.circleSize / 4,
},
}, namer, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`)
if (lastPoint.position) {
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
} else {
lastPos = xyApply(lastPos, elseCircle.position, Math.max)
}
return { lastPos, flowData }
}
export const mergeFlowDatas = (fd1: FlowData, fd2: FlowData): FlowData => {
fd1.edges = fd1.edges.concat(fd2.edges);
fd1.nodes = fd1.nodes.concat(fd2.nodes);
return fd1
}
-139
View File
@@ -1,139 +0,0 @@
import { Styles } from "jss";
import { createAppUseStyles } from "styles/theme";
import { NodeColor } from "types/graphs";
export const useNodeStyles = createAppUseStyles<{
color: NodeColor,
nodeHeight: number,
nodeWidth: number,
accentBackground: boolean,
}>(theme => {
const edgeStyle: Styles = {
flex: '1',
display: 'flex',
flexDirection: 'column',
flexWrap: 'nowrap',
borderRadius: '1em',
justifyContent: 'space-around',
alignItems: 'center',
'&:hover': {
backgroundColor: theme.primaryAccent,
cursor: 'pointer',
}
}
const buttonStyle: Styles = {
fontSize: '8px',
backgroundColor: "rgba(0,0,0,0)",
color: theme.primaryAccent,
borderStyle: 'none',
height: '15px',
width: '15px',
cursor: 'pointer',
}
return {
root: ({ nodeHeight, nodeWidth }) => ({
display: 'flex',
flexDirection: 'column',
justifyContent: 'flex-end',
height: nodeHeight,
maxHeight: nodeHeight,
maxWidth: nodeWidth,
width: nodeWidth,
fontSize: 10,
}),
inner: ({ color, accentBackground }) => ({
position: 'relative',
display: 'flex',
flexDirection: 'row',
backgroundColor: !accentBackground ? theme.secondary :
color === 'lblue' ? theme.condition.primaryColorOpaque : 'none',
borderRadius: '1em',
flex: 1,
height: `100%`,
maxHeight: `100%`,
maxWidth: '100%',
marginTop: '2.5px',
marginBottom: '2.5px',
borderTopWidth: '1px',
borderTopStyle: 'solid',
borderTopLeftRadius: '10px',
borderTopRightRadius: '10px',
borderTopColor: color === 'red' ? theme.redAccent :
color === 'blue' ? theme.condition.primaryColor :
color === 'green' ? theme.green :
color === 'lblue' ? theme.condition.primaryAccent :
'none'
}),
textWrap: {
display: 'flex',
flex: 4,
textAlign: 'center',
justifyContent: 'center',
alignItems: 'center',
height: '100%',
maxHeight: '100%',
maxWidth: "50%",
},
text: {
textOverflow: 'ellipsis',
overflow: "hidden",
whiteSpace: "break-spaces",
lineBreak: "anywhere",
cursor: 'default',
},
buttonDelete: {
...buttonStyle,
"&:hover": {
color: theme.primary,
}
},
buttonEdit: {
...buttonStyle,
"&:hover": {
transform: "rotate(45deg)"
}
},
leftEdge: {
...edgeStyle,
borderLef: `1px ${theme.secondaryAccent} solid`,
borderTopRightRadius: 0,
borderBottomRightRadius: 0,
},
rightEdge: {
...edgeStyle,
borderRight: `1px ${theme.secondaryAccent} solid`,
borderTopLeftRadius: 0,
borderBottomLeftRadius: 0,
},
}
})
export const useCircleStyles = createAppUseStyles<{
size: number,
hasOnFunction: boolean,
hasRemoveFunction: boolean,
backgroundColor?: string,
}>(theme => ({
root: ({ size, hasOnFunction, hasRemoveFunction, backgroundColor }) => {
const baseColor = backgroundColor ? backgroundColor : theme.green;
const hoverColor = hasOnFunction ? theme.greenOpaque : baseColor
return {
backgroundColor: baseColor,
borderRadius: hasRemoveFunction ? 10 : 500,
height: size,
width: size,
color: theme.primary,
cursor: hasOnFunction ? "pointer" : 'default',
"&:hover": {
backgroundColor: hoverColor,
},
fontSize: `${size * 0.4}px`,
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
}
},
trashIcon: {
padding: 1,
}
}))
@@ -1,65 +0,0 @@
import { AutomationTrigger } from 'types/automations/triggers';
import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from './types';
import { makeAddButton } from './flowDataMods';
import { getDescriptionFromAutomationNode } from 'utils/formatting';
export const triggerToFlow = (
flowData: FlowData,
trigger: AutomationTrigger[],
toPoint: string,
dims: DAGAutomationFlowDims,
opts: TriggerMakerOptions,
) => {
const {
distanceFactor,
nodeHeight,
nodeWidth,
padding,
conditionHeight,
circleSize,
flipped,
} = dims;
// convert all triggers to dag nodes
trigger.forEach((t, i) => {
const flowId = `t-${i}`;
flowData.nodes.push({
id: flowId,
type: 'dagnode',
data: {
label: getDescriptionFromAutomationNode(t, opts.namer),
height: nodeHeight,
width: nodeWidth,
flipped,
color: 'red',
onEditClick: () => opts.onEdit(i),
onXClick: () => opts.onDelete(i),
},
position: flipped ? {
y: padding.y,
x: padding.x + nodeWidth * distanceFactor * i
} : {
x: padding.x,
y: padding.y + nodeHeight * distanceFactor * i
}
})
flowData.edges.push({
id: `e(${flowId})-(${toPoint})`,
source: flowId,
target: toPoint,
})
});
// create a 'add button'
flowData.nodes.push(makeAddButton(
'trigger-add',
flipped ? {
y: padding.y + circleSize / 4,
x: padding.x + nodeWidth * distanceFactor * trigger.length,
} : {
x: padding.x + nodeWidth * 0.4,
y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length,
},
dims,
opts.onAdd
))
}
-51
View File
@@ -1,51 +0,0 @@
import { Edge, Node, XYPosition } from 'react-flow-renderer';
import { AutomationSequenceNode } from 'types/automations';
import { DAGCircleProps } from './DAGCircle';
import { DAGNodeProps } from './DAGNode';
import { AutomationTrigger } from 'types/automations/triggers';
import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
import { DAGErrorNodeProps } from './DAGErrorNode';
import { Namer } from 'utils/formatting';
export type DAGAutomationFlowDims = {
padding: XYPosition;
nodeHeight: number;
nodeWidth: number;
conditionWidth: number;
conditionHeight: number;
circleSize: number;
distanceFactor: number;
flipped: boolean;
}
export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | DAGErrorNodeProps | any>;
export type FlowData = {
nodes: DAGAutomationFlowNode[],
edges: Edge[],
}
export type TriggerMakerOptions = {
onAdd: () => void,
onEdit: (i: number) => void,
onDelete: (i: number) => void,
namer: Namer,
}
export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = (
s: ModalState<T>
) => void;
export type ModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = {
single: true,
isError?: boolean,
node: T
update: (n: T) => void;
saveBtnCreateText?: boolean;
allowedTypes: MultiNodeEditorProps['allowedTypes'],
} | {
single: false,
node: AutomationSequenceNode[]
update: (n: AutomationSequenceNode[]) => void;
allowedTypes: ['condition']
}
@@ -1,70 +0,0 @@
import { AutomationSequenceNode } from "types/automations"
import { ChooseAction } from "types/automations/actions";
import { ModalState } from "./types";
import { makeSequenceUpdater } from "./updater"
const mockSequenceUpdater = (defaultState: AutomationSequenceNode[] = []) => {
let state: AutomationSequenceNode[] = [...defaultState]
const modalStates: ModalState[] = [];
const updater = makeSequenceUpdater(
state,
s => {
state = s
},
ms => modalStates.push(ms)
);
return {
get state() {
return state
},
modalStates,
updater
};
}
test("sequence updater updates nodes", () => {
const mock = mockSequenceUpdater([
{
"choose": [
{
"conditions": [],
"sequence": [],
}
],
"default": [],
}
]);
expect(mock.state.length).toBe(1)
expect((mock.state[0] as ChooseAction).alias).toBe(undefined)
mock.updater.updateNode(0, {
...mock.state[0],
alias: "Hello"
} as any)
expect((mock.state[0] as any).alias).toBe("Hello")
})
test('update conditions for node', () => {
const mock = mockSequenceUpdater([
{
"choose": [
{
"conditions": [],
"sequence": [],
}
],
"default": [],
}
]);
mock.updater.makeOnEditConditionsForChooseNode(0, 0)();
expect(mock.modalStates.length).toBe(1)
expect((mock.modalStates[0].node as AutomationSequenceNode[]).length).toBe(0)
mock.modalStates[0].update([
{
"condition": "and",
"conditions": [],
}
] as any)
expect((mock.state[0] as ChooseAction).choose[0].conditions.length).toBe(1)
expect((mock.state[0] as ChooseAction).choose[0].conditions[0].condition).toBe("and")
})
-145
View File
@@ -1,145 +0,0 @@
import { AutomationSequenceNode } from "types/automations";
import { ChooseAction } from "types/automations/actions";
import { AutomationCondition } from "types/automations/conditions";
import { UpdateModalState } from "./types";
import { getNodeType } from '../../utils/automations';
export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>;
export const makeSequenceUpdater = (
sequence: AutomationSequenceNode[],
onChange: (s: AutomationSequenceNode[]) => void,
openModal: UpdateModalState,
) => ({
sequence,
onChange,
removeNode(i: number) {
return onChange([
...sequence.slice(0, i),
...sequence.slice(i + 1),
])
},
addNode() {
return openModal({
single: true,
saveBtnCreateText: true,
node: {
choose: [],
default: [],
},
update: n => {
onChange([
...sequence,
n,
])
},
allowedTypes: ['action', 'condition']
})
},
updateNode(i: number, node: AutomationSequenceNode) {
if (JSON.stringify(node) !== JSON.stringify(sequence[i])) {
return onChange([
...sequence.slice(0, i),
node,
...sequence.slice(i + 1),
])
}
},
updateChooseActionData(i: number, data: ChooseAction) {
const node = sequence[i] as ChooseAction;
return this.updateNode(i, {
...node,
...data,
})
},
makeChildUpdaterForChooseAction(i: number, j: number | null) {
const node = sequence[i];
if ('choose' in node) {
if (j !== null) {
return makeSequenceUpdater(
node.choose[j].sequence,
seq => this.updateNode(i, {
...node,
choose: [
...node.choose.slice(0, j),
{
...node.choose[j],
sequence: seq,
},
...node.choose.slice(j + 1),
]
}),
openModal,
)
} else {
return makeSequenceUpdater(
node.default ?? [],
seq => this.updateNode(i, {
...node,
default: seq
}),
openModal,
)
}
}
throw new Error(`Cannot create sub-updater for ${node}`)
},
makeOnModalOpenForNode(
i: number,
node: AutomationSequenceNode,
) {
return () => openModal({
single: true,
node,
allowedTypes: ['action', 'condition'],
update: n => this.updateNode(i, n),
})
},
makeOnEditConditionsForChooseNode(
i: number,
j: number,
) {
return () => {
const node = sequence[i] as ChooseAction;
return openModal({
single: false,
node: node.choose[j].conditions,
allowedTypes: ['condition'],
update: conditions => this.updateNode(i, {
...node,
choose: [
...node.choose.slice(0, j),
{
sequence: node.choose[j].sequence,
conditions: conditions as AutomationCondition[],
},
...node.choose.slice(j + 1),
]
}),
})
}
},
makeOnEditForBadNode(i: number) {
const node = sequence[i];
return () => openModal({
single: true,
isError: true,
node,
allowedTypes: [getNodeType(node)],
update: n => this.updateNode(i, n),
})
}
});
export const createOnRemoveForChooseNode = (
action: ChooseAction,
update: (data: ChooseAction) => void,
j: number
) => () => update({
...action,
choose: [
...action.choose.slice(0, j),
...action.choose.slice(j + 1),
]
})
@@ -0,0 +1,29 @@
.dag-graphboard {
min-height: 100%;
min-width: 100%;
}
.dag-graphboard.loading {
position: relative;
}
.dag-graphboard.loading span {
position: absolute;
left: 50%;
top: 50%;
}
.dag-graphboard .react-flow__handle {
opacity: 0;
}
.dag-graphboard rect.react-flow__edge-textbg {
fill: var(--mui-background-paper);
stroke: var(--mui-text-primary);
stroke-width: 0.25px;
}
.dag-graphboard text.react-flow__edge-text {
fill: var(--mui-text-primary);
}
@@ -0,0 +1,91 @@
import React from "react";
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { DAGGraphBoard } from ".";
import { Page } from "components/Page";
import { SimpleErrorElement } from "components/SimpleErrorElement";
export default {
title: "DAGGraph/Board",
component: DAGGraphBoard,
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {},
} as ComponentMeta<typeof DAGGraphBoard>;
const Template: ComponentStory<typeof DAGGraphBoard> = (args) => {
return (
<Page>
<DAGGraphBoard {...args} />
</Page>
);
};
export const Loading = Template.bind({});
Loading.args = {
...Loading.args,
state: {
ready: false,
},
};
export const Errored = Template.bind({});
Errored.args = {
...Loading.args,
state: {
ready: true,
data: {
error: <SimpleErrorElement error={new Error("Test")} />,
},
},
};
export const Empty = Template.bind({});
Empty.args = {
...Empty.args,
state: {
ready: true,
data: {
elements: {
nodes: [],
edges: [],
},
},
},
};
export const Basic = Template.bind({});
Basic.args = {
...Basic.args,
state: {
ready: true,
data: {
elements: {
nodes: [
{
position: { x: 50, y: 50 },
id: "1",
data: {
label: "hi",
},
},
{
position: { x: 500, y: 200 },
id: "2",
data: {
label: "hi",
},
} as any,
],
edges: [
{ id: "1->2", source: "1", target: "2", label: "wow" },
{
id: "2->1",
source: "2",
target: "1",
label: "yes",
animated: true,
},
],
},
},
},
};
@@ -0,0 +1,76 @@
import "./index.css";
import { FC } from "react";
import CircularProgress from "@mui/material/CircularProgress";
import ReactFlow, { Controls, ReactFlowProvider } from "react-flow-renderer";
import { NodeEditor } from "components/NodeEditor";
import { Modal } from "components/Modal";
import { nodeTypes } from "../nodes";
import { DAGGraphBoardProps } from "./types";
export const DAGGraphBoard: FC<DAGGraphBoardProps> = (props) => {
return (
<ReactFlowProvider>
<DAGGraphBoardInner {...props} />
</ReactFlowProvider>
);
};
export const DAGGraphBoardInner: FC<DAGGraphBoardProps> = ({
modalState,
state,
closeModal,
}) => {
// render unready or errored states
if (!state.ready) {
return (
<div className="dag-graphboard loading">
<CircularProgress />
</div>
);
}
if ("error" in state.data) {
return <div className="dag-graphboard errored">{state.data.error}</div>;
}
// modal
let modalBody = <></>;
if (modalState) {
modalBody = (
<NodeEditor
node={modalState.node}
onClose={closeModal}
onSave={(n) => {
modalState.update(n as any);
closeModal();
}}
allowedTypes={modalState.allowedTypes}
saveBtnCreateText={modalState.saveBtnCreateText}
/>
);
}
const elements = {
nodes: state.data.elements.nodes,
edges: state.data.elements.edges,
};
// main render
return (
<>
<Modal open={!!modalState}>{modalBody}</Modal>
<ReactFlow
className="dag-graphboard"
nodeTypes={nodeTypes}
fitView
minZoom={0.25}
nodesConnectable={false}
nodesDraggable={false}
{...elements}
>
<Controls showInteractive={false} />
</ReactFlow>
</>
);
};
@@ -0,0 +1,34 @@
import { ReactNode } from "react";
import { AutomationNodeTypes, AutomationSequenceNode } from "types/automations";
import { ElementData } from "../elements/types";
import { AutomationTrigger } from "types/automations/triggers";
export type DAGGraphBoardState =
| {
ready: false;
}
| {
ready: true;
data:
| {
error: ReactNode;
}
| {
elements: ElementData;
};
};
export type DAGGraphBoardProps = {
state: DAGGraphBoardState;
modalState?: ModalState;
closeModal: () => void;
};
export type ModalState<
T extends AutomationSequenceNode | AutomationTrigger = any
> = {
isError?: boolean;
node: T;
update: (n: T) => void;
saveBtnCreateText?: boolean;
allowedTypes: AutomationNodeTypes[];
};
@@ -0,0 +1,24 @@
import { DAGDims } from "./types";
export const NODE_WIDTH = 200 as const;
export const NODE_HEIGHT = 80 as const;
export const DEFAULT_DIMS: DAGDims = {
collection: {
height: NODE_HEIGHT * 3,
width: NODE_WIDTH * 1.5,
},
node: {
height: NODE_HEIGHT,
width: NODE_WIDTH,
},
distanceFactor: {
node: 1.5,
collection: 1,
},
position: {
x: 50,
y: 50,
},
flipped: true,
};
@@ -0,0 +1,67 @@
import { DAGDims, DAGEntities } from "./types";
import { XYPosition } from "react-flow-renderer";
export const moveAlong = (
by: keyof DAGEntities,
startPoint: XYPosition,
increment: number,
dims: DAGDims,
reversed: boolean = false
): XYPosition => {
const moveOnY = {
y: startPoint.y + dims[by].height * dims.distanceFactor.node * increment,
x: startPoint.x,
};
const moveOnX = {
x: startPoint.x + dims[by].width * dims.distanceFactor.node * increment,
y: startPoint.y,
};
if (reversed) {
return dims.flipped ? moveOnX : moveOnY;
}
return !dims.flipped ? moveOnX : moveOnY;
};
export const moveAlongRelativeTo = (
offsetPos: XYPosition,
relatedPos: XYPosition,
dims: DAGDims,
incrementBy: keyof DAGEntities = "collection"
) =>
dims.flipped
? {
x: relatedPos.x + dims.distanceFactor.node * dims[incrementBy].width,
y: offsetPos.y,
}
: {
y: relatedPos.y + dims.distanceFactor.node * dims[incrementBy].height,
x: offsetPos.x,
};
export const moveFromTo = (
from: keyof DAGEntities,
to: keyof DAGEntities,
startPoint: XYPosition,
dims: DAGDims
): XYPosition => {
if (!dims.flipped) {
return {
x: startPoint.x + dims[from].width * dims.distanceFactor.collection,
y: startPoint.y + (dims[from].height - dims[to].height) / 2,
};
} else {
return {
y: startPoint.y + dims[from].height * dims.distanceFactor.collection,
x: startPoint.x + (dims[from].width - dims[to].width) / 2,
};
}
};
export const offsetBy = (
by: keyof DAGEntities,
position: XYPosition,
dims: DAGDims
): XYPosition => ({
x: position.x + dims.distanceFactor[by] * dims[by].width,
y: position.y + dims.distanceFactor[by] * dims[by].height,
});
@@ -0,0 +1,470 @@
import React, { FC, useState } from "react";
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { DAGGraphBoard } from "components/DAGGraph/board";
import { useAutomationNodes } from "./index";
import { useHA } from "haService";
import { AutomationActionData } from "types/automations";
import { createUpdaterFromAutomationData } from "../updater";
import { ModalState } from "../board/types";
import { DEFAULT_DIMS } from "./constants";
const Demo: FC<{
automation: AutomationActionData;
flipped: boolean;
}> = (props) => {
const { namer } = useHA();
const [state, setState] = useState<AutomationActionData>(props.automation);
const [modalState, setModalState] =
useState<ModalState | undefined>(undefined);
const updater = createUpdaterFromAutomationData(
setModalState,
state,
setState
);
const elementData = useAutomationNodes(state, {
dims: {
...DEFAULT_DIMS,
flipped: props.flipped,
},
namer,
openModal: setModalState,
stateUpdater: updater,
});
return (
<DAGGraphBoard
modalState={modalState}
closeModal={() => setModalState(undefined)}
state={{
ready: true,
data: {
elements: elementData,
},
}}
/>
);
};
export default {
title: "DAGGraph/Elements",
component: Demo,
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
flipped: true,
automation: {
trigger: [],
condition: [],
sequence: [],
},
},
} as ComponentMeta<typeof Demo>;
const Template: ComponentStory<typeof Demo> = (args) => (
<Page>
<Demo {...args} />
</Page>
);
export const Empty = Template.bind({});
export const Trigger = Template.bind({});
Trigger.args = {
...Trigger.args,
automation: {
trigger: [
{ platform: "homeassistant", event: "up" },
{
platform: "tag",
tag_id: "Test Me",
device_id: "testme",
enabled: false,
},
],
condition: [],
sequence: [],
},
};
export const Conditions = Template.bind({});
Conditions.args = {
...Conditions.args,
automation: {
trigger: [
{
platform: "zone",
zone: "zone.home",
event: "enter",
entity_id: "person.ari",
},
],
condition: [
{
condition: "and",
conditions: [
{
condition: "numeric_state",
entity_id: "sensor.temperature_kitchen",
below: "15",
},
{
condition: "template",
value_template: 'states(switch.kitchen_light) == "on"',
},
],
},
{
condition: "numeric_state",
entity_id: "sensor.temperature_kitchen",
below: "15",
},
],
sequence: [],
},
};
export const FullAuto = Template.bind({});
FullAuto.args = {
...FullAuto.args,
automation: {
condition: [
{
condition: "and",
conditions: [
{
condition: "numeric_state",
entity_id: "sensor.temperature_kitchen",
below: "15",
},
{
condition: "template",
value_template: 'states(switch.kitchen_light) == "on"',
},
],
},
{
condition: "numeric_state",
entity_id: "sensor.temperature_kitchen",
below: "15",
},
],
trigger: [
{
platform: "numeric_state",
entity_id: "test",
},
{
platform: "homeassistant",
event: "start",
},
{
bad: "node",
} as any,
],
sequence: [
{
condition: "and",
conditions: [
{
condition: "numeric_state",
entity_id: "sensor.temperature_kitchen",
below: "15",
},
{
condition: "template",
value_template: 'states(switch.kitchen_light) == "on"',
},
],
},
{
alias: "Start Music In Kitchen",
service: "media_player.play_media",
target: {
entity_id: "media_player.kitchen_dot",
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
},
},
{
alias: "Bad Node",
},
{
choose: [
{
conditions: [
{
condition: "state",
entity_id: "lights.bathroom",
state: "off",
},
],
sequence: [
{
service: "light.turn_on",
target: {
entity_id: "lights.bathroom",
},
data: {},
},
{
alias: "Turn off bedroom",
service: "light.turn_off",
target: {
entity_id: "lights.bedroom",
},
data: {},
},
],
},
{
conditions: [
{
condition: "state",
entity_id: "lights.bedroom",
state: "off",
},
],
sequence: [
{
alias: "Turn on bedroom",
service: "light.turn_on",
target: {
entity_id: "lights.bedroom",
},
data: {},
},
{
choose: [
{
conditions: [],
sequence: [
{
choose: [],
default: [],
},
],
},
],
default: [
{
choose: [],
default: [],
},
],
},
],
},
],
default: [
{
service: "light.turn_off",
target: {
entity_id: "lights.bathroom",
},
data: {},
},
],
},
{
condition: "and",
conditions: [],
},
],
},
};
export const ChooseAuto = Template.bind({});
ChooseAuto.args = {
...ChooseAuto.args,
automation: {
condition: [],
trigger: [],
sequence: [
{
choose: [
{
conditions: [
{
condition: "state",
entity_id: "lights.bathroom",
state: "off",
},
],
sequence: [
{
service: "light.turn_on",
target: {
entity_id: "lights.bathroom",
},
data: {},
},
{
alias: "Turn off bedroom",
service: "light.turn_off",
target: {
entity_id: "lights.bedroom",
},
data: {},
},
],
},
{
conditions: [
{
condition: "state",
entity_id: "lights.bedroom",
state: "off",
},
],
sequence: [
{
alias: "Turn on bedroom",
service: "light.turn_on",
target: {
entity_id: "lights.bedroom",
},
data: {},
},
{
choose: [
{
conditions: [],
sequence: [
{
choose: [],
default: [],
},
],
},
],
default: [
{
choose: [],
default: [],
},
],
},
],
},
],
default: [
{
service: "light.turn_off",
target: {
entity_id: "lights.bathroom",
},
data: {},
},
],
},
{
choose: [],
default: [],
},
{
service: "switch.turn_on",
target: {
entity_id: "switch.light_balcony",
},
},
],
},
};
export const EmptyChooseAuto = Template.bind({});
EmptyChooseAuto.args = {
...EmptyChooseAuto.args,
automation: {
condition: [],
trigger: [],
sequence: [
{
choose: [],
default: [],
},
],
},
};
export const RepeatAuto = Template.bind({});
RepeatAuto.args = {
...RepeatAuto.args,
automation: {
condition: [],
trigger: [],
sequence: [
{
repeat: {
while: 'states(lights.switch) == "on"',
sequence: [
{
delay: {
minutes: 5,
},
},
],
},
},
{
repeat: {
until: [
{
condition: "state",
entity_id: "lights.bathroom",
state: "off",
},
],
sequence: [
{
entity_id: "button.ping_mainboard",
service: "button.pres",
},
],
},
},
{
repeat: {
count: 2,
sequence: [
{
entity_id: "button.ping_mainboard",
service: "button.pres",
},
],
},
},
],
},
};
export const ParallelAuto = Template.bind({});
ParallelAuto.args = {
...ParallelAuto.args,
automation: {
condition: [],
trigger: [],
sequence: [
{
parallel: [
{
sequence: [
{
delay: {
hours: 1,
},
},
{
service: "light.turn_on",
},
],
},
{
service: "light.turn_off",
},
],
},
],
},
};
@@ -0,0 +1,579 @@
import { DAGDims, ElementMaker, ElementMakerBaseProps } from "./types";
import { AutomationTrigger } from "types/automations/triggers";
import * as distance from "./distance";
import { getDescriptionFromAutomationNode } from "utils/formatting";
import {
AutomationActionData,
AutomationSequenceNode,
} from "types/automations";
import { AutomationCondition } from "types/automations/conditions";
import { CollectionNodeMaker } from "../nodes/CollectionNode";
import { XYPosition } from "react-flow-renderer";
import { DAGElementsOutputState } from "./outputState";
import { SequenceNodeMaker } from "../nodes/SequenceNode";
import {
getNodeType,
convertScriptConditionFieldToAutomationConditions,
} from "utils/automations";
import { ButtonNodeMaker } from "../nodes/ButtonNode";
import { AddIcon } from "components/Icons";
import { useDAGElementsState } from "./state";
import AddBox from "@mui/icons-material/AddBox";
import { DAGGraphChooseUpdater, DAGGraphUpdater } from "../updater";
import { getSpecialNodeMaker, makeSpecialNodeMaker } from "./specialnodes";
import { getNodeSubType } from "../../../utils/automations";
import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
import Add from "@mui/icons-material/Add";
export const useAutomationNodes = (
automation: AutomationActionData,
args: ElementMakerBaseProps
) => {
const dims: DAGDims = {
...args.dims,
};
const state = useDAGElementsState();
const outputState = new DAGElementsOutputState(dims.position, dims);
outputState.extend(
makeTriggerNodes(automation.trigger, {
...args,
state,
dims,
position: dims.position,
nodeId: `${dims.flipped}-trigger`,
nodeIndex: 0,
})
);
outputState.extend(
makeConditionNodes(automation.condition, {
...args,
state,
dims,
position: distance.moveFromTo(
"collection",
"collection",
outputState.getLastNodePos(),
dims
),
nodeId: `${dims.flipped}-condition`,
nodeIndex: 1,
lastNodeId: outputState.lastNodeId,
})
);
outputState.extend(
makeSequenceNodes(automation.sequence, {
...args,
state,
dims,
position: distance.moveFromTo(
"collection",
"node",
outputState.getLastNodePos(),
dims
),
nodeId: `${dims.flipped}-sequence`,
nodeIndex: 2,
lastNodeId: outputState.lastNodeId,
})
);
return outputState.data;
};
export const makeTriggerNodes: ElementMaker<AutomationTrigger> = (
nodes,
{ dims, namer, stateUpdater, nodeId, position }
) => {
const outputState = new DAGElementsOutputState(position, dims);
outputState.addNode(
CollectionNodeMaker.makeElement({ id: nodeId, position }, dims, {
...dims.collection,
collectionType: "trigger",
onAddNode: () => stateUpdater.basic.trigger.addNode(null),
nodes: nodes.map((node, index) => ({
enabled: node.enabled ?? true,
label: getDescriptionFromAutomationNode(node, namer, true),
...stateUpdater.createNodeActions("trigger", index, {}),
})),
})
);
return outputState;
};
export const makeConditionNodes: ElementMaker<AutomationCondition> = (
nodes,
{ nodeId, stateUpdater, position, dims, namer, lastNodeId }
) => {
const outputState = new DAGElementsOutputState(position, dims);
outputState.addNode(
CollectionNodeMaker.makeElement({ id: nodeId, position }, dims, {
...dims.collection,
collectionType: "condition",
hasInput: !!lastNodeId,
onAddNode: () => stateUpdater.basic.condition.addNode(null),
nodes: nodes.map((node, index) => ({
enabled: node.enabled ?? true,
label: getDescriptionFromAutomationNode(node, namer, true),
...stateUpdater.createNodeActions("condition", index, {}),
})),
})
);
if (lastNodeId && outputState.lastNodeId) {
outputState.addEdge(lastNodeId, outputState.lastNodeId, { animated: true });
}
return outputState;
};
export const makeSequenceNodes: ElementMaker<AutomationSequenceNode> = (
nodes,
args
) => {
const { lastNodeId, position, dims, namer, stateUpdater, state } = args;
const outputState = new DAGElementsOutputState(position, dims);
nodes.forEach((node, nodeIndex) => {
// the JSON.stringify is hack to make the edges render nicely
const nodeId = `${args.nodeId}-${
args.nodeIndex
}-${nodeIndex}-${JSON.stringify(node)}`;
outputState.incNextPos("node");
const element = outputState.addNode(
SequenceNodeMaker.makeElement(
{
id: nodeId,
position: outputState.nextPos,
},
dims,
{
color: getNodeType(node) === "action" ? "green" : "blue",
enabled: node.enabled ?? true,
label: getDescriptionFromAutomationNode(node, namer, true),
...state.getIsClosedActions(nodeId, node),
...stateUpdater.createNodeActions("sequence", nodeIndex, {
includeAdd: true,
flipped: dims.flipped,
}),
}
),
true
);
if (nodeIndex === 0 && lastNodeId) {
outputState.addEdge(lastNodeId, element.id);
}
const specialNodeMaker = getSpecialNodeMaker(
getNodeSubType(node, true) as any
);
if (specialNodeMaker) {
outputState.extend(
specialNodeMaker([node] as any, {
...args,
nodeId,
lastNodeId: element.id,
position: outputState.getLastNodePos(),
nodeIndex,
}),
true
);
}
});
const addElement = outputState.addNode(
ButtonNodeMaker.makeElement(
{
id: `${args.nodeId}-add-new`,
position: distance.moveAlong(
"node",
outputState.getLastNodePos(position),
1,
dims
),
},
dims,
{
icon: <AddIcon />,
onClick: () => stateUpdater.basic.sequence.addNode(null),
}
),
true
);
if (nodes.length === 0 && lastNodeId) {
outputState.addEdge(lastNodeId, addElement.id);
}
return outputState;
};
export const makeChooseeNodes = makeSpecialNodeMaker(
"choose",
(node, outputState, args) => {
// offset position
let offsetPos: XYPosition = distance.offsetBy(
"node",
args.position,
args.dims
);
let lastConditionState: DAGElementsOutputState | null = null;
// functions
const drawCondition = (
{ stateUpdater, onRemove }: DAGGraphChooseUpdater,
position: XYPosition,
lastNodeId: string | undefined,
nodeIndex: number,
conditions: AutomationCondition[]
) => {
const conditionState = makeConditionNodes(conditions, {
...args,
stateUpdater,
position,
lastNodeId,
nodeIndex,
nodeId: `${args.nodeId}-choose-${nodeIndex}-condition`,
});
lastConditionState = conditionState;
(conditionState.data.nodes[0].data as any).title = `Option ${
nodeIndex + 1
}`;
(conditionState.data.nodes[0].data as any).onDelete = onRemove;
conditionState.data.edges[0].sourceHandle = `side`;
conditionState.data.edges[0].label = `Option ${nodeIndex + 1}`;
conditionState.data.edges[0].style = {
stroke: "var(--mui-info-main)",
};
outputState.extend(conditionState);
return conditionState;
};
const drawSequence = (
{ stateUpdater }: DAGGraphChooseUpdater,
position: XYPosition,
lastNodeId: string | undefined,
nodeIndex: number,
sequence: AutomationSequenceNode[],
label: "else" | undefined
) => {
const output = makeSequenceNodes(sequence, {
...args,
stateUpdater,
position,
lastNodeId: undefined,
nodeIndex,
nodeId: `${args.nodeId}-choose-${nodeIndex}-sequence`,
});
if (lastNodeId && output.data.nodes.length > 0) {
outputState.addEdge(lastNodeId, output.data.nodes[0].id, {
animated: true,
label,
sourceHandle: label === "else" ? "side" : undefined,
style: {
stroke: "var(--mui-error-main)",
zIndex: -1,
},
});
}
return output;
};
// process options
for (let sIndex = 0; sIndex < node.choose.length; sIndex++) {
const stateUpdater = args.stateUpdater.createChoosNodeUpdater(
args.nodeIndex,
sIndex
);
let pos = offsetPos;
let lastNodeId = args.lastNodeId;
const conditionState = drawCondition(
stateUpdater,
pos,
lastNodeId,
sIndex,
node.choose[sIndex].conditions
);
pos = distance.moveFromTo("collection", "node", pos, args.dims);
lastConditionState = conditionState;
lastNodeId = conditionState.lastNodeId;
const sequence = node.choose[sIndex].sequence;
const output = drawSequence(
stateUpdater,
pos,
lastNodeId,
sIndex,
sequence,
undefined
);
offsetPos = distance.moveAlongRelativeTo(
offsetPos,
output.bbox[1],
args.dims,
"collection"
);
outputState.extend(output);
}
// else
const stateUpdater = args.stateUpdater.createChoosNodeUpdater(
args.nodeIndex,
"else"
);
let pos = offsetPos;
let lastNodeId = args.lastNodeId;
const elseOutput = drawSequence(
stateUpdater,
pos,
lastNodeId,
node.choose.length,
node.default ?? [],
"else"
);
offsetPos = distance.moveAlongRelativeTo(
offsetPos,
elseOutput.bbox[1],
args.dims,
"node"
);
outputState.extend(elseOutput);
// add btn
let addPos = distance.moveAlong(
"node",
elseOutput.data.nodes[0].position,
1 / args.dims.distanceFactor.node,
args.dims,
true
);
console.log({ addPos, lastConditionState });
if (lastConditionState !== null) {
addPos = distance.moveFromTo(
"collection",
"node",
(lastConditionState as DAGElementsOutputState).nextPos,
{
...args.dims,
flipped: !args.dims.flipped,
}
);
}
const addElement = outputState.addNode(
ButtonNodeMaker.makeElement(
{
id: `${args.nodeId}-choose-add-new`,
position: addPos,
},
args.dims,
{
text: "Option",
icon: <AddBox />,
onClick: () =>
args.stateUpdater.basic.sequence.updateNode(
{
...node,
choose: [
...node.choose,
{
conditions: [],
sequence: [],
},
],
},
args.nodeIndex
),
}
)
);
outputState.addEdge(args.nodeId, addElement.id, {
animated: true,
sourceHandle: "side",
});
}
);
export const makeRepeatNodes = makeSpecialNodeMaker(
"repeat",
(node, outputState, args) => {
// offset position
let offsetPos: XYPosition = distance.offsetBy(
"node",
args.position,
args.dims
);
let lastNodeId = args.lastNodeId;
const stateUpdater = args.stateUpdater.createRepeatNodeUpdater(
args.nodeIndex
);
let whileState: DAGElementsOutputState | null = null;
let untilState: DAGElementsOutputState | null = null;
// while
if ("while" in node.repeat) {
whileState = makeConditionNodes(
convertScriptConditionFieldToAutomationConditions(node.repeat.while),
{
...args,
stateUpdater: stateUpdater,
position: offsetPos,
lastNodeId,
nodeIndex: 0,
nodeId: `${args.nodeId}-repeat-while`,
}
);
whileState.data.edges[0].sourceHandle = `side`;
whileState.data.edges[0].label = `While`;
outputState.extend(whileState);
offsetPos = distance.moveFromTo(
"collection",
"node",
offsetPos,
args.dims
);
lastNodeId = whileState.lastNodeId;
}
// sequence
const sequenceState = makeSequenceNodes(node.repeat.sequence, {
...args,
stateUpdater: stateUpdater,
position: offsetPos,
lastNodeId: undefined,
nodeIndex: 0,
nodeId: `${args.nodeId}-repeat-sequence`,
});
if (lastNodeId && sequenceState.data.nodes.length > 0) {
outputState.addEdge(lastNodeId, sequenceState.data.nodes[0].id, {
animated: true,
label:
"count" in node.repeat
? `repeat ${node.repeat.count} time${
node.repeat.count !== 1 ? "s" : ""
}`
: "do",
});
}
lastNodeId = sequenceState.lastNodeId;
offsetPos = distance.moveAlongRelativeTo(
offsetPos,
sequenceState.bbox[1],
args.dims,
"node"
);
// until
if ("until" in node.repeat) {
untilState = makeConditionNodes(
convertScriptConditionFieldToAutomationConditions(node.repeat.until),
{
...args,
stateUpdater: stateUpdater,
position: offsetPos,
lastNodeId,
nodeIndex: 0,
nodeId: `${args.nodeId}-repeat-until`,
}
);
untilState.data.edges[0].label = `Until`;
untilState.data.edges[0].targetHandle = `side`;
outputState.extend(untilState);
offsetPos = distance.moveFromTo(
"collection",
"node",
offsetPos,
args.dims
);
lastNodeId = untilState.lastNodeId;
}
// loop
const firstNodeId =
whileState === null
? sequenceState.data.nodes[0].id
: whileState.lastNodeId;
const finalNodeId =
untilState === null ? sequenceState.lastNodeId : untilState.lastNodeId;
if (finalNodeId && firstNodeId) {
outputState.addEdge(finalNodeId, firstNodeId, {
animated: true,
label: "repeat",
sourceHandle: untilState === null ? "default" : "head",
targetHandle: "return",
});
}
outputState.extend(sequenceState);
}
);
export const makeParallelNodes = makeSpecialNodeMaker(
"parallel",
(node, outputState, args) => {
const offsetPos = distance.moveAlong("node", args.position, 0.5, args.dims);
for (let sIndex = 0; sIndex < node.parallel.length; sIndex++) {
const { stateUpdater, onRemove } =
args.stateUpdater.createParallelNodeUpdater(args.nodeIndex, sIndex);
const element = node.parallel[sIndex];
const deleteBtn = ButtonNodeMaker.makeElement(
{
id: `${args.nodeId}-${sIndex}-delete`,
position: distance.moveAlong(
"node",
offsetPos,
sIndex + 1,
args.dims,
true
),
},
args.dims,
{
icon: <DeleteForeverIcon />,
onClick: onRemove,
}
);
outputState.addNode(deleteBtn);
outputState.addEdge(args.nodeId, deleteBtn.id, {
sourceHandle: "side",
animated: true,
});
const sequence = "sequence" in element ? element.sequence : [element];
const sequenceState = makeSequenceNodes(sequence, {
...args,
stateUpdater,
lastNodeId: deleteBtn.id,
nodeIndex: sIndex,
nodeId: `${args.nodeId}-${sIndex}`,
position: distance.moveAlong("node", deleteBtn.position, 1, args.dims),
});
sequenceState.data.edges[0].sourceHandle = "next";
outputState.extend(sequenceState);
}
const addBtn = ButtonNodeMaker.makeElement(
{
id: `${args.nodeId}-add`,
position: distance.moveAlong(
"node",
offsetPos,
node.parallel.length + 1,
args.dims,
true
),
},
args.dims,
{
icon: <Add />,
onClick: () =>
args.stateUpdater.basic.sequence.updateNode(
{
...node,
parallel: [
...node.parallel,
{
sequence: [],
},
],
},
args.nodeIndex
),
}
);
outputState.addNode(addBtn);
outputState.addEdge(args.nodeId, addBtn.id, {
animated: true,
sourceHandle: "side",
});
}
);
@@ -0,0 +1,20 @@
import { updateBBox } from "./math";
test("compute bbox correctly", () => {
expect(
updateBBox(
[
{ x: 0, y: 0 },
{ x: 0, y: 0 },
],
{ x: 0, y: 70 },
{
height: 70,
width: 170,
}
)
).toStrictEqual([
{ x: 0, y: 0 },
{ x: 170, y: 140 },
]);
});
@@ -0,0 +1,37 @@
import { Node, XYPosition } from "react-flow-renderer";
import { Bbox, Size } from "./types";
export const pointApply = (
p1: XYPosition,
p2: XYPosition,
fcn: (a: number, b: number) => number
): XYPosition => ({
x: fcn(p1.x, p2.x),
y: fcn(p1.y, p2.y),
});
export const addSize = (p: XYPosition, size: Size): XYPosition => ({
x: p.x + size.width,
y: p.y + size.height,
});
export const updateBBox = (bbox: Bbox, p: XYPosition, size: Size): Bbox => {
const ps = addSize(p, size);
return [pointApply(bbox[0], ps, Math.min), pointApply(bbox[1], ps, Math.max)];
};
export const computeBBox = (nodes: Node[]): Bbox => {
return nodes.reduce(
(bbox: Bbox, n) => {
const p0 = n.position;
const height = n.data.height ?? n.style?.height;
const width = n.data.width ?? n.style?.width;
return updateBBox(bbox, p0, { height, width });
},
[
{ x: 0, y: 0 },
{ x: 0, y: 0 },
]
);
};
@@ -0,0 +1,110 @@
import { MarkerType, Edge, XYPosition } from "react-flow-renderer";
import { DAGAutomationFlowNode } from "../nodes";
import { addSize, pointApply } from "./math";
import { Bbox, DAGDims, DAGEntities, ElementData, LastNode } from "./types";
import { moveAlong } from "./distance";
export class DAGElementsOutputState {
public data: ElementData = {
nodes: [],
edges: [],
};
public lastNode?: LastNode;
public bbox: Bbox = [
{ x: 0, y: 0 },
{ x: 0, y: 0 },
];
constructor(public nextPos: XYPosition, public dims: DAGDims) {}
public extend(
other: DAGElementsOutputState,
ignoreLastNode: boolean = false
) {
this.data.nodes = this.data.nodes.concat(other.data.nodes);
this.data.edges = this.data.edges.concat(other.data.edges);
this.bbox[0] = pointApply(this.bbox[0], other.bbox[0], Math.min);
this.bbox[1] = pointApply(this.bbox[1], other.bbox[1], Math.max);
if (!ignoreLastNode) {
this.lastNode = other.lastNode;
this.nextPos = (this.lastNode as any).pos;
}
if (this.dims.flipped) {
this.nextPos = {
y: Math.max(this.nextPos.y, other.bbox[1].y),
x: this.nextPos.x,
};
} else {
this.nextPos = {
x: Math.max(this.nextPos.x, other.bbox[1].x),
y: this.nextPos.y,
};
}
}
public addNode(
node: DAGAutomationFlowNode,
addEdge: boolean = false,
animatedEdge: boolean = false
) {
if (addEdge && this.lastNodeId) {
this.addEdge(this.lastNodeId, node.id, {
animated: animatedEdge,
});
}
this.data.nodes.push(node);
this.bbox[0] = pointApply(this.bbox[0], node.position, Math.min);
this.bbox[1] = pointApply(
this.bbox[1],
addSize(node.position, node.data),
Math.max
);
this.lastNode = {
nodeId: node.id,
pos: node.position,
size: {
height: node.data.height,
width: node.data.width,
},
};
return node;
}
public addEdge(from: string, to: string, edgeProps: Partial<Edge> = {}) {
this.data.edges.push({
markerEnd: {
type: MarkerType.ArrowClosed,
width: 25,
height: 25,
},
...edgeProps,
id: `${from}->${to}`,
source: from,
target: to,
});
}
public get lastNodeId() {
if (this.lastNode) {
return this.lastNode.nodeId;
}
return undefined;
}
public getLastNodePos(orThis: XYPosition | undefined = undefined) {
if (this.lastNode) {
return this.lastNode.pos;
}
if (orThis) {
return orThis;
}
throw Error("missing lastnode");
}
public incNextPos(by: keyof DAGEntities) {
if (!this.lastNode) {
return;
}
this.nextPos = moveAlong(by, this.nextPos, 1, this.dims);
}
}
@@ -0,0 +1,43 @@
import { ActionType, ActionTypeMapping } from "types/automations/actions";
import { DAGElementsOutputState } from "./outputState";
import { ElementMaker, ElementMakerProps } from "./types";
const SpecialNodeRegistry: Partial<Record<ActionType, ElementMaker<any>>> = {};
export const makeSpecialNodeMaker = <
AT extends ActionType,
T extends ActionTypeMapping[AT]
>(
nodeType: AT,
run: (
node: T,
outputState: DAGElementsOutputState,
args: ElementMakerProps
) => any
): ElementMaker<T> => {
const elementMaker: ElementMaker<T> = (nodes, args) => {
const outputState = new DAGElementsOutputState(args.position, args.dims);
if (nodes.length !== 1) {
throw new Error("makeChooseNodes only access a list of 1");
}
const node = nodes[0];
if (
!(node.enabled ?? true) ||
args.state.get(args.lastNodeId ?? "").isClosed
) {
return outputState;
}
run(node, outputState, args);
return outputState;
};
SpecialNodeRegistry[nodeType] = elementMaker;
return elementMaker;
};
export const getSpecialNodeMaker = <AT extends ActionType>(
nodeType: AT
): ElementMaker<AT> | null => SpecialNodeRegistry[nodeType] ?? null;
@@ -0,0 +1,39 @@
import { useState } from "react";
import { AutomationNode } from "types/automations";
export type DAGNodeState = Partial<{
isClosed: boolean;
}>;
export type DAGElementsState = ReturnType<typeof useDAGElementsState>;
export const useDAGElementsState = () => {
const [data, setData] = useState<Record<string, DAGNodeState>>({});
return {
get(nodeId: string): DAGNodeState {
return data[nodeId] ?? {};
},
set<K extends keyof DAGNodeState>(
nodeId: string,
key: K,
value: DAGNodeState[K]
) {
setData({
...data,
[nodeId]: {
...(data[nodeId] ?? {}),
[key]: value,
},
});
},
getIsClosedActions(nodeId: string, node: AutomationNode) {
if ("choose" in node || "repeat" in node) {
return {
isClosed: this.get(nodeId).isClosed ?? false,
setIsClosed: (v: boolean) => this.set(nodeId, "isClosed", v),
};
}
return {};
},
};
};
@@ -0,0 +1,47 @@
import { Edge, XYPosition } from "react-flow-renderer";
import { AutomationNode } from "types/automations";
import { Namer } from "utils/formatting";
import { ModalState } from "../board/types";
import { DAGAutomationFlowNode } from "../nodes";
import { DAGGraphUpdater } from "../updater";
import { DAGElementsOutputState } from "./outputState";
import { DAGElementsState } from "./state";
export type Bbox = [XYPosition, XYPosition];
export type Size = { height: number; width: number };
export type ElementData = {
nodes: DAGAutomationFlowNode[];
edges: Edge[];
};
export type DAGEntityDim = Size;
export type DAGEntities = {
node: DAGEntityDim;
collection: DAGEntityDim;
};
export type DAGDims = DAGEntities & {
position: XYPosition;
distanceFactor: Record<keyof DAGEntities, number>;
flipped: boolean;
};
export type ElementMakerBaseProps = {
stateUpdater: DAGGraphUpdater;
dims: DAGDims;
namer: Namer;
openModal: (m: ModalState) => void;
};
export type ElementMakerProps = ElementMakerBaseProps & {
nodeId: string;
nodeIndex: number;
position: XYPosition;
lastNodeId?: string;
state: DAGElementsState;
};
export type LastNode = {
nodeId: string;
pos: XYPosition;
size: Size;
};
export type ElementMaker<A extends AutomationNode = AutomationNode> = (
haNodes: A[],
args: ElementMakerProps
) => DAGElementsOutputState;
@@ -0,0 +1,49 @@
import { Button } from "components/Inputs/Button";
import InputYaml from "components/Inputs/InputYaml";
import { FC } from "react";
import { DAGGraphBoardProps } from "../board/types";
export const ErroredBoard: FC<
DAGGraphBoardProps & {
error: Error | any;
}
> = (props) => {
// const makeSet = <K extends keyof FailedStateData>(k: K) => (d: FailedStateData[K]) => this.setState({
// ...this.state,
// [k]: d,
// });
// const makeSave = <K extends keyof FailedStateData>(k: K) => () => {
// if (!this.state.hasError) {
// return
// }
// if (k === 'condition') {
// this.props.onConditionUpdate(this.state.condition)
// } else if (k === 'sequence') {
// this.props.onSequenceUpdate(this.state.sequence)
// } else if (k === 'trigger') {
// this.props.onTriggerUpdate(this.state.trigger)
// }
// }
return (
<div className="dag-flow-safe">
<h1>An Error has occured.</h1>
<h1>Failed to Open Autmation!</h1>
Something is likely not configured in your automation properly.
<hr />
<h2>Error:</h2>
{/* <h2>{String(this.state.error)}</h2> */}
<br />
{/* {JSON.stringify(this.state.error, null, 4)} */}
{/* {this.state.errorInfo && this.state.errorInfo.componentStack.split('\n').map((s, i) => <>
<span key={i}>{s}</span><br key={`br-${i}`} />
</>)} */}
<h2>Automation YAML</h2>
{/* <InputYaml label="Trigger" value={this.state.trigger} onChange={makeSet('trigger')} />
<Button onClick={makeSave('trigger')}>Save Triggers</Button>
<InputYaml label="Condition" value={this.state.condition} onChange={makeSet('condition')} />
<Button onClick={makeSave('condition')}>Save Conditions</Button>
<InputYaml label="Action" value={this.state.sequence} onChange={makeSet('sequence')} />
<Button onClick={makeSave('sequence')}>Save Actions</Button> */}
</div>
);
};
+70
View File
@@ -0,0 +1,70 @@
import { FC, useState } from "react";
import {
AutomationActionData,
AutomationSequenceNode,
} from "types/automations";
import { useHA } from "haService";
import { ModalState } from "./board/types";
import { createUpdater } from "./updater";
import { useAutomationNodes } from "./elements";
import { DEFAULT_DIMS } from "./elements/constants";
import { DAGGraphBoard } from "./board";
import { AutomationTrigger } from "types/automations/triggers";
import { AutomationCondition } from "types/automations/conditions";
export const DAGAutomationGraph: FC<{
sequence: AutomationSequenceNode[];
trigger: AutomationTrigger[];
condition: AutomationCondition[];
onSequenceUpdate: (s: AutomationSequenceNode[]) => void;
onTriggerUpdate: (t: AutomationTrigger[]) => void;
onConditionUpdate: (c: AutomationCondition[]) => void;
isFlipped: boolean;
}> = (props) => {
const { namer } = useHA();
const [modalState, setModalState] =
useState<ModalState | undefined>(undefined);
const updater = createUpdater({
openModal: setModalState,
sequence: {
data: props.sequence,
onUpdate: props.onSequenceUpdate,
},
condition: {
data: props.condition,
onUpdate: props.onConditionUpdate as any,
},
trigger: {
data: props.trigger,
onUpdate: props.onTriggerUpdate as any,
},
});
const elementData = useAutomationNodes(
{
sequence: props.sequence,
condition: props.condition,
trigger: props.trigger,
},
{
dims: {
...DEFAULT_DIMS,
flipped: props.isFlipped,
},
namer,
openModal: setModalState,
stateUpdater: updater,
}
);
return (
<DAGGraphBoard
modalState={modalState}
closeModal={() => setModalState(undefined)}
state={{
ready: true,
data: {
elements: elementData,
},
}}
/>
);
};
@@ -0,0 +1,92 @@
import React from "react";
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { ButtonNode } from "./ButtonNode";
import { DAGGraphBoard } from "components/DAGGraph/board";
import { ButtonNodeMaker } from ".";
import { DEFAULT_DIMS } from "../../elements/constants";
import { AddIcon } from "components/Icons";
import { SequenceNodeMaker } from "../SequenceNode";
export default {
title: "DAGGraph/Nodes/Button",
component: ButtonNode,
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
icon: <AddIcon />,
flipped: true,
...DEFAULT_DIMS.node,
},
} as ComponentMeta<typeof ButtonNode>;
const Template: ComponentStory<typeof ButtonNode> = (args) => {
const dims = {
...DEFAULT_DIMS,
...args,
};
return (
<Page>
<DAGGraphBoard
closeModal={() => {}}
state={{
ready: true,
data: {
elements: {
edges: [
{
id: `${dims.flipped}-1`,
source: `${dims.flipped}-node`,
target: `${dims.flipped}-button`,
},
],
nodes: [
SequenceNodeMaker.makeElement(
{
id: `${dims.flipped}-node`,
position: {
x: 0,
y: 0,
},
},
dims,
{
label: "test",
color: "lblue",
enabled: true,
}
),
ButtonNodeMaker.makeElement(
{
id: `${dims.flipped}-button`,
position: !dims.flipped
? {
x:
DEFAULT_DIMS.node.width *
DEFAULT_DIMS.distanceFactor.node,
y: 0,
}
: {
x: 0,
y:
DEFAULT_DIMS.node.height *
DEFAULT_DIMS.distanceFactor.node,
},
},
dims,
args
),
],
},
},
}}
/>
</Page>
);
};
export const Basic = Template.bind({});
export const Text = Template.bind({});
Text.args = {
...Text.args,
text: "Option",
};
@@ -0,0 +1,19 @@
.button-node {
max-width: var(--button-width);
max-height: var(--button-height);
min-width: var(--button-width);
min-height: var(--button-height);
width: var(--button-width);
height: var(--button-height);
overflow: hidden;
display: flex;
justify-content: center;
align-items: center;
/* outline: 1px dashed white; */
}
.button-node button {
display: flex;
gap: 0.25em;
}
@@ -0,0 +1,57 @@
import "./ButtonNode.css";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import { FC } from "react";
import { ButtonNodeProps } from "./types";
import { Handle, Position } from "react-flow-renderer";
import { Button } from "components/Inputs/Button";
export const ButtonNode: FC<ButtonNodeProps> = ({
height,
width,
icon,
flipped,
onClick,
text,
}) => {
const inner = (
<>
<Handle
id="default"
type="target"
position={flipped ? Position.Top : Position.Left}
/>
{icon}
<Handle
id="default"
type="source"
position={!flipped ? Position.Bottom : Position.Right}
/>
<Handle
id="next"
type="source"
position={!flipped ? Position.Right : Position.Bottom}
/>
</>
);
return (
<div
className="button-node"
style={
{
"--button-height": `${height}px`,
"--button-width": `${width}px`,
} as any
}
>
{!text ? (
<ButtonIcon icon={inner} onClick={onClick} />
) : (
<Button onClick={onClick}>
{inner}
{text}
</Button>
)}
</div>
);
};
@@ -0,0 +1,13 @@
import { NodeManager } from "components/DAGGraph/nodes/NodeManager";
import { ButtonNode } from "./ButtonNode";
import { ButtonNodeDataProps } from "./types";
export const ButtonNodeMaker = NodeManager.register(
"ButtonNode",
ButtonNode,
(pre: ButtonNodeDataProps, { node, flipped }) => ({
...node,
...pre,
flipped,
})
);
@@ -0,0 +1,13 @@
import { ReactNode } from "react";
export type ButtonNodeDataProps = {
icon: ReactNode;
onClick: () => void;
text?: string;
};
export type ButtonNodeProps = ButtonNodeDataProps & {
width: number;
height: number;
flipped: boolean;
};
@@ -0,0 +1,72 @@
.collection-nodes--wrap {
--padding-left: 1.5em;
--padding-right: 3em;
--padding-top: 2.25em;
--padding-bottom: 0.25em;
--child-height: calc(var(--node-height) - var(--padding-top) - var(--padding-bottom));
--child-width: calc(var(--node-width) - var(--padding-left) - var(--padding-right));
min-width: var(--node-width);
min-height: var(--node-height);
max-width: var(--node-width);
max-height: var(--node-height);
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
/* outline: 1px dotted white; */
}
.collection-nodes {
position: relative;
border-color: var(--node-color);
border-style: solid;
border-width: 1px;
border-radius: 10px;
max-width: max-content;
max-height: max-content;
padding-right: var(--padding-right);
}
.collection-nodes--inner {
display: flex;
flex-wrap: wrap;
flex-direction: column;
align-items: center;
justify-content: space-around;
gap: 0 1em;
max-width: var(--child-width);
max-height: var(--child-height);
min-height: calc(var(--child-height) / 4);
min-width: var(--child-width);
padding-left: var(--padding-left);
padding-top: var(--padding-top);
padding-bottom: var(--padding-bottom);
overflow: auto;
}
.collection-nodes--total {
position: absolute;
bottom: 0.25em;
right: 0.25em;
font-size: 0.5em;
}
.collection-nodes .add {
position: absolute;
bottom: calc(50% - var(--padding-bottom));
right: 0.25em;
}
.collection-nodes--title {
position: absolute;
top: 0.5em;
left: calc(var(--child-width)/2);
}
@@ -0,0 +1,123 @@
import "./CollectionNode.css";
import Add from "@mui/icons-material/Add";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import { FC } from "react";
import { SequenceNodeElement } from "../SequenceNode/SequenceNodeElement";
import { CollectionNodeProps } from "./types";
import { Handle, Position } from "react-flow-renderer";
import { useSequenceNodeColor } from "../SequenceNode/util";
import { prettyName } from "utils/formatting";
import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
import { useConfirm } from "material-ui-confirm";
import { useSnackbar } from "notistack";
export const CollectionNode: FC<CollectionNodeProps> = ({
onAddNode,
nodes,
sequenceNode,
height,
width,
flipped,
color,
collectionType,
onDelete,
title,
}) => {
const nodeColor = useSequenceNodeColor(color);
const confirm = useConfirm();
const snackbr = useSnackbar();
const trueTile = title ?? collectionType;
return (
<div
className="collection-nodes--wrap"
style={
{
"--node-color": nodeColor,
"--node-height": `${height}px`,
"--node-width": `${width}px`,
} as any
}
>
<div className="collection-nodes">
{!!onDelete && (
<ButtonIcon
className="delete-icon"
icon={<DeleteForeverIcon />}
onClick={() => {
confirm({
description: `Are you sure you want to delete ${trueTile}?`,
})
.then(() => {
onDelete();
snackbr.enqueueSnackbar("Deleted.", {
variant: "info",
});
})
.catch(() =>
snackbr.enqueueSnackbar(`Did not delete ${trueTile}.`, {
variant: "info",
})
);
}}
borderless
color="secondary"
/>
)}
<span className="collection-nodes--title">
{prettyName(collectionType)}s
</span>
<div className="collection-nodes--inner">
{nodes.map((n, i) => (
<SequenceNodeElement
{...n}
{...sequenceNode}
key={i}
color={color}
flipped={flipped}
/>
))}
</div>
<ButtonIcon className="add" icon={<Add />} onClick={onAddNode} />
<>
<Handle
id="default"
key="source-def"
type="source"
position={flipped ? Position.Bottom : Position.Right}
/>
<Handle
id="head"
key="source-head"
type="source"
position={flipped ? Position.Top : Position.Left}
/>
</>
<>
<Handle
id="default"
key="target-def"
type="target"
position={flipped ? Position.Top : Position.Left}
/>
<Handle
id="side"
key="target-side"
type="target"
position={!flipped ? Position.Right : Position.Left}
/>
<Handle
id="return"
key="target-return"
type="target"
position={!flipped ? Position.Bottom : Position.Right}
/>
</>
<span className="collection-nodes--total">
{nodes.length} node{nodes.length !== 1 ? "s" : ""}
</span>
</div>
</div>
);
};
@@ -0,0 +1,233 @@
import React, { FC } from "react";
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { CollectionNode } from "./CollectionNode";
import { DAGGraphBoard } from "components/DAGGraph/board";
import { CollectionNodeMaker } from "./index";
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
import { ButtonNodeMaker } from "../ButtonNode";
import { AddCircle } from "@mui/icons-material";
import { MarkerType } from "react-flow-renderer";
type DemoProps = {
height: number;
width: number;
totalChildNodes: number;
onAddNode: () => void;
hasDelete: boolean;
enabledChild: boolean;
};
const Demo: FC<DemoProps> = (args) => {
return (
<Page>
<DAGGraphBoard
closeModal={() => {}}
state={{
ready: true,
data: {
elements: {
edges: [],
nodes: ["trigger", "sequence", "condition"].map(
(collectionType: any, i: number) =>
CollectionNodeMaker.makeElement(
{
id: collectionType,
position: {
x: 50 + args.width * (i % 3 === 0 ? 1 : 0),
y: 50 + args.height * ((i + 1) % 2 === 0 ? 1 : 0),
},
},
DEFAULT_DIMS,
{
hasInput: false,
onAddNode: args.onAddNode,
onDelete: args.hasDelete ? console.info : undefined,
width: args.width,
height: args.height,
nodes: [
{
enabled: args.enabledChild,
label: collectionType,
},
...Array.from(Array(args.totalChildNodes)).map(
(_, i) => ({
enabled: true,
label: `Dummy Node #${i + 1}`,
})
),
],
collectionType,
}
)
),
},
},
}}
/>
</Page>
);
};
export default {
title: "DAGGraph/Nodes/Collection",
component: Demo,
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
...DEFAULT_DIMS.collection,
totalChildNodes: 1,
enabledChild: true,
hasDelete: false,
},
} as ComponentMeta<typeof Demo>;
export const Colors: ComponentStory<typeof Demo> = (args) => <Demo {...args} />;
export const Empty: ComponentStory<typeof Demo> = (args) => {
return (
<Page>
<DAGGraphBoard
closeModal={() => {}}
state={{
ready: true,
data: {
elements: {
edges: [],
nodes: [
CollectionNodeMaker.makeElement(
{
id: "only-one",
position: {
x: 50,
y: 50,
},
},
DEFAULT_DIMS,
{
hasInput: false,
onDelete: args.hasDelete ? console.info : undefined,
onAddNode: args.onAddNode,
width: args.width,
height: args.height,
nodes: [
...Array.from(Array(args.totalChildNodes)).map(
(_, i) => ({
enabled: true,
label: `Dummy Node #${i + 1}`,
})
),
],
collectionType: "condition",
}
),
],
},
},
}}
/>
</Page>
);
};
Empty.args = {
...Empty.args,
totalChildNodes: 0,
};
export const ReturnTarget: ComponentStory<typeof Demo> = (args) => {
return (
<Page>
<DAGGraphBoard
closeModal={() => {}}
state={{
ready: true,
data: {
elements: {
edges: [
{
id: "1",
source: "root",
target: "btn",
label: "1",
},
{
id: "2",
target: "root",
source: "btn",
animated: true,
targetHandle: "return",
label: "2",
markerEnd: {
type: MarkerType.ArrowClosed,
width: 25,
height: 25,
},
},
{
id: "3",
target: "root",
source: "btn",
label: "3",
},
],
nodes: [
ButtonNodeMaker.makeElement(
{
id: "btn",
position: {
x: 50 + (args.width - DEFAULT_DIMS.node.width) / 2,
y:
50 +
args.height *
2 *
DEFAULT_DIMS.distanceFactor.collection,
},
},
DEFAULT_DIMS,
{
icon: <AddCircle />,
onClick: () => {},
}
),
CollectionNodeMaker.makeElement(
{
id: "root",
position: {
x: 50,
y: 50,
},
},
DEFAULT_DIMS,
{
onDelete: args.hasDelete ? console.info : undefined,
onAddNode: args.onAddNode,
width: args.width,
height: args.height,
nodes: [
{
enabled: args.enabledChild,
label: "condition",
},
...Array.from(Array(args.totalChildNodes)).map(
(_, i) => ({
enabled: true,
label: `Dummy Node #${i + 1}`,
})
),
],
collectionType: "condition",
}
),
],
},
},
}}
/>
</Page>
);
};
export const DeleteIconExample = Empty.bind({});
DeleteIconExample.args = {
...DeleteIconExample.args,
hasDelete: true,
};
@@ -0,0 +1,19 @@
import { NodeManager } from "components/DAGGraph/nodes/NodeManager";
import { CollectionNode } from "./CollectionNode";
import { CollectionNodeDataProps } from "./types";
import { SequenceNodeColor } from "../SequenceNode/types";
export const CollectionNodeMaker = NodeManager.register(
"CollectionNode",
CollectionNode,
(pre: CollectionNodeDataProps, { node, flipped }) => ({
...pre,
color: (pre.collectionType === "condition"
? "blue"
: pre.collectionType === "sequence"
? "green"
: "red") as SequenceNodeColor,
sequenceNode: node,
flipped,
})
);
@@ -0,0 +1,23 @@
import { Size } from "components/DAGGraph/elements/types";
import { ReactNode } from "react";
import { SequenceNodeActions, SequenceNodeColor } from "../SequenceNode/types";
import { AutomationActionData } from "types/automations";
export type CollectionNodeChildProps = Partial<SequenceNodeActions> & {
enabled: boolean;
label: ReactNode;
};
export type CollectionNodeDataProps = Size & {
nodes: CollectionNodeChildProps[];
onAddNode: () => void;
hasInput?: boolean;
collectionType: keyof AutomationActionData;
onDelete?: () => void;
title?: string;
};
export type CollectionNodeProps = CollectionNodeDataProps & {
sequenceNode: Size;
flipped: boolean;
color: SequenceNodeColor;
};
@@ -0,0 +1,38 @@
import { FC } from "react";
import { NodeProps, XYPosition, Node } from "react-flow-renderer";
import { DAGDims } from "../elements/types";
export type NodeMaker = ReturnType<typeof makeNodeMaker>;
export const makeNodeMaker = <
NodeType extends string,
PreNodeData extends {},
NodeData extends {}
>(
nodeType: NodeType,
DAGNode: FC<NodeData>,
convert: (pre: PreNodeData, dims: DAGDims) => NodeData
) => {
return {
get nodeType() {
return nodeType;
},
GraphNode: (p: NodeProps<NodeData>) => {
return <DAGNode {...p.data} />;
},
makeElement(
reactFlowProps: {
id: string;
position: XYPosition;
parentNode?: string;
},
dims: DAGDims,
data: PreNodeData
): Node<NodeData> {
return {
...reactFlowProps,
type: nodeType,
data: convert(data, dims),
};
},
};
};
@@ -0,0 +1,27 @@
import { FC } from "react";
import { NodeTypes } from "react-flow-renderer";
import { makeNodeMaker } from "./NodeMaker";
import { DAGDims } from "../elements/types";
export type NodeManager = typeof NodeManager;
export const NodeManager = (() => {
const nodeTypes: NodeTypes = {};
return {
get nodeTypes() {
return nodeTypes;
},
register: <
NodeType extends string,
PreNodeData extends {},
NodeData extends {}
>(
nodeType: NodeType,
DAGNode: FC<NodeData>,
convert: (pre: PreNodeData, dims: DAGDims) => NodeData
) => {
const nodeMaker = makeNodeMaker(nodeType, DAGNode, convert);
nodeTypes[nodeMaker.nodeType] = nodeMaker.GraphNode;
return nodeMaker;
},
};
})();
@@ -0,0 +1,156 @@
.sequence-node {
font-size: 0.9em;
display: flex;
justify-content: center;
align-items: center;
cursor: default;
max-height: var(--sequence-node-height);
max-width: var(--sequence-node-width);
height: var(--sequence-node-height);
width: var(--sequence-node-width);
min-height: var(--sequence-node-height);
min-width: var(--sequence-node-width);
/* outline: 1px dotted white; */
}
.sequence-node.disabled .sequence-node--inner {
background-color: var(--mui-grey-500);
}
.sequence-node.enabled .sequence-node--inner {
background-color: var(--mui-background-default);
}
.sequence-node--inner {
position: relative;
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
padding: 0.25em 0.75em 0.5em 0.75em;
border-style: solid;
border-top-width: 0.25em;
border-left-width: 1px;
border-right-width: 1px;
border-radius: 10px;
border-bottom-color: var(--mui-grey-500);
border-left-color: var(--mui-grey-700);
border-right-color: var(--mui-grey-700);
border-top-color: var(--sequence-node-color);
max-height: calc(var(--sequence-node-height) - 1em);
max-width: calc(var(--sequence-node-width) - 1em);
min-width: calc(max(var(--sequence-node-width) / 2, var(--sequence-node-height) / 2));
}
.sequence-node.closed .sequence-node--label .icon {
transform: rotate(180deg);
color: var(--mui-primary-main);
}
.sequence-node.closed:hover .sequence-node--label .icon, .sequence-node.open:hover .sequence-node--label .icon {
outline: 1px solid var(--mui-secondary-main);
color: var(--mui-secondary-main);
border-radius: 50px;
transform: scale(0.95, 0.95);
}
.sequence-node.open:hover .sequence-node--label .icon {
transform: rotate(-10deg);
}
.sequence-node.closed:hover .sequence-node--label .icon {
transform: rotate(190deg);
}
.sequence-node.closed .sequence-node--label, .sequence-node.open .sequence-node--label {
cursor: pointer;
}
.sequence-node--label {
flex: 1;
display: flex;
align-items: flex-start;
justify-content: center;
overflow: hidden;
max-height: calc(var(--sequence-node-height) - 1em);
max-width: calc(var(--sequence-node-width) - 1em);
min-height: 1em;
}
.sequence-node--label span {
text-align: center;
white-space: break-word;
overflow: hidden;
text-overflow: ellipsis;
}
.sequence-node--enabled-flag {
position: absolute;
top: -1.5em;
right: -2.5em;
}
.sequence-node--midway-options {
position: absolute;
bottom: -2.5em;
left: calc(50%-0.5em);
z-index: 10;
}
.sequence-node--midway-options button {
padding: 0;
color: var(--mui-primary-main);
background-color: var(--mui-primary-contrastText);
}
.sequence-node--midway-options button:hover {
color: var(--mui-primary-dark);
background-color: var(--mui-primary-contrastText);
}
.sequence-node .sequence-node--inner .speed-dial {
height: 2em;
width: 2em;
min-height: 2em;
max-height: 2em;
position: absolute;
top: -1em;
left: -1em;
background-color: var(--mui-common-black);
border-color: var(--mui-grey-400);
border-style: solid;
border-width: 0.5px;
border-radius: 20px;
}
.open>.sequence-node--actions-btn, .sequence-node--actions-btn:hover {
color: var(--mui-common-black);
background-color: var(--mui-grey-400);
border-radius: 20px;
}
.sequence-node--actions--move .icon-2 {
position: absolute;
bottom: 10%;
left: 60%;
font-size: 0.75em;
}
.sequence-node--actions--move.right {
transform: rotate(180deg);
}
.sequence-node--actions--move.up {
transform: rotate(90deg);
}
.sequence-node--actions--move.down {
transform: rotate(270deg);
}
@@ -0,0 +1,107 @@
import React from "react";
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { SequenceNode } from "./SequenceNode";
import { DAGGraphBoard } from "components/DAGGraph/board";
import { SequenceNodeMaker } from "./index";
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
export default {
title: "DAGGraph/Nodes/Sequence",
component: SequenceNode,
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
...DEFAULT_DIMS.node,
color: "lblue",
label: "test",
hasInput: true,
enabled: true,
},
} as ComponentMeta<typeof SequenceNode>;
const Template: ComponentStory<typeof SequenceNode> = (args) => {
return (
<Page>
<DAGGraphBoard
closeModal={() => {}}
state={{
ready: true,
data: {
elements: {
edges: [],
nodes: [
SequenceNodeMaker.makeElement(
{
id: "test",
position: {
x: 50,
y: 50,
},
},
DEFAULT_DIMS,
args
),
],
},
},
}}
/>
</Page>
);
};
export const Colors: ComponentStory<typeof SequenceNode> = (args) => {
return (
<Page>
<DAGGraphBoard
closeModal={() => {}}
state={{
ready: true,
data: {
elements: {
edges: [],
nodes: ["blue", "red", "green", "lblue"].map((color: any, i) =>
SequenceNodeMaker.makeElement(
{
id: color,
position: {
x:
50 +
DEFAULT_DIMS.node.height *
DEFAULT_DIMS.distanceFactor.node *
i,
y:
50 +
DEFAULT_DIMS.node.height *
DEFAULT_DIMS.distanceFactor.node *
i,
},
},
DEFAULT_DIMS,
{ ...args, color }
)
),
},
},
}}
/>
</Page>
);
};
export const OnMoveAllDirections = Template.bind({});
OnMoveAllDirections.args = {
...OnMoveAllDirections.args,
onMove: {
up: console.info,
down: console.info,
left: console.info,
right: console.info,
},
onAdd: {
up: console.info,
down: console.info,
left: console.info,
right: console.info,
},
};
@@ -0,0 +1,35 @@
import { FC } from "react";
import { Handle, Position } from "react-flow-renderer";
import { SequenceNodeProps } from "./types";
import { SequenceNodeElement } from "./SequenceNodeElement";
export const SequenceNode: FC<SequenceNodeProps> = (props) => {
return (
<SequenceNodeElement {...props}>
<>
<Handle
id="default"
key="target-default"
type="target"
position={props.flipped ? Position.Top : Position.Left}
/>
<Handle
id="return"
key="target-return"
type="target"
position={props.flipped ? Position.Right : Position.Bottom}
/>
</>
<Handle
type="source"
position={props.flipped ? Position.Bottom : Position.Right}
/>
<Handle
id="side"
type="source"
position={props.flipped ? Position.Right : Position.Bottom}
/>
</SequenceNodeElement>
);
};
Loaded 100 of 203 files, more files were not shown because too many files have changed in this diff. Show more