Compare commits

...
222 Commits
Author SHA1 Message Date
ari 67f5358f45 $ 2022-07-21 09:55:01 -04:00
ari c40e441f33 t2 2022-07-21 09:53:27 -04:00
ari a3ee13e8e3 rename test 2022-07-21 09:50:41 -04:00
ari a3fa409eda pre 2022-07-21 09:49:49 -04:00
ari 7ac7d60468 testing releases 2022-07-21 09:49:16 -04:00
dependabot[bot] cb34db3c86 Bump terser from 4.8.0 to 4.8.1 in /webapp (#80)
Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-21 09:37:44 -04:00
ari ea8697137a fixed pytests 2022-07-21 09:37:23 -04:00
Ari Sosnovsky e9246a5b6c Update TriggerTime.tsx 2022-07-20 22:45:18 -04:00
Ari Sosnovsky d121082d4f Update triggers.ts 2022-07-20 22:44:10 -04:00
Ari Sosnovsky 2605978b43 Update editorRender.tsx 2022-07-20 22:43:18 -04:00
Ari Sosnovsky f5b21be26d Update README.md 2022-07-20 22:19:27 -04:00
ari 582859b35b added weekday and refactored condition time 2022-07-20 22:13:46 -04:00
ari 184734ee70 abstracted away input time entity 2022-07-20 22:13:46 -04:00
ari 3a44057a40 cleaned up time trigger 2022-07-20 22:13:46 -04:00
Ari Sosnovsky ef02abe0cb Update README.md 2022-07-19 21:59:37 -04:00
ari 1d52993253 cleaned up unused 2022-07-19 21:47:36 -04:00
ari 50031c4868 area id incorrect errror 2022-07-19 21:22:49 -04:00
ari b3dae6fea7 fixed area id incorrect error 2022-07-19 21:22:43 -04:00
ari fd35938fcb fixed state 2022-07-19 21:13:19 -04:00
ari 649ee0f31e fixed zones 2022-07-19 20:59:11 -04:00
ari e7110dc97b new conditions open up in edit mode 2022-07-19 20:44:37 -04:00
ari dcf577f84c cleaned up choose + distance between nodes 2022-07-19 20:27:02 -04:00
ari fabb5612d5 ground work for minimal tag update 2022-07-18 16:12:48 -04:00
ari 2958fa49f8 action fix 2022-07-18 14:29:33 -04:00
ari 211f5d8be7 updated actions + v0.3.2 2022-07-18 14:28:46 -04:00
ari 3dac905fda cleaner job 2022-07-18 13:50:50 -04:00
ari 75d70b1133 using slim 2022-07-18 13:47:59 -04:00
ari 47b0c89589 correct run.sh 2022-07-18 13:47:37 -04:00
ari 212349b4c0 nomo rust 2022-07-18 13:30:56 -04:00
ari a4789cf43e buster 2022-07-18 13:30:45 -04:00
ari 395a9d955e swiching to hypercorn 2022-07-18 13:30:33 -04:00
ari 937a3f97c4 switching to hypercorn 2022-07-18 13:30:24 -04:00
ari 6bb18563b4 using buster image 2022-07-18 12:58:57 -04:00
ari 2a9ba678d3 only run tests when api or webapp changes 2022-07-18 12:50:13 -04:00
ari 38e362a469 passing -y to rustup 2022-07-18 12:48:42 -04:00
ari b56b5fc184 added rust install 2022-07-18 12:41:32 -04:00
ari 1cce2d20f4 not publishing armhf 2022-07-18 11:58:26 -04:00
ari 717fada35e removed build from ignore 2022-07-18 10:46:30 -04:00
ari ca4be32d63 fixing docker image 2022-07-18 10:40:15 -04:00
ari ad4c1f66f2 fix commit build 2022-07-18 10:34:19 -04:00
ari 4af6b1688a using build stage 2022-07-18 10:07:03 -04:00
ari 045ce75362 added symlink 2022-07-17 20:56:26 -04:00
ari 442a49da8b fixed trigger validator 2022-07-17 20:47:45 -04:00
ari 8e859ff191 using n for docker node versions 2022-07-17 20:46:28 -04:00
ari 3b1b88b404 using buster image 2022-07-17 19:58:54 -04:00
ari 8306686e4c removed standard 2022-07-16 10:04:29 -04:00
ari 6d67dd129c upgrading alpine 2022-07-16 00:39:32 -04:00
ari 5086ecd993 imporoved build failures 2022-07-16 00:29:34 -04:00
ari bbb87ebf9e support for if/else 2022-07-15 23:41:14 -04:00
ari a1ca9d62b7 opening modal when adding new parallel node 2022-07-15 23:15:23 -04:00
ari 0e4e4783fa Moved infobox to modal 2022-07-15 22:53:51 -04:00
ari 1719148c58 editable title 2022-07-15 21:21:15 -04:00
ari 2ea96973ad top bar 2022-07-15 18:35:25 -04:00
ari a35e8e127f v0.3.1 2022-07-15 13:42:35 -04:00
renovate[bot] 46a67b1395 Update dependency @types/react to v18.0.15 (#75)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-07-15 13:26:40 -04:00
ari 6b465219a9 upping limits of display 2022-07-15 13:25:43 -04:00
ari e769a8e798 clean up
added mock large qty autos
2022-07-15 12:37:10 -04:00
ari d8a2dd53d5 ensuring triggers & conditions are not too close to one another 2022-07-15 12:02:02 -04:00
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
245 changed files with 21856 additions and 7655 deletions

No files matched your search

-1
View File
@@ -1,5 +1,4 @@
webapp/node_modules webapp/node_modules
webapp/build
webapp/.storybook webapp/.storybook
webapp/.vscode webapp/.vscode
webapp/.env.local webapp/.env.local
+87 -11
View File
@@ -1,22 +1,70 @@
name: "Manual Build" name: Build
on: on:
workflow_dispatch: workflow_dispatch:
inputs: inputs:
version: version:
type: string type: string
description: "Version Number" description: "Version Number"
required: true push:
branch: [main]
jobs: jobs:
build: metadata:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: "${{ github.event.inputs.version }} / ${{ matrix.arch }}" name: Metadata
strategy: outputs:
matrix: version: ${{ steps.version.outputs.VERSION }}
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps: steps:
- name: Check out repository - name: Check out repository
uses: actions/checkout@v3 uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Get Version
id: version
shell: bash
run: |
if [ -z "${INPUT_VERSION}" ]; then
echo ::set-output name=VERSION::$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
else
echo ::set-output name=VERSION::${INPUT_VERSION}
fi
env:
INPUT_VERSION: ${{ github.event.inputs.version }}
- name: ${{ steps.version.outputs.VERSION }}
shell: bash
run: |
echo ${{ steps.version.outputs.VERSION }}
deploy:
runs-on: ubuntu-latest
name: Build & Publish ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
if: github.event_name != 'pull_request'
needs:
- metadata
strategy:
matrix:
arch:
- "aarch64"
- "amd64"
- "armhf"
- "armv7"
- "i386"
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.10.0
with:
all_but_latest: true
access_token: ${{ github.token }}
- name: Check out repository
uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 16
cache: "yarn"
cache-dependency-path: webapp/yarn.lock
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@v2.0.0 uses: docker/login-action@v2.0.0
@@ -24,10 +72,38 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build & Push to Dockerhub - name: "Save version number"
uses: home-assistant/builder@2022.03.1 run: echo "REACT_APP_BUILD_VERSION=${{ needs.metadata.outputs.version }}" > ./webapp/.env.production
- name: "Build Web"
run: cd webapp && yarn install && yarn build
- name: ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
uses: home-assistant/builder@2022.07.0
with: with:
args: | args: |
--${{ matrix.arch }} \ --${{ matrix.arch }} \
--version ${{ github.event.inputs.version }} \ --no-latest \
--version ${{ needs.metadata.outputs.version }} \
--target . --target .
publish:
runs-on: ubuntu-latest
if: "${{ github.event.inputs.version != '' }}"
needs:
- metadata
- deploy
name: Publish Github Release
steps:
- name: Publish Release ${{ needs.metadata.outputs.version }}
uses: actions/github-script@v6
env:
VERSION: ${{ needs.metadata.outputs.version }}
CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
with:
script: |
github.rest.repos.createRelease({
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: process.env.VERSION,
});
-75
View File
@@ -1,75 +0,0 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"
on:
push:
branches: [ main ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
schedule:
- cron: '29 23 * * 0'
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
strategy:
fail-fast: false
matrix:
language: [ 'javascript', 'python' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
with:
access_token: ${{ github.token }}
- name: Checkout repository
uses: actions/checkout@v3
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
#- run: |
# make bootstrap
# make release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
-46
View File
@@ -1,46 +0,0 @@
name: Deploy
on:
workflow_dispatch:
push:
branch: [main]
paths:
- "config.yaml"
jobs:
metadata:
runs-on: ubuntu-latest
name: Metadata
outputs:
version: ${{ steps.version.outputs.VERSION }}
changlelog: ${{ steps.changlelog.outputs.CHANGELOG }}
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Get Version
id: version
shell: bash
run: |
echo ::set-output name=VERSION::$(cat config.yaml | sed -nr 's/version: (.*)/\1/p')
- name: Get Changelog
id: changlelog
shell: bash
run: |
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
publish:
runs-on: ubuntu-latest
needs:
- metadata
name: Publish Github Release
steps:
- name: Publish Release ${{ needs.metadata.outputs.version }}
uses: actions/github-script@v6
env:
VERSION: ${{ needs.metadata.outputs.version }}
CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
with:
script: |
github.rest.repos.createRelease({
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: process.env.VERSION,
});
+44
View File
@@ -0,0 +1,44 @@
name: Test Release
on:
workflow_dispatch:
inputs:
version:
type: string
description: "Version Number"
jobs:
release:
runs-on: ubuntu-latest
name: Publish Github Release
permissions:
contents: write
steps:
- name: "${{ github.event.inputs.version }}"
uses: actions/github-script@v6
env:
VERSION: "${{ github.event.inputs.version }}"
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
github.rest.repos.createRelease({
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: process.env.VERSION,
});
pre:
runs-on: ubuntu-latest
name: Publish Github PreRelease
permissions:
contents: write
steps:
- name: "${{ github.event.inputs.version }}"
uses: actions/github-script@v6
env:
VERSION: pre-${{ github.event.inputs.version }}
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
github.rest.repos.createRelease({
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: process.env.VERSION,
});
+9 -37
View File
@@ -1,12 +1,14 @@
name: Test name: Commit Tests
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on: on:
workflow_dispatch:
push: push:
branch: [main] branch:
- main
paths:
- "webapp"
- "api"
pull_request: pull_request:
branches: [main] branch:
- main
jobs: jobs:
metadata: metadata:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -42,7 +44,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v3 uses: actions/setup-python@v4
with: with:
python-version: 3.9 python-version: 3.9
- name: Install Dependencies - name: Install Dependencies
@@ -73,33 +75,3 @@ jobs:
run: cd webapp && yarn install run: cd webapp && yarn install
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }} - name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
run: cd webapp && yarn ${{ matrix.action }} run: cd webapp && yarn ${{ matrix.action }}
deploy:
runs-on: ubuntu-latest
name: Build & Publish ${{ matrix.arch }}
needs:
- metadata
- nodejs
- python
strategy:
matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
uses: home-assistant/builder@2022.03.1
with:
args: |
--${{ matrix.arch }} \
--no-latest \
--version ${{ needs.metadata.outputs.version }} \
--target .
+1
View File
@@ -1 +1,2 @@
.vscode/*.log .vscode/*.log
webapp/src/types/validators/index.test.ts
+47 -6
View File
@@ -1,5 +1,48 @@
# Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) # Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge)
## [0.3.2] - Fixed Addon Image for arm-based devices
- Using hypercon instead of uvicorn (this losses the rust dependency which makes it easier to install on arm)
- Pre-building web assets outside of docker (this takes the image size down and speeds up instaltion of addon)
- Updated build scripts to actually fail installation when build/prep steps fail
- Ensured that builds for all architecture run successfully
- Re-worked github actions (quicker test phases)
## [0.3.1] - Increased Pagination + Restricted Repeat Node
- Increased pagination to display up to 10,000 autos for now
- Repeat node now has types
## [0.3.0] - Complete Refactor of Graphs
- Added visual support for
- Repeat Nodes
- Parallel Nodes
- Using collections for conditions & triggers
- Fixed several bugs with improper alerts
- Fixed graph breakage during zoom
- Support for enable/disable nodes in UI
![image](https://user-images.githubusercontent.com/7451445/179135734-8d7ca46d-7e6f-4975-abc3-de86a48de0c0.png)
![image](https://user-images.githubusercontent.com/7451445/179135790-a5e77e2b-6d42-4810-a27b-ff4d165e99ec.png)
![image](https://user-images.githubusercontent.com/7451445/179135916-8083aab5-bee1-4d27-b19d-9e000ca012f9.png)
## [0.1.22] - Many Visual improvements
- Deprecated several custom components in favor of mui.com
- Device Editor now has support for 99% of diplay types
- Condition Device is implemented
- Improved naming autogen for trigger & choose
## [0.1.21] - Service Editor
- first version of service editor
- reloading automations on save
## [0.1.20] - UI Bugfixes ## [0.1.20] - UI Bugfixes
- Using MUI elements for input time - Using MUI elements for input time
@@ -15,9 +58,9 @@
## [0.1.17] - Websockets ## [0.1.17] - Websockets
- Connected to HA main websocket -- now we retrieve real-time information about - Connected to HA main websocket -- now we retrieve real-time information about
* Device names - Device names
* Entity names/ids - Entity names/ids
- Autocomplete for devices and entities - Autocomplete for devices and entities
@@ -41,7 +84,6 @@
- Made the validators less strict in order to capture more edge cases that HA supports - Made the validators less strict in order to capture more edge cases that HA supports
- Nicer auto-generated descriptions for some trigger nodes - Nicer auto-generated descriptions for some trigger nodes
## [0.1.10] - More Bug Fixes ## [0.1.10] - More Bug Fixes
- Allowing null or undefined values for metadata fields - Allowing null or undefined values for metadata fields
@@ -95,8 +137,7 @@
## [0.0.9] - First Working Version ## [0.0.9] - First Working Version
- Instalable verion via github - Instalable verion via github
- Initial POC done - Initial POC done
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+7 -14
View File
@@ -1,8 +1,8 @@
# <--- Pre-Build Args --> # <--- Pre-Build Args -->
ARG BUILD_ARCH ARG BUILD_ARCH
# <--- Image Setup --> # <--- Main Image -->
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14 FROM python:3.9.13-slim-buster
WORKDIR /app WORKDIR /app
# <--- Post-Build Args --> # <--- Post-Build Args -->
@@ -13,11 +13,8 @@ ENV BUILD_VERSION $BUILD_VERSION
# <--- System Wide Dependencies --> # <--- System Wide Dependencies -->
ENV LANG C.UTF-8 ENV LANG C.UTF-8
RUN apk add --no-cache \ RUN apt-get update -y && \
nodejs \ apt-get install -y gcc git build-essential libtool automake curl
npm \
build-base \
python3-dev
# <--- Scripts --> # <--- Scripts -->
COPY docker/bin /app/bin COPY docker/bin /app/bin
@@ -28,16 +25,12 @@ RUN /app/bin/prep.sh
# <--- Python Dependencies --> # <--- Python Dependencies -->
COPY api/setup.py /app/setup.py COPY api/setup.py /app/setup.py
# <--- Webapp Build -->
COPY webapp/ /app/web-builder
RUN cd /app/web-builder && \
echo "REACT_APP_BUILD_VERSION=${BUILD_VERSION}" > /app/web-builder/.env.production
# <--- BUILD --> # <--- BUILD -->
RUN /app/bin/build.sh /app /app/web-builder RUN /app/bin/build.sh /app
# <--- Api Code --> # <--- Api Code -->
COPY api/src /app/src COPY api/src /app/src
COPY webapp/build /app/web
# <--- Ports --> # <--- Ports -->
EXPOSE 8000 EXPOSE 8000
@@ -45,7 +38,7 @@ EXPOSE 8000
# <--- Final --> # <--- Final -->
LABEL \ LABEL \
io.hass.type="addon" \ io.hass.type="addon" \
io.hass.arch="armhf|aarch64|i386|amd64" io.hass.arch="armhf|aarch64|i386|amd64|armv7"
ENTRYPOINT [ "/app/bin/run.sh" ] ENTRYPOINT [ "/app/bin/run.sh" ]
CMD [ "/app" ] CMD [ "/app" ]
+2
View File
@@ -15,9 +15,11 @@ build-with-builder:
-t /data -t /data
build: build:
cd webapp && yarn build
$(DC) build $(DC) build
build-no-cache: build-no-cache:
cd webapp && yarn buil
$(DC) build --no-cache $(DC) build --no-cache
push: push:
+32 -9
View File
@@ -1,16 +1,39 @@
# Shortumation ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=platsic) # Shortumation ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=platsic)
[![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [![Build](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml)
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/asosnovsky/Shortumation/Manual%20Build)
| | Stable | Edge | | Stable | Edge
| --- | --- | --- | --- | --- | ---
| Version | ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-amd64?&sort=date&label=&style=for-the-badge) | Version | ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-amd64?&sort=date&label=&style=for-the-badge)
A better way to write automations in home-assistant without having to install and run a seperate automation engine! A better way to write automations in home-assistant without having to install and run a seperate automation engine!
![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/). 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] Automation Manager
- [X] Tags for automation organization - [X] Tags for automation organization
- [X] Autocomplete fields for entities/devices - [X] Autocomplete fields for entities/devices
- [ ] Script Manager - [X] Visualize parallel/repeat/choose/if-else nodes
- [ ] Use secrets and global parameters - [X] Autogenerate node names
- [ ] Autocomplete fields for template editor - [ ] Clean error reporting
- [ ] Autocomplete fields for referencing scripts - [ ] Script Editor
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1). See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
@@ -50,7 +73,7 @@ If this warning does not scare you or you still want to try things out, then tak
**How is this different from Node-Red?** **How is this different from Node-Red?**
> Node-Red is both an execution engine and an automation editor, which means that in order for you automations to run you have to have an additional component running and executing the automations. Shortumation simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database) > Node-Red is both an execution engine and an automation editor, which means that in order for your automations to run you have to have an additional component running and executing the automations. Shortumation simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database)
**Which HA Installation does this support?** **Which HA Installation does this support?**
+1 -1
View File
@@ -43,4 +43,4 @@ clean:
run-local: run-local:
rm -f web rm -f web
ln -s ../webapp/build web ln -s ../webapp/build web
USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload USE_EXAMPLE_REPO=1 $(VENV_BIN)/hypercorn src.app:app --reload
+15 -14
View File
@@ -5,24 +5,25 @@ setuptools.setup(
python_requires=">=3.9", python_requires=">=3.9",
install_requires=[ install_requires=[
"PyYAML==6.0", "PyYAML==6.0",
"fastapi==0.70.0", "fastapi==0.78.0",
"pydantic==1.8.2", "pydantic==1.9.1",
"uvicorn[standard]==0.15.0", "hypercorn==0.13.2",
"python-decouple==3.5", "python-decouple==3.6",
"websockets==10.3"
], ],
extras_require={ extras_require={
"dev": [ "dev": [
"mypy==0.910", "mypy==0.961",
"mypy-extensions==0.4.3", "mypy-extensions==0.4.3",
"black==22.3.0", "black==22.6.0",
"bandit==1.7.0", "bandit==1.7.4",
"isort==5.9.3", "isort==5.10.1",
"coverage==5.5", "coverage==6.4.1",
"pre-commit==2.13.0", "pre-commit==2.19.0",
"vulture==2.3", "vulture==2.4",
"types-requests==2.25.6", "types-requests==2.28.0",
"types-PyYAML==6.0.7", "types-PyYAML==6.0.9",
"requests==2.27.0", "requests==2.28.1",
], ],
}, },
) )
+5
View File
@@ -5,6 +5,7 @@ from src.api.types import (
ListData, ListData,
ListParams, ListParams,
UpdateAutoRequest, UpdateAutoRequest,
UpdateTags,
) )
from src.automations.errors import FailedDeletion from src.automations.errors import FailedDeletion
from src.automations.manager import AutomationManager from src.automations.manager import AutomationManager
@@ -29,6 +30,10 @@ def make_automation_router(automations: AutomationManager) -> APIRouter:
def upsert_auto(body: UpdateAutoRequest): def upsert_auto(body: UpdateAutoRequest):
automations.update(body.index, body.data) automations.update(body.index, body.data)
@router.post("/item/tags")
def update_tags(body: UpdateTags):
automations.update_tags(body.automation_id, body.tags)
@router.delete("/item") @router.delete("/item")
def delete_auto(body: DeleteAutoRequest): def delete_auto(body: DeleteAutoRequest):
try: try:
+6 -1
View File
@@ -1,4 +1,4 @@
from typing import Generic, List, TypeVar from typing import Dict, Generic, List, TypeVar
from pydantic import BaseModel from pydantic import BaseModel
from pydantic.fields import Field from pydantic.fields import Field
@@ -25,5 +25,10 @@ class UpdateAutoRequest(BaseModel):
data: ExtenededAutomationData data: ExtenededAutomationData
class UpdateTags(BaseModel):
automation_id: str = Field(description="Automation Id to update")
tags: Dict[str, str]
class DeleteAutoRequest(BaseModel): class DeleteAutoRequest(BaseModel):
index: int = Field(description="Index of the automation to update") index: int = Field(description="Index of the automation to update")
+4 -1
View File
@@ -1,5 +1,8 @@
class AutomationLoaderException(Exception): class AutomationLoaderException(Exception):
pass def __init__(self, *args: object, **kwargs) -> None:
super().__init__(
"".join(map(str, args)) + ",".join((f"{k}={v}" for k, v in kwargs.items())),
)
class InvalidAutomationFile(AutomationLoaderException): class InvalidAutomationFile(AutomationLoaderException):
+17 -9
View File
@@ -1,6 +1,6 @@
from typing import Iterator, List, Optional from typing import Dict, Iterator, List, Optional
from src.automations.errors import FailedDeletion from src.automations.errors import FailedDeletion, InvalidAutomationFile
from src.automations.types import AutomationData, ExtenededAutomationData from src.automations.types import AutomationData, ExtenededAutomationData
from src.hass_config.loader import HassConfig from src.hass_config.loader import HassConfig
@@ -22,32 +22,40 @@ class AutomationManager:
continue continue
if i >= offset + limit: if i >= offset + limit:
break break
yield from load_automation(auto, tags.get(i, {})) yield from load_automation(auto, tags.get(auto.get("id", ""), {}))
def get(self, index: int) -> Optional[AutomationData]: def get(self, index: int) -> Optional[ExtenededAutomationData]:
tags = self.hass_config.automation_tags tags = self.hass_config.automation_tags
if index >= 0: if index >= 0:
for i, auto in enumerate(self.hass_config.automations): for i, auto in enumerate(self.hass_config.automations):
if not isinstance(auto, dict):
raise InvalidAutomationFile(automation_index=i)
if i == index: if i == index:
return next(load_automation(auto, tags.get(i, {}))) return next(load_automation(auto, tags.get(auto.get("id", ""), {})))
return None return None
def update(self, index: int, automation: ExtenededAutomationData): def update(self, index: int, automation: ExtenededAutomationData):
tags = self.hass_config.automation_tags tags = self.hass_config.automation_tags
automations: List[dict] = [] automations: List[dict] = []
updated = False updated_index: Optional[int] = None
for i, orig_auto in enumerate(self.hass_config.automations): for i, orig_auto in enumerate(self.hass_config.automations):
if i == index: if i == index:
automations.append(automation.to_primitive()) automations.append(automation.to_primitive())
updated = True updated_index = i
else: else:
automations.append(orig_auto) automations.append(orig_auto)
if not updated: if updated_index is None:
automations.append(automation.to_primitive()) automations.append(automation.to_primitive())
tags[index] = automation.tags updated_index = len(automations) - 1
tags[automation.metadata.id] = automation.tags
self.hass_config.save_automations(automations) self.hass_config.save_automations(automations)
self.hass_config.save_tags(tags) self.hass_config.save_tags(tags)
def update_tags(self, auto_id: str, tags: Dict[str, str]):
autos_tags = self.hass_config.automation_tags
autos_tags[auto_id] = tags
self.hass_config.save_tags(autos_tags)
def delete(self, index: int): def delete(self, index: int):
automations: List[dict] = [] automations: List[dict] = []
deleted = False deleted = False
+1 -1
View File
@@ -4,7 +4,7 @@ from typing import Dict
from src.yaml_serializer import dump_yaml, load_yaml from src.yaml_serializer import dump_yaml, load_yaml
class TagManager(Dict[int, Dict[str, str]]): class TagManager(Dict[str, Dict[str, str]]):
def save(self, path: Path): def save(self, path: Path):
path.write_text(dump_yaml(dict(self))) path.write_text(dump_yaml(dict(self)))
+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))
+5 -2
View File
@@ -10,9 +10,12 @@ def find_hass_config() -> HassConfig:
"""Try to find HASS config.""" """Try to find HASS config."""
if config("USE_EXAMPLE_REPO", False, cast=bool): if config("USE_EXAMPLE_REPO", False, cast=bool):
print("using USE_EXAMPLE_REPO") print("using USE_EXAMPLE_REPO")
from tests.utils import create_copy_of_example_config from tests.utils import (
HA_CONFIG3_EXAMPLE,
create_copy_of_example_config,
)
path = create_copy_of_example_config() path = create_copy_of_example_config(HA_CONFIG3_EXAMPLE)
print("|-> ", path) print("|-> ", path)
return HassConfig(path) return HassConfig(path)
-6
View File
@@ -9,12 +9,6 @@ from src.yaml_serializer.types import (
class YamlSafeLoader(yaml.SafeLoader): class YamlSafeLoader(yaml.SafeLoader):
pass pass
# def compose_node(self, parent: yaml.nodes.Node, index: int) -> yaml.nodes.Node: # type: ignore[override]
# """Annotate a node with the first line it was seen."""
# last_line: int = self.line
# node: yaml.nodes.Node = super().compose_node(parent, index) # type: ignore[assignment]
# node.__line__ = last_line + 1 # type: ignore[attr-defined]
# return node
YamlSafeLoader.add_constructor("!include", IncludedYaml.from_yaml) YamlSafeLoader.add_constructor("!include", IncludedYaml.from_yaml)
@@ -0,0 +1,77 @@
'1616887975473':
Type: HA
'1616888026264':
Type: HA
'1619371298367':
Room: Living
Type: Button
'1620239986670':
Room: Kitchen
Type: Button
'1620324780561':
Room: Kitchen
Type: Button
'1621352850204':
Room: Kitchen
Type: Button
'1622210698281':
Room: Kitchen
Type: Button
'1622769811245':
Room: Living
Type: Button
'1623430479201':
Room: Baby
Type: Button
'1623642118976':
Room: Baby
Type: Button
'1624640900951':
Room: Baby
Type: Button
'1628024070687':
Room: Baby
Type: Routine
'1628024123214':
Room: Baby
Type: Routine
'1628444671951':
Room: Office
Type: Window
'1629309267204':
Room: Balcony
Type: Door
'1629422438707':
Type: Routine
'1634497376234':
Room: Baby
Type: Button
'1635539262562':
Type: Routine
'1636428429596':
Type: Routine
'1639500650865':
Room: Bedroom
Type: Door
'1641617168123':
Type: Ensure Power
'1648071019802':
Type: Ensure Power
'1649426399020':
Room: Office
Type: Motion
'1649432254675':
Room: Baby
Type: Routine
'1649726828269':
Climate: Heat
Type: Climate
'1649727810678':
Climate: Time
Type: Climate
'1649820885714':
Type: Routine
'1649947692702':
BadOne: true
Room: Bedroom
Type: Button
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,2 @@
# empty configuration file
cloud:
@@ -1,77 +1,77 @@
0: '1616887975473':
Type: HA Type: HA
1: '1616888026264':
Type: HA Type: HA
2: '1619371298367':
Type: Button
Room: Living Room: Living
3:
Type: Button Type: Button
'1620239986670':
Room: Kitchen Room: Kitchen
4:
Type: Button Type: Button
'1620324780561':
Room: Kitchen Room: Kitchen
5:
Type: Button Type: Button
'1621352850204':
Room: Kitchen Room: Kitchen
6:
Type: Button Type: Button
'1622210698281':
Room: Kitchen Room: Kitchen
7:
Type: Button Type: Button
'1622769811245':
Room: Living Room: Living
8:
Type: Button Type: Button
'1623430479201':
Room: Baby Room: Baby
9:
Type: Button Type: Button
'1623642118976':
Room: Baby Room: Baby
10:
Type: Button Type: Button
'1624640900951':
Room: Baby
Type: Button
'1628024070687':
Room: Baby Room: Baby
11:
Type: Routine Type: Routine
'1628024123214':
Room: Baby Room: Baby
12:
Type: Routine Type: Routine
Room: Baby '1628444671951':
13: Room: Office
Type: Window Type: Window
Room: Office '1629309267204':
14:
Type: Door
Room: Balcony Room: Balcony
15:
Type: Routine
16:
Type: Button
Room: Baby
17:
Type: Routine
18:
Type: Routine
19:
Type: Door Type: Door
Room: Bedroom '1629422438707':
20:
Type: Ensure Power
21:
Type: Ensure Power
22:
Type: Motion
Room: Office
23:
Type: Routine Type: Routine
'1634497376234':
Room: Baby Room: Baby
24:
Type: Climate
Climate: Heat
25:
Type: Climate
Climate: Time
26:
Type: Routine
27:
Type: Button Type: Button
'1635539262562':
Type: Routine
'1636428429596':
Type: Routine
'1639500650865':
Room: Bedroom Room: Bedroom
BadOne: yes Type: Door
'1641617168123':
Type: Ensure Power
'1648071019802':
Type: Ensure Power
'1649426399020':
Room: Office
Type: Motion
'1649432254675':
Room: Baby
Type: Routine
'1649726828269':
Climate: Heat
Type: Climate
'1649727810678':
Climate: Time
Type: Climate
'1649820885714':
Type: Routine
'1649947692702':
BadOne: true
Room: Bedroom
Type: Button
@@ -100,3 +100,16 @@ class manager_tests(TestCase):
self.assertEqual(manager.get_total_items(), 3) self.assertEqual(manager.get_total_items(), 3)
with self.assertRaises(FailedDeletion): with self.assertRaises(FailedDeletion):
manager.delete(10) manager.delete(10)
def test_save_tags(self):
_, _, manager = get_dummy_automation_loader(
[
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
],
automation_in_conifguration_mode="none",
)
manager.update_tags("test1", {"room": "bathroom"})
auto = manager.get(0)
assert auto.tags == {"room": "bathroom"}
+1
View File
@@ -13,6 +13,7 @@ THIS_FOLDER = Path(__file__).parent
SAMPLES_FOLDER = THIS_FOLDER / "samples" SAMPLES_FOLDER = THIS_FOLDER / "samples"
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config" HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2" HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
HA_CONFIG3_EXAMPLE = SAMPLES_FOLDER / "config-3"
def get_example_automation_loader( def get_example_automation_loader(
+1 -1
View File
@@ -1,5 +1,5 @@
name: Shortumation name: Shortumation
version: v0.1.20 version: v0.3.2
slug: shortumation slug: shortumation
image: asosnovsky/shortumation-{arch} image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation" url: "https://github.com/asosnovsky/Shortumation"
+4 -8
View File
@@ -2,7 +2,7 @@
set -e set -e
api_location=${1} api_location=${1}
web_location=${2} # web_location=${2}
function install_yarn() { function install_yarn() {
pushd $web_location pushd $web_location
@@ -18,11 +18,7 @@ function install_py() {
popd popd
} }
declare -i err=0 werr=0 install_py
install_py & # install_yarn
install_yarn &
while wait -fn || werr=$?; ((werr != 127)); do
err=$werr
done
echo "DONE BUILD" echo "DONE BUILD"
+7 -8
View File
@@ -2,18 +2,17 @@
set -e set -e
function prep_yarn() { function prep_yarn() {
curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n
ln -s /usr/bin/nodejs /usr/bin/node
bash n lts
npm i -g yarn npm i -g yarn
} }
function prep_py() { function prep_py() {
pip install -U wheel setuptools pip pip install -U wheel setuptools pip Cython
} }
declare -i err=0 werr=0 prep_py
prep_py & # prep_yarn
prep_yarn &
while wait -fn || werr=$?; ((werr != 127)); do
err=$werr
done
echo "DONE PREP" echo "DONE PREP"
+1 -1
View File
@@ -7,4 +7,4 @@ echo "--------------------"
echo "BUILD_VERSION = "$BUILD_VERSION echo "BUILD_VERSION = "$BUILD_VERSION
echo $(python --version) echo $(python --version)
echo "--------------------" echo "--------------------"
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000 python -m hypercorn src.app:app -b "0.0.0.0:8000"
+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, "private": true,
"homepage": ".", "homepage": ".",
"dependencies": { "dependencies": {
"@emotion/react": "^11.9.0", "@emotion/react": "11.9.3",
"@emotion/styled": "^11.8.1", "@emotion/styled": "11.9.3",
"@mui/icons-material": "^5.8.3", "@mui/icons-material": "5.8.4",
"@mui/material": "^5.8.0", "@mui/material": "5.8.6",
"@mui/styles": "^5.8.0", "@mui/styles": "5.8.6",
"@types/jest": "^27.5.1", "@types/jest": "28.1.5",
"@types/node": "^17.0.36", "@types/node": "17.0.36",
"@types/react": "^18.0.9", "@types/react": "18.0.15",
"@types/react-dom": "^18.0.5", "@types/react-dom": "18.0.6",
"@types/ws": "^8.5.3", "@types/ws": "8.5.3",
"@uiw/react-codemirror": "^4.7.0", "@uiw/react-codemirror": "4.10.4",
"autosuggest-highlight": "^3.2.1", "autosuggest-highlight": "3.3.2",
"home-assistant-js-websocket": "^7.1.0", "home-assistant-js-websocket": "7.1.0",
"jss": "^10.8.2", "jss": "10.9.0",
"notistack": "^2.0.5", "material-ui-confirm": "3.0.4",
"react": "^18.1.0", "notistack": "2.0.5",
"react-cookie": "^4.1.1", "react": "18.2.0",
"react-dom": "^18.1.0", "react-cookie": "4.1.1",
"react-flow-renderer": "^10.1.2", "react-dom": "18.2.0",
"react-imask": "^6.4.2", "react-flow-renderer": "10.3.8",
"react-jss": "^10.8.2", "react-imask": "6.4.2",
"react-router-dom": "6", "react-jss": "10.9.0",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1", "react-scripts": "5.0.1",
"superstruct": "^0.15.4", "superstruct": "0.16.0",
"theming": "^3.3.0", "theming": "3.3.0",
"typescript": "^4.1.2", "typescript": "4.7.4",
"web-vitals": "^2.1.4", "web-vitals": "2.1.4",
"ws": "^8.7.0", "ws": "8.8.0",
"yarn": "^1.22.17" "yarn": "1.22.19"
}, },
"scripts": { "scripts": {
"start": "react-scripts start", "start": "react-scripts start",
@@ -75,25 +76,25 @@
] ]
}, },
"devDependencies": { "devDependencies": {
"@storybook/addon-actions": "^6.4.22", "@storybook/addon-actions": "6.5.9",
"@storybook/addon-essentials": "^6.4.22", "@storybook/addon-essentials": "6.5.9",
"@storybook/addon-links": "^6.4.22", "@storybook/addon-links": "6.5.9",
"@storybook/addon-queryparams": "^6.2.9", "@storybook/addon-queryparams": "6.2.9",
"@storybook/builder-webpack5": "^6.5.6", "@storybook/builder-webpack5": "6.5.9",
"@storybook/manager-webpack5": "^6.5.6", "@storybook/manager-webpack5": "6.5.9",
"@storybook/node-logger": "^6.4.22", "@storybook/node-logger": "6.5.9",
"@storybook/preset-create-react-app": "^4.1.1", "@storybook/preset-create-react-app": "4.1.2",
"@storybook/react": "^6.4.22", "@storybook/react": "6.5.9",
"@testing-library/jest-dom": "^5.11.4", "@testing-library/jest-dom": "5.16.4",
"@testing-library/react": "^13.3.0", "@testing-library/react": "13.3.0",
"@testing-library/user-event": "^14.2.0", "@testing-library/user-event": "14.2.1",
"@types/autosuggest-highlight": "^3.2.0", "@types/autosuggest-highlight": "3.2.0",
"@types/chroma-js": "^2.1.3", "@types/chroma-js": "2.1.3",
"@types/js-yaml": "^4.0.5", "@types/js-yaml": "4.0.5",
"jest-environment-jsdom": "^28.1.0", "jest-environment-jsdom": "28.1.2",
"ts-node": "^10.8.0", "ts-node": "10.8.2",
"webpack": "^5.72.1", "webpack": "5.73.0",
"webpack-dev-server": "^4.9.0" "webpack-dev-server": "4.9.3"
}, },
"moduleDirectories": [ "moduleDirectories": [
"node_modules", "node_modules",
+29 -11
View File
@@ -1,27 +1,46 @@
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
import { API } from "./base"; import { API } from "./base";
import { ListData, ListParams } from "./types"; import { ListData, ListParams } from "./types";
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths'; import {
AUTOMTAION_LIST,
AUTOMTAION_ITEM,
AUTOMTAION_ITEM_TAGS,
} from "./paths";
export const makeAutomationAPI = (api: API) => ({ export const makeAutomationAPI = (api: API) => ({
async list({ offset, limit }: ListParams) { async list({ offset, limit }: ListParams) {
const data = await api.makeCall<ListData<AutomationData>, ListParams>({ const data = await api.makeCall<ListData<AutomationData>, ListParams>({
path: AUTOMTAION_LIST, path: AUTOMTAION_LIST,
data: { data: {
offset, limit, offset,
} limit,
},
}); });
return data; return data;
}, },
async update({ index, auto }: { index: number, auto: AutomationData }) { async update({ index, auto }: { index: number; auto: AutomationData }) {
return await api.makeCall({ return await api.makeCall({
path: AUTOMTAION_ITEM, path: AUTOMTAION_ITEM,
data: { data: {
index, index,
data: auto data: auto,
}, },
}) });
},
async updateTags({
automation_id,
tags,
}: {
automation_id: string;
tags: Record<string, string>;
}) {
return await api.makeCall({
path: AUTOMTAION_ITEM_TAGS,
data: {
automation_id,
tags,
},
});
}, },
async remove({ index }: { index: number }) { async remove({ index }: { index: number }) {
return await api.makeCall({ return await api.makeCall({
@@ -29,10 +48,9 @@ export const makeAutomationAPI = (api: API) => ({
path: AUTOMTAION_ITEM, path: AUTOMTAION_ITEM,
data: { data: {
index, index,
} },
}) });
} },
}); });
export type AutomationAPI = ReturnType<typeof makeAutomationAPI>; export type AutomationAPI = ReturnType<typeof makeAutomationAPI>;
+12 -10
View File
@@ -1,15 +1,16 @@
import { useEffect } from 'react'; import { useEffect } from "react";
import { useDefaultApiState, makeReloadAutomations } from './util'; import { useDefaultApiState, makeReloadAutomations } from "./util";
import { AutomationAPI } from './automations'; import { AutomationAPI } from "./automations";
export type ApiService = ReturnType<typeof useAPIService>; export type ApiService = ReturnType<typeof useAPIService>;
export const useAPIService = ( export const useAPIService = (automationAPI: AutomationAPI) => {
automationAPI: AutomationAPI
) => {
// state // state
const [state, setState] = useDefaultApiState(); const [state, setState] = useDefaultApiState();
const { reload, wrapCall } = makeReloadAutomations(automationAPI, state, setState); const { reload, wrapCall } = makeReloadAutomations(
automationAPI,
state,
setState
);
// initial load of autos // initial load of autos
useEffect(() => { useEffect(() => {
@@ -21,5 +22,6 @@ export const useAPIService = (
state, state,
removeAutomation: wrapCall(automationAPI.remove), removeAutomation: wrapCall(automationAPI.remove),
updateAutomation: wrapCall(automationAPI.update), updateAutomation: wrapCall(automationAPI.update),
} updateTags: wrapCall(automationAPI.updateTags),
} };
};
+64 -28
View File
@@ -1,57 +1,93 @@
import { useMockAPI } from "./mock" import { useMockAPI } from "./mock";
import { makeAutomationAPI } from "./automations"; import { makeAutomationAPI } from "./automations";
import { createMockAuto } from '../utils/mocks'; import { createMockAuto } from "../utils/mocks";
import { AutomationData } from "types/automations";
const fakeUseRef = (a: any) => ({ current: a }); const fakeUseRef = (a: any) => ({ current: a });
test('mock api uses initial autos for initial population -- empty', async () => { test("mock api uses initial autos for initial population -- empty", async () => {
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any)); const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
const data = await mockApi.list({ limit: 10, offset: 0 }); const data = await mockApi.list({ limit: 10, offset: 0 });
expect(data.ok).toBe(true); expect(data.ok).toBe(true);
expect((data as any).data.data).toHaveLength(0); expect((data as any).data.data).toHaveLength(0);
expect((data as any).data.totalItems).toBe(0); expect((data as any).data.totalItems).toBe(0);
}) });
test('mock api uses initial autos for initial population -- some data', async () => { test("mock api uses initial autos for initial population -- some data", async () => {
const initials = [ const initials = [createMockAuto(), createMockAuto()];
createMockAuto(),
createMockAuto()
];
const mockApi = makeAutomationAPI(useMockAPI(initials, fakeUseRef as any)); const mockApi = makeAutomationAPI(useMockAPI(initials, fakeUseRef as any));
const data = await mockApi.list({ limit: 10, offset: 0 }); const data = await mockApi.list({ limit: 10, offset: 0 });
expect(data.ok).toBe(true); expect(data.ok).toBe(true);
expect((data as any).data.data).toHaveLength(2); expect((data as any).data.data).toHaveLength(2);
expect((data as any).data.totalItems).toBe(2); expect((data as any).data.totalItems).toBe(2);
}) });
test('populate mock api with some data', async () => { test("populate mock api with some data", async () => {
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any)); const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
await mockApi.update({index: 0, auto: createMockAuto()}) await mockApi.update({ index: 0, auto: createMockAuto() });
let data = await mockApi.list({ limit: 10, offset: 0 }); let data = await mockApi.list({ limit: 10, offset: 0 });
expect(data.ok).toBe(true); expect(data.ok).toBe(true);
expect((data as any).data.data).toHaveLength(1); expect((data as any).data.data).toHaveLength(1);
expect((data as any).data.totalItems).toBe(1); expect((data as any).data.totalItems).toBe(1);
await mockApi.update({index: 1, auto: createMockAuto()}) await mockApi.update({ index: 1, auto: createMockAuto() });
data = await mockApi.list({ limit: 10, offset: 0 }); data = await mockApi.list({ limit: 10, offset: 0 });
expect((data as any).data.data).toHaveLength(2); expect((data as any).data.data).toHaveLength(2);
expect((data as any).data.totalItems).toBe(2); expect((data as any).data.totalItems).toBe(2);
}) });
test('delete/update data from mock api', async () => { test("delete/update data from mock api", async () => {
const mockApi = makeAutomationAPI(useMockAPI([ const mockApi = makeAutomationAPI(
createMockAuto(), useMockAPI(
createMockAuto(), [
createMockAuto(), createMockAuto(),
createMockAuto(), createMockAuto(),
createMockAuto(), createMockAuto(),
], fakeUseRef as any)); createMockAuto(),
let data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data; createMockAuto(),
],
fakeUseRef as any
)
);
let data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
const toBeEdited = data[0]; const toBeEdited = data[0];
toBeEdited.metadata.alias = "Bob is my uncle"; toBeEdited.metadata.alias = "Bob is my uncle";
await mockApi.update({index: 0, auto: toBeEdited}) await mockApi.update({ index: 0, auto: toBeEdited });
data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data; data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
expect(data[0].metadata.alias).toEqual("Bob is my uncle"); expect(data[0].metadata.alias).toEqual("Bob is my uncle");
await mockApi.remove({index: 0}) await mockApi.remove({ index: 0 });
data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data; data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
expect(data[0].metadata.alias === "Bob is my uncle").toEqual(false); expect(data[0].metadata.alias === "Bob is my uncle").toEqual(false);
}) });
test("update tags from mock api", async () => {
const mockApi = makeAutomationAPI(
useMockAPI(
[
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
],
fakeUseRef as any
)
);
let data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data
.data as AutomationData[];
const autoId = data[0].metadata.id;
expect(data[0].tags).toStrictEqual({});
mockApi.updateTags({
automation_id: autoId,
tags: {
room: "bathroom",
type: "popup",
},
});
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data
.data as AutomationData[];
expect(data[0].metadata.id).toEqual(autoId);
expect(data[0].tags).toStrictEqual({
room: "bathroom",
type: "popup",
});
});
+44 -27
View File
@@ -1,33 +1,34 @@
import { useRef } from 'react'; import { useRef } from "react";
import { AutomationData } from 'types/automations'; import { AutomationData } from "types/automations";
import { API } from './base'; import { API } from "./base";
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths'; import {
AUTOMTAION_LIST,
AUTOMTAION_ITEM,
AUTOMTAION_ITEM_TAGS,
} from "./paths";
export const useMockAPI = ( export const useMockAPI = (
initialAutos: AutomationData[] = [], initialAutos: AutomationData[] = [],
makeRef = useRef, makeRef = useRef
): API => { ): API => {
const automationsRef = makeRef(initialAutos); const automationsRef = makeRef(initialAutos);
return { return {
async makeCall({ async makeCall({ path, method = "POST", data = {} }) {
path,
method = "POST",
data = {}
}) {
// console.debug("[[mockCall]]", method, path, data); // console.debug("[[mockCall]]", method, path, data);
if (path === AUTOMTAION_LIST) { if (path === AUTOMTAION_LIST) {
return { return {
ok: true, ok: true,
data: JSON.parse(JSON.stringify({ data: JSON.parse(
totalItems: automationsRef.current.length, JSON.stringify({
params: { offset: 0, limit: 100 }, totalItems: automationsRef.current.length,
data: automationsRef.current, params: { offset: 0, limit: 100 },
})) data: automationsRef.current,
} as any })
),
} as any;
} }
if (path === AUTOMTAION_ITEM) { if (path === AUTOMTAION_ITEM) {
if (method === 'POST') { if (method === "POST") {
const { index, data: auto } = data as any; const { index, data: auto } = data as any;
if (index >= automationsRef.current.length) { if (index >= automationsRef.current.length) {
automationsRef.current = [...automationsRef.current, auto]; automationsRef.current = [...automationsRef.current, auto];
@@ -35,29 +36,45 @@ export const useMockAPI = (
automationsRef.current = [ automationsRef.current = [
...automationsRef.current.slice(0, index), ...automationsRef.current.slice(0, index),
auto, auto,
...automationsRef.current.slice(index + 1) ...automationsRef.current.slice(index + 1),
]; ];
} }
return { return {
ok: true, ok: true,
data: {} data: {},
} };
} else if (method === "DELETE") { } else if (method === "DELETE") {
const { index } = data as any; const { index } = data as any;
automationsRef.current = [ automationsRef.current = [
...automationsRef.current.slice(0, index), ...automationsRef.current.slice(0, index),
...automationsRef.current.slice(index + 1) ...automationsRef.current.slice(index + 1),
]; ];
return { return {
ok: true, ok: true,
data: {} data: {},
};
}
}
if (path === AUTOMTAION_ITEM_TAGS) {
if (method === "POST") {
const { automation_id, tags } = data as any;
for (let i = 0; i < automationsRef.current.length; i++) {
const auto = automationsRef.current[i];
if (auto.metadata.id === automation_id) {
automationsRef.current[i].tags = JSON.parse(JSON.stringify(tags));
break;
}
} }
return {
ok: true,
data: {},
};
} }
} }
return { return {
ok: false, ok: false,
error: "PATH NOT FOUND " + method + ": " + path, error: "PATH NOT FOUND " + method + ": " + path,
} };
} },
} };
} };
+2 -3
View File
@@ -1,5 +1,4 @@
export const AUTOMTAION_ROOT = "/" as const;
export const AUTOMTAION_ROOT = '/' as const;
export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const; export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const;
export const AUTOMTAION_ITEM = `${AUTOMTAION_ROOT}item` as const; export const AUTOMTAION_ITEM = `${AUTOMTAION_ROOT}item` as const;
export const AUTOMTAION_ITEM_TAGS = `${AUTOMTAION_ITEM}/tags` as const;
+19 -21
View File
@@ -1,42 +1,40 @@
import { useState } from "react"; import { useState } from "react";
import { ApiState } from "./types"; import { ApiState } from "./types";
import { AutomationAPI } from './automations'; import { AutomationAPI } from "./automations";
export const useDefaultApiState = () =>
useState<ApiState>({
export const useDefaultApiState = () => useState<ApiState>({ automations: { ready: false },
automations: {ready: false}, });
});
export const makeReloadAutomations = ( export const makeReloadAutomations = (
automationAPI: AutomationAPI, automationAPI: AutomationAPI,
state: ApiState, state: ApiState,
setState: (s: ApiState) => void, setState: (s: ApiState) => void
) => { ) => {
const reload = async () => { const reload = async () => {
let params = { offset: 0, limit: 100 }; let params = { offset: 0, limit: 10000 };
if (state.automations.ready && state.automations.ok) { if (state.automations.ready && state.automations.ok) {
params = state.automations.data.params params = state.automations.data.params;
} }
const resp = await automationAPI.list(params); const resp = await automationAPI.list(params);
setState({ setState({
...state, automations: { ...state,
ready: true, automations: {
...resp, ready: true,
} ...resp,
},
}); });
} };
const wrapCall = < const wrapCall = <Call extends (a: any) => Promise<any>>(fcn: Call) => {
Call extends (a: any) => Promise<any>
>(fcn: Call) => {
return async (args: Parameters<Call>[0]): Promise<ReturnType<Call>> => { return async (args: Parameters<Call>[0]): Promise<ReturnType<Call>> => {
const resp = await fcn(args); const resp = await fcn(args);
await reload(); await reload();
return resp; return resp;
} };
} };
return { return {
reload, reload,
wrapCall, wrapCall,
} };
} };
@@ -1,34 +1,19 @@
.automation-editor--info-box { .automation-editor--info-box {
height: 100%;
padding-left: 10px;
padding-right: 10px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: flex-start; align-items: center;
overflow: hidden; gap: 0.5em;
position: relative;
} }
.automation-editor--info-box-inner { .automation-editor--info-box-inner {
height: 100%; max-width: 95vw;
max-height: 90vh;
overflow: auto; overflow: auto;
} }
.automation-editor--info-box.show {
min-width: 20em;
}
.automation-editor--info-box.hide {
min-width: 1em;
}
.automation-editor--info-box.hide>.automation-editor--info-box-inner {
display: none;
}
.automation-editor--info-box--tags { .automation-editor--info-box--tags {
padding: 0.25em 0.75em 1em 0.75em; padding: 0.25em 0.75em 1em 0.75em;
border-color: var(--primary-accent); border-color: var(--mui-grey-400);
border-width: 1px; border-width: 1px;
border-style: ridge; border-style: ridge;
border-radius: 5px; border-radius: 5px;
@@ -1,40 +1,35 @@
import { ComponentMeta, ComponentStory } from "@storybook/react"; import { ComponentMeta, ComponentStory } from "@storybook/react";
import { makeTagDB } from "components/AutomationList/TagDB"; import { makeTagDB } from "components/AutomationList/TagDB";
import { Page } from "components/Page"; import { Page } from "components/Page";
import { useState } from "react"; import { useState } from "react";
import { AutoInfoBox } from "./AutoInfoBox"; import { AutoInfoBox } from "./AutoInfoBox";
import { defaultAutomation } from 'utils/defaults'; import { defaultAutomation } from "utils/defaults";
export default { export default {
title: 'App/AutomationList/Editor/InfoBox', title: "App/AutomationList/Editor/InfoBox",
component: AutoInfoBox, component: AutoInfoBox,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: "^on.*" } },
args: { args: {
tagDB: makeTagDB([ tagDB: makeTagDB([defaultAutomation("test")]),
defaultAutomation("test") },
])
}
} as ComponentMeta<typeof AutoInfoBox>; } as ComponentMeta<typeof AutoInfoBox>;
export const NoTags: ComponentStory<typeof AutoInfoBox> = (args) => {
export const NoTags: ComponentStory<typeof AutoInfoBox> = args => { const [[metadata, tags], setState] = useState([args.metadata, args.tags]);
const [[metadata, tags], setState] = useState([args.metadata, args.tags])
return ( return (
<Page> <Page>
<AutoInfoBox <AutoInfoBox
{...args} {...args}
className=""
metadata={metadata} metadata={metadata}
tags={tags} tags={tags}
onUpdate={(m, t) => { onUpdate={(m, t) => {
args.onUpdate(m, t) args.onUpdate(m, t);
setState([m, t]) setState([m, t]);
}} }}
/> />
</Page> </Page>
) );
} };
NoTags.args = { NoTags.args = {
...NoTags.args, ...NoTags.args,
tags: [], tags: [],
@@ -43,13 +38,13 @@ NoTags.args = {
alias: "Random", alias: "Random",
description: "Example Metadata", description: "Example Metadata",
trigger_variables: { trigger_variables: {
'wowo': '!' wowo: "!",
}, },
mode: 'single', mode: "single",
}, },
} };
export const SomeTags: ComponentStory<typeof AutoInfoBox> = NoTags.bind({}) export const SomeTags: ComponentStory<typeof AutoInfoBox> = NoTags.bind({});
SomeTags.args = { SomeTags.args = {
...SomeTags.args, ...SomeTags.args,
tags: [ tags: [
@@ -61,8 +56,8 @@ SomeTags.args = {
alias: "Bathroom Vent", alias: "Bathroom Vent",
description: "Turn the vent when the humidity is high", description: "Turn the vent when the humidity is high",
trigger_variables: { trigger_variables: {
'wowo': '!' wowo: "!",
}, },
mode: 'single', mode: "single",
}, },
} };
@@ -2,14 +2,13 @@ import "./AutoInfoBox.css";
import { AutomationMetadata } from "types/automations"; import { AutomationMetadata } from "types/automations";
import { InputList } from "components/Inputs/InputList"; import { InputList } from "components/Inputs/InputList";
import InputText from "components/Inputs/InputText"; import InputText from "components/Inputs/InputText";
import { FC, ReactNode, useRef, useState } from 'react'; import { FC, ReactNode, useRef, useState } from "react";
import { AddIcon, TrashIcon } from "components/Icons"; import { AddIcon, TrashIcon } from "components/Icons";
import { Button } from "components/Inputs/Button";
import InputAutoText from "components/Inputs/InputAutoText"; import InputAutoText from "components/Inputs/InputAutoText";
import { TagDB } from "components/AutomationList/TagDB"; import { TagDB } from "components/AutomationList/TagDB";
import { ButtonIcon } from "components/Icons/ButtonIcons";
interface Props { interface Props {
className: string;
metadata: AutomationMetadata; metadata: AutomationMetadata;
tags: Array<[string, string]>; tags: Array<[string, string]>;
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void; onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
@@ -20,127 +19,158 @@ export const AutoInfoBox: FC<Props> = ({
metadata, metadata,
tags, tags,
onUpdate, onUpdate,
className,
children, children,
tagDB, tagDB,
}) => { }) => {
// state // state
const [newTag, setNewTag] = useState<[string, string]>(["", ""]) const [newTag, setNewTag] = useState<[string, string]>(["", ""]);
const [[errorIndex, error], _setError] = useState<[number | 'new', string]>([-1, ""]); const [[errorIndex, error], _setError] = useState<[number | "new", string]>([
-1,
"",
]);
const errorTimeoutId = useRef(-1); const errorTimeoutId = useRef(-1);
// aliases // aliases
const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n)); const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n));
const setError = (index: number | 'new', msg: string) => { const setError = (index: number | "new", msg: string) => {
_setError([index, msg]) _setError([index, msg]);
if (errorTimeoutId.current >= 0) { if (errorTimeoutId.current >= 0) {
window.clearTimeout(errorTimeoutId.current); window.clearTimeout(errorTimeoutId.current);
} }
errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000); errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000);
} };
const onUpdateMetadata = <K extends keyof AutomationMetadata>(k: K) => (update: AutomationMetadata[K]) => onUpdate({ const onUpdateMetadata =
...metadata, <K extends keyof AutomationMetadata>(k: K) =>
[k]: update (update: AutomationMetadata[K]) =>
}, tags); onUpdate(
{
...metadata,
[k]: update,
},
tags
);
const validTagName = (newName: string): string | undefined => { const validTagName = (newName: string): string | undefined => {
if (newName.length <= 0) { if (newName.length <= 0) {
return "Name must be at least 1 character long" return "Name must be at least 1 character long";
} }
// eslint-disable-next-line // eslint-disable-next-line
for (const [name, _] of tags) { for (const [name, _] of tags) {
if (name.trim() === newName.trim()) { if (name.trim() === newName.trim()) {
return `The tag '${name}' already exists` return `The tag '${name}' already exists`;
} }
} }
} };
const updateTagName = (newName: string, tagIndex: number) => { const updateTagName = (newName: string, tagIndex: number) => {
const error = validTagName(newName); const error = validTagName(newName);
if (error) { if (error) {
return setError(tagIndex, error) return setError(tagIndex, error);
} }
onUpdate(metadata, [ onUpdate(metadata, [
...tags.slice(0, tagIndex), ...tags.slice(0, tagIndex),
[newName, tags[tagIndex][1]], [newName, tags[tagIndex][1]],
...tags.slice(tagIndex + 1), ...tags.slice(tagIndex + 1),
]) ]);
} };
const onUpdateTags = (tagValue: string, tagIndex: number) => onUpdate(metadata, [ const onUpdateTags = (tagValue: string, tagIndex: number) =>
...tags.slice(0, tagIndex), onUpdate(metadata, [
[tags[tagIndex][0], tagValue], ...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1), [tags[tagIndex][0], tagValue],
]) ...tags.slice(tagIndex + 1),
]);
const addNewTag = () => { const addNewTag = () => {
const error = validTagName(newTag[0]); const error = validTagName(newTag[0]);
if (error) { if (error) {
return setError('new', error) return setError("new", error);
} }
onUpdate(metadata, tags.concat([ onUpdate(
newTag.map(x => x.trim()) as [string, string] metadata,
])); tags.concat([newTag.map((x) => x.trim()) as [string, string]])
setNewTag(['', '']); );
} setNewTag(["", ""]);
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [ };
...tags.slice(0, tagIndex), const onRemoveTag = (tagIndex: number) =>
...tags.slice(tagIndex + 1), onUpdate(metadata, [
]) ...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1),
]);
// render // render
return <div className={`automation-editor--info-box ${className}`}> return (
<div className="automation-editor--info-box-inner"> <div className="automation-editor--info-box">
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} /> <div className="automation-editor--info-box-inner">
<InputText label="Name" value={metadata.alias ?? ""} onChange={onUpdateMetadata('alias')} /> <InputText
<InputText multiline label="Description" value={metadata.description ?? ""} onChange={onUpdateMetadata('description')} /> label="ID"
<InputList value={metadata.id}
label="Mode" onChange={onUpdateMetadata("id")}
current={metadata.mode} />
onChange={onUpdateMetadata('mode')} <InputText
options={[ label="Name"
'parallel', value={metadata.alias ?? ""}
'single', onChange={onUpdateMetadata("alias")}
'queued', />
'restart' <InputText
]} multiline
/> label="Description"
<div className="automation-editor--info-box--tags"> value={metadata.description ?? ""}
<h1>Tags</h1> onChange={onUpdateMetadata("description")}
<div className="automation-editor--info-box--tag-list"> />
{tags.map(([tagName, tagValue], tagIndex) => <div key={tagIndex} className="automation-editor--info-box--tag"> <InputList
label="Mode"
current={metadata.mode}
onChange={onUpdateMetadata("mode")}
options={["parallel", "single", "queued", "restart"]}
/>
<div className="automation-editor--info-box--tags">
<h1>Tags</h1>
<div className="automation-editor--info-box--tag-list">
{tags.map(([tagName, tagValue], tagIndex) => (
<div key={tagIndex} className="automation-editor--info-box--tag">
<InputAutoText
value={tagName}
label="Name"
onChange={(v) => updateTagName(v, tagIndex)}
options={foundNewTagNames}
error={errorIndex === tagIndex ? error : undefined}
/>
<InputAutoText
value={tagValue}
label="Tag"
onChange={(v) => onUpdateTags(v, tagIndex)}
options={tagDB.getTagValues(tagName)}
error={errorIndex === tagIndex ? error : undefined}
/>
<ButtonIcon
className="automation-editor--info-box--tag--trash"
onClick={() => onRemoveTag(tagIndex)}
icon={<TrashIcon />}
/>
</div>
))}
</div>
<hr />
<div className="automation-editor--info-box--tag">
<InputAutoText <InputAutoText
value={tagName} value={newTag[0]}
label="Name" label="Name"
onChange={v => updateTagName(v, tagIndex)} onChange={(v) => setNewTag([v, newTag[1]])}
options={foundNewTagNames} options={foundNewTagNames}
error={errorIndex === tagIndex ? error : undefined} error={errorIndex === "new" ? error : undefined}
/> />
<InputAutoText <InputAutoText
value={tagValue} value={newTag[1]}
label="Tag" label="Tag"
onChange={v => onUpdateTags(v, tagIndex)} onChange={(v) => setNewTag([newTag[0], v])}
options={tagDB.getTagValues(tagName)} options={tagDB.getTagValues(newTag[0])}
error={errorIndex === tagIndex ? error : undefined} error={errorIndex === "new" ? error : undefined}
/> />
<Button className="automation-editor--info-box--tag--trash" onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button> <ButtonIcon
</div>)} className="automation-editor--info-box--tag--add"
</div> onClick={addNewTag}
<hr /> icon={<AddIcon />}
<div className="automation-editor--info-box--tag"> />
<InputAutoText </div>
value={newTag[0]}
label="Name"
onChange={v => setNewTag([v, newTag[1]])}
options={foundNewTagNames}
error={errorIndex === 'new' ? error : undefined}
/>
<InputAutoText
value={newTag[1]}
label="Tag"
onChange={v => setNewTag([newTag[0], v])}
options={tagDB.getTagValues(newTag[0])}
error={errorIndex === 'new' ? error : undefined}
/>
<Button className="automation-editor--info-box--tag--add" onClick={addNewTag} ><AddIcon /></Button>
</div> </div>
</div> </div>
{children}
</div> </div>
{children} );
</div> };
}
@@ -29,13 +29,54 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
gap: 0.25em; gap: 0.25em;
justify-content: flex-end; justify-content: space-between;
margin-top: 0.25em; margin-top: 0.25em;
} }
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * { .automation-editor--flow-wrapper--toolbar--title {
border-color: var(--change); display: flex;
color: var(--change) flex-direction: row;
justify-content: flex-start;
align-items: center;
gap: 0.25em;
width: 100%;
}
.automation-editor--flow-wrapper--toolbar--title--text .id {
font-size: 0.75em;
max-width: 15em;
padding: 0;
margin: 0;
white-space: break-word;
overflow: hidden;
text-overflow: ellipsis;
padding-bottom: 0.25em;
}
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--title--text {
min-width: 5em;
}
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--modes {
min-width: 6em;
}
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--modes .MuiSelect-select {
padding-left: 0.25em;
padding-right: 0.25em;
padding-top: 1.15em;
padding-bottom: 0.25em;
}
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--modes .MuiInputLabel-root {
font-size: 0.9em;
left: -0.5em;
}
.automation-editor.changed .automation-editor--flow-wrapper--toolbar--save-btn,
.automation-editor--info-box--buttons.changed .automation-editor--flow-wrapper--toolbar--save-btn {
border-color: var(--mui-success-light);
color: var(--mui-success-light);
} }
@@ -46,13 +87,13 @@
padding: 0.25em; padding: 0.25em;
} }
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--flow { .automation-editor--flow-wrapper.changed>.dag-graphboard {
border-color: var(--change); border-color: var(--mui-success-light);
} }
.automation-editor--flow-wrapper--flow { .dag-graphboard {
flex: 1; flex: 1;
border: 1px solid var(--secondary-accent); border: 1px solid var(--mui-grey-700);
margin: 0 0 0.5em 0; margin: 0 0 0.5em 0;
z-index: 1; z-index: 1;
} }
@@ -61,18 +102,6 @@
position: relative; position: relative;
} }
.automation-editor--info-box--icon {
position: absolute;
right: 0em;
bottom: 0.5em;
z-index: 10;
}
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
transform: rotate(180deg);
z-index: 2;
}
.automation-editor.loading .mock-list { .automation-editor.loading .mock-list {
position: absolute; position: absolute;
left: 0; left: 0;
@@ -93,4 +122,9 @@
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
}
.automation-editor--info-box--buttons {
display: flex;
gap: 1em;
} }
@@ -1,100 +1,100 @@
import React from "react"; import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react'; import { ComponentMeta, ComponentStory } from "@storybook/react";
import { AutomationEditor } from './index'; import { AutomationEditor } from "./index";
import { useState } from 'react'; import { useState } from "react";
import * as dgconst from 'components/DAGFlow/constants';
import { Page } from "components/Page"; import { Page } from "components/Page";
import { makeTagDB } from "components/AutomationList/TagDB"; import { makeTagDB } from "components/AutomationList/TagDB";
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
export default { export default {
title: 'App/AutomationList/Editor', title: "App/AutomationList/Editor",
component: AutomationEditor, component: AutomationEditor,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: "^on.*" } },
args: { args: {
dims: dgconst.DEFAULT_DIMS, dims: DEFAULT_DIMS,
} },
} as ComponentMeta<typeof AutomationEditor> } as ComponentMeta<typeof AutomationEditor>;
const Template: ComponentStory<typeof AutomationEditor> = args => { const Template: ComponentStory<typeof AutomationEditor> = (args) => {
const [state, setState] = useState(args.automation) const [state, setState] = useState(args.automation);
return <Page> return (
<AutomationEditor <Page>
{...args} <AutomationEditor
tagDB={makeTagDB(state ? [state] : [])} {...args}
automation={state} tagDB={makeTagDB(state ? [state] : [])}
onUpdate={s => { automation={state}
window.setTimeout(() => setState(s), 3000) onUpdate={(s) => {
}} window.setTimeout(() => setState(s), 3000);
/> }}
</Page> />
} </Page>
);
};
export const Loading = Template.bind({}); export const Loading = Template.bind({});
export const Simple = Template.bind({});
export const Simple = Template.bind({})
Simple.args = { Simple.args = {
...Simple.args, ...Simple.args,
automation: { automation: {
condition: [], condition: [],
tags: { tags: {
"Room": "Bathroom", Room: "Bathroom",
"For": "Toliet", For: "Toliet",
"Type": "Smell", Type: "Smell",
"Use": "Flushing" Use: "Flushing",
}, },
metadata: { metadata: {
id: "random", id:
"random" + String(Date.now()) + String(Date.now()) + String(Date.now()),
alias: "Random", alias: "Random",
description: "Example Metadata", description: "Example Metadata",
trigger_variables: { trigger_variables: {
'wowo': '!' wowo: "!",
}, },
mode: 'single', mode: "single",
}, },
trigger: [ trigger: [
{ {
"platform": "numeric_state", platform: "numeric_state",
"entity_id": "test", entity_id: "test",
}, },
{ {
"platform": "homeassistant", platform: "homeassistant",
"event": "start", event: "start",
} },
], ],
sequence: [ sequence: [
{ {
condition: 'and', condition: "and",
conditions: [ conditions: [
{ {
condition: 'numeric_state', condition: "numeric_state",
entity_id: 'sensor.temperature_kitchen', entity_id: "sensor.temperature_kitchen",
below: '15', below: "15",
}, },
{ {
condition: 'template', condition: "template",
value_template: 'states(switch.kitchen_light) == "on"' value_template: 'states(switch.kitchen_light) == "on"',
} },
] ],
}, },
{ {
alias: "Start Music In Kitchen", alias: "Start Music In Kitchen",
service: 'media_player.play_media', service: "media_player.play_media",
target: { target: {
entity_id: "media_player.kitchen_dot" entity_id: "media_player.kitchen_dot",
}, },
data: { data: {
media_content_id: "Good Morning", media_content_id: "Good Morning",
media_content_type: "SPOTIFY", media_content_type: "SPOTIFY",
} },
} },
] ],
} },
} };
export const EmptyStart = Template.bind({});
export const EmptyStart = Template.bind({})
EmptyStart.args = { EmptyStart.args = {
...EmptyStart.args, ...EmptyStart.args,
automation: { automation: {
@@ -105,31 +105,28 @@ EmptyStart.args = {
alias: "Random", alias: "Random",
description: "Example Metadata", description: "Example Metadata",
trigger_variables: { trigger_variables: {
'wowo': '!' wowo: "!",
}, },
mode: 'single', mode: "single",
}, },
trigger: [ trigger: [],
], sequence: [],
sequence: [] },
} };
}
export const BadAutomationInvalidMetadata = Template.bind({}) export const BadAutomationInvalidMetadata = Template.bind({});
BadAutomationInvalidMetadata.args = { BadAutomationInvalidMetadata.args = {
...BadAutomationInvalidMetadata.args, ...BadAutomationInvalidMetadata.args,
automation: { automation: {
condition: [], condition: [],
tags: {}, tags: {},
metadata: { metadata: {} as any,
} as any, trigger: [],
trigger: [ sequence: [],
], },
sequence: [] };
}
}
export const BadAutomationInvalidTriggers = Template.bind({}) export const BadAutomationInvalidTriggers = Template.bind({});
BadAutomationInvalidTriggers.args = { BadAutomationInvalidTriggers.args = {
...BadAutomationInvalidTriggers.args, ...BadAutomationInvalidTriggers.args,
automation: { automation: {
@@ -140,18 +137,16 @@ BadAutomationInvalidTriggers.args = {
alias: "Random", alias: "Random",
description: "Example Metadata", description: "Example Metadata",
trigger_variables: { trigger_variables: {
'wowo': '!' wowo: "!",
}, },
mode: 'single', mode: "single",
}, },
trigger: [ trigger: ["haha I am a string"] as any,
"haha I am a string" sequence: [],
] as any, },
sequence: [] };
}
}
export const BadAutomationInvalidSequence = Template.bind({}) export const BadAutomationInvalidSequence = Template.bind({});
BadAutomationInvalidSequence.args = { BadAutomationInvalidSequence.args = {
...BadAutomationInvalidSequence.args, ...BadAutomationInvalidSequence.args,
automation: { automation: {
@@ -162,15 +157,89 @@ BadAutomationInvalidSequence.args = {
alias: "Bad Choose Sequence", alias: "Bad Choose Sequence",
description: "Example Metadata", description: "Example Metadata",
trigger_variables: { trigger_variables: {
'wowo': '!' wowo: "!",
}, },
mode: 'single', mode: "single",
}, },
trigger: [], trigger: [],
sequence: [ sequence: [
{ {
choose: {} choose: {},
} },
] as any ] as any,
} },
} };
export const RepeatExample = Template.bind({});
RepeatExample.args = {
...RepeatExample.args,
automation: {
metadata: {
id: "1654976151462",
alias: "Get out of baby room",
description: "",
mode: "single",
},
trigger: [
{
type: "opened",
platform: "device",
device_id: "9b33663d2700da8efe0c31c946448f77",
entity_id: "binary_sensor.door_baby",
domain: "binary_sensor",
},
],
condition: [],
sequence: [
{
service: "notify.mobile_app_levas_phone",
data: {
message: "Someone is in Korie’s room!!!",
},
},
{
repeat: {
while: [
{
type: "is_open",
condition: "device",
device_id: "9b33663d2700da8efe0c31c946448f77",
entity_id: "binary_sensor.door_baby",
domain: "binary_sensor",
},
],
sequence: [
{
service: "notify.alexa_media",
data: {
message:
"Get the fuck out of the baby’s bedroom you sick fuck! This room belongs to Korie! Close the door! I said close. The. Door!",
data: null,
type: "tts",
target: "media_player.baby_bedroom_dot",
},
},
{
delay: {
hours: 0,
minutes: 0,
seconds: 7,
milliseconds: 0,
},
},
],
},
},
{
service: "light.turn_off",
target: {
entity_id: ["light.switch_baby"],
},
data: {
flash: "short",
},
},
],
tags: {},
},
};
+252 -128
View File
@@ -1,23 +1,28 @@
import "./index.css"; import "./index.css";
import Icon from '@mui/material/Icon'; import Icon from "@mui/material/Icon";
import { ArrowIcon, CheckMarkIcon } from "components/Icons"; import { CheckMarkIcon } from "components/Icons";
import { FC, useEffect, useState } from "react"; import { FC, useState } from "react";
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
import { Modal } from "components/Modal";
import { AutoInfoBox } from "./AutoInfoBox"; import { AutoInfoBox } from "./AutoInfoBox";
import { ButtonIcon } from "components/Icons/ButtonIcons"; import ModeEditOutlineTwoToneIcon from "@mui/icons-material/ModeEditOutlineTwoTone";
import { Button } from "components/Inputs/Button"; import { Button } from "components/Inputs/Button";
import { useAutomatioEditorState, EditorData } from './state'; import { useAutomatioEditorState, EditorData } from "./state";
import { SafeDAGAutomationFlow } from "components/DAGFlow/safe"; import { MiniFailure } from "types/validators/helper";
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
import { MiniFailure } from 'types/validators/helper';
import InputYaml from "components/Inputs/InputYaml"; import InputYaml from "components/Inputs/InputYaml";
import { TagDB } from "components/AutomationList/TagDB"; import { TagDB } from "components/AutomationList/TagDB";
import Skeleton from "@mui/material/Skeleton"; import Skeleton from "@mui/material/Skeleton";
import LinearProgress from "@mui/material/LinearProgress"; import LinearProgress from "@mui/material/LinearProgress";
import { useCookies } from "react-cookie";
import { DAGDims } from "components/DAGGraph/elements/types";
import { DAGAutomationGraph } from "components/DAGGraph";
import { InputList } from "components/Inputs/InputList";
import { InputTextView } from "components/Inputs/InputTextView";
import { ControlButton } from "react-flow-renderer";
interface Props { interface Props {
automation?: AutomationData; automation?: AutomationData;
dims: DAGAutomationFlowDims; dims: DAGDims;
onUpdate: (auto: AutomationData) => void; onUpdate: (auto: AutomationData) => void;
tagDB: TagDB; tagDB: TagDB;
} }
@@ -38,134 +43,253 @@ export const AutomationEditor: FC<Props> = ({
save, save,
saveAndUpdate, saveAndUpdate,
} = useAutomatioEditorState(propsAutos, propsOnUpdate); } = useAutomatioEditorState(propsAutos, propsOnUpdate);
const [closeInfo, setCloseInfo] = useState(false); const [infoBoxOpen, setInfoBox] = useState(false);
const [flipped, setFlipped] = useState(dims.flipped); const [
{ ckFlipped },
// effect setCookies,
useEffect(() => { // eslint-disable-next-line
if (dims.flipped !== flipped) { _,
setFlipped(dims.flipped) ] = useCookies(["ckFlipped"]);
} // alias
}, [dims.flipped]) const flipped = dims.flipped ? true : ckFlipped === "1";
const setFlipped = (v: boolean) => setCookies("ckFlipped", v ? "1" : "0");
// render // render
if (state.status === 'loading') { if (state.status === "loading") {
return <div className="automation-editor loading"> return (
<LinearProgress className="linear-loader" /> <div className="automation-editor loading">
<Skeleton className="mock-list" variant="rectangular" /> <LinearProgress className="linear-loader" />
<Skeleton className="mock-graph" variant="rectangular" /> <Skeleton className="mock-list" variant="rectangular" />
</div> <Skeleton className="mock-graph" variant="rectangular" />
}
if (state.status === 'invalid') {
return <ValidationBox
failures={state.failures}
data={state.data}
validate={validate}
onSave={saveAndUpdate}
/>
}
return <div className="automation-editor">
{state.status === 'saving' && <LinearProgress className="linear-loader" />}
<AutoInfoBox
className={closeInfo ? "hide" : "show"}
metadata={state.data.metadata}
tags={state.data.tags}
onUpdate={updateMetadata}
tagDB={tagDB}
>
<ButtonIcon
className="automation-editor--info-box--icon"
onClick={() => setCloseInfo(!closeInfo)}
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
Icon={ArrowIcon}
/>
</AutoInfoBox>
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
<div className="automation-editor--flow-wrapper--toolbar">
{!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> </div>
<SafeDAGAutomationFlow );
className="automation-editor--flow-wrapper--flow" }
sequence={state.data.sequence} if (state.status === "invalid") {
trigger={state.data.trigger} return (
condition={state.data.condition} <ValidationBox
onSequenceUpdate={updateSequence} failures={state.failures}
onTriggerUpdate={updateTrigger} data={state.data}
onConditionUpdate={updateCondition} validate={validate}
dims={{ onSave={saveAndUpdate}
...dims,
flipped,
}}
/> />
</div> );
</div> }
} return (
<div className={["automation-editor", state.status].join(" ")}>
{state.status === "saving" && (
<LinearProgress className="linear-loader" />
)}
<Modal open={infoBoxOpen}>
<AutoInfoBox
metadata={state.data.metadata}
tags={state.data.tags}
onUpdate={updateMetadata}
tagDB={tagDB}
>
<div
className={[
"automation-editor--info-box--buttons",
state.status,
].join(" ")}
>
<Button onClick={() => setInfoBox(false)}>Close</Button>
<Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save}
disabled={state.status !== "changed"}
>
Save <CheckMarkIcon color="#bf4" />
</Button>
</div>
</AutoInfoBox>
</Modal>
<div
className={["automation-editor--flow-wrapper", state.status].join(" ")}
>
<div className="automation-editor--flow-wrapper--toolbar">
<div className="automation-editor--flow-wrapper--toolbar--title">
<span className="automation-editor--flow-wrapper--toolbar--title--text">
<div className="id">{state.data.metadata.id}</div>
<InputTextView
value={state.data.metadata.alias ?? ""}
placeholder="Name"
onChange={(alias) =>
updateMetadata(
{
...state.data.metadata,
alias,
},
state.data.tags
)
}
/>
</span>
<InputList
fullWidth={false}
label="Mode"
className="automation-editor--flow-wrapper--toolbar--modes"
current={{
id: state.data.metadata.mode,
label: "",
}}
onChange={({ id }) =>
updateMetadata(
{
...state.data.metadata,
mode: id,
},
state.data.tags
)
}
getKey={({ id }) => id}
getDescription={({ label }) => label}
options={[
{
id: "single",
label: "Do not start a new run. Issue a warning.",
},
{
id: "parallel",
label:
"Start a new, independent run in parallel with previous runs.",
},
{
id: "queued",
label:
"Start a new run after all previous runs complete. Runs are guaranteed to execute in the order they were queued.",
},
{
id: "restart",
label: "Start a new run after first stopping previous run.",
},
]}
/>
<InputTextView
className="description"
value={state.data.metadata.description ?? ""}
placeholder="Description"
onChange={(description) =>
updateMetadata(
{
...state.data.metadata,
description,
},
state.data.tags
)
}
/>
</div>
{!dims.flipped && (
<Button
className={"automation-editor--flow-wrapper--toolbar--flip-btn"}
onClick={() => setFlipped(!flipped)}
>
<Icon>{flipped ? "flip_to_front" : "flip_to_back"}</Icon>
Flip
</Button>
)}
<Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save}
disabled={state.status !== "changed"}
>
Save <CheckMarkIcon color="#bf4" />
</Button>
</div>
<DAGAutomationGraph
sequence={state.data.sequence}
trigger={state.data.trigger}
condition={state.data.condition}
onSequenceUpdate={updateSequence}
onTriggerUpdate={updateTrigger}
onConditionUpdate={updateCondition}
isFlipped={flipped}
additionalControls={
<ControlButton onClick={() => setInfoBox(!infoBoxOpen)}>
<ModeEditOutlineTwoToneIcon />
</ControlButton>
}
/>
</div>
</div>
);
};
export const ValidationBox: FC<{ export const ValidationBox: FC<{
failures: MiniFailure[] failures: MiniFailure[];
validate: (d: any) => MiniFailure[] | null, validate: (d: any) => MiniFailure[] | null;
data: EditorData, data: EditorData;
onSave: (d: EditorData) => void, onSave: (d: EditorData) => void;
}> = props => { }> = (props) => {
const [{ failures, data }, setState] = useState({ const [{ failures, data }, setState] = useState({
failures: props.failures, failures: props.failures,
data: props.data, data: props.data,
}); });
const makeSave = <K extends keyof EditorData>(k: K) => (d: EditorData[K]) => { const makeSave =
const newData = { <K extends keyof EditorData>(k: K) =>
...data, (d: EditorData[K]) => {
[k]: d, const newData = {
} ...data,
const newFails = props.validate(newData); [k]: d,
if (newFails) { };
setState({ const newFails = props.validate(newData);
failures: newFails, if (newFails) {
data: newData, setState({
}) failures: newFails,
} else { data: newData,
setState({ });
failures: [], } else {
data: newData, setState({
}) failures: [],
} data: newData,
} });
}
};
return <div className="automation-editor-failures"> return (
<ul> <div className="automation-editor-failures">
{failures.map((f, i) => <> <ul>
<li key={i}> {failures.map((f, i) => (
<b>{f.path}</b>: <>
<ul> <li key={i}>
{f.message.map((m, j) => <li key={j}> <b>{f.path}</b>:
{m} <ul>
</li>)} {f.message.map((m, j) => (
</ul> <li key={j}>{m}</li>
</li> ))}
</>)} </ul>
</ul> </li>
<span>Please correct the automation file manually and then continue!</span> </>
<InputYaml label="Metadata" value={data.metadata} onChange={makeSave('metadata')} /> ))}
<InputYaml label="Tags" value={data.tags} onChange={makeSave('tags')} /> </ul>
<InputYaml label="Trigger" value={data.trigger} onChange={makeSave('trigger')} /> <span>
<InputYaml label="Condition" value={data.condition} onChange={makeSave('condition')} /> Please correct the automation file manually and then continue!
<InputYaml label="Actions" value={data.sequence} onChange={makeSave('sequence')} /> </span>
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>Save</Button> <InputYaml
</div> label="Metadata"
} value={data.metadata}
onChange={makeSave("metadata")}
/>
<InputYaml label="Tags" value={data.tags} onChange={makeSave("tags")} />
<InputYaml
label="Trigger"
value={data.trigger}
onChange={makeSave("trigger")}
/>
<InputYaml
label="Condition"
value={data.condition}
onChange={makeSave("condition")}
/>
<InputYaml
label="Actions"
value={data.sequence}
onChange={makeSave("sequence")}
/>
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>
Save
</Button>
</div>
);
};
@@ -3,178 +3,185 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react"; import { useState } from "react";
import { AutomationList } from "."; import { AutomationList } from ".";
import { bigMockAutoList } from "utils/mocks"; import { bigMockAutoList } from "utils/mocks";
import * as dgconst from 'components/DAGFlow/constants';
import { Page } from "components/Page"; import { Page } from "components/Page";
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
import { AutomationData } from "types/automations";
export default { export default {
title: 'App/AutomationList', title: "App/AutomationList",
component: AutomationList, component: AutomationList,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: "^on.*" } },
args: { args: {
dims: dgconst.DEFAULT_DIMS dims: DEFAULT_DIMS,
} },
} as ComponentMeta<typeof AutomationList>; } as ComponentMeta<typeof AutomationList>;
const Template: ComponentStory<typeof AutomationList> = (args) => {
const Template: ComponentStory<typeof AutomationList> = args => { const [autos, setAutos] = useState(args.automations.data);
const [autos, setAutos] = useState(args.automations) return (
return <Page> <Page>
<AutomationList {...args} automations={autos} <AutomationList
onAdd={a => { {...args}
args.onAdd(a); automations={{
setAutos([...autos, a]); ...args.automations,
}} data: autos,
onRemove={i => { }}
args.onRemove(i); onAdd={(a) => {
setAutos([
...autos.slice(0, i),
...autos.slice(i + 1),
]);
}}
onUpdate={(i, a) => {
args.onUpdate(i, a);
setAutos([
...autos.slice(0, i),
a,
...autos.slice(i + 1),
]);
}}
/>
</Page>
}
export const EmptyStart = Template.bind({})
EmptyStart.args = {
...EmptyStart.args,
automations: [],
}
export const FewAutos = Template.bind({})
FewAutos.args = {
...FewAutos.args,
automations: bigMockAutoList,
}
export const BadAutmations = Template.bind({})
BadAutmations.args = {
...BadAutmations.args,
automations: [
{
"metadata": {
"alias": "Set Thermostat to 76 at 8am",
"description": "",
"mode": "single",
} as any,
"trigger": [
{
"at": "08:00:00",
"platform": "time"
}
],
"condition": [
{
"condition": "state",
"entity_id": "climate.thermostat",
"state": "cool"
}
],
"sequence": [
{
"data": {
"temperature": 76
},
"service": "climate.set_temperature",
"target": {
"entity_id": "climate.thermostat"
}
}
],
"tags": {},
},
{
condition: [],
tags: {},
metadata: {
id: "Bad Choose Sequence",
alias: "Bad Choose",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
},
mode: 'single',
},
trigger: [],
sequence: [
{
choose: {}
}
] as any
},
{
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Bad Trigger",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
},
mode: 'single',
},
trigger: [
"haha I am a string"
] as any,
sequence: []
},
{
condition: [],
tags: {},
metadata: {
} as any,
trigger: [
],
sequence: []
}
],
}
export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = args => {
const [autos, setAutos] = useState(args.automations)
return <Page>
<AutomationList {...args} automations={autos}
onAdd={a => {
window.setTimeout(() => {
args.onAdd(a); args.onAdd(a);
setAutos([...autos, a]); setAutos([...autos, a]);
}, 10000) }}
}} onRemove={(i) => {
onRemove={i => {
window.setTimeout(() => {
args.onRemove(i); args.onRemove(i);
setAutos([ setAutos([...autos.slice(0, i), ...autos.slice(i + 1)]);
...autos.slice(0, i), }}
...autos.slice(i + 1), onUpdate={(i, a) => {
]);
}, 10000)
}}
onUpdate={(i, a) => {
window.setTimeout(() => {
args.onUpdate(i, a); args.onUpdate(i, a);
setAutos([ setAutos([...autos.slice(0, i), a, ...autos.slice(i + 1)]);
...autos.slice(0, i), }}
a, />
...autos.slice(i + 1), </Page>
]); );
}, 10000) };
}}
/> const make = (autos: AutomationData[]) => {
</Page> const NewTemp = Template.bind({});
} NewTemp.args = {
...NewTemp.args,
automations: {
data: autos,
params: {
offset: 0,
limit: 100,
},
totalItems: autos.length,
},
};
return NewTemp;
};
export const EmptyStart = make([]);
export const FewAutos = make(bigMockAutoList);
export const BadAutmations = make([
{
metadata: {
alias: "Set Thermostat to 76 at 8am",
description: "",
mode: "single",
} as any,
trigger: [
{
at: "08:00:00",
platform: "time",
},
],
condition: [
{
condition: "state",
entity_id: "climate.thermostat",
state: "cool",
},
],
sequence: [
{
data: {
temperature: 76,
},
service: "climate.set_temperature",
target: {
entity_id: "climate.thermostat",
},
},
],
tags: {},
},
{
condition: [],
tags: {},
metadata: {
id: "Bad Choose Example",
alias: "Bad Choose",
description: "Example Metadata",
trigger_variables: {
wowo: "!",
},
mode: "single",
},
trigger: [],
sequence: [
{
choose: [],
},
] as any,
},
{
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Bad Trigger",
description: "Example Metadata",
trigger_variables: {
wowo: "!",
},
mode: "single",
},
trigger: ["haha I am a string"] as any,
sequence: [],
},
{
condition: [],
tags: {},
metadata: {} as any,
trigger: [],
sequence: [],
},
]);
export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = (
args
) => {
const [autos, setAutos] = useState(args.automations.data);
return (
<Page>
<AutomationList
{...args}
automations={{
...args.automations,
data: autos,
}}
onAdd={(a) => {
window.setTimeout(() => {
args.onAdd(a);
setAutos([...autos, a]);
}, 10000);
}}
onRemove={(i) => {
window.setTimeout(() => {
args.onRemove(i);
setAutos([...autos.slice(0, i), ...autos.slice(i + 1)]);
}, 10000);
}}
onUpdate={(i, a) => {
window.setTimeout(() => {
args.onUpdate(i, a);
setAutos([...autos.slice(0, i), a, ...autos.slice(i + 1)]);
}, 10000);
}}
/>
</Page>
);
};
FewAutosWithSlowLoader.args = { FewAutosWithSlowLoader.args = {
...FewAutosWithSlowLoader.args, ...FewAutosWithSlowLoader.args,
automations: bigMockAutoList, automations: {
} data: bigMockAutoList,
params: {
limit: 100,
offset: 0,
},
totalItems: 100,
},
};
@@ -25,15 +25,15 @@
padding-bottom: 0.5em; padding-bottom: 0.5em;
border-width: 1px; border-width: 1px;
border-bottom-style: solid; border-bottom-style: solid;
border-color: var(--primary-accent); border-color: var(--mui-grey-400);
} }
.automation-list-box--body--group.other { .automation-list-box--body--group.other {
border-color: var(--green); border-color: var(--mui-success-main);
} }
.automation-list-box--body--group.other>b { .automation-list-box--body--group.other>b {
color: var(--change); color: var(--mui-success-light);
} }
.automation-list-box--body--group>.automation-list-box--body--group { .automation-list-box--body--group>.automation-list-box--body--group {
@@ -51,72 +51,10 @@
.automation-list-box--body--group>b:hover, .automation-list-box--body--group>b:hover,
.automation-list-box--body--group.selected>b { .automation-list-box--body--group.selected>b {
background-color: var(--secondary-accent); background-color: var(--mui-grey-700);
color: var(--secondary); color: var(--mui-secondary-contrastText);
} }
.automation-list-box--body--item:hover, .automation-list-box--body--item.selected {
background-color: var(--primary-accent);
color: var(--primary);
}
.automation-list-box--body--item:hover>.automation-list-box--body--item--tags>span {
border-color: var(--primary);
}
.automation-list-box--body--item {
padding-left: 1em;
cursor: pointer;
display: flex;
justify-content: left;
align-items: flex-start;
gap: 1em;
flex-wrap: wrap;
}
.automation-list-box--body--item::before {
content: "⊚ ";
}
.automation-list-box--body--item--title {
display: flex;
flex-direction: column;
padding-left: 0.25em;
flex: 1;
}
.automation-list-box--body--item--title>b {
font-size: 1em;
}
.automation-list-box--body--item--title>span, .automation-list-box--body--item--title>b>span {
font-size: 0.75em;
}
.automation-list-box--body--item>button {
padding: 0.25em !important;
margin: 0.5em !important;
}
.automation-list-box--body--item--tags {
flex: 1;
display: flex;
flex-wrap: wrap;
font-size: 0.75em;
justify-content: left;
align-items: flex-start;
overflow: auto;
max-height: 100%;
gap: 0.25em;
}
.automation-list-box--body--item--tags>span {
border-color: var(--primary-accent);
border-style: solid;
border-width: 1px;
border-radius: 0.5em;
padding: 0.1em 0.5em;
}
.automation-list-box--bottom { .automation-list-box--bottom {
margin-top: 0.5em; margin-top: 0.5em;
@@ -127,8 +65,20 @@
align-items: center; align-items: center;
} }
.automation-list-box--bottom>button { .automation-list-box--bottom>.automation-list-box--bottom--add {
background-color: #070; background-color: var(--mui-primary-main);
color: var(--primary-accent); color: var(--mui-primary-contrastText);
padding: 0.5em 2em; padding: 0.5em 2em;
}
.automation-list-box--bottom>.automation-list-box--bottom--add:hover {
color: var(--mui-primary-light);
}
.automation-list-box--bottom--load svg {
color: var(--mui-primary-main);
}
.automation-list-box--bottom--load.less svg {
transform: rotate(180deg);
} }
@@ -4,47 +4,76 @@ import { AutomationListBox } from "./AutomationListBox";
import { createMockAuto } from "utils/mocks"; import { createMockAuto } from "utils/mocks";
import { Page } from "components/Page"; import { Page } from "components/Page";
import { CookiesProvider } from "react-cookie"; import { CookiesProvider } from "react-cookie";
import { makeTagDB } from "./TagDB";
import { AutomationData } from "types/automations";
export default { export default {
title: 'App/AutomationList/Box', title: "App/AutomationList/Box",
component: AutomationListBox, component: AutomationListBox,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: "^on.*" } },
args: { args: {},
}
} as ComponentMeta<typeof AutomationListBox>; } as ComponentMeta<typeof AutomationListBox>;
const Template: ComponentStory<typeof AutomationListBox> = (args) => {
const [selected, setSelected] = useState(args.selected);
return (
<Page>
<CookiesProvider>
<AutomationListBox
{...args}
tagsDB={makeTagDB(args.automations.data)}
automations={args.automations}
selected={selected}
onSelectAutomation={(i) => {
setSelected(i);
args.onSelectAutomation(i);
}}
/>
</CookiesProvider>
</Page>
);
};
const Template: ComponentStory<typeof AutomationListBox> = args => { const make = (autos: AutomationData[]) => {
const [selected, setSelected] = useState(args.selected) const NewTemp = Template.bind({});
return <Page> NewTemp.args = {
<CookiesProvider> ...NewTemp.args,
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => { automations: {
setSelected(i) data: autos,
args.onSelectAutomation(i) params: {
}} /> offset: 0,
</CookiesProvider> limit: 100,
</Page> },
} totalItems: autos.length,
},
};
export const EmptyStart = Template.bind({}) return NewTemp;
EmptyStart.args = { };
...EmptyStart.args,
automations: [],
}
export const FewAutos = Template.bind({}) export const EmptyStart = make([]);
FewAutos.args = {
...FewAutos.args, export const FewAutos = make([
automations: [ createMockAuto({
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }), Room: "Bathroom",
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }), Type: "Lights",
createMockAuto({ "Room": "Living Room", "Type": "Climate" }), NewDevice: "Yes",
createMockAuto({ "Type": "Climate" }), Remote: "No",
createMockAuto({ "Type": "Lights", "Routine": "Myself" }), Floor: "1",
createMockAuto({ "Routine": "DNS", "Type": "SSL" }), }),
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }), createMockAuto({ Room: "Bathroom", Type: "Climate" }),
createMockAuto({ "Room": "Office", "Type": "Lights" }), createMockAuto({ Room: "Living Room", Type: "Climate" }),
createMockAuto({ "Room": "Office" }), createMockAuto({ Type: "Climate" }),
createMockAuto(), createMockAuto({ Type: "Lights", Routine: "Myself" }),
], createMockAuto({ Routine: "DNS", Type: "SSL" }),
} createMockAuto({ Room: "Bedroom", Type: "Lights", Routine: "Baby" }),
createMockAuto({ Room: "Office", Type: "Lights" }),
createMockAuto({ Room: "Office" }),
createMockAuto(),
]);
export const OneAuto = make([
createMockAuto({
Type: "Climate",
}),
]);
@@ -1,31 +1,22 @@
import { getTagList } from './AutomationListBox'; import { getTagList } from "./AutomationListBox";
import { createMockAuto } from 'utils/mocks'; import { createMockAuto } from "utils/mocks";
// const makeDummy = (id: string, tags: Record<string, string>) => ({ test("getTagList", () => {
// condition: [], expect(
// metadata: { getTagList([
// id, createMockAuto(),
// alias: '', createMockAuto(),
// description: '', createMockAuto(),
// mode: 'single', createMockAuto(),
// }, ])
// tags, ).toStrictEqual([]);
// sequence: [],
// trigger: [],
// })
test('getTagList', () => { expect(
expect(getTagList([ getTagList([
createMockAuto(), createMockAuto({ Room: "Kitchen", Area: "Oven" }),
createMockAuto(), createMockAuto({ Room: "Attic" }),
createMockAuto(), createMockAuto({ Room: "Office" }),
createMockAuto(), createMockAuto({ Area: "Balcony" }),
])).toStrictEqual([]) ])
).toStrictEqual(["Room", "Area"]);
expect(getTagList([ });
createMockAuto({ "Room": "Kitchen", "Area": "Oven" }),
createMockAuto({ "Room": "Attic" }),
createMockAuto({ "Room": "Office" }),
createMockAuto({ "Area": "Balcony" }),
])).toStrictEqual(["Room", "Area"])
})
@@ -1,5 +1,5 @@
import "./AutomationListBox.css"; import "./AutomationListBox.css";
import { FC, useState } from 'react'; import { FC, useState } from "react";
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
import InputMultiSelect from "components/Inputs/InputMultiSelect"; import InputMultiSelect from "components/Inputs/InputMultiSelect";
import InputText from "components/Inputs/InputText"; import InputText from "components/Inputs/InputText";
@@ -7,122 +7,189 @@ import { Button } from "components/Inputs/Button";
import { makeGrouping } from "./automationGrouper"; import { makeGrouping } from "./automationGrouper";
import { AutomationListBoxGroup } from "./AutomationListBoxGroup"; import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
import { useCookies } from "react-cookie"; import { useCookies } from "react-cookie";
import { TagDB } from "components/AutomationList/TagDB";
// import { ButtonIcon } from "components/Icons/ButtonIcons";
// import ReadMoreOutlinedIcon from "@mui/icons-material/ReadMoreOutlined";
import { ListData, ListParams } from "apiService/types";
import Chip from "@mui/material/Chip";
import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
export type AutomationListBoxProps = {
export type Props = { automations: ListData<AutomationData>;
automations: AutomationData[]; selected: number;
selected: number; onSelectAutomation: (i: number) => void;
onSelectAutomation: (i: number) => void; onRemove: (i: number) => void;
onRemove: (i: number) => void; onAdd: () => void;
onAdd: () => void; onUpdateTags: (id: string, tags: Record<string, string>) => void;
} onUpdate: (a: AutomationData, i: number) => void;
onLoadMore: (p: ListParams) => void;
tagsDB: TagDB;
};
const useAutomationListBoxState = () => { const useAutomationListBoxState = () => {
const [cookies, setCookies, _] = useCookies(['albSearchText', 'albSelected']); const [
let initialSelected = []; cookies,
try { setCookies,
initialSelected = JSON.parse(cookies.albSelected) // eslint-disable-next-line
if (!Array.isArray(initialSelected)) { _,
initialSelected = [initialSelected] ] = useCookies(["albSearchText", "albSelected"]);
} let initialSelected = [];
initialSelected = initialSelected.map(Number) try {
// eslint-disable-next-line initialSelected = JSON.parse(cookies.albSelected);
} catch (_) { } if (!Array.isArray(initialSelected)) {
const [searchText, setSearchText] = useState(cookies.albSearchText ?? ""); initialSelected = [initialSelected];
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,
} }
} initialSelected = initialSelected.map(Number);
// eslint-disable-next-line
} catch (_) {}
const [searchText, setSearchText] = useState(cookies.albSearchText ?? "");
const [selectedTagIdx, setSelectedTagIdx] =
useState<number[]>(initialSelected);
export const AutomationListBox: FC<Props> = ({ return {
automations, searchText,
selected, setSearchText(v: string) {
onSelectAutomation, setSearchText(v);
onAdd, setCookies("albSearchText", v);
onRemove, },
setSelectedTagIdx(n: number[]) {
setSelectedTagIdx(n);
setCookies("albSelected", JSON.stringify(n));
},
selectedTagIdx,
};
};
export const AutomationListBox: FC<AutomationListBoxProps> = ({
automations: {
data: automations,
// params: autoParams,
totalItems: totalAutomations,
},
selected,
onSelectAutomation,
onAdd,
onRemove,
// onLoadMore,
onUpdateTags,
tagsDB,
onUpdate,
}) => { }) => {
const tags = getTagList(automations);
const { searchText, setSearchText, selectedTagIdx, setSelectedTagIdx } =
useAutomationListBoxState();
const filteredAutomations = filterAutomations(
automations,
searchText.toLowerCase()
);
const grouping = makeGrouping(
filteredAutomations.map(([a, _]) => a),
selectedTagIdx.map((i) => tags[i]),
selected
);
const tags = getTagList(automations); return (
const { <div className="automation-list-box">
searchText, <div className="automation-list-box--nav">
setSearchText, <InputText label="Search" value={searchText} onChange={setSearchText} />
selectedTagIdx, <InputMultiSelect
setSelectedTagIdx, label="Tags"
} = useAutomationListBoxState(); selected={selectedTagIdx}
const filteredAutomations = filterAutomations(automations, searchText.toLowerCase(), selectedTagIdx, tags); onChange={setSelectedTagIdx}
const grouping = makeGrouping( options={tags}
filteredAutomations.map(([a, _]) => a), max={3}
selectedTagIdx.map(i => tags[i]), />
selected, </div>
) <div className="automation-list-box--body">
<AutomationListBoxGroup
return <div className="automation-list-box"> events={{
<div className="automation-list-box--nav"> onSelectAutomation,
<InputText onRemove,
label="Search" }}
value={searchText} autos={filteredAutomations}
onChange={setSearchText} grouping={grouping}
selectedAutomationIdx={selected}
tagsDB={tagsDB}
onSave={onUpdate}
/>
</div>
<div className="automation-list-box--bottom">
<Button className="automation-list-box--bottom--add" onClick={onAdd}>
Add
</Button>
{automations.length < totalAutomations ? (
<>
<Chip
label={`Only loaded ${automations.length} out of ${totalAutomations}`}
variant="outlined"
color="warning"
icon={<InfoOutlinedIcon />}
onClick={() =>
window.open(
"https://github.com/asosnovsky/Shortumation/issues/78",
"_blank"
)
}
/> />
<InputMultiSelect <small>support for more is not yet implemented</small>
label="Tags" </>
selected={selectedTagIdx} ) : (
onChange={setSelectedTagIdx} ""
options={tags} )}
max={3} {/* {autoParams.offset > 0 && (
<ButtonIcon
borderless
className="automation-list-box--bottom--load less"
icon={<ReadMoreOutlinedIcon />}
onClick={() => onLoadMore()}
/> />
</div> )} */}
<div className="automation-list-box--body"> {/* {filteredAutomations.length} out of {totalAutomations} */}
<AutomationListBoxGroup {/* {autoParams.offset + automations.length < totalAutomations && (
events={{ <ButtonIcon
onSelectAutomation, borderless
onRemove className="automation-list-box--bottom--load more"
}} icon={<ReadMoreOutlinedIcon />}
autos={filteredAutomations}
grouping={grouping}
selectedAutomationIdx={selected}
/> />
</div> )} */}
<div className="automation-list-box--bottom"> </div>
<Button onClick={onAdd}>Add</Button>
<span>Showing Automations: {filteredAutomations.length} out of {automations.length}</span>
</div>
</div> </div>
} );
};
export const getTagList = (autos: AutomationData[]): string[] =>
export const getTagList = (autos: AutomationData[]): string[] => Object.keys(autos Object.keys(
.map(a => Object.keys(a.tags)) autos
.reduce((all: any, keys) => { .map((a) => Object.keys(a.tags))
.reduce((all: any, keys) => {
for (const k of keys) { for (const k of keys) {
all[k] = 1 all[k] = 1;
} }
return all; return all;
}, {})) }, {})
);
const filterAutomations = (autos: AutomationData[], searchText: string, selected: number[], tags: string[]): Array<[AutomationData, number]> => autos.map<[AutomationData, number]>((a, i) => [a, i]).filter(([a, i]) => { const filterAutomations = (
if (!a.metadata) { autos: AutomationData[],
return true searchText: string
} ): Array<[AutomationData, number]> =>
if (searchText.length > 0) { autos
.map<[AutomationData, number]>((a, i) => [a, i])
.filter(([a, i]) => {
if (!a.metadata) {
return true;
}
if (searchText.length > 0) {
if ( if (
!( !(
(a.metadata.description ?? "").toLocaleLowerCase().includes(searchText) || (a.metadata.description ?? "")
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText) .toLocaleLowerCase()
) .includes(searchText) ||
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
)
) { ) {
return false return false;
} }
} }
return true return true;
}) });
@@ -0,0 +1,50 @@
.automation-list-box--body--item:hover, .automation-list-box--body--item.selected {
outline-color: var(--mui-grey-400);
outline-style: solid;
outline-width: 1px;
background-color: var(--mui-secondary-contrastText);
}
.automation-list-box--body--item:hover>.automation-list-box--body--item--tags>span {
border-color: var(--mui-common-black);
}
.automation-list-box--body--item--tags--add:hover {
border-color: var(--mui-common-black);
color: var(--mui-grey-400);
background-color: var(--mui-secondary-contrastText);
}
.automation-list-box--body--item {
padding-left: 1em;
cursor: pointer;
display: flex;
gap: 1em;
}
.automation-list-box--body--item::before {
content: "⊚ ";
}
.automation-list-box--body--item--buttons {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
height: 100%;
gap: 0.25em;
margin: 0.5em
}
.automation-list-box--body--item--buttons>button {
padding: 0.25em;
margin: 0;
}
.automation-list-box--body--item--buttons .save {
color: var(--mui-success-light)
}
.automation-list-box--body--item--buttons .save:hover {
color: var(--mui-success-main)
}
@@ -1,141 +1,257 @@
import "./AutomationListBoxGroup.css";
import { TrashIcon } from "components/Icons"; import { TrashIcon } from "components/Icons";
import { Button } from "components/Inputs/Button";
import { MetadataBox } from "./AutomationMetadataBox"; import { MetadataBox } from "./AutomationMetadataBox";
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
import { AutomationGrouping } from "./automationGrouper"; import { AutomationGrouping } from "./automationGrouper";
import { FC, useState } from "react"; import { FC, useEffect, useState } from "react";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import { TagDB } from "./TagDB";
import Save from "@mui/icons-material/Save";
export type AutomationListBoxEvents = { export type AutomationListBoxEvents = {
onSelectAutomation: (i: number) => void, onSelectAutomation: (i: number) => void;
onRemove: (i: number) => void, onRemove: (i: number) => void;
} };
export type AutomationListBoxGroups = { export type AutomationListBoxGroups = {
grouping: AutomationGrouping, grouping: AutomationGrouping;
currentNode: number, currentNode: number;
} };
export type AutomationListBoxProps = { export type AutomationListBoxProps = {
events: AutomationListBoxEvents, events: AutomationListBoxEvents;
groups: AutomationListBoxGroups, groups: AutomationListBoxGroups;
autos: Array<[AutomationData, number]>, autos: Array<[AutomationData, number]>;
selectedAutomationIdx: number, selectedAutomationIdx: number;
}; };
export type AutomationListBoxGroupProps = { export type AutomationListBoxGroupProps = {
events: AutomationListBoxEvents, events: AutomationListBoxEvents;
grouping: AutomationGrouping, grouping: AutomationGrouping;
autos: Array<[AutomationData, number]>, autos: Array<[AutomationData, number]>;
selectedAutomationIdx: number, selectedAutomationIdx: number;
} tagsDB: TagDB;
onSave: (a: AutomationData, i: number) => void;
};
export const AutomationListBoxGroup: FC<AutomationListBoxGroupProps> = ({ export const AutomationListBoxGroup: FC<AutomationListBoxGroupProps> = ({
events, grouping, autos, selectedAutomationIdx, events,
grouping,
autos,
selectedAutomationIdx,
tagsDB,
onSave,
}) => { }) => {
if (grouping.top.length === 1) { if (grouping.top.length === 1) {
return <> return (
{convertGroupsToItems(autos, { <>
grouping, currentNode: grouping.top[0], {convertGroupsToItems(
}, events, selectedAutomationIdx)} autos,
</> {
} else { grouping,
return <> currentNode: grouping.top[0],
{grouping.top.map(groupIdx => <AutomationListBoxGroupItem },
key={groupIdx} events,
autos={autos} selectedAutomationIdx,
groups={{ tagsDB,
grouping, onSave
currentNode: groupIdx )}
}} </>
events={events} );
selectedAutomationIdx={selectedAutomationIdx} } else {
/>)} return (
</> <>
} {grouping.top.map((groupIdx) => (
} <AutomationListBoxGroupItem
export const convertGroupsToItems = (
autos: Array<[AutomationData, number]>,
{ grouping, currentNode }: AutomationListBoxGroups,
events: AutomationListBoxEvents,
selectedAutomationIdx: number,
) => {
const automations = grouping.getAutomations(currentNode);
if (automations.length > 0) {
return automations.map(autoIndex =>
<AutomationListBoxItem
key={`${autoIndex}-${autos[autoIndex][1]}`}
events={events}
auto={autos[autoIndex]}
isSelected={selectedAutomationIdx === autos[autoIndex][1]}
/>
)
}
const subgroups = grouping.getSubGroups(currentNode);
if (subgroups.length > 0) {
return subgroups.map(groupIdx => <AutomationListBoxGroupItem
key={groupIdx} key={groupIdx}
autos={autos} autos={autos}
groups={{ groups={{
grouping, grouping,
currentNode: groupIdx currentNode: groupIdx,
}} }}
events={events} events={events}
selectedAutomationIdx={selectedAutomationIdx} selectedAutomationIdx={selectedAutomationIdx}
/>) tagsDB={tagsDB}
} onSave={onSave}
return <></> />
} ))}
</>
);
}
};
export const convertGroupsToItems = (
autos: Array<[AutomationData, number]>,
{ grouping, currentNode }: AutomationListBoxGroups,
events: AutomationListBoxEvents,
selectedAutomationIdx: number,
tagsDB: TagDB,
onSave: (a: AutomationData, i: number) => void
) => {
const automations = grouping.getAutomations(currentNode);
if (automations.length > 0) {
return automations.map((autoIndex) => (
<AutomationListBoxItem
key={`${autoIndex}-${autos[autoIndex][1]}`}
events={events}
auto={autos[autoIndex]}
isSelected={selectedAutomationIdx === autos[autoIndex][1]}
tagsDB={tagsDB}
onSave={(a) => onSave(a, autoIndex)}
/>
));
}
const subgroups = grouping.getSubGroups(currentNode);
if (subgroups.length > 0) {
return subgroups.map((groupIdx) => (
<AutomationListBoxGroupItem
key={groupIdx}
autos={autos}
groups={{
grouping,
currentNode: groupIdx,
}}
events={events}
selectedAutomationIdx={selectedAutomationIdx}
tagsDB={tagsDB}
onSave={onSave}
/>
));
}
return <></>;
};
export const AutomationListBoxGroupItem: FC<{ export const AutomationListBoxGroupItem: FC<{
events: AutomationListBoxEvents, events: AutomationListBoxEvents;
groups: AutomationListBoxGroups, groups: AutomationListBoxGroups;
autos: Array<[AutomationData, number]>, autos: Array<[AutomationData, number]>;
selectedAutomationIdx: number, selectedAutomationIdx: number;
}> = ({ tagsDB: TagDB;
autos, groups, events, selectedAutomationIdx, onSave: (a: AutomationData, i: number) => void;
}) => { }> = ({ autos, groups, events, selectedAutomationIdx, tagsDB, onSave }) => {
const groupData = groups.grouping.getData(groups.currentNode); const groupData = groups.grouping.getData(groups.currentNode);
const automations = groups.grouping.getAutomations(groups.currentNode); const automations = groups.grouping.getAutomations(groups.currentNode);
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const isOther = groupData.isOther; const isOther = groupData.isOther;
const openIcon = !open ? "⊕" : "⊖"; const openIcon = !open ? "⊕" : "⊖";
const total = isOther ? <small> const total = isOther ? (
{automations.length} automation{automations.length !== 1 ? 's' : ''} {groupData.isOther ? "" : "(untagged)"} <small>
</small> : <></> {automations.length} automation{automations.length !== 1 ? "s" : ""}{" "}
return <div className={[ {groupData.isOther ? "" : "(untagged)"}
"automation-list-box--body--group", </small>
isOther ? 'other' : '', ) : (
groupData.selected ? 'selected' : '', <></>
].join(' ')}> );
<b onClick={() => setOpen(!open)}>{groupData.name} {openIcon} {total}</b> return (
{open && convertGroupsToItems(autos, groups, events, selectedAutomationIdx)} <div
</div> className={[
} "automation-list-box--body--group",
isOther ? "other" : "",
groupData.selected ? "selected" : "",
].join(" ")}
>
<b onClick={() => setOpen(!open)}>
{groupData.name} {openIcon} {total}
</b>
{open &&
convertGroupsToItems(
autos,
groups,
events,
selectedAutomationIdx,
tagsDB,
onSave
)}
</div>
);
};
export const AutomationListBoxItem: FC<{ export const AutomationListBoxItem: FC<{
auto: [AutomationData, number], auto: [AutomationData, number];
isSelected: boolean, isSelected: boolean;
events: AutomationListBoxEvents, events: AutomationListBoxEvents;
tagsDB: TagDB;
onSave: (a: AutomationData) => void;
}> = ({ }> = ({
events: { events: { onRemove, onSelectAutomation },
onRemove, auto: [auto, autoIndex],
onSelectAutomation, isSelected,
}, tagsDB,
auto: [ onSave,
auto, autoIndex
],
isSelected,
}) => { }) => {
let title = "BadAuto<<Missing Metadata>>" // state
if (auto.metadata) { const [{ tags, isModified, alias }, setState] = useState({
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}` isModified: false,
} tags: Object.entries(auto.tags),
return <div alias: auto.metadata.alias ?? "",
key={autoIndex} });
className={["automation-list-box--body--item", isSelected ? 'selected' : ''].join(' ')}
title={title} // effects
onClick={() => onSelectAutomation(autoIndex)} useEffect(() => {
> setState({
<MetadataBox metadata={auto.metadata} tags={auto.tags} /> isModified: false,
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button> tags: Object.entries(auto.tags),
</div> alias: auto.metadata.alias ?? "",
} });
}, [auto]);
// alias
const setAlias = (a: string) =>
setState({
isModified: true,
tags,
alias: a,
});
const setTags = (t: [string, string][]) =>
setState({
isModified: true,
tags: t,
alias,
});
// sub elements
let title = "BadAuto<<Missing Metadata>>";
if (auto.metadata) {
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`;
}
// render
return (
<div
key={autoIndex}
className={[
"automation-list-box--body--item",
isSelected ? "selected" : "",
isModified ? "modded" : "",
].join(" ")}
title={title}
onClick={() => onSelectAutomation(autoIndex)}
>
<MetadataBox
metadata={{
...auto.metadata,
alias,
}}
tags={tags}
tagsDB={tagsDB}
onTagUpdate={setTags}
onAliasUpdate={setAlias}
/>
<div className="automation-list-box--body--item--buttons">
{isModified && (
<ButtonIcon
className="save"
icon={<Save />}
onClick={() =>
onSave({
...auto,
tags: Object.fromEntries(tags),
metadata: {
...auto.metadata,
alias,
},
})
}
/>
)}
<ButtonIcon onClick={() => onRemove(autoIndex)} icon={<TrashIcon />} />
</div>
</div>
);
};
@@ -0,0 +1,101 @@
.automation-list-box--body--item--title {
display: flex;
flex-direction: column;
padding-left: 0.25em;
flex: 1;
}
.automation-list-box--body--item--title>b {
font-size: 1em;
display: flex;
align-items: center;
gap: 0.25em;
}
.automation-list-box--body--item--title .input-text-view span {
max-height: 1.5em;
}
.automation-list-box--body--item--title>span, .automation-list-box--body--item--title>b>span {
font-size: 0.75em;
}
.automation-list-box--body--item--tags {
flex: 1;
display: flex;
flex-wrap: wrap;
font-size: 0.75em;
justify-content: left;
align-items: flex-start;
overflow: auto;
max-height: 100%;
gap: 0.25em;
}
.automation-list-box--body--item--tags>span {
border-color: var(--mui-grey-400);
border-style: solid;
border-width: 1px;
border-radius: 0.5em;
padding: 0.1em 0.5em;
}
.automation-list-box--body--item--tags--item {
color: white;
border-color: white;
border-style: solid;
border-width: 1px;
border-radius: 0.5em;
padding: 0.1em 0.5em;
display: flex;
flex-direction: row;
gap: 0.25em;
max-width: min-content;
align-items: center;
}
.automation-list-box--body--item--tags--item>.text:hover {
text-decoration: underline;
cursor: pointer;
}
.automation-list-box--body--item--tags--item>.text {
position: relative;
}
.automation-list-box--body--item--tags--item>.text .MuiFilledInput-root {
padding: 0;
min-width: 6em;
max-width: 10em;
background-color: var(--mui-common-black);
}
.automation-list-box--body--item--tags--item>.text .icon {
position: absolute;
right: 0.5em;
top: 0.5em;
cursor: pointer;
}
.automation-list-box--body--item--tags--item>.text .icon:hover {
background-color: var(--mui-grey-400);
border-radius: 20px;
}
.automation-list-box--body--item--tags--item>.text .icon:hover svg {
fill: var(--mui-common-black);
}
.automation-list-box--body--item--tags--item .delete {
font-size: 1em;
color: var(--mui-error-light);
}
.automation-list-box--body--item--tags--item .delete:hover {
color: var(--mui-error-dark);
outline: 1px solid var(--mui-error-dark);
border-radius: 20px;
}
@@ -1,27 +1,181 @@
import { FC } from "react" import "./AutomationMetadataBox.css";
import { AutomationMetadata } from "types/automations" import { CheckMarkIcon } from "components/Icons";
import { FC, useState } from "react";
import { AutomationMetadata } from "types/automations";
import { InputAutoComplete } from "components/Inputs/InputAutoComplete";
import { TagDB } from "./TagDB";
import DeleteIcon from "@mui/icons-material/ClearTwoTone";
import { InputTextView } from "components/Inputs/InputTextView";
export const MetadataBox: FC<{ export const MetadataBox: FC<{
metadata: AutomationMetadata, metadata: AutomationMetadata;
tags: Record<string, string>, onAliasUpdate: (t: string) => void;
}> = (auto) => { onTagUpdate: (t: [string, string][]) => void;
let title = <span>{"BadAuto<<Missing Metadata>>"}</span> tags: [string, string][];
if (auto.metadata) { tagsDB: TagDB;
title = <> }> = ({ tags, onTagUpdate, onAliasUpdate, tagsDB, metadata }) => {
<b>{String(auto.metadata.alias ?? "").slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b> // state
<span>{String(auto.metadata.description ?? "").slice(0, 25)}</span> const [newTag, setNewTag] = useState<
</> | {
} on: false;
return <div }
className="automation-list-box--body--item--title" | {
> on: true;
{title} name: string;
<div value: string;
className="automation-list-box--body--item--tags" }
> >({ on: false });
{Object.keys(auto.tags).map(tagName => <span key={tagName}> // alias
<b>{tagName}:</b> {auto.tags[tagName]} const tagOptions = tagsDB.getTagNames(tags.map((t) => t[0]));
</span>)}
</div> // render
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>;
if (metadata) {
title = (
<>
<b className="text">
<InputTextView
value={metadata.alias ?? ""}
onChange={onAliasUpdate}
/>
<span>({String(metadata.id).slice(0, 10)})</span>
</b>
<span>{String(metadata.description ?? "").slice(0, 25)}</span>
</>
);
}
return (
<div className="automation-list-box--body--item--title">
{title}
<div className="automation-list-box--body--item--tags">
{tags.map(([tagName, tagValue], tagIndex) => (
<MetadataBoxTag
options={[tagOptions, tagsDB.getTagValues(tagName)]}
key={tagIndex}
value={[tagName, tagValue]}
onDelete={() =>
onTagUpdate([
...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1),
])
}
onChange={([newName, newValue]) =>
onTagUpdate([
...tags.slice(0, tagIndex),
[newName, newValue],
...tags.slice(tagIndex + 1),
])
}
/>
))}
{newTag.on ? (
<MetadataBoxTag
options={[tagOptions, tagsDB.getTagValues(newTag.name)]}
key="new"
value={[newTag.name, newTag.value]}
initialState={true}
onChange={([name, value]) => {
setNewTag({
on: true,
name,
value,
});
}}
onToggle={(em) => {
if (!em) {
if (newTag.name.trim() !== "" && newTag.value.trim() !== "") {
onTagUpdate(tags.concat([[newTag.name, newTag.value]]));
setNewTag({
on: false,
});
}
}
setNewTag({
on: false,
});
}}
/>
) : (
<span
className="automation-list-box--body--item--tags--add"
onClick={() =>
setNewTag({
on: true,
name: "",
value: "",
})
}
>
+
</span>
)}
</div>
</div> </div>
} );
};
export const MetadataBoxTag: FC<{
value: [string, string];
onChange: (t: [string, string]) => void;
options: [string[], string[]];
initialState?: boolean;
onToggle?: (em: boolean) => void;
onDelete?: () => void;
}> = (props) => {
const [editMode, setEditMode] = useState(
props.initialState ? props.initialState : false
);
const toggle = () => {
if (editMode) {
if (props.value[0].trim() === "" || props.value[1].trim() === "") {
props.onToggle && props.onToggle(true);
return setEditMode(true);
}
}
props.onToggle && props.onToggle(!editMode);
setEditMode(!editMode);
};
return (
<span className="automation-list-box--body--item--tags--item">
{props.onDelete && (
<DeleteIcon onClick={props.onDelete} className="delete" />
)}
{editMode ? (
<InputAutoComplete
multiple={false}
className="text"
disableChips
options={props.options[0]}
label=""
value={props.value[0]}
onEnter={toggle}
onChange={(v) => props.onChange([v ?? "", props.value[1]])}
onlyShowLabel
endAdornment={<CheckMarkIcon className="icon" onClick={toggle} />}
/>
) : (
<b className="text" onClick={toggle}>
{props.value[0]}:
</b>
)}
{editMode ? (
<InputAutoComplete
multiple={false}
className="text"
disableChips
options={props.options[1]}
label=""
value={props.value[1]}
onEnter={toggle}
onChange={(v) => props.onChange([props.value[0], v ?? ""])}
onlyShowLabel
endAdornment={<CheckMarkIcon className="icon" onClick={toggle} />}
/>
) : (
<span className="text" onClick={toggle}>
{props.value[1]}
</span>
)}
</span>
);
};
@@ -0,0 +1,30 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { MetadataBoxTag } from "./AutomationMetadataBox";
import { useState } from "react";
export default {
title: "App/AutomationList/Box",
component: MetadataBoxTag,
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
value: ["Type", "Climate"],
options: [[], []],
},
} as ComponentMeta<typeof MetadataBoxTag>;
export const BoxTag: ComponentStory<typeof MetadataBoxTag> = (args) => {
const [state, setState] = useState(args.value);
return (
<Page>
<MetadataBoxTag
options={args.options}
value={state}
onChange={(v) => {
setState(v);
args.onChange(v);
}}
/>
</Page>
);
};
@@ -2,34 +2,31 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { ConnectedAutomationList } from "."; import { ConnectedAutomationList } from ".";
import { createMockAuto } from "utils/mocks"; import { createMockAuto } from "utils/mocks";
import { useMockApiService } from "apiService"; import { useMockApiService } from "apiService";
import { DEFAULT_DIMS } from 'components/DAGFlow/constants';
import { Page } from "components/Page"; import { Page } from "components/Page";
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
export default { export default {
title: 'App/AutomationList/Connected', title: "App/AutomationList/MockConnected",
component: ConnectedAutomationList, component: ConnectedAutomationList,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: "^on.*" } },
args: { args: {
dims: DEFAULT_DIMS, dims: DEFAULT_DIMS,
initialAutomations: [], initialAutomations: [],
} },
} as ComponentMeta<typeof ConnectedAutomationList>; } as ComponentMeta<typeof ConnectedAutomationList>;
const Template: ComponentStory<any> = (args) => {
const Template: ComponentStory<any> = args => {
const api = useMockApiService(args.initialAutomations); const api = useMockApiService(args.initialAutomations);
return <Page> return (
<ConnectedAutomationList <Page>
{...args} <ConnectedAutomationList {...args} api={api} />
api={api} </Page>
/> );
</Page> };
}
export const EmptyStart = Template.bind({}) export const EmptyStart = Template.bind({});
export const FewAutos = Template.bind({});
export const FewAutos = Template.bind({})
FewAutos.args = { FewAutos.args = {
...FewAutos.args, ...FewAutos.args,
initialAutomations: [ initialAutomations: [
@@ -44,21 +41,23 @@ FewAutos.args = {
createMockAuto(), createMockAuto(),
createMockAuto(), createMockAuto(),
], ],
} };
export const Loading: ComponentStory<any> = args => { export const Loading: ComponentStory<any> = (args) => {
const api = useMockApiService(args.initialAutomations); const api = useMockApiService(args.initialAutomations);
return <Page> return (
<ConnectedAutomationList <Page>
{...args} <ConnectedAutomationList
api={{ {...args}
...api, api={{
state: { ...api,
"automations": { state: {
"ready": false automations: {
} ready: false,
} },
}} },
/> }}
</Page> />
} </Page>
);
};
+22 -20
View File
@@ -2,23 +2,25 @@ import { AutomationData } from "types/automations";
export type TagDB = ReturnType<typeof makeTagDB>; export type TagDB = ReturnType<typeof makeTagDB>;
export const makeTagDB = (automations: AutomationData[]) => { export const makeTagDB = (automations: AutomationData[]) => {
const allTags: Record<string, Set<string>> = {}; const allTags: Record<string, Set<string>> = {};
automations.forEach(({ tags }) => automations.forEach(({ tags }) =>
Object.keys(tags).forEach(tagName => { Object.keys(tags).forEach((tagName) => {
const tagValue = tags[tagName]; const tagValue = tags[tagName];
if (!allTags[tagName]) { if (!allTags[tagName]) {
allTags[tagName] = new Set() allTags[tagName] = new Set();
} }
allTags[tagName].add(tagValue); allTags[tagName].add(tagValue);
}) })
); );
const allTagNames = Object.keys(allTags); const allTagNames = Object.keys(allTags);
return { return {
getTagNames(myTags: string[]): string[] { getTagNames(myTags: string[]): string[] {
return allTagNames.filter(n => !myTags.includes(n)).sort() return allTagNames.filter((n) => !myTags.includes(n)).sort();
}, },
getTagValues(tagName: string): string[] { getTagValues(tagName: string): string[] {
return allTags[tagName] ? Array.from(allTags[tagName].values()).sort() : []; return allTags[tagName]
} ? Array.from(allTags[tagName].values()).sort()
} : [];
} },
};
};
@@ -50,6 +50,7 @@
.automation-list--list.hide>.automation-list--list-hide { .automation-list--list.hide>.automation-list--list-hide {
transform: rotate(180deg); transform: rotate(180deg);
left: 0;
} }
/* list children: normal */ /* list children: normal */
@@ -58,8 +59,10 @@
border-width: 1px; border-width: 1px;
} }
.automation-list--list-hide { .automation-list--list .automation-list--list-hide {
position: absolute; position: absolute;
bottom: 0.5em; bottom: 0em;
right: 0.5em; left: 0.5em;
max-width: 1.5em;
max-height: 1.5em;
} }
@@ -14,29 +14,7 @@
.automation-list--root.mobile .automation-list--list-hide { .automation-list--root.mobile .automation-list--list-hide {
transform: rotate(90deg); transform: rotate(90deg);
left: 1.25em; left: 0.25em;
}
.automation-list--root.mobile .automation-editor--info-box {
min-width: 100vw;
min-height: calc(100vh - 5em);
max-width: 100vw;
max-height: calc(100vh - 5em);
padding: 0;
}
.automation-list--root.mobile .automation-editor--info-box-inner {
margin-top: 2.5em;
padding-left: 0.5em;
padding-right: 0.5em;
margin-bottom: 2em;
}
.automation-list--root.mobile .automation-editor--info-box--icon {
left: 1.25em;
bottom: 0em;
background-color: var(--primary);
transform: rotate(90deg);
} }
@@ -50,29 +28,11 @@
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide { .automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
transform: rotate(270deg); transform: rotate(270deg);
position: fixed; position: fixed;
top: 0.75em; top: 0.5em;
z-index: 20; z-index: 5;
} }
/* info box hide */ .automation-list--root.mobile .automation-editor--flow-wrapper>.automation-editor--flow-wrapper--toolbar .input-text-view,
.automation-list--root.mobile .automation-editor--info-box.hide { .automation-list--root.mobile .automation-editor--flow-wrapper>.automation-editor--flow-wrapper--toolbar .id {
width: 100vw; display: none;
min-height: 0;
max-height: 0;
}
.automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon {
transform: rotate(270deg);
position: fixed;
top: 0.75em;
background-color: var(--green-opaque);
z-index: 30;
}
.automation-list--root.mobile .automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
height: 0;
opacity: 0;
overflow: hidden;
} }
+155 -77
View File
@@ -1,37 +1,45 @@
import "./index.css"; import "./index.css";
import "./index.mobile.css"; import "./index.mobile.css";
import { AutomationEditor } from "components/AutomationEditor"; import { AutomationEditor } from "components/AutomationEditor";
import { FC, ReactNode, useState } from "react"; import { FC, ReactNode, useState, useRef, useEffect } from "react";
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
import { defaultAutomation } from 'utils/defaults'; import { defaultAutomation } from "utils/defaults";
import { ArrowIcon } from "components/Icons";
import { ButtonIcon } from "components/Icons/ButtonIcons"; import { ButtonIcon } from "components/Icons/ButtonIcons";
import { ApiService } from "apiService/core"; import { ApiService } from "apiService/core";
import { AutomationListBox } from "./AutomationListBox"; import { AutomationListBox } from "./AutomationListBox";
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
import useWindowSize from "utils/useWindowSize"; import useWindowSize from "utils/useWindowSize";
import { makeTagDB } from "./TagDB"; import { makeTagDB } from "./TagDB";
import LinearProgress from "@mui/material/LinearProgress"; import LinearProgress from "@mui/material/LinearProgress";
import CircularProgress from "@mui/material/CircularProgress"; import CircularProgress from "@mui/material/CircularProgress";
import { useCookies } from 'react-cookie'; import { useCookies } from "react-cookie";
import { useHA } from "haService";
import { ArrowBack } from "@mui/icons-material";
import { useSnackbar } from "notistack";
import { DAGDims } from "components/DAGGraph/elements/types";
import { ListData, ListParams } from "apiService/types";
interface AutomationListParams { interface AutomationListParams {
automations: AutomationData[]; automations: ListData<AutomationData>;
onUpdate: (i: number, auto: AutomationData) => void; onUpdate: (i: number, auto: AutomationData) => void;
onUpdateTags: (id: string, tags: Record<string, string>) => void;
onAdd: (auto: AutomationData) => void; onAdd: (auto: AutomationData) => void;
onRemove: (i: number) => void; onRemove: (i: number) => void;
dims: DAGAutomationFlowDims; onLoadMore: (p: ListParams) => void;
dims: DAGDims;
children?: ReactNode; children?: ReactNode;
} }
export const useAutomationListState = () => { export const useAutomationListState = () => {
const [cookies, setCookies, _] = useCookies(['alCurrent']); const [
cookies,
setCookies,
// eslint-disable-next-line
_,
] = useCookies(["alCurrent"]);
let initialCurrent = 0; let initialCurrent = 0;
try { try {
initialCurrent = Number(cookies.alCurrent ?? '0'); initialCurrent = Number(cookies.alCurrent ?? "0");
// eslint-disable-next-line } catch (_) {}
} catch (_) { }
const [hideList, setHideList] = useState(false); const [hideList, setHideList] = useState(false);
const [current, setCurrent] = useState(initialCurrent); const [current, setCurrent] = useState(initialCurrent);
@@ -41,95 +49,165 @@ export const useAutomationListState = () => {
setHideList, setHideList,
current, current,
setCurrent(i: number) { setCurrent(i: number) {
setCurrent(i) setCurrent(i);
setCookies('alCurrent', String(i)) setCookies("alCurrent", String(i));
} },
} };
} };
export const AutomationList: FC<AutomationListParams> = ({ export const AutomationList: FC<AutomationListParams> = ({
automations, automations,
onLoadMore,
onUpdate, onUpdate,
onUpdateTags,
onAdd, onAdd,
onRemove, onRemove,
dims, dims,
children, children,
}) => { }) => {
// state // state
const { hideList, setHideList, current, setCurrent } = useAutomationListState(); const snackbr = useSnackbar();
const { hideList, setHideList, current, setCurrent } =
useAutomationListState();
const { isMobile } = useWindowSize(); const { isMobile } = useWindowSize();
const firstRender = useRef(true);
// alias // alias
const currentAuto = automations.length > 0 ? automations[current] : null; const currentAuto =
const tagDB = makeTagDB(automations); automations.data.length > 0
? automations.data[current - automations.params.offset]
: null;
const tagDB = makeTagDB(automations.data);
// effect
useEffect(() => {
if (firstRender.current) {
snackbr.enqueueSnackbar("Saved.", { variant: "info" });
}
firstRender.current = true;
// eslint-disable-next-line
}, [automations]);
// render // render
return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}> return (
<div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}> <div
<AutomationListBox className={["automation-list--root", isMobile ? "mobile" : ""].join(" ")}
automations={automations} >
onAdd={() => { <div
onAdd(defaultAutomation(String(Date.now()))); className={["automation-list--list", hideList ? "hide" : "show"].join(
setCurrent(automations.length) " "
}} )}
onSelectAutomation={i => { >
setCurrent(i); <AutomationListBox
if (isMobile) { automations={automations}
setHideList(true) onUpdate={(a, i) => onUpdate(i, a)}
} onUpdateTags={onUpdateTags}
}} onAdd={() => {
selected={current} onAdd(defaultAutomation(String(Date.now())));
onRemove={onRemove} setCurrent(automations.data.length);
/> if (isMobile) {
<ButtonIcon setHideList(true);
onClick={() => setHideList(!hideList)} }
className="automation-list--list-hide" }}
Icon={ArrowIcon} onSelectAutomation={(i) => {
/> setCurrent(i);
if (isMobile) {
setHideList(true);
}
}}
onLoadMore={onLoadMore}
selected={current}
onRemove={onRemove}
tagsDB={tagDB}
/>
<ButtonIcon
onClick={() => setHideList(!hideList)}
className="automation-list--list-hide"
icon={<ArrowBack />}
/>
</div>
<div className="automation-list--viewer">
{currentAuto ? (
<AutomationEditor
automation={currentAuto}
onUpdate={(a) => onUpdate(current, a)}
dims={{
...dims,
flipped: isMobile,
}}
tagDB={tagDB}
/>
) : (
<></>
)}
</div>
{children}
</div> </div>
<div className="automation-list--viewer"> );
{currentAuto ? <AutomationEditor };
automation={currentAuto}
onUpdate={a => onUpdate(current, a)}
dims={{
...dims,
flipped: isMobile
}}
tagDB={tagDB}
/> : <></>}
</div>
{children}
</div>
}
interface ConnectedAutomationListParams { interface ConnectedAutomationListParams {
dims: DAGAutomationFlowDims; dims: DAGDims;
api: ApiService; api: ApiService;
} }
export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({ export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
api: { api: {
state: { state: { automations },
automations, ...methods
},
removeAutomation,
updateAutomation,
}, },
dims dims,
}) => { }) => {
const { reloadAutomations } = useHA();
const [saving, setSaving] = useState(false);
const updateTags = async (id: string, tags: Record<string, string>) => {
const resp = await methods.updateTags({
automation_id: id,
tags,
});
setSaving(true);
await reloadAutomations();
setSaving(false);
return resp;
};
const removeAutomation = async (args: any) => {
const resp = await methods.removeAutomation(args);
setSaving(true);
await reloadAutomations();
setSaving(false);
return resp;
};
const updateAutomation = async (args: any) => {
const resp = await methods.updateAutomation(args);
setSaving(true);
await reloadAutomations();
setSaving(false);
return resp;
};
if (!automations.ready) { if (!automations.ready) {
return <div className="automation-list--root loading"> return (
<LinearProgress /> <div className="automation-list--root loading">
<div className="automation-list--circle-loader"> <LinearProgress />
<CircularProgress /> <div className="automation-list--circle-loader">
<CircularProgress />
</div>
</div> </div>
</div> );
} }
if (!automations.ok) { if (!automations.ok) {
return <span>Error {automations.error}</span> return <span>Error {automations.error}</span>;
} }
return <AutomationList return (
dims={dims} <>
automations={automations.data.data} {saving && <LinearProgress />}
onAdd={auto => updateAutomation({ auto, index: automations.data.totalItems + 1 })} <AutomationList
onRemove={index => removeAutomation({ index })} dims={dims}
onUpdate={(index, auto) => updateAutomation({ index, auto })} automations={automations.data}
/> onUpdateTags={updateTags}
} onLoadMore={() => {}}
onAdd={(auto) =>
updateAutomation({ auto, index: automations.data.totalItems + 1 })
}
onRemove={(index) => removeAutomation({ index })}
onUpdate={(index, auto) => updateAutomation({ index, auto })}
/>
</>
);
};
@@ -1,52 +0,0 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react";
import { ConditionEditor } from ".";
import { AutomationCondition } from 'types/automations/conditions';
import { Page } from "components/Page";
export default {
title: 'ConditionEditor',
component: ConditionEditor,
parameters: { actions: { argTypesRegex: '^on.*' } },
} as ComponentMeta<typeof ConditionEditor>;
export const Basic: ComponentStory<typeof ConditionEditor> = args => {
const [state, setState] = useState<AutomationCondition>({
"condition": "or",
"conditions": [
{
"condition": "and",
"conditions": [
{
"condition": "numeric_state",
"entity_id": [
"sensor.kitchen_humidity"
],
"above": "40"
},
{
"condition": "template",
"value_template": "states('switch.kitchen') == 'on'"
}
]
},
{
"condition": "numeric_state",
"entity_id": [
"sensor.kitchen_temperature"
],
"above": "51"
}
]
})
return (
<Page>
<ConditionEditor
onUpdate={setState}
onDelete={() => { }}
condition={state}
/>
</Page>
)
}
@@ -1,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,107 @@
.condition-node-base {
display: flex;
flex-direction: row;
max-height: 85vh;
}
.condition-node-base--list {
max-width: 10em;
width: 7em;
}
.condition-node-base--body {
flex: 1;
min-height: 1.5em;
display: flex;
flex-direction: row;
}
.condition-node-base--body--children.view {
display: flex;
flex-direction: column;
justify-content: center;
min-height: calc(100% - 1px);
max-height: calc(100% - 1px);
background-color: var(--mui-secondary-contrastText);
border-color: var(--mui-grey-700);
border-bottom-style: solid;
border-width: 1px;
}
.condition-node-base--body .input-yaml {
margin: 0;
padding: 0;
}
.condition-node-base--body {
overflow: auto;
max-width: 100vw;
}
.condition-node-base--body .condition-node-base--body--children {
flex: 1;
padding-left: 0.5em;
max-width: 100vw;
overflow-x: hidden;
}
.condition-node-base.is-edited>.condition-node-base--body {
max-height: calc(100%-2px-1em);
max-width: calc(100vw-2px-1em);
min-width: 15em;
border-color: var(--mui-success-main);
border-style: solid;
border-width: 1px;
margin: 0.25em;
padding: 0.25em;
}
.condition-node--logic-viewer--add {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
padding: 0.5em;
background-color: var(--mui-secondary-contrastText);
}
.condition-node--time-editor {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 0.25em;
}
.condition-node--time-editor--ba {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
gap: 0.5em;
padding-top: 1.5em;
padding-bottom: 0.25em;
position: relative;
width: fit-content;
max-width: 100%;
overflow: hidden;
}
.condition-node--time-editor--ba button.remove {
padding: 0.25em;
min-width: fit-content;
color: var(--mui-error-light);
border-color: transparent;
}
.condition-node--time-editor--ba button.remove:hover {
border-color: var(--mui-error-light);
border-radius: 20px;
}
.condition-node--time-editor--ba .label {
position: absolute;
top: 0;
left: 0.2em;
}
@@ -0,0 +1,19 @@
.condition-node-base.mobile {
flex-direction: column;
justify-content: center;
}
.condition-node-base.mobile .condition-node-base--list {
flex-direction: row;
display: flex;
min-width: 100%;
}
.condition-node-base.mobile .condition-node-base--body {
min-height: 3em;
max-width: 100%;
}
.condition-node-base.mobile .condition-node-base--body.edit {
max-height: 500px;
}
@@ -0,0 +1,65 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react";
import { AutomationCondition } from "types/automations/conditions";
import { ConditionNodeBase } from "./ConditionNodeBase";
export default {
title: "ConditionEditor/NodeBase",
component: ConditionNodeBase,
parameters: { actions: { argTypesRegex: "^on.*" } },
} as ComponentMeta<typeof ConditionNodeBase>;
const Template: ComponentStory<typeof ConditionNodeBase> = ({
condition,
...args
}) => {
const [data, setData] = useState(condition);
return (
<Page>
<ConditionNodeBase
{...args}
condition={data}
onUpdate={(data) => {
setData(data);
}}
/>
</Page>
);
};
export const TemplateViewer = Template.bind({});
TemplateViewer.args = {
condition: {
condition: "template",
value_template: "states('switch.light_kitchen') == 'on'",
} as AutomationCondition,
};
export const MultipleThings = Template.bind({});
MultipleThings.args = {
condition: {
condition: "or",
conditions: [
{
condition: "and",
conditions: [
{
condition: "numeric_state",
entity_id: ["sensor.kitchen_humidity"],
above: "40",
},
{
condition: "template",
value_template: "states('switch.kitchen') == 'on'",
},
],
},
{
condition: "numeric_state",
entity_id: ["sensor.kitchen_temperature"],
above: "51",
},
],
} as AutomationCondition,
};
@@ -0,0 +1,130 @@
import "./ConditionNodeBase.css";
import "./ConditionNodeBase.mobile.css";
import { InputList } from "components/Inputs/InputList";
import { FC, useState } from "react";
import { AutomationCondition } from "types/automations/conditions";
import { getSubTypeList } from "utils/automations";
import { getConditionDefaultValues } from "utils/defaults";
import { useHA } from "haService";
import InputYaml from "components/Inputs/InputYaml";
import { getViewer } from "./viewRender";
import { getEditor } from "./editorRender";
import useWindowSize from "utils/useWindowSize";
import { ConditionNodeSettings } from "./ConditionNodeSettings";
export type ConditionNodeBaseProps = {
condition: AutomationCondition;
onDelete?: () => void;
onUpdate: (data: AutomationCondition) => void;
disableDelete?: boolean;
initialViewMode?: ConditionNodeBaseViewMode;
};
export type ConditionNodeBaseViewMode = "edit" | "yaml" | "view";
export const ConditionNodeBase: FC<ConditionNodeBaseProps> = (props) => {
// state
const ha = useHA();
const { isMobile } = useWindowSize();
const [{ isEdited, condition }, setCondition] = useState<{
isEdited: boolean;
condition: AutomationCondition;
}>({
isEdited: false,
condition: props.condition,
});
const [mode, setMode] = useState<ConditionNodeBaseViewMode>(
props.initialViewMode ?? "view"
);
// alias
const updateCondition = (data: any) =>
setCondition({
isEdited: true,
condition: data,
});
// children
let childrenConditions: JSX.Element;
if (mode === "view") {
const Viewer = getViewer(condition);
childrenConditions = (
<Viewer
condition={condition}
onChange={updateCondition}
namer={ha.namer}
/>
);
} else {
const Editor = getEditor(condition);
childrenConditions = (
<Editor
condition={condition}
onChange={updateCondition}
ha={ha}
initialViewMode="edit"
/>
);
}
// icons
const icons = (
<ConditionNodeSettings
onDelete={props.onDelete}
onModeSwitch={setMode}
onSave={() => {
props.onUpdate(condition);
setCondition({
isEdited: false,
condition,
});
}}
mode={mode}
isEdited={isEdited}
disableDelete={props.disableDelete ?? false}
/>
);
// render
return (
<div
className={[
"condition-node-base",
isMobile ? "mobile" : "",
isEdited ? "is-edited" : "",
].join(" ")}
>
<div className="condition-node-base--list">
<InputList
label=""
className="condition-node-base--list--select"
current={condition.condition}
options={getSubTypeList("condition")}
onChange={(n: any) =>
setCondition({
isEdited: true,
condition: {
...getConditionDefaultValues(n),
condition: n,
},
} as any)
}
/>
{isMobile && icons}
</div>
<div className={["condition-node-base--body", mode].join(" ")}>
{mode === "yaml" ? (
<InputYaml
key="yaml"
label=""
value={condition}
onChange={updateCondition}
/>
) : (
<div
className={["condition-node-base--body--children", mode].join(" ")}
>
{childrenConditions}
</div>
)}
{!isMobile && icons}
</div>
</div>
);
};
@@ -0,0 +1,43 @@
.condition-node--settings {
width: 4em;
display: flex;
gap: 0.5em;
flex-direction: column;
justify-content: center;
align-items: center;
}
.condition-node--settings--icons {
display: inline-block;
max-width: 5em;
max-height: 5em;
}
.condition-node--settings--wrap {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
min-width: 5em;
min-height: 5em;
}
.condition-node--settings button.Mui-disabled {
cursor: not-allowed;
}
.condition-node--settings .speed-dial, .condition-node--settings .speed-dial--icon {
min-height: 2.5em;
height: 2.5em;
}
.condition-node--settings .speed-dial--button {
max-width: 4em;
max-height: 4em;
height: 4em;
width: 4em;
}
.condition-node--settings .speed-dial--button:hover button {
background-color: var(--mui-grey-700);
}
@@ -0,0 +1,84 @@
import "./ConditionNodeSettings.css";
import { FC } from "react";
import CodeOutlinedIcon from "@mui/icons-material/CodeOutlined";
import CodeOffOutlinedIcon from "@mui/icons-material/CodeOffOutlined";
import EditOutlinedIcon from "@mui/icons-material/EditOutlined";
import SaveIcon from "@mui/icons-material/Save";
import EditOffIcon from "@mui/icons-material/EditOff";
import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
import SettingsApplicationsIcon from "@mui/icons-material/SettingsApplications";
import { ButtonIcon, ButtonIconProps } from "components/Icons/ButtonIcons";
import { SpeedDial } from "components/SpeedDial";
export type ConditionNodeSettingsProps = {
mode: ConditionNodeViewMode;
onModeSwitch: (m: ConditionNodeViewMode) => void;
isEdited: boolean;
disableDelete: boolean;
onDelete?: () => void;
onSave: () => void;
};
export type ConditionNodeViewMode = "edit" | "yaml" | "view";
export const ConditionNodeSettings: FC<ConditionNodeSettingsProps> = (
props
) => {
// alias
const showDelete = !props.disableDelete && !!props.onDelete;
const createModeSwitch = (m: ConditionNodeViewMode) => () => {
if (props.mode === m) {
props.onModeSwitch("view");
} else {
props.onModeSwitch(m);
}
};
const buttons: Array<ButtonIconProps> = [
{
color: "success",
onClick: createModeSwitch("edit"),
icon: props.mode === "edit" ? <EditOffIcon /> : <EditOutlinedIcon />,
},
{
icon:
props.mode === "yaml" ? <CodeOffOutlinedIcon /> : <CodeOutlinedIcon />,
onClick: createModeSwitch("yaml"),
color: "info",
},
];
if (showDelete) {
buttons.push({
color: "error",
icon: <DeleteForeverIcon />,
onClick: props.onDelete,
});
}
// render
return (
<div
className={[
"condition-node--settings",
props.isEdited ? "edited" : "",
].join(" ")}
>
<SpeedDial
icon={<ButtonIcon icon={<SettingsApplicationsIcon />} />}
direction="left"
>
{buttons.map((opt, i) => (
<ButtonIcon key={i} {...opt} />
))}
</SpeedDial>
{props.isEdited && (
<ButtonIcon
key={"save"}
icon={<SaveIcon />}
color="success"
disabled={!props.isEdited}
onClick={props.onSave}
/>
)}
</div>
);
};
@@ -1,216 +1,414 @@
import { FC } from "react"; import { FC, useState } from "react";
import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions'; import {
AutomationCondition,
DeviceCondition,
LogicCondition,
NumericCondition,
StateCondition,
TemplateCondition,
TimeCondition,
TriggerCondition,
ZoneCondition,
} from "types/automations/conditions";
import InputNumber from "components/Inputs/InputNumber"; import InputNumber from "components/Inputs/InputNumber";
import InputText from "components/Inputs/InputText"; import InputText from "components/Inputs/InputText";
import { InputEntity } from "components/Inputs/InputEntities"; import { InputEntity } from "components/Inputs/InputEntities";
import { ConditionNode } from "./ConditionNode"; import {
ConditionNodeBase,
ConditionNodeBaseViewMode,
} from "./ConditionNodeBase";
import { genUpdateMethods } from "./nestedUpdater"; import { genUpdateMethods } from "./nestedUpdater";
import { InputTime } from "components/Inputs/InputTime"; import { InputTime } from "components/Inputs/InputTime";
import InputYaml from "components/Inputs/InputYaml"; import InputYaml from "components/Inputs/InputYaml";
import { HAService } from "haService";
import { DeviceEditor } from "components/DeviceEditor";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import AddIcon from "@mui/icons-material/Add";
import { getEntityDomains } from "utils/automations";
import { InputAutoComplete } from "components/Inputs/InputAutoComplete";
import { InputTimeEntity } from "components/Inputs/InputTimeEntity";
import { prettyName } from "utils/formatting";
import { InputList } from "components/Inputs/InputList";
import { Button } from "components/Inputs/Button";
import { RemoveCircle } from "@mui/icons-material";
interface Editor<C extends AutomationCondition>
interface Editor<C extends AutomationCondition> extends FC<{ extends FC<{
condition: C, condition: C;
onChange: (condition: C) => void; onChange: (condition: C) => void;
}> { } ha: HAService;
initialViewMode: ConditionNodeBaseViewMode;
}> {}
export const getEditor = (condition: AutomationCondition): Editor<any> => { export const getEditor = (condition: AutomationCondition): Editor<any> => {
switch (condition.condition) { switch (condition.condition) {
case 'template': case "template":
return TemplateEditor; return TemplateEditor;
case 'and': case "and":
return LogicViewer; return LogicViewer;
case 'or': case "or":
return LogicViewer; return LogicViewer;
case 'not': case "not":
return LogicViewer; return LogicViewer;
case 'numeric_state': case "device":
return DeviceConditionEditor;
case "numeric_state":
return NumericStateEditor; return NumericStateEditor;
case 'state': case "state":
return StateEditor; return StateEditor;
case 'time': case "time":
return TimeEditor; return TimeEditor;
case 'trigger': case "trigger":
return TriggerEditor; return TriggerEditor;
case 'zone': case "zone":
return ZoneEditor; return ZoneEditor;
default: default:
return () => <div>Not Ready</div> return () => <div>Not Ready</div>;
} }
} };
export const TemplateEditor: Editor<TemplateCondition> = ({ export const TemplateEditor: Editor<TemplateCondition> = ({
onChange, onChange,
condition, condition,
}) => { }) => {
return <> return (
<InputYaml label="Template" value={condition.value_template} onChange={value_template => onChange({ <>
...condition, <InputYaml
value_template label="Template"
})} /> value={condition.value_template}
</> onChange={(value_template) =>
} onChange({
...condition,
value_template,
})
}
/>
</>
);
};
export const DeviceConditionEditor: Editor<DeviceCondition> = ({
onChange,
condition,
ha: {
deviceExtras: { useDeviceConditionCapalities, useDeviceConditions },
},
}) => {
return (
<DeviceEditor
type="condition"
state={condition}
setState={(data) =>
onChange({
condition: "device",
...data,
} as any)
}
options={useDeviceConditions(
condition.device_id
? {
deviceId: condition.device_id,
}
: undefined
)}
caps={useDeviceConditionCapalities(condition as any)}
/>
);
};
export const NumericStateEditor: Editor<NumericCondition> = ({ export const NumericStateEditor: Editor<NumericCondition> = ({
onChange, onChange,
condition, condition,
}) => { }) => {
return <> return (
<InputEntity <>
value={condition.entity_id} <InputEntity
multiple value={condition.entity_id}
onChange={entity_id => onChange({ multiple
...condition, onChange={(entity_id) =>
entity_id onChange({
})} ...condition,
/> entity_id,
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({ })
...condition, }
attribute />
})} /> <InputText
<InputNumber label="Attribute"
label="Above" value={condition.attribute ?? ""}
value={condition.above ? Number(condition.above) : undefined} onChange={(attribute) =>
onChange={above => onChange({ onChange({
...condition, ...condition,
above: above ? String(above) : undefined, attribute,
})} })
/> }
<InputNumber />
label="Below" <InputNumber
value={condition.below ? Number(condition.below) : undefined} label="Above"
onChange={below => onChange({ value={condition.above ? Number(condition.above) : undefined}
...condition, onChange={(above) =>
below: below ? String(below) : undefined, onChange({
})} ...condition,
/> above: above ? String(above) : undefined,
<InputYaml label="Template" value={condition.value_template ?? ""} onChange={value_template => onChange({ })
...condition, }
value_template />
})} /> <InputNumber
</> label="Below"
} value={condition.below ? Number(condition.below) : undefined}
onChange={(below) =>
onChange({
...condition,
below: below ? String(below) : undefined,
})
}
/>
<InputYaml
label="Template"
value={condition.value_template ?? ""}
onChange={(value_template) =>
onChange({
...condition,
value_template,
})
}
/>
</>
);
};
export const LogicViewer: Editor<LogicCondition> = ({ export const LogicViewer: Editor<LogicCondition> = ({
condition, condition,
onChange, onChange,
initialViewMode,
}) => { }) => {
return (
return <> <>
{condition.conditions.map((c, i) => { {condition.conditions.map((c, i) => {
return <ConditionNode return (
key={i} <ConditionNodeBase
condition={c} key={i}
displayMode={false} condition={c}
{...genUpdateMethods(condition, onChange)(i)} {...genUpdateMethods(condition, onChange)(i)}
showDelete disableDelete={false}
/> initialViewMode={initialViewMode}
})} />
</> );
} })}
<div className="condition-node--logic-viewer--add">
<ButtonIcon
icon={<AddIcon />}
onClick={() =>
onChange({
condition: condition.condition,
conditions: [
...(condition.conditions ?? []),
{
condition: "device",
device_id: "",
domain: "",
type: "",
},
],
})
}
/>
</div>
</>
);
};
export const StateEditor: Editor<StateCondition> = ({ export const StateEditor: Editor<StateCondition> = ({
onChange, onChange,
condition, condition,
ha,
}) => { }) => {
return <> const restrictToDomain =
<InputEntity !condition.entity_id || condition.entity_id.length === 0
value={condition.entity_id} ? undefined
multiple : getEntityDomains(condition.entity_id);
onChange={entity_id => onChange({
...condition,
entity_id
})}
/>
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
...condition,
attribute
})} />
<InputText
label="State"
value={String(condition.state)}
onChange={state => onChange({
...condition,
state,
})}
/>
<InputTime
label="For"
value={condition.for}
onChange={_for => onChange({
...condition,
for: _for,
})}
/>
</>
}
export const TimeEditor: Editor<TimeCondition> = ({ return (
onChange, <>
condition, <InputEntity
}) => { restrictToDomain={restrictToDomain}
return <> value={condition.entity_id}
<InputTime multiple
label="After" onChange={(entity_id) =>
value={condition.after} onChange({
onChange={after => onChange({ ...condition,
...condition, entity_id,
after, })
}
/>
<InputAutoComplete
label="Attribute"
value={condition.attribute ?? ""}
options={ha.entities.getAttributes(condition.entity_id)}
multiple={false}
onChange={(attribute) =>
onChange({
...condition,
attribute: attribute ?? undefined,
})
}
/>
<InputText
label="State"
value={String(condition.state)}
placeholder={ha.entities
.getStates(condition.entity_id, condition.attribute)
.join(" or ")}
onChange={(state) =>
onChange({
...condition,
state,
})
}
/>
<InputTime
label="For"
value={condition.for}
onChange={(_for) =>
onChange({
...condition,
for: _for,
})
}
/>
</>
);
};
type TimeEditorShows = "after" | "before" | "weekday";
export const TimeEditor: Editor<TimeCondition> = ({ onChange, condition }) => {
const [shows, setShows] = useState<TimeEditorShows[]>(
Object.keys(condition).filter((k) =>
["after", "before", "weekday"].includes(k)
) as any
);
return (
<div className="condition-node--time-editor">
{shows.map((show) => {
if (show === "after" || show === "before") {
return (
<div className="condition-node--time-editor--ba" key={show}>
<b className="label">{prettyName(show)}</b>
<InputTimeEntity
value={condition[show] ?? ""}
onChange={(v) =>
onChange({
...condition,
[show]: v,
})
}
/>
<Button
className="remove"
onClick={() => {
setShows(shows.filter((k) => k !== show));
const upd = { ...condition };
delete upd[show];
onChange({ ...upd });
}}
>
<RemoveCircle />
</Button>
</div>
);
} else {
return (
<div>
<InputAutoComplete
label="Weekday"
value={condition.weekday ?? []}
multiple={true}
getID={(opt) => opt}
getLabel={(opt) => {
return {
mon: "Monday",
tue: "Tuesday",
wed: "Wednesday",
thu: "Thursday",
fri: "Friday",
sat: "Saturday",
sun: "Sunday",
}[opt];
}}
onChange={(weekday: any) =>
onChange({
...condition,
weekday: weekday ?? [],
})
}
options={["mon", "tue", "wed", "thu", "fri", "sat", "sun"]}
/>
</div>
);
}
})} })}
/> {shows.length < 3 && (
<InputTime <InputList
label="Before" className="condition-node--time-editor--new"
value={condition.before} label="Option"
onChange={before => onChange({ options={["after", "before", "weekday"].filter(
...condition, (k: any) => !shows.includes(k)
before, )}
})} onChange={(k: any) => {
/> setShows(shows.concat([k]));
<b>Weekday not support for no, use yaml for now</b> {condition.weekday} }}
</> />
} )}
</div>
);
};
export const TriggerEditor: Editor<TriggerCondition> = ({ export const TriggerEditor: Editor<TriggerCondition> = ({
onChange, onChange,
condition, condition,
}) => { }) => {
return <> return (
<InputText label="Trigger ID" value={condition.id} onChange={id => onChange({ <>
...condition, <InputText
id label="Trigger ID"
})} /> value={condition.id}
</> onChange={(id) =>
} onChange({
...condition,
id,
})
}
/>
</>
);
};
export const ZoneEditor: Editor<ZoneCondition> = ({ export const ZoneEditor: Editor<ZoneCondition> = ({ onChange, condition }) => {
onChange, return (
condition, <>
}) => { <InputEntity
return <> label="Zone"
<InputText label="Zone" value={condition.zone} onChange={zone => onChange({ value={condition.zone ?? []}
...condition, multiple
zone onChange={(zone) =>
})} /> onChange({
<InputEntity ...condition,
value={condition.entity_id} zone: zone ?? [],
multiple })
onChange={entity_id => onChange({ }
...condition, restrictToDomain={["zone"]}
entity_id />
})} <InputEntity
/> label="Entity with Location"
<InputText value={condition.entity_id}
label="State" multiple
value={String(condition.state)} onChange={(entity_id) =>
onChange={state => onChange({ onChange({
...condition, ...condition,
state, entity_id,
})} })
/> }
</> restrictToDomain={["person", "device_tracker"]}
} />
</>
);
};
@@ -6,73 +6,140 @@ import { AutomationCondition } from "types/automations/conditions";
import { ConditionEditor } from "."; import { ConditionEditor } from ".";
export default { export default {
title: 'ConditionEditor', title: "ConditionEditor",
component: ConditionEditor, component: ConditionEditor,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
initialViewMode: "edit",
},
} as ComponentMeta<typeof ConditionEditor>; } as ComponentMeta<typeof ConditionEditor>;
const Template: ComponentStory<typeof ConditionEditor> = ({
const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }) => { condition,
...args
}) => {
const [data, setData] = useState(condition); const [data, setData] = useState(condition);
return <Page> return (
<ConditionEditor {...args} <Page>
condition={data} <ConditionEditor
onUpdate={data => { {...args}
setData(data) condition={data}
}} onUpdate={(data) => {
/> setData(data);
</Page> }}
} />
</Page>
);
};
export const TemplateViewer = Template.bind({}) export const TemplateViewer = Template.bind({});
TemplateViewer.args = { TemplateViewer.args = {
condition: { condition: {
condition: 'template', condition: "template",
value_template: "states('switch.light_kitchen') == 'on'" value_template: "states('switch.light_kitchen') == 'on'",
} as AutomationCondition, } as AutomationCondition,
} };
export const NumericStateViewer = Template.bind({});
export const NumericStateViewer = Template.bind({})
NumericStateViewer.args = { NumericStateViewer.args = {
condition: { condition: {
condition: "numeric_state", condition: "numeric_state",
entity_id: "sensor.humidity_kitchen", entity_id: "sensor.humidity_kitchen",
above: "10", above: "10",
} as AutomationCondition, } as AutomationCondition,
} };
export const LogicCondition = Template.bind({}) export const LogicCondition = Template.bind({});
LogicCondition.args = { LogicCondition.args = {
condition: { condition: {
condition: 'or', condition: "or",
conditions: [ conditions: [
{ {
condition: 'numeric_state', condition: "numeric_state",
entity_id: 'sensor.humidity_kitchen', entity_id: "sensor.humidity_kitchen",
above: '60' above: "60",
}, },
{ {
condition: 'numeric_state', condition: "numeric_state",
entity_id: 'sensor.humidity_living_room', entity_id: "sensor.humidity_living_room",
above: '60' above: "60",
}, },
{ {
condition: 'and', condition: "and",
conditions: [ conditions: [
{ {
condition: 'numeric_state', condition: "numeric_state",
entity_id: 'sensor.humidity_bedroom', entity_id: "sensor.humidity_bedroom",
above: '60' above: "60",
}, },
{ {
condition: 'numeric_state', condition: "numeric_state",
entity_id: 'sensor.humidity_bathroom', entity_id: "sensor.humidity_bathroom",
above: '60' above: "60",
} },
] ],
}, },
] ],
} as AutomationCondition, } as AutomationCondition,
} };
export const TimeCondition = Template.bind({});
TimeCondition.args = {
condition: {
condition: "or",
conditions: [
{
condition: "time",
},
{
condition: "time",
after: "10:00:00",
},
{
condition: "time",
before: "input_datetime.test",
},
{
condition: "time",
weekday: ["fri"],
},
],
} as AutomationCondition,
};
export const MultipleConditions: ComponentStory<typeof ConditionEditor> = (
args
) => {
const [state, setState] = useState<AutomationCondition>({
condition: "or",
conditions: [
{
condition: "and",
conditions: [
{
condition: "numeric_state",
entity_id: ["sensor.kitchen_humidity"],
above: "40",
},
{
condition: "template",
value_template: "states('switch.kitchen') == 'on'",
},
],
},
{
condition: "numeric_state",
entity_id: ["sensor.kitchen_temperature"],
above: "51",
},
],
});
return (
<Page>
<ConditionEditor
onUpdate={setState}
onDelete={() => {}}
condition={state}
/>
</Page>
);
};
+14 -17
View File
@@ -1,27 +1,24 @@
import { FC } from "react"; import { FC } from "react";
import { AutomationCondition } from "types/automations/conditions"; import { AutomationCondition } from "types/automations/conditions";
import { ConditionNode } from "./ConditionNode"; import { ConditionNodeBase } from "./ConditionNodeBase";
import { ConditionNodeViewMode } from "./ConditionNodeSettings";
export const ConditionEditor: FC<{ export const ConditionEditor: FC<{
condition: AutomationCondition; condition: AutomationCondition;
onDelete: (which: 'root' | number) => void; onDelete: () => void;
onUpdate: (data: AutomationCondition) => void; onUpdate: (data: AutomationCondition) => void;
}> = ({ initialViewMode?: ConditionNodeViewMode;
condition, }> = ({ condition, onDelete, onUpdate, initialViewMode }) => {
onDelete, // state
onUpdate, return (
}) => { <ConditionNodeBase
// state
return <ConditionNode
condition={condition} condition={condition}
onDelete={onDelete} onDelete={onDelete}
onUpdate={update => { onUpdate={(update) => {
onUpdate(update) onUpdate(update);
}} }}
displayMode disableDelete={true}
showDelete={false} initialViewMode={initialViewMode}
/> />
} );
};
@@ -1,28 +1,26 @@
import { AutomationCondition, LogicCondition } from "types/automations/conditions"; import {
AutomationCondition,
LogicCondition,
} from "types/automations/conditions";
export const genUpdateMethods =
export const genUpdateMethods = ( (condition: LogicCondition, onChange: (c: LogicCondition) => void) =>
condition: LogicCondition, (i: number) => ({
onChange: (c: LogicCondition) => void onUpdate: (update: AutomationCondition) =>
) => (i: number) => ({ onChange({
onUpdate: (update: AutomationCondition) => onChange({
...condition, ...condition,
conditions: [ conditions: [
...condition.conditions.slice(0, i), ...condition.conditions.slice(0, i),
update, update,
...condition.conditions.slice(i + 1) ...condition.conditions.slice(i + 1),
] ],
}), }),
onDelete: (which: 'root' | number) => { onDelete: () => {
if (which === 'root') { onChange({
onChange({ ...condition,
...condition, conditions: condition.conditions
conditions: condition.conditions.slice(0, i).concat( .slice(0, i)
condition.conditions.slice(i + 1) .concat(condition.conditions.slice(i + 1)),
) });
}) },
} else { });
throw new Error("Not Implemented")
}
}
})
@@ -1,142 +0,0 @@
import { Styles } from "jss";
import { createAppUseStyles } from "styles/theme";
export const useStyles = createAppUseStyles<{
hasChildren: boolean,
isMobile: boolean,
}>(theme => {
const deleteBtn: Styles = {
borderRadius: '10px',
borderStyle: 'none',
padding: '0',
margin: '0',
background: theme.red,
width: '30px',
height: '15px',
fontSize: '10px',
textAlign: 'center',
cursor: 'pointer',
"&:hover": {
background: theme.redAccent,
}
}
return {
root: ({ hasChildren, isMobile }) => ({
background: theme.primary,
padding: 0,
position: 'relative',
display: 'flex',
flexDirection: isMobile ? 'column' : hasChildren ? 'column' : 'row',
}),
title: ({ hasChildren }) => ({
display: 'flex',
border: hasChildren ? `1px solid ${theme.primaryAccent}` : 'none',
borderRadius: 10,
borderBottomRightRadius: 0,
borderBottomLeftRadius: 0,
height: '100%',
}),
titleText: ({ hasChildren }) => ({
background: theme.condition.primaryColor,
border: `1px solid ${theme.primaryAccent}`,
borderRadius: 10,
borderTopRightRadius: 0,
borderBottomRightRadius: 0,
borderBottomLeftRadius: hasChildren ? 0 : 10,
minWidth: '10em',
maxWidth: '30em',
textOverflow: 'ellipsis',
textAlign: 'center',
cursor: 'pointer',
color: theme.primaryAccent,
}),
deleteBtnRoot: {
...deleteBtn,
position: 'absolute',
left: -35,
top: 10,
},
modifyBtn: ({ hasChildren }) => ({
// styling
backgroundColor: theme.green,
color: theme.primary,
fill: theme.primaryAccent,
borderColor: theme.primaryAccent,
borderWidth: 1,
borderRadius: hasChildren ? 10 : 0,
borderTopLeftRadius: 0,
borderBottomLeftRadius: 0,
cursor: 'pointer',
// positioning
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
padding: '0px 10px',
right: 1,
top: 10,
// on hover
"&:hover": {
backgroundColor: theme.greenLight,
fill: theme.primaryAccentLight,
},
"&:hover $icon": {
transform: "rotate(90deg)"
}
}),
icon: {},
deleteBtn,
conditionWrap: {
overflow: 'auto',
},
children: ({ hasChildren }) => ({
flex: 1,
paddingLeft: hasChildren ? 50 : 10,
paddingRight: hasChildren ? 0 : 10,
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
border: `1px solid ${theme.secondaryAccent}`,
borderBottomRightRadius: hasChildren ? 10 : 0,
borderBottomLeftRadius: hasChildren ? 10 : 0,
minHeight: hasChildren ? undefined : '100%',
overflow: 'scroll'
}),
addBtnContainer: {
display: 'flex',
justifyContent: 'center',
},
yamlBtn: {
backgroundColor: theme.secondary,
borderWidth: 1,
borderStyle: 'solid',
borderColor: theme.secondaryAccent,
color: theme.secondaryAccent,
paddingLeft: 20,
paddingRight: 20,
cursor: 'pointer',
"&:hover": {
backgroundColor: theme.primaryLight,
fill: theme.primaryAccentLight,
},
},
addBtn: {
backgroundColor: theme.secondary,
borderWidth: 1,
borderStyle: 'solid',
borderColor: theme.secondaryAccent,
color: theme.secondaryAccent,
borderRadius: 5,
marginTop: 5,
marginBottom: 5,
paddingLeft: 20,
paddingRight: 20,
cursor: 'pointer',
"&:hover": {
backgroundColor: theme.primaryLight,
fill: theme.primaryAccentLight,
},
}
}
})
@@ -1,45 +1,53 @@
import { FC } from "react"; 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 { getDescriptionFromAutomationNode, Namer } from "utils/formatting";
import { ConditionNode } from "./ConditionNode"; import { ConditionNodeBase } from "./ConditionNodeBase";
import { genUpdateMethods } from "./nestedUpdater"; import { genUpdateMethods } from "./nestedUpdater";
interface Viewer<C extends AutomationCondition>
interface Viewer<C extends AutomationCondition> extends FC<{ extends FC<{
condition: C; condition: C;
namer: Namer; namer: Namer;
onChange: (condition: C) => void; onChange: (condition: C) => void;
}> { } }> {}
export const getViewer = (condition: AutomationCondition): Viewer<any> => { export const getViewer = (condition: AutomationCondition): Viewer<any> => {
if ( if (
(condition.condition === 'and') || condition.condition === "and" ||
(condition.condition === 'or') || condition.condition === "or" ||
(condition.condition === 'not') condition.condition === "not"
) { ) {
return LogicViewer return LogicViewer;
} }
return GenericViewer return GenericViewer;
} };
export const GenericViewer: Viewer<AutomationCondition> = ({ export const GenericViewer: Viewer<AutomationCondition> = ({
condition, condition,
namer, namer,
}) => { }) => {
return <> return <>{getDescriptionFromAutomationNode(condition, namer, true)}</>;
{getDescriptionFromAutomationNode(condition, namer)} };
</>
}
export const LogicViewer: Viewer<LogicCondition> = ({ export const LogicViewer: Viewer<LogicCondition> = ({
condition, condition,
onChange, onChange,
}) => { }) => {
return <> return (
{condition.conditions.map((c, i) => { <>
return <ConditionNode key={i} condition={c} displayMode {condition.conditions.map((c, i) => {
{...genUpdateMethods(condition, onChange)(i)} return (
/> <ConditionNodeBase
})} key={i}
</> condition={c}
} // displayMode
{...genUpdateMethods(condition, onChange)(i)}
/>
);
})}
</>
);
};
@@ -1,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,26 @@
.dag-graphboard.loading {
position: relative;
min-height: 100%;
min-width: 100%;
}
.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,79 @@
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,
additionalControls,
}) => {
// 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} showFitView>
{additionalControls}
</Controls>
</ReactFlow>
</>
);
};
@@ -0,0 +1,35 @@
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;
additionalControls?: ReactNode;
};
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, 1.5],
collection: [1.2, 1.1],
},
position: {
x: 50,
y: 50,
},
flipped: true,
};
@@ -0,0 +1,76 @@
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[by][0] * increment,
x: startPoint.x,
};
const moveOnX = {
x: startPoint.x + dims[by].width * dims.distanceFactor[by][1] * 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[incrementBy][0] * dims[incrementBy].width,
y: offsetPos.y,
}
: {
y:
relatedPos.y +
dims.distanceFactor[incrementBy][1] * dims[incrementBy].height,
x: offsetPos.x,
};
export const moveFromTo = (
from: keyof DAGEntities,
to: keyof DAGEntities,
startPoint: XYPosition,
dims: DAGDims,
byFrom: boolean = false
): XYPosition => {
if (!dims.flipped) {
return {
x:
startPoint.x +
dims[from].width * dims.distanceFactor[byFrom ? from : to][0],
y: startPoint.y + (dims[from].height - dims[to].height) / 2,
};
} else {
return {
y:
startPoint.y +
dims[from].height * dims.distanceFactor[byFrom ? from : to][1],
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][0] * 0.9 * dims[by].width,
y: position.y + dims.distanceFactor[by][1] * 0.9 * dims[by].height,
});
@@ -0,0 +1,135 @@
import { XYPosition } from "react-flow-renderer";
import AddBox from "@mui/icons-material/AddBox";
import { getDescriptionFromAutomationNode } from "utils/formatting";
import { validateNode } from "utils/automations";
import { AutomationCondition } from "types/automations/conditions";
import { AutomationTrigger } from "types/automations/triggers";
import { DAGDims, ElementMaker, ElementMakerProps } from "./types";
import { DAGElementsOutputState } from "./outputState";
import { convertFailuresToSequenceNodeDataProps } from "./util";
import { ButtonNodeMaker } from "../nodes/ButtonNode";
import { CollectionNodeMaker } from "../nodes/CollectionNode";
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) => {
const failures = validateNode(node, ["trigger"]);
if (failures) {
return {
enabled: node.enabled ?? true,
...stateUpdater.createNodeActions("trigger", index, {}),
...convertFailuresToSequenceNodeDataProps(failures),
};
}
return {
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) => {
const failures = validateNode(node, ["condition"]);
if (failures) {
return {
enabled: node.enabled ?? true,
...stateUpdater.createNodeActions("condition", index, {}),
...convertFailuresToSequenceNodeDataProps(failures),
};
}
return {
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;
};
type MakeAddButtonArgs = {
position: XYPosition;
nodeId: string;
outputState: DAGElementsOutputState;
dims: DAGDims;
onClick: () => void;
};
export const makeAddButton = (args: MakeAddButtonArgs) => {
const addElement = args.outputState.addNode(
ButtonNodeMaker.makeElement(
{
id: `${args.nodeId}-add-new`,
position: args.position,
},
args.dims,
{
text: "Option",
icon: <AddBox />,
onClick: args.onClick,
}
)
);
args.outputState.addEdge(args.nodeId, addElement.id, {
animated: true,
sourceHandle: "side",
});
};
type DrawConditionArgs = {
conditions: AutomationCondition[];
args: ElementMakerProps;
onRemove: () => void;
};
export const drawCondition = ({
conditions,
onRemove,
args,
}: DrawConditionArgs) => {
const conditionState = makeConditionNodes(conditions, args);
(conditionState.data.nodes[0].data as any).title = `Option ${
args.nodeIndex + 1
}`;
(conditionState.data.nodes[0].data as any).onDelete = onRemove;
conditionState.data.edges[0].sourceHandle = `side`;
conditionState.data.edges[0].label = args.nodeIndex > 0 ? "else if" : "if";
conditionState.data.edges[0].style = {
stroke: "var(--mui-info-main)",
};
return conditionState;
};
Loaded 100 of 245 files, more files were not shown because too many files have changed in this diff. Show more