Compare commits

...
239 Commits
Author SHA1 Message Date
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
ari 7f8b75fa02 added installation instructions 2022-05-17 21:46:47 -04:00
ari d2c5310b93 new version release 2022-05-17 21:31:10 -04:00
ari a19db93c37 support for malformed automations 2022-05-17 20:48:43 -04:00
ari 6c57408f27 making PRs don't trigger deployments 2022-05-17 12:20:28 -04:00
ari b9a77746c0 updated changelog 2022-05-17 12:19:34 -04:00
ari f1ffab13be fixed up unittest 2022-05-17 12:18:15 -04:00
Ari Sosnovsky 52fcfd9271 Merge pull request #9 from issy/main 2022-05-17 07:50:30 -04:00
Issy Szemeti f435bb70aa Spelling 2022-05-17 11:05:41 +01:00
root 2598c23fd2 no local host 2022-05-16 23:56:47 -04:00
Ari Sosnovsky 070dc7c871 Update config.yaml 2022-05-16 22:51:12 -04:00
Ari Sosnovsky 3d70f04e60 Update CHANGELOG.md 2022-05-16 22:50:53 -04:00
ari cf29d9d61c added build ways 2022-05-16 22:03:27 -04:00
ari 2245fd556b removed logs 2022-05-16 21:54:22 -04:00
ari f50f22190e mobile mode 2022-05-16 21:50:05 -04:00
ari b342088b96 fixed up tsc error 2022-05-16 19:37:32 -04:00
ari c0c0d3181c v0.1.5 2022-05-16 19:27:03 -04:00
ari cf013cc342 fixed up styles 2022-05-16 19:27:03 -04:00
Ari Sosnovsky 23b869d43e Update README.md 2022-05-16 19:07:14 -04:00
Ari Sosnovsky e333e80ea3 Update README.md 2022-05-16 16:03:45 -04:00
Ari Sosnovsky 996e23038f Update README.md 2022-05-16 16:01:46 -04:00
ari 0be03b1536 updating api routing 2022-05-16 15:38:13 -04:00
ari dc726ff184 consolidated 2022-05-16 12:58:39 -04:00
ari 7e5885a34d added manual 2022-05-16 12:46:14 -04:00
ari 38396c4d98 added manual 2022-05-16 12:45:31 -04:00
ari ea832884f1 fixed deploy 2022-05-16 12:45:02 -04:00
ari ea14cd4239 trying autogenerated release 2022-05-16 12:44:25 -04:00
ari 4e19bdf4c4 changed up paths 2022-05-16 12:43:12 -04:00
Ari Sosnovsky 75c5870e00 Update config.yaml 2022-05-16 12:03:26 -04:00
Ari Sosnovsky 4b75ac9199 Update README.md 2022-05-16 11:14:11 -04:00
Ari Sosnovsky fd3780f5bc Update CHANGELOG.md 2022-05-16 11:13:49 -04:00
ari 035ac0c898 prepping 0.1.2 2022-05-16 11:05:17 -04:00
ari b331e4c5a0 using setup python instead of container 2022-05-16 11:03:56 -04:00
ari b9fb49fd32 updated test ci 2022-05-16 11:02:27 -04:00
ari a33a18c102 updated tests 2022-05-16 10:58:54 -04:00
ari defa0ce787 updated test yaml 2022-05-16 10:52:56 -04:00
ari b17e4c75b3 ran linters 2022-05-16 10:42:47 -04:00
ari ef5e66a8f1 fixed test cases 2022-05-16 10:29:05 -04:00
ari edc65da14b added cancel last run 2022-05-15 17:12:58 -04:00
ari 1ee34b234d new version 2022-05-15 17:11:38 -04:00
ari cf178e23d0 updated version 2022-05-15 17:09:34 -04:00
ari 7caac74d2d updated latest 2022-05-15 17:08:33 -04:00
ari 8b9d400a4d names 2022-05-15 16:47:43 -04:00
ari c830f35ee4 correct version 2022-05-15 16:45:08 -04:00
ari 7ac92fb98e neater job names in actions 2022-05-15 16:42:43 -04:00
ari 88ad07aabc cleaned up workflow names 2022-05-15 16:39:49 -04:00
ari 80e98d4a28 cleaned up actions 2022-05-15 16:39:20 -04:00
ari 1a2a78b1e8 setting init to false 2022-05-15 16:38:01 -04:00
ari 5c99308fa6 trying build 2022-05-15 16:24:37 -04:00
ari 0e63bb5b25 updated config 2022-05-15 16:21:29 -04:00
ari b0dd9dfddc trying ha builder 2022-05-15 16:15:03 -04:00
ari 33eae5e027 trying ha builder 2022-05-15 16:13:03 -04:00
ari 6372ec77f7 trying ha builder 2022-05-15 16:08:42 -04:00
ari c9e6bb78da build main when push 2022-05-15 16:03:57 -04:00
ari a7ec4da5cd more correct commands for deploy 2022-05-15 16:03:36 -04:00
ari 0d29642703 redoing deploy 2022-05-15 15:54:50 -04:00
ari 80121c9ee8 extracting the version correctly 2022-05-14 17:26:16 -04:00
ari 1c5bff7c47 building v0.0.15 2022-05-14 17:22:40 -04:00
ari 2af528db36 gh workflow 2022-05-14 17:19:41 -04:00
ari 9dc4c9c59f gh workflow 2022-05-14 17:05:27 -04:00
ari e2c669dcf2 gh workflow 2022-05-14 17:04:45 -04:00
ari d33df7f532 gh workflow 2022-05-14 17:04:23 -04:00
ari 48cb1207b2 gh workflow 2022-05-14 17:04:00 -04:00
ari 36cfcd625b gh workflow 2022-05-14 17:03:05 -04:00
ari 56d5ca3d08 github workflow 2022-05-14 17:01:57 -04:00
ari 06eb6e27b7 github workflow 2022-05-14 17:01:17 -04:00
ari b1a86f3bf0 0.0.14 2022-05-13 17:26:44 -04:00
ari a626a89ed3 cleand up webapp for building 2022-05-13 17:26:44 -04:00
ari 3526fbd9ee updated api 2022-05-13 17:26:44 -04:00
ari 4cfc429980 cleaned up styling for editor 2022-05-13 17:26:44 -04:00
ari bfc95db6f6 cleaned up multinode stlying 2022-05-13 17:26:44 -04:00
ari 8d804add13 cleaned up styling 2022-05-13 17:26:44 -04:00
ari 2db116ad9b fixed test 2022-05-13 17:26:44 -04:00
ari 6981eddb49 Added Gear Icon 2022-05-13 17:26:44 -04:00
ari c118ccc99b no more $smType in webapp 2022-05-13 17:26:44 -04:00
ari 429dfd5b50 removed $smType for conditions and trigger 2022-05-13 17:26:44 -04:00
ari 49fea3fabd cleaned up types 2022-05-13 17:26:44 -04:00
Ari Sosnovsky 38b0aecffa Update README.md 2022-05-05 17:23:48 -04:00
267 changed files with 19480 additions and 13049 deletions

No files matched your search

+9
View File
@@ -2,3 +2,12 @@ webapp/node_modules
webapp/build webapp/build
webapp/.storybook webapp/.storybook
webapp/.vscode webapp/.vscode
webapp/.env.local
webapp/tmux.sh
api/.env
api/.coverage
api/venv
api/build
api/.mypy_cache
api/.vscode
api/.coverage
+33
View File
@@ -0,0 +1,33 @@
name: "Manual Build"
on:
workflow_dispatch:
inputs:
version:
type: string
description: "Version Number"
required: true
jobs:
build:
runs-on: ubuntu-latest
name: "${{ github.event.inputs.version }} / ${{ matrix.arch }}"
strategy:
matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build & Push to Dockerhub
uses: home-assistant/builder@2022.03.1
with:
args: |
--${{ matrix.arch }} \
--version ${{ github.event.inputs.version }} \
--target .
+5
View File
@@ -37,6 +37,11 @@ jobs:
# Learn more about CodeQL language support at https://git.io/codeql-language-support # Learn more about CodeQL language support at https://git.io/codeql-language-support
steps: steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
with:
access_token: ${{ github.token }}
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v3
+46
View File
@@ -0,0 +1,46 @@
name: Deploy
on:
workflow_dispatch:
push:
branch: [main]
paths:
- "config.yaml"
jobs:
metadata:
runs-on: ubuntu-latest
name: Metadata
outputs:
version: ${{ steps.version.outputs.VERSION }}
changlelog: ${{ steps.changlelog.outputs.CHANGELOG }}
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Get Version
id: version
shell: bash
run: |
echo ::set-output name=VERSION::$(cat config.yaml | sed -nr 's/version: (.*)/\1/p')
- name: Get Changelog
id: changlelog
shell: bash
run: |
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
publish:
runs-on: ubuntu-latest
needs:
- metadata
name: Publish Github Release
steps:
- name: Publish Release ${{ needs.metadata.outputs.version }}
uses: actions/github-script@v6
env:
VERSION: ${{ needs.metadata.outputs.version }}
CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
with:
script: |
github.rest.repos.createRelease({
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: process.env.VERSION,
});
+105
View File
@@ -0,0 +1,105 @@
name: Test
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on:
workflow_dispatch:
push:
branch: [main]
pull_request:
branches: [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: |
echo ::set-output name=VERSION::$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
- name: ${{ steps.version.outputs.VERSION }}
shell: bash
run: |
echo ${{ steps.version.outputs.VERSION }}
python:
name: "Python Tests"
runs-on: ubuntu-latest
needs:
- metadata
strategy:
matrix:
action:
- lint
- coverage
- security-checks
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: 3.9
- name: Install Dependencies
run: cd api && make setup
- name: Echo dependencies
run: cd api && ./venv/bin/pip freeze
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
run: cd api && make ${{ matrix.action }}
nodejs:
name: "NodeJs Tests"
runs-on: ubuntu-latest
needs:
- metadata
strategy:
matrix:
action:
- "test:ci"
- "tsc:ci"
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
cache: "yarn"
cache-dependency-path: webapp/yarn.lock
- name: Install Dependencies
run: cd webapp && yarn install
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
run: cd webapp && yarn ${{ matrix.action }}
deploy:
runs-on: ubuntu-latest
name: Build & Publish ${{ matrix.arch }}
needs:
- metadata
- nodejs
- python
strategy:
matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
uses: home-assistant/builder@2022.03.1
with:
args: |
--${{ matrix.arch }} \
--no-latest \
--version ${{ needs.metadata.outputs.version }} \
--target .
+1
View File
@@ -0,0 +1 @@
.vscode/*.log
+4 -1
View File
@@ -8,5 +8,8 @@
"*test_*.py" "*test_*.py"
], ],
"python.testing.pytestEnabled": false, "python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": true "python.testing.unittestEnabled": true,
"yaml.schemas": {
"https://json.schemastore.org/github-action.json": ".github/workflows/*.yml"
}
} }
+88 -3
View File
@@ -1,4 +1,90 @@
# Changelog # Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge)
## [0.1.22] - Many Visual improvements
- Deprecated several custom components in favor of mui.com
- Device Editor now has support for 99% of diplay types
- Condition Device is implemented
- Improved naming autogen for trigger & choose
## [0.1.21] - Service Editor
- first version of service editor
- reloading automations on save
## [0.1.20] - UI Bugfixes
- Using MUI elements for input time
- Added delay action / wait_on_triggers action
- Added enabled/disabled flag in node editor
- Optional flip vertical during desktop mode
- Fixed up modal clipping
## [0.1.19] - Vertical mobile mode
- in mobile mode we draw the graphs vertically now
## [0.1.17] - Websockets
- Connected to HA main websocket -- now we retrieve real-time information about
- Device names
- Entity names/ids
- Autocomplete for devices and entities
## [0.1.14] - Material UI + Autocomplete
- Brought some Material UI elements for input and text
- Autocomplete for tags
- Using 'id' as alias for trigger (as it seems to break HA otherwise)
- Not using 'alias' for conditions, always auto-generating it (again, this used to break HA)
- Added missing `data` object to service-actions
## [0.1.13] - YAML
- Better YAML
- Rewrote yaml parser/loader to use pyyaml and safe mode
- Cleaned up description vs alias
## [0.1.12] - Less Intense Error Messages
- Added more node-based errors (this way it's easier to see where validations failed)
- Made the validators less strict in order to capture more edge cases that HA supports
- Nicer auto-generated descriptions for some trigger nodes
## [0.1.10] - More Bug Fixes
- Allowing null or undefined values for metadata fields
- Trigger.platform==time will now have the .at property better supported
## [0.1.9] - Fixed up invalid types for various triggers
- Some triggers had invalid types and were causing a false-positive validation
## [0.1.8] - Support for Malformed Automations
- API will no longer error out on missing values or invalid lists
- Frontend has support for displaying bad automations
## [0.1.6] - Mobile Mode
- Improved mobile mode
- Fixed up arrow styles due to typos
- Added selection color
## [0.1.2] - Docker Hub Images
- Publishing images to docker hub is now stable
## [0.0.15] - Publish to dockerhub
- Publishing images to docker hub
## [0.0.14] - Using vanila ha yaml
- Supporing vanilla out of the box HA yaml as oppose to parsing them (no more $smType)
- Conditions have now a more a explicit node
## [0.0.13] - Better Styling with react-flow ## [0.0.13] - Better Styling with react-flow
@@ -20,8 +106,7 @@
## [0.0.9] - First Working Version ## [0.0.9] - First Working Version
- Instalable verion via github - Instalable verion via github
- Initial POC done - Initial POC done
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+20 -16
View File
@@ -1,11 +1,16 @@
# <--- Build Args --> # <--- Pre-Build Args -->
ARG BUILD_ARCH ARG BUILD_ARCH
ARG BUILD_VERSION
# <--- Image Setup --> # <--- Image Setup -->
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14 FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
WORKDIR /app WORKDIR /app
# <--- Post-Build Args -->
ARG BUILD_VERSION
# <--- Environment Variables -->
ENV BUILD_VERSION $BUILD_VERSION
# <--- System Wide Dependencies --> # <--- System Wide Dependencies -->
ENV LANG C.UTF-8 ENV LANG C.UTF-8
RUN apk add --no-cache \ RUN apk add --no-cache \
@@ -13,29 +18,26 @@ RUN apk add --no-cache \
npm \ npm \
build-base \ build-base \
python3-dev python3-dev
RUN pip install -U wheel setuptools pip && \
npm i -g yarn # <--- Scripts -->
COPY docker/bin /app/bin
# <--- PREP -->
RUN /app/bin/prep.sh
# <--- Python Dependencies --> # <--- Python Dependencies -->
COPY api/setup.py /app/setup.py COPY api/setup.py /app/setup.py
RUN pip install . /app
# <--- Webapp Build --> # <--- Webapp Build -->
COPY webapp/ /app/web-builder COPY webapp/ /app/web-builder
RUN cd /app/web-builder && \ RUN cd /app/web-builder && \
yarn && \ echo "REACT_APP_BUILD_VERSION=${BUILD_VERSION}" > /app/web-builder/.env.production
yarn build && \
cp -r /app/web-builder/build /app/web && \ # <--- BUILD -->
rm -rf /app/web-builder RUN /app/bin/build.sh /app /app/web-builder
# <--- Api Code --> # <--- Api Code -->
COPY api/src /app/src COPY api/src /app/src
COPY run.sh /app/run.sh
RUN chmod +x /app/run.sh
# <--- Environment Variables -->
ENV HASSIO_TOKEN ""
ENV BUILD_VERSION $BUILD_VERSION
# <--- Ports --> # <--- Ports -->
EXPOSE 8000 EXPOSE 8000
@@ -45,5 +47,7 @@ LABEL \
io.hass.type="addon" \ io.hass.type="addon" \
io.hass.arch="armhf|aarch64|i386|amd64" io.hass.arch="armhf|aarch64|i386|amd64"
CMD [ "/app/run.sh" ] ENTRYPOINT [ "/app/bin/run.sh" ]
CMD [ "/app" ]
LABEL org.opencontainers.image.source https://github.com/asosnovsky/Shortumation
+32 -6
View File
@@ -1,18 +1,44 @@
DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml BUILD_TAG=$(shell git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
DC=BUILD_TAG=${BUILD_TAG} docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
local_run: 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:
$(DC) build $(DC) build
build-no-cache:
$(DC) build --no-cache
push:
$(DC) push
start:
$(DC) up -d $(DC) up -d
sleep 1 sleep 1
$(DC) ps $(DC) ps
local_logs: logs:
$(DC) logs -f $(DC) logs -f
local_ps: ps:
$(DC) ps $(DC) ps
stop:
local_stop:
$(DC) stop $(DC) stop
bash:
$(DC) exec addon bash
config:
$(DC) config
+44 -4
View File
@@ -1,8 +1,19 @@
# Shortumation # Shortumation ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=platsic)
![image](https://user-images.githubusercontent.com/7451445/165433007-371cc1f1-39cf-4857-8bba-331d4048750e.png) [![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/asosnovsky/Shortumation/Manual%20Build)
| | 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 [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/). A better way to write automations in home-assistant without having to install and run a seperate automation engine!
![image](https://user-images.githubusercontent.com/7451445/170770378-122c6722-993d-40ac-801d-387cfaccd41f.png)
![image](https://user-images.githubusercontent.com/7451445/170770572-fd38950a-b6b4-4b49-8c94-fb0a5f3008ce.png)
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
## Features ## Features
@@ -10,12 +21,41 @@ A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI
- [X] See all automations in one common view - [X] See all automations in one common view
- [X] Automation Manager - [X] Automation Manager
- [X] Tags for automation organization - [X] Tags for automation organization
- [X] Autocomplete fields for entities/devices
- [ ] Script Manager - [ ] Script Manager
- [ ] Use secrets and global parameters - [ ] Use secrets and global parameters
- [ ] Autocomplete fields for entities/devices
- [ ] Autocomplete fields for template editor - [ ] Autocomplete fields for template editor
- [ ] Autocomplete fields for referencing scripts - [ ] Autocomplete fields for referencing scripts
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1). See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
## Installation
### Addon
Add the repository URL under **Supervisor → Add-on store → ⋮ → Manage add-on repositories**:
https://github.com/asosnovsky/Shortumation
It should now appear in your `Add-on Store` and you should be able to install it!
### Containerized
Please note that this way of using Shortumation is **not future proof**, currently we use the `/config/automation.yaml` file as our source of truth for the automations. Which means that we do not need access to the HA API or Websockets. In future release you may need to configure some additional compomenents to enable this.
If this warning does not scare you or you still want to try things out, then take a look at the example [docker-compose.yaml](example/containerized/docker-compose.yaml).
## FAQ
**How is this different from Node-Red?**
> Node-Red is both an execution engine and an automation editor, which means that in order for you automations to run you have to have an additional component running and executing the automations. Shortumation simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database)
**Which HA Installation does this support?**
> Currently this is only tested on HA OS. However, you should be able to get it working supervised installations as well (as they support addons). If you want to make it work for Container or Core, you will need to do some additional leg-work and I welcome a PR to get this working (it should be just a matter of mounting the `/config` path to the container running the images in this repo).
**Which version of HA does this require?**
> Since I am working on this project on my own, I can only test it against my own HA installations at home, and I tend to keep things as up to date as possible. The lowest version of HA this was tested on is `core-2022.5.4`
+12
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.
+14
View File
@@ -0,0 +1,14 @@
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)
+2 -2
View File
@@ -10,7 +10,7 @@ setup:
$(PIP) install .[dev] $(PIP) install .[dev]
lint: lint:
$(VENV_BIN)/vulture --exclude src $(VENV_BIN)/vulture src .vulture_whitelist
$(MAKE) lint-project $(MAKE) lint-project
$(MAKE) lint-tests $(MAKE) lint-tests
@@ -33,7 +33,7 @@ test:
coverage: coverage:
$(VENV_BIN)/coverage run -m unittest discover tests $(VENV_BIN)/coverage run -m unittest discover tests
$(VENV_BIN)/coverage report -m --fail-under=90 $(VENV_BIN)/coverage report -m --fail-under=80
clean: clean:
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
+12
View File
@@ -29,3 +29,15 @@ exclude = '''
[tool.coverage.run] [tool.coverage.run]
omit = ["./venv/*", "tests/*"] omit = ["./venv/*", "tests/*"]
[[tool.mypy.overrides]]
module = "decouple.*"
ignore_missing_imports = true
[[tool.mypy.overrides]]
module = "ruamel.*"
ignore_missing_imports = true
[[tool.mypy.overrides]]
module = "tests.*"
ignore_missing_imports = true
+3 -2
View File
@@ -4,7 +4,7 @@ import setuptools # type: ignore
setuptools.setup( setuptools.setup(
python_requires=">=3.9", python_requires=">=3.9",
install_requires=[ install_requires=[
"ruamel.yaml==0.17.17", "PyYAML==6.0",
"fastapi==0.70.0", "fastapi==0.70.0",
"pydantic==1.8.2", "pydantic==1.8.2",
"uvicorn[standard]==0.15.0", "uvicorn[standard]==0.15.0",
@@ -14,13 +14,14 @@ setuptools.setup(
"dev": [ "dev": [
"mypy==0.910", "mypy==0.910",
"mypy-extensions==0.4.3", "mypy-extensions==0.4.3",
"black==21.7b0", "black==22.3.0",
"bandit==1.7.0", "bandit==1.7.0",
"isort==5.9.3", "isort==5.9.3",
"coverage==5.5", "coverage==5.5",
"pre-commit==2.13.0", "pre-commit==2.13.0",
"vulture==2.3", "vulture==2.3",
"types-requests==2.25.6", "types-requests==2.25.6",
"types-PyYAML==6.0.7",
"requests==2.27.0", "requests==2.27.0",
], ],
}, },
+13 -7
View File
@@ -1,17 +1,18 @@
from sys import prefix
from fastapi import FastAPI from fastapi import FastAPI
from fastapi.staticfiles import StaticFiles
from fastapi.middleware.cors import CORSMiddleware from fastapi.middleware.cors import CORSMiddleware
from fastapi.staticfiles import StaticFiles
from src.automations.manager import AutomationManager from src.automations.manager import AutomationManager
from src.env import ROOT_FOLDER, ORIGIN from src.env import API_PREFIX, ORIGIN, ROOT_FOLDER
from .routes import ping, automations, details
from .routes import automations, details, ping, socket
def make_app(automation_mgr: AutomationManager) -> FastAPI: def make_app(automation_mgr: AutomationManager) -> FastAPI:
app = FastAPI() app = FastAPI()
if (ROOT_FOLDER / "web").exists(): if (ROOT_FOLDER / "web").exists():
app.mount( app.mount(
"/web", f"{API_PREFIX}/web",
StaticFiles( StaticFiles(
directory=ROOT_FOLDER / "web", directory=ROOT_FOLDER / "web",
html=True, html=True,
@@ -28,6 +29,11 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
allow_headers=["*"], allow_headers=["*"],
) )
app.include_router(ping.router, prefix="/ping") app.include_router(ping.router, prefix="/ping")
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations") app.include_router(
app.include_router(details.make_details_router(automation_mgr.hass_config), prefix="/details") automations.make_automation_router(automation_mgr), prefix=f"{API_PREFIX}/automations"
)
app.include_router(
details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details"
)
app.include_router(socket.router, prefix=f"{API_PREFIX}/socket")
return app return app
+4 -3
View File
@@ -1,5 +1,5 @@
from fastapi import APIRouter, HTTPException from fastapi import APIRouter, HTTPException
from src.automations.manager import AutomationManager
from src.api.types import ( from src.api.types import (
DeleteAutoRequest, DeleteAutoRequest,
ListData, ListData,
@@ -7,6 +7,7 @@ from src.api.types import (
UpdateAutoRequest, UpdateAutoRequest,
) )
from src.automations.errors import FailedDeletion from src.automations.errors import FailedDeletion
from src.automations.manager import AutomationManager
from src.automations.types import AutomationData from src.automations.types import AutomationData
@@ -24,11 +25,11 @@ def make_automation_router(automations: AutomationManager) -> APIRouter:
), ),
) )
@router.post("") @router.post("/item")
def upsert_auto(body: UpdateAutoRequest): def upsert_auto(body: UpdateAutoRequest):
automations.update(body.index, body.data) automations.update(body.index, body.data)
@router.delete("") @router.delete("/item")
def delete_auto(body: DeleteAutoRequest): def delete_auto(body: DeleteAutoRequest):
try: try:
automations.delete(body.index) automations.delete(body.index)
+5 -5
View File
@@ -1,21 +1,21 @@
from fastapi import APIRouter from fastapi import APIRouter
from datetime import datetime
from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
from src.hass_config import HassConfig from src.hass_config import HassConfig
from src.env import BUILD_VERSION
def make_details_router(hass_config: HassConfig) -> APIRouter: def make_details_router(hass_config: HassConfig) -> APIRouter:
router = APIRouter() router = APIRouter()
@router.get("/") @router.get("/")
def read_ping(): def read_details():
return { return {
"version": BUILD_VERSION, "version": BUILD_VERSION,
"hassio_token": HASSIO_TOKEN,
"hassio_url": HASSIO_WS,
"config": hass_config.get_configuration_path(), "config": hass_config.get_configuration_path(),
"tags": hass_config.get_automation_tags_path(), "tags": hass_config.get_automation_tags_path(),
"autos": hass_config.get_automation_path(), "autos": hass_config.get_automation_path(),
} }
return router return router
+2 -1
View File
@@ -1,6 +1,7 @@
from fastapi import APIRouter
from datetime import datetime from datetime import datetime
from fastapi import APIRouter
from src.env import BUILD_VERSION from src.env import BUILD_VERSION
router = APIRouter() router = APIRouter()
+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(),
)
+2
View File
@@ -1,7 +1,9 @@
from typing import Generic, List, TypeVar from typing import Generic, List, TypeVar
from pydantic import BaseModel from pydantic import BaseModel
from pydantic.fields import Field from pydantic.fields import Field
from pydantic.generics import GenericModel from pydantic.generics import GenericModel
from src.automations.types import ExtenededAutomationData from src.automations.types import ExtenededAutomationData
DataT = TypeVar("DataT") DataT = TypeVar("DataT")
+1 -1
View File
@@ -1,6 +1,6 @@
from src.api.app import make_app
from src.automations.manager import AutomationManager from src.automations.manager import AutomationManager
from src.hass_config import find_hass_config from src.hass_config import find_hass_config
from src.api.app import make_app
hass_config = find_hass_config() hass_config = find_hass_config()
app = make_app(AutomationManager(hass_config)) app = make_app(AutomationManager(hass_config))
+34 -14
View File
@@ -1,11 +1,12 @@
from itertools import chain from typing import Any, Iterator, Union
from typing import Iterable, Iterator
from pydantic.error_wrappers import ValidationError from pydantic.error_wrappers import ValidationError
from src.automations.tags import TagManager
from src.json_serializer import normalize_obj from src.json_serializer import normalize_obj
from .types import AutomationData, AutomationMetdata, ExtenededAutomationData
from .parsers import _parse_actions
from .errors import InvalidAutomationFile from .errors import InvalidAutomationFile
from .types import AutomationMetdata, ExtenededAutomationData
# Single loader # Single loader
def load_automation( def load_automation(
@@ -25,16 +26,35 @@ def load_automation(
try: try:
yield ExtenededAutomationData( yield ExtenededAutomationData(
metadata=AutomationMetdata.parse_obj(auto_raw), metadata=AutomationMetdata.parse_obj(auto_raw),
sequence=list( condition=ifempty_or_null_then_list(load_conditions(auto_raw.get("condition", []))),
_parse_actions( sequence=ifempty_or_null_then_list(load_conditions(auto_raw.get("action", []))),
chain( trigger=ifempty_or_null_then_list(normalize_obj(auto_raw.get("trigger", []))),
auto_raw.get("condition", []),
auto_raw.get("action", []),
)
)
),
trigger=[normalize_obj(obj) for obj in auto_raw.get("trigger", [])],
tags=tags, tags=tags,
) )
except ValidationError as err: except ValidationError as err:
raise InvalidAutomationFile from err raise InvalidAutomationFile from err
def ifempty_or_null_then_list(obj: Any):
if not isinstance(obj, list):
return []
else:
return obj
def load_conditions(conditions: Union[dict, list, str]):
if isinstance(conditions, list):
return list(map(ensure_condition_dictionary, conditions))
elif not conditions:
return []
else:
return [ensure_condition_dictionary(conditions)]
def ensure_condition_dictionary(c: Union[str, dict]):
c = normalize_obj(c)
if isinstance(c, str):
return {"condition": "template", "value_template": c}
elif isinstance(c, dict):
return c
raise InvalidAutomationFile(f"Invalid type for condition object {c}")
+3 -1
View File
@@ -1,7 +1,9 @@
from typing import Iterator, List, Optional from typing import Iterator, List, Optional
from src.automations.errors import FailedDeletion from src.automations.errors import FailedDeletion
from src.automations.types import AutomationData, ExtenededAutomationData from src.automations.types import AutomationData, ExtenededAutomationData
from src.hass_config.loader import HassConfig from src.hass_config.loader import HassConfig
from .loader import load_automation from .loader import load_automation
@@ -45,7 +47,7 @@ class AutomationManager:
tags[index] = automation.tags tags[index] = automation.tags
self.hass_config.save_automations(automations) self.hass_config.save_automations(automations)
self.hass_config.save_tags(tags) self.hass_config.save_tags(tags)
def delete(self, index: int): def delete(self, index: int):
automations: List[dict] = [] automations: List[dict] = []
deleted = False deleted = False
-88
View File
@@ -1,88 +0,0 @@
from typing import Iterable, Union
from src.json_serializer import json_dumps, normalize_obj
from src.yaml_serializer.types import SecretValue, NOT_IMPLEMENTED_SV_MSG
from .types import AutomationActionNode, AutomationConditionNode
def _parse_actions(
raw_actions: Iterable[Union[dict, str]]
) -> Iterable[Union[AutomationActionNode, AutomationConditionNode]]:
for raw_c in raw_actions:
action_type = "unknown"
if isinstance(raw_c, str):
yield from _parse_conditions([raw_c])
continue
elif isinstance(raw_c, dict):
if raw_c.get("condition"):
yield from _parse_conditions([raw_c])
continue
elif raw_c.get("service"):
action_type = "service"
action_data = normalize_obj(raw_c)
elif raw_c.get("repeat"):
action_type = "repeat"
repeat_data = raw_c.pop("repeat")
action_data = {
**raw_c,
"repeat": {
"count": repeat_data.get("count", 0),
"sequence": list(_parse_actions(repeat_data.get("sequence", []))),
},
}
elif raw_c.get("wait_template"):
action_type = "wait"
action_data = normalize_obj(raw_c)
elif raw_c.get("event"):
action_type = "event"
action_data = normalize_obj(raw_c)
elif raw_c.get("type") and raw_c.get("device_id"):
action_type = "device"
action_data = normalize_obj(raw_c)
elif raw_c.get("choose"):
action_type = "choose"
choose_data = raw_c.pop("choose")
default_data = raw_c.pop("default", [])
action_data = {
**raw_c,
"choose": [
{
"conditions": list(_parse_conditions(option.get("conditions", []))),
"sequence": list(_parse_actions(option.get("sequence", []))),
}
for option in choose_data
],
"default": list(_parse_actions(default_data)),
}
else:
action_data = normalize_obj(raw_c)
yield AutomationActionNode(
action=action_type,
action_data=action_data,
)
def _parse_conditions(
raw_conditions: Iterable[Union[dict, str]]
) -> Iterable[AutomationConditionNode]:
for raw_c in raw_conditions:
if isinstance(raw_c, str):
yield AutomationConditionNode(
condition="template",
condition_data={"value_template": raw_c},
)
elif isinstance(raw_c, SecretValue):
yield AutomationConditionNode(
condition="template",
condition_data={"value_template": NOT_IMPLEMENTED_SV_MSG},
)
elif isinstance(raw_c, dict):
condition = raw_c.pop("condition")
yield AutomationConditionNode(
condition=condition,
condition_data=normalize_obj(raw_c),
)
else:
yield AutomationConditionNode(
condition="template",
condition_data=json_dumps(raw_c),
)
+5 -6
View File
@@ -1,15 +1,14 @@
from pathlib import Path from pathlib import Path
from typing import Dict from typing import Dict
from src.yaml_serializer import dump_yaml, load_yaml from src.yaml_serializer import dump_yaml, load_yaml
class TagManager(Dict[int, Dict[str, str]]): class TagManager(Dict[int, Dict[str, str]]):
def save(self, path: Path): def save(self, path: Path):
path.write_text(dump_yaml(dict(self))) path.write_text(dump_yaml(dict(self)))
@classmethod @classmethod
def load(cls, path: Path): def load(cls, path: Path):
with path.open('r') as fp: with path.open("r") as fp:
return cls(load_yaml(fp)) return cls(load_yaml(fp))
+11 -29
View File
@@ -1,27 +1,7 @@
from typing import Dict, List, Literal, Optional, Union from typing import Dict, List, Optional, Union
from pydantic.fields import Field
from pydantic import BaseModel from pydantic import BaseModel
from pydantic.fields import Field
class AutomationConditionNode(BaseModel):
condition: str
condition_data: dict
node_type: Literal["condition"] = Field(alias="$smType", default="condition")
def to_primitive(self):
return {
**self.condition_data,
"condition": self.condition,
}
class AutomationActionNode(BaseModel):
action: str
action_data: dict
node_type: Literal["action"] = Field(alias="$smType", default="action")
def to_primitive(self):
return self.action_data
class AutomationMetdata(BaseModel): class AutomationMetdata(BaseModel):
@@ -29,21 +9,23 @@ class AutomationMetdata(BaseModel):
alias: Optional[str] = None alias: Optional[str] = None
description: Optional[str] = None description: Optional[str] = None
trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None
mode: Literal["single", "restart", "queued", "parallel"] = "single" mode: str = "single"
class AutomationData(BaseModel): class AutomationData(BaseModel):
metadata: AutomationMetdata metadata: AutomationMetdata
trigger: List[dict] = [] trigger: List[dict] = []
sequence: List[Union[AutomationConditionNode, AutomationActionNode]] = [] condition: List[dict] = []
sequence: List[dict] = []
def to_primitive(self): def to_primitive(self):
return { return {
**self.metadata.dict(), **self.metadata.dict(exclude_unset=True, exclude_none=True),
"trigger": self.trigger, "trigger": self.trigger,
"condition": [], "condition": self.condition,
"action": [action.to_primitive() for action in self.sequence], "action": self.sequence,
} }
class ExtenededAutomationData(AutomationData): class ExtenededAutomationData(AutomationData):
tags: Dict[str, str] = Field(default_factory=dict) tags: Dict[str, str] = Field(default_factory=dict)
+5 -3
View File
@@ -1,9 +1,11 @@
from email.policy import default
from decouple import config, Csv
from pathlib import Path from pathlib import Path
from decouple import Csv, config
ROOT_FOLDER = Path(__file__).parent.parent.absolute() ROOT_FOLDER = Path(__file__).parent.parent.absolute()
BUILD_VERSION = config("BUILD_VERSION", "0.0.0") BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
HASSIO_TOKEN = config("SUPERVISOR_TOKEN", "")
HASSIO_WS = config("HASSIO_WS", "ws://supervisor/core/websocket")
LOG_LEVEL = config("LOG_LEVEL", "INFO") LOG_LEVEL = config("LOG_LEVEL", "INFO")
ORIGIN = config("ORIGIN", cast=Csv(), default="*") API_PREFIX = config("API_PREFIX", "")
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
+9 -5
View File
@@ -1,7 +1,8 @@
import os import os
from typing import cast
from decouple import config
from pathlib import Path from pathlib import Path
from decouple import config
from .loader import HassConfig from .loader import HassConfig
@@ -11,10 +12,13 @@ def find_hass_config() -> HassConfig:
print("using USE_EXAMPLE_REPO") print("using USE_EXAMPLE_REPO")
from tests.utils import create_copy_of_example_config from tests.utils import create_copy_of_example_config
return HassConfig(create_copy_of_example_config()) path = create_copy_of_example_config()
print("|-> ", path)
return HassConfig(path)
if "HASSIO_TOKEN" in os.environ: config_dir = Path("/config")
return HassConfig(Path("/config")) if config_dir.is_dir():
return HassConfig(config_dir)
"""Put together the default configuration directory based on the OS.""" """Put together the default configuration directory based on the OS."""
data_dir = Path(config("APPDATA", None) if os.name == "nt" else os.path.expanduser("~")) data_dir = Path(config("APPDATA", None) if os.name == "nt" else os.path.expanduser("~"))
+5 -5
View File
@@ -1,9 +1,10 @@
from pathlib import Path from pathlib import Path
from typing import List, Optional from typing import List, Optional
from src.automations.tags import TagManager
from src.yaml_serializer import load_yaml, dump_yaml from src.automations.tags import TagManager
from src.yaml_serializer import dump_yaml, load_yaml
from src.yaml_serializer.types import IncludedYaml from src.yaml_serializer.types import IncludedYaml
from .errors import MissingFile from .errors import MissingFile
@@ -25,7 +26,7 @@ class HassConfig:
except FileNotFoundError as err: except FileNotFoundError as err:
raise MissingFile("automations.yaml") from err raise MissingFile("automations.yaml") from err
return self.configurations["automation"] return self.configurations["automation"]
@property @property
def automation_tags(self) -> TagManager: def automation_tags(self) -> TagManager:
tag_path = self.get_automation_tags_path() tag_path = self.get_automation_tags_path()
@@ -35,7 +36,6 @@ class HassConfig:
else: else:
return TagManager.load(tag_path) return TagManager.load(tag_path)
def get_automation_tags_path(self) -> Path: def get_automation_tags_path(self) -> Path:
return self.root_path / ".shortumations" / "tags.yaml" return self.root_path / ".shortumations" / "tags.yaml"
@@ -66,4 +66,4 @@ class HassConfig:
) )
def save_tags(self, tags: TagManager): def save_tags(self, tags: TagManager):
tags.save(self.get_automation_tags_path()) tags.save(self.get_automation_tags_path())
+2 -1
View File
@@ -1,5 +1,5 @@
import json import json
from typing import Any from typing import Any, List
def json_dumps(obj: Any) -> str: def json_dumps(obj: Any) -> str:
@@ -34,6 +34,7 @@ def normalize_obj(obj: Any) -> Any:
or isinstance(obj, int) or isinstance(obj, int)
or isinstance(obj, float) or isinstance(obj, float)
or isinstance(obj, bool) or isinstance(obj, bool)
or obj is None
): ):
return obj return obj
else: else:
+4
View File
@@ -14,3 +14,7 @@ else:
logging.basicConfig(level=logging.NOTSET) logging.basicConfig(level=logging.NOTSET)
logger = logging.getLogger() logger = logging.getLogger()
def get_logger(name: str):
return logging.getLogger(name)
+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())
+15 -4
View File
@@ -1,6 +1,10 @@
import io import io
from typing import Any, Union, TextIO from typing import Any, TextIO, Union
from src.yaml_serializer.base_yaml import yaml
import yaml
from src.yaml_serializer.dumper import YamlSafeDumper
from src.yaml_serializer.loader import YamlSafeLoader
def dump_yaml(obj: Any) -> str: def dump_yaml(obj: Any) -> str:
@@ -13,7 +17,14 @@ def dump_yaml(obj: Any) -> str:
str str
""" """
stream = io.StringIO() stream = io.StringIO()
yaml.dump(obj, stream) yaml.dump( # nosec
obj,
stream,
default_flow_style=False,
allow_unicode=True,
sort_keys=False,
Dumper=YamlSafeDumper,
)
stream.seek(0) stream.seek(0)
return stream.read() return stream.read()
@@ -27,4 +38,4 @@ def load_yaml(yaml_stream: TextIO) -> Union[dict, list]:
Returns: Returns:
List[dict, list] List[dict, list]
""" """
return yaml.load(yaml_stream) return yaml.load(yaml_stream, Loader=YamlSafeLoader) # nosec
-14
View File
@@ -1,14 +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
+26
View File
@@ -0,0 +1,26 @@
import yaml
from src.yaml_serializer.types import (
IncludedYaml,
IncludedYamlDir,
SecretValue,
)
class YamlSafeLoader(yaml.SafeLoader):
pass
# def compose_node(self, parent: yaml.nodes.Node, index: int) -> yaml.nodes.Node: # type: ignore[override]
# """Annotate a node with the first line it was seen."""
# last_line: int = self.line
# node: yaml.nodes.Node = super().compose_node(parent, index) # type: ignore[assignment]
# node.__line__ = last_line + 1 # type: ignore[attr-defined]
# return node
YamlSafeLoader.add_constructor("!include", IncludedYaml.from_yaml)
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)
+3 -2
View File
@@ -1,6 +1,7 @@
from typing import NamedTuple 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): class IncludedYaml(NamedTuple):
@@ -0,0 +1,15 @@
- id: '1652069225859'
alias: 'Climate - Pref temperature '
description: ''
trigger:
- platform: state
entity_id: input_number.preferred_temperature
condition: []
action:
- service: climate.set_temperature
data:
temperature:
'[object Object]':
target:
entity_id: climate.main_floor
mode: single
@@ -0,0 +1,2 @@
# empty configuration file
cloud:
@@ -0,0 +1,77 @@
0:
Type: HA
1:
Type: HA
2:
Type: Button
Room: Living
3:
Type: Button
Room: Kitchen
4:
Type: Button
Room: Kitchen
5:
Type: Button
Room: Kitchen
6:
Type: Button
Room: Kitchen
7:
Type: Button
Room: Living
8:
Type: Button
Room: Baby
9:
Type: Button
Room: Baby
10:
Type: Button
Room: Baby
11:
Type: Routine
Room: Baby
12:
Type: Routine
Room: Baby
13:
Type: Window
Room: Office
14:
Type: Door
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:
Type: Routine
Room: Baby
24:
Type: Climate
Climate: Heat
25:
Type: Climate
Climate: Time
26:
Type: Routine
27:
Type: Button
Room: Bedroom
BadOne: yes
+28
View File
@@ -811,3 +811,31 @@
device_id: das2qdasdasdasadaasd device_id: das2qdasdasdasadaasd
default: [] default: []
mode: single mode: single
- id: 'baddy-1'
alias: 'bad triggers'
description: ''
trigger: ""
condition: []
action: []
mode: single
- id: 'baddy-2'
alias: 'null things'
description: ''
trigger:
condition:
action:
mode: single
- id: 'baddy-3'
alias: 'big null things'
description:
trigger:
condition:
action:
mode: single
- id: 'bad mode'
alias: 'bade mode'
description: ""
trigger: []
condition: []
action: []
mode: bad
+228 -18
View File
@@ -1,8 +1,15 @@
from unittest import TestCase from unittest import TestCase
import yaml
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from src.api.app import make_app from src.api.app import make_app
from src.automations.types import AutomationData, AutomationMetdata, ExtenededAutomationData from src.automations.types import (
from tests.utils import get_example_automation_loader AutomationData,
AutomationMetdata,
ExtenededAutomationData,
)
from tests.utils import HA_CONFIG2_EXAMPLE, get_example_automation_loader
class BaseTestCase(TestCase): class BaseTestCase(TestCase):
@@ -16,6 +23,9 @@ class BaseTestCase(TestCase):
class automation_list_tests(BaseTestCase): class automation_list_tests(BaseTestCase):
test_params = {"total": 32, "subtest2_found_items": 7, "subtest1_found_items": 10}
def test_get_list_of_everything(self): def test_get_list_of_everything(self):
data = self.client.post( data = self.client.post(
"/automations/list", "/automations/list",
@@ -33,8 +43,8 @@ class automation_list_tests(BaseTestCase):
"limit": 50, "limit": 50,
}, },
) )
self.assertEqual(d["totalItems"], 28) self.assertEqual(d["totalItems"], self.test_params["total"])
self.assertEqual(len(d["data"]), 28) self.assertEqual(len(d["data"]), self.test_params["total"])
def test_subset1(self): def test_subset1(self):
data = self.client.post( data = self.client.post(
@@ -53,8 +63,8 @@ class automation_list_tests(BaseTestCase):
"limit": 10, "limit": 10,
}, },
) )
self.assertEqual(d["totalItems"], 28) self.assertEqual(d["totalItems"], self.test_params["total"])
self.assertEqual(len(d["data"]), 10) self.assertEqual(len(d["data"]), self.test_params["subtest1_found_items"])
def test_subset2(self): def test_subset2(self):
data = self.client.post( data = self.client.post(
@@ -73,32 +83,48 @@ class automation_list_tests(BaseTestCase):
"limit": 10, "limit": 10,
}, },
) )
self.assertEqual(d["totalItems"], 28) self.assertEqual(d["totalItems"], self.test_params["total"])
self.assertEqual(len(d["data"]), 3) self.assertEqual(len(d["data"]), self.test_params["subtest2_found_items"])
class automation2_lists_tests(automation_list_tests):
test_params = {
"total": 1,
"subtest2_found_items": 0,
"subtest1_found_items": 1,
}
def setUp(self) -> None:
(
self.config_folder,
self.hass_config,
self.automation_loader,
) = get_example_automation_loader(HA_CONFIG2_EXAMPLE)
self.client = TestClient(make_app(self.automation_loader))
class automation_update_tests(BaseTestCase): class automation_update_tests(BaseTestCase):
def test_insert_new(self): def test_insert_new(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
self.assertEqual(resp.json()["totalItems"], 28) self.assertEqual(resp.json()["totalItems"], 32)
resp = self.client.post( resp = self.client.post(
"/automations", "/automations/item",
json={ json={
"index": 29, "index": 33,
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(), "data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
}, },
) )
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 28}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 32})
data = resp.json() data = resp.json()
self.assertEqual(data["totalItems"], 29) self.assertEqual(data["totalItems"], 33)
self.assertEqual(data["data"][0]["metadata"]["id"], "testme") self.assertEqual(data["data"][0]["metadata"]["id"], "testme")
def test_update_some(self): def test_update_some(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
original_auto = resp.json()["data"][0] original_auto = resp.json()["data"][0]
resp = self.client.post( resp = self.client.post(
"/automations", "/automations/item",
json={ json={
"index": 20, "index": 20,
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(), "data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
@@ -108,19 +134,203 @@ class automation_update_tests(BaseTestCase):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
new_auto = resp.json()["data"][0] new_auto = resp.json()["data"][0]
self.assertNotEqual(original_auto, new_auto) self.assertNotEqual(original_auto, new_auto)
self.assertEqual(ExtenededAutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto) self.assertEqual(
ExtenededAutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto
)
def test_consistent_standard_1(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 15})
original_auto = resp.json()["data"][0]
original_auto["metadata"]["alias"] = "I CHANGED!"
resp = self.client.post(
"/automations/item",
json={
"index": 15,
"data": original_auto,
},
)
self.assertEqual(resp.status_code, 200)
with (self.config_folder / "automations.yaml").open("r") as fp:
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")))
self.assertDictEqual(
disk_data,
{"id": "1629422438707", "alias": "I CHANGED!", "description": "", "mode": "single"},
)
self.assertListEqual(
trigger, [{"platform": "time", "at": "input_datetime.vita_night_pump_time"}]
)
self.assertListEqual(
condition,
[
{
"conditions": [
{
"condition": "time",
"after": "input_datetime.vita_night_pump_time",
"before": "00:00:00",
},
{"condition": "time", "after": "00:00:00", "before": "06:00:00"},
],
"condition": "and",
},
],
)
self.assertListEqual(
action,
[
{
"service": "light.turn_on",
"target": {"entity_id": "light.bulb_staircase", "area_id": "living_room"},
"data": {"brightness_pct": 40, "transition": 15},
}
],
)
def test_consistent_standard_2(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 27})
original_auto = resp.json()["data"][0]
original_auto["metadata"]["alias"] = "I CHANGED!"
resp = self.client.post(
"/automations/item",
json={
"index": 27,
"data": original_auto,
},
)
self.assertEqual(resp.status_code, 200)
with (self.config_folder / "automations.yaml").open("r") as fp:
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")))
self.assertDictEqual(
disk_data,
{"id": "1649947692702", "alias": "I CHANGED!", "description": "", "mode": "single"},
)
self.assertListEqual(
trigger,
[
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_on",
"id": "turn_on",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_off",
"id": "turn_off",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_up",
"id": "dim_up",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_down",
"id": "dim_down",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_double_press",
"subtype": "turn_on",
"id": "up_dbclk",
},
],
)
self.assertListEqual(condition, [])
self.assertListEqual(
action,
[
{
"choose": [
{
"conditions": [{"condition": "trigger", "id": "turn_off"}],
"sequence": [
{
"type": "turn_off",
"device_id": "das2qdasdasdasadaasd",
"entity_id": "light.bulb_ari_lamp",
"domain": "light",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "turn_on"}],
"sequence": [
{
"service": "light.turn_on",
"data": {"color_temp": 153, "brightness_pct": 100},
"target": {"device_id": "das2qdasdasdasadaasd"},
}
],
},
{
"conditions": [{"condition": "trigger", "id": "dim_up"}],
"sequence": [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_increase",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "dim_down"}],
"sequence": [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_decrease",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "up_dbclk"}],
"sequence": [
{
"service": "light.turn_on",
"data": {"color_temp": 500, "brightness_pct": 100},
"target": {"device_id": "das2qdasdasdasadaasd"},
}
],
},
],
"default": [],
}
],
)
class automation_delete_tests(BaseTestCase): class automation_delete_tests(BaseTestCase):
def test_delete_some(self): def test_delete_some(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
self.assertEqual(resp.json()["totalItems"], 28) self.assertEqual(resp.json()["totalItems"], 32)
resp = self.client.delete( resp = self.client.delete(
"/automations", "/automations/item",
json={ json={
"index": 20, "index": 20,
}, },
) )
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
self.assertEqual(resp.json()["totalItems"], 27) self.assertEqual(resp.json()["totalItems"], 31)
+19 -27
View File
@@ -1,15 +1,8 @@
from unittest import TestCase from unittest import TestCase
from src.automations.types import (
AutomationActionNode,
AutomationConditionNode,
AutomationMetdata,
ExtenededAutomationData,
)
from src.automations.loader import load_automation from src.automations.loader import load_automation
from src.yaml_serializer.types import ( from src.automations.types import AutomationMetdata, ExtenededAutomationData
SecretValue, from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
NOT_IMPLEMENTED_SV_MSG,
)
class loader_tests(TestCase): class loader_tests(TestCase):
@@ -33,7 +26,7 @@ class loader_tests(TestCase):
], ],
"mode": "single", "mode": "single",
}, },
{} {},
) )
) )
self.assertEqual( self.assertEqual(
@@ -46,22 +39,21 @@ class loader_tests(TestCase):
mode="single", mode="single",
), ),
trigger=[{"platform": "homeassistant", "event": "shutdown"}], trigger=[{"platform": "homeassistant", "event": "shutdown"}],
sequence=[ condition=[
AutomationConditionNode( {
condition="template", "condition": "template",
condition_data={"value_template": "states(time.time) >= '10:00:00'"}, "value_template": "states(time.time) >= '10:00:00'",
), }
AutomationActionNode(
action="device",
action_data={
"device_id": NOT_IMPLEMENTED_SV_MSG,
"domain": "mobile_app",
"type": "notify",
"title": "Hassio Status",
"message": "Hassio Is turning off...",
},
),
], ],
tags={} sequence=[
{
"device_id": NOT_IMPLEMENTED_SV_MSG,
"domain": "mobile_app",
"type": "notify",
"title": "Hassio Status",
"message": "Hassio Is turning off...",
}
],
tags={},
), ),
) )
@@ -1,4 +1,5 @@
from unittest import TestCase from unittest import TestCase
from src.automations.errors import FailedDeletion, InvalidAutomationFile from src.automations.errors import FailedDeletion, InvalidAutomationFile
from src.automations.types import AutomationMetdata, ExtenededAutomationData from src.automations.types import AutomationMetdata, ExtenededAutomationData
from tests.utils import ( from tests.utils import (
@@ -23,11 +24,11 @@ class manager_tests(TestCase):
_, _, loader = get_example_automation_loader() _, _, loader = get_example_automation_loader()
self.assertIsNone(loader.get(-1)) self.assertIsNone(loader.get(-1))
self.assertIsNone(loader.get(1_000)) self.assertIsNone(loader.get(1_000))
self.assertIsNone(loader.get(31)) self.assertIsNone(loader.get(33))
def test_length(self): def test_length(self):
_, _, loader = get_example_automation_loader() _, _, loader = get_example_automation_loader()
self.assertEqual(loader.get_total_items(), 28) self.assertEqual(loader.get_total_items(), 32)
def test_bad_automations_file(self): def test_bad_automations_file(self):
folder, _, manager = get_dummy_automation_loader( folder, _, manager = get_dummy_automation_loader(
@@ -50,11 +51,11 @@ class manager_tests(TestCase):
def test_create_automation_with_example_folder(self): def test_create_automation_with_example_folder(self):
_, _, manager = get_example_automation_loader() _, _, manager = get_example_automation_loader()
self.assertEqual(manager.get_total_items(), 28) self.assertEqual(manager.get_total_items(), 32)
manager.update(32, ExtenededAutomationData(metadata=AutomationMetdata(id="test1"))) manager.update(40, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
auto = manager.get(28) auto = manager.get(32)
self.assertIsNotNone(auto) self.assertIsNotNone(auto)
self.assertEqual(manager.get_total_items(), 29) self.assertEqual(manager.get_total_items(), 33)
self.assertEqual(auto.metadata.id, "test1") # type: ignore self.assertEqual(auto.metadata.id, "test1") # type: ignore
def test_update_automation(self): def test_update_automation(self):
@@ -1,222 +0,0 @@
from unittest import TestCase
from src.automations.types import (
AutomationActionNode,
AutomationConditionNode,
)
from src.automations.parsers import (
_parse_conditions,
_parse_actions,
)
from src.yaml_serializer.types import (
SecretValue,
NOT_IMPLEMENTED_SV_MSG,
)
class parser_tests(TestCase):
def test_various_condition_types(self):
raw_conditions = [
{"condition": "template", "value_template": "silly logic here"},
"silly logic here",
{"condition": "time", "after": "10:00:00", "weekday": ["mon", "tue"]},
{"condition": "what is this?", "wuba": "dub"},
SecretValue("supersecretcondition", "rm -rf ./*"),
]
expected_process = [
AutomationConditionNode(
condition="template",
condition_data={"value_template": "silly logic here"},
),
AutomationConditionNode(
condition="template",
condition_data={"value_template": "silly logic here"},
),
AutomationConditionNode(
condition="time",
condition_data={"after": "10:00:00", "weekday": ["mon", "tue"]},
),
AutomationConditionNode(
condition="what is this?",
condition_data={"wuba": "dub"},
),
AutomationConditionNode(
condition="template",
condition_data={"value_template": NOT_IMPLEMENTED_SV_MSG},
),
]
for expected, parsed in zip(expected_process, _parse_conditions(raw_conditions)):
self.assertEqual(parsed, expected)
def test_various_action_types(self):
raw_conditions = [
{"condition": "template", "value_template": "silly logic here"},
"silly logic here",
{"condition": "time", "after": "10:00:00", "weekday": ["mon", "tue"]},
{
"service": "light.turn_on",
"target": ["light.kitchen"],
"data": {"brightness": 10},
},
{"something": "is wrong"},
{
"alias": "Doing amazing things!",
"repeat": {
"count": 1000,
"sequence": [
"conditionA",
{
"wait_template": "states('light.kitchen') == 'off",
"timeout": 10,
},
{
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
],
},
},
{"event": "custom-event", "event_data": "wow"},
{
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
{
"alias": "Doing amazing things!",
"choose": [
{
"conditions": [
r"{{ states('switch.plug_out_bug_lamp') == 'unavailable'}}",
],
"sequence": [
"conditionA",
{
"wait_template": "states('light.kitchen') == 'off",
"timeout": 10,
},
{
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
],
}
],
"default": [{"event": "nope", "event_data": {}}],
},
]
expected_process = [
AutomationConditionNode(
condition="template",
condition_data={"value_template": "silly logic here"},
),
AutomationConditionNode(
condition="template",
condition_data={"value_template": "silly logic here"},
),
AutomationConditionNode(
condition="time",
condition_data={"after": "10:00:00", "weekday": ["mon", "tue"]},
),
AutomationActionNode(
action="service",
action_data={
"service": "light.turn_on",
"target": ["light.kitchen"],
"data": {"brightness": 10},
},
),
AutomationActionNode(action="unknown", action_data={"something": "is wrong"}),
AutomationActionNode(
action="repeat",
action_data={
"alias": "Doing amazing things!",
"repeat": {
"count": 1000,
"sequence": [
AutomationConditionNode(
condition="template",
condition_data={"value_template": "conditionA"},
),
AutomationActionNode(
action="wait",
action_data={
"wait_template": "states('light.kitchen') == 'off",
"timeout": 10,
},
),
AutomationActionNode(
action="device",
action_data={
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
),
],
},
},
),
AutomationActionNode(
action="event",
action_data={"event": "custom-event", "event_data": "wow"},
),
AutomationActionNode(
action="device",
action_data={
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
),
AutomationActionNode(
action="choose",
action_data={
"alias": "Doing amazing things!",
"choose": [
{
"conditions": [
AutomationConditionNode(
condition="template",
condition_data={
"value_template": r"{{ states('switch.plug_out_bug_lamp') == 'unavailable'}}"
},
)
],
"sequence": [
AutomationConditionNode(
condition="template",
condition_data={"value_template": "conditionA"},
),
AutomationActionNode(
action="wait",
action_data={
"wait_template": "states('light.kitchen') == 'off",
"timeout": 10,
},
),
AutomationActionNode(
action="device",
action_data={
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
),
],
}
],
"default": [
AutomationActionNode(
action="event",
action_data={"event": "nope", "event_data": {}},
)
],
},
),
]
for expected, parsed in zip(expected_process, _parse_actions(raw_conditions)):
self.assertEqual(parsed, expected)
+5 -6
View File
@@ -1,18 +1,17 @@
from pathlib import Path from pathlib import Path
from tempfile import mktemp from tempfile import mktemp
from unittest import TestCase from unittest import TestCase
from src.automations.tags import TagManager from src.automations.tags import TagManager
class tag_tests(TestCase):
class tag_tests(TestCase):
def test_load_and_save(self): def test_load_and_save(self):
tmp_file = Path(mktemp()).with_suffix('.yml') tmp_file = Path(mktemp()).with_suffix(".yml")
tags = TagManager() tags = TagManager()
tags[0] = {'Room': "Kitchen", "Type": 'Lights'} tags[0] = {"Room": "Kitchen", "Type": "Lights"}
tags[1] = {} tags[1] = {}
tags.save(tmp_file) tags.save(tmp_file)
loaded_tags = TagManager.load(tmp_file) loaded_tags = TagManager.load(tmp_file)
assert loaded_tags.keys() == tags.keys() assert loaded_tags.keys() == tags.keys()
@@ -1,4 +1,5 @@
from unittest import TestCase from unittest import TestCase
from src.automations.types import AutomationData, AutomationMetdata from src.automations.types import AutomationData, AutomationMetdata
from src.hass_config.errors import MissingFile from src.hass_config.errors import MissingFile
from src.hass_config.loader import HassConfig from src.hass_config.loader import HassConfig
+2 -27
View File
@@ -1,11 +1,8 @@
import json import json
from unittest import TestCase from unittest import TestCase
from ruamel.yaml.scalarstring import ScalarString
from ruamel.yaml.scalarint import ScalarInt
from ruamel.yaml.scalarbool import ScalarBoolean
from ruamel.yaml.scalarfloat import ScalarFloat
from src.yaml_serializer.types import SecretValue, NOT_IMPLEMENTED_SV_MSG
from src.json_serializer import json_dumps from src.json_serializer import json_dumps
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
class json_serializer_tests(TestCase): class json_serializer_tests(TestCase):
@@ -32,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"),
},
),
)
+32 -12
View File
@@ -1,14 +1,13 @@
import io import io
from unittest import TestCase from unittest import TestCase
from src.yaml_serializer import (
dump_yaml, from src.yaml_serializer import dump_yaml, load_yaml
load_yaml,
)
from src.yaml_serializer.types import ( from src.yaml_serializer.types import (
IncludedYaml, IncludedYaml,
SecretValue,
IncludedYamlDir, IncludedYamlDir,
SecretValue,
) )
from tests.utils import SAMPLES_FOLDER
class dumping_yamls_tests(TestCase): class dumping_yamls_tests(TestCase):
@@ -20,21 +19,29 @@ class dumping_yamls_tests(TestCase):
) )
} }
) )
self.assertEqual(yaml, "automations: !include automations.yaml\n") self.assertEqual(yaml, "automations: !include 'automations.yaml'\n")
def test_dumping_secrets(self): def test_dumping_secrets(self):
yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")}) yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")})
self.assertEqual(yaml, "google_password: !secret gpass\n") self.assertEqual(yaml, "google_password: !secret 'gpass'\n")
def test_dumping_stub(self): def test_dumping_stub(self):
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")}) yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")})
self.assertEqual(yaml, "sensor: !include_dir_list sensors/*yaml\n") self.assertEqual(yaml, "sensor: !include_dir_list 'sensors/*yaml'\n")
def test_load_stub(self): def test_load_stub(self):
yaml_obj = load_yaml( yaml_obj = load_yaml(
io.StringIO( io.StringIO(
""" """
name: cool name: cool
date: "10:00"
bools:
- "yes"
- "no"
- true
- false
bobIsNull:
bobIsNull2: null
google_password: !secret gpass google_password: !secret gpass
sensor: !include_dir_list sensors/*yaml sensor: !include_dir_list sensors/*yaml
automations: !include automations.yaml automations: !include automations.yaml
@@ -45,6 +52,10 @@ class dumping_yamls_tests(TestCase):
dict(yaml_obj), dict(yaml_obj),
{ {
"name": "cool", "name": "cool",
"date": "10:00",
"bools": ["yes", "no", True, False],
"bobIsNull": None,
"bobIsNull2": None,
"google_password": SecretValue("gpass", "n/a"), "google_password": SecretValue("gpass", "n/a"),
"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"), "sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"),
"automations": IncludedYaml("automations.yaml"), "automations": IncludedYaml("automations.yaml"),
@@ -52,8 +63,17 @@ class dumping_yamls_tests(TestCase):
) )
self.assertEqual( self.assertEqual(
dump_yaml(yaml_obj), dump_yaml(yaml_obj),
"name: cool\n" """name: cool
"google_password: !secret gpass\n" date: '10:00'
"sensor: !include_dir_list sensors/*yaml\n" bools:
f"automations: !include automations.yaml\n", - 'yes'
- 'no'
- true
- false
bobIsNull: null
bobIsNull2: null
google_password: !secret 'gpass'
sensor: !include_dir_list 'sensors/*yaml'
automations: !include 'automations.yaml'
""",
) )
+9 -6
View File
@@ -1,32 +1,35 @@
from pathlib import Path
from shutil import copytree from shutil import copytree
from tempfile import mkdtemp from tempfile import mkdtemp
from pathlib import Path
from typing import List, Literal, Optional, Tuple from typing import List, Literal, Optional, Tuple
from src.automations.manager import AutomationManager from src.automations.manager import AutomationManager
from src.automations.types import AutomationData from src.automations.types import AutomationData
from src.hass_config.loader import HassConfig from src.hass_config.loader import HassConfig
from src.yaml_serializer import dump_yaml from src.yaml_serializer import dump_yaml
from src.yaml_serializer.types import IncludedYaml from src.yaml_serializer.types import IncludedYaml
THIS_FOLDER = Path(__file__).parent THIS_FOLDER = Path(__file__).parent
SAMPLES_FOLDER = THIS_FOLDER / "samples" SAMPLES_FOLDER = THIS_FOLDER / "samples"
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config" HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
def get_example_automation_loader() -> Tuple[Path, HassConfig, AutomationManager]: def get_example_automation_loader(
config_to_copy: Path = HA_CONFIG_EXAMPLE,
) -> Tuple[Path, HassConfig, AutomationManager]:
"""Creates an example automation loader from the samples folder """Creates an example automation loader from the samples folder
Returns: Returns:
Tuple[Path, HassConfig, AutomationManager] Tuple[Path, HassConfig, AutomationManager]
""" """
root_folder = create_copy_of_example_config() root_folder = create_copy_of_example_config(config_to_copy)
hass_config = HassConfig(root_folder) hass_config = HassConfig(root_folder)
automation_loader = AutomationManager(hass_config) automation_loader = AutomationManager(hass_config)
return root_folder, hass_config, automation_loader return root_folder, hass_config, automation_loader
def create_copy_of_example_config() -> Path: def create_copy_of_example_config(config_to_copy: Path = HA_CONFIG_EXAMPLE) -> Path:
"""Creates a copy of the example config folder """Creates a copy of the example config folder
Returns: Returns:
@@ -34,7 +37,7 @@ def create_copy_of_example_config() -> Path:
""" """
root_folder = Path(mkdtemp()) root_folder = Path(mkdtemp())
root_folder.rmdir() root_folder.rmdir()
copytree(HA_CONFIG_EXAMPLE, root_folder) copytree(config_to_copy, root_folder)
return root_folder return root_folder
+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))
+10 -9
View File
@@ -1,29 +1,30 @@
name: Shortumation name: Shortumation
version: 0.0.13 version: v0.1.22
slug: shortumation slug: shortumation
image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation" url: "https://github.com/asosnovsky/Shortumation"
description: "A homeassitant addon which provides better UI for automations & scripts." description: "A homeassitant addon which provides better UI for automations & scripts."
arch: arch:
- armhf
- armv7
- aarch64 - aarch64
- amd64 - amd64
- armhf
- armv7
- i386 - i386
startup: application startup: application
boot: auto boot: auto
init: false
ingress: true ingress: true
ingress_port: 8000 ingress_port: 8000
ingress_entry: "web/" ingress_entry: "web/"
panel_icon: mdi:home-automation homeassistant_api: true
hassio_role: manager
privileged:
- SYS_RAWIO
host_network: true
auth_api: true auth_api: true
panel_icon: mdi:home-automation
hassio_role: homeassistant
host_network: false
map: map:
- config:rw - config:rw
options: {} options: {}
ports: ports:
8000/tcp: 8000 8000/tcp:
ports_description: ports_description:
8000/tcp: Main port for the API & Web. 8000/tcp: Main port for the API & Web.
+3 -2
View File
@@ -1,9 +1,10 @@
version: '3' version: '3'
services: services:
addon: addon:
image: "asosnovsky/shortumation:${ARCH:-amd64}-${BUILD_TAG:-latest}" image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
build: build:
context: "./" context: "./"
dockerfile: "./Dockerfile" dockerfile: "./Dockerfile"
args: args:
- BUILD_ARCH=${ARCH:-amd64} BUILD_ARCH: ${ARCH:-amd64}
BUILD_VERSION: ${BUILD_TAG:-edge}
+3
View File
@@ -3,5 +3,8 @@ services:
addon: addon:
volumes: volumes:
- "./sample_config:/config" - "./sample_config:/config"
- "./api/tests:/app/tests"
ports: ports:
- "8000:8000" - "8000:8000"
env_file:
- api/.env
+28
View File
@@ -0,0 +1,28 @@
#!/bin/bash
set -e
api_location=${1}
web_location=${2}
function install_yarn() {
pushd $web_location
yarn
yarn build
cp -r $web_location/build $api_location/web
popd
}
function install_py() {
pushd $api_location
pip install . $api_location
popd
}
declare -i err=0 werr=0
install_py &
install_yarn &
while wait -fn || werr=$?; ((werr != 127)); do
err=$werr
done
echo "DONE BUILD"
+19
View File
@@ -0,0 +1,19 @@
#!/bin/bash
set -e
function prep_yarn() {
npm i -g yarn
}
function prep_py() {
pip install -U wheel setuptools pip
}
declare -i err=0 werr=0
prep_py &
prep_yarn &
while wait -fn || werr=$?; ((werr != 127)); do
err=$werr
done
echo "DONE PREP"
+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 uvicorn src.app:app --host "0.0.0.0" --port 8000
+21
View File
@@ -0,0 +1,21 @@
version: '3'
services:
homeassistant:
container_name: homeassistant
image: "ghcr.io/home-assistant/home-assistant:stable"
volumes:
- config:/config
restart: unless-stopped
privileged: true
network_mode: host
shortumation:
# make sure to replace the ARCH with whatever system you are running!
image: "asosnovsky/shortumation-${ARCH:-amd64}:latest"
volumes:
- config:/config
ports:
- 8081:8000
volumes:
config:
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.
-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: 0:
Type: Generic Type: Generic2
1: 1:
Type: Generic Type: Generic
2: 2:
+6 -2
View File
@@ -40,13 +40,17 @@
- id: shortu-2 - id: shortu-2
alias: Neat trick alias: Neat trick
description: '' description: ''
trigger_variables:
mode: queued mode: queued
trigger: [] trigger: []
condition: [] condition: []
action: action:
- alias: Choose - alias: Choose
default: [] default:
- condition: and
alias: ''
conditions:
- condition: or
conditions: []
choose: [] choose: []
- service: lights.turn_on - service: lights.turn_on
target: target:
+1 -1
View File
@@ -1 +1 @@
SKIP_PREFLIGHT_CHECK=true SKIP_PREFLIGHT_CHECK=true
+7 -1
View File
@@ -1,4 +1,7 @@
module.exports = { module.exports = {
'core': {
builder: 'webpack5'
},
"stories": [ "stories": [
"../src/**/*.stories.mdx", "../src/**/*.stories.mdx",
"../src/**/*.stories.@(js|jsx|ts|tsx)" "../src/**/*.stories.@(js|jsx|ts|tsx)"
@@ -8,5 +11,8 @@ module.exports = {
"@storybook/addon-essentials", "@storybook/addon-essentials",
"@storybook/preset-create-react-app", "@storybook/preset-create-react-app",
"@storybook/addon-queryparams", "@storybook/addon-queryparams",
] ],
"features": {
"emotionAlias": false,
},
} }
+6 -13
View File
@@ -2,24 +2,17 @@
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"name": "Debug CRA Tests", "name": "Debug Jest Tests",
"type": "node", "type": "node",
"request": "launch", "request": "launch",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts", "runtimeArgs": [
"args": [ "--inspect-brk",
"test", "${workspaceRoot}/node_modules/.bin/jest",
"--runInBand", "--runInBand"
"--no-cache",
"--watchAll=false"
], ],
"cwd": "${workspaceRoot}",
"protocol": "inspector",
"console": "integratedTerminal", "console": "integratedTerminal",
"internalConsoleOptions": "neverOpen", "internalConsoleOptions": "neverOpen",
"env": { "port": 9229
"CI": "true"
},
"disableOptimisticBPs": true
} }
] ]
} }
+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
},
]
}
+35 -14
View File
@@ -4,26 +4,42 @@
"private": true, "private": true,
"homepage": ".", "homepage": ".",
"dependencies": { "dependencies": {
"@types/jest": "^26.0.15", "@emotion/react": "^11.9.0",
"@types/node": "^12.0.0", "@emotion/styled": "^11.8.1",
"@types/react": "^17.0.0", "@mui/icons-material": "^5.8.3",
"@types/react-dom": "^17.0.0", "@mui/material": "^5.8.0",
"chroma-js": "^2.1.2", "@mui/styles": "^5.8.0",
"@types/jest": "^27.5.1",
"@types/node": "^17.0.36",
"@types/react": "^18.0.9",
"@types/react-dom": "^18.0.5",
"@types/ws": "^8.5.3",
"@uiw/react-codemirror": "^4.7.0",
"autosuggest-highlight": "^3.2.1",
"home-assistant-js-websocket": "^7.1.0",
"jss": "^10.8.2", "jss": "^10.8.2",
"react": "^17.0.2", "notistack": "^2.0.5",
"react-dom": "^17.0.2", "react": "^18.1.0",
"react-cookie": "^4.1.1",
"react-dom": "^18.1.0",
"react-flow-renderer": "^10.1.2", "react-flow-renderer": "^10.1.2",
"react-imask": "^6.4.2",
"react-jss": "^10.8.2", "react-jss": "^10.8.2",
"react-router-dom": "6", "react-router-dom": "6",
"react-scripts": "4.0.3", "react-scripts": "5.0.1",
"superstruct": "^0.15.4",
"theming": "^3.3.0", "theming": "^3.3.0",
"typescript": "^4.1.2", "typescript": "^4.1.2",
"web-vitals": "^1.0.1", "web-vitals": "^2.1.4",
"ws": "^8.7.0",
"yarn": "^1.22.17" "yarn": "^1.22.17"
}, },
"scripts": { "scripts": {
"start": "react-scripts start", "start": "react-scripts start",
"build": "react-scripts build", "build": "react-scripts build",
"tsc": "tsc -w",
"tsc:ci": "tsc",
"test:ci": "react-scripts test --ci=true --all --watchAll=false",
"test": "react-scripts test", "test": "react-scripts test",
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache", "test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
"eject": "react-scripts eject", "eject": "react-scripts eject",
@@ -63,16 +79,21 @@
"@storybook/addon-essentials": "^6.4.22", "@storybook/addon-essentials": "^6.4.22",
"@storybook/addon-links": "^6.4.22", "@storybook/addon-links": "^6.4.22",
"@storybook/addon-queryparams": "^6.2.9", "@storybook/addon-queryparams": "^6.2.9",
"@storybook/builder-webpack5": "^6.5.6",
"@storybook/manager-webpack5": "^6.5.6",
"@storybook/node-logger": "^6.4.22", "@storybook/node-logger": "^6.4.22",
"@storybook/preset-create-react-app": "^3.2.0", "@storybook/preset-create-react-app": "^4.1.1",
"@storybook/react": "^6.4.22", "@storybook/react": "^6.4.22",
"@testing-library/jest-dom": "^5.11.4", "@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0", "@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^12.1.10", "@testing-library/user-event": "^14.2.0",
"@types/autosuggest-highlight": "^3.2.0",
"@types/chroma-js": "^2.1.3", "@types/chroma-js": "^2.1.3",
"@types/js-yaml": "^4.0.5", "@types/js-yaml": "^4.0.5",
"jest-environment-jsdom": "^27.5.1", "jest-environment-jsdom": "^28.1.0",
"ts-node": "^10.4.0" "ts-node": "^10.8.0",
"webpack": "^5.72.1",
"webpack-dev-server": "^4.9.0"
}, },
"moduleDirectories": [ "moduleDirectories": [
"node_modules", "node_modules",
+9 -5
View File
@@ -3,17 +3,21 @@ import { Routes, Route, BrowserRouter } from "react-router-dom";
import { AutomationRoute } from 'routes/automation'; import { AutomationRoute } from 'routes/automation';
import { useConnectedApiService } from 'apiService'; import { useConnectedApiService } from 'apiService';
import { ErrorBoundary } from 'components/ErrorBoundary'; import { ErrorBoundary } from 'components/ErrorBoundary';
import { CookiesProvider } from "react-cookie";
function App() { function App() {
const api = useConnectedApiService(); const api = useConnectedApiService();
return ( return (
<div className="app"> <div className="app">
<ErrorBoundary> <ErrorBoundary>
<BrowserRouter> <CookiesProvider>
<Routes> <BrowserRouter>
<Route path="*" element={<AutomationRoute api={api} />} /> <Routes>
</Routes> <Route path="*" element={<AutomationRoute api={api} />} />
</BrowserRouter> </Routes>
</BrowserRouter>
</CookiesProvider>
</ErrorBoundary> </ErrorBoundary>
</div> </div>
); );
+5 -5
View File
@@ -1,7 +1,7 @@
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
import { API } from "./base"; import { API } from "./base";
import { ListData, ListParams } from "./types"; import { ListData, ListParams } from "./types";
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths'; import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
export const makeAutomationAPI = (api: API) => ({ export const makeAutomationAPI = (api: API) => ({
@@ -14,19 +14,19 @@ export const makeAutomationAPI = (api: API) => ({
}); });
return data; return data;
}, },
async update({index, auto}: {index: number, auto: AutomationData}) { async update({ index, auto }: { index: number, auto: AutomationData }) {
return await api.makeCall({ return await api.makeCall({
path: AUTOMTAION_ROOT, path: AUTOMTAION_ITEM,
data: { data: {
index, index,
data: auto data: auto
}, },
}) })
}, },
async remove({index}: {index: number}) { async remove({ index }: { index: number }) {
return await api.makeCall({ return await api.makeCall({
method: "DELETE", method: "DELETE",
path: AUTOMTAION_ROOT, path: AUTOMTAION_ITEM,
data: { data: {
index, index,
} }
+6 -3
View File
@@ -10,13 +10,16 @@ export const makeRemoteAPI = (baseURL: string): API => ({
data = {} data = {}
}) { }) {
try { try {
const reply = await fetch(baseURL + path, { const payload: RequestInit = {
method, method,
headers: { headers: {
"Content-Type": "application/json" "Content-Type": "application/json"
}, },
body: JSON.stringify(data), };
}); if (method !== 'GET') {
payload["body"] = JSON.stringify(data);
}
const reply = await fetch(baseURL + path, payload);
let response: APIResponse<any>; let response: APIResponse<any>;
if (reply.status === 200) { if (reply.status === 200) {
response = { response = {
+11 -8
View File
@@ -4,15 +4,18 @@ import { makeRemoteAPI } from "./base";
import { useAPIService } from './core'; import { useAPIService } from './core';
import { useMockAPI } from "./mock"; import { useMockAPI } from "./mock";
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i); const locationPrefixWeb = window.location.pathname.match(/(\/.+\/)web/i);
console.log(process.env) const baseURL = new URL(
process.env.NODE_ENV === 'development' ?
`http://${window.location.hostname}:8000` :
window.location.origin + (!locationPrefixWeb ? '' : locationPrefixWeb[1])
);
export const wsURL = baseURL + "socket"
export const remoteAutoAPI = makeRemoteAPI(
baseURL + "automations"
);
export const useConnectedApiService = () => useAPIService( export const useConnectedApiService = () => useAPIService(
makeAutomationAPI(makeRemoteAPI( makeAutomationAPI(remoteAutoAPI)
process.env.NODE_ENV === 'development' ?
"http://localhost:8000/automations" :
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
))
); );
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService( export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
makeAutomationAPI(useMockAPI(initialAutos)) makeAutomationAPI(useMockAPI(initialAutos))
+4 -4
View File
@@ -1,7 +1,7 @@
import { useRef } from 'react'; import { useRef } from 'react';
import { AutomationData } from 'types/automations'; import { AutomationData } from 'types/automations';
import { API } from './base'; import { API } from './base';
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths'; import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
export const useMockAPI = ( export const useMockAPI = (
@@ -15,7 +15,7 @@ export const useMockAPI = (
method = "POST", method = "POST",
data = {} data = {}
}) { }) {
console.debug("[[mockCall]]", method, path, data); // console.debug("[[mockCall]]", method, path, data);
if (path === AUTOMTAION_LIST) { if (path === AUTOMTAION_LIST) {
return { return {
ok: true, ok: true,
@@ -26,7 +26,7 @@ export const useMockAPI = (
})) }))
} as any } as any
} }
if (path === AUTOMTAION_ROOT) { if (path === AUTOMTAION_ITEM) {
if (method === 'POST') { if (method === 'POST') {
const { index, data: auto } = data as any; const { index, data: auto } = data as any;
if (index >= automationsRef.current.length) { if (index >= automationsRef.current.length) {
@@ -37,7 +37,7 @@ export const useMockAPI = (
auto, auto,
...automationsRef.current.slice(index + 1) ...automationsRef.current.slice(index + 1)
]; ];
} }
return { return {
ok: true, ok: true,
data: {} data: {}
+1
View File
@@ -2,3 +2,4 @@
export const AUTOMTAION_ROOT = '/' as const; export const AUTOMTAION_ROOT = '/' as const;
export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const; export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const;
export const AUTOMTAION_ITEM = `${AUTOMTAION_ROOT}item` as const;
+1 -1
View File
@@ -7,7 +7,7 @@ export interface ListParams {
} }
export type APIRequest<D> = { export type APIRequest<D> = {
path: string; path: string;
method?: "POST" | "DELETE", method?: "POST" | "DELETE" | "GET",
data?: D; data?: D;
}; };
+3 -3
View File
@@ -5,7 +5,7 @@ import { AutomationAPI } from './automations';
export const useDefaultApiState = () => useState<ApiState>({ export const useDefaultApiState = () => useState<ApiState>({
automations: {ready: false}, automations: { ready: false },
}); });
export const makeReloadAutomations = ( export const makeReloadAutomations = (
@@ -21,8 +21,8 @@ export const makeReloadAutomations = (
const resp = await automationAPI.list(params); const resp = await automationAPI.list(params);
setState({ setState({
...state, automations: { ...state, automations: {
ready: true, ready: true,
...resp, ...resp,
} }
}); });
} }
@@ -15,7 +15,7 @@
} }
.automation-editor--info-box.show { .automation-editor--info-box.show {
min-width: 25em; min-width: 20em;
} }
.automation-editor--info-box.hide { .automation-editor--info-box.hide {
@@ -34,6 +34,13 @@
border-radius: 5px; border-radius: 5px;
} }
.automation-editor--info-box--tag-list {
max-height: 30vh;
overflow-y: scroll;
padding-left: 0.25em;
padding-right: 0.25em;
}
.automation-editor--info-box--tags>h1 { .automation-editor--info-box--tags>h1 {
font-size: 1.5em; font-size: 1.5em;
} }
@@ -49,6 +56,7 @@
.automation-editor--info-box--tag>div { .automation-editor--info-box--tag>div {
margin: 0; margin: 0;
flex: 1;
} }
.automation-editor--info-box--tag>div>input { .automation-editor--info-box--tag>div>input {
@@ -56,29 +64,11 @@
padding: 1em 0.25em 0.2em 0.25em; padding: 1em 0.25em 0.2em 0.25em;
} }
.automation-editor--info-box--tag>button { .automation-editor--info-box--tag--trash, .automation-editor--info-box--tag--add {
height: 1.25em; height: 2em;
width: 1.25em; width: 2em;
font-size: 1em; font-size: 1em;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
}
.automation-editor--info-box--tag--error {
width: 100%;
display: flex;
justify-content: center;
padding: 0;
}
.automation-editor--info-box--tag--error.hide {
height: 0;
opacity: 0;
display: none;
}
.automation-editor--info-box--tag--error.show {
height: fit-content;
opacity: 1;
} }
@@ -1,19 +1,29 @@
import { ComponentMeta, ComponentStory } from "@storybook/react"; import { ComponentMeta, ComponentStory } from "@storybook/react";
import { makeTagDB } from "components/AutomationList/TagDB";
import { Page } from "components/Page";
import { useState } from "react"; import { useState } from "react";
import { AutoInfoBox } from "./AutoInfoBox"; import { AutoInfoBox } from "./AutoInfoBox";
import { defaultAutomation } from 'utils/defaults';
export default { export default {
title: 'App/AutomationList/Editor/InfoBox', title: 'App/AutomationList/Editor/InfoBox',
component: AutoInfoBox, component: AutoInfoBox,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
tagDB: makeTagDB([
defaultAutomation("test")
])
}
} as ComponentMeta<typeof AutoInfoBox>; } as ComponentMeta<typeof AutoInfoBox>;
export const NoTags: ComponentStory<typeof AutoInfoBox> = args => { export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
const [[metadata, tags], setState] = useState([args.metadata, args.tags]) const [[metadata, tags], setState] = useState([args.metadata, args.tags])
return ( return (
<div className="page"> <Page>
<AutoInfoBox <AutoInfoBox
{...args}
className="" className=""
metadata={metadata} metadata={metadata}
tags={tags} tags={tags}
@@ -22,7 +32,7 @@ export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
setState([m, t]) setState([m, t])
}} }}
/> />
</div> </Page>
) )
} }
NoTags.args = { NoTags.args = {
@@ -1,17 +1,20 @@
import "./AutoInfoBox.css"; import "./AutoInfoBox.css";
import { AutomationMetadata } from "types/automations"; import { AutomationMetadata } from "types/automations";
import InputList from "components/Inputs/InputList"; import { InputList } from "components/Inputs/InputList";
import InputText from "components/Inputs/InputText"; import InputText from "components/Inputs/InputText";
import InputTextArea from "components/Inputs/InputTextArea"; import { FC, ReactNode, useRef, useState } from "react";
import { FC, useRef, useState } from 'react';
import { AddIcon, TrashIcon } from "components/Icons"; import { AddIcon, TrashIcon } from "components/Icons";
import { Button } from "components/Inputs/Button"; import InputAutoText from "components/Inputs/InputAutoText";
import { TagDB } from "components/AutomationList/TagDB";
import { ButtonIcon } from "components/Icons/ButtonIcons";
interface Props { interface Props {
className: string; className: string;
metadata: AutomationMetadata; metadata: AutomationMetadata;
tags: Array<[string, string]>; tags: Array<[string, string]>;
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void; onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
tagDB: TagDB;
children?: ReactNode;
} }
export const AutoInfoBox: FC<Props> = ({ export const AutoInfoBox: FC<Props> = ({
metadata, metadata,
@@ -19,101 +22,157 @@ export const AutoInfoBox: FC<Props> = ({
onUpdate, onUpdate,
className, className,
children, children,
tagDB,
}) => { }) => {
// state // state
const [newTag, setNewTag] = useState<[string, string]>(["", ""]) const [newTag, setNewTag] = useState<[string, string]>(["", ""]);
const [[errorIndex, error], _setError] = useState<[number | 'new', string]>([-1, ""]); const [[errorIndex, error], _setError] = useState<[number | "new", string]>([
-1,
"",
]);
const errorTimeoutId = useRef(-1); const errorTimeoutId = useRef(-1);
// aliases // aliases
const setError = (index: number | 'new', msg: string) => { const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n));
_setError([index, msg]) const setError = (index: number | "new", msg: string) => {
_setError([index, msg]);
if (errorTimeoutId.current >= 0) { if (errorTimeoutId.current >= 0) {
window.clearTimeout(errorTimeoutId.current); window.clearTimeout(errorTimeoutId.current);
} }
errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000); errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000);
} };
const onUpdateMetadata = <K extends keyof AutomationMetadata>(k: K) => (update: AutomationMetadata[K]) => onUpdate({ const onUpdateMetadata =
...metadata, <K extends keyof AutomationMetadata>(k: K) =>
[k]: update (update: AutomationMetadata[K]) =>
}, tags); onUpdate(
{
...metadata,
[k]: update,
},
tags
);
const validTagName = (newName: string): string | undefined => { const validTagName = (newName: string): string | undefined => {
if (newName.length <= 0) { if (newName.length <= 0) {
return "Name must be at least 1 character long" return "Name must be at least 1 character long";
} }
// eslint-disable-next-line // eslint-disable-next-line
for (const [name, _] of tags) { for (const [name, _] of tags) {
if (name.trim() === newName.trim()) { if (name.trim() === newName.trim()) {
return `The tag '${name}' already exists` return `The tag '${name}' already exists`;
} }
} }
} };
const updateTagName = (newName: string, tagIndex: number) => { const updateTagName = (newName: string, tagIndex: number) => {
const error = validTagName(newName); const error = validTagName(newName);
if (error) { if (error) {
return setError(tagIndex, error) return setError(tagIndex, error);
} }
onUpdate(metadata, [ onUpdate(metadata, [
...tags.slice(0, tagIndex), ...tags.slice(0, tagIndex),
[newName, tags[tagIndex][1]], [newName, tags[tagIndex][1]],
...tags.slice(tagIndex + 1), ...tags.slice(tagIndex + 1),
]) ]);
} };
const onUpdateTags = (tagValue: string, tagIndex: number) => onUpdate(metadata, [ const onUpdateTags = (tagValue: string, tagIndex: number) =>
...tags.slice(0, tagIndex), onUpdate(metadata, [
[tags[tagIndex][0], tagValue], ...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1), [tags[tagIndex][0], tagValue],
]) ...tags.slice(tagIndex + 1),
]);
const addNewTag = () => { const addNewTag = () => {
const error = validTagName(newTag[0]); const error = validTagName(newTag[0]);
if (error) { if (error) {
return setError('new', error) return setError("new", error);
} }
onUpdate(metadata, tags.concat([newTag])); onUpdate(
setNewTag(['', '']); metadata,
} tags.concat([newTag.map((x) => x.trim()) as [string, string]])
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [ );
...tags.slice(0, tagIndex), setNewTag(["", ""]);
...tags.slice(tagIndex + 1), };
]) const onRemoveTag = (tagIndex: number) =>
onUpdate(metadata, [
...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1),
]);
// render // render
return <div className={`automation-editor--info-box ${className}`}> return (
<div className="automation-editor--info-box-inner"> <div className={`automation-editor--info-box ${className}`}>
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} /> <div className="automation-editor--info-box-inner">
<InputText label="Name" value={metadata.alias} onChange={onUpdateMetadata('alias')} /> <InputText
<InputTextArea label="Description" value={metadata.description} onChange={onUpdateMetadata('description')} /> label="ID"
<InputList value={metadata.id}
label="Mode" onChange={onUpdateMetadata("id")}
current={metadata.mode} />
onChange={onUpdateMetadata('mode')} <InputText
options={[ label="Name"
'parallel', value={metadata.alias ?? ""}
'single', onChange={onUpdateMetadata("alias")}
'queued', />
'restart' <InputText
]} multiline
/> label="Description"
<div className="automation-editor--info-box--tags"> value={metadata.description ?? ""}
<h1>Tags</h1> onChange={onUpdateMetadata("description")}
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag"> />
<Button onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button> <InputList
<InputText value={tagName} label="Name" onChange={v => updateTagName(v, tagIndex)} /> label="Mode"
<InputText value={tagValue} label="Tag" onChange={v => onUpdateTags(v, tagIndex)} /> current={metadata.mode}
<span className={["automation-editor--info-box--tag--error", (errorIndex === tagIndex) ? "show" : "hide"].join(" ")}> onChange={onUpdateMetadata("mode")}
{error} options={["parallel", "single", "queued", "restart"]}
</span> />
</div>)} <div className="automation-editor--info-box--tags">
<hr /> <h1>Tags</h1>
<div className="automation-editor--info-box--tag"> <div className="automation-editor--info-box--tag-list">
<InputText value={newTag[0]} label="Name" onChange={v => setNewTag([v, newTag[1]])} onEnter={addNewTag} /> {tags.map(([tagName, tagValue], tagIndex) => (
<InputText value={newTag[1]} label="Tag" onChange={v => setNewTag([newTag[0], v])} onEnter={addNewTag} /> <div key={tagIndex} className="automation-editor--info-box--tag">
<Button onClick={addNewTag} ><AddIcon /></Button> <InputAutoText
<span className={["automation-editor--info-box--tag--error", (errorIndex === 'new') ? "show" : "hide"].join(" ")}> value={tagName}
{error} label="Name"
</span> onChange={(v) => updateTagName(v, tagIndex)}
options={foundNewTagNames}
error={errorIndex === tagIndex ? error : undefined}
/>
<InputAutoText
value={tagValue}
label="Tag"
onChange={(v) => onUpdateTags(v, tagIndex)}
options={tagDB.getTagValues(tagName)}
error={errorIndex === tagIndex ? error : undefined}
/>
<ButtonIcon
className="automation-editor--info-box--tag--trash"
onClick={() => onRemoveTag(tagIndex)}
icon={<TrashIcon />}
/>
</div>
))}
</div>
<hr />
<div className="automation-editor--info-box--tag">
<InputAutoText
value={newTag[0]}
label="Name"
onChange={(v) => setNewTag([v, newTag[1]])}
options={foundNewTagNames}
error={errorIndex === "new" ? error : undefined}
/>
<InputAutoText
value={newTag[1]}
label="Tag"
onChange={(v) => setNewTag([newTag[0], v])}
options={tagDB.getTagValues(newTag[0])}
error={errorIndex === "new" ? error : undefined}
/>
<ButtonIcon
className="automation-editor--info-box--tag--add"
onClick={addNewTag}
icon={<AddIcon />}
/>
</div>
</div> </div>
</div> </div>
{children}
</div> </div>
{children} );
</div> };
}
@@ -1,10 +1,19 @@
.automation-editor { .automation-editor {
display: flex; display: flex;
position: relative;
flex-direction: row; flex-direction: row;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.automation-editor-failures {
display: flex;
flex-direction: column;
padding: 1em;
overflow: scroll;
height: 100%;
}
.automation-editor--flow-wrapper { .automation-editor--flow-wrapper {
flex: 1; flex: 1;
padding: 0 0.5em 0 0.5em; padding: 0 0.5em 0 0.5em;
@@ -19,13 +28,9 @@
.automation-editor--flow-wrapper--toolbar { .automation-editor--flow-wrapper--toolbar {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
gap: 0.25em;
justify-content: flex-end; justify-content: flex-end;
} margin-top: 0.25em;
.automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
height: 0;
opacity: 0;
overflow: hidden;
} }
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * { .automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
@@ -56,14 +61,39 @@
position: relative; position: relative;
} }
.automation-editor--info-box--icon { .automation-editor .automation-editor--info-box--icon {
position: absolute; position: absolute;
right: 0em; left: 0.25em;
bottom: 0.5em; bottom: 0em;
z-index: 10; z-index: 10;
max-width: 1.5em;
max-height: 1.5em;
} }
.automation-editor--info-box.hide>.automation-editor--info-box--icon { .automation-editor--info-box.hide>.automation-editor--info-box--icon {
transform: rotate(180deg); transform: rotate(180deg);
z-index: 2; z-index: 2;
left: 0.1em;
}
.automation-editor.loading .mock-list {
position: absolute;
left: 0;
width: 40%;
height: 100%;
}
.automation-editor.loading .mock-graph {
position: absolute;
left: 40%;
width: 60%;
height: 100%;
}
.automation-editor .linear-loader {
position: absolute;
top: 0;
left: 0;
width: 100%;
} }
@@ -2,7 +2,9 @@ import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react'; import { ComponentMeta, ComponentStory } from '@storybook/react';
import { AutomationEditor } from './index'; import { AutomationEditor } from './index';
import { useState } from 'react'; import { useState } from 'react';
import * as dgconst from 'components/DAGSvgs/constants'; import * as dgconst from 'components/DAGFlow/constants';
import { Page } from "components/Page";
import { makeTagDB } from "components/AutomationList/TagDB";
export default { export default {
@@ -10,30 +12,22 @@ export default {
component: AutomationEditor, component: AutomationEditor,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: '^on.*' } },
args: { args: {
dims: { dims: dgconst.DEFAULT_DIMS,
nodeHeight: dgconst.NODE_HEIGHT,
nodeWidth: dgconst.NODE_WIDTH,
distanceFactor: dgconst.DISTANCE_FACTOR,
circleSize: dgconst.CIRCLE_SIZE,
padding: {
x: dgconst.PADDING,
y: dgconst.PADDING,
},
}
} }
} as ComponentMeta<typeof AutomationEditor> } as ComponentMeta<typeof AutomationEditor>
const Template: ComponentStory<typeof AutomationEditor> = args => { const Template: ComponentStory<typeof AutomationEditor> = args => {
const [state, setState] = useState(args.automation) const [state, setState] = useState(args.automation)
return <div className="page"> return <Page>
<AutomationEditor <AutomationEditor
{...args} {...args}
tagDB={makeTagDB(state ? [state] : [])}
automation={state} automation={state}
onUpdate={s => { onUpdate={s => {
window.setTimeout(() => setState(s), 3000) window.setTimeout(() => setState(s), 3000)
}} }}
/> />
</div> </Page>
} }
export const Loading = Template.bind({}); export const Loading = Template.bind({});
@@ -43,6 +37,7 @@ export const Simple = Template.bind({})
Simple.args = { Simple.args = {
...Simple.args, ...Simple.args,
automation: { automation: {
condition: [],
tags: { tags: {
"Room": "Bathroom", "Room": "Bathroom",
"For": "Toliet", "For": "Toliet",
@@ -60,53 +55,38 @@ Simple.args = {
}, },
trigger: [ trigger: [
{ {
"$smType": undefined,
"platform": "numeric_state", "platform": "numeric_state",
"entity_id": "test", "entity_id": "test",
}, },
{ {
"$smType": undefined,
"platform": "homeassistant", "platform": "homeassistant",
"event": "start", "event": "start",
} }
], ],
sequence: [ sequence: [
{ {
$smType: "condition",
condition: 'and', condition: 'and',
condition_data: { conditions: [
conditions: [ {
{ condition: 'numeric_state',
$smType: 'condition', entity_id: 'sensor.temperature_kitchen',
condition: 'numeric_state', below: '15',
condition_data: { },
entity_id: 'sensor.temperature_kitchen', {
below: '15', condition: 'template',
} value_template: 'states(switch.kitchen_light) == "on"'
}, }
{ ]
$smType: "condition",
condition: 'template',
condition_data: {
value_template: 'states(switch.kitchen_light) == "on"'
}
}
]
}
}, },
{ {
$smType: "action", alias: "Start Music In Kitchen",
action: "service", service: 'media_player.play_media',
action_data: { target: {
alias: "Start Music In Kitchen", entity_id: "media_player.kitchen_dot"
service: 'media_player.play_media', },
target: { data: {
entity_id: "media_player.kitchen_dot" media_content_id: "Good Morning",
}, media_content_type: "SPOTIFY",
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
} }
} }
] ]
@@ -118,6 +98,7 @@ export const EmptyStart = Template.bind({})
EmptyStart.args = { EmptyStart.args = {
...EmptyStart.args, ...EmptyStart.args,
automation: { automation: {
condition: [],
tags: {}, tags: {},
metadata: { metadata: {
id: "random", id: "random",
@@ -133,3 +114,63 @@ EmptyStart.args = {
sequence: [] sequence: []
} }
} }
export const BadAutomationInvalidMetadata = Template.bind({})
BadAutomationInvalidMetadata.args = {
...BadAutomationInvalidMetadata.args,
automation: {
condition: [],
tags: {},
metadata: {
} as any,
trigger: [
],
sequence: []
}
}
export const BadAutomationInvalidTriggers = Template.bind({})
BadAutomationInvalidTriggers.args = {
...BadAutomationInvalidTriggers.args,
automation: {
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Random",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
},
mode: 'single',
},
trigger: [
"haha I am a string"
] as any,
sequence: []
}
}
export const BadAutomationInvalidSequence = Template.bind({})
BadAutomationInvalidSequence.args = {
...BadAutomationInvalidSequence.args,
automation: {
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Bad Choose Sequence",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
},
mode: 'single',
},
trigger: [],
sequence: [
{
choose: {}
}
] as any
}
}
+179 -42
View File
@@ -1,23 +1,33 @@
import "./index.css"; import "./index.css";
import { ArrowIcon, CheckMarkIcon } from "components/Icons"; import Icon from "@mui/material/Icon";
import { CheckMarkIcon } from "components/Icons";
import { FC, useState } from "react"; import { FC, useState } from "react";
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
import { AutoInfoBox } from "./AutoInfoBox"; import { AutoInfoBox } from "./AutoInfoBox";
import { ButtonIcon } from "components/Icons/ButtonIcons"; import { ButtonIcon } from "components/Icons/ButtonIcons";
import { Button } from "components/Inputs/Button"; import { Button } from "components/Inputs/Button";
import { useAutomatioEditorState } from "./state"; import { useAutomatioEditorState, EditorData } from "./state";
import { DAGAutomationFlow } from "components/DAGFlow"; import { SafeDAGAutomationFlow } from "components/DAGFlow/safe";
import { DAGAutomationFlowDims } from "components/DAGFlow/types"; import { DAGAutomationFlowDims } from "components/DAGFlow/types";
import { MiniFailure } from "types/validators/helper";
import InputYaml from "components/Inputs/InputYaml";
import { TagDB } from "components/AutomationList/TagDB";
import Skeleton from "@mui/material/Skeleton";
import LinearProgress from "@mui/material/LinearProgress";
import { ArrowBack } from "@mui/icons-material";
import { useCookies } from "react-cookie";
interface Props { interface Props {
automation?: AutomationData; automation?: AutomationData;
dims: DAGAutomationFlowDims; dims: DAGAutomationFlowDims;
onUpdate: (auto: AutomationData) => void; onUpdate: (auto: AutomationData) => void;
tagDB: TagDB;
} }
export const AutomationEditor: FC<Props> = ({ export const AutomationEditor: FC<Props> = ({
dims, dims,
automation: propsAutos, automation: propsAutos,
onUpdate: propsOnUpdate, onUpdate: propsOnUpdate,
tagDB,
}) => { }) => {
// state // state
const { const {
@@ -25,49 +35,176 @@ export const AutomationEditor: FC<Props> = ({
updateSequence, updateSequence,
updateTrigger, updateTrigger,
updateMetadata, updateMetadata,
updateCondition,
validate,
save, save,
saveAndUpdate,
} = useAutomatioEditorState(propsAutos, propsOnUpdate); } = useAutomatioEditorState(propsAutos, propsOnUpdate);
const [closeInfo, setCloseInfo] = useState(false); const [closeInfo, setCloseInfo] = useState(false);
const [
{ ckFlipped },
setCookies,
// eslint-disable-next-line
_,
] = useCookies(["ckFlipped"]);
// alias
const flipped = dims.flipped ? true : ckFlipped === "1";
const setFlipped = (v: boolean) => setCookies("ckFlipped", v ? "1" : "0");
// render // render
if (state.status === 'loading') { if (state.status === "loading") {
return <div className="automation-editor loading"> return (
Loading... <div className="automation-editor loading">
</div> <LinearProgress className="linear-loader" />
} <Skeleton className="mock-list" variant="rectangular" />
return <div className="automation-editor"> <Skeleton className="mock-graph" variant="rectangular" />
<AutoInfoBox
className={closeInfo ? "hide" : "show"}
metadata={state.data.metadata}
tags={state.data.tags}
onUpdate={updateMetadata}
>
<ButtonIcon
className="automation-editor--info-box--icon"
onClick={() => setCloseInfo(!closeInfo)}
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
>{ArrowIcon}</ButtonIcon>
</AutoInfoBox>
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
<div className="automation-editor--flow-wrapper--toolbar">
<Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save}
disabled={state.status !== 'changed'}
>
Save <CheckMarkIcon color="#bf4" />
</Button>
</div> </div>
<DAGAutomationFlow );
className="automation-editor--flow-wrapper--flow" }
sequence={state.data.sequence} if (state.status === "invalid") {
trigger={state.data.trigger} return (
onSequenceUpdate={updateSequence} <ValidationBox
onTriggerUpdate={updateTrigger} failures={state.failures}
dims={dims} data={state.data}
validate={validate}
onSave={saveAndUpdate}
/> />
);
}
return (
<div className="automation-editor">
{state.status === "saving" && (
<LinearProgress className="linear-loader" />
)}
<AutoInfoBox
className={closeInfo ? "hide" : "show"}
metadata={state.data.metadata}
tags={state.data.tags}
onUpdate={updateMetadata}
tagDB={tagDB}
>
<ButtonIcon
className="automation-editor--info-box--icon"
onClick={() => setCloseInfo(!closeInfo)}
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
color="success"
icon={<ArrowBack />}
/>
</AutoInfoBox>
<div
className={["automation-editor--flow-wrapper", state.status].join(" ")}
>
<div className="automation-editor--flow-wrapper--toolbar">
{!dims.flipped && (
<Button
className={"automation-editor--flow-wrapper--toolbar--flip-btn"}
onClick={() => setFlipped(!flipped)}
>
<Icon>{flipped ? "flip_to_front" : "flip_to_back"}</Icon>
Flip
</Button>
)}
<Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save}
disabled={state.status !== "changed"}
>
Save <CheckMarkIcon color="#bf4" />
</Button>
</div>
<SafeDAGAutomationFlow
className="automation-editor--flow-wrapper--flow"
sequence={state.data.sequence}
trigger={state.data.trigger}
condition={state.data.condition}
onSequenceUpdate={updateSequence}
onTriggerUpdate={updateTrigger}
onConditionUpdate={updateCondition}
dims={{
...dims,
flipped,
}}
/>
</div>
</div> </div>
</div> );
} };
export const ValidationBox: FC<{
failures: MiniFailure[];
validate: (d: any) => MiniFailure[] | null;
data: EditorData;
onSave: (d: EditorData) => void;
}> = (props) => {
const [{ failures, data }, setState] = useState({
failures: props.failures,
data: props.data,
});
const makeSave =
<K extends keyof EditorData>(k: K) =>
(d: EditorData[K]) => {
const newData = {
...data,
[k]: d,
};
const newFails = props.validate(newData);
if (newFails) {
setState({
failures: newFails,
data: newData,
});
} else {
setState({
failures: [],
data: newData,
});
}
};
return (
<div className="automation-editor-failures">
<ul>
{failures.map((f, i) => (
<>
<li key={i}>
<b>{f.path}</b>:
<ul>
{f.message.map((m, j) => (
<li key={j}>{m}</li>
))}
</ul>
</li>
</>
))}
</ul>
<span>
Please correct the automation file manually and then continue!
</span>
<InputYaml
label="Metadata"
value={data.metadata}
onChange={makeSave("metadata")}
/>
<InputYaml label="Tags" value={data.tags} onChange={makeSave("tags")} />
<InputYaml
label="Trigger"
value={data.trigger}
onChange={makeSave("trigger")}
/>
<InputYaml
label="Condition"
value={data.condition}
onChange={makeSave("condition")}
/>
<InputYaml
label="Actions"
value={data.sequence}
onChange={makeSave("sequence")}
/>
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>
Save
</Button>
</div>
);
};
+44 -20
View File
@@ -1,13 +1,19 @@
import { useState, useEffect } from 'react'; import { useState, useEffect } from 'react';
import { AutomationData, AutomationMetadata } from "types/automations"; import { AutomationData, AutomationMetadata } from "types/automations";
import * as v from "types/validators/autmation";
import { getFailures } from "types/validators/helper";
import { MiniFailure } from '../../types/validators/helper';
export type EditorData = ReturnType<typeof genEditorData>; export type EditorData = ReturnType<typeof genEditorData>;
export type EditorState = { export type EditorState = {
status: 'unchanged' | 'changed', status: 'unchanged' | 'changed' | 'saving',
data: EditorData data: EditorData
} | { } | {
status: 'loading' status: 'loading'
} | {
status: 'invalid',
failures: MiniFailure[],
data: EditorData,
} }
export type EditorStatus = EditorState['status']; export type EditorStatus = EditorState['status'];
@@ -18,10 +24,9 @@ export const useAutomatioEditorState = (
const [state, update] = useState<EditorState>({ const [state, update] = useState<EditorState>({
status: "loading", status: "loading",
}); });
const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => ( const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => (
data: D data: D
) => state.status !== 'loading' && update({ ) => ((state.status === 'changed') || (state.status === 'unchanged')) && update({
status: 'changed', status: 'changed',
data: { data: {
...state.data, ...state.data,
@@ -29,20 +34,47 @@ export const useAutomatioEditorState = (
} }
}) })
const saveAndUpdate = (data: EditorData) => {
const cleanData = {
...data,
tags: data.tags.reduce((all, [tagName, tagValue]) => ({
...all,
[tagName.trim()]: tagValue.trim(),
}), {})
};
update({
status: "saving",
data,
})
onSave(cleanData);
}
useEffect(() => { useEffect(() => {
if (automation) { if (automation) {
update({ const failures = getFailures(automation, v.AutomationData);
status: 'unchanged', if (failures) {
data: genEditorData(automation), update({
}) status: 'invalid',
failures,
data: genEditorData(automation),
})
} else {
update({
status: 'unchanged',
data: genEditorData(automation),
})
}
} }
}, [automation]); }, [automation]);
return { return {
validate: (data: any) => getFailures(data, v.AutomationData),
updateTrigger: makeUpdate('trigger'), updateTrigger: makeUpdate('trigger'),
updateSequence: makeUpdate('sequence'), updateSequence: makeUpdate('sequence'),
updateCondition: makeUpdate('condition'),
saveAndUpdate,
updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => { updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => {
if (state.status !== 'loading') { if ((state.status === 'changed') || (state.status === 'unchanged')) {
update({ update({
status: 'changed', status: 'changed',
data: { data: {
@@ -55,17 +87,7 @@ export const useAutomatioEditorState = (
}, },
save: () => { save: () => {
if (state.status !== 'loading') { if (state.status !== 'loading') {
const data = { saveAndUpdate(state.data)
...state.data,
tags: state.data.tags.reduce((all, [tagName, tagValue]) => ({
...all,
[tagName]: tagValue,
}), {})
};
update({
status: "loading",
})
onSave(data);
} }
}, },
get state() { get state() {
@@ -80,6 +102,7 @@ const genEditorData = (automation: AutomationData) => {
metadata, metadata,
trigger, trigger,
sequence, sequence,
condition,
} = automation; } = automation;
const tags: [string, string][] = Object.keys(automation.tags).map(tagName => [tagName, automation.tags[tagName]]); const tags: [string, string][] = Object.keys(automation.tags).map(tagName => [tagName, automation.tags[tagName]]);
@@ -88,6 +111,7 @@ const genEditorData = (automation: AutomationData) => {
metadata, metadata,
trigger, trigger,
sequence, sequence,
condition,
tags, tags,
} }
} }
@@ -2,31 +2,23 @@ import "styles/root.css";
import { ComponentMeta, ComponentStory } from "@storybook/react"; import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react"; import { useState } from "react";
import { AutomationList } from "."; import { AutomationList } from ".";
import { createMockAuto } from "utils/mocks"; import { bigMockAutoList } from "utils/mocks";
import * as dgconst from 'components/DAGSvgs/constants'; import * as dgconst from 'components/DAGFlow/constants';
import { Page } from "components/Page";
export default { export default {
title: 'App/AutomationList', title: 'App/AutomationList',
component: AutomationList, component: AutomationList,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: '^on.*' } },
args: { args: {
dims: { dims: dgconst.DEFAULT_DIMS
nodeHeight: dgconst.NODE_HEIGHT,
nodeWidth: dgconst.NODE_WIDTH,
distanceFactor: dgconst.DISTANCE_FACTOR,
circleSize: dgconst.CIRCLE_SIZE,
padding: {
x: dgconst.PADDING,
y: dgconst.PADDING,
},
}
} }
} as ComponentMeta<typeof AutomationList>; } as ComponentMeta<typeof AutomationList>;
const Template: ComponentStory<typeof AutomationList> = args => { const Template: ComponentStory<typeof AutomationList> = args => {
const [autos, setAutos] = useState(args.automations) const [autos, setAutos] = useState(args.automations)
return <div className="page"> return <Page>
<AutomationList {...args} automations={autos} <AutomationList {...args} automations={autos}
onAdd={a => { onAdd={a => {
args.onAdd(a); args.onAdd(a);
@@ -48,7 +40,7 @@ const Template: ComponentStory<typeof AutomationList> = args => {
]); ]);
}} }}
/> />
</div> </Page>
} }
export const EmptyStart = Template.bind({}) export const EmptyStart = Template.bind({})
@@ -60,16 +52,129 @@ EmptyStart.args = {
export const FewAutos = Template.bind({}) export const FewAutos = Template.bind({})
FewAutos.args = { FewAutos.args = {
...FewAutos.args, ...FewAutos.args,
automations: bigMockAutoList,
}
export const BadAutmations = Template.bind({})
BadAutmations.args = {
...BadAutmations.args,
automations: [ automations: [
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }), {
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }), "metadata": {
createMockAuto({ "Room": "Living Room", "Type": "Climate" }), "alias": "Set Thermostat to 76 at 8am",
createMockAuto({ "Type": "Climate" }), "description": "",
createMockAuto({ "Type": "Lights", "Routine": "Myself" }), "mode": "single",
createMockAuto({ "Routine": "DNS", "Type": "SSL" }), } as any,
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }), "trigger": [
createMockAuto({ "Room": "Office", "Type": "Lights" }), {
createMockAuto({ "Room": "Office" }), "at": "08:00:00",
createMockAuto(), "platform": "time"
}
],
"condition": [
{
"condition": "state",
"entity_id": "climate.thermostat",
"state": "cool"
}
],
"sequence": [
{
"data": {
"temperature": 76
},
"service": "climate.set_temperature",
"target": {
"entity_id": "climate.thermostat"
}
}
],
"tags": {},
},
{
condition: [],
tags: {},
metadata: {
id: "Bad Choose Sequence",
alias: "Bad Choose",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
},
mode: 'single',
},
trigger: [],
sequence: [
{
choose: {}
}
] as any
},
{
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Bad Trigger",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
},
mode: 'single',
},
trigger: [
"haha I am a string"
] as any,
sequence: []
},
{
condition: [],
tags: {},
metadata: {
} as any,
trigger: [
],
sequence: []
}
], ],
} }
export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = args => {
const [autos, setAutos] = useState(args.automations)
return <Page>
<AutomationList {...args} automations={autos}
onAdd={a => {
window.setTimeout(() => {
args.onAdd(a);
setAutos([...autos, a]);
}, 10000)
}}
onRemove={i => {
window.setTimeout(() => {
args.onRemove(i);
setAutos([
...autos.slice(0, i),
...autos.slice(i + 1),
]);
}, 10000)
}}
onUpdate={(i, a) => {
window.setTimeout(() => {
args.onUpdate(i, a);
setAutos([
...autos.slice(0, i),
a,
...autos.slice(i + 1),
]);
}, 10000)
}}
/>
</Page>
}
FewAutosWithSlowLoader.args = {
...FewAutosWithSlowLoader.args,
automations: bigMockAutoList,
}
@@ -5,15 +5,18 @@
} }
.automation-list-box--body { .automation-list-box--body {
overflow: auto; overflow-y: auto;
overflow-x: hidden;
height: 100%; height: 100%;
flex: 1; flex: 1;
user-select: none; user-select: none;
} }
.automation-list-box--body > * {
.automation-list-box--body>* {
padding-top: 0.5em; padding-top: 0.5em;
padding-bottom: 0.5em; padding-bottom: 0.5em;
} }
.automation-list-box--body--group { .automation-list-box--body--group {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -21,33 +24,46 @@
border-radius: 10px; border-radius: 10px;
padding-bottom: 0.5em; padding-bottom: 0.5em;
border-width: 1px; border-width: 1px;
border-bottom-style: solid ; border-bottom-style: solid;
border-color: white; border-color: var(--primary-accent);
} }
.automation-list-box--body--group > .automation-list-box--body--group {
border-left-style: solid ; .automation-list-box--body--group.other {
border-color: var(--green);
}
.automation-list-box--body--group.other>b {
color: var(--change);
}
.automation-list-box--body--group>.automation-list-box--body--group {
border-left-style: solid;
border-top-left-radius: 0; border-top-left-radius: 0;
margin-left: 0.75em; margin-left: 0.75em;
padding-left: 0.5em; padding-left: 0.5em;
} }
.automation-list-box--body--group > b { .automation-list-box--body--group>b {
width: 100%; width: 100%;
cursor: pointer; cursor: pointer;
padding: 0.1em; padding: 0.1em;
} }
.automation-list-box--body--group > b:hover {
.automation-list-box--body--group>b:hover,
.automation-list-box--body--group.selected>b {
background-color: var(--secondary-accent); background-color: var(--secondary-accent);
color: var(--secondary); color: var(--secondary);
} }
.automation-list-box--body--item:hover { .automation-list-box--body--item:hover, .automation-list-box--body--item.selected {
background-color: var(--primary-accent); background-color: var(--primary-accent);
color: var(--primary); color: var(--primary);
} }
.automation-list-box--body--item:hover > .automation-list-box--body--item--tags > span {
.automation-list-box--body--item:hover>.automation-list-box--body--item--tags>span {
border-color: var(--primary); border-color: var(--primary);
} }
.automation-list-box--body--item { .automation-list-box--body--item {
padding-left: 1em; padding-left: 1em;
cursor: pointer; cursor: pointer;
@@ -57,25 +73,31 @@
gap: 1em; gap: 1em;
flex-wrap: wrap; flex-wrap: wrap;
} }
.automation-list-box--body--item::before { .automation-list-box--body--item::before {
content: "⊚ "; content: "⊚ ";
} }
.automation-list-box--body--item--title { .automation-list-box--body--item--title {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding-left: 0.25em; padding-left: 0.25em;
flex: 1; flex: 1;
} }
.automation-list-box--body--item--title > b {
.automation-list-box--body--item--title>b {
font-size: 1em; font-size: 1em;
} }
.automation-list-box--body--item--title > span, .automation-list-box--body--item--title > b > span {
.automation-list-box--body--item--title>span, .automation-list-box--body--item--title>b>span {
font-size: 0.75em; font-size: 0.75em;
} }
.automation-list-box--body--item > button {
.automation-list-box--body--item>button {
padding: 0.25em !important; padding: 0.25em !important;
margin: 0.5em !important; margin: 0.5em !important;
} }
.automation-list-box--body--item--tags { .automation-list-box--body--item--tags {
flex: 1; flex: 1;
display: flex; display: flex;
@@ -87,13 +109,15 @@
max-height: 100%; max-height: 100%;
gap: 0.25em; gap: 0.25em;
} }
.automation-list-box--body--item--tags > span {
.automation-list-box--body--item--tags>span {
border-color: var(--primary-accent); border-color: var(--primary-accent);
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
border-radius: 0.5em; border-radius: 0.5em;
padding: 0.1em 0.5em; padding: 0.1em 0.5em;
} }
.automation-list-box--bottom { .automation-list-box--bottom {
margin-top: 0.5em; margin-top: 0.5em;
margin-bottom: 0.5em; margin-bottom: 0.5em;
@@ -102,7 +126,8 @@
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
} }
.automation-list-box--bottom > button {
.automation-list-box--bottom>button {
background-color: #070; background-color: #070;
color: var(--primary-accent); color: var(--primary-accent);
padding: 0.5em 2em; padding: 0.5em 2em;
@@ -2,6 +2,8 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react"; import { useState } from "react";
import { AutomationListBox } from "./AutomationListBox"; import { AutomationListBox } from "./AutomationListBox";
import { createMockAuto } from "utils/mocks"; import { createMockAuto } from "utils/mocks";
import { Page } from "components/Page";
import { CookiesProvider } from "react-cookie";
export default { export default {
title: 'App/AutomationList/Box', title: 'App/AutomationList/Box',
@@ -13,11 +15,15 @@ export default {
const Template: ComponentStory<typeof AutomationListBox> = args => { const Template: ComponentStory<typeof AutomationListBox> = args => {
const [autos, setAutos] = useState(args.automations) const [selected, setSelected] = useState(args.selected)
console.log({ args }) return <Page>
return <div className="page"> <CookiesProvider>
<AutomationListBox {...args} automations={autos} /> <AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
</div> setSelected(i)
args.onSelectAutomation(i)
}} />
</CookiesProvider>
</Page>
} }
export const EmptyStart = Template.bind({}) export const EmptyStart = Template.bind({})
@@ -1,85 +1,18 @@
import { groupAutomations, getTagList } from './AutomationListBox'; import { getTagList } from './AutomationListBox';
import { AutomationData } from 'types/automations/index';
import { createMockAuto } from 'utils/mocks'; import { createMockAuto } from 'utils/mocks';
test('group automations', () => { // const makeDummy = (id: string, tags: Record<string, string>) => ({
const automations: AutomationData[] = [ // condition: [],
{ // metadata: {
metadata: { // id,
id: '1', // alias: '',
alias: '', // description: '',
description: '', // mode: 'single',
mode: 'single', // },
}, // tags,
tags: { // sequence: [],
"Room": 'Living Room', // trigger: [],
"Type": 'Lights' // })
},
sequence: [],
trigger: [],
},
{
metadata: {
id: '2',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Living Room',
"Type": 'Climate'
},
sequence: [],
trigger: [],
},
{
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', () => { test('getTagList', () => {
expect(getTagList([ expect(getTagList([
@@ -1,185 +1,142 @@
import "./AutomationListBox.css"; import "./AutomationListBox.css";
import { FC, useState } from 'react'; import { FC, useState } from "react";
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
import InputMultiSelect from "components/Inputs/InputMultiSelect"; import InputMultiSelect from "components/Inputs/InputMultiSelect";
import InputText from "components/Inputs/InputText"; import InputText from "components/Inputs/InputText";
import { Button } from "components/Inputs/Button"; import { Button } from "components/Inputs/Button";
import { TrashIcon } from "components/Icons"; import { makeGrouping } from "./automationGrouper";
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
import { useCookies } from "react-cookie";
export type Props = { export type Props = {
automations: AutomationData[]; automations: AutomationData[];
onSelectAutomation: (i: number) => void; selected: number;
onRemove: (i: number) => void; onSelectAutomation: (i: number) => void;
onAdd: () => 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);
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<Props> = ({ export const AutomationListBox: FC<Props> = ({
automations, automations,
onSelectAutomation, selected,
onAdd, onSelectAutomation,
onRemove, onAdd,
onRemove,
}) => { }) => {
const tags = getTagList(automations);
const { searchText, setSearchText, selectedTagIdx, setSelectedTagIdx } =
useAutomationListBoxState();
const filteredAutomations = filterAutomations(
automations,
searchText.toLowerCase()
);
const grouping = makeGrouping(
filteredAutomations.map(([a, _]) => a),
selectedTagIdx.map((i) => tags[i]),
selected
);
const tags = getTagList(automations); return (
const [searchText, setSearchText] = useState(''); <div className="automation-list-box">
const [selected, setSelected] = useState<number[]>([]); <div className="automation-list-box--nav">
const filteredAutomations = filterAutomations(automations, searchText, selected, tags); <InputText label="Search" value={searchText} onChange={setSearchText} />
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selected, tags); <InputMultiSelect
label="Tags"
return <div className="automation-list-box"> selected={selectedTagIdx}
<div className="automation-list-box--nav"> onChange={setSelectedTagIdx}
<InputText options={tags}
label="Search" max={3}
value={searchText} />
onChange={setSearchText} </div>
/> <div className="automation-list-box--body">
<InputMultiSelect <AutomationListBoxGroup
label="Tags" events={{
selected={selected} onSelectAutomation,
onChange={setSelected} onRemove,
options={tags} }}
max={3} autos={filteredAutomations}
/> grouping={grouping}
</div> selectedAutomationIdx={selected}
<div className="automation-list-box--body"> />
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove)} </div>
</div> <div className="automation-list-box--bottom">
<div className="automation-list-box--bottom"> <Button onClick={onAdd}>Add</Button>
<Button onClick={onAdd}>Add</Button> <span>
<span>Showing Automations: {filteredAutomations.length} out of {automations.length}</span> Showing Automations: {filteredAutomations.length} out of{" "}
</div> {automations.length}
</span>
</div>
</div> </div>
} );
};
export const getTagList = (autos: AutomationData[]): string[] =>
export const getTagList = (autos: AutomationData[]): string[] => Object.keys(autos Object.keys(
.map(a => Object.keys(a.tags)) autos
.reduce((all: any, keys) => { .map((a) => Object.keys(a.tags))
.reduce((all: any, keys) => {
for (const k of keys) { for (const k of keys) {
all[k] = 1 all[k] = 1;
} }
return all; return all;
}, {})) }, {})
);
const filterAutomations = (autos: AutomationData[], searchText: string, selected: number[], tags: string[]): Array<[AutomationData, number]> => autos.map<[AutomationData, number]>((a, i) => [a, i]).filter(([a, i]) => { const filterAutomations = (
if (searchText.length > 0) { autos: AutomationData[],
searchText: string
): Array<[AutomationData, number]> =>
autos
.map<[AutomationData, number]>((a, i) => [a, i])
.filter(([a, i]) => {
if (!a.metadata) {
return true;
}
if (searchText.length > 0) {
if ( if (
!( !(
a.metadata.description.toLocaleLowerCase().includes(searchText) || (a.metadata.description ?? "")
a.metadata.alias.toLocaleLowerCase().includes(searchText) .toLocaleLowerCase()
) .includes(searchText) ||
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
)
) { ) {
return false return false;
} }
} }
if (selected.length > 0) { return true;
for (const i of selected) { });
if (!a.tags[tags[i]]) {
return false
}
}
}
return true
})
export const groupAutomations = (
autos: AutomationData[],
selected: number[],
tags: string[],
) => {
if (selected.length === 0) {
return autos.map((_, i) => i);
}
const out: any = {};
for (let ai = 0; ai < autos.length; ai++) {
const a = autos[ai];
let where = out;
let tag: string = '';
let lastKey: string | null = null;
for (const i of selected) {
tag = tags[i];
if (lastKey !== null) {
where = where[lastKey]
}
if (!where[a.tags[tag]]) {
where[a.tags[tag]] = {}
}
lastKey = a.tags[tag]
}
if (lastKey !== null) {
if (!where[lastKey] || !Array.isArray(where[lastKey])) {
where[lastKey] = []
}
where[lastKey].push(ai)
}
}
return out;
}
const convertGroupsToItems = (
groups: any,
autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void,
) => {
if (Array.isArray(groups)) {
return groups.map(i => {
const [auto, autoIndex] = autos[i];
return <div
key={i}
className="automation-list-box--body--item"
title={`Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`}
onClick={() => onSelectAutomation(autoIndex)}
>
<div
className="automation-list-box--body--item--title"
>
<b>{auto.metadata.alias.slice(0, 15)} <span>({auto.metadata.id.slice(0, 5)})</span></b>
<span>{auto.metadata.description.slice(0, 25)}</span>
<div
className="automation-list-box--body--item--tags"
>
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
<b>{tagName}:</b> {auto.tags[tagName]}
</span>)}
</div>
</div>
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
</div>
})
} else {
return Object.keys(groups).map(groupName => {
return <AutomationListBoxGroup
key={groupName}
groupName={groupName}
groups={groups[groupName]}
autos={autos}
onSelectAutomation={onSelectAutomation}
onRemove={onRemove}
/>
})
}
}
const AutomationListBoxGroup: FC<{
groupName: string,
groups: any,
autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void;
}> = ({
groupName,
groups,
autos,
onSelectAutomation,
onRemove,
}) => {
const [open, setOpen] = useState(false);
return <div className="automation-list-box--body--group">
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove)}
</div>
}
@@ -0,0 +1,166 @@
import { TrashIcon } from "components/Icons";
import { MetadataBox } from "./AutomationMetadataBox";
import { AutomationData } from "types/automations";
import { AutomationGrouping } from "./automationGrouper";
import { FC, useState } from "react";
import { ButtonIcon } from "components/Icons/ButtonIcons";
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;
};
export const AutomationListBoxGroup: FC<AutomationListBoxGroupProps> = ({
events,
grouping,
autos,
selectedAutomationIdx,
}) => {
if (grouping.top.length === 1) {
return (
<>
{convertGroupsToItems(
autos,
{
grouping,
currentNode: grouping.top[0],
},
events,
selectedAutomationIdx
)}
</>
);
} else {
return (
<>
{grouping.top.map((groupIdx) => (
<AutomationListBoxGroupItem
key={groupIdx}
autos={autos}
groups={{
grouping,
currentNode: groupIdx,
}}
events={events}
selectedAutomationIdx={selectedAutomationIdx}
/>
))}
</>
);
}
};
export const convertGroupsToItems = (
autos: Array<[AutomationData, number]>,
{ grouping, currentNode }: AutomationListBoxGroups,
events: AutomationListBoxEvents,
selectedAutomationIdx: number
) => {
const automations = grouping.getAutomations(currentNode);
if (automations.length > 0) {
return automations.map((autoIndex) => (
<AutomationListBoxItem
key={`${autoIndex}-${autos[autoIndex][1]}`}
events={events}
auto={autos[autoIndex]}
isSelected={selectedAutomationIdx === autos[autoIndex][1]}
/>
));
}
const subgroups = grouping.getSubGroups(currentNode);
if (subgroups.length > 0) {
return subgroups.map((groupIdx) => (
<AutomationListBoxGroupItem
key={groupIdx}
autos={autos}
groups={{
grouping,
currentNode: groupIdx,
}}
events={events}
selectedAutomationIdx={selectedAutomationIdx}
/>
));
}
return <></>;
};
export const AutomationListBoxGroupItem: FC<{
events: AutomationListBoxEvents;
groups: AutomationListBoxGroups;
autos: Array<[AutomationData, number]>;
selectedAutomationIdx: number;
}> = ({ autos, groups, events, selectedAutomationIdx }) => {
const groupData = groups.grouping.getData(groups.currentNode);
const automations = groups.grouping.getAutomations(groups.currentNode);
const [open, setOpen] = useState(false);
const isOther = groupData.isOther;
const openIcon = !open ? "⊕" : "⊖";
const total = isOther ? (
<small>
{automations.length} automation{automations.length !== 1 ? "s" : ""}{" "}
{groupData.isOther ? "" : "(untagged)"}
</small>
) : (
<></>
);
return (
<div
className={[
"automation-list-box--body--group",
isOther ? "other" : "",
groupData.selected ? "selected" : "",
].join(" ")}
>
<b onClick={() => setOpen(!open)}>
{groupData.name} {openIcon} {total}
</b>
{open &&
convertGroupsToItems(autos, groups, events, selectedAutomationIdx)}
</div>
);
};
export const AutomationListBoxItem: FC<{
auto: [AutomationData, number];
isSelected: boolean;
events: AutomationListBoxEvents;
}> = ({
events: { onRemove, onSelectAutomation },
auto: [auto, autoIndex],
isSelected,
}) => {
let title = "BadAuto<<Missing Metadata>>";
if (auto.metadata) {
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`;
}
return (
<div
key={autoIndex}
className={[
"automation-list-box--body--item",
isSelected ? "selected" : "",
].join(" ")}
title={title}
onClick={() => onSelectAutomation(autoIndex)}
>
<MetadataBox metadata={auto.metadata} tags={auto.tags} />
<ButtonIcon onClick={() => onRemove(autoIndex)} icon={<TrashIcon />} />
</div>
);
};
@@ -0,0 +1,27 @@
import { FC } from "react"
import { AutomationMetadata } from "types/automations"
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>
}
@@ -2,23 +2,15 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { ConnectedAutomationList } from "."; import { ConnectedAutomationList } from ".";
import { createMockAuto } from "utils/mocks"; import { createMockAuto } from "utils/mocks";
import { useMockApiService } from "apiService"; import { useMockApiService } from "apiService";
import * as dgconst from 'components/DAGSvgs/constants'; import { DEFAULT_DIMS } from 'components/DAGFlow/constants';
import { Page } from "components/Page";
export default { export default {
title: 'App/AutomationList/Connected', title: 'App/AutomationList/Connected',
component: ConnectedAutomationList, component: ConnectedAutomationList,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: '^on.*' } },
args: { args: {
dims: { dims: DEFAULT_DIMS,
nodeHeight: dgconst.NODE_HEIGHT,
nodeWidth: dgconst.NODE_WIDTH,
distanceFactor: dgconst.DISTANCE_FACTOR,
circleSize: dgconst.CIRCLE_SIZE,
padding: {
x: dgconst.PADDING,
y: dgconst.PADDING,
},
},
initialAutomations: [], initialAutomations: [],
} }
} as ComponentMeta<typeof ConnectedAutomationList>; } as ComponentMeta<typeof ConnectedAutomationList>;
@@ -26,12 +18,12 @@ export default {
const Template: ComponentStory<any> = args => { const Template: ComponentStory<any> = args => {
const api = useMockApiService(args.initialAutomations); const api = useMockApiService(args.initialAutomations);
return <div className="page"> return <Page>
<ConnectedAutomationList <ConnectedAutomationList
{...args} {...args}
api={api} api={api}
/> />
</div> </Page>
} }
export const EmptyStart = Template.bind({}) export const EmptyStart = Template.bind({})
@@ -53,3 +45,20 @@ 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,24 @@
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 -4
View File
@@ -9,7 +9,6 @@
.automation-list--list { .automation-list--list {
flex: 1; flex: 1;
min-width: 400px;
max-width: 400px; max-width: 400px;
position: relative; position: relative;
} }
@@ -19,6 +18,25 @@
flex: 1; flex: 1;
} }
/* Loading state */
.automation-list--root.loading {
width: 100%;
height: 100%;
flex-direction: column;
}
.automation-list--root.loading>* {
width: 100%;
}
.automation-list--root.loading .automation-list--circle-loader {
width: 100%;
height: 100%;
justify-content: center;
align-items: center;
display: flex;
}
/* list children: on hide */ /* list children: on hide */
.automation-list--list.hide>.automation-list-box { .automation-list--list.hide>.automation-list-box {
width: 0; width: 0;
@@ -32,6 +50,7 @@
.automation-list--list.hide>.automation-list--list-hide { .automation-list--list.hide>.automation-list--list-hide {
transform: rotate(180deg); transform: rotate(180deg);
left: 0;
} }
/* list children: normal */ /* list children: normal */
@@ -40,8 +59,10 @@
border-width: 1px; border-width: 1px;
} }
.automation-list--list-hide { .automation-list--list .automation-list--list-hide {
position: absolute; position: absolute;
bottom: 0.5em; bottom: 0em;
right: 0.5em; left: 0.5em;
max-width: 1.5em;
max-height: 1.5em;
} }
@@ -0,0 +1,78 @@
/* none-hidden */
.automation-list--root.mobile {
flex-direction: column;
}
.automation-list--root.mobile>.automation-list--list {
max-width: 100vw;
min-height: 100vh;
}
.automation-list--root.mobile .automation-editor {
flex-direction: column;
}
.automation-list--root.mobile .automation-list--list-hide {
transform: rotate(90deg);
left: 0.25em;
}
.automation-list--root.mobile .automation-editor--info-box {
min-width: 100vw;
min-height: calc(100vh - 5em);
max-width: 100vw;
max-height: calc(100vh - 5em);
padding: 0;
}
.automation-list--root.mobile .automation-editor--info-box-inner {
margin-top: 2.5em;
padding-left: 0.5em;
padding-right: 0.5em;
margin-bottom: 2em;
}
.automation-list--root.mobile .automation-editor--info-box--icon {
left: 0.5em;
bottom: 0em;
background-color: var(--primary);
transform: rotate(90deg);
}
/* list hide */
.automation-list--root.mobile .automation-list--list.hide {
width: 100vw;
min-height: 0;
max-height: 0;
}
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
transform: rotate(270deg);
position: fixed;
top: 0;
z-index: 5;
}
/* info box hide */
.automation-list--root.mobile .automation-editor--info-box.hide {
width: 100vw;
min-height: 0;
max-height: 0;
}
.automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon {
transform: rotate(270deg);
position: fixed;
top: 0em;
left: 0.25em;
z-index: 10;
}
.automation-list--root.mobile .automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
height: 0;
opacity: 0;
overflow: hidden;
}
Loaded 100 of 267 files, more files were not shown because too many files have changed in this diff. Show more