Compare commits

..
340 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
ari c17783064c update config 2022-06-12 22:44:16 -04:00
ari d824a93695 delay fixes 2022-06-12 22:23:30 -04:00
ari 5207c48f8d v0.1.20 2022-06-12 22:11:58 -04:00
ari b30f4ed59a enabled flag 2022-06-12 21:55:32 -04:00
ari e3a816f2c8 wait template 2022-06-12 21:39:45 -04:00
ari 240f8faef7 latest work 2022-06-12 16:42:44 -04:00
ari 651ba865b1 fixed up inputtime 2022-06-11 18:54:33 -04:00
ari a3e9d19c45 added icon for flip 2022-06-09 17:13:34 -04:00
ari 942867d646 adjusted tasks 2022-06-08 09:38:58 -04:00
ari 041c2f02d5 added tasks + timestring validation 2022-06-08 09:34:52 -04:00
ari fb30d577aa clean up 2022-06-06 22:42:08 -04:00
ari c4a90fcd1c clean up 2022-06-06 22:39:30 -04:00
ari 4c3b34195a service autocomplete 2022-06-06 22:37:34 -04:00
ari 78494ee74d fixed up some styling issues 2022-06-06 19:40:20 -04:00
ari d3fff074e5 fixed up linting 2022-06-06 17:35:35 -04:00
ari 0ee0a06737 more reliable ws 2022-06-06 17:34:06 -04:00
ari 61000f2ff1 namer in conditions 2022-06-06 11:28:51 -04:00
ari ac1ee86cc7 namer 2022-06-06 11:27:25 -04:00
ari c934a4afcb using cookies to remember where we are 2022-06-06 11:02:06 -04:00
Ari Sosnovsky 359958aada 1.1.19 2022-06-05 23:16:30 -04:00
ari 7a73af4434 initial proto of mobile mode graph 2022-06-05 20:55:44 -04:00
ari 55bb941399 some fixes for invalid nodes 2022-06-04 23:36:12 -04:00
ari afb765024d clean up on actions 2022-06-04 22:12:32 -04:00
ari 911f867518 fixed up issues with saving 2022-06-04 22:10:41 -04:00
ari 25bb19dbe5 new logo 2022-06-04 21:32:45 -04:00
ari 9960ce2909 new logo 2022-06-04 21:25:42 -04:00
ari c2fde70954 logo 2022-06-04 21:13:54 -04:00
Ari Sosnovsky 5ca9c4a361 Prepped v0.1.17 (#12)
prepped v0.1.17
2022-06-04 20:56:42 -04:00
ari c27f2d13f0 no latest for tests 2022-06-04 18:40:57 -04:00
ari 26c81effd6 fixed routing issue 2022-06-04 17:54:32 -04:00
ari e72c83b980 location fix 2022-06-04 16:09:52 -04:00
ari e222c42150 fixed typing errors 2022-06-04 15:56:15 -04:00
ari e7b88fc6f6 ensured ci passes 2022-06-04 15:50:28 -04:00
ari 079f353dbf trying to just redirect ws 2022-06-04 15:45:14 -04:00
ari e6e51be5a5 using dockerhub 2022-06-01 21:50:01 -04:00
ari 3a6b21a117 updated ignore list 2022-06-01 21:48:31 -04:00
ari f42df5a70f added build actions to ghcr.io 2022-06-01 21:22:58 -04:00
ari 0c3e9b5ace added build actions to ghcr.io 2022-06-01 21:22:44 -04:00
ari bc773154c6 all the latest socket work 2022-06-01 21:17:16 -04:00
ari a530e5e6e0 clean ups 2022-05-31 17:13:15 -04:00
ari 1ad87c205d updated emitters 2022-05-31 13:28:11 -04:00
ari d45f72b168 badges 2022-05-31 13:21:31 -04:00
ari 0c7db09c32 removed desc 2022-05-31 12:50:53 -04:00
ari 2b1648eff2 added desc to build 2022-05-31 12:50:15 -04:00
ari 06356b46e9 deployment 2022-05-31 12:46:11 -04:00
ari 21fe64f4bf added supervisor token + snackbar for errors 2022-05-31 12:19:58 -04:00
ari e22f64dd51 updated all packages to latest 2022-05-31 11:24:37 -04:00
ari f1b24ec783 device id 2022-05-30 19:48:55 -04:00
ari 8a90b56ac3 fixed tsc 2022-05-30 15:20:42 -04:00
ari 7d111c853b slight improvement on condition editor for mobile 2022-05-30 15:14:47 -04:00
ari 0c72481729 clean up 2022-05-30 15:10:33 -04:00
ari 996626f9af input entities 2022-05-30 15:05:54 -04:00
ari 878035e748 added ha websockets 2022-05-29 22:06:21 -04:00
ari cc930ee4ac dealt with linitng errors 2022-05-29 21:06:43 -04:00
ari 169a2e9059 loaders 2022-05-27 16:43:31 -04:00
ari 6275123071 v0.1.14 2022-05-27 14:37:21 -04:00
ari 0001c93792 speeding up build times 2022-05-27 13:37:43 -04:00
ari 90d3fa0587 sorting tag names 2022-05-27 13:01:50 -04:00
ari 938040e519 sorting tag values 2022-05-27 13:01:27 -04:00
ari 14b3132c64 ensured unique tag types 2022-05-27 13:00:52 -04:00
ari 17c79d7aab updated deps 2022-05-27 12:54:15 -04:00
Ari Sosnovsky 67cc57f068 Create SECURITY.md 2022-05-27 12:36:59 -04:00
ari a4743b0353 added helper text for error 2022-05-27 12:31:56 -04:00
ari 5efda5f3b2 using mui select 2022-05-27 12:25:44 -04:00
ari 7d7a788723 added unsupported 2022-05-27 12:08:58 -04:00
ari cdf67aa1a9 fixed up alias issues 2022-05-27 12:02:25 -04:00
ari 98133607ca revamp grouper 2022-05-27 11:46:54 -04:00
ari 5729b74c89 tag autocomplete 2022-05-26 21:49:28 -04:00
ari fb8eb4f38c cleaner test 2022-05-24 22:14:34 -04:00
ari 21adcb6973 better autoinfobox styling 2022-05-24 22:11:42 -04:00
ari 8a33d05ced slightly better node condition editor 2022-05-24 22:00:34 -04:00
ari 334268b5ee deprecated textarea 2022-05-24 21:31:54 -04:00
ari 3b7b17021f replaced yaml editor 2022-05-24 21:28:14 -04:00
ari 44c4ac12dd initial work with mui 2022-05-24 21:12:01 -04:00
ari f8233dd6ab added mui 2022-05-24 21:11:49 -04:00
ari 54f528deb4 simple tmux as help build 2022-05-20 15:46:10 -04:00
ari eb363acf81 v0.1.13 2022-05-20 14:08:36 -04:00
ari 415acf06cc correct slash 2022-05-20 13:46:09 -04:00
ari 0325b8eec3 trying to get a valid version 2022-05-20 13:45:23 -04:00
ari d184871217 trying to get build test working 2022-05-20 13:40:02 -04:00
ari 0499feb61d added test badge; 2022-05-20 12:34:40 -04:00
ari 0030920558 fixed up typing 2022-05-20 12:33:25 -04:00
ari f62f139f55 fixed up tests 2022-05-20 12:32:36 -04:00
ari 2d80798ccb removed rumeal references 2022-05-20 12:29:24 -04:00
ari 3da5e1c88c fixed python issues 2022-05-20 11:05:15 -04:00
ari 7df34bdf7f build post test 2022-05-20 11:01:39 -04:00
ari 554528ace0 fixed yarn build 2022-05-20 10:56:06 -04:00
ari 298a233a5f changed yaml loaders 2022-05-20 10:53:53 -04:00
ari cbbc099384 no repeat alias editor 2022-05-20 10:05:27 -04:00
ari 48decb2e16 saving colors when not modified 2022-05-19 23:22:16 -04:00
ari 7afda7eb1c fixing up yaml modder 2022-05-19 23:18:16 -04:00
ari f6270c94f3 clean up 2022-05-19 22:57:58 -04:00
ari 952dcba3ac nicer yaml editor 2022-05-19 22:56:34 -04:00
ari 25770e1c1d v0.1.12 2022-05-18 23:09:19 -04:00
ari 029a2dac9f better formatting 2022-05-18 22:57:51 -04:00
ari 8732ab8dda not populating changelog 2022-05-18 22:42:56 -04:00
ari 42ab6e5913 improper save for conditions 2022-05-18 22:41:24 -04:00
ari c28796872f condition validation 2022-05-18 22:37:25 -04:00
ari 40690293a8 added initial pre-validation per node 2022-05-18 22:23:57 -04:00
ari 621f43e5c8 v0.1.10 2022-05-18 11:57:34 -04:00
ari f3496f9d32 fixed nodejs test 2022-05-18 11:04:15 -04:00
ari 409cf2b21a simpler names 2022-05-18 11:03:07 -04:00
ari ef92261666 reverting something stupid 2022-05-18 11:01:29 -04:00
ari 83edaf9bf8 tagged names 2022-05-18 11:00:41 -04:00
ari f8efd895a9 not building 2022-05-18 10:59:35 -04:00
ari da0d153b81 fixed up linting 2022-05-18 10:58:26 -04:00
ari bcd262dd46 - fixed up optional metadata + + desc
- using timestamp for default new ids
'
2022-05-18 10:54:53 -04:00
ari ea47b3e1eb fixed up automation time 2022-05-18 10:37:41 -04:00
ari 5192c09681 trying to provide test 2022-05-18 09:50:08 -04:00
ari d3adfaaacb making sure the version is required 2022-05-17 22:16:09 -04:00
ari c249a94b3d fixing up typo 2022-05-17 22:15:44 -04:00
ari dce028d0bc clean up 2022-05-17 22:15:18 -04:00
ari 7333f9e159 added manual build 2022-05-17 22:15:06 -04:00
ari 809095f8e0 added edge tag 2022-05-17 22:14:38 -04:00
ari 8942693a32 added a manual build 2022-05-17 22:13:57 -04:00
ari db49ed02ed updated tsc 2022-05-17 22:10:08 -04:00
ari cce2e03053 fixed up trigger issues 2022-05-17 22:03:22 -04:00
ari 4509a224a9 minor style patch 2022-05-17 21:51:20 -04:00
316 changed files with 30736 additions and 14330 deletions

No files matched your search

+9 -1
View File
@@ -1,4 +1,12 @@
webapp/node_modules
webapp/build
webapp/.storybook
webapp/.vscode
webapp/.env.local
webapp/tmux.sh
api/.env
api/.coverage
api/venv
api/build
api/.mypy_cache
api/.vscode
api/.coverage
+109
View File
@@ -0,0 +1,109 @@
name: Build
on:
workflow_dispatch:
inputs:
version:
type: string
description: "Version Number"
push:
branch: [main]
jobs:
metadata:
runs-on: ubuntu-latest
name: Metadata
outputs:
version: ${{ steps.version.outputs.VERSION }}
steps:
- name: Check out repository
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Get Version
id: version
shell: bash
run: |
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
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: "Save version number"
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:
args: |
--${{ matrix.arch }} \
--no-latest \
--version ${{ needs.metadata.outputs.version }} \
--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
-77
View File
@@ -1,77 +0,0 @@
name: Deploy
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on:
workflow_dispatch:
push:
branch: [main]
paths:
- 'config.yaml'
jobs:
metadata:
runs-on: ubuntu-latest
name: Metadata
outputs:
version: ${{ steps.version.outputs.VERSION }}
changlelog: ${{ steps.changlelog.outputs.CHANGELOG }}
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Get Version
id: version
shell: bash
run: |
echo ::set-output name=VERSION::$(cat config.yaml | sed -nr 's/version: (.*)/\1/p')
- name: Get Changelog
id: changlelog
shell: bash
run: |
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
build:
runs-on: ubuntu-latest
name: Build & Publish ${{ matrix.arch }}
needs:
- metadata
strategy:
matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
uses: home-assistant/builder@2022.03.1
with:
args: |
--${{ matrix.arch }} \
--target .
publish:
runs-on: ubuntu-latest
needs:
- metadata
- build
name: Publish Github Release
steps:
- name: Publish Release ${{ needs.metadata.outputs.version }}
uses: actions/github-script@v6
env:
VERSION: ${{ needs.metadata.outputs.version }}
CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
with:
script: |
github.rest.repos.createRelease({
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: process.env.VERSION,
body: process.env.CHANGELOG,
});
+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,
});
+38 -41
View File
@@ -1,80 +1,77 @@
name: Test
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on:
workflow_dispatch:
name: Commit Tests
on:
push:
branch: [main]
branch:
- main
paths:
- "webapp"
- "api"
pull_request:
branches: [main]
branch:
- main
jobs:
build:
metadata:
runs-on: ubuntu-latest
name: Build Test for ${{ matrix.arch }}
strategy:
matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
name: Metadata
outputs:
version: ${{ steps.version.outputs.VERSION }}
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
with:
all_but_latest: true
access_token: ${{ github.token }}
- name: Check out repository
uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
fetch-depth: 0
- name: Get Version
id: version
shell: bash
run: |
echo ::set-output name=VERSION::$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
- name: ${{ steps.version.outputs.VERSION }}
shell: bash
run: |
echo ${{ steps.version.outputs.VERSION }}
- name: ${{ matrix.arch }}
uses: home-assistant/builder@2022.03.1
with:
args: |
--test \
--${{ matrix.arch }} \
--target .
python:
name: "Python Tests"
runs-on: ubuntu-latest
needs:
- metadata
strategy:
matrix:
action: [lint, coverage, security-checks]
action:
- lint
- coverage
- security-checks
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Install Dependencies
run: cd api && make setup
- name: Echo dependencies
run: cd api && ./venv/bin/pip freeze
- name: Running ${{ matrix.action }}
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
run: cd api && make ${{ matrix.action }}
nodejs:
name: "NodeJs Tests"
runs-on: ubuntu-latest
needs:
- metadata
strategy:
matrix:
action: [test:ci, tsc:ci, build]
action:
- "test:ci"
- "tsc:ci"
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
cache: 'yarn'
cache: "yarn"
cache-dependency-path: webapp/yarn.lock
- name: Install Dependencies
run: cd webapp && yarn install
- name: Run Tests
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
run: cd webapp && yarn ${{ matrix.action }}
+1
View File
@@ -1 +1,2 @@
.vscode/*.log
webapp/src/types/validators/index.test.ts
+4 -1
View File
@@ -8,5 +8,8 @@
"*test_*.py"
],
"python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": true
"python.testing.unittestEnabled": true,
"yaml.schemas": {
"https://json.schemastore.org/github-action.json": ".github/workflows/*.yml"
}
}
+96 -4
View File
@@ -1,6 +1,99 @@
# Changelog
# Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge)
## [0.1.7] - Support for Malformed Automations
## [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
- Using MUI elements for input time
- Added delay action / wait_on_triggers action
- Added enabled/disabled flag in node editor
- Optional flip vertical during desktop mode
- Fixed up modal clipping
## [0.1.19] - Vertical mobile mode
- in mobile mode we draw the graphs vertically now
## [0.1.17] - Websockets
- Connected to HA main websocket -- now we retrieve real-time information about
- Device names
- Entity names/ids
- Autocomplete for devices and entities
## [0.1.14] - Material UI + Autocomplete
- Brought some Material UI elements for input and text
- Autocomplete for tags
- Using 'id' as alias for trigger (as it seems to break HA otherwise)
- Not using 'alias' for conditions, always auto-generating it (again, this used to break HA)
- Added missing `data` object to service-actions
## [0.1.13] - YAML
- Better YAML
- Rewrote yaml parser/loader to use pyyaml and safe mode
- Cleaned up description vs alias
## [0.1.12] - Less Intense Error Messages
- Added more node-based errors (this way it's easier to see where validations failed)
- Made the validators less strict in order to capture more edge cases that HA supports
- Nicer auto-generated descriptions for some trigger nodes
## [0.1.10] - More Bug Fixes
- Allowing null or undefined values for metadata fields
- Trigger.platform==time will now have the .at property better supported
## [0.1.9] - Fixed up invalid types for various triggers
- Some triggers had invalid types and were causing a false-positive validation
## [0.1.8] - Support for Malformed Automations
- API will no longer error out on missing values or invalid lists
- Frontend has support for displaying bad automations
@@ -44,8 +137,7 @@
## [0.0.9] - First Working Version
- Instalable verion via github
- Initial POC done
- Initial POC done
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+24 -27
View File
@@ -1,41 +1,36 @@
# <--- Build Args -->
# <--- Pre-Build Args -->
ARG BUILD_ARCH
# <--- Main Image -->
FROM python:3.9.13-slim-buster
WORKDIR /app
# <--- Post-Build Args -->
ARG BUILD_VERSION
# <--- Image Setup -->
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
WORKDIR /app
# <--- Environment Variables -->
ENV BUILD_VERSION $BUILD_VERSION
# <--- System Wide Dependencies -->
ENV LANG C.UTF-8
RUN apk add --no-cache \
nodejs \
npm \
build-base \
python3-dev
RUN pip install -U wheel setuptools pip && \
npm i -g yarn
RUN apt-get update -y && \
apt-get install -y gcc git build-essential libtool automake curl
# <--- Scripts -->
COPY docker/bin /app/bin
# <--- PREP -->
RUN /app/bin/prep.sh
# <--- Python Dependencies -->
COPY api/setup.py /app/setup.py
RUN pip install . /app
# <--- Webapp Build -->
COPY webapp/ /app/web-builder
RUN cd /app/web-builder && \
yarn && \
yarn build && \
cp -r /app/web-builder/build /app/web && \
rm -rf /app/web-builder
# <--- BUILD -->
RUN /app/bin/build.sh /app
# <--- Api Code -->
COPY api/src /app/src
COPY run.sh /app/run.sh
RUN chmod +x /app/run.sh
# <--- Environment Variables -->
ENV HASSIO_TOKEN ""
ENV BUILD_VERSION $BUILD_VERSION
COPY webapp/build /app/web
# <--- Ports -->
EXPOSE 8000
@@ -43,7 +38,9 @@ EXPOSE 8000
# <--- Final -->
LABEL \
io.hass.type="addon" \
io.hass.arch="armhf|aarch64|i386|amd64"
io.hass.arch="armhf|aarch64|i386|amd64|armv7"
CMD [ "/app/run.sh" ]
ENTRYPOINT [ "/app/bin/run.sh" ]
CMD [ "/app" ]
LABEL org.opencontainers.image.source https://github.com/asosnovsky/Shortumation
+29 -7
View File
@@ -1,24 +1,46 @@
DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
BUILD_TAG=$(shell git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
DC=BUILD_TAG=${BUILD_TAG} docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
build-with-builder:
docker run \
--rm \
--privileged \
-v ~/.docker:/root/.docker \
-v /var/run/docker.sock:/var/run/docker.sock:ro \
-v ${PWD}:/data \
homeassistant/amd64-builder \
--amd64 \
--test \
--version ${BUILD_TAG} \
-t /data
build:
cd webapp && yarn build
$(DC) build
build-no-cache:
cd webapp && yarn buil
$(DC) build --no-cache
push:
$(DC) push
local_run:
$(MAKE) build
start:
$(DC) up -d
sleep 1
$(DC) ps
local_logs:
logs:
$(DC) logs -f
local_ps:
ps:
$(DC) ps
local_stop:
stop:
$(DC) stop
bash:
$(DC) exec addon bash
config:
$(DC) config
+38 -9
View File
@@ -1,10 +1,39 @@
# Shortumation
# 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) [![Build](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml)
| | 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)
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
![image](https://user-images.githubusercontent.com/7451445/168672575-fb19997d-fe9b-4192-96b0-733b62519797.png)
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/168672840-71ceaa8a-2bee-443e-9150-5b0f03b05d08.png)
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
@@ -15,11 +44,11 @@ A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI
- [X] See all automations in one common view
- [X] Automation Manager
- [X] Tags for automation organization
- [ ] Script Manager
- [ ] Use secrets and global parameters
- [ ] Autocomplete fields for entities/devices
- [ ] Autocomplete fields for template editor
- [ ] Autocomplete fields for referencing scripts
- [X] Autocomplete fields for entities/devices
- [X] Visualize parallel/repeat/choose/if-else nodes
- [X] Autogenerate node names
- [ ] Clean error reporting
- [ ] Script Editor
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
@@ -44,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?**
> 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?**
+12
View File
@@ -0,0 +1,12 @@
# Security Policy
## Supported Versions
| Version | Supported |
| ------- | ------------------ |
| 0.1.x | :white_check_mark: |
## Reporting a Vulnerability
Please open an issue with the tag 'Vulnerability', and include your reasoning in it.
+13 -16
View File
@@ -1,17 +1,14 @@
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:16)
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:27)
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:31)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:12)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:9)
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:16)
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:17)
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:6)
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:7)
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:17)
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:28)
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:32)
read_details # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:10)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:10)
websocket_endpoint # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/socket.py:9)
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:18)
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:19)
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:11)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:12)
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
logger # unused variable (/home/ari/Projects/Shortumation/api/src/logger.py:16)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:13)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:30)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:54)
+2 -2
View File
@@ -33,7 +33,7 @@ test:
coverage:
$(VENV_BIN)/coverage run -m unittest discover tests
$(VENV_BIN)/coverage report -m --fail-under=90
$(VENV_BIN)/coverage report -m --fail-under=80
clean:
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
@@ -43,4 +43,4 @@ clean:
run-local:
rm -f 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
+16 -14
View File
@@ -4,24 +4,26 @@ import setuptools # type: ignore
setuptools.setup(
python_requires=">=3.9",
install_requires=[
"ruamel.yaml==0.17.17",
"fastapi==0.70.0",
"pydantic==1.8.2",
"uvicorn[standard]==0.15.0",
"python-decouple==3.5",
"PyYAML==6.0",
"fastapi==0.78.0",
"pydantic==1.9.1",
"hypercorn==0.13.2",
"python-decouple==3.6",
"websockets==10.3"
],
extras_require={
"dev": [
"mypy==0.910",
"mypy==0.961",
"mypy-extensions==0.4.3",
"black==22.3.0",
"bandit==1.7.0",
"isort==5.9.3",
"coverage==5.5",
"pre-commit==2.13.0",
"vulture==2.3",
"types-requests==2.25.6",
"requests==2.27.0",
"black==22.6.0",
"bandit==1.7.4",
"isort==5.10.1",
"coverage==6.4.1",
"pre-commit==2.19.0",
"vulture==2.4",
"types-requests==2.28.0",
"types-PyYAML==6.0.9",
"requests==2.28.1",
],
},
)
+10 -5
View File
@@ -3,16 +3,16 @@ from fastapi.middleware.cors import CORSMiddleware
from fastapi.staticfiles import StaticFiles
from src.automations.manager import AutomationManager
from src.env import ORIGIN, ROOT_FOLDER
from src.env import API_PREFIX, ORIGIN, ROOT_FOLDER
from .routes import automations, details, ping
from .routes import automations, details, ping, socket
def make_app(automation_mgr: AutomationManager) -> FastAPI:
app = FastAPI()
if (ROOT_FOLDER / "web").exists():
app.mount(
"/web",
f"{API_PREFIX}/web",
StaticFiles(
directory=ROOT_FOLDER / "web",
html=True,
@@ -29,6 +29,11 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
allow_headers=["*"],
)
app.include_router(ping.router, prefix="/ping")
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations")
app.include_router(details.make_details_router(automation_mgr.hass_config), prefix="/details")
app.include_router(
automations.make_automation_router(automation_mgr), prefix=f"{API_PREFIX}/automations"
)
app.include_router(
details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details"
)
app.include_router(socket.router, prefix=f"{API_PREFIX}/socket")
return app
+5
View File
@@ -5,6 +5,7 @@ from src.api.types import (
ListData,
ListParams,
UpdateAutoRequest,
UpdateTags,
)
from src.automations.errors import FailedDeletion
from src.automations.manager import AutomationManager
@@ -29,6 +30,10 @@ def make_automation_router(automations: AutomationManager) -> APIRouter:
def upsert_auto(body: UpdateAutoRequest):
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")
def delete_auto(body: DeleteAutoRequest):
try:
+4 -4
View File
@@ -1,8 +1,6 @@
from datetime import datetime
from fastapi import APIRouter
from src.env import BUILD_VERSION
from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
from src.hass_config import HassConfig
@@ -10,9 +8,11 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
router = APIRouter()
@router.get("/")
def read_ping():
def read_details():
return {
"version": BUILD_VERSION,
"hassio_token": HASSIO_TOKEN,
"hassio_url": HASSIO_WS,
"config": hass_config.get_configuration_path(),
"tags": hass_config.get_automation_tags_path(),
"autos": hass_config.get_automation_path(),
+39
View File
@@ -0,0 +1,39 @@
import asyncio
import json
from fastapi import APIRouter, WebSocket, WebSocketDisconnect
from src.logger import get_logger
from src.ws_redirect import WSRedirector
router = APIRouter()
logger = get_logger(__name__)
@router.websocket("/api/websocket")
async def websocket_endpoint(websocket: WebSocket):
async def on_message(msg: str):
await websocket.send_text(msg)
conn = WSRedirector(
on_message=on_message,
)
async def wait_for_data():
while True:
try:
msg_str = await websocket.receive_text()
msg_d = json.loads(msg_str)
if msg_d.get("type") != "auth":
await conn.send(msg_str)
except WebSocketDisconnect:
logger.info("Websocket closed.")
await conn.close()
break
await websocket.accept()
await asyncio.gather(
conn.start(),
wait_for_data(),
)
+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.fields import Field
@@ -25,5 +25,10 @@ class UpdateAutoRequest(BaseModel):
data: ExtenededAutomationData
class UpdateTags(BaseModel):
automation_id: str = Field(description="Automation Id to update")
tags: Dict[str, str]
class DeleteAutoRequest(BaseModel):
index: int = Field(description="Index of the automation to update")
+4 -1
View File
@@ -1,5 +1,8 @@
class AutomationLoaderException(Exception):
pass
def __init__(self, *args: object, **kwargs) -> None:
super().__init__(
"".join(map(str, args)) + ",".join((f"{k}={v}" for k, v in kwargs.items())),
)
class InvalidAutomationFile(AutomationLoaderException):
+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.hass_config.loader import HassConfig
@@ -22,32 +22,40 @@ class AutomationManager:
continue
if i >= offset + limit:
break
yield from load_automation(auto, tags.get(i, {}))
yield from load_automation(auto, tags.get(auto.get("id", ""), {}))
def get(self, index: int) -> Optional[AutomationData]:
def get(self, index: int) -> Optional[ExtenededAutomationData]:
tags = self.hass_config.automation_tags
if index >= 0:
for i, auto in enumerate(self.hass_config.automations):
if not isinstance(auto, dict):
raise InvalidAutomationFile(automation_index=i)
if i == index:
return next(load_automation(auto, tags.get(i, {})))
return next(load_automation(auto, tags.get(auto.get("id", ""), {})))
return None
def update(self, index: int, automation: ExtenededAutomationData):
tags = self.hass_config.automation_tags
automations: List[dict] = []
updated = False
updated_index: Optional[int] = None
for i, orig_auto in enumerate(self.hass_config.automations):
if i == index:
automations.append(automation.to_primitive())
updated = True
updated_index = i
else:
automations.append(orig_auto)
if not updated:
if updated_index is None:
automations.append(automation.to_primitive())
tags[index] = automation.tags
updated_index = len(automations) - 1
tags[automation.metadata.id] = automation.tags
self.hass_config.save_automations(automations)
self.hass_config.save_tags(tags)
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):
automations: List[dict] = []
deleted = False
+1 -1
View File
@@ -4,7 +4,7 @@ from typing import Dict
from src.yaml_serializer import dump_yaml, load_yaml
class TagManager(Dict[int, Dict[str, str]]):
class TagManager(Dict[str, Dict[str, str]]):
def save(self, path: Path):
path.write_text(dump_yaml(dict(self)))
+1 -1
View File
@@ -1,4 +1,4 @@
from typing import Dict, List, Literal, Optional, Union
from typing import Dict, List, Optional, Union
from pydantic import BaseModel
from pydantic.fields import Field
+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))
+3
View File
@@ -4,5 +4,8 @@ from decouple import Csv, config
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
HASSIO_TOKEN = config("SUPERVISOR_TOKEN", "")
HASSIO_WS = config("HASSIO_WS", "ws://supervisor/core/websocket")
LOG_LEVEL = config("LOG_LEVEL", "INFO")
API_PREFIX = config("API_PREFIX", "")
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
+5 -2
View File
@@ -10,9 +10,12 @@ def find_hass_config() -> HassConfig:
"""Try to find HASS config."""
if config("USE_EXAMPLE_REPO", False, cast=bool):
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)
return HassConfig(path)
+4
View File
@@ -14,3 +14,7 @@ else:
logging.basicConfig(level=logging.NOTSET)
logger = logging.getLogger()
def get_logger(name: str):
return logging.getLogger(name)
+59
View File
@@ -0,0 +1,59 @@
import asyncio
import json
from typing import Callable, Coroutine, Optional
from websockets.client import WebSocketClientProtocol, connect
from websockets.exceptions import ConnectionClosedOK
from src.env import HASSIO_TOKEN, HASSIO_WS
from src.logger import get_logger, logger
OnMessage = Callable[[str], Coroutine]
logger = get_logger(__name__)
class WSRedirector:
def __init__(
self,
on_message: OnMessage,
token: str = HASSIO_TOKEN,
host: str = HASSIO_WS,
) -> None:
self._host = host
self._token = token
self._on_message = on_message
self._client: Optional[WebSocketClientProtocol] = None
self._close: bool = False
@property
def is_closed(self):
return self._close
async def send(self, msg: str):
if self._client:
return await self._client.send(msg)
async def start(self):
async with connect(self._host) as websocket:
self._client = websocket
await websocket.send(json.dumps({"type": "auth", "access_token": self._token}))
while not self.is_closed:
try:
msg = await websocket.recv()
# logger.debug(f"HA MSG :--> {msg} {self.is_closed}")
await self.process_message(msg)
except ConnectionClosedOK:
pass
logger.info("Closing socket...")
await websocket.close()
logger.info("Closed socket")
async def process_message(self, msg: str):
await self._on_message(msg)
async def close(self):
self._close = True
await self._client.close()
def __del__(self):
asyncio.create_task(self.close())
+13 -3
View File
@@ -1,7 +1,10 @@
import io
from typing import Any, TextIO, Union
from src.yaml_serializer.base_yaml import yaml
import yaml
from src.yaml_serializer.dumper import YamlSafeDumper
from src.yaml_serializer.loader import YamlSafeLoader
def dump_yaml(obj: Any) -> str:
@@ -14,7 +17,14 @@ def dump_yaml(obj: Any) -> str:
str
"""
stream = io.StringIO()
yaml.dump(obj, stream)
yaml.dump( # nosec
obj,
stream,
default_flow_style=False,
allow_unicode=True,
sort_keys=False,
Dumper=YamlSafeDumper,
)
stream.seek(0)
return stream.read()
@@ -28,4 +38,4 @@ def load_yaml(yaml_stream: TextIO) -> Union[dict, list]:
Returns:
List[dict, list]
"""
return yaml.load(yaml_stream)
return yaml.load(yaml_stream, Loader=YamlSafeLoader) # nosec
-19
View File
@@ -1,19 +0,0 @@
from ruamel.yaml import YAML
from src.yaml_serializer.types import (
IncludedYaml,
IncludedYamlDir,
SecretValue,
)
yaml = YAML()
yaml.register_class(IncludedYaml)
yaml.register_class(SecretValue)
yaml.register_class(IncludedYamlDir)
yaml.constructor.add_constructor("!include", IncludedYaml.from_yaml)
yaml.constructor.add_constructor("!secret", SecretValue.from_yaml)
yaml.constructor.add_constructor("!env_var", IncludedYamlDir.from_yaml)
yaml.constructor.add_constructor("!include_dir_list", IncludedYamlDir.from_yaml)
yaml.constructor.add_constructor("!include_dir_merge_list", IncludedYamlDir.from_yaml)
yaml.constructor.add_constructor("!include_dir_named", IncludedYamlDir.from_yaml)
yaml.constructor.add_constructor("!include_dir_merge_named", IncludedYamlDir.from_yaml)
+16
View File
@@ -0,0 +1,16 @@
import yaml
from src.yaml_serializer.types import (
IncludedYaml,
IncludedYamlDir,
SecretValue,
)
class YamlSafeDumper(yaml.SafeDumper):
pass
YamlSafeDumper.add_representer(IncludedYaml, IncludedYaml.to_yaml) # type: ignore
YamlSafeDumper.add_representer(SecretValue, SecretValue.to_yaml) # type: ignore
YamlSafeDumper.add_representer(IncludedYamlDir, IncludedYamlDir.to_yaml) # type: ignore
+20
View File
@@ -0,0 +1,20 @@
import yaml
from src.yaml_serializer.types import (
IncludedYaml,
IncludedYamlDir,
SecretValue,
)
class YamlSafeLoader(yaml.SafeLoader):
pass
YamlSafeLoader.add_constructor("!include", IncludedYaml.from_yaml)
YamlSafeLoader.add_constructor("!secret", SecretValue.from_yaml)
YamlSafeLoader.add_constructor("!env_var", IncludedYamlDir.from_yaml)
YamlSafeLoader.add_constructor("!include_dir_list", IncludedYamlDir.from_yaml)
YamlSafeLoader.add_constructor("!include_dir_merge_list", IncludedYamlDir.from_yaml)
YamlSafeLoader.add_constructor("!include_dir_named", IncludedYamlDir.from_yaml)
YamlSafeLoader.add_constructor("!include_dir_merge_named", IncludedYamlDir.from_yaml)
+2 -2
View File
@@ -1,7 +1,7 @@
from typing import NamedTuple
from ruamel.yaml.nodes import Node
from ruamel.yaml.representer import BaseRepresenter
from yaml.nodes import Node
from yaml.representer import BaseRepresenter
class IncludedYaml(NamedTuple):
@@ -0,0 +1,77 @@
'1616887975473':
Type: HA
'1616888026264':
Type: HA
'1619371298367':
Room: Living
Type: Button
'1620239986670':
Room: Kitchen
Type: Button
'1620324780561':
Room: Kitchen
Type: Button
'1621352850204':
Room: Kitchen
Type: Button
'1622210698281':
Room: Kitchen
Type: Button
'1622769811245':
Room: Living
Type: Button
'1623430479201':
Room: Baby
Type: Button
'1623642118976':
Room: Baby
Type: Button
'1624640900951':
Room: Baby
Type: Button
'1628024070687':
Room: Baby
Type: Routine
'1628024123214':
Room: Baby
Type: Routine
'1628444671951':
Room: Office
Type: Window
'1629309267204':
Room: Balcony
Type: Door
'1629422438707':
Type: Routine
'1634497376234':
Room: Baby
Type: Button
'1635539262562':
Type: Routine
'1636428429596':
Type: Routine
'1639500650865':
Room: Bedroom
Type: Door
'1641617168123':
Type: Ensure Power
'1648071019802':
Type: Ensure Power
'1649426399020':
Room: Office
Type: Motion
'1649432254675':
Room: Baby
Type: Routine
'1649726828269':
Climate: Heat
Type: Climate
'1649727810678':
Climate: Time
Type: Climate
'1649820885714':
Type: Routine
'1649947692702':
BadOne: true
Room: Bedroom
Type: Button
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,2 @@
# empty configuration file
cloud:
@@ -1,77 +1,77 @@
0:
'1616887975473':
Type: HA
1:
'1616888026264':
Type: HA
2:
Type: Button
'1619371298367':
Room: Living
3:
Type: Button
'1620239986670':
Room: Kitchen
4:
Type: Button
'1620324780561':
Room: Kitchen
5:
Type: Button
'1621352850204':
Room: Kitchen
6:
Type: Button
'1622210698281':
Room: Kitchen
7:
Type: Button
'1622769811245':
Room: Living
8:
Type: Button
'1623430479201':
Room: Baby
9:
Type: Button
'1623642118976':
Room: Baby
10:
Type: Button
'1624640900951':
Room: Baby
Type: Button
'1628024070687':
Room: Baby
11:
Type: Routine
'1628024123214':
Room: Baby
12:
Type: Routine
Room: Baby
13:
'1628444671951':
Room: Office
Type: Window
Room: Office
14:
Type: Door
'1629309267204':
Room: Balcony
15:
Type: Routine
16:
Type: Button
Room: Baby
17:
Type: Routine
18:
Type: Routine
19:
Type: Door
Room: Bedroom
20:
Type: Ensure Power
21:
Type: Ensure Power
22:
Type: Motion
Room: Office
23:
'1629422438707':
Type: Routine
'1634497376234':
Room: Baby
24:
Type: Climate
Climate: Heat
25:
Type: Climate
Climate: Time
26:
Type: Routine
27:
Type: Button
'1635539262562':
Type: Routine
'1636428429596':
Type: Routine
'1639500650865':
Room: Bedroom
BadOne: yes
Type: Door
'1641617168123':
Type: Ensure Power
'1648071019802':
Type: Ensure Power
'1649426399020':
Room: Office
Type: Motion
'1649432254675':
Room: Baby
Type: Routine
'1649726828269':
Climate: Heat
Type: Climate
'1649727810678':
Climate: Time
Type: Climate
'1649820885714':
Type: Routine
'1649947692702':
BadOne: true
Room: Bedroom
Type: Button
+3 -3
View File
@@ -1,7 +1,7 @@
from unittest import TestCase
import yaml
from fastapi.testclient import TestClient
from ruamel.yaml import YAML
from src.api.app import make_app
from src.automations.types import (
@@ -151,7 +151,7 @@ class automation_update_tests(BaseTestCase):
)
self.assertEqual(resp.status_code, 200)
with (self.config_folder / "automations.yaml").open("r") as fp:
disk_data = dict(YAML().load(fp)[15])
disk_data = dict(yaml.safe_load(fp)[15])
trigger = list(map(dict, disk_data.pop("trigger")))
condition = disk_data.pop("condition")
action = list(map(dict, disk_data.pop("action")))
@@ -202,7 +202,7 @@ class automation_update_tests(BaseTestCase):
)
self.assertEqual(resp.status_code, 200)
with (self.config_folder / "automations.yaml").open("r") as fp:
disk_data = dict(YAML().load(fp)[27])
disk_data = dict(yaml.safe_load(fp)[27])
trigger = list(map(dict, disk_data.pop("trigger")))
condition = disk_data.pop("condition")
action = list(map(dict, disk_data.pop("action")))
@@ -100,3 +100,16 @@ class manager_tests(TestCase):
self.assertEqual(manager.get_total_items(), 3)
with self.assertRaises(FailedDeletion):
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,11 +1,6 @@
import json
from unittest import TestCase
from ruamel.yaml.scalarbool import ScalarBoolean
from ruamel.yaml.scalarfloat import ScalarFloat
from ruamel.yaml.scalarint import ScalarInt
from ruamel.yaml.scalarstring import ScalarString
from src.json_serializer import json_dumps
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
@@ -34,25 +29,3 @@ class json_serializer_tests(TestCase):
},
),
)
def test_convert_ruamel_types(self):
self.assertEqual(
json_dumps(
{
"int": ScalarInt(1),
"float": ScalarFloat(1.3),
"bool": ScalarBoolean(False),
"list": [1, ScalarString("w")],
"tup": (1, ScalarString("w")),
}
),
json.dumps(
{
"int": 1,
"float": 1.3,
"bool": 0,
"list": [1, "w"],
"tup": (1, "w"),
},
),
)
+28 -7
View File
@@ -19,21 +19,29 @@ class dumping_yamls_tests(TestCase):
)
}
)
self.assertEqual(yaml, "automations: !include automations.yaml\n")
self.assertEqual(yaml, "automations: !include 'automations.yaml'\n")
def test_dumping_secrets(self):
yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")})
self.assertEqual(yaml, "google_password: !secret gpass\n")
self.assertEqual(yaml, "google_password: !secret 'gpass'\n")
def test_dumping_stub(self):
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")})
self.assertEqual(yaml, "sensor: !include_dir_list sensors/*yaml\n")
self.assertEqual(yaml, "sensor: !include_dir_list 'sensors/*yaml'\n")
def test_load_stub(self):
yaml_obj = load_yaml(
io.StringIO(
"""
name: cool
date: "10:00"
bools:
- "yes"
- "no"
- true
- false
bobIsNull:
bobIsNull2: null
google_password: !secret gpass
sensor: !include_dir_list sensors/*yaml
automations: !include automations.yaml
@@ -44,6 +52,10 @@ class dumping_yamls_tests(TestCase):
dict(yaml_obj),
{
"name": "cool",
"date": "10:00",
"bools": ["yes", "no", True, False],
"bobIsNull": None,
"bobIsNull2": None,
"google_password": SecretValue("gpass", "n/a"),
"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"),
"automations": IncludedYaml("automations.yaml"),
@@ -51,8 +63,17 @@ class dumping_yamls_tests(TestCase):
)
self.assertEqual(
dump_yaml(yaml_obj),
"name: cool\n"
"google_password: !secret gpass\n"
"sensor: !include_dir_list sensors/*yaml\n"
f"automations: !include automations.yaml\n",
"""name: cool
date: '10:00'
bools:
- 'yes'
- 'no'
- true
- false
bobIsNull: null
bobIsNull2: null
google_password: !secret 'gpass'
sensor: !include_dir_list 'sensors/*yaml'
automations: !include 'automations.yaml'
""",
)
+1
View File
@@ -13,6 +13,7 @@ THIS_FOLDER = Path(__file__).parent
SAMPLES_FOLDER = THIS_FOLDER / "samples"
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
HA_CONFIG3_EXAMPLE = SAMPLES_FOLDER / "config-3"
def get_example_automation_loader(
+29
View File
@@ -0,0 +1,29 @@
import os
import yaml
from pathlib import Path
print(Path().absolute())
CONFIG_YAML = Path("config.yaml").absolute()
CHANGELOG_MD = Path("CHANGELOG.md").absolute()
print(CONFIG_YAML)
print(CHANGELOG_MD)
version = os.environ["VERSION"]
version_name = os.environ["NAME"]
change = os.environ["CHANGELOG"].splitlines()
config = yaml.load(CONFIG_YAML.read_text(), yaml.Loader)
changelog = CHANGELOG_MD.read_text().splitlines()
with CHANGELOG_MD.open("w") as fp:
for i, log in enumerate(changelog):
if i == 2:
fp.write(f"## [{version}] - {version_name}\n\n")
for clog in change:
fp.write(f"- {clog.strip()}\n")
fp.write(log.strip() + "\n")
CONFIG_YAML.write_text(yaml.dump(config))
+6 -7
View File
@@ -1,5 +1,5 @@
name: Shortumation
version: 0.1.7
version: v0.3.2
slug: shortumation
image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation"
@@ -16,16 +16,15 @@ init: false
ingress: true
ingress_port: 8000
ingress_entry: "web/"
panel_icon: mdi:home-automation
hassio_role: manager
privileged:
- SYS_RAWIO
host_network: false
homeassistant_api: true
auth_api: true
panel_icon: mdi:home-automation
hassio_role: homeassistant
host_network: false
map:
- config:rw
options: {}
ports:
8000/tcp: 8000
8000/tcp:
ports_description:
8000/tcp: Main port for the API & Web.
+3 -2
View File
@@ -1,9 +1,10 @@
version: '3'
services:
addon:
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-latest}"
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
build:
context: "./"
dockerfile: "./Dockerfile"
args:
- BUILD_ARCH=${ARCH:-amd64}
BUILD_ARCH: ${ARCH:-amd64}
BUILD_VERSION: ${BUILD_TAG:-edge}
+3
View File
@@ -3,5 +3,8 @@ services:
addon:
volumes:
- "./sample_config:/config"
- "./api/tests:/app/tests"
ports:
- "8000:8000"
env_file:
- api/.env
+24
View File
@@ -0,0 +1,24 @@
#!/bin/bash
set -e
api_location=${1}
# web_location=${2}
function install_yarn() {
pushd $web_location
yarn
yarn build
cp -r $web_location/build $api_location/web
popd
}
function install_py() {
pushd $api_location
pip install . $api_location
popd
}
install_py
# install_yarn
echo "DONE BUILD"
+18
View File
@@ -0,0 +1,18 @@
#!/bin/bash
set -e
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
}
function prep_py() {
pip install -U wheel setuptools pip Cython
}
prep_py
# prep_yarn
echo "DONE PREP"
+10
View File
@@ -0,0 +1,10 @@
#!/bin/bash
api_location=${1}
pushd $api_location
echo "--------------------"
echo "BUILD_VERSION = "$BUILD_VERSION
echo $(python --version)
echo "--------------------"
python -m hypercorn src.app:app -b "0.0.0.0:8000"
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+11
View File
@@ -0,0 +1,11 @@
{
"extends": ["config:base"],
"schedule": ["every month"],
"packageRules": [
{
"matchDepTypes": ["devDependencies"],
"matchUpdateTypes": ["patch", "minor"],
"groupName": "devDependencies (non-major)"
}
]
}
-4
View File
@@ -1,4 +0,0 @@
#!/bin/bash
echo $(python --version)
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
+1 -1
View File
@@ -1,5 +1,5 @@
0:
Type: Generic
Type: Generic2
1:
Type: Generic
2:
+1 -1
View File
@@ -1 +1 @@
SKIP_PREFLIGHT_CHECK=true
SKIP_PREFLIGHT_CHECK=true
+7 -1
View File
@@ -1,4 +1,7 @@
module.exports = {
'core': {
builder: 'webpack5'
},
"stories": [
"../src/**/*.stories.mdx",
"../src/**/*.stories.@(js|jsx|ts|tsx)"
@@ -8,5 +11,8 @@ module.exports = {
"@storybook/addon-essentials",
"@storybook/preset-create-react-app",
"@storybook/addon-queryparams",
]
],
"features": {
"emotionAlias": false,
},
}
+6 -13
View File
@@ -2,24 +2,17 @@
"version": "0.2.0",
"configurations": [
{
"name": "Debug CRA Tests",
"name": "Debug Jest Tests",
"type": "node",
"request": "launch",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts",
"args": [
"test",
"--runInBand",
"--no-cache",
"--watchAll=false"
"runtimeArgs": [
"--inspect-brk",
"${workspaceRoot}/node_modules/.bin/jest",
"--runInBand"
],
"cwd": "${workspaceRoot}",
"protocol": "inspector",
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"env": {
"CI": "true"
},
"disableOptimisticBPs": true
"port": 9229
}
]
}
+59
View File
@@ -0,0 +1,59 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "tsc",
"problemMatcher": [],
"label": "npm: tsc",
"detail": "tsc -w",
"presentation": {
"reveal": "always",
"panel": "shared"
},
"runOptions": {
"runOn": "folderOpen"
},
"group": "test"
},
{
"type": "npm",
"script": "test",
"problemMatcher": [],
"label": "npm: test",
"detail": "test",
"presentation": {
"reveal": "always",
"panel": "shared"
},
"runOptions": {
"runOn": "folderOpen"
},
"group": "test",
},
{
"type": "npm",
"script": "storybook",
"problemMatcher": [],
"label": "npm: storybook",
"detail": "start-storybook -p 6006 -s public",
"promptOnClose": true
},
{
"type": "npm",
"script": "build",
"problemMatcher": [],
"label": "npm: build",
"detail": "react-scripts build",
"group": "build"
},
{
"type": "npm",
"script": "start",
"problemMatcher": [],
"label": "npm: start",
"detail": "react-scripts start",
"promptOnClose": true
},
]
}
+50 -31
View File
@@ -4,22 +4,36 @@
"private": true,
"homepage": ".",
"dependencies": {
"@types/jest": "^26.0.15",
"@types/node": "^12.0.0",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"jss": "^10.8.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-flow-renderer": "^10.1.2",
"react-jss": "^10.8.2",
"react-router-dom": "6",
"react-scripts": "4.0.3",
"superstruct": "^0.15.4",
"theming": "^3.3.0",
"typescript": "^4.1.2",
"web-vitals": "^1.0.1",
"yarn": "^1.22.17"
"@emotion/react": "11.9.3",
"@emotion/styled": "11.9.3",
"@mui/icons-material": "5.8.4",
"@mui/material": "5.8.6",
"@mui/styles": "5.8.6",
"@types/jest": "28.1.5",
"@types/node": "17.0.36",
"@types/react": "18.0.15",
"@types/react-dom": "18.0.6",
"@types/ws": "8.5.3",
"@uiw/react-codemirror": "4.10.4",
"autosuggest-highlight": "3.3.2",
"home-assistant-js-websocket": "7.1.0",
"jss": "10.9.0",
"material-ui-confirm": "3.0.4",
"notistack": "2.0.5",
"react": "18.2.0",
"react-cookie": "4.1.1",
"react-dom": "18.2.0",
"react-flow-renderer": "10.3.8",
"react-imask": "6.4.2",
"react-jss": "10.9.0",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1",
"superstruct": "0.16.0",
"theming": "3.3.0",
"typescript": "4.7.4",
"web-vitals": "2.1.4",
"ws": "8.8.0",
"yarn": "1.22.19"
},
"scripts": {
"start": "react-scripts start",
@@ -62,23 +76,28 @@
]
},
"devDependencies": {
"@storybook/addon-actions": "^6.4.22",
"@storybook/addon-essentials": "^6.4.22",
"@storybook/addon-links": "^6.4.22",
"@storybook/addon-queryparams": "^6.2.9",
"@storybook/node-logger": "^6.4.22",
"@storybook/preset-create-react-app": "^3.2.0",
"@storybook/react": "^6.4.22",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"@types/chroma-js": "^2.1.3",
"@types/js-yaml": "^4.0.5",
"jest-environment-jsdom": "^27.5.1",
"ts-node": "^10.4.0"
"@storybook/addon-actions": "6.5.9",
"@storybook/addon-essentials": "6.5.9",
"@storybook/addon-links": "6.5.9",
"@storybook/addon-queryparams": "6.2.9",
"@storybook/builder-webpack5": "6.5.9",
"@storybook/manager-webpack5": "6.5.9",
"@storybook/node-logger": "6.5.9",
"@storybook/preset-create-react-app": "4.1.2",
"@storybook/react": "6.5.9",
"@testing-library/jest-dom": "5.16.4",
"@testing-library/react": "13.3.0",
"@testing-library/user-event": "14.2.1",
"@types/autosuggest-highlight": "3.2.0",
"@types/chroma-js": "2.1.3",
"@types/js-yaml": "4.0.5",
"jest-environment-jsdom": "28.1.2",
"ts-node": "10.8.2",
"webpack": "5.73.0",
"webpack-dev-server": "4.9.3"
},
"moduleDirectories": [
"node_modules",
"src"
]
}
}
+9 -5
View File
@@ -3,17 +3,21 @@ import { Routes, Route, BrowserRouter } from "react-router-dom";
import { AutomationRoute } from 'routes/automation';
import { useConnectedApiService } from 'apiService';
import { ErrorBoundary } from 'components/ErrorBoundary';
import { CookiesProvider } from "react-cookie";
function App() {
const api = useConnectedApiService();
return (
<div className="app">
<ErrorBoundary>
<BrowserRouter>
<Routes>
<Route path="*" element={<AutomationRoute api={api} />} />
</Routes>
</BrowserRouter>
<CookiesProvider>
<BrowserRouter>
<Routes>
<Route path="*" element={<AutomationRoute api={api} />} />
</Routes>
</BrowserRouter>
</CookiesProvider>
</ErrorBoundary>
</div>
);
+29 -11
View File
@@ -1,27 +1,46 @@
import { AutomationData } from "types/automations";
import { API } from "./base";
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) => ({
async list({ offset, limit }: ListParams) {
const data = await api.makeCall<ListData<AutomationData>, ListParams>({
path: AUTOMTAION_LIST,
data: {
offset, limit,
}
offset,
limit,
},
});
return data;
},
async update({ index, auto }: { index: number, auto: AutomationData }) {
async update({ index, auto }: { index: number; auto: AutomationData }) {
return await api.makeCall({
path: AUTOMTAION_ITEM,
data: {
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 }) {
return await api.makeCall({
@@ -29,10 +48,9 @@ export const makeAutomationAPI = (api: API) => ({
path: AUTOMTAION_ITEM,
data: {
index,
}
})
}
},
});
},
});
export type AutomationAPI = ReturnType<typeof makeAutomationAPI>;
+6 -3
View File
@@ -10,13 +10,16 @@ export const makeRemoteAPI = (baseURL: string): API => ({
data = {}
}) {
try {
const reply = await fetch(baseURL + path, {
const payload: RequestInit = {
method,
headers: {
"Content-Type": "application/json"
},
body: JSON.stringify(data),
});
};
if (method !== 'GET') {
payload["body"] = JSON.stringify(data);
}
const reply = await fetch(baseURL + path, payload);
let response: APIResponse<any>;
if (reply.status === 200) {
response = {
+12 -10
View File
@@ -1,15 +1,16 @@
import { useEffect } from 'react';
import { useDefaultApiState, makeReloadAutomations } from './util';
import { AutomationAPI } from './automations';
import { useEffect } from "react";
import { useDefaultApiState, makeReloadAutomations } from "./util";
import { AutomationAPI } from "./automations";
export type ApiService = ReturnType<typeof useAPIService>;
export const useAPIService = (
automationAPI: AutomationAPI
) => {
export const useAPIService = (automationAPI: AutomationAPI) => {
// state
const [state, setState] = useDefaultApiState();
const { reload, wrapCall } = makeReloadAutomations(automationAPI, state, setState);
const { reload, wrapCall } = makeReloadAutomations(
automationAPI,
state,
setState
);
// initial load of autos
useEffect(() => {
@@ -21,5 +22,6 @@ export const useAPIService = (
state,
removeAutomation: wrapCall(automationAPI.remove),
updateAutomation: wrapCall(automationAPI.update),
}
}
updateTags: wrapCall(automationAPI.updateTags),
};
};
+11 -7
View File
@@ -4,14 +4,18 @@ import { makeRemoteAPI } from "./base";
import { useAPIService } from './core';
import { useMockAPI } from "./mock";
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
const locationPrefixWeb = window.location.pathname.match(/(\/.+\/)web/i);
const baseURL = new URL(
process.env.NODE_ENV === 'development' ?
`http://${window.location.hostname}:8000` :
window.location.origin + (!locationPrefixWeb ? '' : locationPrefixWeb[1])
);
export const wsURL = baseURL + "socket"
export const remoteAutoAPI = makeRemoteAPI(
baseURL + "automations"
);
export const useConnectedApiService = () => useAPIService(
makeAutomationAPI(makeRemoteAPI(
process.env.NODE_ENV === 'development' ?
"http://localhost:8000/automations" :
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
))
makeAutomationAPI(remoteAutoAPI)
);
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
makeAutomationAPI(useMockAPI(initialAutos))
+64 -28
View File
@@ -1,57 +1,93 @@
import { useMockAPI } from "./mock"
import { useMockAPI } from "./mock";
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 });
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 data = await mockApi.list({ limit: 10, offset: 0 });
expect(data.ok).toBe(true);
expect((data as any).data.data).toHaveLength(0);
expect((data as any).data.totalItems).toBe(0);
})
});
test('mock api uses initial autos for initial population -- some data', async () => {
const initials = [
createMockAuto(),
createMockAuto()
];
test("mock api uses initial autos for initial population -- some data", async () => {
const initials = [createMockAuto(), createMockAuto()];
const mockApi = makeAutomationAPI(useMockAPI(initials, fakeUseRef as any));
const data = await mockApi.list({ limit: 10, offset: 0 });
expect(data.ok).toBe(true);
expect((data as any).data.data).toHaveLength(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));
await mockApi.update({index: 0, auto: createMockAuto()})
await mockApi.update({ index: 0, auto: createMockAuto() });
let data = await mockApi.list({ limit: 10, offset: 0 });
expect(data.ok).toBe(true);
expect((data as any).data.data).toHaveLength(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 });
expect((data as any).data.data).toHaveLength(2);
expect((data as any).data.totalItems).toBe(2);
})
});
test('delete/update data 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;
test("delete/update data 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;
const toBeEdited = data[0];
toBeEdited.metadata.alias = "Bob is my uncle";
await mockApi.update({index: 0, auto: toBeEdited})
data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data;
await mockApi.update({ index: 0, auto: toBeEdited });
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
expect(data[0].metadata.alias).toEqual("Bob is my uncle");
await mockApi.remove({index: 0})
data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data;
await mockApi.remove({ index: 0 });
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
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",
});
});
+45 -28
View File
@@ -1,33 +1,34 @@
import { useRef } from 'react';
import { AutomationData } from 'types/automations';
import { API } from './base';
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
import { useRef } from "react";
import { AutomationData } from "types/automations";
import { API } from "./base";
import {
AUTOMTAION_LIST,
AUTOMTAION_ITEM,
AUTOMTAION_ITEM_TAGS,
} from "./paths";
export const useMockAPI = (
initialAutos: AutomationData[] = [],
makeRef = useRef,
makeRef = useRef
): API => {
const automationsRef = makeRef(initialAutos);
return {
async makeCall({
path,
method = "POST",
data = {}
}) {
console.debug("[[mockCall]]", method, path, data);
async makeCall({ path, method = "POST", data = {} }) {
// console.debug("[[mockCall]]", method, path, data);
if (path === AUTOMTAION_LIST) {
return {
ok: true,
data: JSON.parse(JSON.stringify({
totalItems: automationsRef.current.length,
params: { offset: 0, limit: 100 },
data: automationsRef.current,
}))
} as any
data: JSON.parse(
JSON.stringify({
totalItems: automationsRef.current.length,
params: { offset: 0, limit: 100 },
data: automationsRef.current,
})
),
} as any;
}
if (path === AUTOMTAION_ITEM) {
if (method === 'POST') {
if (method === "POST") {
const { index, data: auto } = data as any;
if (index >= automationsRef.current.length) {
automationsRef.current = [...automationsRef.current, auto];
@@ -35,29 +36,45 @@ export const useMockAPI = (
automationsRef.current = [
...automationsRef.current.slice(0, index),
auto,
...automationsRef.current.slice(index + 1)
...automationsRef.current.slice(index + 1),
];
}
return {
ok: true,
data: {}
}
data: {},
};
} else if (method === "DELETE") {
const { index } = data as any;
automationsRef.current = [
...automationsRef.current.slice(0, index),
...automationsRef.current.slice(index + 1)
...automationsRef.current.slice(index + 1),
];
return {
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 {
ok: false,
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_ITEM = `${AUTOMTAION_ROOT}item` as const;
export const AUTOMTAION_ITEM_TAGS = `${AUTOMTAION_ITEM}/tags` as const;
+1 -1
View File
@@ -7,7 +7,7 @@ export interface ListParams {
}
export type APIRequest<D> = {
path: string;
method?: "POST" | "DELETE",
method?: "POST" | "DELETE" | "GET",
data?: D;
};
+19 -21
View File
@@ -1,42 +1,40 @@
import { useState } from "react";
import { ApiState } from "./types";
import { AutomationAPI } from './automations';
import { AutomationAPI } from "./automations";
export const useDefaultApiState = () => useState<ApiState>({
automations: {ready: false},
});
export const useDefaultApiState = () =>
useState<ApiState>({
automations: { ready: false },
});
export const makeReloadAutomations = (
automationAPI: AutomationAPI,
state: ApiState,
setState: (s: ApiState) => void,
setState: (s: ApiState) => void
) => {
const reload = async () => {
let params = { offset: 0, limit: 100 };
let params = { offset: 0, limit: 10000 };
if (state.automations.ready && state.automations.ok) {
params = state.automations.data.params
params = state.automations.data.params;
}
const resp = await automationAPI.list(params);
setState({
...state, automations: {
ready: true,
...resp,
}
...state,
automations: {
ready: true,
...resp,
},
});
}
const wrapCall = <
Call extends (a: any) => Promise<any>
>(fcn: Call) => {
};
const wrapCall = <Call extends (a: any) => Promise<any>>(fcn: Call) => {
return async (args: Parameters<Call>[0]): Promise<ReturnType<Call>> => {
const resp = await fcn(args);
await reload();
return resp;
}
}
};
};
return {
reload,
wrapCall,
}
}
};
};
@@ -1,39 +1,31 @@
.automation-editor--info-box {
height: 100%;
padding-left: 10px;
padding-right: 10px;
display: flex;
flex-direction: column;
justify-content: flex-start;
overflow: hidden;
position: relative;
align-items: center;
gap: 0.5em;
}
.automation-editor--info-box-inner {
height: 100%;
max-width: 95vw;
max-height: 90vh;
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 {
padding: 0.25em 0.75em 1em 0.75em;
border-color: var(--primary-accent);
border-color: var(--mui-grey-400);
border-width: 1px;
border-style: ridge;
border-radius: 5px;
}
.automation-editor--info-box--tag-list {
max-height: 30vh;
overflow-y: scroll;
padding-left: 0.25em;
padding-right: 0.25em;
}
.automation-editor--info-box--tags>h1 {
font-size: 1.5em;
}
@@ -49,6 +41,7 @@
.automation-editor--info-box--tag>div {
margin: 0;
flex: 1;
}
.automation-editor--info-box--tag>div>input {
@@ -56,29 +49,11 @@
padding: 1em 0.25em 0.2em 0.25em;
}
.automation-editor--info-box--tag>button {
height: 1.25em;
width: 1.25em;
.automation-editor--info-box--tag--trash, .automation-editor--info-box--tag--add {
height: 2em;
width: 2em;
font-size: 1em;
display: flex;
justify-content: center;
align-items: center;
}
.automation-editor--info-box--tag--error {
width: 100%;
display: flex;
justify-content: center;
padding: 0;
}
.automation-editor--info-box--tag--error.hide {
height: 0;
opacity: 0;
display: none;
}
.automation-editor--info-box--tag--error.show {
height: fit-content;
opacity: 1;
}
@@ -1,30 +1,35 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { makeTagDB } from "components/AutomationList/TagDB";
import { Page } from "components/Page";
import { useState } from "react";
import { AutoInfoBox } from "./AutoInfoBox";
import { defaultAutomation } from "utils/defaults";
export default {
title: 'App/AutomationList/Editor/InfoBox',
title: "App/AutomationList/Editor/InfoBox",
component: AutoInfoBox,
parameters: { actions: { argTypesRegex: '^on.*' } },
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
tagDB: makeTagDB([defaultAutomation("test")]),
},
} as ComponentMeta<typeof AutoInfoBox>;
export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
const [[metadata, tags], setState] = useState([args.metadata, args.tags])
export const NoTags: ComponentStory<typeof AutoInfoBox> = (args) => {
const [[metadata, tags], setState] = useState([args.metadata, args.tags]);
return (
<div className="page">
<Page>
<AutoInfoBox
className=""
{...args}
metadata={metadata}
tags={tags}
onUpdate={(m, t) => {
args.onUpdate(m, t)
setState([m, t])
args.onUpdate(m, t);
setState([m, t]);
}}
/>
</div>
)
}
</Page>
);
};
NoTags.args = {
...NoTags.args,
tags: [],
@@ -33,13 +38,13 @@ NoTags.args = {
alias: "Random",
description: "Example Metadata",
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,
tags: [
@@ -51,8 +56,8 @@ SomeTags.args = {
alias: "Bathroom Vent",
description: "Turn the vent when the humidity is high",
trigger_variables: {
'wowo': '!'
wowo: "!",
},
mode: 'single',
mode: "single",
},
}
};
@@ -2,118 +2,175 @@ import "./AutoInfoBox.css";
import { AutomationMetadata } from "types/automations";
import { InputList } from "components/Inputs/InputList";
import InputText from "components/Inputs/InputText";
import InputTextArea from "components/Inputs/InputTextArea";
import { FC, useRef, useState } from 'react';
import { FC, ReactNode, useRef, useState } from "react";
import { AddIcon, TrashIcon } from "components/Icons";
import { Button } from "components/Inputs/Button";
import InputAutoText from "components/Inputs/InputAutoText";
import { TagDB } from "components/AutomationList/TagDB";
import { ButtonIcon } from "components/Icons/ButtonIcons";
interface Props {
className: string;
metadata: AutomationMetadata;
tags: Array<[string, string]>;
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
tagDB: TagDB;
children?: ReactNode;
}
export const AutoInfoBox: FC<Props> = ({
metadata,
tags,
onUpdate,
className,
children,
tagDB,
}) => {
// state
const [newTag, setNewTag] = useState<[string, string]>(["", ""])
const [[errorIndex, error], _setError] = useState<[number | 'new', string]>([-1, ""]);
const [newTag, setNewTag] = useState<[string, string]>(["", ""]);
const [[errorIndex, error], _setError] = useState<[number | "new", string]>([
-1,
"",
]);
const errorTimeoutId = useRef(-1);
// aliases
const setError = (index: number | 'new', msg: string) => {
_setError([index, msg])
const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n));
const setError = (index: number | "new", msg: string) => {
_setError([index, msg]);
if (errorTimeoutId.current >= 0) {
window.clearTimeout(errorTimeoutId.current);
}
errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000);
}
const onUpdateMetadata = <K extends keyof AutomationMetadata>(k: K) => (update: AutomationMetadata[K]) => onUpdate({
...metadata,
[k]: update
}, tags);
};
const onUpdateMetadata =
<K extends keyof AutomationMetadata>(k: K) =>
(update: AutomationMetadata[K]) =>
onUpdate(
{
...metadata,
[k]: update,
},
tags
);
const validTagName = (newName: string): string | undefined => {
if (newName.length <= 0) {
return "Name must be at least 1 character long"
return "Name must be at least 1 character long";
}
// eslint-disable-next-line
for (const [name, _] of tags) {
if (name.trim() === newName.trim()) {
return `The tag '${name}' already exists`
return `The tag '${name}' already exists`;
}
}
}
};
const updateTagName = (newName: string, tagIndex: number) => {
const error = validTagName(newName);
if (error) {
return setError(tagIndex, error)
return setError(tagIndex, error);
}
onUpdate(metadata, [
...tags.slice(0, tagIndex),
[newName, tags[tagIndex][1]],
...tags.slice(tagIndex + 1),
])
}
const onUpdateTags = (tagValue: string, tagIndex: number) => onUpdate(metadata, [
...tags.slice(0, tagIndex),
[tags[tagIndex][0], tagValue],
...tags.slice(tagIndex + 1),
])
]);
};
const onUpdateTags = (tagValue: string, tagIndex: number) =>
onUpdate(metadata, [
...tags.slice(0, tagIndex),
[tags[tagIndex][0], tagValue],
...tags.slice(tagIndex + 1),
]);
const addNewTag = () => {
const error = validTagName(newTag[0]);
if (error) {
return setError('new', error)
return setError("new", error);
}
onUpdate(metadata, tags.concat([newTag]));
setNewTag(['', '']);
}
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [
...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1),
])
onUpdate(
metadata,
tags.concat([newTag.map((x) => x.trim()) as [string, string]])
);
setNewTag(["", ""]);
};
const onRemoveTag = (tagIndex: number) =>
onUpdate(metadata, [
...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1),
]);
// render
return <div className={`automation-editor--info-box ${className}`}>
<div className="automation-editor--info-box-inner">
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} />
<InputText label="Name" value={metadata.alias} onChange={onUpdateMetadata('alias')} />
<InputTextArea label="Description" value={metadata.description} onChange={onUpdateMetadata('description')} />
<InputList
label="Mode"
current={metadata.mode}
onChange={onUpdateMetadata('mode')}
options={[
'parallel',
'single',
'queued',
'restart'
]}
/>
<div className="automation-editor--info-box--tags">
<h1>Tags</h1>
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag">
<Button onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button>
<InputText value={tagName} label="Name" onChange={v => updateTagName(v, tagIndex)} />
<InputText value={tagValue} label="Tag" onChange={v => onUpdateTags(v, tagIndex)} />
<span className={["automation-editor--info-box--tag--error", (errorIndex === tagIndex) ? "show" : "hide"].join(" ")}>
{error}
</span>
</div>)}
<hr />
<div className="automation-editor--info-box--tag">
<InputText value={newTag[0]} label="Name" onChange={v => setNewTag([v, newTag[1]])} onEnter={addNewTag} />
<InputText value={newTag[1]} label="Tag" onChange={v => setNewTag([newTag[0], v])} onEnter={addNewTag} />
<Button onClick={addNewTag} ><AddIcon /></Button>
<span className={["automation-editor--info-box--tag--error", (errorIndex === 'new') ? "show" : "hide"].join(" ")}>
{error}
</span>
return (
<div className="automation-editor--info-box">
<div className="automation-editor--info-box-inner">
<InputText
label="ID"
value={metadata.id}
onChange={onUpdateMetadata("id")}
/>
<InputText
label="Name"
value={metadata.alias ?? ""}
onChange={onUpdateMetadata("alias")}
/>
<InputText
multiline
label="Description"
value={metadata.description ?? ""}
onChange={onUpdateMetadata("description")}
/>
<InputList
label="Mode"
current={metadata.mode}
onChange={onUpdateMetadata("mode")}
options={["parallel", "single", "queued", "restart"]}
/>
<div className="automation-editor--info-box--tags">
<h1>Tags</h1>
<div className="automation-editor--info-box--tag-list">
{tags.map(([tagName, tagValue], tagIndex) => (
<div key={tagIndex} className="automation-editor--info-box--tag">
<InputAutoText
value={tagName}
label="Name"
onChange={(v) => updateTagName(v, tagIndex)}
options={foundNewTagNames}
error={errorIndex === tagIndex ? error : undefined}
/>
<InputAutoText
value={tagValue}
label="Tag"
onChange={(v) => onUpdateTags(v, tagIndex)}
options={tagDB.getTagValues(tagName)}
error={errorIndex === tagIndex ? error : undefined}
/>
<ButtonIcon
className="automation-editor--info-box--tag--trash"
onClick={() => onRemoveTag(tagIndex)}
icon={<TrashIcon />}
/>
</div>
))}
</div>
<hr />
<div className="automation-editor--info-box--tag">
<InputAutoText
value={newTag[0]}
label="Name"
onChange={(v) => setNewTag([v, newTag[1]])}
options={foundNewTagNames}
error={errorIndex === "new" ? error : undefined}
/>
<InputAutoText
value={newTag[1]}
label="Tag"
onChange={(v) => setNewTag([newTag[0], v])}
options={tagDB.getTagValues(newTag[0])}
error={errorIndex === "new" ? error : undefined}
/>
<ButtonIcon
className="automation-editor--info-box--tag--add"
onClick={addNewTag}
icon={<AddIcon />}
/>
</div>
</div>
</div>
{children}
</div>
{children}
</div>
}
);
};
@@ -1,5 +1,6 @@
.automation-editor {
display: flex;
position: relative;
flex-direction: row;
width: 100%;
height: 100%;
@@ -9,6 +10,8 @@
display: flex;
flex-direction: column;
padding: 1em;
overflow: scroll;
height: 100%;
}
.automation-editor--flow-wrapper {
@@ -25,18 +28,55 @@
.automation-editor--flow-wrapper--toolbar {
display: flex;
flex-direction: row;
justify-content: flex-end;
gap: 0.25em;
justify-content: space-between;
margin-top: 0.25em;
}
.automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
height: 0;
opacity: 0;
.automation-editor--flow-wrapper--toolbar--title {
display: flex;
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.changed>.automation-editor--flow-wrapper--toolbar * {
border-color: var(--change);
color: var(--change)
.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);
}
@@ -47,13 +87,13 @@
padding: 0.25em;
}
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--flow {
border-color: var(--change);
.automation-editor--flow-wrapper.changed>.dag-graphboard {
border-color: var(--mui-success-light);
}
.automation-editor--flow-wrapper--flow {
.dag-graphboard {
flex: 1;
border: 1px solid var(--secondary-accent);
border: 1px solid var(--mui-grey-700);
margin: 0 0 0.5em 0;
z-index: 1;
}
@@ -62,14 +102,29 @@
position: relative;
}
.automation-editor--info-box--icon {
.automation-editor.loading .mock-list {
position: absolute;
right: 0em;
bottom: 0.5em;
z-index: 10;
left: 0;
width: 40%;
height: 100%;
}
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
transform: rotate(180deg);
z-index: 2;
.automation-editor.loading .mock-graph {
position: absolute;
left: 40%;
width: 60%;
height: 100%;
}
.automation-editor .linear-loader {
position: absolute;
top: 0;
left: 0;
width: 100%;
}
.automation-editor--info-box--buttons {
display: flex;
gap: 1em;
}
@@ -1,97 +1,100 @@
import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { AutomationEditor } from './index';
import { useState } from 'react';
import * as dgconst from 'components/DAGSvgs/constants';
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { AutomationEditor } from "./index";
import { useState } from "react";
import { Page } from "components/Page";
import { makeTagDB } from "components/AutomationList/TagDB";
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
export default {
title: 'App/AutomationList/Editor',
title: "App/AutomationList/Editor",
component: AutomationEditor,
parameters: { actions: { argTypesRegex: '^on.*' } },
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
dims: dgconst.DEFAULT_DIMS
}
} as ComponentMeta<typeof AutomationEditor>
dims: DEFAULT_DIMS,
},
} as ComponentMeta<typeof AutomationEditor>;
const Template: ComponentStory<typeof AutomationEditor> = args => {
const [state, setState] = useState(args.automation)
return <div className="page">
<AutomationEditor
{...args}
automation={state}
onUpdate={s => {
window.setTimeout(() => setState(s), 3000)
}}
/>
</div>
}
const Template: ComponentStory<typeof AutomationEditor> = (args) => {
const [state, setState] = useState(args.automation);
return (
<Page>
<AutomationEditor
{...args}
tagDB={makeTagDB(state ? [state] : [])}
automation={state}
onUpdate={(s) => {
window.setTimeout(() => setState(s), 3000);
}}
/>
</Page>
);
};
export const Loading = Template.bind({});
export const Simple = Template.bind({})
export const Simple = Template.bind({});
Simple.args = {
...Simple.args,
automation: {
condition: [],
tags: {
"Room": "Bathroom",
"For": "Toliet",
"Type": "Smell",
"Use": "Flushing"
Room: "Bathroom",
For: "Toliet",
Type: "Smell",
Use: "Flushing",
},
metadata: {
id: "random",
id:
"random" + String(Date.now()) + String(Date.now()) + String(Date.now()),
alias: "Random",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
wowo: "!",
},
mode: 'single',
mode: "single",
},
trigger: [
{
"platform": "numeric_state",
"entity_id": "test",
platform: "numeric_state",
entity_id: "test",
},
{
"platform": "homeassistant",
"event": "start",
}
platform: "homeassistant",
event: "start",
},
],
sequence: [
{
condition: 'and',
condition: "and",
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.temperature_kitchen',
below: '15',
condition: "numeric_state",
entity_id: "sensor.temperature_kitchen",
below: "15",
},
{
condition: 'template',
value_template: 'states(switch.kitchen_light) == "on"'
}
]
condition: "template",
value_template: 'states(switch.kitchen_light) == "on"',
},
],
},
{
alias: "Start Music In Kitchen",
service: 'media_player.play_media',
service: "media_player.play_media",
target: {
entity_id: "media_player.kitchen_dot"
entity_id: "media_player.kitchen_dot",
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
}
]
}
}
},
},
],
},
};
export const EmptyStart = Template.bind({})
export const EmptyStart = Template.bind({});
EmptyStart.args = {
...EmptyStart.args,
automation: {
@@ -102,31 +105,28 @@ EmptyStart.args = {
alias: "Random",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
wowo: "!",
},
mode: 'single',
mode: "single",
},
trigger: [
],
sequence: []
}
}
trigger: [],
sequence: [],
},
};
export const BadAutomationInvalidMetadata = Template.bind({})
export const BadAutomationInvalidMetadata = Template.bind({});
BadAutomationInvalidMetadata.args = {
...BadAutomationInvalidMetadata.args,
automation: {
condition: [],
tags: {},
metadata: {
} as any,
trigger: [
],
sequence: []
}
}
metadata: {} as any,
trigger: [],
sequence: [],
},
};
export const BadAutomationInvalidTriggers = Template.bind({})
export const BadAutomationInvalidTriggers = Template.bind({});
BadAutomationInvalidTriggers.args = {
...BadAutomationInvalidTriggers.args,
automation: {
@@ -137,18 +137,16 @@ BadAutomationInvalidTriggers.args = {
alias: "Random",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
wowo: "!",
},
mode: 'single',
mode: "single",
},
trigger: [
"haha I am a string"
] as any,
sequence: []
}
}
trigger: ["haha I am a string"] as any,
sequence: [],
},
};
export const BadAutomationInvalidSequence = Template.bind({})
export const BadAutomationInvalidSequence = Template.bind({});
BadAutomationInvalidSequence.args = {
...BadAutomationInvalidSequence.args,
automation: {
@@ -159,15 +157,89 @@ BadAutomationInvalidSequence.args = {
alias: "Bad Choose Sequence",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
wowo: "!",
},
mode: 'single',
mode: "single",
},
trigger: [],
sequence: [
{
choose: {}
}
] as any
}
}
choose: {},
},
] as any,
},
};
export const RepeatExample = Template.bind({});
RepeatExample.args = {
...RepeatExample.args,
automation: {
metadata: {
id: "1654976151462",
alias: "Get out of baby room",
description: "",
mode: "single",
},
trigger: [
{
type: "opened",
platform: "device",
device_id: "9b33663d2700da8efe0c31c946448f77",
entity_id: "binary_sensor.door_baby",
domain: "binary_sensor",
},
],
condition: [],
sequence: [
{
service: "notify.mobile_app_levas_phone",
data: {
message: "Someone is in Korie’s room!!!",
},
},
{
repeat: {
while: [
{
type: "is_open",
condition: "device",
device_id: "9b33663d2700da8efe0c31c946448f77",
entity_id: "binary_sensor.door_baby",
domain: "binary_sensor",
},
],
sequence: [
{
service: "notify.alexa_media",
data: {
message:
"Get the fuck out of the baby’s bedroom you sick fuck! This room belongs to Korie! Close the door! I said close. The. Door!",
data: null,
type: "tts",
target: "media_player.baby_bedroom_dot",
},
},
{
delay: {
hours: 0,
minutes: 0,
seconds: 7,
milliseconds: 0,
},
},
],
},
},
{
service: "light.turn_off",
target: {
entity_id: ["light.switch_baby"],
},
data: {
flash: "short",
},
},
],
tags: {},
},
};
+256 -104
View File
@@ -1,25 +1,36 @@
import "./index.css";
import { ArrowIcon, CheckMarkIcon } from "components/Icons";
import Icon from "@mui/material/Icon";
import { CheckMarkIcon } from "components/Icons";
import { FC, useState } from "react";
import { AutomationData } from "types/automations";
import { Modal } from "components/Modal";
import { AutoInfoBox } from "./AutoInfoBox";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import ModeEditOutlineTwoToneIcon from "@mui/icons-material/ModeEditOutlineTwoTone";
import { Button } from "components/Inputs/Button";
import { useAutomatioEditorState, EditorData } from './state';
import { SafeDAGAutomationFlow } from "components/DAGFlow/safe";
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
import { MiniFailure } from 'types/validators/helper';
import { useAutomatioEditorState, EditorData } from "./state";
import { MiniFailure } from "types/validators/helper";
import InputYaml from "components/Inputs/InputYaml";
import { TagDB } from "components/AutomationList/TagDB";
import Skeleton from "@mui/material/Skeleton";
import LinearProgress from "@mui/material/LinearProgress";
import { 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 {
automation?: AutomationData;
dims: DAGAutomationFlowDims;
dims: DAGDims;
onUpdate: (auto: AutomationData) => void;
tagDB: TagDB;
}
export const AutomationEditor: FC<Props> = ({
dims,
automation: propsAutos,
onUpdate: propsOnUpdate,
tagDB,
}) => {
// state
const {
@@ -32,112 +43,253 @@ export const AutomationEditor: FC<Props> = ({
save,
saveAndUpdate,
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
const [closeInfo, setCloseInfo] = useState(false);
const [infoBoxOpen, setInfoBox] = useState(false);
const [
{ ckFlipped },
setCookies,
// eslint-disable-next-line
_,
] = useCookies(["ckFlipped"]);
// alias
const flipped = dims.flipped ? true : ckFlipped === "1";
const setFlipped = (v: boolean) => setCookies("ckFlipped", v ? "1" : "0");
// render
if (state.status === 'loading') {
return <div className="automation-editor loading">
Loading...
</div>
}
if (state.status === 'invalid') {
return <ValidationBox
failures={state.failures}
data={state.data}
validate={validate}
onSave={saveAndUpdate}
/>
}
return <div className="automation-editor">
<AutoInfoBox
className={closeInfo ? "hide" : "show"}
metadata={state.data.metadata}
tags={state.data.tags}
onUpdate={updateMetadata}
>
<ButtonIcon
className="automation-editor--info-box--icon"
onClick={() => setCloseInfo(!closeInfo)}
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
>{ArrowIcon}</ButtonIcon>
</AutoInfoBox>
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
<div className="automation-editor--flow-wrapper--toolbar">
<Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save}
disabled={state.status !== 'changed'}
>
Save <CheckMarkIcon color="#bf4" />
</Button>
if (state.status === "loading") {
return (
<div className="automation-editor loading">
<LinearProgress className="linear-loader" />
<Skeleton className="mock-list" variant="rectangular" />
<Skeleton className="mock-graph" variant="rectangular" />
</div>
<SafeDAGAutomationFlow
className="automation-editor--flow-wrapper--flow"
sequence={state.data.sequence}
trigger={state.data.trigger}
condition={state.data.condition}
onSequenceUpdate={updateSequence}
onTriggerUpdate={updateTrigger}
onConditionUpdate={updateCondition}
dims={dims}
);
}
if (state.status === "invalid") {
return (
<ValidationBox
failures={state.failures}
data={state.data}
validate={validate}
onSave={saveAndUpdate}
/>
</div>
</div>
}
);
}
return (
<div className={["automation-editor", state.status].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<{
failures: MiniFailure[]
validate: (d: any) => MiniFailure[] | null,
data: EditorData,
onSave: (d: EditorData) => void,
}> = props => {
failures: MiniFailure[];
validate: (d: any) => MiniFailure[] | null;
data: EditorData;
onSave: (d: EditorData) => void;
}> = (props) => {
const [{ failures, data }, setState] = useState({
failures: props.failures,
data: props.data,
});
const makeSave = <K extends keyof EditorData>(k: K) => (d: EditorData[K]) => {
const newData = {
...data,
[k]: d,
}
const newFails = props.validate(newData);
if (newFails) {
setState({
failures: newFails,
data: newData,
})
} else {
setState({
failures: [],
data: newData,
})
}
}
const makeSave =
<K extends keyof EditorData>(k: K) =>
(d: EditorData[K]) => {
const newData = {
...data,
[k]: d,
};
const newFails = props.validate(newData);
if (newFails) {
setState({
failures: newFails,
data: newData,
});
} else {
setState({
failures: [],
data: newData,
});
}
};
return <div className="automation-editor-failures">
<ul>
{failures.map((f, i) => <>
<li key={i}>
<b>{f.path}</b>:
<ul>
{f.message.map((m, j) => <li key={j}>
{m}
</li>)}
</ul>
</li>
</>)}
</ul>
<span>Please correct the automation file manually and then continue!</span>
<InputYaml label="Metadata" value={data.metadata} onChange={makeSave('metadata')} resizable />
<InputYaml label="Tags" value={data.tags} onChange={makeSave('tags')} resizable />
<InputYaml label="Trigger" value={data.trigger} onChange={makeSave('trigger')} resizable />
<InputYaml label="Condition" value={data.condition} onChange={makeSave('condition')} resizable />
<InputYaml label="Actions" value={data.sequence} onChange={makeSave('sequence')} resizable />
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>Save</Button>
</div>
}
return (
<div className="automation-editor-failures">
<ul>
{failures.map((f, i) => (
<>
<li key={i}>
<b>{f.path}</b>:
<ul>
{f.message.map((m, j) => (
<li key={j}>{m}</li>
))}
</ul>
</li>
</>
))}
</ul>
<span>
Please correct the automation file manually and then continue!
</span>
<InputYaml
label="Metadata"
value={data.metadata}
onChange={makeSave("metadata")}
/>
<InputYaml label="Tags" value={data.tags} onChange={makeSave("tags")} />
<InputYaml
label="Trigger"
value={data.trigger}
onChange={makeSave("trigger")}
/>
<InputYaml
label="Condition"
value={data.condition}
onChange={makeSave("condition")}
/>
<InputYaml
label="Actions"
value={data.sequence}
onChange={makeSave("sequence")}
/>
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>
Save
</Button>
</div>
);
};
@@ -6,7 +6,7 @@ import { MiniFailure } from '../../types/validators/helper';
export type EditorData = ReturnType<typeof genEditorData>;
export type EditorState = {
status: 'unchanged' | 'changed',
status: 'unchanged' | 'changed' | 'saving',
data: EditorData
} | {
status: 'loading'
@@ -43,7 +43,8 @@ export const useAutomatioEditorState = (
}), {})
};
update({
status: "loading",
status: "saving",
data,
})
onSave(cleanData);
}
@@ -2,119 +2,186 @@ import "styles/root.css";
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react";
import { AutomationList } from ".";
import { createMockAuto } from "utils/mocks";
import * as dgconst from 'components/DAGSvgs/constants';
import { bigMockAutoList } from "utils/mocks";
import { Page } from "components/Page";
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
import { AutomationData } from "types/automations";
export default {
title: 'App/AutomationList',
title: "App/AutomationList",
component: AutomationList,
parameters: { actions: { argTypesRegex: '^on.*' } },
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
dims: dgconst.DEFAULT_DIMS
}
dims: DEFAULT_DIMS,
},
} as ComponentMeta<typeof AutomationList>;
const Template: ComponentStory<typeof AutomationList> = (args) => {
const [autos, setAutos] = useState(args.automations.data);
return (
<Page>
<AutomationList
{...args}
automations={{
...args.automations,
data: autos,
}}
onAdd={(a) => {
args.onAdd(a);
setAutos([...autos, a]);
}}
onRemove={(i) => {
args.onRemove(i);
setAutos([...autos.slice(0, i), ...autos.slice(i + 1)]);
}}
onUpdate={(i, a) => {
args.onUpdate(i, a);
setAutos([...autos.slice(0, i), a, ...autos.slice(i + 1)]);
}}
/>
</Page>
);
};
const Template: ComponentStory<typeof AutomationList> = args => {
const [autos, setAutos] = useState(args.automations)
return <div className="page">
<AutomationList {...args} automations={autos}
onAdd={a => {
args.onAdd(a);
setAutos([...autos, a]);
}}
onRemove={i => {
args.onRemove(i);
setAutos([
...autos.slice(0, i),
...autos.slice(i + 1),
]);
}}
onUpdate={(i, a) => {
args.onUpdate(i, a);
setAutos([
...autos.slice(0, i),
a,
...autos.slice(i + 1),
]);
}}
/>
</div>
}
export const EmptyStart = Template.bind({})
EmptyStart.args = {
...EmptyStart.args,
automations: [],
}
export const FewAutos = Template.bind({})
FewAutos.args = {
...FewAutos.args,
automations: [
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
createMockAuto({ "Type": "Climate" }),
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
createMockAuto({ "Room": "Office", "Type": "Lights" }),
createMockAuto({ "Room": "Office" }),
createMockAuto(),
],
}
export const BadAutmations = Template.bind({})
BadAutmations.args = {
...BadAutmations.args,
automations: [
{
condition: [],
tags: {},
metadata: {
id: "Bad Choose Sequence",
alias: "Bad Choose",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
},
mode: 'single',
const make = (autos: AutomationData[]) => {
const NewTemp = Template.bind({});
NewTemp.args = {
...NewTemp.args,
automations: {
data: autos,
params: {
offset: 0,
limit: 100,
},
trigger: [],
sequence: [
{
choose: {}
}
] as any
totalItems: autos.length,
},
{
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Bad Trigger",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
},
mode: 'single',
};
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",
},
trigger: [
"haha I am a string"
] as any,
sequence: []
],
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",
},
{
condition: [],
tags: {},
metadata: {
} as any,
trigger: [
],
sequence: []
}
],
}
trigger: [],
sequence: [
{
choose: [],
},
] as any,
},
{
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Bad Trigger",
description: "Example Metadata",
trigger_variables: {
wowo: "!",
},
mode: "single",
},
trigger: ["haha I am a string"] as any,
sequence: [],
},
{
condition: [],
tags: {},
metadata: {} as any,
trigger: [],
sequence: [],
},
]);
export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = (
args
) => {
const [autos, setAutos] = useState(args.automations.data);
return (
<Page>
<AutomationList
{...args}
automations={{
...args.automations,
data: autos,
}}
onAdd={(a) => {
window.setTimeout(() => {
args.onAdd(a);
setAutos([...autos, a]);
}, 10000);
}}
onRemove={(i) => {
window.setTimeout(() => {
args.onRemove(i);
setAutos([...autos.slice(0, i), ...autos.slice(i + 1)]);
}, 10000);
}}
onUpdate={(i, a) => {
window.setTimeout(() => {
args.onUpdate(i, a);
setAutos([...autos.slice(0, i), a, ...autos.slice(i + 1)]);
}, 10000);
}}
/>
</Page>
);
};
FewAutosWithSlowLoader.args = {
...FewAutosWithSlowLoader.args,
automations: {
data: bigMockAutoList,
params: {
limit: 100,
offset: 0,
},
totalItems: 100,
},
};
@@ -5,7 +5,8 @@
}
.automation-list-box--body {
overflow: auto;
overflow-y: auto;
overflow-x: hidden;
height: 100%;
flex: 1;
user-select: none;
@@ -24,7 +25,15 @@
padding-bottom: 0.5em;
border-width: 1px;
border-bottom-style: solid;
border-color: white;
border-color: var(--mui-grey-400);
}
.automation-list-box--body--group.other {
border-color: var(--mui-success-main);
}
.automation-list-box--body--group.other>b {
color: var(--mui-success-light);
}
.automation-list-box--body--group>.automation-list-box--body--group {
@@ -40,73 +49,12 @@
padding: 0.1em;
}
.automation-list-box--body--group>b:hover {
background-color: var(--secondary-accent);
color: var(--secondary);
.automation-list-box--body--group>b:hover,
.automation-list-box--body--group.selected>b {
background-color: var(--mui-grey-700);
color: var(--mui-secondary-contrastText);
}
.automation-list-box--body--item:hover, .automation-list-box--body--item.selected {
background-color: var(--primary-accent);
color: var(--primary);
}
.automation-list-box--body--item:hover>.automation-list-box--body--item--tags>span {
border-color: var(--primary);
}
.automation-list-box--body--item {
padding-left: 1em;
cursor: pointer;
display: flex;
justify-content: left;
align-items: flex-start;
gap: 1em;
flex-wrap: wrap;
}
.automation-list-box--body--item::before {
content: "⊚ ";
}
.automation-list-box--body--item--title {
display: flex;
flex-direction: column;
padding-left: 0.25em;
flex: 1;
}
.automation-list-box--body--item--title>b {
font-size: 1em;
}
.automation-list-box--body--item--title>span, .automation-list-box--body--item--title>b>span {
font-size: 0.75em;
}
.automation-list-box--body--item>button {
padding: 0.25em !important;
margin: 0.5em !important;
}
.automation-list-box--body--item--tags {
flex: 1;
display: flex;
flex-wrap: wrap;
font-size: 0.75em;
justify-content: left;
align-items: flex-start;
overflow: auto;
max-height: 100%;
gap: 0.25em;
}
.automation-list-box--body--item--tags>span {
border-color: var(--primary-accent);
border-style: solid;
border-width: 1px;
border-radius: 0.5em;
padding: 0.1em 0.5em;
}
.automation-list-box--bottom {
margin-top: 0.5em;
@@ -117,8 +65,20 @@
align-items: center;
}
.automation-list-box--bottom>button {
background-color: #070;
color: var(--primary-accent);
.automation-list-box--bottom>.automation-list-box--bottom--add {
background-color: var(--mui-primary-main);
color: var(--mui-primary-contrastText);
padding: 0.5em 2em;
}
.automation-list-box--bottom>.automation-list-box--bottom--add:hover {
color: var(--mui-primary-light);
}
.automation-list-box--bottom--load svg {
color: var(--mui-primary-main);
}
.automation-list-box--bottom--load.less svg {
transform: rotate(180deg);
}
@@ -2,45 +2,78 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react";
import { AutomationListBox } from "./AutomationListBox";
import { createMockAuto } from "utils/mocks";
import { Page } from "components/Page";
import { CookiesProvider } from "react-cookie";
import { makeTagDB } from "./TagDB";
import { AutomationData } from "types/automations";
export default {
title: 'App/AutomationList/Box',
title: "App/AutomationList/Box",
component: AutomationListBox,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
}
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {},
} as ComponentMeta<typeof AutomationListBox>;
const Template: ComponentStory<typeof AutomationListBox> = (args) => {
const [selected, setSelected] = useState(args.selected);
return (
<Page>
<CookiesProvider>
<AutomationListBox
{...args}
tagsDB={makeTagDB(args.automations.data)}
automations={args.automations}
selected={selected}
onSelectAutomation={(i) => {
setSelected(i);
args.onSelectAutomation(i);
}}
/>
</CookiesProvider>
</Page>
);
};
const Template: ComponentStory<typeof AutomationListBox> = args => {
const [selected, setSelected] = useState(args.selected)
return <div className="page">
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
setSelected(i)
args.onSelectAutomation(i)
}} />
</div>
}
const make = (autos: AutomationData[]) => {
const NewTemp = Template.bind({});
NewTemp.args = {
...NewTemp.args,
automations: {
data: autos,
params: {
offset: 0,
limit: 100,
},
totalItems: autos.length,
},
};
export const EmptyStart = Template.bind({})
EmptyStart.args = {
...EmptyStart.args,
automations: [],
}
return NewTemp;
};
export const FewAutos = Template.bind({})
FewAutos.args = {
...FewAutos.args,
automations: [
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
createMockAuto({ "Type": "Climate" }),
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
createMockAuto({ "Room": "Office", "Type": "Lights" }),
createMockAuto({ "Room": "Office" }),
createMockAuto(),
],
}
export const EmptyStart = make([]);
export const FewAutos = make([
createMockAuto({
Room: "Bathroom",
Type: "Lights",
NewDevice: "Yes",
Remote: "No",
Floor: "1",
}),
createMockAuto({ Room: "Bathroom", Type: "Climate" }),
createMockAuto({ Room: "Living Room", Type: "Climate" }),
createMockAuto({ Type: "Climate" }),
createMockAuto({ Type: "Lights", Routine: "Myself" }),
createMockAuto({ Routine: "DNS", Type: "SSL" }),
createMockAuto({ Room: "Bedroom", Type: "Lights", Routine: "Baby" }),
createMockAuto({ Room: "Office", Type: "Lights" }),
createMockAuto({ Room: "Office" }),
createMockAuto(),
]);
export const OneAuto = make([
createMockAuto({
Type: "Climate",
}),
]);
@@ -1,101 +1,22 @@
import { groupAutomations, getTagList } from './AutomationListBox';
import { AutomationData } from 'types/automations/index';
import { createMockAuto } from 'utils/mocks';
import { getTagList } from "./AutomationListBox";
import { createMockAuto } from "utils/mocks";
test('group automations', () => {
const automations: AutomationData[] = [
{
condition: [],
metadata: {
id: '1',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Living Room',
"Type": 'Lights'
},
sequence: [],
trigger: [],
},
{
condition: [],
metadata: {
id: '2',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Living Room',
"Type": 'Climate'
},
sequence: [],
trigger: [],
},
{
condition: [],
metadata: {
id: '3',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Kitchen',
"Type": 'Climate'
},
sequence: [],
trigger: [],
},
];
expect(groupAutomations(automations, [0, 1], ['Room', "Type"])).toStrictEqual({
"Living Room": {
"Lights": [0],
"Climate": [1],
},
"Kitchen": {
"Climate": [2],
}
})
expect(groupAutomations(automations, [1, 0], ['Room', "Type"])).toStrictEqual({
"Lights": {
"Living Room": [0],
},
"Climate": {
"Living Room": [1],
"Kitchen": [2]
}
})
expect(groupAutomations(automations, [1], ['Room', "Type"])).toStrictEqual({
"Lights": [0],
"Climate": [1, 2]
})
expect(groupAutomations(automations, [0], ['Room', "Type"])).toStrictEqual({
"Living Room": [0, 1],
"Kitchen": [2]
})
expect(groupAutomations(automations, [], ['Room', "Type"])).toStrictEqual([
0, 1, 2
test("getTagList", () => {
expect(
getTagList([
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
])
).toStrictEqual([]);
expect(
getTagList([
createMockAuto({ Room: "Kitchen", Area: "Oven" }),
createMockAuto({ Room: "Attic" }),
createMockAuto({ Room: "Office" }),
createMockAuto({ Area: "Balcony" }),
])
).toStrictEqual(["Room", "Area"]);
});
test('getTagList', () => {
expect(getTagList([
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
])).toStrictEqual([])
expect(getTagList([
createMockAuto({ "Room": "Kitchen", "Area": "Oven" }),
createMockAuto({ "Room": "Attic" }),
createMockAuto({ "Room": "Office" }),
createMockAuto({ "Area": "Balcony" }),
])).toStrictEqual(["Room", "Area"])
})
@@ -1,211 +1,195 @@
import "./AutomationListBox.css";
import { FC, useState } from 'react';
import { AutomationData, AutomationMetadata } from "types/automations";
import { FC, useState } from "react";
import { AutomationData } from "types/automations";
import InputMultiSelect from "components/Inputs/InputMultiSelect";
import InputText from "components/Inputs/InputText";
import { Button } from "components/Inputs/Button";
import { TrashIcon } from "components/Icons";
import { makeGrouping } from "./automationGrouper";
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
import { useCookies } from "react-cookie";
import { TagDB } from "components/AutomationList/TagDB";
// import { ButtonIcon } from "components/Icons/ButtonIcons";
// import ReadMoreOutlinedIcon from "@mui/icons-material/ReadMoreOutlined";
import { ListData, ListParams } from "apiService/types";
import Chip from "@mui/material/Chip";
import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
export type AutomationListBoxProps = {
automations: ListData<AutomationData>;
selected: number;
onSelectAutomation: (i: number) => void;
onRemove: (i: number) => void;
onAdd: () => void;
onUpdateTags: (id: string, tags: Record<string, string>) => void;
onUpdate: (a: AutomationData, i: number) => void;
onLoadMore: (p: ListParams) => void;
tagsDB: TagDB;
};
export type Props = {
automations: AutomationData[];
selected: number;
onSelectAutomation: (i: number) => void;
onRemove: (i: number) => void;
onAdd: () => void;
}
const useAutomationListBoxState = () => {
const [
cookies,
setCookies,
// eslint-disable-next-line
_,
] = useCookies(["albSearchText", "albSelected"]);
let initialSelected = [];
try {
initialSelected = JSON.parse(cookies.albSelected);
if (!Array.isArray(initialSelected)) {
initialSelected = [initialSelected];
}
initialSelected = initialSelected.map(Number);
// eslint-disable-next-line
} catch (_) {}
const [searchText, setSearchText] = useState(cookies.albSearchText ?? "");
const [selectedTagIdx, setSelectedTagIdx] =
useState<number[]>(initialSelected);
export const AutomationListBox: FC<Props> = ({
automations,
selected,
onSelectAutomation,
onAdd,
onRemove,
return {
searchText,
setSearchText(v: string) {
setSearchText(v);
setCookies("albSearchText", v);
},
setSelectedTagIdx(n: number[]) {
setSelectedTagIdx(n);
setCookies("albSelected", JSON.stringify(n));
},
selectedTagIdx,
};
};
export const AutomationListBox: FC<AutomationListBoxProps> = ({
automations: {
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);
const [searchText, setSearchText] = useState('');
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]);
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags);
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selectedTagIdx, tags);
return <div className="automation-list-box">
<div className="automation-list-box--nav">
<InputText
label="Search"
value={searchText}
onChange={setSearchText}
return (
<div className="automation-list-box">
<div className="automation-list-box--nav">
<InputText label="Search" value={searchText} onChange={setSearchText} />
<InputMultiSelect
label="Tags"
selected={selectedTagIdx}
onChange={setSelectedTagIdx}
options={tags}
max={3}
/>
</div>
<div className="automation-list-box--body">
<AutomationListBoxGroup
events={{
onSelectAutomation,
onRemove,
}}
autos={filteredAutomations}
grouping={grouping}
selectedAutomationIdx={selected}
tagsDB={tagsDB}
onSave={onUpdate}
/>
</div>
<div className="automation-list-box--bottom">
<Button 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
label="Tags"
selected={selectedTagIdx}
onChange={setSelectedTagIdx}
options={tags}
max={3}
<small>support for more is not yet implemented</small>
</>
) : (
""
)}
{/* {autoParams.offset > 0 && (
<ButtonIcon
borderless
className="automation-list-box--bottom--load less"
icon={<ReadMoreOutlinedIcon />}
onClick={() => onLoadMore()}
/>
</div>
<div className="automation-list-box--body">
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove, selected)}
</div>
<div className="automation-list-box--bottom">
<Button onClick={onAdd}>Add</Button>
<span>Showing Automations: {filteredAutomations.length} out of {automations.length}</span>
</div>
)} */}
{/* {filteredAutomations.length} out of {totalAutomations} */}
{/* {autoParams.offset + automations.length < totalAutomations && (
<ButtonIcon
borderless
className="automation-list-box--bottom--load more"
icon={<ReadMoreOutlinedIcon />}
/>
)} */}
</div>
</div>
}
);
};
export const getTagList = (autos: AutomationData[]): string[] => Object.keys(autos
.map(a => Object.keys(a.tags))
.reduce((all: any, keys) => {
export const getTagList = (autos: AutomationData[]): string[] =>
Object.keys(
autos
.map((a) => Object.keys(a.tags))
.reduce((all: any, keys) => {
for (const k of keys) {
all[k] = 1
all[k] = 1;
}
return all;
}, {}))
}, {})
);
const filterAutomations = (autos: AutomationData[], searchText: string, selected: number[], tags: string[]): Array<[AutomationData, number]> => autos.map<[AutomationData, number]>((a, i) => [a, i]).filter(([a, i]) => {
if (!a.metadata) {
return true
}
if (searchText.length > 0) {
const filterAutomations = (
autos: AutomationData[],
searchText: string
): Array<[AutomationData, number]> =>
autos
.map<[AutomationData, number]>((a, i) => [a, i])
.filter(([a, i]) => {
if (!a.metadata) {
return true;
}
if (searchText.length > 0) {
if (
!(
a.metadata.description.toLocaleLowerCase().includes(searchText) ||
a.metadata.alias.toLocaleLowerCase().includes(searchText)
)
!(
(a.metadata.description ?? "")
.toLocaleLowerCase()
.includes(searchText) ||
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
)
) {
return false
return false;
}
}
if (selected.length > 0) {
for (const i of selected) {
if (!a.tags[tags[i]]) {
return false
}
}
}
return true
})
export const groupAutomations = (
autos: AutomationData[],
selected: number[],
tags: string[],
) => {
if (selected.length === 0) {
return autos.map((_, i) => i);
}
const out: any = {};
for (let ai = 0; ai < autos.length; ai++) {
const a = autos[ai];
let where = out;
let tag: string = '';
let lastKey: string | null = null;
for (const i of selected) {
tag = tags[i];
if (lastKey !== null) {
where = where[lastKey]
}
if (!where[a.tags[tag]]) {
where[a.tags[tag]] = {}
}
lastKey = a.tags[tag]
}
if (lastKey !== null) {
if (!where[lastKey] || !Array.isArray(where[lastKey])) {
where[lastKey] = []
}
where[lastKey].push(ai)
}
}
return out;
}
const convertGroupsToItems = (
groups: any,
autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void,
selected: number,
) => {
if (Array.isArray(groups)) {
return groups.map(i => {
const [auto, autoIndex] = autos[i];
let title = "BadAuto<<Missing Metadata>>"
if (auto.metadata) {
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`
}
return <div
key={i}
className={["automation-list-box--body--item", selected === autoIndex ? 'selected' : ''].join(' ')}
title={title}
onClick={() => onSelectAutomation(autoIndex)}
>
<MetadataBox metadata={auto.metadata} tags={auto.tags} />
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
</div>
})
} else {
return Object.keys(groups).map(groupName => {
return <AutomationListBoxGroup
key={groupName}
groupName={groupName}
groups={groups[groupName]}
autos={autos}
onSelectAutomation={onSelectAutomation}
onRemove={onRemove}
selected={selected}
/>
})
}
}
export const MetadataBox: FC<{
metadata: AutomationMetadata,
tags: Record<string, string>,
}> = (auto) => {
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
if (auto.metadata) {
title = <>
<b>{String(auto.metadata.alias).slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
<span>{String(auto.metadata.description).slice(0, 25)}</span>
</>
}
return <div
className="automation-list-box--body--item--title"
>
{title}
<div
className="automation-list-box--body--item--tags"
>
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
<b>{tagName}:</b> {auto.tags[tagName]}
</span>)}
</div>
</div>
}
const AutomationListBoxGroup: FC<{
groupName: string,
groups: any,
autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void;
selected: number,
}> = ({
groupName,
groups,
autos,
onSelectAutomation,
onRemove,
selected,
}) => {
const [open, setOpen] = useState(false);
return <div className="automation-list-box--body--group">
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove, selected)}
</div>
}
}
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)
}
@@ -0,0 +1,257 @@
import "./AutomationListBoxGroup.css";
import { TrashIcon } from "components/Icons";
import { MetadataBox } from "./AutomationMetadataBox";
import { AutomationData } from "types/automations";
import { AutomationGrouping } from "./automationGrouper";
import { FC, useEffect, useState } from "react";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import { TagDB } from "./TagDB";
import Save from "@mui/icons-material/Save";
export type AutomationListBoxEvents = {
onSelectAutomation: (i: number) => void;
onRemove: (i: number) => void;
};
export type AutomationListBoxGroups = {
grouping: AutomationGrouping;
currentNode: number;
};
export type AutomationListBoxProps = {
events: AutomationListBoxEvents;
groups: AutomationListBoxGroups;
autos: Array<[AutomationData, number]>;
selectedAutomationIdx: number;
};
export type AutomationListBoxGroupProps = {
events: AutomationListBoxEvents;
grouping: AutomationGrouping;
autos: Array<[AutomationData, number]>;
selectedAutomationIdx: number;
tagsDB: TagDB;
onSave: (a: AutomationData, i: number) => void;
};
export const AutomationListBoxGroup: FC<AutomationListBoxGroupProps> = ({
events,
grouping,
autos,
selectedAutomationIdx,
tagsDB,
onSave,
}) => {
if (grouping.top.length === 1) {
return (
<>
{convertGroupsToItems(
autos,
{
grouping,
currentNode: grouping.top[0],
},
events,
selectedAutomationIdx,
tagsDB,
onSave
)}
</>
);
} else {
return (
<>
{grouping.top.map((groupIdx) => (
<AutomationListBoxGroupItem
key={groupIdx}
autos={autos}
groups={{
grouping,
currentNode: groupIdx,
}}
events={events}
selectedAutomationIdx={selectedAutomationIdx}
tagsDB={tagsDB}
onSave={onSave}
/>
))}
</>
);
}
};
export const convertGroupsToItems = (
autos: Array<[AutomationData, number]>,
{ grouping, currentNode }: AutomationListBoxGroups,
events: AutomationListBoxEvents,
selectedAutomationIdx: number,
tagsDB: TagDB,
onSave: (a: AutomationData, i: number) => void
) => {
const automations = grouping.getAutomations(currentNode);
if (automations.length > 0) {
return automations.map((autoIndex) => (
<AutomationListBoxItem
key={`${autoIndex}-${autos[autoIndex][1]}`}
events={events}
auto={autos[autoIndex]}
isSelected={selectedAutomationIdx === autos[autoIndex][1]}
tagsDB={tagsDB}
onSave={(a) => onSave(a, autoIndex)}
/>
));
}
const subgroups = grouping.getSubGroups(currentNode);
if (subgroups.length > 0) {
return subgroups.map((groupIdx) => (
<AutomationListBoxGroupItem
key={groupIdx}
autos={autos}
groups={{
grouping,
currentNode: groupIdx,
}}
events={events}
selectedAutomationIdx={selectedAutomationIdx}
tagsDB={tagsDB}
onSave={onSave}
/>
));
}
return <></>;
};
export const AutomationListBoxGroupItem: FC<{
events: AutomationListBoxEvents;
groups: AutomationListBoxGroups;
autos: Array<[AutomationData, number]>;
selectedAutomationIdx: number;
tagsDB: TagDB;
onSave: (a: AutomationData, i: number) => void;
}> = ({ autos, groups, events, selectedAutomationIdx, tagsDB, onSave }) => {
const groupData = groups.grouping.getData(groups.currentNode);
const automations = groups.grouping.getAutomations(groups.currentNode);
const [open, setOpen] = useState(false);
const isOther = groupData.isOther;
const openIcon = !open ? "⊕" : "⊖";
const total = isOther ? (
<small>
{automations.length} automation{automations.length !== 1 ? "s" : ""}{" "}
{groupData.isOther ? "" : "(untagged)"}
</small>
) : (
<></>
);
return (
<div
className={[
"automation-list-box--body--group",
isOther ? "other" : "",
groupData.selected ? "selected" : "",
].join(" ")}
>
<b onClick={() => setOpen(!open)}>
{groupData.name} {openIcon} {total}
</b>
{open &&
convertGroupsToItems(
autos,
groups,
events,
selectedAutomationIdx,
tagsDB,
onSave
)}
</div>
);
};
export const AutomationListBoxItem: FC<{
auto: [AutomationData, number];
isSelected: boolean;
events: AutomationListBoxEvents;
tagsDB: TagDB;
onSave: (a: AutomationData) => void;
}> = ({
events: { onRemove, onSelectAutomation },
auto: [auto, autoIndex],
isSelected,
tagsDB,
onSave,
}) => {
// state
const [{ tags, isModified, alias }, setState] = useState({
isModified: false,
tags: Object.entries(auto.tags),
alias: auto.metadata.alias ?? "",
});
// effects
useEffect(() => {
setState({
isModified: false,
tags: Object.entries(auto.tags),
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;
}
@@ -0,0 +1,181 @@
import "./AutomationMetadataBox.css";
import { CheckMarkIcon } from "components/Icons";
import { FC, useState } from "react";
import { AutomationMetadata } from "types/automations";
import { InputAutoComplete } from "components/Inputs/InputAutoComplete";
import { TagDB } from "./TagDB";
import DeleteIcon from "@mui/icons-material/ClearTwoTone";
import { InputTextView } from "components/Inputs/InputTextView";
export const MetadataBox: FC<{
metadata: AutomationMetadata;
onAliasUpdate: (t: string) => void;
onTagUpdate: (t: [string, string][]) => void;
tags: [string, string][];
tagsDB: TagDB;
}> = ({ tags, onTagUpdate, onAliasUpdate, tagsDB, metadata }) => {
// state
const [newTag, setNewTag] = useState<
| {
on: false;
}
| {
on: true;
name: string;
value: string;
}
>({ on: false });
// alias
const tagOptions = tagsDB.getTagNames(tags.map((t) => t[0]));
// render
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>;
if (metadata) {
title = (
<>
<b 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>
);
};
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,33 +2,31 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { ConnectedAutomationList } from ".";
import { createMockAuto } from "utils/mocks";
import { useMockApiService } from "apiService";
import { DEFAULT_DIMS } from 'components/DAGSvgs/constants';
import { Page } from "components/Page";
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
export default {
title: 'App/AutomationList/Connected',
title: "App/AutomationList/MockConnected",
component: ConnectedAutomationList,
parameters: { actions: { argTypesRegex: '^on.*' } },
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
dims: DEFAULT_DIMS,
initialAutomations: [],
}
},
} as ComponentMeta<typeof ConnectedAutomationList>;
const Template: ComponentStory<any> = args => {
const Template: ComponentStory<any> = (args) => {
const api = useMockApiService(args.initialAutomations);
return <div className="page">
<ConnectedAutomationList
{...args}
api={api}
/>
</div>
}
return (
<Page>
<ConnectedAutomationList {...args} api={api} />
</Page>
);
};
export const EmptyStart = Template.bind({})
export const EmptyStart = Template.bind({});
export const FewAutos = Template.bind({})
export const FewAutos = Template.bind({});
FewAutos.args = {
...FewAutos.args,
initialAutomations: [
@@ -43,4 +41,23 @@ FewAutos.args = {
createMockAuto(),
createMockAuto(),
],
}
};
export const Loading: ComponentStory<any> = (args) => {
const api = useMockApiService(args.initialAutomations);
return (
<Page>
<ConnectedAutomationList
{...args}
api={{
...api,
state: {
automations: {
ready: false,
},
},
}}
/>
</Page>
);
};
@@ -0,0 +1,26 @@
import { AutomationData } from "types/automations";
export type TagDB = ReturnType<typeof makeTagDB>;
export const makeTagDB = (automations: AutomationData[]) => {
const allTags: Record<string, Set<string>> = {};
automations.forEach(({ tags }) =>
Object.keys(tags).forEach((tagName) => {
const tagValue = tags[tagName];
if (!allTags[tagName]) {
allTags[tagName] = new Set();
}
allTags[tagName].add(tagValue);
})
);
const allTagNames = Object.keys(allTags);
return {
getTagNames(myTags: string[]): string[] {
return allTagNames.filter((n) => !myTags.includes(n)).sort();
},
getTagValues(tagName: string): string[] {
return allTags[tagName]
? Array.from(allTags[tagName].values()).sort()
: [];
},
};
};
@@ -0,0 +1,72 @@
import { makeGrouping } from "./automationGrouper";
import { AutomationData } from 'types/automations/index';
import { bigMockAutoList, createMockAuto } from 'utils/mocks';
const automations: AutomationData[] = [
createMockAuto({
"Room": 'Living Room',
"Type": 'Lights'
}),
createMockAuto({
"Room": 'Living Room',
"Type": 'Climate'
}),
createMockAuto({
"Room": 'Kitchen',
"Type": 'Climate'
}),
createMockAuto({
"Type": 'Climate'
}),
createMockAuto({
"Room": 'Living Room'
}),
createMockAuto({}),
];
test('no grouping', () => {
const grouped = makeGrouping(automations, [], 0);
expect(grouped.top).toStrictEqual([0])
expect(grouped.getAutomations(0)).toStrictEqual([0, 1, 2, 3, 4, 5])
});
test('1 grouping', () => {
const grouped = makeGrouping(automations, ["Room"], 0);
expect(grouped.top).toHaveLength(3);
expect(grouped.getAutomations(0)).toStrictEqual([0, 1, 4])
expect(grouped.getAutomations(1)).toStrictEqual([2])
expect(grouped.getAutomations(2)).toStrictEqual([3, 5])
});
test('2 groupings', () => {
const grouped = makeGrouping(automations, ["Room", "Type"], 0);
expect(grouped.top).toHaveLength(3);
expect(grouped.getAutomations(grouped.top[0])).toHaveLength(0)
expect(grouped.getSubGroups(grouped.top[0])).toHaveLength(3)
expect(grouped.getAutomations(grouped.top[1])).toHaveLength(0)
expect(grouped.getSubGroups(grouped.top[1])).toHaveLength(1)
expect(grouped.getAutomations(grouped.top[2])).toHaveLength(2)
expect(grouped.getSubGroups(grouped.top[2])).toHaveLength(0)
});
test('bigAutoList groupings has not duplicate ids', () => {
const grouped = makeGrouping(bigMockAutoList, ['Room', "Remote"], 0);
const flattenAndCount = (gid: number): Record<number, number[]> => {
const subgroups = grouped.getSubGroups(gid);
if (subgroups.length > 0) {
return flattenAndConsolidate(subgroups)
} else {
return grouped.getAutomations(gid).reduce((sum: Record<number, number[]>, b) => {
sum[b] = (sum[b] ?? []).concat(gid)
return sum
}, {})
}
}
const flattenAndConsolidate = (gids: number[]): Record<number, number[]> => gids.map(flattenAndCount).reduce((a, b) => {
for (const k of Object.keys(b).map(Number)) {
a[k] = (a[k] ?? []).concat(b[k])
}
return a
}, {})
const countedAutos = flattenAndConsolidate(grouped.top)
for (const key of Object.keys(countedAutos).map(Number)) {
expect(countedAutos[key]).toHaveLength(1)
}
})
@@ -0,0 +1,130 @@
import { AutomationData } from "types/automations";
const makeGrouper = () => {
const groupIdNames: string[] = []
const groupSubGroups: Array<Set<number>> = []
const groupAutomations: number[][] = []
const groupData: Array<{
name: string;
selected: boolean;
isOther: boolean;
isTop: boolean;
}> = [];
const topGroups: number[] = [];
return {
groupIdNames,
groupSubGroups,
groupAutomations,
groupData,
topGroups,
addNew(groupId: string, groupName: string, theChosenOne: boolean, isTopLevel: boolean, isOther: boolean = false): number {
groupIdNames.push(groupId);
groupSubGroups.push(new Set());
groupAutomations.push([]);
groupData.push({
name: groupName,
selected: theChosenOne,
isTop: isTopLevel,
isOther
})
const groupIdx = groupIdNames.length - 1;
if (isTopLevel) {
topGroups.push(groupIdx);
}
return groupIdx;
},
updateGroup(
groupIdx: number,
update: {
isChosen: boolean,
lastGroupIdx: number | null,
autoIdx: number | null,
}
) {
if (update.isChosen) {
groupData[groupIdx].selected = true;
}
if (update.lastGroupIdx !== null) {
groupSubGroups[update.lastGroupIdx].add(groupIdx);
}
if (update.autoIdx !== null) {
groupAutomations[groupIdx].push(update.autoIdx)
}
}
}
}
export type AutomationGrouping = ReturnType<typeof makeGrouping>;
export const makeGrouping = (
autos: AutomationData[],
selectedTags: string[],
selectedAutomationIdx: number,
) => {
const grouper = makeGrouper();
if (selectedTags.length === 0) {
grouper.addNew("$", "", selectedAutomationIdx >= 0, true, true)
grouper.groupAutomations = [autos.map((_, i) => i)];
} else {
autos.forEach((auto, autoIdx) => {
const theChosenOne = selectedAutomationIdx === autoIdx;
let lastGroupIdx: number | null = null;
let lastGroupId: string = "$";
for (let ti = 0; ti < selectedTags.length; ti++) {
const isTopLevel = ti === 0;
const selTag = selectedTags[ti];
if (selTag in auto.tags) {
const groupName = auto.tags[selTag];
const groupId = `${lastGroupId}>${selTag}:${groupName}`;
let groupIdx = grouper.groupIdNames.indexOf(groupId);
if (groupIdx < 0) {
groupIdx = grouper.addNew(groupId, groupName, theChosenOne, isTopLevel);
}
grouper.updateGroup(groupIdx, {
isChosen: theChosenOne,
lastGroupIdx,
autoIdx: ti === selectedTags.length - 1 ? autoIdx : null,
})
lastGroupIdx = groupIdx;
lastGroupId = groupId;
} else {
const groupId = `${lastGroupId}>${selTag}:$`;
let groupIdx = grouper.groupIdNames.indexOf(groupId);
if (groupIdx < 0) {
groupIdx = grouper.addNew(groupId, "", theChosenOne, isTopLevel, true);
}
grouper.updateGroup(groupIdx, {
isChosen: theChosenOne,
lastGroupIdx,
autoIdx,
})
break
}
}
});
}
const sortGroupIds = (groupIds: number[]) => groupIds.sort((a, b) => {
const adata = grouper.groupData[a];
const bdata = grouper.groupData[b];
if (adata.isOther) {
return 1
} else {
return adata.name > bdata.name ? -1 : 1
}
})
return {
top: sortGroupIds(grouper.topGroups),
getSubGroups(groupIdx: number) {
return sortGroupIds(Array.from(grouper.groupSubGroups[groupIdx].values()))
},
getAutomations(groupIdx: number) {
return grouper.groupAutomations[groupIdx]
},
getData(groupIdx: number) {
return grouper.groupData[groupIdx]
}
}
}
+25 -3
View File
@@ -18,6 +18,25 @@
flex: 1;
}
/* Loading state */
.automation-list--root.loading {
width: 100%;
height: 100%;
flex-direction: column;
}
.automation-list--root.loading>* {
width: 100%;
}
.automation-list--root.loading .automation-list--circle-loader {
width: 100%;
height: 100%;
justify-content: center;
align-items: center;
display: flex;
}
/* list children: on hide */
.automation-list--list.hide>.automation-list-box {
width: 0;
@@ -31,6 +50,7 @@
.automation-list--list.hide>.automation-list--list-hide {
transform: rotate(180deg);
left: 0;
}
/* list children: normal */
@@ -39,8 +59,10 @@
border-width: 1px;
}
.automation-list--list-hide {
.automation-list--list .automation-list--list-hide {
position: absolute;
bottom: 0.5em;
right: 0.5em;
bottom: 0em;
left: 0.5em;
max-width: 1.5em;
max-height: 1.5em;
}
@@ -14,29 +14,7 @@
.automation-list--root.mobile .automation-list--list-hide {
transform: rotate(90deg);
left: 1.25em;
}
.automation-list--root.mobile .automation-editor--info-box {
min-width: 100vw;
min-height: calc(100vh - 5em);
max-width: 100vw;
max-height: calc(100vh - 5em);
padding: 0;
}
.automation-list--root.mobile .automation-editor--info-box-inner {
margin-top: 2.5em;
padding-left: 0.5em;
padding-right: 0.5em;
margin-bottom: 2em;
}
.automation-list--root.mobile .automation-editor--info-box--icon {
left: 1.25em;
bottom: 0em;
background-color: var(--primary);
transform: rotate(90deg);
left: 0.25em;
}
@@ -50,21 +28,11 @@
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
transform: rotate(270deg);
position: fixed;
top: 0.75em;
z-index: 20;
top: 0.5em;
z-index: 5;
}
/* info box hide */
.automation-list--root.mobile .automation-editor--info-box.hide {
width: 100vw;
min-height: 0;
max-height: 0;
}
.automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon {
transform: rotate(270deg);
position: fixed;
top: 0.75em;
background-color: var(--green-opaque);
z-index: 30;
.automation-list--root.mobile .automation-editor--flow-wrapper>.automation-editor--flow-wrapper--toolbar .input-text-view,
.automation-list--root.mobile .automation-editor--flow-wrapper>.automation-editor--flow-wrapper--toolbar .id {
display: none;
}
+172 -59
View File
@@ -1,100 +1,213 @@
import "./index.css";
import "./index.mobile.css";
import { AutomationEditor } from "components/AutomationEditor";
import { FC, useState } from "react";
import { FC, ReactNode, useState, useRef, useEffect } from "react";
import { AutomationData } from "types/automations";
import { defaultAutomation } from 'utils/defaults';
import { ArrowIcon } from "components/Icons";
import { defaultAutomation } from "utils/defaults";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import { ApiService } from "apiService/core";
import { AutomationListBox } from "./AutomationListBox";
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
import useWindowSize from "utils/useWindowSize";
import { makeTagDB } from "./TagDB";
import LinearProgress from "@mui/material/LinearProgress";
import CircularProgress from "@mui/material/CircularProgress";
import { useCookies } from "react-cookie";
import { 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 {
automations: AutomationData[];
automations: ListData<AutomationData>;
onUpdate: (i: number, auto: AutomationData) => void;
onUpdateTags: (id: string, tags: Record<string, string>) => void;
onAdd: (auto: AutomationData) => void;
onRemove: (i: number) => void;
dims: DAGAutomationFlowDims;
onLoadMore: (p: ListParams) => void;
dims: DAGDims;
children?: ReactNode;
}
export const useAutomationListState = () => {
const [
cookies,
setCookies,
// eslint-disable-next-line
_,
] = useCookies(["alCurrent"]);
let initialCurrent = 0;
try {
initialCurrent = Number(cookies.alCurrent ?? "0");
} catch (_) {}
const [hideList, setHideList] = useState(false);
const [current, setCurrent] = useState(initialCurrent);
return {
hideList,
setHideList,
current,
setCurrent(i: number) {
setCurrent(i);
setCookies("alCurrent", String(i));
},
};
};
export const AutomationList: FC<AutomationListParams> = ({
automations,
onLoadMore,
onUpdate,
onUpdateTags,
onAdd,
onRemove,
dims,
children,
}) => {
// state
const [hideList, setHideList] = useState(false);
const [current, setCurrent] = useState(0);
const snackbr = useSnackbar();
const { hideList, setHideList, current, setCurrent } =
useAutomationListState();
const { isMobile } = useWindowSize();
const firstRender = useRef(true);
// alias
const currentAuto = automations.length > 0 ? automations[current] : null;
const currentAuto =
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
return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}>
<div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}>
<AutomationListBox
automations={automations}
onAdd={() => {
onAdd(defaultAutomation(`shortu-${automations.length}`));
setCurrent(automations.length)
}}
onSelectAutomation={i => {
setCurrent(i);
if (isMobile) {
setHideList(true)
}
}}
selected={current}
onRemove={onRemove}
/>
<ButtonIcon
onClick={() => setHideList(!hideList)}
className="automation-list--list-hide"
return (
<div
className={["automation-list--root", isMobile ? "mobile" : ""].join(" ")}
>
<div
className={["automation-list--list", hideList ? "hide" : "show"].join(
" "
)}
>
{ArrowIcon}
</ButtonIcon>
<AutomationListBox
automations={automations}
onUpdate={(a, i) => onUpdate(i, a)}
onUpdateTags={onUpdateTags}
onAdd={() => {
onAdd(defaultAutomation(String(Date.now())));
setCurrent(automations.data.length);
if (isMobile) {
setHideList(true);
}
}}
onSelectAutomation={(i) => {
setCurrent(i);
if (isMobile) {
setHideList(true);
}
}}
onLoadMore={onLoadMore}
selected={current}
onRemove={onRemove}
tagsDB={tagDB}
/>
<ButtonIcon
onClick={() => setHideList(!hideList)}
className="automation-list--list-hide"
icon={<ArrowBack />}
/>
</div>
<div className="automation-list--viewer">
{currentAuto ? (
<AutomationEditor
automation={currentAuto}
onUpdate={(a) => onUpdate(current, a)}
dims={{
...dims,
flipped: isMobile,
}}
tagDB={tagDB}
/>
) : (
<></>
)}
</div>
{children}
</div>
<div className="automation-list--viewer">
{currentAuto ? <AutomationEditor
automation={currentAuto}
onUpdate={a => onUpdate(current, a)}
dims={dims}
/> : <></>}
</div>
{children}
</div>
}
);
};
interface ConnectedAutomationListParams {
dims: DAGAutomationFlowDims;
dims: DAGDims;
api: ApiService;
}
export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
api: {
state: {
automations,
},
removeAutomation,
updateAutomation,
state: { automations },
...methods
},
dims
dims,
}) => {
const { reloadAutomations } = useHA();
const [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) {
return <span>Loading...</span>
return (
<div className="automation-list--root loading">
<LinearProgress />
<div className="automation-list--circle-loader">
<CircularProgress />
</div>
</div>
);
}
if (!automations.ok) {
return <span>Error {automations.error}</span>
return <span>Error {automations.error}</span>;
}
return <AutomationList
dims={dims}
automations={automations.data.data}
onAdd={auto => updateAutomation({ auto, index: automations.data.totalItems + 1 })}
onRemove={index => removeAutomation({ index })}
onUpdate={(index, auto) => updateAutomation({ index, auto })}
/>
}
return (
<>
{saving && <LinearProgress />}
<AutomationList
dims={dims}
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,51 +0,0 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react";
import { ConditionEditor } from ".";
import { AutomationCondition } from 'types/automations/conditions';
export default {
title: 'ConditionEditor',
component: ConditionEditor,
parameters: { actions: { argTypesRegex: '^on.*' } },
} as ComponentMeta<typeof ConditionEditor>;
export const Basic: ComponentStory<typeof ConditionEditor> = args => {
const [state, setState] = useState<AutomationCondition>({
"condition": "or",
"conditions": [
{
"condition": "and",
"conditions": [
{
"condition": "numeric_state",
"entity_id": [
"sensor.kitchen_humidity"
],
"above": "40"
},
{
"condition": "template",
"value_template": "states('switch.kitchen') == 'on'"
}
]
},
{
"condition": "numeric_state",
"entity_id": [
"sensor.kitchen_temperature"
],
"above": "51"
}
]
})
return (
<div className="page">
<ConditionEditor
onUpdate={setState}
onDelete={() => { }}
condition={state}
/>
</div>
)
}
@@ -1,128 +0,0 @@
import { Classes } from "jss";
import { FC, useState, useEffect } from 'react';
import { getConditionDefaultValues } from "utils/defaults";
import { AutomationCondition } from "types/automations/conditions";
import { CheckMarkIcon, PencilIcon } from "components/Icons";
import { InputList } from "components/Inputs/InputList";
import InputYaml from "components/Inputs/InputYaml";
import { getEditor } from "./editorRender";
import { useStyles } from "./style";
import { getViewer } from "./viewRender";
export const ConditionNode: FC<{
condition: AutomationCondition;
displayMode: boolean;
showDelete?: boolean;
onDelete?: (which: 'root' | number) => void;
onUpdate?: (data: AutomationCondition) => void;
children?: (props: {
classes: Classes<string>
}) => JSX.Element,
}> = ({
condition,
showDelete = false,
displayMode = true,
onDelete = () => { },
onUpdate = () => { },
children = () => { },
}) => {
// state
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
const [yamlMode, setYamlMode] = useState(false);
// alias
const effectiveDM = internalDisplayMode || yamlMode;
// effect
useEffect(() => {
setInternalDisplayMode(displayMode);
}, [displayMode])
useEffect(() => {
if (yamlMode) {
setInternalDisplayMode(true);
}
}, [yamlMode])
// alias
const onAddChild = () => {
if (
(condition.condition === 'and') ||
(condition.condition === 'or') ||
(condition.condition === 'not')
) {
onUpdate({
...condition,
conditions: condition.conditions.concat({
condition: 'or',
conditions: []
})
})
}
}
// children
let childrenConditions: JSX.Element;
if (effectiveDM) {
const Viewer = getViewer(condition);
childrenConditions = <Viewer condition={condition} onChange={onUpdate} />
} else {
const Editor = getEditor(condition);
childrenConditions = <Editor condition={condition} onChange={onUpdate} />
}
// styles
let hasChildren = false;
if (condition.condition === "not") {
hasChildren = true
} else if (condition.condition === 'and') {
hasChildren = true
} else if (condition.condition === 'or') {
hasChildren = true
}
const { classes } = useStyles({ hasChildren });
// components
const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) =>
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
return <div className={classes.root}>
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
<div className={classes.title}>
<InputList
label=""
className={classes.titleText}
current={condition.condition}
options={[
'or', 'not', 'and',
'template',
'numeric_state',
'state',
'time',
'trigger',
'zone',
]}
onChange={(n: any) => onUpdate({
...getConditionDefaultValues(n),
...condition,
condition: n,
} as any)}
/>
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
{yamlMode ? 'visual' : 'yaml'}
</button>}
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
</button>}
</div>
<div className={classes.children}>
{yamlMode && <InputYaml
label=""
value={condition}
onChange={update => onUpdate(update as any)}
resizable
/>}
{!yamlMode && childrenConditions}
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
</div>}
</div>
{children({ classes })}
</div>
}
@@ -0,0 +1,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;
}
Loaded 100 of 316 files, more files were not shown because too many files have changed in this diff. Show more