Compare commits

..
137 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
217 changed files with 16967 additions and 12344 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
-1
View File
@@ -30,5 +30,4 @@ jobs:
args: | args: |
--${{ matrix.arch }} \ --${{ matrix.arch }} \
--version ${{ github.event.inputs.version }} \ --version ${{ github.event.inputs.version }} \
--additional-tag edge \
--target . --target .
-28
View File
@@ -1,6 +1,4 @@
name: Deploy name: Deploy
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
@@ -28,32 +26,6 @@ jobs:
run: | run: |
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md) echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
# build:
# runs-on: ubuntu-latest
# name: Build & Publish ${{ matrix.arch }}
# needs:
# - metadata
# strategy:
# matrix:
# arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
# steps:
# - name: Check out repository
# uses: actions/checkout@v3
# - name: Login to DockerHub
# uses: docker/login-action@v2.0.0
# with:
# username: ${{ secrets.DOCKERHUB_USERNAME }}
# password: ${{ secrets.DOCKERHUB_TOKEN }}
# - name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
# uses: home-assistant/builder@2022.03.1
# with:
# args: |
# --${{ matrix.arch }} \
# --target .
publish: publish:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: needs:
+56 -34
View File
@@ -1,50 +1,44 @@
name: Test name: Test
env: env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs" MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branch: [main] branch: [main]
pull_request: pull_request:
branches: [main] branches: [main]
jobs: jobs:
build: metadata:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Build Test for ${{ matrix.arch }} name: Metadata
strategy: outputs:
matrix: version: ${{ steps.version.outputs.VERSION }}
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps: steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
with:
all_but_latest: true
access_token: ${{ github.token }}
- name: Check out repository - name: Check out repository
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} fetch-depth: 0
password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Get Version
id: version
shell: bash
run: |
echo ::set-output name=VERSION::$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
- name: ${{ steps.version.outputs.VERSION }}
shell: bash
run: |
echo ${{ steps.version.outputs.VERSION }}
- name: ${{ matrix.arch }}
uses: home-assistant/builder@2022.03.1
with:
args: |
--test \
--${{ matrix.arch }} \
--target .
python: python:
name: "Python Tests" name: "Python Tests"
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs:
- metadata
strategy: strategy:
matrix: matrix:
action: [lint, coverage, security-checks] action:
- lint
- coverage
- security-checks
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Set up Python - name: Set up Python
@@ -55,29 +49,57 @@ jobs:
run: cd api && make setup run: cd api && make setup
- name: Echo dependencies - name: Echo dependencies
run: cd api && ./venv/bin/pip freeze run: cd api && ./venv/bin/pip freeze
- name: Running ${{ matrix.action }} - name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
run: cd api && make ${{ matrix.action }} run: cd api && make ${{ matrix.action }}
nodejs: nodejs:
name: "NodeJs Tests" name: "NodeJs Tests"
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs:
- metadata
strategy: strategy:
matrix: matrix:
action: action:
- "test:ci" - "test:ci"
- "tsc:ci" - "tsc:ci"
- "build"
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: 16 node-version: 16
cache: 'yarn' cache: "yarn"
cache-dependency-path: webapp/yarn.lock cache-dependency-path: webapp/yarn.lock
- name: Install Dependencies - name: Install Dependencies
run: cd webapp && yarn install run: cd webapp && yarn install
- name: Run Tests - name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
run: cd webapp && yarn ${{ matrix.action }} run: cd webapp && yarn ${{ matrix.action }}
deploy:
runs-on: ubuntu-latest
name: Build & Publish ${{ matrix.arch }}
needs:
- metadata
- nodejs
- python
strategy:
matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
uses: home-assistant/builder@2022.03.1
with:
args: |
--${{ matrix.arch }} \
--no-latest \
--version ${{ needs.metadata.outputs.version }} \
--target .
+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"
}
} }
+49 -4
View File
@@ -1,4 +1,51 @@
# 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 ## [0.1.12] - Less Intense Error Messages
@@ -6,7 +53,6 @@
- Made the validators less strict in order to capture more edge cases that HA supports - Made the validators less strict in order to capture more edge cases that HA supports
- Nicer auto-generated descriptions for some trigger nodes - Nicer auto-generated descriptions for some trigger nodes
## [0.1.10] - More Bug Fixes ## [0.1.10] - More Bug Fixes
- Allowing null or undefined values for metadata fields - Allowing null or undefined values for metadata fields
@@ -60,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
+27 -7
View File
@@ -1,24 +1,44 @@
DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml BUILD_TAG=$(shell git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
DC=BUILD_TAG=${BUILD_TAG} docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
build-with-builder:
docker run \
--rm \
--privileged \
-v ~/.docker:/root/.docker \
-v /var/run/docker.sock:/var/run/docker.sock:ro \
-v ${PWD}:/data \
homeassistant/amd64-builder \
--amd64 \
--test \
--version ${BUILD_TAG} \
-t /data
build: build:
$(DC) build $(DC) build
build-no-cache:
$(DC) build --no-cache
push: push:
$(DC) push $(DC) push
local_run: start:
$(MAKE) build
$(DC) up -d $(DC) up -d
sleep 1 sleep 1
$(DC) ps $(DC) ps
local_logs: logs:
$(DC) logs -f $(DC) logs -f
local_ps: ps:
$(DC) ps $(DC) ps
stop:
local_stop:
$(DC) stop $(DC) stop
bash:
$(DC) exec addon bash
config:
$(DC) config
+10 -4
View File
@@ -1,10 +1,16 @@
# Shortumation # Shortumation ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=platsic)
[![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
![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 better way to write automations in home-assistant without having to install and run a seperate automation engine! A better way to write automations in home-assistant without having to install and run a seperate automation engine!
![image](https://user-images.githubusercontent.com/7451445/168672575-fb19997d-fe9b-4192-96b0-733b62519797.png) ![image](https://user-images.githubusercontent.com/7451445/170770378-122c6722-993d-40ac-801d-387cfaccd41f.png)
![image](https://user-images.githubusercontent.com/7451445/168672840-71ceaa8a-2bee-443e-9150-5b0f03b05d08.png) ![image](https://user-images.githubusercontent.com/7451445/170770572-fd38950a-b6b4-4b49-8c94-fb0a5f3008ce.png)
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/). A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
@@ -15,9 +21,9 @@ A [home-assistant 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
+12
View File
@@ -0,0 +1,12 @@
# Security Policy
## Supported Versions
| Version | Supported |
| ------- | ------------------ |
| 0.1.x | :white_check_mark: |
## Reporting a Vulnerability
Please open an issue with the tag 'Vulnerability', and include your reasoning in it.
+13 -16
View File
@@ -1,17 +1,14 @@
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:16) list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:17)
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:27) upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:28)
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:31) delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:32)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:12) read_details # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:10)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:9) read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:10)
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:16) websocket_endpoint # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/socket.py:9)
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:17) params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:18)
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:6) total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:19)
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:7) id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8) alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9) description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10) trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:11)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:12)
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5) json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
logger # unused variable (/home/ari/Projects/Shortumation/api/src/logger.py:16)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:13)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:30)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:54)
+1 -1
View File
@@ -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
+2 -1
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",
@@ -21,6 +21,7 @@ setuptools.setup(
"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",
], ],
}, },
+10 -5
View File
@@ -3,16 +3,16 @@ from fastapi.middleware.cors import CORSMiddleware
from fastapi.staticfiles import StaticFiles from fastapi.staticfiles import StaticFiles
from src.automations.manager import AutomationManager from src.automations.manager import AutomationManager
from src.env import ORIGIN, ROOT_FOLDER from src.env import API_PREFIX, ORIGIN, ROOT_FOLDER
from .routes import automations, details, ping from .routes import automations, details, ping, socket
def make_app(automation_mgr: AutomationManager) -> FastAPI: def make_app(automation_mgr: AutomationManager) -> FastAPI:
app = FastAPI() app = FastAPI()
if (ROOT_FOLDER / "web").exists(): if (ROOT_FOLDER / "web").exists():
app.mount( app.mount(
"/web", f"{API_PREFIX}/web",
StaticFiles( StaticFiles(
directory=ROOT_FOLDER / "web", directory=ROOT_FOLDER / "web",
html=True, html=True,
@@ -29,6 +29,11 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
allow_headers=["*"], allow_headers=["*"],
) )
app.include_router(ping.router, prefix="/ping") app.include_router(ping.router, prefix="/ping")
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations") app.include_router(
app.include_router(details.make_details_router(automation_mgr.hass_config), prefix="/details") automations.make_automation_router(automation_mgr), prefix=f"{API_PREFIX}/automations"
)
app.include_router(
details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details"
)
app.include_router(socket.router, prefix=f"{API_PREFIX}/socket")
return app return app
+4 -4
View File
@@ -1,8 +1,6 @@
from datetime import datetime
from fastapi import APIRouter from fastapi import APIRouter
from src.env import BUILD_VERSION from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
from src.hass_config import HassConfig from src.hass_config import HassConfig
@@ -10,9 +8,11 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
router = APIRouter() router = APIRouter()
@router.get("/") @router.get("/")
def read_ping(): def read_details():
return { return {
"version": BUILD_VERSION, "version": BUILD_VERSION,
"hassio_token": HASSIO_TOKEN,
"hassio_url": HASSIO_WS,
"config": hass_config.get_configuration_path(), "config": hass_config.get_configuration_path(),
"tags": hass_config.get_automation_tags_path(), "tags": hass_config.get_automation_tags_path(),
"autos": hass_config.get_automation_path(), "autos": hass_config.get_automation_path(),
+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(),
)
+3
View File
@@ -4,5 +4,8 @@ from decouple import Csv, config
ROOT_FOLDER = Path(__file__).parent.parent.absolute() ROOT_FOLDER = Path(__file__).parent.parent.absolute()
BUILD_VERSION = config("BUILD_VERSION", "0.0.0") BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
HASSIO_TOKEN = config("SUPERVISOR_TOKEN", "")
HASSIO_WS = config("HASSIO_WS", "ws://supervisor/core/websocket")
LOG_LEVEL = config("LOG_LEVEL", "INFO") LOG_LEVEL = config("LOG_LEVEL", "INFO")
API_PREFIX = config("API_PREFIX", "")
ORIGIN = config("ORIGIN", cast=Csv(), default="*") ORIGIN = config("ORIGIN", cast=Csv(), default="*")
+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())
+13 -3
View File
@@ -1,7 +1,10 @@
import io import io
from typing import Any, TextIO, Union from typing import Any, TextIO, Union
from src.yaml_serializer.base_yaml import yaml import yaml
from src.yaml_serializer.dumper import YamlSafeDumper
from src.yaml_serializer.loader import YamlSafeLoader
def dump_yaml(obj: Any) -> str: def dump_yaml(obj: Any) -> str:
@@ -14,7 +17,14 @@ def dump_yaml(obj: Any) -> str:
str str
""" """
stream = io.StringIO() stream = io.StringIO()
yaml.dump(obj, stream) yaml.dump( # nosec
obj,
stream,
default_flow_style=False,
allow_unicode=True,
sort_keys=False,
Dumper=YamlSafeDumper,
)
stream.seek(0) stream.seek(0)
return stream.read() return stream.read()
@@ -28,4 +38,4 @@ def load_yaml(yaml_stream: TextIO) -> Union[dict, list]:
Returns: Returns:
List[dict, list] List[dict, list]
""" """
return yaml.load(yaml_stream) return yaml.load(yaml_stream, Loader=YamlSafeLoader) # nosec
-19
View File
@@ -1,19 +0,0 @@
from ruamel.yaml import YAML
from src.yaml_serializer.types import (
IncludedYaml,
IncludedYamlDir,
SecretValue,
)
yaml = YAML()
yaml.register_class(IncludedYaml)
yaml.register_class(SecretValue)
yaml.register_class(IncludedYamlDir)
yaml.constructor.add_constructor("!include", IncludedYaml.from_yaml)
yaml.constructor.add_constructor("!secret", SecretValue.from_yaml)
yaml.constructor.add_constructor("!env_var", IncludedYamlDir.from_yaml)
yaml.constructor.add_constructor("!include_dir_list", IncludedYamlDir.from_yaml)
yaml.constructor.add_constructor("!include_dir_merge_list", IncludedYamlDir.from_yaml)
yaml.constructor.add_constructor("!include_dir_named", IncludedYamlDir.from_yaml)
yaml.constructor.add_constructor("!include_dir_merge_named", IncludedYamlDir.from_yaml)
+16
View File
@@ -0,0 +1,16 @@
import yaml
from src.yaml_serializer.types import (
IncludedYaml,
IncludedYamlDir,
SecretValue,
)
class YamlSafeDumper(yaml.SafeDumper):
pass
YamlSafeDumper.add_representer(IncludedYaml, IncludedYaml.to_yaml) # type: ignore
YamlSafeDumper.add_representer(SecretValue, SecretValue.to_yaml) # type: ignore
YamlSafeDumper.add_representer(IncludedYamlDir, IncludedYamlDir.to_yaml) # type: ignore
+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)
+2 -2
View File
@@ -1,7 +1,7 @@
from typing import NamedTuple from typing import NamedTuple
from ruamel.yaml.nodes import Node from yaml.nodes import Node
from ruamel.yaml.representer import BaseRepresenter from yaml.representer import BaseRepresenter
class IncludedYaml(NamedTuple): class IncludedYaml(NamedTuple):
+3 -3
View File
@@ -1,7 +1,7 @@
from unittest import TestCase from unittest import TestCase
import yaml
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from ruamel.yaml import YAML
from src.api.app import make_app from src.api.app import make_app
from src.automations.types import ( from src.automations.types import (
@@ -151,7 +151,7 @@ class automation_update_tests(BaseTestCase):
) )
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
with (self.config_folder / "automations.yaml").open("r") as fp: with (self.config_folder / "automations.yaml").open("r") as fp:
disk_data = dict(YAML().load(fp)[15]) disk_data = dict(yaml.safe_load(fp)[15])
trigger = list(map(dict, disk_data.pop("trigger"))) trigger = list(map(dict, disk_data.pop("trigger")))
condition = disk_data.pop("condition") condition = disk_data.pop("condition")
action = list(map(dict, disk_data.pop("action"))) action = list(map(dict, disk_data.pop("action")))
@@ -202,7 +202,7 @@ class automation_update_tests(BaseTestCase):
) )
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
with (self.config_folder / "automations.yaml").open("r") as fp: with (self.config_folder / "automations.yaml").open("r") as fp:
disk_data = dict(YAML().load(fp)[27]) disk_data = dict(yaml.safe_load(fp)[27])
trigger = list(map(dict, disk_data.pop("trigger"))) trigger = list(map(dict, disk_data.pop("trigger")))
condition = disk_data.pop("condition") condition = disk_data.pop("condition")
action = list(map(dict, disk_data.pop("action"))) action = list(map(dict, disk_data.pop("action")))
@@ -1,11 +1,6 @@
import json import json
from unittest import TestCase from unittest import TestCase
from ruamel.yaml.scalarbool import ScalarBoolean
from ruamel.yaml.scalarfloat import ScalarFloat
from ruamel.yaml.scalarint import ScalarInt
from ruamel.yaml.scalarstring import ScalarString
from src.json_serializer import json_dumps from src.json_serializer import json_dumps
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
@@ -34,25 +29,3 @@ class json_serializer_tests(TestCase):
}, },
), ),
) )
def test_convert_ruamel_types(self):
self.assertEqual(
json_dumps(
{
"int": ScalarInt(1),
"float": ScalarFloat(1.3),
"bool": ScalarBoolean(False),
"list": [1, ScalarString("w")],
"tup": (1, ScalarString("w")),
}
),
json.dumps(
{
"int": 1,
"float": 1.3,
"bool": 0,
"list": [1, "w"],
"tup": (1, "w"),
},
),
)
+28 -7
View File
@@ -19,21 +19,29 @@ class dumping_yamls_tests(TestCase):
) )
} }
) )
self.assertEqual(yaml, "automations: !include automations.yaml\n") self.assertEqual(yaml, "automations: !include 'automations.yaml'\n")
def test_dumping_secrets(self): def test_dumping_secrets(self):
yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")}) yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")})
self.assertEqual(yaml, "google_password: !secret gpass\n") self.assertEqual(yaml, "google_password: !secret 'gpass'\n")
def test_dumping_stub(self): def test_dumping_stub(self):
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")}) yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")})
self.assertEqual(yaml, "sensor: !include_dir_list sensors/*yaml\n") self.assertEqual(yaml, "sensor: !include_dir_list 'sensors/*yaml'\n")
def test_load_stub(self): def test_load_stub(self):
yaml_obj = load_yaml( yaml_obj = load_yaml(
io.StringIO( io.StringIO(
""" """
name: cool name: cool
date: "10:00"
bools:
- "yes"
- "no"
- true
- false
bobIsNull:
bobIsNull2: null
google_password: !secret gpass google_password: !secret gpass
sensor: !include_dir_list sensors/*yaml sensor: !include_dir_list sensors/*yaml
automations: !include automations.yaml automations: !include automations.yaml
@@ -44,6 +52,10 @@ class dumping_yamls_tests(TestCase):
dict(yaml_obj), dict(yaml_obj),
{ {
"name": "cool", "name": "cool",
"date": "10:00",
"bools": ["yes", "no", True, False],
"bobIsNull": None,
"bobIsNull2": None,
"google_password": SecretValue("gpass", "n/a"), "google_password": SecretValue("gpass", "n/a"),
"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"), "sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"),
"automations": IncludedYaml("automations.yaml"), "automations": IncludedYaml("automations.yaml"),
@@ -51,8 +63,17 @@ class dumping_yamls_tests(TestCase):
) )
self.assertEqual( self.assertEqual(
dump_yaml(yaml_obj), dump_yaml(yaml_obj),
"name: cool\n" """name: cool
"google_password: !secret gpass\n" date: '10:00'
"sensor: !include_dir_list sensors/*yaml\n" bools:
f"automations: !include automations.yaml\n", - 'yes'
- 'no'
- true
- false
bobIsNull: null
bobIsNull2: null
google_password: !secret 'gpass'
sensor: !include_dir_list 'sensors/*yaml'
automations: !include 'automations.yaml'
""",
) )
+29
View File
@@ -0,0 +1,29 @@
import os
import yaml
from pathlib import Path
print(Path().absolute())
CONFIG_YAML = Path("config.yaml").absolute()
CHANGELOG_MD = Path("CHANGELOG.md").absolute()
print(CONFIG_YAML)
print(CHANGELOG_MD)
version = os.environ["VERSION"]
version_name = os.environ["NAME"]
change = os.environ["CHANGELOG"].splitlines()
config = yaml.load(CONFIG_YAML.read_text(), yaml.Loader)
changelog = CHANGELOG_MD.read_text().splitlines()
with CHANGELOG_MD.open("w") as fp:
for i, log in enumerate(changelog):
if i == 2:
fp.write(f"## [{version}] - {version_name}\n\n")
for clog in change:
fp.write(f"- {clog.strip()}\n")
fp.write(log.strip() + "\n")
CONFIG_YAML.write_text(yaml.dump(config))
+6 -7
View File
@@ -1,5 +1,5 @@
name: Shortumation name: Shortumation
version: 0.1.12 version: v0.1.22
slug: shortumation slug: shortumation
image: asosnovsky/shortumation-{arch} image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation" url: "https://github.com/asosnovsky/Shortumation"
@@ -16,16 +16,15 @@ init: false
ingress: true ingress: true
ingress_port: 8000 ingress_port: 8000
ingress_entry: "web/" ingress_entry: "web/"
panel_icon: mdi:home-automation homeassistant_api: true
hassio_role: manager
privileged:
- SYS_RAWIO
host_network: false
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
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:
+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
},
]
}
+32 -14
View File
@@ -4,21 +4,34 @@
"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",
"@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", "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": {
@@ -66,19 +79,24 @@
"@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",
"src" "src"
] ]
} }
+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>
); );
+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 -7
View File
@@ -4,14 +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);
const baseURL = new URL(
process.env.NODE_ENV === 'development' ?
`http://${window.location.hostname}:8000` :
window.location.origin + (!locationPrefixWeb ? '' : locationPrefixWeb[1])
);
export const wsURL = baseURL + "socket"
export const remoteAutoAPI = makeRemoteAPI(
baseURL + "automations"
);
export const useConnectedApiService = () => useAPIService( export const useConnectedApiService = () => useAPIService(
makeAutomationAPI(makeRemoteAPI( makeAutomationAPI(remoteAutoAPI)
process.env.NODE_ENV === 'development' ?
"http://localhost:8000/automations" :
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
))
); );
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService( export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
makeAutomationAPI(useMockAPI(initialAutos)) makeAutomationAPI(useMockAPI(initialAutos))
+1 -1
View File
@@ -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,
+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,
} }
}); });
} }
@@ -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 = {
@@ -2,16 +2,19 @@ import "./AutoInfoBox.css";
import { AutomationMetadata } from "types/automations"; import { AutomationMetadata } from "types/automations";
import { InputList } from "components/Inputs/InputList"; import { InputList } from "components/Inputs/InputList";
import InputText from "components/Inputs/InputText"; import InputText from "components/Inputs/InputText";
import InputTextArea from "components/Inputs/InputTextArea"; import { FC, ReactNode, useRef, useState } from "react";
import { FC, useRef, useState } from 'react';
import { AddIcon, TrashIcon } from "components/Icons"; import { AddIcon, TrashIcon } from "components/Icons";
import { Button } from "components/Inputs/Button"; import InputAutoText from "components/Inputs/InputAutoText";
import { TagDB } from "components/AutomationList/TagDB";
import { ButtonIcon } from "components/Icons/ButtonIcons";
interface Props { interface Props {
className: string; className: string;
metadata: AutomationMetadata; metadata: AutomationMetadata;
tags: Array<[string, string]>; tags: Array<[string, string]>;
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void; onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
tagDB: TagDB;
children?: ReactNode;
} }
export const AutoInfoBox: FC<Props> = ({ export const AutoInfoBox: FC<Props> = ({
metadata, metadata,
@@ -19,101 +22,157 @@ export const AutoInfoBox: FC<Props> = ({
onUpdate, onUpdate,
className, className,
children, children,
tagDB,
}) => { }) => {
// state // state
const [newTag, setNewTag] = useState<[string, string]>(["", ""]) const [newTag, setNewTag] = useState<[string, string]>(["", ""]);
const [[errorIndex, error], _setError] = useState<[number | 'new', string]>([-1, ""]); const [[errorIndex, error], _setError] = useState<[number | "new", string]>([
-1,
"",
]);
const errorTimeoutId = useRef(-1); const errorTimeoutId = useRef(-1);
// aliases // aliases
const setError = (index: number | 'new', msg: string) => { const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n));
_setError([index, msg]) const setError = (index: number | "new", msg: string) => {
_setError([index, msg]);
if (errorTimeoutId.current >= 0) { if (errorTimeoutId.current >= 0) {
window.clearTimeout(errorTimeoutId.current); window.clearTimeout(errorTimeoutId.current);
} }
errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000); errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000);
} };
const onUpdateMetadata = <K extends keyof AutomationMetadata>(k: K) => (update: AutomationMetadata[K]) => onUpdate({ const onUpdateMetadata =
...metadata, <K extends keyof AutomationMetadata>(k: K) =>
[k]: update (update: AutomationMetadata[K]) =>
}, tags); onUpdate(
{
...metadata,
[k]: update,
},
tags
);
const validTagName = (newName: string): string | undefined => { const validTagName = (newName: string): string | undefined => {
if (newName.length <= 0) { if (newName.length <= 0) {
return "Name must be at least 1 character long" return "Name must be at least 1 character long";
} }
// eslint-disable-next-line // eslint-disable-next-line
for (const [name, _] of tags) { for (const [name, _] of tags) {
if (name.trim() === newName.trim()) { if (name.trim() === newName.trim()) {
return `The tag '${name}' already exists` return `The tag '${name}' already exists`;
} }
} }
} };
const updateTagName = (newName: string, tagIndex: number) => { const updateTagName = (newName: string, tagIndex: number) => {
const error = validTagName(newName); const error = validTagName(newName);
if (error) { if (error) {
return setError(tagIndex, error) return setError(tagIndex, error);
} }
onUpdate(metadata, [ onUpdate(metadata, [
...tags.slice(0, tagIndex), ...tags.slice(0, tagIndex),
[newName, tags[tagIndex][1]], [newName, tags[tagIndex][1]],
...tags.slice(tagIndex + 1), ...tags.slice(tagIndex + 1),
]) ]);
} };
const onUpdateTags = (tagValue: string, tagIndex: number) => onUpdate(metadata, [ const onUpdateTags = (tagValue: string, tagIndex: number) =>
...tags.slice(0, tagIndex), onUpdate(metadata, [
[tags[tagIndex][0], tagValue], ...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1), [tags[tagIndex][0], tagValue],
]) ...tags.slice(tagIndex + 1),
]);
const addNewTag = () => { const addNewTag = () => {
const error = validTagName(newTag[0]); const error = validTagName(newTag[0]);
if (error) { if (error) {
return setError('new', error) return setError("new", error);
} }
onUpdate(metadata, tags.concat([newTag])); onUpdate(
setNewTag(['', '']); metadata,
} tags.concat([newTag.map((x) => x.trim()) as [string, string]])
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [ );
...tags.slice(0, tagIndex), setNewTag(["", ""]);
...tags.slice(tagIndex + 1), };
]) const onRemoveTag = (tagIndex: number) =>
onUpdate(metadata, [
...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1),
]);
// render // render
return <div className={`automation-editor--info-box ${className}`}> return (
<div className="automation-editor--info-box-inner"> <div className={`automation-editor--info-box ${className}`}>
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} /> <div className="automation-editor--info-box-inner">
<InputText label="Name" value={metadata.alias ?? ""} onChange={onUpdateMetadata('alias')} /> <InputText
<InputTextArea label="Description" value={metadata.description ?? ""} onChange={onUpdateMetadata('description')} /> label="ID"
<InputList value={metadata.id}
label="Mode" onChange={onUpdateMetadata("id")}
current={metadata.mode} />
onChange={onUpdateMetadata('mode')} <InputText
options={[ label="Name"
'parallel', value={metadata.alias ?? ""}
'single', onChange={onUpdateMetadata("alias")}
'queued', />
'restart' <InputText
]} multiline
/> label="Description"
<div className="automation-editor--info-box--tags"> value={metadata.description ?? ""}
<h1>Tags</h1> onChange={onUpdateMetadata("description")}
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag"> />
<Button onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button> <InputList
<InputText value={tagName} label="Name" onChange={v => updateTagName(v, tagIndex)} /> label="Mode"
<InputText value={tagValue} label="Tag" onChange={v => onUpdateTags(v, tagIndex)} /> current={metadata.mode}
<span className={["automation-editor--info-box--tag--error", (errorIndex === tagIndex) ? "show" : "hide"].join(" ")}> onChange={onUpdateMetadata("mode")}
{error} options={["parallel", "single", "queued", "restart"]}
</span> />
</div>)} <div className="automation-editor--info-box--tags">
<hr /> <h1>Tags</h1>
<div className="automation-editor--info-box--tag"> <div className="automation-editor--info-box--tag-list">
<InputText value={newTag[0]} label="Name" onChange={v => setNewTag([v, newTag[1]])} onEnter={addNewTag} /> {tags.map(([tagName, tagValue], tagIndex) => (
<InputText value={newTag[1]} label="Tag" onChange={v => setNewTag([newTag[0], v])} onEnter={addNewTag} /> <div key={tagIndex} className="automation-editor--info-box--tag">
<Button onClick={addNewTag} ><AddIcon /></Button> <InputAutoText
<span className={["automation-editor--info-box--tag--error", (errorIndex === 'new') ? "show" : "hide"].join(" ")}> value={tagName}
{error} label="Name"
</span> onChange={(v) => updateTagName(v, tagIndex)}
options={foundNewTagNames}
error={errorIndex === tagIndex ? error : undefined}
/>
<InputAutoText
value={tagValue}
label="Tag"
onChange={(v) => onUpdateTags(v, tagIndex)}
options={tagDB.getTagValues(tagName)}
error={errorIndex === tagIndex ? error : undefined}
/>
<ButtonIcon
className="automation-editor--info-box--tag--trash"
onClick={() => onRemoveTag(tagIndex)}
icon={<TrashIcon />}
/>
</div>
))}
</div>
<hr />
<div className="automation-editor--info-box--tag">
<InputAutoText
value={newTag[0]}
label="Name"
onChange={(v) => setNewTag([v, newTag[1]])}
options={foundNewTagNames}
error={errorIndex === "new" ? error : undefined}
/>
<InputAutoText
value={newTag[1]}
label="Tag"
onChange={(v) => setNewTag([newTag[0], v])}
options={tagDB.getTagValues(newTag[0])}
error={errorIndex === "new" ? error : undefined}
/>
<ButtonIcon
className="automation-editor--info-box--tag--add"
onClick={addNewTag}
icon={<AddIcon />}
/>
</div>
</div> </div>
</div> </div>
{children}
</div> </div>
{children} );
</div> };
}
@@ -1,5 +1,6 @@
.automation-editor { .automation-editor {
display: flex; display: flex;
position: relative;
flex-direction: row; flex-direction: row;
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -27,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 * {
@@ -64,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%;
} }
@@ -3,6 +3,8 @@ import { ComponentMeta, ComponentStory } from '@storybook/react';
import { AutomationEditor } from './index'; import { AutomationEditor } from './index';
import { useState } from 'react'; import { useState } from 'react';
import * as dgconst from 'components/DAGFlow/constants'; import * as dgconst from 'components/DAGFlow/constants';
import { Page } from "components/Page";
import { makeTagDB } from "components/AutomationList/TagDB";
export default { export default {
@@ -10,21 +12,22 @@ export default {
component: AutomationEditor, component: AutomationEditor,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: '^on.*' } },
args: { args: {
dims: dgconst.DEFAULT_DIMS dims: dgconst.DEFAULT_DIMS,
} }
} as ComponentMeta<typeof AutomationEditor> } as ComponentMeta<typeof AutomationEditor>
const Template: ComponentStory<typeof AutomationEditor> = args => { const Template: ComponentStory<typeof AutomationEditor> = args => {
const [state, setState] = useState(args.automation) const [state, setState] = useState(args.automation)
return <div className="page"> return <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({});
+166 -99
View File
@@ -1,25 +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, EditorData } from './state'; import { useAutomatioEditorState, EditorData } from "./state";
import { SafeDAGAutomationFlow } from "components/DAGFlow/safe"; 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 { MiniFailure } from "types/validators/helper";
import InputYaml from "components/Inputs/InputYaml"; 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 {
@@ -32,112 +40,171 @@ export const AutomationEditor: FC<Props> = ({
save, save,
saveAndUpdate, 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" />
if (state.status === 'invalid') { <Skeleton className="mock-graph" variant="rectangular" />
return <ValidationBox
failures={state.failures}
data={state.data}
validate={validate}
onSave={saveAndUpdate}
/>
}
return <div className="automation-editor">
<AutoInfoBox
className={closeInfo ? "hide" : "show"}
metadata={state.data.metadata}
tags={state.data.tags}
onUpdate={updateMetadata}
>
<ButtonIcon
className="automation-editor--info-box--icon"
onClick={() => setCloseInfo(!closeInfo)}
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
>{ArrowIcon}</ButtonIcon>
</AutoInfoBox>
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
<div className="automation-editor--flow-wrapper--toolbar">
<Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save}
disabled={state.status !== 'changed'}
>
Save <CheckMarkIcon color="#bf4" />
</Button>
</div> </div>
<SafeDAGAutomationFlow );
className="automation-editor--flow-wrapper--flow" }
sequence={state.data.sequence} if (state.status === "invalid") {
trigger={state.data.trigger} return (
condition={state.data.condition} <ValidationBox
onSequenceUpdate={updateSequence} failures={state.failures}
onTriggerUpdate={updateTrigger} data={state.data}
onConditionUpdate={updateCondition} validate={validate}
dims={dims} onSave={saveAndUpdate}
/> />
</div> );
</div> }
} return (
<div className="automation-editor">
{state.status === "saving" && (
<LinearProgress className="linear-loader" />
)}
<AutoInfoBox
className={closeInfo ? "hide" : "show"}
metadata={state.data.metadata}
tags={state.data.tags}
onUpdate={updateMetadata}
tagDB={tagDB}
>
<ButtonIcon
className="automation-editor--info-box--icon"
onClick={() => setCloseInfo(!closeInfo)}
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
color="success"
icon={<ArrowBack />}
/>
</AutoInfoBox>
<div
className={["automation-editor--flow-wrapper", state.status].join(" ")}
>
<div className="automation-editor--flow-wrapper--toolbar">
{!dims.flipped && (
<Button
className={"automation-editor--flow-wrapper--toolbar--flip-btn"}
onClick={() => setFlipped(!flipped)}
>
<Icon>{flipped ? "flip_to_front" : "flip_to_back"}</Icon>
Flip
</Button>
)}
<Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save}
disabled={state.status !== "changed"}
>
Save <CheckMarkIcon color="#bf4" />
</Button>
</div>
<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>
);
};
export const ValidationBox: FC<{ export const ValidationBox: FC<{
failures: MiniFailure[] failures: MiniFailure[];
validate: (d: any) => MiniFailure[] | null, validate: (d: any) => MiniFailure[] | null;
data: EditorData, data: EditorData;
onSave: (d: EditorData) => void, onSave: (d: EditorData) => void;
}> = props => { }> = (props) => {
const [{ failures, data }, setState] = useState({ const [{ failures, data }, setState] = useState({
failures: props.failures, failures: props.failures,
data: props.data, data: props.data,
}); });
const makeSave = <K extends keyof EditorData>(k: K) => (d: EditorData[K]) => { const makeSave =
const newData = { <K extends keyof EditorData>(k: K) =>
...data, (d: EditorData[K]) => {
[k]: d, const newData = {
} ...data,
const newFails = props.validate(newData); [k]: d,
if (newFails) { };
setState({ const newFails = props.validate(newData);
failures: newFails, if (newFails) {
data: newData, setState({
}) failures: newFails,
} else { data: newData,
setState({ });
failures: [], } else {
data: newData, setState({
}) failures: [],
} data: newData,
} });
}
};
return <div className="automation-editor-failures"> return (
<ul> <div className="automation-editor-failures">
{failures.map((f, i) => <> <ul>
<li key={i}> {failures.map((f, i) => (
<b>{f.path}</b>: <>
<ul> <li key={i}>
{f.message.map((m, j) => <li key={j}> <b>{f.path}</b>:
{m} <ul>
</li>)} {f.message.map((m, j) => (
</ul> <li key={j}>{m}</li>
</li> ))}
</>)} </ul>
</ul> </li>
<span>Please correct the automation file manually and then continue!</span> </>
<InputYaml label="Metadata" value={data.metadata} onChange={makeSave('metadata')} resizable /> ))}
<InputYaml label="Tags" value={data.tags} onChange={makeSave('tags')} resizable /> </ul>
<InputYaml label="Trigger" value={data.trigger} onChange={makeSave('trigger')} resizable /> <span>
<InputYaml label="Condition" value={data.condition} onChange={makeSave('condition')} resizable /> Please correct the automation file manually and then continue!
<InputYaml label="Actions" value={data.sequence} onChange={makeSave('sequence')} resizable /> </span>
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>Save</Button> <InputYaml
</div> label="Metadata"
} value={data.metadata}
onChange={makeSave("metadata")}
/>
<InputYaml label="Tags" value={data.tags} onChange={makeSave("tags")} />
<InputYaml
label="Trigger"
value={data.trigger}
onChange={makeSave("trigger")}
/>
<InputYaml
label="Condition"
value={data.condition}
onChange={makeSave("condition")}
/>
<InputYaml
label="Actions"
value={data.sequence}
onChange={makeSave("sequence")}
/>
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>
Save
</Button>
</div>
);
};
@@ -6,7 +6,7 @@ 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'
@@ -43,7 +43,8 @@ export const useAutomatioEditorState = (
}), {}) }), {})
}; };
update({ update({
status: "loading", status: "saving",
data,
}) })
onSave(cleanData); onSave(cleanData);
} }
@@ -2,8 +2,9 @@ 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/DAGFlow/constants'; import * as dgconst from 'components/DAGFlow/constants';
import { Page } from "components/Page";
export default { export default {
title: 'App/AutomationList', title: 'App/AutomationList',
@@ -17,7 +18,7 @@ export default {
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);
@@ -39,7 +40,7 @@ const Template: ComponentStory<typeof AutomationList> = args => {
]); ]);
}} }}
/> />
</div> </Page>
} }
export const EmptyStart = Template.bind({}) export const EmptyStart = Template.bind({})
@@ -51,457 +52,7 @@ EmptyStart.args = {
export const FewAutos = Template.bind({}) export const FewAutos = Template.bind({})
FewAutos.args = { FewAutos.args = {
...FewAutos.args, ...FewAutos.args,
automations: [ automations: bigMockAutoList,
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
createMockAuto({ "Type": "Climate" }),
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
createMockAuto({ "Room": "Office", "Type": "Lights" }),
createMockAuto({ "Room": "Office" }),
createMockAuto(),
{
"metadata": {
"id": "1649947692702",
"alias": "Bed Remote",
"description": "",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_on",
"id": "turn_on"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_off",
"id": "turn_off"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_up",
"id": "dim_up"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_down",
"id": "dim_down"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_double_press",
"subtype": "turn_on",
"id": "up_dbclk"
}
],
"condition": [],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "turn_off"
}
],
"sequence": [
{
"type": "turn_off",
"device_id": "asdasdasdasdas",
"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": "asdasdasdasdas"
}
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "dim_up"
}
],
"sequence": [
{
"device_id": "asdasdasdasdas",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_increase"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "dim_down"
}
],
"sequence": [
{
"device_id": "asdasdasdasdas",
"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": "asdasdasdasdas"
}
}
]
}
],
"default": []
}
],
"tags": {
"Type": "Remote",
"Room": "Bedroom"
}
},
{
"metadata": {
"id": "1641617168123",
"alias": "Ensure On",
"description": "",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"platform": "device",
"type": "turned_off",
"device_id": "tasdasdasdasdasdasda",
"entity_id": "switch.power_washer",
"domain": "switch"
},
{
"platform": "device",
"type": "turned_off",
"device_id": "dasdasdasdasdas",
"entity_id": "switch.plug_living_room_tv",
"domain": "switch"
}
],
"condition": [],
"sequence": [
{
"type": "turn_on",
"device_id": "tasdasdasdasdasdasda",
"entity_id": "switch.power_washer",
"domain": "switch"
},
{
"type": "turn_on",
"device_id": "dasdasdasdasdas",
"entity_id": "switch.plug_living_room_tv",
"domain": "switch"
}
],
"tags": {}
},
{
"metadata": {
"id": "1649726828269",
"alias": "Climate Heat Mode Settings",
"description": "Ensures that the climate is always in sync with the house settings",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"platform": "state",
"entity_id": "climate.main_floor",
"id": "main"
},
{
"platform": "state",
"entity_id": "climate.second_floor",
"id": "second"
},
{
"platform": "state",
"entity_id": "input_boolean.thermostats_house_is_heating",
"id": "setting"
}
],
"condition": [],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "setting"
}
],
"sequence": [
{
"service": "climate.turn_off",
"data": {},
"target": {
"device_id": [
"d88dcfe82bc9a1c0f2b77b871848155e",
"ef2d47fdeef19f8984b85f92f2597f73"
]
}
}
]
},
{
"conditions": [
{
"condition": "state",
"entity_id": "input_boolean.thermostats_house_is_heating",
"state": "on"
}
],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "and",
"conditions": [
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'heat' }}"
},
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'off' }}"
}
]
}
],
"sequence": [
{
"service": "climate.set_hvac_mode",
"data": {
"hvac_mode": "heat"
},
"target": {
"entity_id": "{{ trigger.entity_id }}"
}
}
]
}
]
}
]
}
],
"default": [
{
"choose": [
{
"conditions": [
{
"condition": "and",
"conditions": [
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'cool' }}"
},
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'off' }}"
}
]
}
],
"sequence": [
{
"service": "climate.set_hvac_mode",
"data": {
"hvac_mode": "cool"
},
"target": {
"entity_id": "{{ trigger.entity_id }}"
}
}
]
}
]
}
]
}
],
"tags": {}
},
{
"metadata": {
"id": "1628024070687",
"alias": "Baby Light Setting",
"description": "Configures max/min light settings for the baby ",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"platform": "time",
"at": "21:00:00",
"id": "night"
},
{
"platform": "time",
"at": "07:30:00",
"id": "day"
}
],
"condition": [],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "night"
}
],
"sequence": [
{
"service": "zwave_js.set_config_parameter",
"data": {
"parameter": "5",
"value": "15"
}
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "day"
}
],
"sequence": [
{
"service": "zwave_js.set_config_parameter",
"data": {
"parameter": "5",
"value": 100
}
}
]
}
],
"default": []
}
],
"tags": {}
},
{
"metadata": {
"id": "alarmanlage_an",
"alias": "alarmanlage_an (Uhrzeit)",
"mode": "single"
},
tags: {},
"trigger": [
{
"entity_id": "sensor.time",
"platform": "state",
"to": "23:30"
}
],
"condition": [
{
"condition": "or",
"conditions": [
{
"condition": "state",
"entity_id": "person.simon",
"state": "home"
},
{
"condition": "state",
"entity_id": "person.leni",
"state": "home"
}
]
}
],
"sequence": [
{
"service": "alarm_control_panel.alarm_arm_night",
"target": {
"entity_id": [
"alarm_control_panel.alarmo"
]
},
"data": {
"code": "xxx"
}
},
{
"service": "alarm_control_panel.alarm_arm_away",
"data": {},
"target": {
"entity_id": "alarm_control_panel.blink_home"
}
}
],
}
],
} }
@@ -589,3 +140,41 @@ BadAutmations.args = {
} }
], ],
} }
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,7 +5,8 @@
} }
.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;
@@ -24,7 +25,15 @@
padding-bottom: 0.5em; padding-bottom: 0.5em;
border-width: 1px; border-width: 1px;
border-bottom-style: solid; border-bottom-style: solid;
border-color: white; border-color: var(--primary-accent);
}
.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 { .automation-list-box--body--group>.automation-list-box--body--group {
@@ -40,7 +49,8 @@
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);
} }
@@ -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',
@@ -14,12 +16,14 @@ export default {
const Template: ComponentStory<typeof AutomationListBox> = args => { const Template: ComponentStory<typeof AutomationListBox> = args => {
const [selected, setSelected] = useState(args.selected) const [selected, setSelected] = useState(args.selected)
return <div className="page"> return <Page>
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => { <CookiesProvider>
setSelected(i) <AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
args.onSelectAutomation(i) setSelected(i)
}} /> args.onSelectAutomation(i)
</div> }} />
</CookiesProvider>
</Page>
} }
export const EmptyStart = Template.bind({}) export const EmptyStart = Template.bind({})
@@ -1,88 +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: {
condition: [], // id,
metadata: { // alias: '',
id: '1', // description: '',
alias: '', // mode: 'single',
description: '', // },
mode: 'single', // tags,
}, // sequence: [],
tags: { // trigger: [],
"Room": 'Living Room', // })
"Type": 'Lights'
},
sequence: [],
trigger: [],
},
{
condition: [],
metadata: {
id: '2',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Living Room',
"Type": 'Climate'
},
sequence: [],
trigger: [],
},
{
condition: [],
metadata: {
id: '3',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Kitchen',
"Type": 'Climate'
},
sequence: [],
trigger: [],
},
];
expect(groupAutomations(automations, [0, 1], ['Room', "Type"])).toStrictEqual({
"Living Room": {
"Lights": [0],
"Climate": [1],
},
"Kitchen": {
"Climate": [2],
}
})
expect(groupAutomations(automations, [1, 0], ['Room', "Type"])).toStrictEqual({
"Lights": {
"Living Room": [0],
},
"Climate": {
"Living Room": [1],
"Kitchen": [2]
}
})
expect(groupAutomations(automations, [1], ['Room', "Type"])).toStrictEqual({
"Lights": [0],
"Climate": [1, 2]
})
expect(groupAutomations(automations, [0], ['Room', "Type"])).toStrictEqual({
"Living Room": [0, 1],
"Kitchen": [2]
})
expect(groupAutomations(automations, [], ['Room', "Type"])).toStrictEqual([
0, 1, 2
])
});
test('getTagList', () => { test('getTagList', () => {
expect(getTagList([ expect(getTagList([
@@ -1,211 +1,142 @@
import "./AutomationListBox.css"; import "./AutomationListBox.css";
import { FC, useState } from 'react'; import { FC, useState } from "react";
import { AutomationData, AutomationMetadata } 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[];
selected: number; selected: number;
onSelectAutomation: (i: number) => void; onSelectAutomation: (i: number) => void;
onRemove: (i: number) => void; onRemove: (i: number) => void;
onAdd: () => 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,
selected, selected,
onSelectAutomation, onSelectAutomation,
onAdd, onAdd,
onRemove, 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 [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]); <div className="automation-list-box--nav">
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags); <InputText label="Search" value={searchText} onChange={setSearchText} />
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selectedTagIdx, 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={selectedTagIdx} onSelectAutomation,
onChange={setSelectedTagIdx} onRemove,
options={tags} }}
max={3} autos={filteredAutomations}
/> grouping={grouping}
</div> selectedAutomationIdx={selected}
<div className="automation-list-box--body"> />
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove, selected)} </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 (!a.metadata) { autos: AutomationData[],
return true searchText: string
} ): Array<[AutomationData, number]> =>
if (searchText.length > 0) { autos
.map<[AutomationData, number]>((a, i) => [a, i])
.filter(([a, i]) => {
if (!a.metadata) {
return true;
}
if (searchText.length > 0) {
if ( if (
!( !(
(a.metadata.description ?? "").toLocaleLowerCase().includes(searchText) || (a.metadata.description ?? "")
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText) .toLocaleLowerCase()
) .includes(searchText) ||
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
)
) { ) {
return false return false;
} }
} }
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,
selected: number,
) => {
if (Array.isArray(groups)) {
return groups.map(i => {
const [auto, autoIndex] = autos[i];
let title = "BadAuto<<Missing Metadata>>"
if (auto.metadata) {
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`
}
return <div
key={i}
className={["automation-list-box--body--item", selected === autoIndex ? 'selected' : ''].join(' ')}
title={title}
onClick={() => onSelectAutomation(autoIndex)}
>
<MetadataBox metadata={auto.metadata} tags={auto.tags} />
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
</div>
})
} else {
return Object.keys(groups).map(groupName => {
return <AutomationListBoxGroup
key={groupName}
groupName={groupName}
groups={groups[groupName]}
autos={autos}
onSelectAutomation={onSelectAutomation}
onRemove={onRemove}
selected={selected}
/>
})
}
}
export const MetadataBox: FC<{
metadata: AutomationMetadata,
tags: Record<string, string>,
}> = (auto) => {
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
if (auto.metadata) {
title = <>
<b>{String(auto.metadata.alias ?? "").slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
<span>{String(auto.metadata.description ?? "").slice(0, 25)}</span>
</>
}
return <div
className="automation-list-box--body--item--title"
>
{title}
<div
className="automation-list-box--body--item--tags"
>
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
<b>{tagName}:</b> {auto.tags[tagName]}
</span>)}
</div>
</div>
}
const AutomationListBoxGroup: FC<{
groupName: string,
groups: any,
autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void;
selected: number,
}> = ({
groupName,
groups,
autos,
onSelectAutomation,
onRemove,
selected,
}) => {
const [open, setOpen] = useState(false);
return <div className="automation-list-box--body--group">
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove, selected)}
</div>
}
@@ -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>
}
@@ -3,6 +3,7 @@ import { ConnectedAutomationList } from ".";
import { createMockAuto } from "utils/mocks"; import { createMockAuto } from "utils/mocks";
import { useMockApiService } from "apiService"; import { useMockApiService } from "apiService";
import { DEFAULT_DIMS } from 'components/DAGFlow/constants'; import { DEFAULT_DIMS } from 'components/DAGFlow/constants';
import { Page } from "components/Page";
export default { export default {
title: 'App/AutomationList/Connected', title: 'App/AutomationList/Connected',
@@ -17,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({})
@@ -44,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 -3
View File
@@ -18,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;
@@ -31,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 */
@@ -39,8 +59,10 @@
border-width: 1px; border-width: 1px;
} }
.automation-list--list-hide { .automation-list--list .automation-list--list-hide {
position: absolute; position: absolute;
bottom: 0.5em; bottom: 0em;
right: 0.5em; left: 0.5em;
max-width: 1.5em;
max-height: 1.5em;
} }
@@ -14,7 +14,7 @@
.automation-list--root.mobile .automation-list--list-hide { .automation-list--root.mobile .automation-list--list-hide {
transform: rotate(90deg); transform: rotate(90deg);
left: 1.25em; left: 0.25em;
} }
.automation-list--root.mobile .automation-editor--info-box { .automation-list--root.mobile .automation-editor--info-box {
@@ -33,7 +33,7 @@
} }
.automation-list--root.mobile .automation-editor--info-box--icon { .automation-list--root.mobile .automation-editor--info-box--icon {
left: 1.25em; left: 0.5em;
bottom: 0em; bottom: 0em;
background-color: var(--primary); background-color: var(--primary);
transform: rotate(90deg); transform: rotate(90deg);
@@ -50,8 +50,8 @@
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide { .automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
transform: rotate(270deg); transform: rotate(270deg);
position: fixed; position: fixed;
top: 0.75em; top: 0;
z-index: 20; z-index: 5;
} }
/* info box hide */ /* info box hide */
@@ -64,7 +64,15 @@
.automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon { .automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon {
transform: rotate(270deg); transform: rotate(270deg);
position: fixed; position: fixed;
top: 0.75em; top: 0em;
background-color: var(--green-opaque); left: 0.25em;
z-index: 30; z-index: 10;
}
.automation-list--root.mobile .automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
height: 0;
opacity: 0;
overflow: hidden;
} }
+124 -55
View File
@@ -1,16 +1,20 @@
import "./index.css"; import "./index.css";
import "./index.mobile.css"; import "./index.mobile.css";
import { AutomationEditor } from "components/AutomationEditor"; import { AutomationEditor } from "components/AutomationEditor";
import { FC, useState } from "react"; import { FC, ReactNode, useState } from "react";
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
import { defaultAutomation } from 'utils/defaults'; import { defaultAutomation } from "utils/defaults";
import { ArrowIcon } from "components/Icons";
import { ButtonIcon } from "components/Icons/ButtonIcons"; import { ButtonIcon } from "components/Icons/ButtonIcons";
import { ApiService } from "apiService/core"; import { ApiService } from "apiService/core";
import { AutomationListBox } from "./AutomationListBox"; import { AutomationListBox } from "./AutomationListBox";
import { DAGAutomationFlowDims } from 'components/DAGFlow/types'; import { DAGAutomationFlowDims } from "components/DAGFlow/types";
import useWindowSize from "utils/useWindowSize"; import useWindowSize from "utils/useWindowSize";
import { makeTagDB } from "./TagDB";
import LinearProgress from "@mui/material/LinearProgress";
import CircularProgress from "@mui/material/CircularProgress";
import { useCookies } from "react-cookie";
import { useHA } from "haService";
import { ArrowBack } from "@mui/icons-material";
interface AutomationListParams { interface AutomationListParams {
automations: AutomationData[]; automations: AutomationData[];
@@ -18,8 +22,35 @@ interface AutomationListParams {
onAdd: (auto: AutomationData) => void; onAdd: (auto: AutomationData) => void;
onRemove: (i: number) => void; onRemove: (i: number) => void;
dims: DAGAutomationFlowDims; dims: DAGAutomationFlowDims;
children?: ReactNode;
} }
export const useAutomationListState = () => {
const [
cookies,
setCookies,
// eslint-disable-next-line
_,
] = useCookies(["alCurrent"]);
let initialCurrent = 0;
try {
initialCurrent = Number(cookies.alCurrent ?? "0");
} catch (_) {}
const [hideList, setHideList] = useState(false);
const [current, setCurrent] = useState(initialCurrent);
return {
hideList,
setHideList,
current,
setCurrent(i: number) {
setCurrent(i);
setCookies("alCurrent", String(i));
},
};
};
export const AutomationList: FC<AutomationListParams> = ({ export const AutomationList: FC<AutomationListParams> = ({
automations, automations,
onUpdate, onUpdate,
@@ -29,46 +60,65 @@ export const AutomationList: FC<AutomationListParams> = ({
children, children,
}) => { }) => {
// state // state
const [hideList, setHideList] = useState(false); const { hideList, setHideList, current, setCurrent } =
const [current, setCurrent] = useState(0); useAutomationListState();
const { isMobile } = useWindowSize(); const { isMobile } = useWindowSize();
// alias // alias
const currentAuto = automations.length > 0 ? automations[current] : null; const currentAuto = automations.length > 0 ? automations[current] : null;
const tagDB = makeTagDB(automations);
// render // render
return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}> return (
<div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}> <div
<AutomationListBox className={["automation-list--root", isMobile ? "mobile" : ""].join(" ")}
automations={automations} >
onAdd={() => { <div
onAdd(defaultAutomation(String(Date.now()))); className={["automation-list--list", hideList ? "hide" : "show"].join(
setCurrent(automations.length) " "
}} )}
onSelectAutomation={i => {
setCurrent(i);
if (isMobile) {
setHideList(true)
}
}}
selected={current}
onRemove={onRemove}
/>
<ButtonIcon
onClick={() => setHideList(!hideList)}
className="automation-list--list-hide"
> >
{ArrowIcon} <AutomationListBox
</ButtonIcon> automations={automations}
onAdd={() => {
onAdd(defaultAutomation(String(Date.now())));
setCurrent(automations.length);
if (isMobile) {
setHideList(true);
}
}}
onSelectAutomation={(i) => {
setCurrent(i);
if (isMobile) {
setHideList(true);
}
}}
selected={current}
onRemove={onRemove}
/>
<ButtonIcon
onClick={() => setHideList(!hideList)}
className="automation-list--list-hide"
icon={<ArrowBack />}
/>
</div>
<div className="automation-list--viewer">
{currentAuto ? (
<AutomationEditor
automation={currentAuto}
onUpdate={(a) => onUpdate(current, a)}
dims={{
...dims,
flipped: isMobile,
}}
tagDB={tagDB}
/>
) : (
<></>
)}
</div>
{children}
</div> </div>
<div className="automation-list--viewer"> );
{currentAuto ? <AutomationEditor };
automation={currentAuto}
onUpdate={a => onUpdate(current, a)}
dims={dims}
/> : <></>}
</div>
{children}
</div>
}
interface ConnectedAutomationListParams { interface ConnectedAutomationListParams {
dims: DAGAutomationFlowDims; dims: DAGAutomationFlowDims;
@@ -76,25 +126,44 @@ interface ConnectedAutomationListParams {
} }
export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({ export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
api: { api: {
state: { state: { automations },
automations, ...methods
},
removeAutomation,
updateAutomation,
}, },
dims dims,
}) => { }) => {
const { reloadAutomations } = useHA();
const removeAutomation = async (args: any) => {
const resp = await methods.removeAutomation(args);
await reloadAutomations();
return resp;
};
const updateAutomation = async (args: any) => {
const resp = await methods.updateAutomation(args);
await reloadAutomations();
return resp;
};
if (!automations.ready) { if (!automations.ready) {
return <span>Loading...</span> return (
<div className="automation-list--root loading">
<LinearProgress />
<div className="automation-list--circle-loader">
<CircularProgress />
</div>
</div>
);
} }
if (!automations.ok) { if (!automations.ok) {
return <span>Error {automations.error}</span> return <span>Error {automations.error}</span>;
} }
return <AutomationList return (
dims={dims} <AutomationList
automations={automations.data.data} dims={dims}
onAdd={auto => updateAutomation({ auto, index: automations.data.totalItems + 1 })} automations={automations.data.data}
onRemove={index => removeAutomation({ index })} onAdd={(auto) =>
onUpdate={(index, auto) => updateAutomation({ index, auto })} updateAutomation({ auto, index: automations.data.totalItems + 1 })
/> }
} onRemove={(index) => removeAutomation({ index })}
onUpdate={(index, auto) => updateAutomation({ index, auto })}
/>
);
};
@@ -2,6 +2,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react"; import { useState } from "react";
import { ConditionEditor } from "."; import { ConditionEditor } from ".";
import { AutomationCondition } from 'types/automations/conditions'; import { AutomationCondition } from 'types/automations/conditions';
import { Page } from "components/Page";
export default { export default {
title: 'ConditionEditor', title: 'ConditionEditor',
@@ -40,12 +41,12 @@ export const Basic: ComponentStory<typeof ConditionEditor> = args => {
] ]
}) })
return ( return (
<div className="page"> <Page>
<ConditionEditor <ConditionEditor
onUpdate={setState} onUpdate={setState}
onDelete={() => { }} onDelete={() => { }}
condition={state} condition={state}
/> />
</div> </Page>
) )
} }
@@ -1,5 +1,5 @@
import { Classes } from "jss"; import { Classes } from "jss";
import { FC, useState, useEffect } from 'react'; import { FC, useState, useEffect } from "react";
import { getConditionDefaultValues } from "utils/defaults"; import { getConditionDefaultValues } from "utils/defaults";
import { AutomationCondition } from "types/automations/conditions"; import { AutomationCondition } from "types/automations/conditions";
import { CheckMarkIcon, PencilIcon } from "components/Icons"; import { CheckMarkIcon, PencilIcon } from "components/Icons";
@@ -8,121 +8,153 @@ import InputYaml from "components/Inputs/InputYaml";
import { getEditor } from "./editorRender"; import { getEditor } from "./editorRender";
import { useStyles } from "./style"; import { useStyles } from "./style";
import { getViewer } from "./viewRender"; import { getViewer } from "./viewRender";
import useWindowSize from "utils/useWindowSize";
import { useHA } from "haService";
import { getSubTypeList } from "utils/automations";
export const ConditionNode: FC<{ export const ConditionNode: FC<{
condition: AutomationCondition; condition: AutomationCondition;
displayMode: boolean; displayMode: boolean;
showDelete?: boolean; showDelete?: boolean;
onDelete?: (which: 'root' | number) => void; onDelete?: (which: "root" | number) => void;
onUpdate?: (data: AutomationCondition) => void; onUpdate?: (data: AutomationCondition) => void;
children?: (props: { children?: (props: { classes: Classes<string> }) => JSX.Element;
classes: Classes<string>
}) => JSX.Element,
}> = ({ }> = ({
condition, condition,
showDelete = false, showDelete = false,
displayMode = true, displayMode = true,
onDelete = () => { }, onDelete = () => {},
onUpdate = () => { }, onUpdate = () => {},
children = () => { }, children = () => {},
}) => { }) => {
// state // state
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode); const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
const [yamlMode, setYamlMode] = useState(false); const [yamlMode, setYamlMode] = useState(false);
// alias const { isMobile } = useWindowSize();
const effectiveDM = internalDisplayMode || yamlMode; const ha = useHA();
// effect // alias
useEffect(() => { const effectiveDM = internalDisplayMode || yamlMode;
setInternalDisplayMode(displayMode); // effect
}, [displayMode]) useEffect(() => {
useEffect(() => { setInternalDisplayMode(displayMode);
if (yamlMode) { }, [displayMode]);
setInternalDisplayMode(true); useEffect(() => {
} if (yamlMode) {
}, [yamlMode]) setInternalDisplayMode(true);
// alias
const onAddChild = () => {
if (
(condition.condition === 'and') ||
(condition.condition === 'or') ||
(condition.condition === 'not')
) {
onUpdate({
...condition,
conditions: condition.conditions.concat({
condition: 'or',
conditions: []
})
})
}
} }
// children }, [yamlMode]);
let childrenConditions: JSX.Element; // alias
if (effectiveDM) { const onAddChild = () => {
const Viewer = getViewer(condition); if (
childrenConditions = <Viewer condition={condition} onChange={onUpdate} /> condition.condition === "and" ||
} else { condition.condition === "or" ||
const Editor = getEditor(condition); condition.condition === "not"
childrenConditions = <Editor condition={condition} onChange={onUpdate} /> ) {
onUpdate({
...condition,
conditions: condition.conditions.concat({
condition: "or",
conditions: [],
}),
});
} }
// styles };
let hasChildren = false; // children
if (condition.condition === "not") { let childrenConditions: JSX.Element;
hasChildren = true if (effectiveDM) {
} else if (condition.condition === 'and') { const Viewer = getViewer(condition);
hasChildren = true childrenConditions = (
} else if (condition.condition === 'or') { <Viewer condition={condition} onChange={onUpdate} namer={ha.namer} />
hasChildren = true );
} } else {
const { classes } = useStyles({ hasChildren }); const Editor = getEditor(condition);
childrenConditions = (
// components <Editor condition={condition} onChange={onUpdate} ha={ha} />
const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) => );
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
return <div className={classes.root}>
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
<div className={classes.title}>
<InputList
label=""
className={classes.titleText}
current={condition.condition}
options={[
'or', 'not', 'and',
'template',
'numeric_state',
'state',
'time',
'trigger',
'zone',
]}
onChange={(n: any) => onUpdate({
...getConditionDefaultValues(n),
...condition,
condition: n,
} as any)}
/>
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
{yamlMode ? 'visual' : 'yaml'}
</button>}
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
</button>}
</div>
<div className={classes.children}>
{yamlMode && <InputYaml
label=""
value={condition}
onChange={update => onUpdate(update as any)}
resizable
/>}
{!yamlMode && childrenConditions}
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
</div>}
</div>
{children({ classes })}
</div>
} }
// styles
let hasChildren = false;
if (condition.condition === "not") {
hasChildren = true;
} else if (condition.condition === "and") {
hasChildren = true;
} else if (condition.condition === "or") {
hasChildren = true;
}
const { classes } = useStyles({ hasChildren, isMobile });
// components
const DeleteButton = (p: { onClick?: () => void; isRoot?: boolean }) => (
<button
className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn}
onClick={p?.onClick}
>
X
</button>
);
return (
<div className={classes.root}>
<>
{showDelete && !effectiveDM && (
<DeleteButton isRoot onClick={() => onDelete("root")} />
)}
<div className={classes.title}>
<InputList
label=""
className={classes.titleText}
current={condition.condition}
options={getSubTypeList("condition")}
onChange={(n: any) =>
onUpdate({
...getConditionDefaultValues(n),
...condition,
condition: n,
} as any)
}
/>
{effectiveDM && (
<button
className={classes.yamlBtn}
onClick={() => setYamlMode(!yamlMode)}
>
{yamlMode ? "visual" : "yaml"}
</button>
)}
{!yamlMode && (
<button
className={classes.modifyBtn}
onClick={() => setInternalDisplayMode(!effectiveDM)}
>
{effectiveDM ? (
<PencilIcon className={classes.icon} />
) : (
<CheckMarkIcon className={classes.icon} />
)}
</button>
)}
</div>
<div className={classes.children}>
{yamlMode && (
<InputYaml
label=""
value={condition}
onChange={(update) => onUpdate(update as any)}
/>
)}
<div className={classes.conditionWrap}>
{!yamlMode && childrenConditions}
</div>
{!yamlMode && hasChildren && (
<div className={classes.addBtnContainer}>
<button className={classes.addBtn} onClick={() => onAddChild()}>
Add
</button>
</div>
)}
</div>
{children({ classes })}
</>
</div>
);
};
@@ -1,238 +1,324 @@
import { FC } from "react"; import { FC } from "react";
import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions'; import {
import { getDescriptionFromAutomationNode } from "utils/formatting"; AutomationCondition,
DeviceCondition,
LogicCondition,
NumericCondition,
StateCondition,
TemplateCondition,
TimeCondition,
TriggerCondition,
ZoneCondition,
} from "types/automations/conditions";
import InputNumber from "components/Inputs/InputNumber"; import InputNumber from "components/Inputs/InputNumber";
import InputText from "components/Inputs/InputText"; import InputText from "components/Inputs/InputText";
import InputTextArea from "components/Inputs/InputTextArea"; import { InputEntity } from "components/Inputs/InputEntities";
import { InputEntity } from "components/Inputs/InputTextBubble";
import { ConditionNode } from "./ConditionNode"; import { ConditionNode } from "./ConditionNode";
import { genUpdateMethods } from "./nestedUpdater"; import { genUpdateMethods } from "./nestedUpdater";
import InputTime from "components/Inputs/InputTime"; import { InputTime } from "components/Inputs/InputTime";
import InputYaml from "components/Inputs/InputYaml";
import { HAService } from "haService";
interface Editor<C extends AutomationCondition> extends FC<{ import { DeviceEditor } from "components/DeviceEditor";
condition: C,
onChange: (condition: C) => void;
}> { }
interface Editor<C extends AutomationCondition>
extends FC<{
condition: C;
onChange: (condition: C) => void;
ha: HAService;
}> {}
export const getEditor = (condition: AutomationCondition): Editor<any> => { export const getEditor = (condition: AutomationCondition): Editor<any> => {
switch (condition.condition) { switch (condition.condition) {
case 'template': case "template":
return TemplateEditor; return TemplateEditor;
case 'and': case "and":
return LogicViewer; return LogicViewer;
case 'or': case "or":
return LogicViewer; return LogicViewer;
case 'not': case "not":
return LogicViewer; return LogicViewer;
case 'numeric_state': case "device":
return DeviceConditionEditor;
case "numeric_state":
return NumericStateEditor; return NumericStateEditor;
case 'state': case "state":
return StateEditor; return StateEditor;
case 'time': case "time":
return TimeEditor; return TimeEditor;
case 'trigger': case "trigger":
return TriggerEditor; return TriggerEditor;
case 'zone': case "zone":
return ZoneEditor; return ZoneEditor;
default: default:
return () => <div>Not Ready</div> return () => <div>Not Ready</div>;
} }
} };
export const TemplateEditor: Editor<TemplateCondition> = ({ export const TemplateEditor: Editor<TemplateCondition> = ({
onChange, onChange,
condition, condition,
}) => { }) => {
return <div> return (
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({ <>
...condition, <InputYaml
alias label="Template"
})} /> value={condition.value_template}
<InputTextArea label="Template" value={condition.value_template} onChange={value_template => onChange({ onChange={(value_template) =>
...condition, onChange({
value_template ...condition,
})} resizable /> value_template,
</div> })
} }
/>
</>
);
};
export const DeviceConditionEditor: Editor<DeviceCondition> = ({
onChange,
condition,
ha: {
deviceExtras: { useDeviceConditionCapalities, useDeviceConditions },
},
}) => {
return (
<DeviceEditor
type="condition"
state={condition}
setState={(data) =>
onChange({
condition: "device",
...data,
} as any)
}
options={useDeviceConditions(
condition.device_id
? {
deviceId: condition.device_id,
}
: undefined
)}
caps={useDeviceConditionCapalities(condition as any)}
/>
);
};
export const NumericStateEditor: Editor<NumericCondition> = ({ export const NumericStateEditor: Editor<NumericCondition> = ({
onChange, onChange,
condition, condition,
}) => { }) => {
return <div> return (
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({ <>
...condition, <InputEntity
alias value={condition.entity_id}
})} /> multiple
<InputEntity onChange={(entity_id) =>
value={condition.entity_id} onChange({
onChange={entity_id => onChange({ ...condition,
...condition, entity_id,
entity_id })
})} }
/> />
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({ <InputText
...condition, label="Attribute"
attribute value={condition.attribute ?? ""}
})} /> onChange={(attribute) =>
<InputNumber onChange({
label="Above" ...condition,
value={condition.above ? Number(condition.above) : undefined} attribute,
onChange={above => onChange({ })
...condition, }
above: above ? String(above) : undefined, />
})} <InputNumber
/> label="Above"
<InputNumber value={condition.above ? Number(condition.above) : undefined}
label="Below" onChange={(above) =>
value={condition.below ? Number(condition.below) : undefined} onChange({
onChange={below => onChange({ ...condition,
...condition, above: above ? String(above) : undefined,
below: below ? String(below) : undefined, })
})} }
/> />
<InputTextArea label="Template" value={condition.value_template ?? ""} onChange={value_template => onChange({ <InputNumber
...condition, label="Below"
value_template value={condition.below ? Number(condition.below) : undefined}
})} resizable /> onChange={(below) =>
</div> onChange({
} ...condition,
below: below ? String(below) : undefined,
})
}
/>
<InputYaml
label="Template"
value={condition.value_template ?? ""}
onChange={(value_template) =>
onChange({
...condition,
value_template,
})
}
/>
</>
);
};
export const LogicViewer: Editor<LogicCondition> = ({ export const LogicViewer: Editor<LogicCondition> = ({
condition, condition,
onChange, onChange,
}) => { }) => {
return (
return <> <>
{condition.conditions.map((c, i) => { {condition.conditions.map((c, i) => {
return <ConditionNode return (
key={i} <ConditionNode
condition={c} key={i}
displayMode={false} condition={c}
{...genUpdateMethods(condition, onChange)(i)} displayMode={false}
showDelete {...genUpdateMethods(condition, onChange)(i)}
/> showDelete
})} />
</> );
} })}
</>
);
};
export const StateEditor: Editor<StateCondition> = ({ export const StateEditor: Editor<StateCondition> = ({
onChange, onChange,
condition, condition,
}) => { }) => {
return <div> return (
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({ <>
...condition, <InputEntity
alias value={condition.entity_id}
})} /> multiple
<InputEntity onChange={(entity_id) =>
value={condition.entity_id} onChange({
onChange={entity_id => onChange({ ...condition,
...condition, entity_id,
entity_id })
})} }
/> />
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({ <InputText
...condition, label="Attribute"
attribute value={condition.attribute ?? ""}
})} /> onChange={(attribute) =>
<InputText onChange({
label="State" ...condition,
value={String(condition.state)} attribute,
onChange={state => onChange({ })
...condition, }
state, />
})} <InputText
/> label="State"
<InputTime value={String(condition.state)}
label="For" onChange={(state) =>
value={condition.for} onChange({
onChange={_for => onChange({ ...condition,
...condition, state,
for: _for, })
})} }
/> />
</div> <InputTime
} label="For"
value={condition.for}
onChange={(_for) =>
onChange({
...condition,
for: _for,
})
}
/>
</>
);
};
export const TimeEditor: Editor<TimeCondition> = ({ export const TimeEditor: Editor<TimeCondition> = ({ onChange, condition }) => {
onChange, return (
condition, <>
}) => { <InputTime
return <div> label="After"
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({ value={condition.after}
...condition, onChange={(after) =>
alias onChange({
})} /> ...condition,
<InputTime after,
label="After" })
value={condition.after} }
onChange={after => onChange({ />
...condition, <InputTime
after, label="Before"
})} value={condition.before}
/> onChange={(before) =>
<InputTime onChange({
label="Before" ...condition,
value={condition.before} before,
onChange={before => onChange({ })
...condition, }
before, />
})} <b>Weekday not support for no, use yaml for now</b> {condition.weekday}
/> </>
<b>Weekday not support for no, use yaml for now</b> {condition.weekday} );
</div> };
}
export const TriggerEditor: Editor<TriggerCondition> = ({ export const TriggerEditor: Editor<TriggerCondition> = ({
onChange, onChange,
condition, condition,
}) => { }) => {
return <div> return (
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({ <>
...condition, <InputText
alias label="Trigger ID"
})} /> value={condition.id}
<InputText label="Trigger ID" value={condition.id} onChange={id => onChange({ onChange={(id) =>
...condition, onChange({
id ...condition,
})} /> id,
</div> })
} }
/>
</>
);
};
export const ZoneEditor: Editor<ZoneCondition> = ({ export const ZoneEditor: Editor<ZoneCondition> = ({ onChange, condition }) => {
onChange, return (
condition, <>
}) => { <InputEntity
return <div> label="Zone"
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({ value={condition.zone}
...condition, multiple={false}
alias onChange={(zone) =>
})} /> onChange({
<InputText label="Zone" value={condition.zone} onChange={zone => onChange({ ...condition,
...condition, zone: zone ?? "",
zone })
})} /> }
<InputEntity restrictToDomain={["zone"]}
value={condition.entity_id} />
onChange={entity_id => onChange({ <InputEntity
...condition, label="Entity with Location"
entity_id value={condition.entity_id}
})} multiple
/> onChange={(entity_id) =>
<InputText onChange({
label="State" ...condition,
value={String(condition.state)} entity_id,
onChange={state => onChange({ })
...condition, }
state, restrictToDomain={["person", "device_tracker"]}
})} />
/> <InputText
</div> label="State"
} value={String(condition.state)}
onChange={(state) =>
onChange({
...condition,
state,
})
}
/>
</>
);
};
@@ -1,4 +1,5 @@
import { ComponentMeta, ComponentStory } from "@storybook/react"; import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react"; import { useState } from "react";
import { AutomationCondition } from "types/automations/conditions"; import { AutomationCondition } from "types/automations/conditions";
@@ -14,14 +15,14 @@ export default {
const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }) => { const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }) => {
const [data, setData] = useState(condition); const [data, setData] = useState(condition);
return <div className="page"> return <Page>
<ConditionEditor {...args} <ConditionEditor {...args}
condition={data} condition={data}
onUpdate={data => { onUpdate={data => {
setData(data) setData(data)
}} }}
/> />
</div> </Page>
} }
export const TemplateViewer = Template.bind({}) export const TemplateViewer = Template.bind({})
+11 -6
View File
@@ -2,7 +2,8 @@ import { Styles } from "jss";
import { createAppUseStyles } from "styles/theme"; import { createAppUseStyles } from "styles/theme";
export const useStyles = createAppUseStyles<{ export const useStyles = createAppUseStyles<{
hasChildren: boolean hasChildren: boolean,
isMobile: boolean,
}>(theme => { }>(theme => {
const deleteBtn: Styles = { const deleteBtn: Styles = {
borderRadius: '10px', borderRadius: '10px',
@@ -20,12 +21,12 @@ export const useStyles = createAppUseStyles<{
} }
} }
return { return {
root: ({ hasChildren }) => ({ root: ({ hasChildren, isMobile }) => ({
background: theme.primary, background: theme.primary,
padding: 0, padding: 0,
position: 'relative', position: 'relative',
display: 'flex', display: 'flex',
flexDirection: hasChildren ? 'column' : 'row', flexDirection: isMobile ? 'column' : hasChildren ? 'column' : 'row',
}), }),
title: ({ hasChildren }) => ({ title: ({ hasChildren }) => ({
display: 'flex', display: 'flex',
@@ -42,8 +43,8 @@ export const useStyles = createAppUseStyles<{
borderTopRightRadius: 0, borderTopRightRadius: 0,
borderBottomRightRadius: 0, borderBottomRightRadius: 0,
borderBottomLeftRadius: hasChildren ? 0 : 10, borderBottomLeftRadius: hasChildren ? 0 : 10,
padding: 10, minWidth: '10em',
minWidth: 30, maxWidth: '30em',
textOverflow: 'ellipsis', textOverflow: 'ellipsis',
textAlign: 'center', textAlign: 'center',
cursor: 'pointer', cursor: 'pointer',
@@ -86,6 +87,9 @@ export const useStyles = createAppUseStyles<{
}), }),
icon: {}, icon: {},
deleteBtn, deleteBtn,
conditionWrap: {
overflow: 'auto',
},
children: ({ hasChildren }) => ({ children: ({ hasChildren }) => ({
flex: 1, flex: 1,
paddingLeft: hasChildren ? 50 : 10, paddingLeft: hasChildren ? 50 : 10,
@@ -96,7 +100,8 @@ export const useStyles = createAppUseStyles<{
border: `1px solid ${theme.secondaryAccent}`, border: `1px solid ${theme.secondaryAccent}`,
borderBottomRightRadius: hasChildren ? 10 : 0, borderBottomRightRadius: hasChildren ? 10 : 0,
borderBottomLeftRadius: hasChildren ? 10 : 0, borderBottomLeftRadius: hasChildren ? 10 : 0,
minHeight: hasChildren ? undefined : '100%' minHeight: hasChildren ? undefined : '100%',
overflow: 'scroll'
}), }),
addBtnContainer: { addBtnContainer: {
display: 'flex', display: 'flex',
@@ -1,43 +1,53 @@
import { FC } from "react"; import { FC } from "react";
import { AutomationCondition, LogicCondition } from "types/automations/conditions"; import {
import { getDescriptionFromAutomationNode } from "utils/formatting"; AutomationCondition,
LogicCondition,
} from "types/automations/conditions";
import { getDescriptionFromAutomationNode, Namer } from "utils/formatting";
import { ConditionNode } from "./ConditionNode"; import { ConditionNode } from "./ConditionNode";
import { genUpdateMethods } from "./nestedUpdater"; import { genUpdateMethods } from "./nestedUpdater";
interface Viewer<C extends AutomationCondition>
interface Viewer<C extends AutomationCondition> extends FC<{ extends FC<{
condition: C; condition: C;
onChange: (condition: C) => void; namer: Namer;
}> { } onChange: (condition: C) => void;
}> {}
export const getViewer = (condition: AutomationCondition): Viewer<any> => { export const getViewer = (condition: AutomationCondition): Viewer<any> => {
if ( if (
(condition.condition === 'and') || condition.condition === "and" ||
(condition.condition === 'or') || condition.condition === "or" ||
(condition.condition === 'not') condition.condition === "not"
) { ) {
return LogicViewer return LogicViewer;
} }
return GenericViewer return GenericViewer;
} };
export const GenericViewer: Viewer<AutomationCondition> = ({ export const GenericViewer: Viewer<AutomationCondition> = ({
condition, condition,
namer,
}) => { }) => {
return <> return <>{getDescriptionFromAutomationNode(condition, namer, true)}</>;
{getDescriptionFromAutomationNode(condition)} };
</>
}
export const LogicViewer: Viewer<LogicCondition> = ({ export const LogicViewer: Viewer<LogicCondition> = ({
condition, condition,
onChange, onChange,
}) => { }) => {
return <> return (
{condition.conditions.map((c, i) => { <>
return <ConditionNode key={i} condition={c} displayMode {condition.conditions.map((c, i) => {
{...genUpdateMethods(condition, onChange)(i)} return (
/> <ConditionNode
})} key={i}
</> condition={c}
} displayMode
{...genUpdateMethods(condition, onChange)(i)}
/>
);
})}
</>
);
};
+4 -2
View File
@@ -12,6 +12,7 @@ export interface DAGCircleProps {
backgroundColor?: string; backgroundColor?: string;
disableSource?: boolean; disableSource?: boolean;
disableTarget?: boolean; disableTarget?: boolean;
flipped: boolean;
} }
export const makeFlowCircle = ( export const makeFlowCircle = (
circleId: string, circleId: string,
@@ -32,6 +33,7 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
backgroundColor, backgroundColor,
disableSource = false, disableSource = false,
disableTarget = false, disableTarget = false,
flipped,
} }
}) => { }) => {
const { classes } = useCircleStyles({ const { classes } = useCircleStyles({
@@ -41,8 +43,8 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
backgroundColor, backgroundColor,
}); });
return <> return <>
{!disableSource && <Handle type="source" position={Position.Right} />} {!disableSource && <Handle type="source" position={flipped ? Position.Bottom : Position.Right} />}
{!disableTarget && <Handle type="target" position={Position.Left} />} {!disableTarget && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<div className={classes.root}> <div className={classes.root}>
{ {
onAdd ? onAdd ?
@@ -7,6 +7,7 @@ import * as dgconst from "components/DAGFlow/constants";
import ReactFlow, { Controls } from 'react-flow-renderer'; import ReactFlow, { Controls } from 'react-flow-renderer';
import { DAGErrorNode } from "./DAGErrorNode"; import { DAGErrorNode } from "./DAGErrorNode";
import { convertToFlowNode } from "./helpers"; import { convertToFlowNode } from "./helpers";
import { Page } from "components/Page";
export default { export default {
@@ -29,7 +30,7 @@ export const Examples: ComponentStory<typeof DAGErrorNode> = args => {
"y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i "y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i
} }
})); }));
return <div className="page"> return <Page>
<ReactFlow <ReactFlow
defaultNodes={nodes} defaultNodes={nodes}
nodeTypes={{ nodeTypes={{
@@ -42,5 +43,5 @@ export const Examples: ComponentStory<typeof DAGErrorNode> = args => {
> >
<Controls /> <Controls />
</ReactFlow> </ReactFlow>
</div> </Page>
} }
@@ -3,21 +3,21 @@ import { Handle, Position } from 'react-flow-renderer';
import { FC } from 'react'; import { FC } from 'react';
import { InfoIcon, PencilIcon } from 'components/Icons'; import { InfoIcon, PencilIcon } from 'components/Icons';
export interface DAGErrorNodeProps { export interface DAGErrorNodeProps {
height: number; height: number;
width: number; width: number;
flipped: boolean;
hasInput?: boolean; hasInput?: boolean;
error?: any, error?: any,
onEdit: () => void; onEdit: () => void;
} }
export const DAGErrorNode: FC<DAGErrorNodeProps> = ({ export const DAGErrorNode: FC<DAGErrorNodeProps> = ({
height, width, hasInput, error, onEdit height, width, hasInput, error, onEdit, flipped
}) => { }) => {
// render // render
return <> return <>
{hasInput && <Handle type="target" position={Position.Left} />} {hasInput && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<Handle type="source" position={Position.Right} /> <Handle type="source" position={flipped ? Position.Bottom : Position.Right} />
<div className={["dagnode-error"].join(' ')} style={{ <div className={["dagnode-error"].join(' ')} style={{
height, height,
width, width,
@@ -8,6 +8,7 @@ import * as dgconst from "components/DAGFlow/constants";
import ReactFlow, { Controls } from 'react-flow-renderer'; import ReactFlow, { Controls } from 'react-flow-renderer';
import { DAGNode } from "./DAGNode"; import { DAGNode } from "./DAGNode";
import { convertToFlowNode } from "./helpers"; import { convertToFlowNode } from "./helpers";
import { Page } from "components/Page";
export default { export default {
@@ -30,7 +31,7 @@ export const Colors: ComponentStory<typeof DAGNode> = args => {
"type": "mynode", "type": "mynode",
"position": { "x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i, "y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i } "position": { "x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i, "y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i }
})); }));
return <div className="page"> return <Page>
<ReactFlow <ReactFlow
defaultNodes={nodes} defaultNodes={nodes}
nodeTypes={{ nodeTypes={{
@@ -43,5 +44,5 @@ export const Colors: ComponentStory<typeof DAGNode> = args => {
> >
<Controls /> <Controls />
</ReactFlow> </ReactFlow>
</div> </Page>
} }
+4 -2
View File
@@ -14,6 +14,7 @@ export interface DAGNodeProps {
label: string; label: string;
hasInput?: boolean; hasInput?: boolean;
accentBackground?: boolean; accentBackground?: boolean;
flipped: boolean;
} }
export const DAGNode: FC<DAGNodeProps> = ({ export const DAGNode: FC<DAGNodeProps> = ({
label, label,
@@ -24,6 +25,7 @@ export const DAGNode: FC<DAGNodeProps> = ({
color, color,
hasInput = false, hasInput = false,
accentBackground = false, accentBackground = false,
flipped,
}) => { }) => {
const { classes, theme } = useNodeStyles({ const { classes, theme } = useNodeStyles({
color, color,
@@ -32,8 +34,8 @@ export const DAGNode: FC<DAGNodeProps> = ({
accentBackground, accentBackground,
}); });
return <> return <>
{hasInput && <Handle type="target" position={Position.Left} />} {hasInput && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<Handle type="source" position={Position.Right} /> <Handle type="source" position={flipped ? Position.Bottom : Position.Right} />
<div className={classes.root}> <div className={classes.root}>
<div className={classes.inner}> <div className={classes.inner}>
<div className={classes.leftEdge} onClick={onXClick}> <div className={classes.leftEdge} onClick={onXClick}>
@@ -19,4 +19,5 @@ export const DEFAULT_DIMS = {
x: PADDING, x: PADDING,
y: PADDING, y: PADDING,
}, },
flipped: false,
} as DAGAutomationFlowDims } as DAGAutomationFlowDims
+9 -10
View File
@@ -1,19 +1,22 @@
import { makeFlowCircle } from "./DAGCircle" import { DAGCircleProps, makeFlowCircle } from "./DAGCircle"
import { DAGAutomationFlowDims } from "./types" import { DAGAutomationFlowDims } from "./types"
import { XYPosition } from 'react-flow-renderer'; import { Node, XYPosition } from 'react-flow-renderer';
import { DAGNodeProps } from "./DAGNode";
export const makeAddButton = ( export const makeAddButton = (
id: string, id: string,
position: XYPosition, position: XYPosition,
{ {
circleSize, circleSize,
flipped,
}: DAGAutomationFlowDims, }: DAGAutomationFlowDims,
onAdd: () => void, onAdd: () => void,
disableTarget: boolean = true, disableTarget: boolean = true,
) => makeFlowCircle( ): Node<DAGCircleProps> => makeFlowCircle(
id, id,
position, position,
{ {
flipped,
size: circleSize, size: circleSize,
onAdd, onAdd,
disableSource: true, disableSource: true,
@@ -25,22 +28,17 @@ export const makeConditionPoint = (
id: string, id: string,
position: XYPosition, position: XYPosition,
{ {
padding,
conditionWidth, conditionWidth,
conditionHeight, conditionHeight,
nodeWidth, flipped,
nodeHeight,
circleSize,
distanceFactor,
}: DAGAutomationFlowDims, }: DAGAutomationFlowDims,
totalConditions: number, totalConditions: number,
onEditClick: () => void, onEditClick: () => void,
) => ({ ): Node<DAGNodeProps> => ({
id, id,
type: 'dagnode', type: 'dagnode',
position, position,
data: { data: {
size: circleSize,
color: 'lblue', color: 'lblue',
accentBackground: true, accentBackground: true,
label: `${totalConditions} Condition${totalConditions !== 1 ? 's' : ''}`, label: `${totalConditions} Condition${totalConditions !== 1 ? 's' : ''}`,
@@ -48,5 +46,6 @@ export const makeConditionPoint = (
width: conditionWidth, width: conditionWidth,
hasInput: true, hasInput: true,
onEditClick, onEditClick,
flipped,
} }
}) })
@@ -5,6 +5,7 @@ import { ComponentMeta, ComponentStory } from '@storybook/react';
import { DAGAutomationFlow } from '.'; import { DAGAutomationFlow } from '.';
import { useState } from 'react'; import { useState } from 'react';
import * as dgconst from "components/DAGFlow/constants"; import * as dgconst from "components/DAGFlow/constants";
import { Page } from "components/Page";
export default { export default {
@@ -22,7 +23,7 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
sequence: args.sequence, sequence: args.sequence,
condition: args.condition, condition: args.condition,
}) })
return <div className="page"> return <Page>
<DAGAutomationFlow <DAGAutomationFlow
{...args} {...args}
{...state} {...state}
@@ -32,7 +33,7 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
onSequenceUpdate={sequence => setState({ ...state, sequence })} onSequenceUpdate={sequence => setState({ ...state, sequence })}
onConditionUpdate={condition => setState({ ...state, condition })} onConditionUpdate={condition => setState({ ...state, condition })}
/> />
</div> </Page>
} }
export const Simple = Template.bind({}) export const Simple = Template.bind({})
@@ -91,7 +92,10 @@ Complex.args = {
{ {
"platform": "homeassistant", "platform": "homeassistant",
"event": "start", "event": "start",
} },
{
"bad": "node"
} as any
], ],
sequence: [ sequence: [
{ {
@@ -119,6 +123,9 @@ Complex.args = {
"media_content_type": "SPOTIFY" "media_content_type": "SPOTIFY"
} }
}, },
{
"alias": "Bad Node",
},
{ {
"choose": [ "choose": [
{ {
@@ -230,4 +237,27 @@ Errors.args = {
"choose": {} "choose": {}
} as any } as any
] ]
}
export const ComplexFlipped = Complex.bind({})
ComplexFlipped.args = {
...Complex.args,
dims: {
...dgconst.DEFAULT_DIMS,
...Complex.args.dims,
flipped: true,
}
}
export const SimpleFlipped = Simple.bind({})
SimpleFlipped.args = {
...Simple.args,
dims: {
...dgconst.DEFAULT_DIMS,
...Complex.args.dims,
flipped: true,
}
} }
+162 -119
View File
@@ -1,12 +1,17 @@
import { FC, useState } from "react"; import { FC, useState } from "react";
import ReactFlow, { Controls } from 'react-flow-renderer'; import ReactFlow, { Controls } from "react-flow-renderer";
import { AutomationSequenceNode } from "types/automations"; import { AutomationSequenceNode } from "types/automations";
import { AutomationTrigger } from 'types/automations/triggers'; import { AutomationTrigger } from "types/automations/triggers";
import { triggerToFlow } from "./triggerConvertor"; import { triggerToFlow } from "./triggerConvertor";
import { DAGNode } from "./DAGNode"; import { DAGNode } from "./DAGNode";
import { DAGAutomationFlowDims, FlowData, ModalState, UpdateModalState } from './types'; import {
import { DAGCircle } from './DAGCircle'; DAGAutomationFlowDims,
FlowData,
ModalState,
UpdateModalState,
} from "./types";
import { DAGCircle } from "./DAGCircle";
import { sequenceToFlow } from "./sequenceConvertor"; import { sequenceToFlow } from "./sequenceConvertor";
import { makeSequenceUpdater } from "./updater"; import { makeSequenceUpdater } from "./updater";
import { NodeEditor } from "components/NodeEditor"; import { NodeEditor } from "components/NodeEditor";
@@ -16,132 +21,170 @@ import { AutomationCondition } from "types/automations/conditions";
import { makeConditionPoint } from "./flowDataMods"; import { makeConditionPoint } from "./flowDataMods";
import { convertToFlowNode } from "./helpers"; import { convertToFlowNode } from "./helpers";
import { DAGErrorNode } from "./DAGErrorNode"; import { DAGErrorNode } from "./DAGErrorNode";
import { useHA } from "haService";
const nodeTypes = { const nodeTypes = {
'dagnode': convertToFlowNode(DAGNode), dagnode: convertToFlowNode(DAGNode),
'errornode': convertToFlowNode(DAGErrorNode), errornode: convertToFlowNode(DAGErrorNode),
'dagcircle': DAGCircle, dagcircle: DAGCircle,
} };
const makeOnEditAutomationConditions = ( const makeOnEditAutomationConditions =
(
conditions: AutomationCondition[], conditions: AutomationCondition[],
updateConditions: (c: AutomationCondition[]) => void, updateConditions: (c: AutomationCondition[]) => void,
openModal: UpdateModalState, openModal: UpdateModalState
) => () => openModal({ ) =>
single: false, () =>
node: conditions, openModal({
allowedTypes: ['condition'], single: false,
update: c => updateConditions(c as any), node: conditions,
}) allowedTypes: ["condition"],
update: (c) => updateConditions(c as any),
});
export interface DAGAutomationFlowProps { export interface DAGAutomationFlowProps {
className?: string; className?: string;
trigger: AutomationTrigger[]; trigger: AutomationTrigger[];
condition: AutomationCondition[]; condition: AutomationCondition[];
sequence: AutomationSequenceNode[]; sequence: AutomationSequenceNode[];
dims: DAGAutomationFlowDims; dims: DAGAutomationFlowDims;
onTriggerUpdate: (t: AutomationTrigger[]) => void; onTriggerUpdate: (t: AutomationTrigger[]) => void;
onSequenceUpdate: (s: AutomationSequenceNode[]) => void; onSequenceUpdate: (s: AutomationSequenceNode[]) => void;
onConditionUpdate: (s: AutomationCondition[]) => void; onConditionUpdate: (s: AutomationCondition[]) => void;
} }
export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
className, className,
trigger, trigger,
condition, condition,
sequence, sequence,
onTriggerUpdate, onTriggerUpdate,
onSequenceUpdate, onSequenceUpdate,
onConditionUpdate, onConditionUpdate,
dims, dims,
}) => { }) => {
// state // state
const [modalState, setModalState] = useState<ModalState | null>(null); const [modalState, setModalState] = useState<ModalState | null>(null);
const { namer } = useHA();
// modal
let modalBody = <></>;
if (modalState) {
if (modalState.single) {
modalBody = (
<NodeEditor
node={modalState.node}
isErrored={modalState.isError}
onClose={() => setModalState(null)}
onSave={(n) => {
modalState.update(n as any);
setModalState(null);
}}
allowedTypes={modalState.allowedTypes}
saveBtnCreateText={modalState.saveBtnCreateText}
/>
);
} else {
modalBody = (
<MultiNodeEditor
sequence={modalState.node}
onClose={() => setModalState(null)}
onSave={(n) => modalState.update(n as any)}
allowedTypes={["condition"]}
/>
);
}
}
// modal // convert automation to flow data
let modalBody = <></> const condPoint = makeConditionPoint(
if (modalState) { "c",
if (modalState.single) { dims.flipped
modalBody = <NodeEditor ? {
node={modalState.node} y: dims.padding.y + dims.nodeHeight * dims.distanceFactor,
isErrored={modalState.isError} x: dims.padding.x + dims.nodeWidth * 0.25,
onClose={() => setModalState(null)}
onSave={n => { modalState.update(n as any); setModalState(null); }}
allowedTypes={modalState.allowedTypes}
saveBtnCreateText={modalState.saveBtnCreateText}
/>
} else {
modalBody = <MultiNodeEditor
sequence={modalState.node}
onClose={() => setModalState(null)}
onSave={(n) => modalState.update(n as any)}
allowedTypes={['condition']}
/>
} }
} : {
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor,
// convert automation to flow data y: dims.padding.y + dims.nodeHeight * 0.25,
const condPoint = makeConditionPoint('c', {
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y + dims.nodeHeight * 0.25
}, dims, condition.length, makeOnEditAutomationConditions(
condition,
onConditionUpdate,
setModalState,
));
const flowData: FlowData = {
nodes: [condPoint],
edges: [],
}
triggerToFlow(flowData, trigger, condPoint.id, dims, {
onAdd: () => onTriggerUpdate([
...trigger, {
platform: 'event',
event_type: '',
}
]),
onDelete: i => onTriggerUpdate([
...trigger.slice(0, i),
...trigger.slice(i + 1)
]),
onEdit: i => setModalState({
single: true,
node: trigger[i],
update: t => onTriggerUpdate([
...trigger.slice(0, i),
t,
...trigger.slice(i + 1)
]),
allowedTypes: ['trigger'],
})
});
sequenceToFlow(
flowData,
sequence,
condPoint.id,
{
...dims, padding: {
x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth,
y: dims.padding.y,
}
}, },
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState), dims,
); condition.length,
// render makeOnEditAutomationConditions(condition, onConditionUpdate, setModalState)
return <> );
<Modal open={!!modalState}> const flowData: FlowData = {
{modalBody} nodes: [condPoint],
</Modal> edges: [],
<ReactFlow };
className={className} triggerToFlow(flowData, trigger, condPoint.id, dims, {
nodeTypes={nodeTypes} namer,
snapToGrid onAdd: () =>
onlyRenderVisibleElements setModalState({
nodesConnectable={false} single: true,
nodesDraggable={false} saveBtnCreateText: true,
{...flowData} node: {
> platform: "device",
<Controls /> },
</ReactFlow> update: (n) => {
</>; onTriggerUpdate([...trigger, n]);
} },
allowedTypes: ["trigger"],
}),
onDelete: (i) =>
onTriggerUpdate([...trigger.slice(0, i), ...trigger.slice(i + 1)]),
onEdit: (i) =>
setModalState({
single: true,
node: trigger[i],
update: (t) =>
onTriggerUpdate([...trigger.slice(0, i), t, ...trigger.slice(i + 1)]),
allowedTypes: ["trigger"],
}),
});
sequenceToFlow(
flowData,
sequence,
condPoint.id,
{
...dims,
padding: dims.flipped
? {
y: condPoint.position.y - dims.nodeHeight - dims.conditionHeight,
x: dims.padding.x,
}
: {
x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth,
y: dims.padding.y,
},
},
namer,
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState)
);
// this fixes some strange edge drawing issue
flowData.edges = flowData.edges.map((e) => ({
...e,
source: `${e.source}-${dims.flipped}`,
target: `${e.target}-${dims.flipped}`,
}));
flowData.nodes = flowData.nodes.map((n) => ({
...n,
id: `${n.id}-${dims.flipped}`,
}));
// render
return (
<>
<Modal open={!!modalState}>{modalBody}</Modal>
<ReactFlow
className={className}
nodeTypes={nodeTypes}
snapToGrid
onlyRenderVisibleElements
nodesConnectable={false}
nodesDraggable={false}
{...flowData}
>
<Controls />
</ReactFlow>
</>
);
};
+3 -3
View File
@@ -70,11 +70,11 @@ export class SafeDAGAutomationFlow extends Component<DAGAutomationFlowProps, Sta
<span key={i}>{s}</span><br key={`br-${i}`} /> <span key={i}>{s}</span><br key={`br-${i}`} />
</>)} </>)}
<h2>Automation YAML</h2> <h2>Automation YAML</h2>
<InputYaml resizable label="Trigger" value={this.state.trigger} onChange={makeSet('trigger')} /> <InputYaml label="Trigger" value={this.state.trigger} onChange={makeSet('trigger')} />
<Button onClick={makeSave('trigger')}>Save Triggers</Button> <Button onClick={makeSave('trigger')}>Save Triggers</Button>
<InputYaml resizable label="Condition" value={this.state.condition} onChange={makeSet('condition')} /> <InputYaml label="Condition" value={this.state.condition} onChange={makeSet('condition')} />
<Button onClick={makeSave('condition')}>Save Conditions</Button> <Button onClick={makeSave('condition')}>Save Conditions</Button>
<InputYaml resizable label="Action" value={this.state.sequence} onChange={makeSet('sequence')} /> <InputYaml label="Action" value={this.state.sequence} onChange={makeSet('sequence')} />
<Button onClick={makeSave('sequence')}>Save Actions</Button> <Button onClick={makeSave('sequence')}>Save Actions</Button>
</div> </div>
} }
+345 -231
View File
@@ -1,266 +1,380 @@
import { AutomationSequenceNode } from 'types/automations'; import { AutomationSequenceNode } from "types/automations";
import { DAGAutomationFlowDims, FlowData } from './types'; import { DAGAutomationFlowDims, FlowData } from "./types";
import { getDescriptionFromAutomationNode } from 'utils/formatting'; import { getDescriptionFromAutomationNode, Namer } from "utils/formatting";
import { XYPosition } from 'react-flow-renderer'; import { XYPosition } from "react-flow-renderer";
import { ChooseAction } from 'types/automations/actions'; import { ChooseAction } from "types/automations/actions";
import { makeFlowCircle } from './DAGCircle'; import { makeFlowCircle } from "./DAGCircle";
import { createOnRemoveForChooseNode, SequenceUpdater } from './updater'; import { createOnRemoveForChooseNode, SequenceUpdater } from "./updater";
import { getNodeType } from 'utils/automations'; import { getNodeType } from "utils/automations";
import { makeAddButton, makeConditionPoint } from './flowDataMods'; import { makeAddButton, makeConditionPoint } from "./flowDataMods";
export const sequenceToFlow = ( export const sequenceToFlow = (
flowData: FlowData, flowData: FlowData,
sequence: AutomationSequenceNode[], sequence: AutomationSequenceNode[],
fromPoint: string, fromPoint: string,
dims: DAGAutomationFlowDims, dims: DAGAutomationFlowDims,
updater: SequenceUpdater, namer: Namer,
prefix: string = "", updater: SequenceUpdater,
prefix: string = ""
) => { ) => {
let lastPointId = fromPoint; let lastPointId = fromPoint;
let lasPos: XYPosition | null = null; let lasPos: XYPosition | null = null;
// sequence // sequence
for (let i = 0; i < sequence.length; i++) { for (let i = 0; i < sequence.length; i++) {
const node = sequence[i]; const node = sequence[i];
const nodeId = `${prefix}n-${i}`; const nodeId = `${prefix}n-${i}`;
let position: XYPosition; let position: XYPosition;
if (lasPos) { if (lasPos) {
position = { position = dims.flipped
x: lasPos.x + dims.nodeWidth * dims.distanceFactor, ? {
y: dims.padding.y y: lasPos.y + dims.nodeHeight * dims.distanceFactor,
} x: dims.padding.x,
} else { }
position = { : {
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2), x: lasPos.x + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y y: dims.padding.y,
}; };
} } else {
// draw node position = dims.flipped
if (getNodeType(node) === 'action') { ? {
if ('choose' in node) { y: dims.padding.y + dims.nodeHeight * dims.distanceFactor * (i + 2),
try { x: dims.padding.x,
const out = addChooseNode(node, position, nodeId, dims, updater, i); }
position = out.lastPos : {
flowData = mergeFlowDatas(flowData, out.flowData); x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2),
} catch (err) { y: dims.padding.y,
console.error(err) };
addErrorNode(flowData, nodeId, position, dims, err, updater.makeOnEditForBadNode(i));
}
} else {
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i)
});
}
} else {
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i)
});
}
addEdge(flowData, lastPointId, nodeId, false)
lastPointId = nodeId;
lasPos = position;
} }
// draw node
if (getNodeType(node) === "action") {
if ("choose" in node) {
try {
const out = addChooseNode(
node,
position,
nodeId,
dims,
namer,
updater,
i
);
position = out.lastPos;
flowData = mergeFlowDatas(flowData, out.flowData);
} catch (err) {
console.error(err);
addErrorNode(
flowData,
nodeId,
position,
dims,
err,
updater.makeOnEditForBadNode(i)
);
}
} else {
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i),
namer,
});
}
} else {
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i),
namer,
});
}
addEdge(flowData, lastPointId, nodeId, false);
lastPointId = nodeId;
lasPos = position;
}
// add button // add button
const addCircle = makeAddButton( const addCircle = makeAddButton(
`${prefix}-+`, `${prefix}-+`,
{ dims.flipped
x: ( ? {
lasPos === null ? y:
dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) : (lasPos === null
lasPos.x ? dims.padding.y +
) + dims.nodeWidth * dims.distanceFactor, dims.nodeHeight * dims.distanceFactor * (sequence.length + 1)
y: dims.padding.y + dims.circleSize / 4 : lasPos.y) +
dims.nodeHeight * dims.distanceFactor,
x: dims.padding.x + dims.circleSize * 1.5,
}
: {
x:
(lasPos === null
? dims.padding.x +
dims.nodeWidth * dims.distanceFactor * (sequence.length + 1)
: lasPos.x) +
dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y + dims.circleSize / 4,
}, },
dims, dims,
updater.addNode, updater.addNode,
false, false
) );
flowData.nodes.push(addCircle) flowData.nodes.push(addCircle);
addEdge(flowData, lastPointId, addCircle.id, false) addEdge(flowData, lastPointId, addCircle.id, false);
return { return {
position: lasPos, position: lasPos,
pointId: lastPointId, pointId: lastPointId,
}; };
} };
const xyApply = (p1: XYPosition, p2: XYPosition, fcn: (a: number, b: number) => number): XYPosition => ({ const xyApply = (
x: fcn(p1.x, p2.x), y: fcn(p1.y, p2.y) p1: XYPosition,
}) p2: XYPosition,
fcn: (a: number, b: number) => number
): XYPosition => ({
x: fcn(p1.x, p2.x),
y: fcn(p1.y, p2.y),
});
const addEdge = (flowData: FlowData, source: string, target: string, animated: boolean = false) => flowData.edges.push({ const addEdge = (
flowData: FlowData,
source: string,
target: string,
animated: boolean = false
) =>
flowData.edges.push({
id: `${source}-${target}`, id: `${source}-${target}`,
source, source,
target, target,
animated, animated,
}) });
const addSingleNode = ( const addSingleNode = (
flowData: FlowData, flowData: FlowData,
node: AutomationSequenceNode, node: AutomationSequenceNode,
position: XYPosition, position: XYPosition,
nodeId: string, nodeId: string,
{ { flipped, nodeHeight, nodeWidth }: DAGAutomationFlowDims,
nodeHeight, opts: {
nodeWidth, onEditClick: () => void;
}: DAGAutomationFlowDims, onXClick: () => void;
opts: { namer: Namer;
onEditClick: () => void; }
onXClick: () => void; ) =>
} flowData.nodes.push({
) => flowData.nodes.push({
id: nodeId, id: nodeId,
type: 'dagnode', type: "dagnode",
data: { data: {
label: getDescriptionFromAutomationNode(node), label: getDescriptionFromAutomationNode(node, opts.namer, true),
height: nodeHeight, height: nodeHeight,
width: nodeWidth, width: nodeWidth,
color: getNodeType(node) === 'action' ? 'green' : 'blue', color: getNodeType(node) === "action" ? "green" : "blue",
hasInput: true, hasInput: true,
...opts, flipped,
...opts,
}, },
position, position,
}); });
const addErrorNode = ( const addErrorNode = (
flowData: FlowData, flowData: FlowData,
nodeId: string, nodeId: string,
position: XYPosition, position: XYPosition,
{ { nodeHeight, nodeWidth }: DAGAutomationFlowDims,
nodeHeight, error: any,
nodeWidth, onEdit: () => void,
}: DAGAutomationFlowDims, hasInput: boolean = true
error: any, ) =>
onEdit: () => void, flowData.nodes.push({
hasInput: boolean = true,
) => flowData.nodes.push({
id: nodeId, id: nodeId,
type: 'errornode', type: "errornode",
position, position,
data: { data: {
height: nodeHeight, height: nodeHeight,
width: nodeWidth, width: nodeWidth,
hasInput, hasInput,
onEdit, onEdit,
error, error,
} },
}) });
const addChooseNode = ( const addChooseNode = (
node: ChooseAction, node: ChooseAction,
position: XYPosition, position: XYPosition,
nodeId: string, nodeId: string,
dims: DAGAutomationFlowDims, dims: DAGAutomationFlowDims,
updater: SequenceUpdater, namer: Namer,
i: number, updater: SequenceUpdater,
i: number
) => { ) => {
const flowData: FlowData = { const flowData: FlowData = {
nodes: [], nodes: [],
edges: [], edges: [],
}; };
addSingleNode(flowData, node, position, nodeId, dims, { addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node), onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i), onXClick: () => updater.removeNode(i),
}); namer,
let lastPos: XYPosition = position; });
// conditions let lastPos: XYPosition = position;
node.choose.forEach(({ sequence, conditions }, j) => { // conditions
const sequenceId = `${nodeId}.${j}`; node.choose.forEach(({ sequence, conditions }, j) => {
// edit/delete circle const sequenceId = `${nodeId}.${j}`;
const circle = makeFlowCircle(`${sequenceId}>delete`, { // edit/delete circle
const circle = makeFlowCircle(
`${sequenceId}>delete`,
dims.flipped
? {
y: position.y + dims.nodeHeight * dims.distanceFactor,
x: lastPos.x + dims.nodeWidth * dims.distanceFactor,
}
: {
x: position.x + dims.nodeWidth * dims.distanceFactor, x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor, y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
}, { },
size: dims.circleSize, {
onRemove: createOnRemoveForChooseNode( flipped: dims.flipped,
node, size: dims.circleSize,
d => updater.updateNode(i, d), onRemove: createOnRemoveForChooseNode(
j, node,
), (d) => updater.updateNode(i, d),
}) j
flowData.nodes.push(circle) ),
addEdge(flowData, nodeId, circle.id, true) }
const condNode = makeConditionPoint(
`${sequenceId}>cond`,
{
x: circle.position.x + dims.circleSize * dims.distanceFactor,
y: circle.position.y + dims.circleSize / 8,
},
dims,
conditions.length,
updater.makeOnEditConditionsForChooseNode(i, j)
);
flowData.nodes.push(condNode)
addEdge(flowData, circle.id, condNode.id, true)
// actual sub sequence
const lastPoint = sequenceToFlow(flowData, sequence, condNode.id, {
...dims,
padding: {
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
y: condNode.position.y - dims.conditionHeight / 2,
},
}, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`);
if (lastPoint.position) {
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
} else {
lastPos = xyApply(lastPos, { x: lastPos.x, y: lastPos.y + dims.nodeHeight * dims.distanceFactor }, Math.max)
}
})
const totalChildren = node.choose.length;
// add button
const addCirlce = makeAddButton(
`${nodeId}>add`,
{
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
},
dims,
() => updater.updateNode(i, {
...node,
choose: [
...node.choose,
{
sequence: [],
conditions: [],
}
]
}),
false,
); );
flowData.nodes.push(addCirlce) flowData.nodes.push(circle);
addEdge(flowData, nodeId, addCirlce.id, true) addEdge(flowData, nodeId, circle.id, true);
const condNode = makeConditionPoint(
`${sequenceId}>cond`,
dims.flipped
? {
y: circle.position.y + dims.circleSize * dims.distanceFactor,
x: circle.position.x - dims.circleSize,
}
: {
x: circle.position.x + dims.circleSize * dims.distanceFactor,
y: circle.position.y + dims.circleSize / 8,
},
dims,
conditions.length,
updater.makeOnEditConditionsForChooseNode(i, j)
);
flowData.nodes.push(condNode);
addEdge(flowData, circle.id, condNode.id, true);
// else // actual sub sequence
const elseCircle = makeFlowCircle(`${nodeId}>else`, { const lastPoint = sequenceToFlow(
x: position.x + dims.nodeWidth * dims.distanceFactor, flowData,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2, sequence,
}, { size: dims.circleSize }) condNode.id,
flowData.nodes.push(elseCircle) {
addEdge(flowData, nodeId, elseCircle.id, true)
const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, {
...dims, ...dims,
padding: { padding: dims.flipped
? {
y: condNode.position.y - dims.nodeHeight * dims.distanceFactor,
x: condNode.position.x - dims.conditionHeight / 2,
}
: {
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
y: condNode.position.y - dims.conditionHeight / 2,
},
},
namer,
updater.makeChildUpdaterForChooseAction(i, j),
`${sequenceId}.`
);
if (lastPoint.position) {
lastPos = xyApply(lastPos, lastPoint.position, Math.max);
} else {
lastPos = xyApply(
lastPos,
dims.flipped
? {
y: lastPos.y,
x: lastPos.x + dims.nodeWidth * dims.distanceFactor,
}
: {
x: lastPos.x,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
},
Math.max
);
}
});
const totalChildren = node.choose.length;
// add button
const addCirlce = makeAddButton(
`${nodeId}>add`,
dims.flipped
? {
y: position.y + dims.nodeHeight * dims.distanceFactor,
x: lastPos.x + dims.nodeWidth * dims.distanceFactor,
}
: {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
},
dims,
() =>
updater.updateNode(i, {
...node,
choose: [
...node.choose,
{
sequence: [],
conditions: [],
},
],
}),
false
);
flowData.nodes.push(addCirlce);
addEdge(flowData, nodeId, addCirlce.id, true);
// else
const elseCircle = makeFlowCircle(
`${nodeId}>else`,
dims.flipped
? {
y: position.y + dims.nodeHeight * dims.distanceFactor,
x: lastPos.x + dims.nodeWidth * dims.distanceFactor * 2,
}
: {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2,
},
{ size: dims.circleSize, flipped: dims.flipped }
);
flowData.nodes.push(elseCircle);
addEdge(flowData, nodeId, elseCircle.id, true);
const lastPoint = sequenceToFlow(
flowData,
node.default ?? [],
elseCircle.id,
{
...dims,
padding: dims.flipped
? {
y: position.y,
x: elseCircle.position.x - 1.4 * dims.circleSize,
}
: {
x: position.x - dims.nodeWidth, x: position.x - dims.nodeWidth,
y: elseCircle.position.y - dims.circleSize / 4, y: elseCircle.position.y - dims.circleSize / 4,
}, },
}, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`) },
if (lastPoint.position) { namer,
lastPos = xyApply(lastPos, lastPoint.position, Math.max) updater.makeChildUpdaterForChooseAction(i, null),
} else { `${nodeId}.${totalChildren}.`
lastPos = xyApply(lastPos, elseCircle.position, Math.max) );
} if (lastPoint.position) {
return { lastPos, flowData } lastPos = xyApply(lastPos, lastPoint.position, Math.max);
} } else {
lastPos = xyApply(lastPos, elseCircle.position, Math.max);
}
return { lastPos, flowData };
};
export const mergeFlowDatas = (fd1: FlowData, fd2: FlowData): FlowData => { export const mergeFlowDatas = (fd1: FlowData, fd2: FlowData): FlowData => {
fd1.edges = fd1.edges.concat(fd2.edges); fd1.edges = fd1.edges.concat(fd2.edges);
fd1.nodes = fd1.nodes.concat(fd2.nodes); fd1.nodes = fd1.nodes.concat(fd2.nodes);
return fd1 return fd1;
} };
@@ -1,53 +1,74 @@
import { AutomationTrigger } from 'types/automations/triggers'; import { AutomationTrigger } from "types/automations/triggers";
import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from './types'; import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from "./types";
import { makeAddButton } from './flowDataMods'; import { makeAddButton } from "./flowDataMods";
import { getDescriptionFromAutomationNode } from 'utils/formatting'; import { getDescriptionFromAutomationNode } from "utils/formatting";
export const triggerToFlow = ( export const triggerToFlow = (
flowData: FlowData, flowData: FlowData,
trigger: AutomationTrigger[], trigger: AutomationTrigger[],
toPoint: string, toPoint: string,
dims: DAGAutomationFlowDims, dims: DAGAutomationFlowDims,
opts: TriggerMakerOptions, opts: TriggerMakerOptions
) => { ) => {
const { const {
distanceFactor, distanceFactor,
nodeHeight, nodeHeight,
nodeWidth, nodeWidth,
padding, padding,
conditionHeight, conditionHeight,
} = dims; circleSize,
// convert all triggers to dag nodes flipped,
trigger.forEach((t, i) => { } = dims;
const flowId = `t-${i}`; // convert all triggers to dag nodes
flowData.nodes.push({ trigger.forEach((t, i) => {
id: flowId, const flowId = `t-${i}`;
type: 'dagnode', flowData.nodes.push({
data: { id: flowId,
label: getDescriptionFromAutomationNode(t), type: "dagnode",
height: nodeHeight, data: {
width: nodeWidth, label: getDescriptionFromAutomationNode(t, opts.namer, true),
color: 'red', height: nodeHeight,
onEditClick: () => opts.onEdit(i), width: nodeWidth,
onXClick: () => opts.onDelete(i), flipped,
}, color: "red",
position: { x: padding.x, y: padding.y + nodeHeight * distanceFactor * i } onEditClick: () => opts.onEdit(i),
}) onXClick: () => opts.onDelete(i),
flowData.edges.push({ },
id: `e(${flowId})-(${toPoint})`, position: flipped
source: flowId, ? {
target: toPoint, y: padding.y,
}) x: padding.x + nodeWidth * distanceFactor * i,
}
: {
x: padding.x,
y: padding.y + nodeHeight * distanceFactor * i,
},
}); });
flowData.edges.push({
id: `e(${flowId})-(${toPoint})`,
source: flowId,
target: toPoint,
});
});
// create a 'add button' // create a 'add button'
flowData.nodes.push(makeAddButton( flowData.nodes.push(
'trigger-add', makeAddButton(
{ "trigger-add",
flipped
? {
y: padding.y + circleSize / 4,
x: padding.x + nodeWidth * distanceFactor * trigger.length,
}
: {
x: padding.x + nodeWidth * 0.4, x: padding.x + nodeWidth * 0.4,
y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length, y:
}, padding.y +
dims, conditionHeight / 2 +
opts.onAdd nodeHeight * distanceFactor * trigger.length,
)) },
} dims,
opts.onAdd
)
);
};
+3
View File
@@ -5,6 +5,7 @@ import { DAGNodeProps } from './DAGNode';
import { AutomationTrigger } from 'types/automations/triggers'; import { AutomationTrigger } from 'types/automations/triggers';
import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types'; import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
import { DAGErrorNodeProps } from './DAGErrorNode'; import { DAGErrorNodeProps } from './DAGErrorNode';
import { Namer } from 'utils/formatting';
export type DAGAutomationFlowDims = { export type DAGAutomationFlowDims = {
@@ -15,6 +16,7 @@ export type DAGAutomationFlowDims = {
conditionHeight: number; conditionHeight: number;
circleSize: number; circleSize: number;
distanceFactor: number; distanceFactor: number;
flipped: boolean;
} }
export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | DAGErrorNodeProps | any>; export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | DAGErrorNodeProps | any>;
@@ -27,6 +29,7 @@ export type TriggerMakerOptions = {
onAdd: () => void, onAdd: () => void,
onEdit: (i: number) => void, onEdit: (i: number) => void,
onDelete: (i: number) => void, onDelete: (i: number) => void,
namer: Namer,
} }
export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = ( export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = (
@@ -40,8 +40,8 @@ test("sequence updater updates nodes", () => {
mock.updater.updateNode(0, { mock.updater.updateNode(0, {
...mock.state[0], ...mock.state[0],
alias: "Hello" alias: "Hello"
}) } as any)
expect(mock.state[0].alias).toBe("Hello") expect((mock.state[0] as any).alias).toBe("Hello")
}) })
test('update conditions for node', () => { test('update conditions for node', () => {
const mock = mockSequenceUpdater([ const mock = mockSequenceUpdater([
+80 -89
View File
@@ -2,140 +2,131 @@ import { AutomationSequenceNode } from "types/automations";
import { ChooseAction } from "types/automations/actions"; import { ChooseAction } from "types/automations/actions";
import { AutomationCondition } from "types/automations/conditions"; import { AutomationCondition } from "types/automations/conditions";
import { UpdateModalState } from "./types"; import { UpdateModalState } from "./types";
import { getNodeType } from '../../utils/automations'; import { getNodeType } from "../../utils/automations";
export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>; export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>;
export const makeSequenceUpdater = ( export const makeSequenceUpdater = (
sequence: AutomationSequenceNode[], sequence: AutomationSequenceNode[],
onChange: (s: AutomationSequenceNode[]) => void, onChange: (s: AutomationSequenceNode[]) => void,
openModal: UpdateModalState, openModal: UpdateModalState
) => ({ ) => ({
sequence, sequence,
onChange, onChange,
removeNode(i: number) { removeNode(i: number) {
return onChange([ return onChange([...sequence.slice(0, i), ...sequence.slice(i + 1)]);
...sequence.slice(0, i),
...sequence.slice(i + 1),
])
}, },
addNode() { addNode() {
return openModal({ return openModal({
single: true, single: true,
saveBtnCreateText: true, saveBtnCreateText: true,
node: { node: {
choose: [], device_id: "",
default: [],
}, },
update: n => onChange([ update: (n) => {
...sequence, onChange([...sequence, n]);
n, },
]), allowedTypes: ["action", "condition"],
allowedTypes: ['action', 'condition'] });
})
}, },
updateNode(i: number, node: AutomationSequenceNode) { updateNode(i: number, node: AutomationSequenceNode) {
return onChange([ if (JSON.stringify(node) !== JSON.stringify(sequence[i])) {
...sequence.slice(0, i), return onChange([
node, ...sequence.slice(0, i),
...sequence.slice(i + 1), node,
]) ...sequence.slice(i + 1),
]);
}
}, },
updateChooseActionData(i: number, data: ChooseAction) { updateChooseActionData(i: number, data: ChooseAction) {
const node = sequence[i] as ChooseAction; const node = sequence[i] as ChooseAction;
return this.updateNode(i, { return this.updateNode(i, {
...node, ...node,
...data, ...data,
}) });
}, },
makeChildUpdaterForChooseAction(i: number, j: number | null) { makeChildUpdaterForChooseAction(i: number, j: number | null) {
const node = sequence[i]; const node = sequence[i];
if ('choose' in node) { if ("choose" in node) {
if (j !== null) { if (j !== null) {
return makeSequenceUpdater( return makeSequenceUpdater(
node.choose[j].sequence, node.choose[j].sequence,
seq => this.updateNode(i, { (seq) =>
...node, this.updateNode(i, {
choose: [ ...node,
...node.choose.slice(0, j), choose: [
{ ...node.choose.slice(0, j),
...node.choose[j], {
sequence: seq, ...node.choose[j],
}, sequence: seq,
...node.choose.slice(j + 1), },
] ...node.choose.slice(j + 1),
}), ],
openModal, }),
) openModal
);
} else { } else {
return makeSequenceUpdater( return makeSequenceUpdater(
node.default ?? [], node.default ?? [],
seq => this.updateNode(i, { (seq) =>
...node, this.updateNode(i, {
default: seq ...node,
}), default: seq,
openModal, }),
) openModal
);
} }
} }
throw new Error(`Cannot create sub-updater for ${node}`) throw new Error(`Cannot create sub-updater for ${node}`);
}, },
makeOnModalOpenForNode( makeOnModalOpenForNode(i: number, node: AutomationSequenceNode) {
i: number, return () =>
node: AutomationSequenceNode, openModal({
) { single: true,
return () => openModal({ node,
single: true, allowedTypes: ["action", "condition"],
node, update: (n) => this.updateNode(i, n),
allowedTypes: ['action', 'condition'], });
update: n => this.updateNode(i, n),
})
}, },
makeOnEditConditionsForChooseNode( makeOnEditConditionsForChooseNode(i: number, j: number) {
i: number,
j: number,
) {
return () => { return () => {
const node = sequence[i] as ChooseAction; const node = sequence[i] as ChooseAction;
return openModal({ return openModal({
single: false, single: false,
node: node.choose[j].conditions, node: node.choose[j].conditions,
allowedTypes: ['condition'], allowedTypes: ["condition"],
update: conditions => this.updateNode(i, { update: (conditions) =>
...node, this.updateNode(i, {
choose: [ ...node,
...node.choose.slice(0, j), choose: [
{ ...node.choose.slice(0, j),
sequence: node.choose[j].sequence, {
conditions: conditions as AutomationCondition[], sequence: node.choose[j].sequence,
}, conditions: conditions as AutomationCondition[],
...node.choose.slice(j + 1), },
] ...node.choose.slice(j + 1),
}), ],
}) }),
} });
};
}, },
makeOnEditForBadNode(i: number) { makeOnEditForBadNode(i: number) {
const node = sequence[i]; const node = sequence[i];
return () => openModal({ return () =>
single: true, openModal({
isError: true, single: true,
node, isError: true,
allowedTypes: [getNodeType(node)], node,
update: n => this.updateNode(i, n), allowedTypes: [getNodeType(node)],
}) update: (n) => this.updateNode(i, n),
} });
},
}); });
export const createOnRemoveForChooseNode =
export const createOnRemoveForChooseNode = ( (action: ChooseAction, update: (data: ChooseAction) => void, j: number) =>
action: ChooseAction, () =>
update: (data: ChooseAction) => void, update({
j: number ...action,
) => () => update({ choose: [...action.choose.slice(0, j), ...action.choose.slice(j + 1)],
...action, });
choose: [
...action.choose.slice(0, j),
...action.choose.slice(j + 1),
]
})
@@ -0,0 +1,92 @@
import {
BaseOption,
InputAutoComplete,
} from "components/Inputs/InputAutoComplete";
import { InputDevice } from "components/Inputs/InputDevice";
import { InputDeviceCapabilties } from "components/Inputs/InputDeviceCapabilties";
import { InputEntity } from "components/Inputs/InputEntities";
import { cleanUpUndefined } from "components/NodeEditor/OptionManager/OptionManager";
import { DeviceBaseType, DeviceTypeCapability } from "haService/types";
import { AutomationDeviceState } from "types/automations/common";
export type DeviceEditorProps<DBT extends DeviceBaseType> = {
type: "action" | "condition" | "trigger";
state: Partial<AutomationDeviceState>;
setState: (n: Partial<AutomationDeviceState & Record<string, any>>) => void;
options: Record<string, BaseOption<{ data: DBT[] }>>;
caps: Partial<DeviceTypeCapability>;
};
export function DeviceEditor<DBT extends DeviceBaseType>({
type,
state,
setState,
caps,
options,
}: DeviceEditorProps<DBT>) {
// aliases
const update = (upd: Partial<AutomationDeviceState & Record<string, any>>) =>
setState(
cleanUpUndefined({
...state,
...upd,
})
);
const actionId = (state.type ?? "") + (state.subtype ?? "");
const entities = ((options[actionId] ?? {}).data ?? [])
.map(({ entity_id }) => entity_id)
.filter((x) => !!x) as string[];
// render
return (
<>
<InputDevice
key="devices"
label="Device"
value={state.device_id ?? ""}
onChange={(device_id) => setState({ device_id: device_id ?? "" })}
/>
<InputAutoComplete
key="action"
label="Action"
multiple={false}
value={actionId}
options={Object.keys(options).map((k) => options[k])}
disabled={Object.keys(options).length === 0}
onChange={(key) => {
if (key) {
const opt = options[key].data[0];
const updateObj: any = { ...opt };
delete updateObj["metadata"];
setState(updateObj);
} else {
setState({
device_id: state.device_id,
});
}
}}
/>
{entities.length > 0 && (
<InputEntity
key={"entities" + state.device_id}
label="Entity"
value={state.entity_id ?? ""}
multiple={false}
onChange={(entity_id) =>
update({ entity_id: entity_id ?? undefined })
}
preSelectedEntityIds={entities}
/>
)}
{caps?.extra_fields && (
<InputDeviceCapabilties
key="caps"
state={state}
setState={setState}
defn={caps.extra_fields}
/>
)}
{Object.keys(options).length + entities.length === 0 && (
<>This device has no {type}s.</>
)}
</>
);
}
@@ -1,6 +1,7 @@
import React, { FC } from "react"; import React, { FC } from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react'; import { ComponentMeta, ComponentStory } from '@storybook/react';
import { ErrorBoundary } from "."; import { ErrorBoundary } from ".";
import { Page } from "components/Page";
export default { export default {
@@ -15,20 +16,20 @@ export const ErrorThrown: ComponentStory<typeof ErrorBoundary> = args => {
const BadComponent: FC = () => { const BadComponent: FC = () => {
throw new Error("!!!") throw new Error("!!!")
} }
return <div className="page"> return <Page>
<ErrorBoundary> <ErrorBoundary>
<BadComponent /> <BadComponent />
</ErrorBoundary> </ErrorBoundary>
</div> </Page>
} }
export const NoError: ComponentStory<typeof ErrorBoundary> = args => { export const NoError: ComponentStory<typeof ErrorBoundary> = args => {
const GoodComponent: FC = () => { const GoodComponent: FC = () => {
return <span>All Good.</span> return <span>All Good.</span>
} }
return <div className="page"> return <Page>
<ErrorBoundary> <ErrorBoundary>
<GoodComponent /> <GoodComponent />
</ErrorBoundary> </ErrorBoundary>
</div> </Page>
} }
@@ -1,5 +1,5 @@
import "./index.css"; import "./index.css";
import { Component, ErrorInfo } from "react"; import { Component, ErrorInfo, ReactNode } from "react";
type State = { type State = {
hasError: false; hasError: false;
@@ -8,7 +8,9 @@ type State = {
error: any, error: any,
errorInfo?: ErrorInfo, errorInfo?: ErrorInfo,
} }
export class ErrorBoundary extends Component<{}, State> { export class ErrorBoundary extends Component<{
children: ReactNode
}, State> {
state: State = { state: State = {
hasError: false hasError: false
@@ -39,6 +41,8 @@ export class ErrorBoundary extends Component<{}, State> {
</div> </div>
} }
return this.props.children; return <>
{this.props.children}
</>;
} }
} }
@@ -0,0 +1,6 @@
.MuiButtonBase-root.icon-button[type="button"] {
border-width: 1px;
border-style: solid;
max-width: 1.5em;
max-height: 1.5em;
}
+23 -29
View File
@@ -1,30 +1,24 @@
import { FC } from 'react'; import "./ButtonIcons.css";
import { IconBaseProps } from './base'; import { FC, ReactNode } from "react";
import { createAppUseStyles } from 'styles/theme'; import MuiIconButton, { IconButtonTypeMap } from "@mui/material/IconButton";
export interface ButtonIconStyleProps { export const ButtonIcon: FC<{
} icon: ReactNode;
export interface ButtonIconProps extends IconBaseProps, ButtonIconStyleProps { onClick?: () => void;
children: FC<IconBaseProps>; className?: string;
} title?: string;
const useButtonIconStyles = createAppUseStyles(theme => ({ disabled?: boolean;
buttonIcon: { color?: IconButtonTypeMap["props"]["color"];
borderRadius: "100%", }> = (props) => {
borderWidth: 1, return (
borderStyle: "groove", <MuiIconButton
padding: "0.25em", className={["icon-button", props.className ?? ""].join(" ")}
"&:hover": { onClick={props.onClick}
backgroundColor: theme.secondaryAccent, title={props.title}
cursor: 'pointer', color={props.color}
} disabled={props.disabled}
} >
})) {props.icon}
</MuiIconButton>
);
export const ButtonIcon: FC<ButtonIconProps> = ({ };
children: Child,
className,
...props
}) => <Child
className={`${useButtonIconStyles({}).classes.buttonIcon} ${className}`} {...props}
/>
+34 -24
View File
@@ -1,40 +1,50 @@
import { ComponentStory } from "@storybook/react"; import { ComponentStory } from "@storybook/react";
import { IconBase } from "./base"; import { IconBase } from "./base";
import { PencilIcon, CheckMarkIcon, TrashIcon, InfoIcon, ArrowIcon, AddIcon, ZoomIcon, GearIcon } from "."; import {
PencilIcon,
CheckMarkIcon,
TrashIcon,
InfoIcon,
ArrowIcon,
AddIcon,
ZoomIcon,
GearIcon,
} from ".";
import { ButtonIcon } from "./ButtonIcons"; import { ButtonIcon } from "./ButtonIcons";
import { Page } from "components/Page";
export default { export default {
title: 'Icons', title: "Icons",
component: IconBase, component: IconBase,
}; };
export const IconList: ComponentStory<typeof IconBase> = (args) => { export const IconList: ComponentStory<typeof IconBase> = (args) => {
return (
return <div className="page"> <Page>
<PencilIcon {...args} /> <PencilIcon {...args} />
<CheckMarkIcon {...args} /> <CheckMarkIcon {...args} />
<AddIcon {...args} /> <AddIcon {...args} />
<TrashIcon {...args} /> <TrashIcon {...args} />
<InfoIcon {...args} /> <InfoIcon {...args} />
<ZoomIcon {...args} /> <ZoomIcon {...args} />
<GearIcon {...args} /> <GearIcon {...args} />
</div> </Page>
} );
};
IconList.args = { IconList.args = {
size: 2, size: 2,
color: 'red' color: "red",
} };
export const ButtonIconExample: ComponentStory<typeof IconBase> = (args) => { export const ButtonIconExample: ComponentStory<typeof IconBase> = (args) => {
return (
return <div className="page"> <Page>
<ButtonIcon {...args}>{ArrowIcon}</ButtonIcon> <ButtonIcon icon={<ArrowIcon {...args} />} />
</div> </Page>
} );
};
ButtonIconExample.args = { ButtonIconExample.args = {
size: 2, size: 2,
color: 'red' color: "red",
} };
+20 -6
View File
@@ -1,7 +1,21 @@
import { ButtonHTMLAttributes, FC } from "react"; import { FC, ReactNode } from "react";
import { useButtonStyles } from "./styles"; import MuiButton from "@mui/material/Button";
export const Button: FC<ButtonHTMLAttributes<HTMLButtonElement>> = props => { export const Button: FC<{
const { classes } = useButtonStyles({}); className?: string;
return <button {...props} className={`${classes.input} ${props.className ?? ''}`} /> title?: string;
} disabled?: boolean;
children?: ReactNode;
onClick?: () => void;
}> = (props) => {
return (
<MuiButton
className={props.className}
title={props.title}
disabled={props.disabled}
onClick={props.onClick}
variant="outlined"
children={props.children}
/>
);
};
Loaded 100 of 217 files, more files were not shown because too many files have changed in this diff. Show more