Compare commits

...
120 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
202 changed files with 16689 additions and 12215 deletions

No files matched your search

+9
View File
@@ -2,3 +2,12 @@ webapp/node_modules
webapp/build
webapp/.storybook
webapp/.vscode
webapp/.env.local
webapp/tmux.sh
api/.env
api/.coverage
api/venv
api/build
api/.mypy_cache
api/.vscode
api/.coverage
-1
View File
@@ -30,5 +30,4 @@ jobs:
args: |
--${{ matrix.arch }} \
--version ${{ github.event.inputs.version }} \
--additional-tag edge \
--target .
-2
View File
@@ -1,6 +1,4 @@
name: Deploy
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on:
workflow_dispatch:
push:
+5 -3
View File
@@ -35,7 +35,10 @@ jobs:
- metadata
strategy:
matrix:
action: [lint, coverage, security-checks]
action:
- lint
- coverage
- security-checks
steps:
- uses: actions/checkout@v3
- name: Set up Python
@@ -59,7 +62,6 @@ jobs:
action:
- "test:ci"
- "tsc:ci"
- "build"
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
@@ -98,6 +100,6 @@ jobs:
with:
args: |
--${{ matrix.arch }} \
--no-latest \
--version ${{ needs.metadata.outputs.version }} \
--additional-tag edge \
--target .
+43 -4
View File
@@ -1,4 +1,45 @@
# 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
@@ -12,7 +53,6 @@
- Made the validators less strict in order to capture more edge cases that HA supports
- Nicer auto-generated descriptions for some trigger nodes
## [0.1.10] - More Bug Fixes
- Allowing null or undefined values for metadata fields
@@ -66,8 +106,7 @@
## [0.0.9] - First Working Version
- Instalable verion via github
- Initial POC done
- Initial POC done
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+20 -16
View File
@@ -1,11 +1,16 @@
# <--- Build Args -->
# <--- Pre-Build Args -->
ARG BUILD_ARCH
ARG BUILD_VERSION
# <--- Image Setup -->
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
WORKDIR /app
# <--- Post-Build Args -->
ARG BUILD_VERSION
# <--- Environment Variables -->
ENV BUILD_VERSION $BUILD_VERSION
# <--- System Wide Dependencies -->
ENV LANG C.UTF-8
RUN apk add --no-cache \
@@ -13,29 +18,26 @@ RUN apk add --no-cache \
npm \
build-base \
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 -->
COPY api/setup.py /app/setup.py
RUN pip install . /app
# <--- Webapp Build -->
COPY webapp/ /app/web-builder
RUN cd /app/web-builder && \
yarn && \
yarn build && \
cp -r /app/web-builder/build /app/web && \
rm -rf /app/web-builder
echo "REACT_APP_BUILD_VERSION=${BUILD_VERSION}" > /app/web-builder/.env.production
# <--- BUILD -->
RUN /app/bin/build.sh /app /app/web-builder
# <--- Api Code -->
COPY api/src /app/src
COPY run.sh /app/run.sh
RUN chmod +x /app/run.sh
# <--- Environment Variables -->
ENV HASSIO_TOKEN ""
ENV BUILD_VERSION $BUILD_VERSION
# <--- Ports -->
EXPOSE 8000
@@ -45,5 +47,7 @@ LABEL \
io.hass.type="addon" \
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:
$(DC) build
build-no-cache:
$(DC) build --no-cache
push:
$(DC) push
local_run:
$(MAKE) build
start:
$(DC) up -d
sleep 1
$(DC) ps
local_logs:
logs:
$(DC) logs -f
local_ps:
ps:
$(DC) ps
local_stop:
stop:
$(DC) stop
bash:
$(DC) exec addon bash
config:
$(DC) config
+8 -4
View File
@@ -1,12 +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!
![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/).
@@ -17,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] Automation Manager
- [X] Tags for automation organization
- [X] Autocomplete fields for entities/devices
- [ ] Script Manager
- [ ] Use secrets and global parameters
- [ ] Autocomplete fields for entities/devices
- [ ] Autocomplete fields for template editor
- [ ] 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)
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:27)
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:31)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:12)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:9)
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:16)
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:17)
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:6)
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:7)
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:17)
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:28)
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:32)
read_details # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:10)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:10)
websocket_endpoint # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/socket.py:9)
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:18)
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:19)
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:11)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:12)
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
logger # unused variable (/home/ari/Projects/Shortumation/api/src/logger.py:16)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:13)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:30)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:54)
+1 -2
View File
@@ -33,7 +33,7 @@ test:
coverage:
$(VENV_BIN)/coverage run -m unittest discover tests
$(VENV_BIN)/coverage report -m --fail-under=90
$(VENV_BIN)/coverage report -m --fail-under=80
clean:
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
@@ -43,5 +43,4 @@ clean:
run-local:
rm -f web
ln -s ../webapp/build web
cd ../webapp && yarn build
USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload
+10 -5
View File
@@ -3,16 +3,16 @@ from fastapi.middleware.cors import CORSMiddleware
from fastapi.staticfiles import StaticFiles
from src.automations.manager import AutomationManager
from src.env import ORIGIN, ROOT_FOLDER
from src.env import API_PREFIX, ORIGIN, ROOT_FOLDER
from .routes import automations, details, ping
from .routes import automations, details, ping, socket
def make_app(automation_mgr: AutomationManager) -> FastAPI:
app = FastAPI()
if (ROOT_FOLDER / "web").exists():
app.mount(
"/web",
f"{API_PREFIX}/web",
StaticFiles(
directory=ROOT_FOLDER / "web",
html=True,
@@ -29,6 +29,11 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
allow_headers=["*"],
)
app.include_router(ping.router, prefix="/ping")
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations")
app.include_router(details.make_details_router(automation_mgr.hass_config), prefix="/details")
app.include_router(
automations.make_automation_router(automation_mgr), prefix=f"{API_PREFIX}/automations"
)
app.include_router(
details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details"
)
app.include_router(socket.router, prefix=f"{API_PREFIX}/socket")
return app
+4 -4
View File
@@ -1,8 +1,6 @@
from datetime import datetime
from fastapi import APIRouter
from src.env import BUILD_VERSION
from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
from src.hass_config import HassConfig
@@ -10,9 +8,11 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
router = APIRouter()
@router.get("/")
def read_ping():
def read_details():
return {
"version": BUILD_VERSION,
"hassio_token": HASSIO_TOKEN,
"hassio_url": HASSIO_WS,
"config": hass_config.get_configuration_path(),
"tags": hass_config.get_automation_tags_path(),
"autos": hass_config.get_automation_path(),
+39
View File
@@ -0,0 +1,39 @@
import asyncio
import json
from fastapi import APIRouter, WebSocket, WebSocketDisconnect
from src.logger import get_logger
from src.ws_redirect import WSRedirector
router = APIRouter()
logger = get_logger(__name__)
@router.websocket("/api/websocket")
async def websocket_endpoint(websocket: WebSocket):
async def on_message(msg: str):
await websocket.send_text(msg)
conn = WSRedirector(
on_message=on_message,
)
async def wait_for_data():
while True:
try:
msg_str = await websocket.receive_text()
msg_d = json.loads(msg_str)
if msg_d.get("type") != "auth":
await conn.send(msg_str)
except WebSocketDisconnect:
logger.info("Websocket closed.")
await conn.close()
break
await websocket.accept()
await asyncio.gather(
conn.start(),
wait_for_data(),
)
+3
View File
@@ -4,5 +4,8 @@ from decouple import Csv, config
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
HASSIO_TOKEN = config("SUPERVISOR_TOKEN", "")
HASSIO_WS = config("HASSIO_WS", "ws://supervisor/core/websocket")
LOG_LEVEL = config("LOG_LEVEL", "INFO")
API_PREFIX = config("API_PREFIX", "")
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
+4
View File
@@ -14,3 +14,7 @@ else:
logging.basicConfig(level=logging.NOTSET)
logger = logging.getLogger()
def get_logger(name: str):
return logging.getLogger(name)
+59
View File
@@ -0,0 +1,59 @@
import asyncio
import json
from typing import Callable, Coroutine, Optional
from websockets.client import WebSocketClientProtocol, connect
from websockets.exceptions import ConnectionClosedOK
from src.env import HASSIO_TOKEN, HASSIO_WS
from src.logger import get_logger, logger
OnMessage = Callable[[str], Coroutine]
logger = get_logger(__name__)
class WSRedirector:
def __init__(
self,
on_message: OnMessage,
token: str = HASSIO_TOKEN,
host: str = HASSIO_WS,
) -> None:
self._host = host
self._token = token
self._on_message = on_message
self._client: Optional[WebSocketClientProtocol] = None
self._close: bool = False
@property
def is_closed(self):
return self._close
async def send(self, msg: str):
if self._client:
return await self._client.send(msg)
async def start(self):
async with connect(self._host) as websocket:
self._client = websocket
await websocket.send(json.dumps({"type": "auth", "access_token": self._token}))
while not self.is_closed:
try:
msg = await websocket.recv()
# logger.debug(f"HA MSG :--> {msg} {self.is_closed}")
await self.process_message(msg)
except ConnectionClosedOK:
pass
logger.info("Closing socket...")
await websocket.close()
logger.info("Closed socket")
async def process_message(self, msg: str):
await self._on_message(msg)
async def close(self):
self._close = True
await self._client.close()
def __del__(self):
asyncio.create_task(self.close())
+29
View File
@@ -0,0 +1,29 @@
import os
import yaml
from pathlib import Path
print(Path().absolute())
CONFIG_YAML = Path("config.yaml").absolute()
CHANGELOG_MD = Path("CHANGELOG.md").absolute()
print(CONFIG_YAML)
print(CHANGELOG_MD)
version = os.environ["VERSION"]
version_name = os.environ["NAME"]
change = os.environ["CHANGELOG"].splitlines()
config = yaml.load(CONFIG_YAML.read_text(), yaml.Loader)
changelog = CHANGELOG_MD.read_text().splitlines()
with CHANGELOG_MD.open("w") as fp:
for i, log in enumerate(changelog):
if i == 2:
fp.write(f"## [{version}] - {version_name}\n\n")
for clog in change:
fp.write(f"- {clog.strip()}\n")
fp.write(log.strip() + "\n")
CONFIG_YAML.write_text(yaml.dump(config))
+6 -7
View File
@@ -1,5 +1,5 @@
name: Shortumation
version: 0.1.13
version: v0.1.22
slug: shortumation
image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation"
@@ -16,16 +16,15 @@ init: false
ingress: true
ingress_port: 8000
ingress_entry: "web/"
panel_icon: mdi:home-automation
hassio_role: manager
privileged:
- SYS_RAWIO
host_network: false
homeassistant_api: true
auth_api: true
panel_icon: mdi:home-automation
hassio_role: homeassistant
host_network: false
map:
- config:rw
options: {}
ports:
8000/tcp: 8000
8000/tcp:
ports_description:
8000/tcp: Main port for the API & Web.
+3 -2
View File
@@ -1,9 +1,10 @@
version: '3'
services:
addon:
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-latest}"
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
build:
context: "./"
dockerfile: "./Dockerfile"
args:
- BUILD_ARCH=${ARCH:-amd64}
BUILD_ARCH: ${ARCH:-amd64}
BUILD_VERSION: ${BUILD_TAG:-edge}
+3
View File
@@ -3,5 +3,8 @@ services:
addon:
volumes:
- "./sample_config:/config"
- "./api/tests:/app/tests"
ports:
- "8000:8000"
env_file:
- api/.env
+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:
Type: Generic
Type: Generic2
1:
Type: Generic
2:
+1 -1
View File
@@ -1 +1 @@
SKIP_PREFLIGHT_CHECK=true
SKIP_PREFLIGHT_CHECK=true
+7 -1
View File
@@ -1,4 +1,7 @@
module.exports = {
'core': {
builder: 'webpack5'
},
"stories": [
"../src/**/*.stories.mdx",
"../src/**/*.stories.@(js|jsx|ts|tsx)"
@@ -8,5 +11,8 @@ module.exports = {
"@storybook/addon-essentials",
"@storybook/preset-create-react-app",
"@storybook/addon-queryparams",
]
],
"features": {
"emotionAlias": false,
},
}
+6 -13
View File
@@ -2,24 +2,17 @@
"version": "0.2.0",
"configurations": [
{
"name": "Debug CRA Tests",
"name": "Debug Jest Tests",
"type": "node",
"request": "launch",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts",
"args": [
"test",
"--runInBand",
"--no-cache",
"--watchAll=false"
"runtimeArgs": [
"--inspect-brk",
"${workspaceRoot}/node_modules/.bin/jest",
"--runInBand"
],
"cwd": "${workspaceRoot}",
"protocol": "inspector",
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"env": {
"CI": "true"
},
"disableOptimisticBPs": true
"port": 9229
}
]
}
+59
View File
@@ -0,0 +1,59 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "tsc",
"problemMatcher": [],
"label": "npm: tsc",
"detail": "tsc -w",
"presentation": {
"reveal": "always",
"panel": "shared"
},
"runOptions": {
"runOn": "folderOpen"
},
"group": "test"
},
{
"type": "npm",
"script": "test",
"problemMatcher": [],
"label": "npm: test",
"detail": "test",
"presentation": {
"reveal": "always",
"panel": "shared"
},
"runOptions": {
"runOn": "folderOpen"
},
"group": "test",
},
{
"type": "npm",
"script": "storybook",
"problemMatcher": [],
"label": "npm: storybook",
"detail": "start-storybook -p 6006 -s public",
"promptOnClose": true
},
{
"type": "npm",
"script": "build",
"problemMatcher": [],
"label": "npm: build",
"detail": "react-scripts build",
"group": "build"
},
{
"type": "npm",
"script": "start",
"problemMatcher": [],
"label": "npm: start",
"detail": "react-scripts start",
"promptOnClose": true
},
]
}
+30 -13
View File
@@ -4,22 +4,34 @@
"private": true,
"homepage": ".",
"dependencies": {
"@types/jest": "^26.0.15",
"@types/node": "^12.0.0",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
"@mui/icons-material": "^5.8.3",
"@mui/material": "^5.8.0",
"@mui/styles": "^5.8.0",
"@types/jest": "^27.5.1",
"@types/node": "^17.0.36",
"@types/react": "^18.0.9",
"@types/react-dom": "^18.0.5",
"@types/ws": "^8.5.3",
"@uiw/react-codemirror": "^4.7.0",
"autosuggest-highlight": "^3.2.1",
"home-assistant-js-websocket": "^7.1.0",
"jss": "^10.8.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"notistack": "^2.0.5",
"react": "^18.1.0",
"react-cookie": "^4.1.1",
"react-dom": "^18.1.0",
"react-flow-renderer": "^10.1.2",
"react-imask": "^6.4.2",
"react-jss": "^10.8.2",
"react-router-dom": "6",
"react-scripts": "4.0.3",
"react-scripts": "5.0.1",
"superstruct": "^0.15.4",
"theming": "^3.3.0",
"typescript": "^4.1.2",
"web-vitals": "^1.0.1",
"web-vitals": "^2.1.4",
"ws": "^8.7.0",
"yarn": "^1.22.17"
},
"scripts": {
@@ -67,16 +79,21 @@
"@storybook/addon-essentials": "^6.4.22",
"@storybook/addon-links": "^6.4.22",
"@storybook/addon-queryparams": "^6.2.9",
"@storybook/builder-webpack5": "^6.5.6",
"@storybook/manager-webpack5": "^6.5.6",
"@storybook/node-logger": "^6.4.22",
"@storybook/preset-create-react-app": "^3.2.0",
"@storybook/preset-create-react-app": "^4.1.1",
"@storybook/react": "^6.4.22",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^14.2.0",
"@types/autosuggest-highlight": "^3.2.0",
"@types/chroma-js": "^2.1.3",
"@types/js-yaml": "^4.0.5",
"jest-environment-jsdom": "^27.5.1",
"ts-node": "^10.4.0"
"jest-environment-jsdom": "^28.1.0",
"ts-node": "^10.8.0",
"webpack": "^5.72.1",
"webpack-dev-server": "^4.9.0"
},
"moduleDirectories": [
"node_modules",
+9 -5
View File
@@ -3,17 +3,21 @@ import { Routes, Route, BrowserRouter } from "react-router-dom";
import { AutomationRoute } from 'routes/automation';
import { useConnectedApiService } from 'apiService';
import { ErrorBoundary } from 'components/ErrorBoundary';
import { CookiesProvider } from "react-cookie";
function App() {
const api = useConnectedApiService();
return (
<div className="app">
<ErrorBoundary>
<BrowserRouter>
<Routes>
<Route path="*" element={<AutomationRoute api={api} />} />
</Routes>
</BrowserRouter>
<CookiesProvider>
<BrowserRouter>
<Routes>
<Route path="*" element={<AutomationRoute api={api} />} />
</Routes>
</BrowserRouter>
</CookiesProvider>
</ErrorBoundary>
</div>
);
+6 -3
View File
@@ -10,13 +10,16 @@ export const makeRemoteAPI = (baseURL: string): API => ({
data = {}
}) {
try {
const reply = await fetch(baseURL + path, {
const payload: RequestInit = {
method,
headers: {
"Content-Type": "application/json"
},
body: JSON.stringify(data),
});
};
if (method !== 'GET') {
payload["body"] = JSON.stringify(data);
}
const reply = await fetch(baseURL + path, payload);
let response: APIResponse<any>;
if (reply.status === 200) {
response = {
+11 -7
View File
@@ -4,14 +4,18 @@ import { makeRemoteAPI } from "./base";
import { useAPIService } from './core';
import { useMockAPI } from "./mock";
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
const locationPrefixWeb = window.location.pathname.match(/(\/.+\/)web/i);
const baseURL = new URL(
process.env.NODE_ENV === 'development' ?
`http://${window.location.hostname}:8000` :
window.location.origin + (!locationPrefixWeb ? '' : locationPrefixWeb[1])
);
export const wsURL = baseURL + "socket"
export const remoteAutoAPI = makeRemoteAPI(
baseURL + "automations"
);
export const useConnectedApiService = () => useAPIService(
makeAutomationAPI(makeRemoteAPI(
process.env.NODE_ENV === 'development' ?
"http://localhost:8000/automations" :
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
))
makeAutomationAPI(remoteAutoAPI)
);
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
makeAutomationAPI(useMockAPI(initialAutos))
+1 -1
View File
@@ -15,7 +15,7 @@ export const useMockAPI = (
method = "POST",
data = {}
}) {
console.debug("[[mockCall]]", method, path, data);
// console.debug("[[mockCall]]", method, path, data);
if (path === AUTOMTAION_LIST) {
return {
ok: true,
+1 -1
View File
@@ -7,7 +7,7 @@ export interface ListParams {
}
export type APIRequest<D> = {
path: string;
method?: "POST" | "DELETE",
method?: "POST" | "DELETE" | "GET",
data?: D;
};
+3 -3
View File
@@ -5,7 +5,7 @@ import { AutomationAPI } from './automations';
export const useDefaultApiState = () => useState<ApiState>({
automations: {ready: false},
automations: { ready: false },
});
export const makeReloadAutomations = (
@@ -21,8 +21,8 @@ export const makeReloadAutomations = (
const resp = await automationAPI.list(params);
setState({
...state, automations: {
ready: true,
...resp,
ready: true,
...resp,
}
});
}
@@ -34,6 +34,13 @@
border-radius: 5px;
}
.automation-editor--info-box--tag-list {
max-height: 30vh;
overflow-y: scroll;
padding-left: 0.25em;
padding-right: 0.25em;
}
.automation-editor--info-box--tags>h1 {
font-size: 1.5em;
}
@@ -49,6 +56,7 @@
.automation-editor--info-box--tag>div {
margin: 0;
flex: 1;
}
.automation-editor--info-box--tag>div>input {
@@ -56,29 +64,11 @@
padding: 1em 0.25em 0.2em 0.25em;
}
.automation-editor--info-box--tag>button {
height: 1.25em;
width: 1.25em;
.automation-editor--info-box--tag--trash, .automation-editor--info-box--tag--add {
height: 2em;
width: 2em;
font-size: 1em;
display: flex;
justify-content: center;
align-items: center;
}
.automation-editor--info-box--tag--error {
width: 100%;
display: flex;
justify-content: center;
padding: 0;
}
.automation-editor--info-box--tag--error.hide {
height: 0;
opacity: 0;
display: none;
}
.automation-editor--info-box--tag--error.show {
height: fit-content;
opacity: 1;
}
@@ -1,19 +1,29 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { makeTagDB } from "components/AutomationList/TagDB";
import { Page } from "components/Page";
import { useState } from "react";
import { AutoInfoBox } from "./AutoInfoBox";
import { defaultAutomation } from 'utils/defaults';
export default {
title: 'App/AutomationList/Editor/InfoBox',
component: AutoInfoBox,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
tagDB: makeTagDB([
defaultAutomation("test")
])
}
} as ComponentMeta<typeof AutoInfoBox>;
export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
const [[metadata, tags], setState] = useState([args.metadata, args.tags])
return (
<div className="page">
<Page>
<AutoInfoBox
{...args}
className=""
metadata={metadata}
tags={tags}
@@ -22,7 +32,7 @@ export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
setState([m, t])
}}
/>
</div>
</Page>
)
}
NoTags.args = {
@@ -2,16 +2,19 @@ import "./AutoInfoBox.css";
import { AutomationMetadata } from "types/automations";
import { InputList } from "components/Inputs/InputList";
import InputText from "components/Inputs/InputText";
import InputTextArea from "components/Inputs/InputTextArea";
import { FC, useRef, useState } from 'react';
import { FC, ReactNode, useRef, useState } from "react";
import { AddIcon, TrashIcon } from "components/Icons";
import { Button } from "components/Inputs/Button";
import InputAutoText from "components/Inputs/InputAutoText";
import { TagDB } from "components/AutomationList/TagDB";
import { ButtonIcon } from "components/Icons/ButtonIcons";
interface Props {
className: string;
metadata: AutomationMetadata;
tags: Array<[string, string]>;
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
tagDB: TagDB;
children?: ReactNode;
}
export const AutoInfoBox: FC<Props> = ({
metadata,
@@ -19,101 +22,157 @@ export const AutoInfoBox: FC<Props> = ({
onUpdate,
className,
children,
tagDB,
}) => {
// state
const [newTag, setNewTag] = useState<[string, string]>(["", ""])
const [[errorIndex, error], _setError] = useState<[number | 'new', string]>([-1, ""]);
const [newTag, setNewTag] = useState<[string, string]>(["", ""]);
const [[errorIndex, error], _setError] = useState<[number | "new", string]>([
-1,
"",
]);
const errorTimeoutId = useRef(-1);
// aliases
const setError = (index: number | 'new', msg: string) => {
_setError([index, msg])
const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n));
const setError = (index: number | "new", msg: string) => {
_setError([index, msg]);
if (errorTimeoutId.current >= 0) {
window.clearTimeout(errorTimeoutId.current);
}
errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000);
}
const onUpdateMetadata = <K extends keyof AutomationMetadata>(k: K) => (update: AutomationMetadata[K]) => onUpdate({
...metadata,
[k]: update
}, tags);
};
const onUpdateMetadata =
<K extends keyof AutomationMetadata>(k: K) =>
(update: AutomationMetadata[K]) =>
onUpdate(
{
...metadata,
[k]: update,
},
tags
);
const validTagName = (newName: string): string | undefined => {
if (newName.length <= 0) {
return "Name must be at least 1 character long"
return "Name must be at least 1 character long";
}
// eslint-disable-next-line
for (const [name, _] of tags) {
if (name.trim() === newName.trim()) {
return `The tag '${name}' already exists`
return `The tag '${name}' already exists`;
}
}
}
};
const updateTagName = (newName: string, tagIndex: number) => {
const error = validTagName(newName);
if (error) {
return setError(tagIndex, error)
return setError(tagIndex, error);
}
onUpdate(metadata, [
...tags.slice(0, tagIndex),
[newName, tags[tagIndex][1]],
...tags.slice(tagIndex + 1),
])
}
const onUpdateTags = (tagValue: string, tagIndex: number) => onUpdate(metadata, [
...tags.slice(0, tagIndex),
[tags[tagIndex][0], tagValue],
...tags.slice(tagIndex + 1),
])
]);
};
const onUpdateTags = (tagValue: string, tagIndex: number) =>
onUpdate(metadata, [
...tags.slice(0, tagIndex),
[tags[tagIndex][0], tagValue],
...tags.slice(tagIndex + 1),
]);
const addNewTag = () => {
const error = validTagName(newTag[0]);
if (error) {
return setError('new', error)
return setError("new", error);
}
onUpdate(metadata, tags.concat([newTag]));
setNewTag(['', '']);
}
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [
...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1),
])
onUpdate(
metadata,
tags.concat([newTag.map((x) => x.trim()) as [string, string]])
);
setNewTag(["", ""]);
};
const onRemoveTag = (tagIndex: number) =>
onUpdate(metadata, [
...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1),
]);
// render
return <div className={`automation-editor--info-box ${className}`}>
<div className="automation-editor--info-box-inner">
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} />
<InputText label="Name" value={metadata.alias ?? ""} onChange={onUpdateMetadata('alias')} />
<InputTextArea label="Description" value={metadata.description ?? ""} onChange={onUpdateMetadata('description')} />
<InputList
label="Mode"
current={metadata.mode}
onChange={onUpdateMetadata('mode')}
options={[
'parallel',
'single',
'queued',
'restart'
]}
/>
<div className="automation-editor--info-box--tags">
<h1>Tags</h1>
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag">
<Button onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button>
<InputText value={tagName} label="Name" onChange={v => updateTagName(v, tagIndex)} />
<InputText value={tagValue} label="Tag" onChange={v => onUpdateTags(v, tagIndex)} />
<span className={["automation-editor--info-box--tag--error", (errorIndex === tagIndex) ? "show" : "hide"].join(" ")}>
{error}
</span>
</div>)}
<hr />
<div className="automation-editor--info-box--tag">
<InputText value={newTag[0]} label="Name" onChange={v => setNewTag([v, newTag[1]])} onEnter={addNewTag} />
<InputText value={newTag[1]} label="Tag" onChange={v => setNewTag([newTag[0], v])} onEnter={addNewTag} />
<Button onClick={addNewTag} ><AddIcon /></Button>
<span className={["automation-editor--info-box--tag--error", (errorIndex === 'new') ? "show" : "hide"].join(" ")}>
{error}
</span>
return (
<div className={`automation-editor--info-box ${className}`}>
<div className="automation-editor--info-box-inner">
<InputText
label="ID"
value={metadata.id}
onChange={onUpdateMetadata("id")}
/>
<InputText
label="Name"
value={metadata.alias ?? ""}
onChange={onUpdateMetadata("alias")}
/>
<InputText
multiline
label="Description"
value={metadata.description ?? ""}
onChange={onUpdateMetadata("description")}
/>
<InputList
label="Mode"
current={metadata.mode}
onChange={onUpdateMetadata("mode")}
options={["parallel", "single", "queued", "restart"]}
/>
<div className="automation-editor--info-box--tags">
<h1>Tags</h1>
<div className="automation-editor--info-box--tag-list">
{tags.map(([tagName, tagValue], tagIndex) => (
<div key={tagIndex} className="automation-editor--info-box--tag">
<InputAutoText
value={tagName}
label="Name"
onChange={(v) => updateTagName(v, tagIndex)}
options={foundNewTagNames}
error={errorIndex === tagIndex ? error : undefined}
/>
<InputAutoText
value={tagValue}
label="Tag"
onChange={(v) => onUpdateTags(v, tagIndex)}
options={tagDB.getTagValues(tagName)}
error={errorIndex === tagIndex ? error : undefined}
/>
<ButtonIcon
className="automation-editor--info-box--tag--trash"
onClick={() => onRemoveTag(tagIndex)}
icon={<TrashIcon />}
/>
</div>
))}
</div>
<hr />
<div className="automation-editor--info-box--tag">
<InputAutoText
value={newTag[0]}
label="Name"
onChange={(v) => setNewTag([v, newTag[1]])}
options={foundNewTagNames}
error={errorIndex === "new" ? error : undefined}
/>
<InputAutoText
value={newTag[1]}
label="Tag"
onChange={(v) => setNewTag([newTag[0], v])}
options={tagDB.getTagValues(newTag[0])}
error={errorIndex === "new" ? error : undefined}
/>
<ButtonIcon
className="automation-editor--info-box--tag--add"
onClick={addNewTag}
icon={<AddIcon />}
/>
</div>
</div>
</div>
{children}
</div>
{children}
</div>
}
);
};
@@ -1,5 +1,6 @@
.automation-editor {
display: flex;
position: relative;
flex-direction: row;
width: 100%;
height: 100%;
@@ -27,13 +28,9 @@
.automation-editor--flow-wrapper--toolbar {
display: flex;
flex-direction: row;
gap: 0.25em;
justify-content: flex-end;
}
.automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
height: 0;
opacity: 0;
overflow: hidden;
margin-top: 0.25em;
}
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
@@ -64,14 +61,39 @@
position: relative;
}
.automation-editor--info-box--icon {
.automation-editor .automation-editor--info-box--icon {
position: absolute;
right: 0em;
bottom: 0.5em;
left: 0.25em;
bottom: 0em;
z-index: 10;
max-width: 1.5em;
max-height: 1.5em;
}
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
transform: rotate(180deg);
z-index: 2;
left: 0.1em;
}
.automation-editor.loading .mock-list {
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 { useState } from 'react';
import * as dgconst from 'components/DAGFlow/constants';
import { Page } from "components/Page";
import { makeTagDB } from "components/AutomationList/TagDB";
export default {
@@ -10,21 +12,22 @@ export default {
component: AutomationEditor,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
dims: dgconst.DEFAULT_DIMS
dims: dgconst.DEFAULT_DIMS,
}
} as ComponentMeta<typeof AutomationEditor>
const Template: ComponentStory<typeof AutomationEditor> = args => {
const [state, setState] = useState(args.automation)
return <div className="page">
return <Page>
<AutomationEditor
{...args}
tagDB={makeTagDB(state ? [state] : [])}
automation={state}
onUpdate={s => {
window.setTimeout(() => setState(s), 3000)
}}
/>
</div>
</Page>
}
export const Loading = Template.bind({});
+166 -99
View File
@@ -1,25 +1,33 @@
import "./index.css";
import { ArrowIcon, CheckMarkIcon } from "components/Icons";
import Icon from "@mui/material/Icon";
import { CheckMarkIcon } from "components/Icons";
import { FC, useState } from "react";
import { AutomationData } from "types/automations";
import { AutoInfoBox } from "./AutoInfoBox";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import { Button } from "components/Inputs/Button";
import { useAutomatioEditorState, EditorData } from './state';
import { useAutomatioEditorState, EditorData } from "./state";
import { SafeDAGAutomationFlow } from "components/DAGFlow/safe";
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 { 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 {
automation?: AutomationData;
dims: DAGAutomationFlowDims;
onUpdate: (auto: AutomationData) => void;
tagDB: TagDB;
}
export const AutomationEditor: FC<Props> = ({
dims,
automation: propsAutos,
onUpdate: propsOnUpdate,
tagDB,
}) => {
// state
const {
@@ -32,112 +40,171 @@ export const AutomationEditor: FC<Props> = ({
save,
saveAndUpdate,
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
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
if (state.status === 'loading') {
return <div className="automation-editor loading">
Loading...
</div>
}
if (state.status === 'invalid') {
return <ValidationBox
failures={state.failures}
data={state.data}
validate={validate}
onSave={saveAndUpdate}
/>
}
return <div className="automation-editor">
<AutoInfoBox
className={closeInfo ? "hide" : "show"}
metadata={state.data.metadata}
tags={state.data.tags}
onUpdate={updateMetadata}
>
<ButtonIcon
className="automation-editor--info-box--icon"
onClick={() => setCloseInfo(!closeInfo)}
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
>{ArrowIcon}</ButtonIcon>
</AutoInfoBox>
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
<div className="automation-editor--flow-wrapper--toolbar">
<Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save}
disabled={state.status !== 'changed'}
>
Save <CheckMarkIcon color="#bf4" />
</Button>
if (state.status === "loading") {
return (
<div className="automation-editor loading">
<LinearProgress className="linear-loader" />
<Skeleton className="mock-list" variant="rectangular" />
<Skeleton className="mock-graph" variant="rectangular" />
</div>
<SafeDAGAutomationFlow
className="automation-editor--flow-wrapper--flow"
sequence={state.data.sequence}
trigger={state.data.trigger}
condition={state.data.condition}
onSequenceUpdate={updateSequence}
onTriggerUpdate={updateTrigger}
onConditionUpdate={updateCondition}
dims={dims}
);
}
if (state.status === "invalid") {
return (
<ValidationBox
failures={state.failures}
data={state.data}
validate={validate}
onSave={saveAndUpdate}
/>
</div>
</div>
}
);
}
return (
<div className="automation-editor">
{state.status === "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<{
failures: MiniFailure[]
validate: (d: any) => MiniFailure[] | null,
data: EditorData,
onSave: (d: EditorData) => void,
}> = props => {
failures: MiniFailure[];
validate: (d: any) => MiniFailure[] | null;
data: EditorData;
onSave: (d: EditorData) => void;
}> = (props) => {
const [{ failures, data }, setState] = useState({
failures: props.failures,
data: props.data,
});
const makeSave = <K extends keyof EditorData>(k: K) => (d: EditorData[K]) => {
const newData = {
...data,
[k]: d,
}
const newFails = props.validate(newData);
if (newFails) {
setState({
failures: newFails,
data: newData,
})
} else {
setState({
failures: [],
data: newData,
})
}
}
const makeSave =
<K extends keyof EditorData>(k: K) =>
(d: EditorData[K]) => {
const newData = {
...data,
[k]: d,
};
const newFails = props.validate(newData);
if (newFails) {
setState({
failures: newFails,
data: newData,
});
} else {
setState({
failures: [],
data: newData,
});
}
};
return <div className="automation-editor-failures">
<ul>
{failures.map((f, i) => <>
<li key={i}>
<b>{f.path}</b>:
<ul>
{f.message.map((m, j) => <li key={j}>
{m}
</li>)}
</ul>
</li>
</>)}
</ul>
<span>Please correct the automation file manually and then continue!</span>
<InputYaml label="Metadata" value={data.metadata} onChange={makeSave('metadata')} />
<InputYaml label="Tags" value={data.tags} onChange={makeSave('tags')} />
<InputYaml label="Trigger" value={data.trigger} onChange={makeSave('trigger')} />
<InputYaml label="Condition" value={data.condition} onChange={makeSave('condition')} />
<InputYaml label="Actions" value={data.sequence} onChange={makeSave('sequence')} />
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>Save</Button>
</div>
}
return (
<div className="automation-editor-failures">
<ul>
{failures.map((f, i) => (
<>
<li key={i}>
<b>{f.path}</b>:
<ul>
{f.message.map((m, j) => (
<li key={j}>{m}</li>
))}
</ul>
</li>
</>
))}
</ul>
<span>
Please correct the automation file manually and then continue!
</span>
<InputYaml
label="Metadata"
value={data.metadata}
onChange={makeSave("metadata")}
/>
<InputYaml label="Tags" value={data.tags} onChange={makeSave("tags")} />
<InputYaml
label="Trigger"
value={data.trigger}
onChange={makeSave("trigger")}
/>
<InputYaml
label="Condition"
value={data.condition}
onChange={makeSave("condition")}
/>
<InputYaml
label="Actions"
value={data.sequence}
onChange={makeSave("sequence")}
/>
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>
Save
</Button>
</div>
);
};
@@ -6,7 +6,7 @@ import { MiniFailure } from '../../types/validators/helper';
export type EditorData = ReturnType<typeof genEditorData>;
export type EditorState = {
status: 'unchanged' | 'changed',
status: 'unchanged' | 'changed' | 'saving',
data: EditorData
} | {
status: 'loading'
@@ -43,7 +43,8 @@ export const useAutomatioEditorState = (
}), {})
};
update({
status: "loading",
status: "saving",
data,
})
onSave(cleanData);
}
@@ -2,8 +2,9 @@ import "styles/root.css";
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react";
import { AutomationList } from ".";
import { createMockAuto } from "utils/mocks";
import { bigMockAutoList } from "utils/mocks";
import * as dgconst from 'components/DAGFlow/constants';
import { Page } from "components/Page";
export default {
title: 'App/AutomationList',
@@ -17,7 +18,7 @@ export default {
const Template: ComponentStory<typeof AutomationList> = args => {
const [autos, setAutos] = useState(args.automations)
return <div className="page">
return <Page>
<AutomationList {...args} automations={autos}
onAdd={a => {
args.onAdd(a);
@@ -39,7 +40,7 @@ const Template: ComponentStory<typeof AutomationList> = args => {
]);
}}
/>
</div>
</Page>
}
export const EmptyStart = Template.bind({})
@@ -51,457 +52,7 @@ EmptyStart.args = {
export const FewAutos = Template.bind({})
FewAutos.args = {
...FewAutos.args,
automations: [
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
createMockAuto({ "Type": "Climate" }),
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
createMockAuto({ "Room": "Office", "Type": "Lights" }),
createMockAuto({ "Room": "Office" }),
createMockAuto(),
{
"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"
}
}
],
}
],
automations: bigMockAutoList,
}
@@ -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 {
overflow: auto;
overflow-y: auto;
overflow-x: hidden;
height: 100%;
flex: 1;
user-select: none;
@@ -24,7 +25,15 @@
padding-bottom: 0.5em;
border-width: 1px;
border-bottom-style: solid;
border-color: white;
border-color: var(--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 {
@@ -40,7 +49,8 @@
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);
color: var(--secondary);
}
@@ -2,6 +2,8 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react";
import { AutomationListBox } from "./AutomationListBox";
import { createMockAuto } from "utils/mocks";
import { Page } from "components/Page";
import { CookiesProvider } from "react-cookie";
export default {
title: 'App/AutomationList/Box',
@@ -14,12 +16,14 @@ export default {
const Template: ComponentStory<typeof AutomationListBox> = args => {
const [selected, setSelected] = useState(args.selected)
return <div className="page">
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
setSelected(i)
args.onSelectAutomation(i)
}} />
</div>
return <Page>
<CookiesProvider>
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
setSelected(i)
args.onSelectAutomation(i)
}} />
</CookiesProvider>
</Page>
}
export const EmptyStart = Template.bind({})
@@ -1,88 +1,18 @@
import { groupAutomations, getTagList } from './AutomationListBox';
import { AutomationData } from 'types/automations/index';
import { getTagList } from './AutomationListBox';
import { createMockAuto } from 'utils/mocks';
test('group automations', () => {
const automations: AutomationData[] = [
{
condition: [],
metadata: {
id: '1',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Living Room',
"Type": 'Lights'
},
sequence: [],
trigger: [],
},
{
condition: [],
metadata: {
id: '2',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Living Room',
"Type": 'Climate'
},
sequence: [],
trigger: [],
},
{
condition: [],
metadata: {
id: '3',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Kitchen',
"Type": 'Climate'
},
sequence: [],
trigger: [],
},
];
expect(groupAutomations(automations, [0, 1], ['Room', "Type"])).toStrictEqual({
"Living Room": {
"Lights": [0],
"Climate": [1],
},
"Kitchen": {
"Climate": [2],
}
})
expect(groupAutomations(automations, [1, 0], ['Room', "Type"])).toStrictEqual({
"Lights": {
"Living Room": [0],
},
"Climate": {
"Living Room": [1],
"Kitchen": [2]
}
})
expect(groupAutomations(automations, [1], ['Room', "Type"])).toStrictEqual({
"Lights": [0],
"Climate": [1, 2]
})
expect(groupAutomations(automations, [0], ['Room', "Type"])).toStrictEqual({
"Living Room": [0, 1],
"Kitchen": [2]
})
expect(groupAutomations(automations, [], ['Room', "Type"])).toStrictEqual([
0, 1, 2
])
});
// const makeDummy = (id: string, tags: Record<string, string>) => ({
// condition: [],
// metadata: {
// id,
// alias: '',
// description: '',
// mode: 'single',
// },
// tags,
// sequence: [],
// trigger: [],
// })
test('getTagList', () => {
expect(getTagList([
@@ -1,211 +1,142 @@
import "./AutomationListBox.css";
import { FC, useState } from 'react';
import { AutomationData, AutomationMetadata } from "types/automations";
import { FC, useState } from "react";
import { AutomationData } from "types/automations";
import InputMultiSelect from "components/Inputs/InputMultiSelect";
import InputText from "components/Inputs/InputText";
import { Button } from "components/Inputs/Button";
import { TrashIcon } from "components/Icons";
import { makeGrouping } from "./automationGrouper";
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
import { useCookies } from "react-cookie";
export type Props = {
automations: AutomationData[];
selected: number;
onSelectAutomation: (i: number) => void;
onRemove: (i: number) => void;
onAdd: () => void;
}
automations: AutomationData[];
selected: number;
onSelectAutomation: (i: number) => void;
onRemove: (i: number) => void;
onAdd: () => void;
};
const useAutomationListBoxState = () => {
const [
cookies,
setCookies,
// eslint-disable-next-line
_,
] = useCookies(["albSearchText", "albSelected"]);
let initialSelected = [];
try {
initialSelected = JSON.parse(cookies.albSelected);
if (!Array.isArray(initialSelected)) {
initialSelected = [initialSelected];
}
initialSelected = initialSelected.map(Number);
// eslint-disable-next-line
} catch (_) {}
const [searchText, setSearchText] = useState(cookies.albSearchText ?? "");
const [selectedTagIdx, setSelectedTagIdx] =
useState<number[]>(initialSelected);
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> = ({
automations,
selected,
onSelectAutomation,
onAdd,
onRemove,
automations,
selected,
onSelectAutomation,
onAdd,
onRemove,
}) => {
const tags = getTagList(automations);
const { searchText, setSearchText, selectedTagIdx, setSelectedTagIdx } =
useAutomationListBoxState();
const filteredAutomations = filterAutomations(
automations,
searchText.toLowerCase()
);
const grouping = makeGrouping(
filteredAutomations.map(([a, _]) => a),
selectedTagIdx.map((i) => tags[i]),
selected
);
const tags = getTagList(automations);
const [searchText, setSearchText] = useState('');
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]);
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags);
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selectedTagIdx, tags);
return <div className="automation-list-box">
<div className="automation-list-box--nav">
<InputText
label="Search"
value={searchText}
onChange={setSearchText}
/>
<InputMultiSelect
label="Tags"
selected={selectedTagIdx}
onChange={setSelectedTagIdx}
options={tags}
max={3}
/>
</div>
<div className="automation-list-box--body">
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove, selected)}
</div>
<div className="automation-list-box--bottom">
<Button onClick={onAdd}>Add</Button>
<span>Showing Automations: {filteredAutomations.length} out of {automations.length}</span>
</div>
return (
<div className="automation-list-box">
<div className="automation-list-box--nav">
<InputText label="Search" value={searchText} onChange={setSearchText} />
<InputMultiSelect
label="Tags"
selected={selectedTagIdx}
onChange={setSelectedTagIdx}
options={tags}
max={3}
/>
</div>
<div className="automation-list-box--body">
<AutomationListBoxGroup
events={{
onSelectAutomation,
onRemove,
}}
autos={filteredAutomations}
grouping={grouping}
selectedAutomationIdx={selected}
/>
</div>
<div className="automation-list-box--bottom">
<Button onClick={onAdd}>Add</Button>
<span>
Showing Automations: {filteredAutomations.length} out of{" "}
{automations.length}
</span>
</div>
</div>
}
);
};
export const getTagList = (autos: AutomationData[]): string[] => Object.keys(autos
.map(a => Object.keys(a.tags))
.reduce((all: any, keys) => {
export const getTagList = (autos: AutomationData[]): string[] =>
Object.keys(
autos
.map((a) => Object.keys(a.tags))
.reduce((all: any, keys) => {
for (const k of keys) {
all[k] = 1
all[k] = 1;
}
return all;
}, {}))
}, {})
);
const filterAutomations = (autos: AutomationData[], searchText: string, selected: number[], tags: string[]): Array<[AutomationData, number]> => autos.map<[AutomationData, number]>((a, i) => [a, i]).filter(([a, i]) => {
if (!a.metadata) {
return true
}
if (searchText.length > 0) {
const filterAutomations = (
autos: AutomationData[],
searchText: string
): Array<[AutomationData, number]> =>
autos
.map<[AutomationData, number]>((a, i) => [a, i])
.filter(([a, i]) => {
if (!a.metadata) {
return true;
}
if (searchText.length > 0) {
if (
!(
(a.metadata.description ?? "").toLocaleLowerCase().includes(searchText) ||
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
)
!(
(a.metadata.description ?? "")
.toLocaleLowerCase()
.includes(searchText) ||
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
)
) {
return false
return false;
}
}
if (selected.length > 0) {
for (const i of selected) {
if (!a.tags[tags[i]]) {
return false
}
}
}
return true
})
export const groupAutomations = (
autos: AutomationData[],
selected: number[],
tags: string[],
) => {
if (selected.length === 0) {
return autos.map((_, i) => i);
}
const out: any = {};
for (let ai = 0; ai < autos.length; ai++) {
const a = autos[ai];
let where = out;
let tag: string = '';
let lastKey: string | null = null;
for (const i of selected) {
tag = tags[i];
if (lastKey !== null) {
where = where[lastKey]
}
if (!where[a.tags[tag]]) {
where[a.tags[tag]] = {}
}
lastKey = a.tags[tag]
}
if (lastKey !== null) {
if (!where[lastKey] || !Array.isArray(where[lastKey])) {
where[lastKey] = []
}
where[lastKey].push(ai)
}
}
return out;
}
const convertGroupsToItems = (
groups: any,
autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void,
selected: number,
) => {
if (Array.isArray(groups)) {
return groups.map(i => {
const [auto, autoIndex] = autos[i];
let title = "BadAuto<<Missing Metadata>>"
if (auto.metadata) {
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`
}
return <div
key={i}
className={["automation-list-box--body--item", selected === autoIndex ? 'selected' : ''].join(' ')}
title={title}
onClick={() => onSelectAutomation(autoIndex)}
>
<MetadataBox metadata={auto.metadata} tags={auto.tags} />
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
</div>
})
} else {
return Object.keys(groups).map(groupName => {
return <AutomationListBoxGroup
key={groupName}
groupName={groupName}
groups={groups[groupName]}
autos={autos}
onSelectAutomation={onSelectAutomation}
onRemove={onRemove}
selected={selected}
/>
})
}
}
export const MetadataBox: FC<{
metadata: AutomationMetadata,
tags: Record<string, string>,
}> = (auto) => {
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
if (auto.metadata) {
title = <>
<b>{String(auto.metadata.alias ?? "").slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
<span>{String(auto.metadata.description ?? "").slice(0, 25)}</span>
</>
}
return <div
className="automation-list-box--body--item--title"
>
{title}
<div
className="automation-list-box--body--item--tags"
>
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
<b>{tagName}:</b> {auto.tags[tagName]}
</span>)}
</div>
</div>
}
const AutomationListBoxGroup: FC<{
groupName: string,
groups: any,
autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void;
selected: number,
}> = ({
groupName,
groups,
autos,
onSelectAutomation,
onRemove,
selected,
}) => {
const [open, setOpen] = useState(false);
return <div className="automation-list-box--body--group">
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove, selected)}
</div>
}
}
return true;
});
@@ -0,0 +1,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 { useMockApiService } from "apiService";
import { DEFAULT_DIMS } from 'components/DAGFlow/constants';
import { Page } from "components/Page";
export default {
title: 'App/AutomationList/Connected',
@@ -17,12 +18,12 @@ export default {
const Template: ComponentStory<any> = args => {
const api = useMockApiService(args.initialAutomations);
return <div className="page">
return <Page>
<ConnectedAutomationList
{...args}
api={api}
/>
</div>
</Page>
}
export const EmptyStart = Template.bind({})
@@ -44,3 +45,20 @@ FewAutos.args = {
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;
}
/* Loading state */
.automation-list--root.loading {
width: 100%;
height: 100%;
flex-direction: column;
}
.automation-list--root.loading>* {
width: 100%;
}
.automation-list--root.loading .automation-list--circle-loader {
width: 100%;
height: 100%;
justify-content: center;
align-items: center;
display: flex;
}
/* list children: on hide */
.automation-list--list.hide>.automation-list-box {
width: 0;
@@ -31,6 +50,7 @@
.automation-list--list.hide>.automation-list--list-hide {
transform: rotate(180deg);
left: 0;
}
/* list children: normal */
@@ -39,8 +59,10 @@
border-width: 1px;
}
.automation-list--list-hide {
.automation-list--list .automation-list--list-hide {
position: absolute;
bottom: 0.5em;
right: 0.5em;
bottom: 0em;
left: 0.5em;
max-width: 1.5em;
max-height: 1.5em;
}
@@ -14,7 +14,7 @@
.automation-list--root.mobile .automation-list--list-hide {
transform: rotate(90deg);
left: 1.25em;
left: 0.25em;
}
.automation-list--root.mobile .automation-editor--info-box {
@@ -33,7 +33,7 @@
}
.automation-list--root.mobile .automation-editor--info-box--icon {
left: 1.25em;
left: 0.5em;
bottom: 0em;
background-color: var(--primary);
transform: rotate(90deg);
@@ -50,8 +50,8 @@
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
transform: rotate(270deg);
position: fixed;
top: 0.75em;
z-index: 20;
top: 0;
z-index: 5;
}
/* info box hide */
@@ -64,7 +64,15 @@
.automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon {
transform: rotate(270deg);
position: fixed;
top: 0.75em;
background-color: var(--green-opaque);
z-index: 30;
top: 0em;
left: 0.25em;
z-index: 10;
}
.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.mobile.css";
import { AutomationEditor } from "components/AutomationEditor";
import { FC, useState } from "react";
import { FC, ReactNode, useState } from "react";
import { AutomationData } from "types/automations";
import { defaultAutomation } from 'utils/defaults';
import { ArrowIcon } from "components/Icons";
import { defaultAutomation } from "utils/defaults";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import { ApiService } from "apiService/core";
import { AutomationListBox } from "./AutomationListBox";
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
import useWindowSize from "utils/useWindowSize";
import { makeTagDB } from "./TagDB";
import LinearProgress from "@mui/material/LinearProgress";
import CircularProgress from "@mui/material/CircularProgress";
import { useCookies } from "react-cookie";
import { useHA } from "haService";
import { ArrowBack } from "@mui/icons-material";
interface AutomationListParams {
automations: AutomationData[];
@@ -18,8 +22,35 @@ interface AutomationListParams {
onAdd: (auto: AutomationData) => void;
onRemove: (i: number) => void;
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> = ({
automations,
onUpdate,
@@ -29,46 +60,65 @@ export const AutomationList: FC<AutomationListParams> = ({
children,
}) => {
// state
const [hideList, setHideList] = useState(false);
const [current, setCurrent] = useState(0);
const { hideList, setHideList, current, setCurrent } =
useAutomationListState();
const { isMobile } = useWindowSize();
// alias
const currentAuto = automations.length > 0 ? automations[current] : null;
const tagDB = makeTagDB(automations);
// render
return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}>
<div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}>
<AutomationListBox
automations={automations}
onAdd={() => {
onAdd(defaultAutomation(String(Date.now())));
setCurrent(automations.length)
}}
onSelectAutomation={i => {
setCurrent(i);
if (isMobile) {
setHideList(true)
}
}}
selected={current}
onRemove={onRemove}
/>
<ButtonIcon
onClick={() => setHideList(!hideList)}
className="automation-list--list-hide"
return (
<div
className={["automation-list--root", isMobile ? "mobile" : ""].join(" ")}
>
<div
className={["automation-list--list", hideList ? "hide" : "show"].join(
" "
)}
>
{ArrowIcon}
</ButtonIcon>
<AutomationListBox
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 className="automation-list--viewer">
{currentAuto ? <AutomationEditor
automation={currentAuto}
onUpdate={a => onUpdate(current, a)}
dims={dims}
/> : <></>}
</div>
{children}
</div>
}
);
};
interface ConnectedAutomationListParams {
dims: DAGAutomationFlowDims;
@@ -76,25 +126,44 @@ interface ConnectedAutomationListParams {
}
export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
api: {
state: {
automations,
},
removeAutomation,
updateAutomation,
state: { automations },
...methods
},
dims
dims,
}) => {
const { reloadAutomations } = useHA();
const removeAutomation = async (args: any) => {
const resp = await methods.removeAutomation(args);
await reloadAutomations();
return resp;
};
const updateAutomation = async (args: any) => {
const resp = await methods.updateAutomation(args);
await reloadAutomations();
return resp;
};
if (!automations.ready) {
return <span>Loading...</span>
return (
<div className="automation-list--root loading">
<LinearProgress />
<div className="automation-list--circle-loader">
<CircularProgress />
</div>
</div>
);
}
if (!automations.ok) {
return <span>Error {automations.error}</span>
return <span>Error {automations.error}</span>;
}
return <AutomationList
dims={dims}
automations={automations.data.data}
onAdd={auto => updateAutomation({ auto, index: automations.data.totalItems + 1 })}
onRemove={index => removeAutomation({ index })}
onUpdate={(index, auto) => updateAutomation({ index, auto })}
/>
}
return (
<AutomationList
dims={dims}
automations={automations.data.data}
onAdd={(auto) =>
updateAutomation({ auto, index: automations.data.totalItems + 1 })
}
onRemove={(index) => removeAutomation({ index })}
onUpdate={(index, auto) => updateAutomation({ index, auto })}
/>
);
};
@@ -2,6 +2,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react";
import { ConditionEditor } from ".";
import { AutomationCondition } from 'types/automations/conditions';
import { Page } from "components/Page";
export default {
title: 'ConditionEditor',
@@ -40,12 +41,12 @@ export const Basic: ComponentStory<typeof ConditionEditor> = args => {
]
})
return (
<div className="page">
<Page>
<ConditionEditor
onUpdate={setState}
onDelete={() => { }}
condition={state}
/>
</div>
</Page>
)
}
@@ -1,5 +1,5 @@
import { Classes } from "jss";
import { FC, useState, useEffect } from 'react';
import { FC, useState, useEffect } from "react";
import { getConditionDefaultValues } from "utils/defaults";
import { AutomationCondition } from "types/automations/conditions";
import { CheckMarkIcon, PencilIcon } from "components/Icons";
@@ -8,120 +8,153 @@ import InputYaml from "components/Inputs/InputYaml";
import { getEditor } from "./editorRender";
import { useStyles } from "./style";
import { getViewer } from "./viewRender";
import useWindowSize from "utils/useWindowSize";
import { useHA } from "haService";
import { getSubTypeList } from "utils/automations";
export const ConditionNode: FC<{
condition: AutomationCondition;
displayMode: boolean;
showDelete?: boolean;
onDelete?: (which: 'root' | number) => void;
onDelete?: (which: "root" | number) => void;
onUpdate?: (data: AutomationCondition) => void;
children?: (props: {
classes: Classes<string>
}) => JSX.Element,
children?: (props: { classes: Classes<string> }) => JSX.Element;
}> = ({
condition,
showDelete = false,
displayMode = true,
onDelete = () => { },
onUpdate = () => { },
children = () => { },
onDelete = () => {},
onUpdate = () => {},
children = () => {},
}) => {
// state
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
const [yamlMode, setYamlMode] = useState(false);
// alias
const effectiveDM = internalDisplayMode || yamlMode;
// effect
useEffect(() => {
setInternalDisplayMode(displayMode);
}, [displayMode])
useEffect(() => {
if (yamlMode) {
setInternalDisplayMode(true);
}
}, [yamlMode])
// alias
const onAddChild = () => {
if (
(condition.condition === 'and') ||
(condition.condition === 'or') ||
(condition.condition === 'not')
) {
onUpdate({
...condition,
conditions: condition.conditions.concat({
condition: 'or',
conditions: []
})
})
}
// state
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
const [yamlMode, setYamlMode] = useState(false);
const { isMobile } = useWindowSize();
const ha = useHA();
// alias
const effectiveDM = internalDisplayMode || yamlMode;
// effect
useEffect(() => {
setInternalDisplayMode(displayMode);
}, [displayMode]);
useEffect(() => {
if (yamlMode) {
setInternalDisplayMode(true);
}
// children
let childrenConditions: JSX.Element;
if (effectiveDM) {
const Viewer = getViewer(condition);
childrenConditions = <Viewer condition={condition} onChange={onUpdate} />
} else {
const Editor = getEditor(condition);
childrenConditions = <Editor condition={condition} onChange={onUpdate} />
}, [yamlMode]);
// alias
const onAddChild = () => {
if (
condition.condition === "and" ||
condition.condition === "or" ||
condition.condition === "not"
) {
onUpdate({
...condition,
conditions: condition.conditions.concat({
condition: "or",
conditions: [],
}),
});
}
// styles
let hasChildren = false;
if (condition.condition === "not") {
hasChildren = true
} else if (condition.condition === 'and') {
hasChildren = true
} else if (condition.condition === 'or') {
hasChildren = true
}
const { classes } = useStyles({ hasChildren });
// components
const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) =>
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
return <div className={classes.root}>
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
<div className={classes.title}>
<InputList
label=""
className={classes.titleText}
current={condition.condition}
options={[
'or', 'not', 'and',
'template',
'numeric_state',
'state',
'time',
'trigger',
'zone',
]}
onChange={(n: any) => onUpdate({
...getConditionDefaultValues(n),
...condition,
condition: n,
} as any)}
/>
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
{yamlMode ? 'visual' : 'yaml'}
</button>}
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
</button>}
</div>
<div className={classes.children}>
{yamlMode && <InputYaml
label=""
value={condition}
onChange={update => onUpdate(update as any)}
/>}
{!yamlMode && childrenConditions}
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
</div>}
</div>
{children({ classes })}
</div>
};
// children
let childrenConditions: JSX.Element;
if (effectiveDM) {
const Viewer = getViewer(condition);
childrenConditions = (
<Viewer condition={condition} onChange={onUpdate} namer={ha.namer} />
);
} else {
const Editor = getEditor(condition);
childrenConditions = (
<Editor condition={condition} onChange={onUpdate} ha={ha} />
);
}
// 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 { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions';
import { getDescriptionFromAutomationNode } from "utils/formatting";
import {
AutomationCondition,
DeviceCondition,
LogicCondition,
NumericCondition,
StateCondition,
TemplateCondition,
TimeCondition,
TriggerCondition,
ZoneCondition,
} from "types/automations/conditions";
import InputNumber from "components/Inputs/InputNumber";
import InputText from "components/Inputs/InputText";
import InputTextArea from "components/Inputs/InputTextArea";
import { InputEntity } from "components/Inputs/InputTextBubble";
import { InputEntity } from "components/Inputs/InputEntities";
import { ConditionNode } from "./ConditionNode";
import { genUpdateMethods } from "./nestedUpdater";
import InputTime from "components/Inputs/InputTime";
interface Editor<C extends AutomationCondition> extends FC<{
condition: C,
onChange: (condition: C) => void;
}> { }
import { InputTime } from "components/Inputs/InputTime";
import InputYaml from "components/Inputs/InputYaml";
import { HAService } from "haService";
import { DeviceEditor } from "components/DeviceEditor";
interface Editor<C extends AutomationCondition>
extends FC<{
condition: C;
onChange: (condition: C) => void;
ha: HAService;
}> {}
export const getEditor = (condition: AutomationCondition): Editor<any> => {
switch (condition.condition) {
case 'template':
case "template":
return TemplateEditor;
case 'and':
case "and":
return LogicViewer;
case 'or':
case "or":
return LogicViewer;
case 'not':
case "not":
return LogicViewer;
case 'numeric_state':
case "device":
return DeviceConditionEditor;
case "numeric_state":
return NumericStateEditor;
case 'state':
case "state":
return StateEditor;
case 'time':
case "time":
return TimeEditor;
case 'trigger':
case "trigger":
return TriggerEditor;
case 'zone':
case "zone":
return ZoneEditor;
default:
return () => <div>Not Ready</div>
return () => <div>Not Ready</div>;
}
}
};
export const TemplateEditor: Editor<TemplateCondition> = ({
onChange,
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
alias
})} />
<InputTextArea label="Template" value={condition.value_template} onChange={value_template => onChange({
...condition,
value_template
})} resizable />
</div>
}
return (
<>
<InputYaml
label="Template"
value={condition.value_template}
onChange={(value_template) =>
onChange({
...condition,
value_template,
})
}
/>
</>
);
};
export const DeviceConditionEditor: Editor<DeviceCondition> = ({
onChange,
condition,
ha: {
deviceExtras: { useDeviceConditionCapalities, useDeviceConditions },
},
}) => {
return (
<DeviceEditor
type="condition"
state={condition}
setState={(data) =>
onChange({
condition: "device",
...data,
} as any)
}
options={useDeviceConditions(
condition.device_id
? {
deviceId: condition.device_id,
}
: undefined
)}
caps={useDeviceConditionCapalities(condition as any)}
/>
);
};
export const NumericStateEditor: Editor<NumericCondition> = ({
onChange,
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
alias
})} />
<InputEntity
value={condition.entity_id}
onChange={entity_id => onChange({
...condition,
entity_id
})}
/>
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
...condition,
attribute
})} />
<InputNumber
label="Above"
value={condition.above ? Number(condition.above) : undefined}
onChange={above => onChange({
...condition,
above: above ? String(above) : undefined,
})}
/>
<InputNumber
label="Below"
value={condition.below ? Number(condition.below) : undefined}
onChange={below => onChange({
...condition,
below: below ? String(below) : undefined,
})}
/>
<InputTextArea label="Template" value={condition.value_template ?? ""} onChange={value_template => onChange({
...condition,
value_template
})} resizable />
</div>
}
return (
<>
<InputEntity
value={condition.entity_id}
multiple
onChange={(entity_id) =>
onChange({
...condition,
entity_id,
})
}
/>
<InputText
label="Attribute"
value={condition.attribute ?? ""}
onChange={(attribute) =>
onChange({
...condition,
attribute,
})
}
/>
<InputNumber
label="Above"
value={condition.above ? Number(condition.above) : undefined}
onChange={(above) =>
onChange({
...condition,
above: above ? String(above) : undefined,
})
}
/>
<InputNumber
label="Below"
value={condition.below ? Number(condition.below) : undefined}
onChange={(below) =>
onChange({
...condition,
below: below ? String(below) : undefined,
})
}
/>
<InputYaml
label="Template"
value={condition.value_template ?? ""}
onChange={(value_template) =>
onChange({
...condition,
value_template,
})
}
/>
</>
);
};
export const LogicViewer: Editor<LogicCondition> = ({
condition,
onChange,
}) => {
return <>
{condition.conditions.map((c, i) => {
return <ConditionNode
key={i}
condition={c}
displayMode={false}
{...genUpdateMethods(condition, onChange)(i)}
showDelete
/>
})}
</>
}
return (
<>
{condition.conditions.map((c, i) => {
return (
<ConditionNode
key={i}
condition={c}
displayMode={false}
{...genUpdateMethods(condition, onChange)(i)}
showDelete
/>
);
})}
</>
);
};
export const StateEditor: Editor<StateCondition> = ({
onChange,
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
alias
})} />
<InputEntity
value={condition.entity_id}
onChange={entity_id => onChange({
...condition,
entity_id
})}
/>
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
...condition,
attribute
})} />
<InputText
label="State"
value={String(condition.state)}
onChange={state => onChange({
...condition,
state,
})}
/>
<InputTime
label="For"
value={condition.for}
onChange={_for => onChange({
...condition,
for: _for,
})}
/>
</div>
}
return (
<>
<InputEntity
value={condition.entity_id}
multiple
onChange={(entity_id) =>
onChange({
...condition,
entity_id,
})
}
/>
<InputText
label="Attribute"
value={condition.attribute ?? ""}
onChange={(attribute) =>
onChange({
...condition,
attribute,
})
}
/>
<InputText
label="State"
value={String(condition.state)}
onChange={(state) =>
onChange({
...condition,
state,
})
}
/>
<InputTime
label="For"
value={condition.for}
onChange={(_for) =>
onChange({
...condition,
for: _for,
})
}
/>
</>
);
};
export const TimeEditor: Editor<TimeCondition> = ({
onChange,
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
alias
})} />
<InputTime
label="After"
value={condition.after}
onChange={after => onChange({
...condition,
after,
})}
/>
<InputTime
label="Before"
value={condition.before}
onChange={before => onChange({
...condition,
before,
})}
/>
<b>Weekday not support for no, use yaml for now</b> {condition.weekday}
</div>
}
export const TimeEditor: Editor<TimeCondition> = ({ onChange, condition }) => {
return (
<>
<InputTime
label="After"
value={condition.after}
onChange={(after) =>
onChange({
...condition,
after,
})
}
/>
<InputTime
label="Before"
value={condition.before}
onChange={(before) =>
onChange({
...condition,
before,
})
}
/>
<b>Weekday not support for no, use yaml for now</b> {condition.weekday}
</>
);
};
export const TriggerEditor: Editor<TriggerCondition> = ({
onChange,
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
alias
})} />
<InputText label="Trigger ID" value={condition.id} onChange={id => onChange({
...condition,
id
})} />
</div>
}
return (
<>
<InputText
label="Trigger ID"
value={condition.id}
onChange={(id) =>
onChange({
...condition,
id,
})
}
/>
</>
);
};
export const ZoneEditor: Editor<ZoneCondition> = ({
onChange,
condition,
}) => {
return <div>
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
alias
})} />
<InputText label="Zone" value={condition.zone} onChange={zone => onChange({
...condition,
zone
})} />
<InputEntity
value={condition.entity_id}
onChange={entity_id => onChange({
...condition,
entity_id
})}
/>
<InputText
label="State"
value={String(condition.state)}
onChange={state => onChange({
...condition,
state,
})}
/>
</div>
}
export const ZoneEditor: Editor<ZoneCondition> = ({ onChange, condition }) => {
return (
<>
<InputEntity
label="Zone"
value={condition.zone}
multiple={false}
onChange={(zone) =>
onChange({
...condition,
zone: zone ?? "",
})
}
restrictToDomain={["zone"]}
/>
<InputEntity
label="Entity with Location"
value={condition.entity_id}
multiple
onChange={(entity_id) =>
onChange({
...condition,
entity_id,
})
}
restrictToDomain={["person", "device_tracker"]}
/>
<InputText
label="State"
value={String(condition.state)}
onChange={(state) =>
onChange({
...condition,
state,
})
}
/>
</>
);
};
@@ -1,4 +1,5 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react";
import { AutomationCondition } from "types/automations/conditions";
@@ -14,14 +15,14 @@ export default {
const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }) => {
const [data, setData] = useState(condition);
return <div className="page">
return <Page>
<ConditionEditor {...args}
condition={data}
onUpdate={data => {
setData(data)
}}
/>
</div>
</Page>
}
export const TemplateViewer = Template.bind({})
+11 -6
View File
@@ -2,7 +2,8 @@ import { Styles } from "jss";
import { createAppUseStyles } from "styles/theme";
export const useStyles = createAppUseStyles<{
hasChildren: boolean
hasChildren: boolean,
isMobile: boolean,
}>(theme => {
const deleteBtn: Styles = {
borderRadius: '10px',
@@ -20,12 +21,12 @@ export const useStyles = createAppUseStyles<{
}
}
return {
root: ({ hasChildren }) => ({
root: ({ hasChildren, isMobile }) => ({
background: theme.primary,
padding: 0,
position: 'relative',
display: 'flex',
flexDirection: hasChildren ? 'column' : 'row',
flexDirection: isMobile ? 'column' : hasChildren ? 'column' : 'row',
}),
title: ({ hasChildren }) => ({
display: 'flex',
@@ -42,8 +43,8 @@ export const useStyles = createAppUseStyles<{
borderTopRightRadius: 0,
borderBottomRightRadius: 0,
borderBottomLeftRadius: hasChildren ? 0 : 10,
padding: 10,
minWidth: 30,
minWidth: '10em',
maxWidth: '30em',
textOverflow: 'ellipsis',
textAlign: 'center',
cursor: 'pointer',
@@ -86,6 +87,9 @@ export const useStyles = createAppUseStyles<{
}),
icon: {},
deleteBtn,
conditionWrap: {
overflow: 'auto',
},
children: ({ hasChildren }) => ({
flex: 1,
paddingLeft: hasChildren ? 50 : 10,
@@ -96,7 +100,8 @@ export const useStyles = createAppUseStyles<{
border: `1px solid ${theme.secondaryAccent}`,
borderBottomRightRadius: hasChildren ? 10 : 0,
borderBottomLeftRadius: hasChildren ? 10 : 0,
minHeight: hasChildren ? undefined : '100%'
minHeight: hasChildren ? undefined : '100%',
overflow: 'scroll'
}),
addBtnContainer: {
display: 'flex',
@@ -1,43 +1,53 @@
import { FC } from "react";
import { AutomationCondition, LogicCondition } from "types/automations/conditions";
import { getDescriptionFromAutomationNode } from "utils/formatting";
import {
AutomationCondition,
LogicCondition,
} from "types/automations/conditions";
import { getDescriptionFromAutomationNode, Namer } from "utils/formatting";
import { ConditionNode } from "./ConditionNode";
import { genUpdateMethods } from "./nestedUpdater";
interface Viewer<C extends AutomationCondition> extends FC<{
condition: C;
onChange: (condition: C) => void;
}> { }
interface Viewer<C extends AutomationCondition>
extends FC<{
condition: C;
namer: Namer;
onChange: (condition: C) => void;
}> {}
export const getViewer = (condition: AutomationCondition): Viewer<any> => {
if (
(condition.condition === 'and') ||
(condition.condition === 'or') ||
(condition.condition === 'not')
condition.condition === "and" ||
condition.condition === "or" ||
condition.condition === "not"
) {
return LogicViewer
return LogicViewer;
}
return GenericViewer
}
return GenericViewer;
};
export const GenericViewer: Viewer<AutomationCondition> = ({
condition,
namer,
}) => {
return <>
{getDescriptionFromAutomationNode(condition)}
</>
}
return <>{getDescriptionFromAutomationNode(condition, namer, true)}</>;
};
export const LogicViewer: Viewer<LogicCondition> = ({
condition,
onChange,
}) => {
return <>
{condition.conditions.map((c, i) => {
return <ConditionNode key={i} condition={c} displayMode
{...genUpdateMethods(condition, onChange)(i)}
/>
})}
</>
}
return (
<>
{condition.conditions.map((c, i) => {
return (
<ConditionNode
key={i}
condition={c}
displayMode
{...genUpdateMethods(condition, onChange)(i)}
/>
);
})}
</>
);
};
+4 -2
View File
@@ -12,6 +12,7 @@ export interface DAGCircleProps {
backgroundColor?: string;
disableSource?: boolean;
disableTarget?: boolean;
flipped: boolean;
}
export const makeFlowCircle = (
circleId: string,
@@ -32,6 +33,7 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
backgroundColor,
disableSource = false,
disableTarget = false,
flipped,
}
}) => {
const { classes } = useCircleStyles({
@@ -41,8 +43,8 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
backgroundColor,
});
return <>
{!disableSource && <Handle type="source" position={Position.Right} />}
{!disableTarget && <Handle type="target" position={Position.Left} />}
{!disableSource && <Handle type="source" position={flipped ? Position.Bottom : Position.Right} />}
{!disableTarget && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<div className={classes.root}>
{
onAdd ?
@@ -7,6 +7,7 @@ import * as dgconst from "components/DAGFlow/constants";
import ReactFlow, { Controls } from 'react-flow-renderer';
import { DAGErrorNode } from "./DAGErrorNode";
import { convertToFlowNode } from "./helpers";
import { Page } from "components/Page";
export default {
@@ -29,7 +30,7 @@ export const Examples: ComponentStory<typeof DAGErrorNode> = args => {
"y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i
}
}));
return <div className="page">
return <Page>
<ReactFlow
defaultNodes={nodes}
nodeTypes={{
@@ -42,5 +43,5 @@ export const Examples: ComponentStory<typeof DAGErrorNode> = args => {
>
<Controls />
</ReactFlow>
</div>
</Page>
}
@@ -3,21 +3,21 @@ import { Handle, Position } from 'react-flow-renderer';
import { FC } from 'react';
import { InfoIcon, PencilIcon } from 'components/Icons';
export interface DAGErrorNodeProps {
height: number;
width: number;
flipped: boolean;
hasInput?: boolean;
error?: any,
onEdit: () => void;
}
export const DAGErrorNode: FC<DAGErrorNodeProps> = ({
height, width, hasInput, error, onEdit
height, width, hasInput, error, onEdit, flipped
}) => {
// render
return <>
{hasInput && <Handle type="target" position={Position.Left} />}
<Handle type="source" position={Position.Right} />
{hasInput && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<Handle type="source" position={flipped ? Position.Bottom : Position.Right} />
<div className={["dagnode-error"].join(' ')} style={{
height,
width,
@@ -8,6 +8,7 @@ import * as dgconst from "components/DAGFlow/constants";
import ReactFlow, { Controls } from 'react-flow-renderer';
import { DAGNode } from "./DAGNode";
import { convertToFlowNode } from "./helpers";
import { Page } from "components/Page";
export default {
@@ -30,7 +31,7 @@ export const Colors: ComponentStory<typeof DAGNode> = args => {
"type": "mynode",
"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
defaultNodes={nodes}
nodeTypes={{
@@ -43,5 +44,5 @@ export const Colors: ComponentStory<typeof DAGNode> = args => {
>
<Controls />
</ReactFlow>
</div>
</Page>
}
+4 -2
View File
@@ -14,6 +14,7 @@ export interface DAGNodeProps {
label: string;
hasInput?: boolean;
accentBackground?: boolean;
flipped: boolean;
}
export const DAGNode: FC<DAGNodeProps> = ({
label,
@@ -24,6 +25,7 @@ export const DAGNode: FC<DAGNodeProps> = ({
color,
hasInput = false,
accentBackground = false,
flipped,
}) => {
const { classes, theme } = useNodeStyles({
color,
@@ -32,8 +34,8 @@ export const DAGNode: FC<DAGNodeProps> = ({
accentBackground,
});
return <>
{hasInput && <Handle type="target" position={Position.Left} />}
<Handle type="source" position={Position.Right} />
{hasInput && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<Handle type="source" position={flipped ? Position.Bottom : Position.Right} />
<div className={classes.root}>
<div className={classes.inner}>
<div className={classes.leftEdge} onClick={onXClick}>
@@ -19,4 +19,5 @@ export const DEFAULT_DIMS = {
x: PADDING,
y: PADDING,
},
flipped: false,
} as DAGAutomationFlowDims
+9 -10
View File
@@ -1,19 +1,22 @@
import { makeFlowCircle } from "./DAGCircle"
import { DAGCircleProps, makeFlowCircle } from "./DAGCircle"
import { DAGAutomationFlowDims } from "./types"
import { XYPosition } from 'react-flow-renderer';
import { Node, XYPosition } from 'react-flow-renderer';
import { DAGNodeProps } from "./DAGNode";
export const makeAddButton = (
id: string,
position: XYPosition,
{
circleSize,
flipped,
}: DAGAutomationFlowDims,
onAdd: () => void,
disableTarget: boolean = true,
) => makeFlowCircle(
): Node<DAGCircleProps> => makeFlowCircle(
id,
position,
{
flipped,
size: circleSize,
onAdd,
disableSource: true,
@@ -25,22 +28,17 @@ export const makeConditionPoint = (
id: string,
position: XYPosition,
{
padding,
conditionWidth,
conditionHeight,
nodeWidth,
nodeHeight,
circleSize,
distanceFactor,
flipped,
}: DAGAutomationFlowDims,
totalConditions: number,
onEditClick: () => void,
) => ({
): Node<DAGNodeProps> => ({
id,
type: 'dagnode',
position,
data: {
size: circleSize,
color: 'lblue',
accentBackground: true,
label: `${totalConditions} Condition${totalConditions !== 1 ? 's' : ''}`,
@@ -48,5 +46,6 @@ export const makeConditionPoint = (
width: conditionWidth,
hasInput: true,
onEditClick,
flipped,
}
})
@@ -5,6 +5,7 @@ import { ComponentMeta, ComponentStory } from '@storybook/react';
import { DAGAutomationFlow } from '.';
import { useState } from 'react';
import * as dgconst from "components/DAGFlow/constants";
import { Page } from "components/Page";
export default {
@@ -22,7 +23,7 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
sequence: args.sequence,
condition: args.condition,
})
return <div className="page">
return <Page>
<DAGAutomationFlow
{...args}
{...state}
@@ -32,7 +33,7 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
onSequenceUpdate={sequence => setState({ ...state, sequence })}
onConditionUpdate={condition => setState({ ...state, condition })}
/>
</div>
</Page>
}
export const Simple = Template.bind({})
@@ -91,7 +92,10 @@ Complex.args = {
{
"platform": "homeassistant",
"event": "start",
}
},
{
"bad": "node"
} as any
],
sequence: [
{
@@ -119,6 +123,9 @@ Complex.args = {
"media_content_type": "SPOTIFY"
}
},
{
"alias": "Bad Node",
},
{
"choose": [
{
@@ -230,4 +237,27 @@ Errors.args = {
"choose": {}
} as any
]
}
export const ComplexFlipped = Complex.bind({})
ComplexFlipped.args = {
...Complex.args,
dims: {
...dgconst.DEFAULT_DIMS,
...Complex.args.dims,
flipped: true,
}
}
export const SimpleFlipped = Simple.bind({})
SimpleFlipped.args = {
...Simple.args,
dims: {
...dgconst.DEFAULT_DIMS,
...Complex.args.dims,
flipped: true,
}
}
+162 -119
View File
@@ -1,12 +1,17 @@
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 { AutomationTrigger } from 'types/automations/triggers';
import { AutomationTrigger } from "types/automations/triggers";
import { triggerToFlow } from "./triggerConvertor";
import { DAGNode } from "./DAGNode";
import { DAGAutomationFlowDims, FlowData, ModalState, UpdateModalState } from './types';
import { DAGCircle } from './DAGCircle';
import {
DAGAutomationFlowDims,
FlowData,
ModalState,
UpdateModalState,
} from "./types";
import { DAGCircle } from "./DAGCircle";
import { sequenceToFlow } from "./sequenceConvertor";
import { makeSequenceUpdater } from "./updater";
import { NodeEditor } from "components/NodeEditor";
@@ -16,132 +21,170 @@ import { AutomationCondition } from "types/automations/conditions";
import { makeConditionPoint } from "./flowDataMods";
import { convertToFlowNode } from "./helpers";
import { DAGErrorNode } from "./DAGErrorNode";
import { useHA } from "haService";
const nodeTypes = {
'dagnode': convertToFlowNode(DAGNode),
'errornode': convertToFlowNode(DAGErrorNode),
'dagcircle': DAGCircle,
}
dagnode: convertToFlowNode(DAGNode),
errornode: convertToFlowNode(DAGErrorNode),
dagcircle: DAGCircle,
};
const makeOnEditAutomationConditions = (
const makeOnEditAutomationConditions =
(
conditions: AutomationCondition[],
updateConditions: (c: AutomationCondition[]) => void,
openModal: UpdateModalState,
) => () => openModal({
single: false,
node: conditions,
allowedTypes: ['condition'],
update: c => updateConditions(c as any),
})
openModal: UpdateModalState
) =>
() =>
openModal({
single: false,
node: conditions,
allowedTypes: ["condition"],
update: (c) => updateConditions(c as any),
});
export interface DAGAutomationFlowProps {
className?: string;
trigger: AutomationTrigger[];
condition: AutomationCondition[];
sequence: AutomationSequenceNode[];
dims: DAGAutomationFlowDims;
onTriggerUpdate: (t: AutomationTrigger[]) => void;
onSequenceUpdate: (s: AutomationSequenceNode[]) => void;
onConditionUpdate: (s: AutomationCondition[]) => void;
className?: string;
trigger: AutomationTrigger[];
condition: AutomationCondition[];
sequence: AutomationSequenceNode[];
dims: DAGAutomationFlowDims;
onTriggerUpdate: (t: AutomationTrigger[]) => void;
onSequenceUpdate: (s: AutomationSequenceNode[]) => void;
onConditionUpdate: (s: AutomationCondition[]) => void;
}
export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
className,
trigger,
condition,
sequence,
onTriggerUpdate,
onSequenceUpdate,
onConditionUpdate,
dims,
className,
trigger,
condition,
sequence,
onTriggerUpdate,
onSequenceUpdate,
onConditionUpdate,
dims,
}) => {
// state
const [modalState, setModalState] = useState<ModalState | null>(null);
// state
const [modalState, setModalState] = useState<ModalState | null>(null);
const { namer } = useHA();
// modal
let modalBody = <></>;
if (modalState) {
if (modalState.single) {
modalBody = (
<NodeEditor
node={modalState.node}
isErrored={modalState.isError}
onClose={() => setModalState(null)}
onSave={(n) => {
modalState.update(n as any);
setModalState(null);
}}
allowedTypes={modalState.allowedTypes}
saveBtnCreateText={modalState.saveBtnCreateText}
/>
);
} else {
modalBody = (
<MultiNodeEditor
sequence={modalState.node}
onClose={() => setModalState(null)}
onSave={(n) => modalState.update(n as any)}
allowedTypes={["condition"]}
/>
);
}
}
// modal
let modalBody = <></>
if (modalState) {
if (modalState.single) {
modalBody = <NodeEditor
node={modalState.node}
isErrored={modalState.isError}
onClose={() => setModalState(null)}
onSave={n => { modalState.update(n as any); setModalState(null); }}
allowedTypes={modalState.allowedTypes}
saveBtnCreateText={modalState.saveBtnCreateText}
/>
} else {
modalBody = <MultiNodeEditor
sequence={modalState.node}
onClose={() => setModalState(null)}
onSave={(n) => modalState.update(n as any)}
allowedTypes={['condition']}
/>
// convert automation to flow data
const condPoint = makeConditionPoint(
"c",
dims.flipped
? {
y: dims.padding.y + dims.nodeHeight * dims.distanceFactor,
x: dims.padding.x + dims.nodeWidth * 0.25,
}
}
// convert automation to flow data
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,
}
: {
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y + dims.nodeHeight * 0.25,
},
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
);
// render
return <>
<Modal open={!!modalState}>
{modalBody}
</Modal>
<ReactFlow
className={className}
nodeTypes={nodeTypes}
snapToGrid
onlyRenderVisibleElements
nodesConnectable={false}
nodesDraggable={false}
{...flowData}
>
<Controls />
</ReactFlow>
</>;
}
dims,
condition.length,
makeOnEditAutomationConditions(condition, onConditionUpdate, setModalState)
);
const flowData: FlowData = {
nodes: [condPoint],
edges: [],
};
triggerToFlow(flowData, trigger, condPoint.id, dims, {
namer,
onAdd: () =>
setModalState({
single: true,
saveBtnCreateText: true,
node: {
platform: "device",
},
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>
</>
);
};
+345 -231
View File
@@ -1,266 +1,380 @@
import { AutomationSequenceNode } from 'types/automations';
import { DAGAutomationFlowDims, FlowData } from './types';
import { getDescriptionFromAutomationNode } from 'utils/formatting';
import { XYPosition } from 'react-flow-renderer';
import { ChooseAction } from 'types/automations/actions';
import { makeFlowCircle } from './DAGCircle';
import { createOnRemoveForChooseNode, SequenceUpdater } from './updater';
import { getNodeType } from 'utils/automations';
import { makeAddButton, makeConditionPoint } from './flowDataMods';
import { AutomationSequenceNode } from "types/automations";
import { DAGAutomationFlowDims, FlowData } from "./types";
import { getDescriptionFromAutomationNode, Namer } from "utils/formatting";
import { XYPosition } from "react-flow-renderer";
import { ChooseAction } from "types/automations/actions";
import { makeFlowCircle } from "./DAGCircle";
import { createOnRemoveForChooseNode, SequenceUpdater } from "./updater";
import { getNodeType } from "utils/automations";
import { makeAddButton, makeConditionPoint } from "./flowDataMods";
export const sequenceToFlow = (
flowData: FlowData,
sequence: AutomationSequenceNode[],
fromPoint: string,
dims: DAGAutomationFlowDims,
updater: SequenceUpdater,
prefix: string = "",
flowData: FlowData,
sequence: AutomationSequenceNode[],
fromPoint: string,
dims: DAGAutomationFlowDims,
namer: Namer,
updater: SequenceUpdater,
prefix: string = ""
) => {
let lastPointId = fromPoint;
let lasPos: XYPosition | null = null;
// sequence
for (let i = 0; i < sequence.length; i++) {
const node = sequence[i];
const nodeId = `${prefix}n-${i}`;
let position: XYPosition;
if (lasPos) {
position = {
x: lasPos.x + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y
}
} else {
position = {
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2),
y: dims.padding.y
};
}
// draw node
if (getNodeType(node) === 'action') {
if ('choose' in node) {
try {
const out = addChooseNode(node, position, nodeId, dims, 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)
});
}
} 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;
let lastPointId = fromPoint;
let lasPos: XYPosition | null = null;
// sequence
for (let i = 0; i < sequence.length; i++) {
const node = sequence[i];
const nodeId = `${prefix}n-${i}`;
let position: XYPosition;
if (lasPos) {
position = dims.flipped
? {
y: lasPos.y + dims.nodeHeight * dims.distanceFactor,
x: dims.padding.x,
}
: {
x: lasPos.x + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y,
};
} else {
position = dims.flipped
? {
y: dims.padding.y + dims.nodeHeight * dims.distanceFactor * (i + 2),
x: dims.padding.x,
}
: {
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2),
y: dims.padding.y,
};
}
// draw node
if (getNodeType(node) === "action") {
if ("choose" in node) {
try {
const out = addChooseNode(
node,
position,
nodeId,
dims,
namer,
updater,
i
);
position = out.lastPos;
flowData = mergeFlowDatas(flowData, out.flowData);
} catch (err) {
console.error(err);
addErrorNode(
flowData,
nodeId,
position,
dims,
err,
updater.makeOnEditForBadNode(i)
);
}
} else {
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i),
namer,
});
}
} else {
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i),
namer,
});
}
addEdge(flowData, lastPointId, nodeId, false);
lastPointId = nodeId;
lasPos = position;
}
// add button
const addCircle = makeAddButton(
`${prefix}-+`,
{
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
// add button
const addCircle = makeAddButton(
`${prefix}-+`,
dims.flipped
? {
y:
(lasPos === null
? dims.padding.y +
dims.nodeHeight * dims.distanceFactor * (sequence.length + 1)
: lasPos.y) +
dims.nodeHeight * dims.distanceFactor,
x: dims.padding.x + dims.circleSize * 1.5,
}
: {
x:
(lasPos === null
? dims.padding.x +
dims.nodeWidth * dims.distanceFactor * (sequence.length + 1)
: lasPos.x) +
dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y + dims.circleSize / 4,
},
dims,
updater.addNode,
false,
)
flowData.nodes.push(addCircle)
addEdge(flowData, lastPointId, addCircle.id, false)
return {
position: lasPos,
pointId: lastPointId,
};
}
dims,
updater.addNode,
false
);
flowData.nodes.push(addCircle);
addEdge(flowData, lastPointId, addCircle.id, false);
return {
position: lasPos,
pointId: lastPointId,
};
};
const xyApply = (p1: XYPosition, p2: XYPosition, fcn: (a: number, b: number) => number): XYPosition => ({
x: fcn(p1.x, p2.x), y: fcn(p1.y, p2.y)
})
const xyApply = (
p1: XYPosition,
p2: XYPosition,
fcn: (a: number, b: number) => number
): XYPosition => ({
x: fcn(p1.x, p2.x),
y: fcn(p1.y, p2.y),
});
const addEdge = (flowData: FlowData, source: string, target: string, animated: boolean = false) => flowData.edges.push({
const addEdge = (
flowData: FlowData,
source: string,
target: string,
animated: boolean = false
) =>
flowData.edges.push({
id: `${source}-${target}`,
source,
target,
animated,
})
});
const addSingleNode = (
flowData: FlowData,
node: AutomationSequenceNode,
position: XYPosition,
nodeId: string,
{
nodeHeight,
nodeWidth,
}: DAGAutomationFlowDims,
opts: {
onEditClick: () => void;
onXClick: () => void;
}
) => flowData.nodes.push({
flowData: FlowData,
node: AutomationSequenceNode,
position: XYPosition,
nodeId: string,
{ flipped, nodeHeight, nodeWidth }: DAGAutomationFlowDims,
opts: {
onEditClick: () => void;
onXClick: () => void;
namer: Namer;
}
) =>
flowData.nodes.push({
id: nodeId,
type: 'dagnode',
type: "dagnode",
data: {
label: getDescriptionFromAutomationNode(node),
height: nodeHeight,
width: nodeWidth,
color: getNodeType(node) === 'action' ? 'green' : 'blue',
hasInput: true,
...opts,
label: getDescriptionFromAutomationNode(node, opts.namer, true),
height: nodeHeight,
width: nodeWidth,
color: getNodeType(node) === "action" ? "green" : "blue",
hasInput: true,
flipped,
...opts,
},
position,
});
});
const addErrorNode = (
flowData: FlowData,
nodeId: string,
position: XYPosition,
{
nodeHeight,
nodeWidth,
}: DAGAutomationFlowDims,
error: any,
onEdit: () => void,
hasInput: boolean = true,
) => flowData.nodes.push({
flowData: FlowData,
nodeId: string,
position: XYPosition,
{ nodeHeight, nodeWidth }: DAGAutomationFlowDims,
error: any,
onEdit: () => void,
hasInput: boolean = true
) =>
flowData.nodes.push({
id: nodeId,
type: 'errornode',
type: "errornode",
position,
data: {
height: nodeHeight,
width: nodeWidth,
hasInput,
onEdit,
error,
}
})
height: nodeHeight,
width: nodeWidth,
hasInput,
onEdit,
error,
},
});
const addChooseNode = (
node: ChooseAction,
position: XYPosition,
nodeId: string,
dims: DAGAutomationFlowDims,
updater: SequenceUpdater,
i: number,
node: ChooseAction,
position: XYPosition,
nodeId: string,
dims: DAGAutomationFlowDims,
namer: Namer,
updater: SequenceUpdater,
i: number
) => {
const flowData: FlowData = {
nodes: [],
edges: [],
};
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i),
});
let lastPos: XYPosition = position;
// conditions
node.choose.forEach(({ sequence, conditions }, j) => {
const sequenceId = `${nodeId}.${j}`;
// edit/delete circle
const circle = makeFlowCircle(`${sequenceId}>delete`, {
const flowData: FlowData = {
nodes: [],
edges: [],
};
addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i),
namer,
});
let lastPos: XYPosition = position;
// conditions
node.choose.forEach(({ sequence, conditions }, j) => {
const sequenceId = `${nodeId}.${j}`;
// edit/delete circle
const circle = makeFlowCircle(
`${sequenceId}>delete`,
dims.flipped
? {
y: position.y + dims.nodeHeight * dims.distanceFactor,
x: lastPos.x + dims.nodeWidth * dims.distanceFactor,
}
: {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
}, {
size: dims.circleSize,
onRemove: createOnRemoveForChooseNode(
node,
d => updater.updateNode(i, d),
j,
),
})
flowData.nodes.push(circle)
addEdge(flowData, nodeId, circle.id, true)
const condNode = makeConditionPoint(
`${sequenceId}>cond`,
{
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,
},
{
flipped: dims.flipped,
size: dims.circleSize,
onRemove: createOnRemoveForChooseNode(
node,
(d) => updater.updateNode(i, d),
j
),
}
);
flowData.nodes.push(addCirlce)
addEdge(flowData, nodeId, addCirlce.id, true)
flowData.nodes.push(circle);
addEdge(flowData, nodeId, circle.id, true);
const condNode = makeConditionPoint(
`${sequenceId}>cond`,
dims.flipped
? {
y: circle.position.y + dims.circleSize * dims.distanceFactor,
x: circle.position.x - dims.circleSize,
}
: {
x: circle.position.x + dims.circleSize * dims.distanceFactor,
y: circle.position.y + dims.circleSize / 8,
},
dims,
conditions.length,
updater.makeOnEditConditionsForChooseNode(i, j)
);
flowData.nodes.push(condNode);
addEdge(flowData, circle.id, condNode.id, true);
// else
const elseCircle = makeFlowCircle(`${nodeId}>else`, {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2,
}, { size: dims.circleSize })
flowData.nodes.push(elseCircle)
addEdge(flowData, nodeId, elseCircle.id, true)
const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, {
// actual sub sequence
const lastPoint = sequenceToFlow(
flowData,
sequence,
condNode.id,
{
...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,
y: elseCircle.position.y - dims.circleSize / 4,
},
}, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`)
if (lastPoint.position) {
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
} else {
lastPos = xyApply(lastPos, elseCircle.position, Math.max)
}
return { lastPos, flowData }
}
},
},
namer,
updater.makeChildUpdaterForChooseAction(i, null),
`${nodeId}.${totalChildren}.`
);
if (lastPoint.position) {
lastPos = xyApply(lastPos, lastPoint.position, Math.max);
} else {
lastPos = xyApply(lastPos, elseCircle.position, Math.max);
}
return { lastPos, flowData };
};
export const mergeFlowDatas = (fd1: FlowData, fd2: FlowData): FlowData => {
fd1.edges = fd1.edges.concat(fd2.edges);
fd1.nodes = fd1.nodes.concat(fd2.nodes);
return fd1
}
fd1.edges = fd1.edges.concat(fd2.edges);
fd1.nodes = fd1.nodes.concat(fd2.nodes);
return fd1;
};
@@ -1,53 +1,74 @@
import { AutomationTrigger } from 'types/automations/triggers';
import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from './types';
import { makeAddButton } from './flowDataMods';
import { getDescriptionFromAutomationNode } from 'utils/formatting';
import { AutomationTrigger } from "types/automations/triggers";
import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from "./types";
import { makeAddButton } from "./flowDataMods";
import { getDescriptionFromAutomationNode } from "utils/formatting";
export const triggerToFlow = (
flowData: FlowData,
trigger: AutomationTrigger[],
toPoint: string,
dims: DAGAutomationFlowDims,
opts: TriggerMakerOptions,
flowData: FlowData,
trigger: AutomationTrigger[],
toPoint: string,
dims: DAGAutomationFlowDims,
opts: TriggerMakerOptions
) => {
const {
distanceFactor,
nodeHeight,
nodeWidth,
padding,
conditionHeight,
} = dims;
// convert all triggers to dag nodes
trigger.forEach((t, i) => {
const flowId = `t-${i}`;
flowData.nodes.push({
id: flowId,
type: 'dagnode',
data: {
label: getDescriptionFromAutomationNode(t),
height: nodeHeight,
width: nodeWidth,
color: 'red',
onEditClick: () => opts.onEdit(i),
onXClick: () => opts.onDelete(i),
},
position: { x: padding.x, y: padding.y + nodeHeight * distanceFactor * i }
})
flowData.edges.push({
id: `e(${flowId})-(${toPoint})`,
source: flowId,
target: toPoint,
})
const {
distanceFactor,
nodeHeight,
nodeWidth,
padding,
conditionHeight,
circleSize,
flipped,
} = dims;
// convert all triggers to dag nodes
trigger.forEach((t, i) => {
const flowId = `t-${i}`;
flowData.nodes.push({
id: flowId,
type: "dagnode",
data: {
label: getDescriptionFromAutomationNode(t, opts.namer, true),
height: nodeHeight,
width: nodeWidth,
flipped,
color: "red",
onEditClick: () => opts.onEdit(i),
onXClick: () => opts.onDelete(i),
},
position: flipped
? {
y: padding.y,
x: padding.x + nodeWidth * distanceFactor * i,
}
: {
x: padding.x,
y: padding.y + nodeHeight * distanceFactor * i,
},
});
flowData.edges.push({
id: `e(${flowId})-(${toPoint})`,
source: flowId,
target: toPoint,
});
});
// create a 'add button'
flowData.nodes.push(makeAddButton(
'trigger-add',
{
// create a 'add button'
flowData.nodes.push(
makeAddButton(
"trigger-add",
flipped
? {
y: padding.y + circleSize / 4,
x: padding.x + nodeWidth * distanceFactor * trigger.length,
}
: {
x: padding.x + nodeWidth * 0.4,
y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length,
},
dims,
opts.onAdd
))
}
y:
padding.y +
conditionHeight / 2 +
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 { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
import { DAGErrorNodeProps } from './DAGErrorNode';
import { Namer } from 'utils/formatting';
export type DAGAutomationFlowDims = {
@@ -15,6 +16,7 @@ export type DAGAutomationFlowDims = {
conditionHeight: number;
circleSize: number;
distanceFactor: number;
flipped: boolean;
}
export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | DAGErrorNodeProps | any>;
@@ -27,6 +29,7 @@ export type TriggerMakerOptions = {
onAdd: () => void,
onEdit: (i: number) => void,
onDelete: (i: number) => void,
namer: Namer,
}
export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = (
@@ -40,8 +40,8 @@ test("sequence updater updates nodes", () => {
mock.updater.updateNode(0, {
...mock.state[0],
alias: "Hello"
})
expect(mock.state[0].alias).toBe("Hello")
} as any)
expect((mock.state[0] as any).alias).toBe("Hello")
})
test('update conditions for node', () => {
const mock = mockSequenceUpdater([
+80 -89
View File
@@ -2,140 +2,131 @@ import { AutomationSequenceNode } from "types/automations";
import { ChooseAction } from "types/automations/actions";
import { AutomationCondition } from "types/automations/conditions";
import { UpdateModalState } from "./types";
import { getNodeType } from '../../utils/automations';
import { getNodeType } from "../../utils/automations";
export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>;
export const makeSequenceUpdater = (
sequence: AutomationSequenceNode[],
onChange: (s: AutomationSequenceNode[]) => void,
openModal: UpdateModalState,
openModal: UpdateModalState
) => ({
sequence,
onChange,
removeNode(i: number) {
return onChange([
...sequence.slice(0, i),
...sequence.slice(i + 1),
])
return onChange([...sequence.slice(0, i), ...sequence.slice(i + 1)]);
},
addNode() {
return openModal({
single: true,
saveBtnCreateText: true,
node: {
choose: [],
default: [],
device_id: "",
},
update: n => onChange([
...sequence,
n,
]),
allowedTypes: ['action', 'condition']
})
update: (n) => {
onChange([...sequence, n]);
},
allowedTypes: ["action", "condition"],
});
},
updateNode(i: number, node: AutomationSequenceNode) {
return onChange([
...sequence.slice(0, i),
node,
...sequence.slice(i + 1),
])
if (JSON.stringify(node) !== JSON.stringify(sequence[i])) {
return onChange([
...sequence.slice(0, i),
node,
...sequence.slice(i + 1),
]);
}
},
updateChooseActionData(i: number, data: ChooseAction) {
const node = sequence[i] as ChooseAction;
return this.updateNode(i, {
...node,
...data,
})
});
},
makeChildUpdaterForChooseAction(i: number, j: number | null) {
const node = sequence[i];
if ('choose' in node) {
if ("choose" in node) {
if (j !== null) {
return makeSequenceUpdater(
node.choose[j].sequence,
seq => this.updateNode(i, {
...node,
choose: [
...node.choose.slice(0, j),
{
...node.choose[j],
sequence: seq,
},
...node.choose.slice(j + 1),
]
}),
openModal,
)
(seq) =>
this.updateNode(i, {
...node,
choose: [
...node.choose.slice(0, j),
{
...node.choose[j],
sequence: seq,
},
...node.choose.slice(j + 1),
],
}),
openModal
);
} else {
return makeSequenceUpdater(
node.default ?? [],
seq => this.updateNode(i, {
...node,
default: seq
}),
openModal,
)
(seq) =>
this.updateNode(i, {
...node,
default: seq,
}),
openModal
);
}
}
throw new Error(`Cannot create sub-updater for ${node}`)
throw new Error(`Cannot create sub-updater for ${node}`);
},
makeOnModalOpenForNode(
i: number,
node: AutomationSequenceNode,
) {
return () => openModal({
single: true,
node,
allowedTypes: ['action', 'condition'],
update: n => this.updateNode(i, n),
})
makeOnModalOpenForNode(i: number, node: AutomationSequenceNode) {
return () =>
openModal({
single: true,
node,
allowedTypes: ["action", "condition"],
update: (n) => this.updateNode(i, n),
});
},
makeOnEditConditionsForChooseNode(
i: number,
j: number,
) {
makeOnEditConditionsForChooseNode(i: number, j: number) {
return () => {
const node = sequence[i] as ChooseAction;
return openModal({
single: false,
node: node.choose[j].conditions,
allowedTypes: ['condition'],
update: conditions => this.updateNode(i, {
...node,
choose: [
...node.choose.slice(0, j),
{
sequence: node.choose[j].sequence,
conditions: conditions as AutomationCondition[],
},
...node.choose.slice(j + 1),
]
}),
})
}
allowedTypes: ["condition"],
update: (conditions) =>
this.updateNode(i, {
...node,
choose: [
...node.choose.slice(0, j),
{
sequence: node.choose[j].sequence,
conditions: conditions as AutomationCondition[],
},
...node.choose.slice(j + 1),
],
}),
});
};
},
makeOnEditForBadNode(i: number) {
const node = sequence[i];
return () => openModal({
single: true,
isError: true,
node,
allowedTypes: [getNodeType(node)],
update: n => this.updateNode(i, n),
})
}
return () =>
openModal({
single: true,
isError: true,
node,
allowedTypes: [getNodeType(node)],
update: (n) => this.updateNode(i, n),
});
},
});
export const createOnRemoveForChooseNode = (
action: ChooseAction,
update: (data: ChooseAction) => void,
j: number
) => () => update({
...action,
choose: [
...action.choose.slice(0, j),
...action.choose.slice(j + 1),
]
})
export const createOnRemoveForChooseNode =
(action: ChooseAction, update: (data: ChooseAction) => void, j: number) =>
() =>
update({
...action,
choose: [...action.choose.slice(0, j), ...action.choose.slice(j + 1)],
});
@@ -0,0 +1,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 { ComponentMeta, ComponentStory } from '@storybook/react';
import { ErrorBoundary } from ".";
import { Page } from "components/Page";
export default {
@@ -15,20 +16,20 @@ export const ErrorThrown: ComponentStory<typeof ErrorBoundary> = args => {
const BadComponent: FC = () => {
throw new Error("!!!")
}
return <div className="page">
return <Page>
<ErrorBoundary>
<BadComponent />
</ErrorBoundary>
</div>
</Page>
}
export const NoError: ComponentStory<typeof ErrorBoundary> = args => {
const GoodComponent: FC = () => {
return <span>All Good.</span>
}
return <div className="page">
return <Page>
<ErrorBoundary>
<GoodComponent />
</ErrorBoundary>
</div>
</Page>
}
@@ -1,5 +1,5 @@
import "./index.css";
import { Component, ErrorInfo } from "react";
import { Component, ErrorInfo, ReactNode } from "react";
type State = {
hasError: false;
@@ -8,7 +8,9 @@ type State = {
error: any,
errorInfo?: ErrorInfo,
}
export class ErrorBoundary extends Component<{}, State> {
export class ErrorBoundary extends Component<{
children: ReactNode
}, State> {
state: State = {
hasError: false
@@ -39,6 +41,8 @@ export class ErrorBoundary extends Component<{}, State> {
</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 { IconBaseProps } from './base';
import { createAppUseStyles } from 'styles/theme';
import "./ButtonIcons.css";
import { FC, ReactNode } from "react";
import MuiIconButton, { IconButtonTypeMap } from "@mui/material/IconButton";
export interface ButtonIconStyleProps {
}
export interface ButtonIconProps extends IconBaseProps, ButtonIconStyleProps {
children: FC<IconBaseProps>;
}
const useButtonIconStyles = createAppUseStyles(theme => ({
buttonIcon: {
borderRadius: "100%",
borderWidth: 1,
borderStyle: "groove",
padding: "0.25em",
"&:hover": {
backgroundColor: theme.secondaryAccent,
cursor: 'pointer',
}
}
}))
export const ButtonIcon: FC<ButtonIconProps> = ({
children: Child,
className,
...props
}) => <Child
className={`${useButtonIconStyles({}).classes.buttonIcon} ${className}`} {...props}
/>
export const ButtonIcon: FC<{
icon: ReactNode;
onClick?: () => void;
className?: string;
title?: string;
disabled?: boolean;
color?: IconButtonTypeMap["props"]["color"];
}> = (props) => {
return (
<MuiIconButton
className={["icon-button", props.className ?? ""].join(" ")}
onClick={props.onClick}
title={props.title}
color={props.color}
disabled={props.disabled}
>
{props.icon}
</MuiIconButton>
);
};
+34 -24
View File
@@ -1,40 +1,50 @@
import { ComponentStory } from "@storybook/react";
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 { Page } from "components/Page";
export default {
title: 'Icons',
title: "Icons",
component: IconBase,
};
export const IconList: ComponentStory<typeof IconBase> = (args) => {
return <div className="page">
<PencilIcon {...args} />
<CheckMarkIcon {...args} />
<AddIcon {...args} />
<TrashIcon {...args} />
<InfoIcon {...args} />
<ZoomIcon {...args} />
<GearIcon {...args} />
</div>
}
return (
<Page>
<PencilIcon {...args} />
<CheckMarkIcon {...args} />
<AddIcon {...args} />
<TrashIcon {...args} />
<InfoIcon {...args} />
<ZoomIcon {...args} />
<GearIcon {...args} />
</Page>
);
};
IconList.args = {
size: 2,
color: 'red'
}
color: "red",
};
export const ButtonIconExample: ComponentStory<typeof IconBase> = (args) => {
return <div className="page">
<ButtonIcon {...args}>{ArrowIcon}</ButtonIcon>
</div>
}
return (
<Page>
<ButtonIcon icon={<ArrowIcon {...args} />} />
</Page>
);
};
ButtonIconExample.args = {
size: 2,
color: 'red'
}
color: "red",
};
+20 -6
View File
@@ -1,7 +1,21 @@
import { ButtonHTMLAttributes, FC } from "react";
import { useButtonStyles } from "./styles";
import { FC, ReactNode } from "react";
import MuiButton from "@mui/material/Button";
export const Button: FC<ButtonHTMLAttributes<HTMLButtonElement>> = props => {
const { classes } = useButtonStyles({});
return <button {...props} className={`${classes.input} ${props.className ?? ''}`} />
}
export const Button: FC<{
className?: string;
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}
/>
);
};
@@ -0,0 +1,27 @@
import { FC } from "react";
import {
InputAutoComplete,
InputAutoCompletePropsBase,
} from "./InputAutoComplete";
import { useHAAreas } from "haService/AreaRegistry";
export type InputAreaProps = InputAutoCompletePropsBase & {
restrictToDomain?: string[];
restrictedIntegrations?: string[];
};
export const InputArea: FC<InputAreaProps> = (props) => {
// state
const areas = useHAAreas();
console.log(areas);
return (
<InputAutoComplete
{...props}
validateOption={(v) => areas.validateOptions(v)}
options={areas.getOptions()}
getID={areas.getID}
getLabel={areas.getLabel}
onlyShowLabel
/>
);
};
@@ -0,0 +1,47 @@
.input-autocomplete .BaseBadge-root {
max-width: 100%;
}
.input-autocomplete--chip>span {
display: flex;
flex-direction: row;
gap: 0.15em;
}
.input-autocomplete--chip>span>small::before {
content: "/ ";
}
.input-autocomplete--chip>span>small {
size: 0.15em;
}
.input-autocomplete--errors {
margin-top: 0.75em;
}
.input-autocomplete--errors ul {
padding: 0 0 0 1em;
margin: 0;
max-height: 2.5em;
overflow-y: auto;
overflow-x: hidden;
}
.input-autocomplete--tags {
max-height: 5em;
width: fit-content;
max-width: 100%;
overflow: auto;
text-overflow: ellipsis;
}
.input-autocomplete--chip small {
max-width: 7em;
text-overflow: ellipsis;
overflow: hidden;
}
.input-autocomplete--popper {
min-width: fit-content;
}
@@ -0,0 +1,23 @@
import { computeSimilarity } from "./InputAutoComplete";
test("similarity score", () => {
const searchTerms = [
"lught",
"light",
"light balcn",
"light bal",
"light balcony",
"Balcony lig",
].map((x) => computeSimilarity(x, "light.balcony", "Balcony Light"));
expect(searchTerms).toStrictEqual(searchTerms.sort());
});
test("similarity score", () => {
expect(
computeSimilarity(
"li",
"6592b3d6d05d3de6fa26c3dbd2edecc2",
"Balcony Lights"
)
).toBeGreaterThan(0);
});
@@ -0,0 +1,256 @@
import "./InputAutoComplete.css";
import Autocomplete from "@mui/material/Autocomplete";
import TextField from "@mui/material/TextField";
import Chip from "@mui/material/Chip";
import Badge from "@mui/material/Badge";
import Popper from "@mui/material/Popper";
import { SearchItem } from "./extras";
import { ReactNode } from "react";
import { prettyName } from "utils/formatting";
export type BaseOption<T = {}> = {
id: string;
label: string;
} & T;
export type Option<T = {}> = string | BaseOption<T>;
export type InputAutoCompleteProps<T extends Option<any>> = {
validateOption?: (v: string[]) => string[] | null;
groupBy?: (opt: T) => string;
options: T[];
getLabel?: (opt: T) => string;
getID?: (opt: T) => string;
} & InputAutoCompletePropsBase;
export type InputAutoCompletePropsBase = {
label?: string;
className?: string;
disabled?: boolean;
required?: boolean;
onlyShowLabel?: boolean;
helperText?: ReactNode;
endAdornment?: ReactNode;
} & (
| {
value: string | null;
multiple?: false;
onChange: (v: string | null) => void;
}
| {
value: string | string[];
multiple: true;
onChange: (v: string[]) => void;
}
);
export function computeSimilarity(
text: string,
optId: string,
optLabel: string
) {
let similarityScore = 0;
const lowCaseId = optId.toLocaleLowerCase();
const lowCaseLabel = optLabel.toLocaleLowerCase();
for (const segment of text.toLocaleLowerCase().split(" ")) {
if (lowCaseId.includes(segment)) {
similarityScore += lowCaseId.length / lowCaseId.length;
}
if (lowCaseLabel.includes(segment)) {
similarityScore += lowCaseLabel.length / lowCaseLabel.length;
}
}
return similarityScore;
}
export function InputAutoComplete<T extends Option>(
props: InputAutoCompleteProps<T>
) {
// aliases
const getID = (opt: T): string => {
if (props.getID) {
return props.getID(opt);
}
if (typeof opt === "string") {
return opt;
}
return opt.id;
};
const getLabel = (opt: T): string => {
if (props.getLabel) {
return props.getLabel(opt);
}
if (typeof opt === "string") {
return opt;
}
return opt.label;
};
// processing of inputs
const value = Array.isArray(props.value)
? props.value
: !!props.value
? [props.value]
: [];
const errors = props.validateOption ? props.validateOption(value) : null;
const options = props.options
.filter((opt) => !value.includes(getID(opt)))
.sort((a, b) => {
return getID(a) > getID(b) ? 1 : -1;
});
// processing of errors
let helperText = props.helperText ?? <></>;
let error: boolean = false;
if (errors !== null) {
error = true;
if (errors.length > 0) {
helperText = (
<Badge
className="input-autocomplete--errors"
badgeContent={errors.length}
color="error"
>
<ul title={errors.join(", and")}>
{errors.map((msg, i) => (
<li key={i}>{msg}</li>
))}
</ul>
</Badge>
);
}
}
// events
const onChange = (_e: any, v: any) => {
const cleanValue: string[] =
v === null
? []
: Array.isArray(v)
? v.map((opt) => {
if (typeof opt === "string") {
return opt;
}
return opt.id;
})
: [v];
if (props.multiple) {
props.onChange(cleanValue);
} else {
props.onChange(cleanValue[cleanValue.length - 1]);
}
};
return (
<Autocomplete
className={["input-autocomplete", props.className ?? ""].join(" ")}
multiple={true}
freeSolo
value={value}
options={options}
onChange={onChange}
getOptionLabel={getLabel as any}
disabled={props.disabled}
PopperComponent={(props) => {
return (
<Popper
key={Math.random().toString()}
{...props}
className={[props.className, "input-autocomplete--popper"].join(
" "
)}
/>
);
}}
filterOptions={(opts, s) => {
const searchTerm = s.inputValue;
if (!searchTerm) {
return opts;
}
return opts
.map((opt) => {
return {
opt,
similarityScore: computeSimilarity(
searchTerm,
getID(opt),
getLabel(opt)
),
};
})
.filter((opt) => opt.similarityScore > 0)
.sort((a, b) => {
return a.similarityScore < b.similarityScore ? 1 : -1;
})
.map(({ opt }) => opt);
}}
groupBy={props.groupBy}
renderOption={(listProps, option, { inputValue }) => {
const label = getLabel(option);
const id = getID(option);
return (
<>
<SearchItem
key={label + id}
listProps={listProps}
id={id}
label={label}
searchTerm={inputValue}
onlyShowLabel={props.onlyShowLabel}
/>
</>
);
}}
renderInput={(params) => (
<TextField
{...params}
InputProps={{
...params.InputProps,
endAdornment: props.endAdornment ?? params.InputProps.endAdornment,
}}
variant="filled"
required={props.required}
label={props.label ?? "Entity ID"}
helperText={helperText}
disabled={props.disabled}
error={error}
/>
)}
renderTags={(tagValue, getTagProps) => {
const inner = (
<div className="input-autocomplete--tags">
{tagValue.map((option, index) => {
const label = getLabel(option);
const id = getID(option);
const tagProps = getTagProps({ index });
tagProps.className += " input-autocomplete--chip";
return (
<Chip
size="medium"
title={`${label} / ${id}`}
label={
<>
{id === label ? (
<span>{prettyName(label)}</span>
) : (
<b>{label}</b>
)}
{id !== label && !props.onlyShowLabel && (
<small>{id}</small>
)}
</>
}
{...tagProps}
/>
);
})}
</div>
);
if (props.multiple) {
return (
<Badge badgeContent={tagValue.length} color="info">
{inner}
</Badge>
);
} else {
return inner;
}
}}
/>
);
}
@@ -0,0 +1,52 @@
import TextField from "@mui/material/TextField";
import Autocomplete from "@mui/material/Autocomplete";
import { ReactNode } from "react";
export interface InputAutoTextProps {
label: string;
value: string;
className?: string;
options?: string[];
error?: string;
required?: boolean;
endAdornment?: ReactNode;
onChange: (v: string) => void;
}
export default function InputAutoText({
value = "",
label,
options = [],
onChange,
className,
required,
endAdornment,
error,
}: InputAutoTextProps) {
return (
<Autocomplete
freeSolo
className={className}
value={value}
options={options}
onChange={(_e, v) => onChange(v === null ? "" : v)}
renderInput={(params) => (
<TextField
{...params}
required={required}
variant="filled"
label={label}
error={error !== undefined}
helperText={error}
fullWidth
InputProps={{
endAdornment,
}}
onChange={(e) => {
e.preventDefault();
onChange(e.target.value);
}}
/>
)}
/>
);
}
@@ -1,24 +0,0 @@
.input-boolean {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
max-width: fit-content;
border: 1px solid var(--secondary-accent);
border-radius: 5px;
padding: 0.5em;
background-color: var(--secondary);
}
.input-boolean.disabled:hover, .input-boolean.disabled:hover * {
cursor: not-allowed;
}
.input-boolean:hover, .input-boolean:hover * {
cursor: pointer;
background-color: var(--secondary-opaque);
}
.input-boolean * {
user-select: none;
}
@@ -1,4 +1,5 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react";
import InputBoolean from "./InputBoolean";
@@ -12,12 +13,12 @@ export default {
const Template: ComponentStory<typeof InputBoolean> = args => {
const [state, onChange] = useState(args.value)
return <div className="page">
return <Page>
<InputBoolean {...args} value={state} onChange={v => {
args.onChange(v)
onChange(v)
}} />
</div>
</Page>
}
export const SimpleText = Template.bind({})
+63 -5
View File
@@ -1,19 +1,77 @@
import "./InputBoolean.css";
import Checkbox from "@mui/material/Checkbox";
import FormGroup from "@mui/material/FormGroup";
import FormControlLabel from "@mui/material/FormControlLabel";
import { ReactNode } from "react";
import FormHelperText from "@mui/material/FormHelperText";
import InputAdornment from "@mui/material/InputAdornment";
export interface Props {
label: string;
value: boolean;
title?: string;
helperText?: ReactNode;
onChange: (v: boolean) => void;
disabled?: boolean;
className?: string;
required?: boolean;
placeholder?: string;
endAdornment?: ReactNode;
}
export default function InputBoolean({
label,
value = false,
title,
helperText,
onChange,
disabled = false,
className,
required,
placeholder,
endAdornment,
}: Props) {
return <div className={["input-boolean", disabled ? 'disabled' : ''].join(' ')} onClick={() => onChange(!value)}>
<input type="checkbox" checked={value} onChange={() => { }} disabled={disabled} />
<label>{label}</label>
</div>
return (
<FormGroup
className={className}
title={title}
style={{
alignItems: "flex-start",
}}
>
<FormControlLabel
disabled={disabled}
control={
<Checkbox
checked={value}
onChange={() => onChange(!value)}
required={required}
placeholder={placeholder}
/>
}
label={
endAdornment ? (
<div
style={{
display: "flex",
flexDirection: "row",
justifyContent: "center",
alignItems: "center",
}}
>
<span
style={{
flex: 1,
}}
>
{label}
</span>
<InputAdornment position="end">{endAdornment}</InputAdornment>
</div>
) : (
label
)
}
/>
<FormHelperText>{helperText}</FormHelperText>
</FormGroup>
);
}
@@ -0,0 +1,150 @@
import "./InputTime.css";
import { useState, useEffect, FC } from "react";
import TextField from "@mui/material/TextField";
import EditIcon from "@mui/icons-material/Edit";
import CloseIcon from "@mui/icons-material/Close";
import { AutomationTime, AutomationTimeObject } from "types/automations/common";
import {
convertAutomationTimeToTimeObject,
convertObjectToAutomationTimeString,
} from "utils/time";
import { convertAutomationTimeToTimeString } from "utils/time";
import { prettyName } from "utils/formatting";
import InputLabel from "@mui/material/InputLabel";
import { ButtonIcon } from "components/Icons/ButtonIcons";
// constants
const fields: Array<keyof AutomationTimeObject> = [
"hours",
"minutes",
"seconds",
"milliseconds",
];
export interface Props {
label: string;
value?: AutomationTime;
onChange: (v?: AutomationTimeObject) => void;
}
export const InputTime: FC<Props> = (props) => {
// state
const [disabled, setDisabled] = useState(!props.value);
const [displayValue, setDisplayValue] = useState(
convertAutomationTimeToTimeObject(props.value)
);
// process display input
const updateOne = (k: keyof AutomationTimeObject) => (v: string) => {
if (Number(v) < 0) {
setDisplayValue({
...displayValue,
[k]: 0,
});
} else if (k === "hours") {
setDisplayValue({
...displayValue,
[k]: Number(v),
});
} else if (k === "minutes") {
let minutes = Number(v);
let { hours = 0 } = displayValue;
if (minutes > 59) {
const additonalHours = Math.floor(minutes / 60);
hours += additonalHours;
minutes = minutes - additonalHours * 60;
}
setDisplayValue({
...displayValue,
minutes,
hours,
});
} else if (k === "seconds") {
let seconds = Number(v);
let { hours = 0, minutes = 0 } = displayValue;
if (seconds > 59) {
const additonalHours = Math.floor(seconds / (60 * 60));
hours += additonalHours;
seconds = seconds - additonalHours * 60;
}
if (seconds > 59) {
const additionalMinutes = Math.floor(seconds / 60);
minutes += additionalMinutes;
seconds = seconds - additionalMinutes * 60;
}
setDisplayValue({
...displayValue,
minutes,
hours,
seconds,
});
} else if (k === "milliseconds") {
let milliseconds = Number(v);
let { hours = 0, minutes = 0, seconds = 0 } = displayValue;
if (milliseconds > 1000) {
const additonalHours = Math.floor(milliseconds / (60 * 60 * 1000));
hours += additonalHours;
milliseconds = milliseconds - additonalHours * 60 * 60 * 1000;
}
if (milliseconds > 1000) {
const additionalMinutes = Math.floor(milliseconds / (60 * 1000));
minutes += additionalMinutes;
milliseconds = milliseconds - additionalMinutes * 60 * 1000;
}
if (milliseconds > 1000) {
const additionalSeconds = Math.floor(milliseconds / 1000);
seconds += additionalSeconds;
milliseconds = milliseconds - additionalSeconds * 1000;
}
setDisplayValue({
...displayValue,
minutes,
hours,
seconds,
milliseconds,
});
}
};
// effect
useEffect(() => {
if (disabled && !props.value) {
return;
}
if (disabled) {
props.onChange(undefined);
} else {
const pVal = convertAutomationTimeToTimeString(props.value);
const cVal = convertObjectToAutomationTimeString(displayValue);
if (pVal !== cVal) {
props.onChange(displayValue);
}
}
// eslint-disable-next-line
}, [disabled, displayValue]);
return (
<div className="input-time">
<InputLabel>{props.label}</InputLabel>
<div className="input-time--inner">
{fields.map((name) => (
<TextField
key={name}
variant="filled"
label={prettyName(name)}
defaultValue="00"
InputProps={{
disabled,
type: "number",
title: prettyName(name),
}}
value={displayValue[name] ?? 0}
onChange={(e) => updateOne(name)(e.target.value)}
/>
))}
<ButtonIcon
onClick={() => setDisabled(!disabled)}
icon={disabled ? <EditIcon /> : <CloseIcon />}
/>
</div>
</div>
);
};
@@ -0,0 +1,36 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react";
import { InputDevice } from "./InputDevice";
export default {
title: 'Inputs/InputDevice',
component: InputDevice,
parameters: { actions: { argTypesRegex: '^on.*' } },
argTypes: {}
} as ComponentMeta<typeof InputDevice>;
const Template: ComponentStory<typeof InputDevice> = args => {
const [value, setValue] = useState(args.value)
return <Page>
<div style={{
maxWidth: 200
}}>
<InputDevice {...args} value={value as any} onChange={(v: any) => {
setValue(v)
args.onChange(v as any)
}} />
</div>
</Page>
}
export const Single = Template.bind({})
Single.args = {
...Single.args,
multiple: false,
value: 'sensor.humidity_bathroom'
} as any
@@ -0,0 +1,22 @@
import { FC } from "react";
import { useHADeviceRegistry } from "haService";
import {
InputAutoComplete,
InputAutoCompletePropsBase,
} from "./InputAutoComplete";
export type InputDeviceProps = InputAutoCompletePropsBase;
export const InputDevice: FC<InputDeviceProps> = (props) => {
// state
const dr = useHADeviceRegistry();
return (
<InputAutoComplete
{...props}
label={props.label ?? "Device ID"}
getID={dr.getID}
getLabel={dr.getLabel}
options={dr.getOptions()}
/>
);
};
Loaded 100 of 202 files, more files were not shown because too many files have changed in this diff. Show more