Compare commits

...
76 Commits
Author SHA1 Message Date
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
177 changed files with 11241 additions and 10251 deletions

No files matched your search

+9
View File
@@ -2,3 +2,12 @@ webapp/node_modules
webapp/build webapp/build
webapp/.storybook webapp/.storybook
webapp/.vscode webapp/.vscode
webapp/.env.local
webapp/tmux.sh
api/.env
api/.coverage
api/venv
api/build
api/.mypy_cache
api/.vscode
api/.coverage
-1
View File
@@ -30,5 +30,4 @@ jobs:
args: | args: |
--${{ matrix.arch }} \ --${{ matrix.arch }} \
--version ${{ github.event.inputs.version }} \ --version ${{ github.event.inputs.version }} \
--additional-tag edge \
--target . --target .
-2
View File
@@ -1,6 +1,4 @@
name: Deploy name: Deploy
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
+5 -3
View File
@@ -35,7 +35,10 @@ jobs:
- metadata - metadata
strategy: strategy:
matrix: matrix:
action: [lint, coverage, security-checks] action:
- lint
- coverage
- security-checks
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Set up Python - name: Set up Python
@@ -59,7 +62,6 @@ jobs:
action: action:
- "test:ci" - "test:ci"
- "tsc:ci" - "tsc:ci"
- "build"
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
@@ -98,6 +100,6 @@ jobs:
with: with:
args: | args: |
--${{ matrix.arch }} \ --${{ matrix.arch }} \
--no-latest \
--version ${{ needs.metadata.outputs.version }} \ --version ${{ needs.metadata.outputs.version }} \
--additional-tag edge \
--target . --target .
+30 -1
View File
@@ -1,4 +1,33 @@
# Changelog # Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge)
## [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 ## [0.1.13] - YAML
+20 -16
View File
@@ -1,11 +1,16 @@
# <--- Build Args --> # <--- Pre-Build Args -->
ARG BUILD_ARCH ARG BUILD_ARCH
ARG BUILD_VERSION
# <--- Image Setup --> # <--- Image Setup -->
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14 FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
WORKDIR /app WORKDIR /app
# <--- Post-Build Args -->
ARG BUILD_VERSION
# <--- Environment Variables -->
ENV BUILD_VERSION $BUILD_VERSION
# <--- System Wide Dependencies --> # <--- System Wide Dependencies -->
ENV LANG C.UTF-8 ENV LANG C.UTF-8
RUN apk add --no-cache \ RUN apk add --no-cache \
@@ -13,29 +18,26 @@ RUN apk add --no-cache \
npm \ npm \
build-base \ build-base \
python3-dev python3-dev
RUN pip install -U wheel setuptools pip && \
npm i -g yarn # <--- Scripts -->
COPY docker/bin /app/bin
# <--- PREP -->
RUN /app/bin/prep.sh
# <--- Python Dependencies --> # <--- Python Dependencies -->
COPY api/setup.py /app/setup.py COPY api/setup.py /app/setup.py
RUN pip install . /app
# <--- Webapp Build --> # <--- Webapp Build -->
COPY webapp/ /app/web-builder COPY webapp/ /app/web-builder
RUN cd /app/web-builder && \ RUN cd /app/web-builder && \
yarn && \ echo "REACT_APP_BUILD_VERSION=${BUILD_VERSION}" > /app/web-builder/.env.production
yarn build && \
cp -r /app/web-builder/build /app/web && \ # <--- BUILD -->
rm -rf /app/web-builder RUN /app/bin/build.sh /app /app/web-builder
# <--- Api Code --> # <--- Api Code -->
COPY api/src /app/src COPY api/src /app/src
COPY run.sh /app/run.sh
RUN chmod +x /app/run.sh
# <--- Environment Variables -->
ENV HASSIO_TOKEN ""
ENV BUILD_VERSION $BUILD_VERSION
# <--- Ports --> # <--- Ports -->
EXPOSE 8000 EXPOSE 8000
@@ -45,5 +47,7 @@ LABEL \
io.hass.type="addon" \ io.hass.type="addon" \
io.hass.arch="armhf|aarch64|i386|amd64" io.hass.arch="armhf|aarch64|i386|amd64"
CMD [ "/app/run.sh" ] ENTRYPOINT [ "/app/bin/run.sh" ]
CMD [ "/app" ]
LABEL org.opencontainers.image.source https://github.com/asosnovsky/Shortumation
+27 -7
View File
@@ -1,24 +1,44 @@
DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml BUILD_TAG=$(shell git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
DC=BUILD_TAG=${BUILD_TAG} docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
build-with-builder:
docker run \
--rm \
--privileged \
-v ~/.docker:/root/.docker \
-v /var/run/docker.sock:/var/run/docker.sock:ro \
-v ${PWD}:/data \
homeassistant/amd64-builder \
--amd64 \
--test \
--version ${BUILD_TAG} \
-t /data
build: build:
$(DC) build $(DC) build
build-no-cache:
$(DC) build --no-cache
push: push:
$(DC) push $(DC) push
local_run: start:
$(MAKE) build
$(DC) up -d $(DC) up -d
sleep 1 sleep 1
$(DC) ps $(DC) ps
local_logs: logs:
$(DC) logs -f $(DC) logs -f
local_ps: ps:
$(DC) ps $(DC) ps
stop:
local_stop:
$(DC) stop $(DC) stop
bash:
$(DC) exec addon bash
config:
$(DC) config
+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) [![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/asosnovsky/Shortumation/Manual%20Build)
| | Stable | Edge
| --- | --- | ---
| Version | ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-amd64?&sort=date&label=&style=for-the-badge)
A better way to write automations in home-assistant without having to install and run a seperate automation engine! A better way to write automations in home-assistant without having to install and run a seperate automation engine!
![image](https://user-images.githubusercontent.com/7451445/168672575-fb19997d-fe9b-4192-96b0-733b62519797.png) ![image](https://user-images.githubusercontent.com/7451445/170770378-122c6722-993d-40ac-801d-387cfaccd41f.png)
![image](https://user-images.githubusercontent.com/7451445/168672840-71ceaa8a-2bee-443e-9150-5b0f03b05d08.png) ![image](https://user-images.githubusercontent.com/7451445/170770572-fd38950a-b6b4-4b49-8c94-fb0a5f3008ce.png)
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/). A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
@@ -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] See all automations in one common view
- [X] Automation Manager - [X] Automation Manager
- [X] Tags for automation organization - [X] Tags for automation organization
- [X] Autocomplete fields for entities/devices
- [ ] Script Manager - [ ] Script Manager
- [ ] Use secrets and global parameters - [ ] Use secrets and global parameters
- [ ] Autocomplete fields for entities/devices
- [ ] Autocomplete fields for template editor - [ ] Autocomplete fields for template editor
- [ ] Autocomplete fields for referencing scripts - [ ] Autocomplete fields for referencing scripts
+12
View File
@@ -0,0 +1,12 @@
# Security Policy
## Supported Versions
| Version | Supported |
| ------- | ------------------ |
| 0.1.x | :white_check_mark: |
## Reporting a Vulnerability
Please open an issue with the tag 'Vulnerability', and include your reasoning in it.
+13 -16
View File
@@ -1,17 +1,14 @@
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:16) list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:17)
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:27) upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:28)
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:31) delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:32)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:12) read_details # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:10)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:9) read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:10)
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:16) websocket_endpoint # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/socket.py:9)
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:17) params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:18)
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:6) total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:19)
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:7) id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8) alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9) description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10) trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:11)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:12)
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5) json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
logger # unused variable (/home/ari/Projects/Shortumation/api/src/logger.py:16)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:13)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:30)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:54)
+1 -2
View File
@@ -33,7 +33,7 @@ test:
coverage: coverage:
$(VENV_BIN)/coverage run -m unittest discover tests $(VENV_BIN)/coverage run -m unittest discover tests
$(VENV_BIN)/coverage report -m --fail-under=90 $(VENV_BIN)/coverage report -m --fail-under=80
clean: clean:
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
@@ -43,5 +43,4 @@ clean:
run-local: run-local:
rm -f web rm -f web
ln -s ../webapp/build web ln -s ../webapp/build web
cd ../webapp && yarn build
USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload 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 fastapi.staticfiles import StaticFiles
from src.automations.manager import AutomationManager from src.automations.manager import AutomationManager
from src.env import ORIGIN, ROOT_FOLDER from src.env import API_PREFIX, ORIGIN, ROOT_FOLDER
from .routes import automations, details, ping from .routes import automations, details, ping, socket
def make_app(automation_mgr: AutomationManager) -> FastAPI: def make_app(automation_mgr: AutomationManager) -> FastAPI:
app = FastAPI() app = FastAPI()
if (ROOT_FOLDER / "web").exists(): if (ROOT_FOLDER / "web").exists():
app.mount( app.mount(
"/web", f"{API_PREFIX}/web",
StaticFiles( StaticFiles(
directory=ROOT_FOLDER / "web", directory=ROOT_FOLDER / "web",
html=True, html=True,
@@ -29,6 +29,11 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
allow_headers=["*"], allow_headers=["*"],
) )
app.include_router(ping.router, prefix="/ping") app.include_router(ping.router, prefix="/ping")
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations") app.include_router(
app.include_router(details.make_details_router(automation_mgr.hass_config), prefix="/details") automations.make_automation_router(automation_mgr), prefix=f"{API_PREFIX}/automations"
)
app.include_router(
details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details"
)
app.include_router(socket.router, prefix=f"{API_PREFIX}/socket")
return app return app
+4 -4
View File
@@ -1,8 +1,6 @@
from datetime import datetime
from fastapi import APIRouter from fastapi import APIRouter
from src.env import BUILD_VERSION from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
from src.hass_config import HassConfig from src.hass_config import HassConfig
@@ -10,9 +8,11 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
router = APIRouter() router = APIRouter()
@router.get("/") @router.get("/")
def read_ping(): def read_details():
return { return {
"version": BUILD_VERSION, "version": BUILD_VERSION,
"hassio_token": HASSIO_TOKEN,
"hassio_url": HASSIO_WS,
"config": hass_config.get_configuration_path(), "config": hass_config.get_configuration_path(),
"tags": hass_config.get_automation_tags_path(), "tags": hass_config.get_automation_tags_path(),
"autos": hass_config.get_automation_path(), "autos": hass_config.get_automation_path(),
+39
View File
@@ -0,0 +1,39 @@
import asyncio
import json
from fastapi import APIRouter, WebSocket, WebSocketDisconnect
from src.logger import get_logger
from src.ws_redirect import WSRedirector
router = APIRouter()
logger = get_logger(__name__)
@router.websocket("/api/websocket")
async def websocket_endpoint(websocket: WebSocket):
async def on_message(msg: str):
await websocket.send_text(msg)
conn = WSRedirector(
on_message=on_message,
)
async def wait_for_data():
while True:
try:
msg_str = await websocket.receive_text()
msg_d = json.loads(msg_str)
if msg_d.get("type") != "auth":
await conn.send(msg_str)
except WebSocketDisconnect:
logger.info("Websocket closed.")
await conn.close()
break
await websocket.accept()
await asyncio.gather(
conn.start(),
wait_for_data(),
)
+3
View File
@@ -4,5 +4,8 @@ from decouple import Csv, config
ROOT_FOLDER = Path(__file__).parent.parent.absolute() ROOT_FOLDER = Path(__file__).parent.parent.absolute()
BUILD_VERSION = config("BUILD_VERSION", "0.0.0") BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
HASSIO_TOKEN = config("SUPERVISOR_TOKEN", "")
HASSIO_WS = config("HASSIO_WS", "ws://supervisor/core/websocket")
LOG_LEVEL = config("LOG_LEVEL", "INFO") LOG_LEVEL = config("LOG_LEVEL", "INFO")
API_PREFIX = config("API_PREFIX", "")
ORIGIN = config("ORIGIN", cast=Csv(), default="*") ORIGIN = config("ORIGIN", cast=Csv(), default="*")
+4
View File
@@ -14,3 +14,7 @@ else:
logging.basicConfig(level=logging.NOTSET) logging.basicConfig(level=logging.NOTSET)
logger = logging.getLogger() logger = logging.getLogger()
def get_logger(name: str):
return logging.getLogger(name)
+59
View File
@@ -0,0 +1,59 @@
import asyncio
import json
from typing import Callable, Coroutine, Optional
from websockets.client import WebSocketClientProtocol, connect
from websockets.exceptions import ConnectionClosedOK
from src.env import HASSIO_TOKEN, HASSIO_WS
from src.logger import get_logger, logger
OnMessage = Callable[[str], Coroutine]
logger = get_logger(__name__)
class WSRedirector:
def __init__(
self,
on_message: OnMessage,
token: str = HASSIO_TOKEN,
host: str = HASSIO_WS,
) -> None:
self._host = host
self._token = token
self._on_message = on_message
self._client: Optional[WebSocketClientProtocol] = None
self._close: bool = False
@property
def is_closed(self):
return self._close
async def send(self, msg: str):
if self._client:
return await self._client.send(msg)
async def start(self):
async with connect(self._host) as websocket:
self._client = websocket
await websocket.send(json.dumps({"type": "auth", "access_token": self._token}))
while not self.is_closed:
try:
msg = await websocket.recv()
# logger.debug(f"HA MSG :--> {msg} {self.is_closed}")
await self.process_message(msg)
except ConnectionClosedOK:
pass
logger.info("Closing socket...")
await websocket.close()
logger.info("Closed socket")
async def process_message(self, msg: str):
await self._on_message(msg)
async def close(self):
self._close = True
await self._client.close()
def __del__(self):
asyncio.create_task(self.close())
+29
View File
@@ -0,0 +1,29 @@
import os
import yaml
from pathlib import Path
print(Path().absolute())
CONFIG_YAML = Path("config.yaml").absolute()
CHANGELOG_MD = Path("CHANGELOG.md").absolute()
print(CONFIG_YAML)
print(CHANGELOG_MD)
version = os.environ["VERSION"]
version_name = os.environ["NAME"]
change = os.environ["CHANGELOG"].splitlines()
config = yaml.load(CONFIG_YAML.read_text(), yaml.Loader)
changelog = CHANGELOG_MD.read_text().splitlines()
with CHANGELOG_MD.open("w") as fp:
for i, log in enumerate(changelog):
if i == 2:
fp.write(f"## [{version}] - {version_name}\n\n")
for clog in change:
fp.write(f"- {clog.strip()}\n")
fp.write(log.strip() + "\n")
CONFIG_YAML.write_text(yaml.dump(config))
+6 -7
View File
@@ -1,5 +1,5 @@
name: Shortumation name: Shortumation
version: 0.1.13 version: v0.1.20
slug: shortumation slug: shortumation
image: asosnovsky/shortumation-{arch} image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation" url: "https://github.com/asosnovsky/Shortumation"
@@ -16,16 +16,15 @@ init: false
ingress: true ingress: true
ingress_port: 8000 ingress_port: 8000
ingress_entry: "web/" ingress_entry: "web/"
panel_icon: mdi:home-automation homeassistant_api: true
hassio_role: manager
privileged:
- SYS_RAWIO
host_network: false
auth_api: true auth_api: true
panel_icon: mdi:home-automation
hassio_role: homeassistant
host_network: false
map: map:
- config:rw - config:rw
options: {} options: {}
ports: ports:
8000/tcp: 8000 8000/tcp:
ports_description: ports_description:
8000/tcp: Main port for the API & Web. 8000/tcp: Main port for the API & Web.
+3 -2
View File
@@ -1,9 +1,10 @@
version: '3' version: '3'
services: services:
addon: addon:
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-latest}" image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
build: build:
context: "./" context: "./"
dockerfile: "./Dockerfile" dockerfile: "./Dockerfile"
args: args:
- BUILD_ARCH=${ARCH:-amd64} BUILD_ARCH: ${ARCH:-amd64}
BUILD_VERSION: ${BUILD_TAG:-edge}
+3
View File
@@ -3,5 +3,8 @@ services:
addon: addon:
volumes: volumes:
- "./sample_config:/config" - "./sample_config:/config"
- "./api/tests:/app/tests"
ports: ports:
- "8000:8000" - "8000:8000"
env_file:
- api/.env
+28
View File
@@ -0,0 +1,28 @@
#!/bin/bash
set -e
api_location=${1}
web_location=${2}
function install_yarn() {
pushd $web_location
yarn
yarn build
cp -r $web_location/build $api_location/web
popd
}
function install_py() {
pushd $api_location
pip install . $api_location
popd
}
declare -i err=0 werr=0
install_py &
install_yarn &
while wait -fn || werr=$?; ((werr != 127)); do
err=$werr
done
echo "DONE BUILD"
+19
View File
@@ -0,0 +1,19 @@
#!/bin/bash
set -e
function prep_yarn() {
npm i -g yarn
}
function prep_py() {
pip install -U wheel setuptools pip
}
declare -i err=0 werr=0
prep_py &
prep_yarn &
while wait -fn || werr=$?; ((werr != 127)); do
err=$werr
done
echo "DONE PREP"
+10
View File
@@ -0,0 +1,10 @@
#!/bin/bash
api_location=${1}
pushd $api_location
echo "--------------------"
echo "BUILD_VERSION = "$BUILD_VERSION
echo $(python --version)
echo "--------------------"
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
-4
View File
@@ -1,4 +0,0 @@
#!/bin/bash
echo $(python --version)
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
+1 -1
View File
@@ -1,5 +1,5 @@
0: 0:
Type: Generic Type: Generic2
1: 1:
Type: Generic Type: Generic
2: 2:
+7 -1
View File
@@ -1,4 +1,7 @@
module.exports = { module.exports = {
'core': {
builder: 'webpack5'
},
"stories": [ "stories": [
"../src/**/*.stories.mdx", "../src/**/*.stories.mdx",
"../src/**/*.stories.@(js|jsx|ts|tsx)" "../src/**/*.stories.@(js|jsx|ts|tsx)"
@@ -8,5 +11,8 @@ module.exports = {
"@storybook/addon-essentials", "@storybook/addon-essentials",
"@storybook/preset-create-react-app", "@storybook/preset-create-react-app",
"@storybook/addon-queryparams", "@storybook/addon-queryparams",
] ],
"features": {
"emotionAlias": false,
},
} }
+6 -13
View File
@@ -2,24 +2,17 @@
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"name": "Debug CRA Tests", "name": "Debug Jest Tests",
"type": "node", "type": "node",
"request": "launch", "request": "launch",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts", "runtimeArgs": [
"args": [ "--inspect-brk",
"test", "${workspaceRoot}/node_modules/.bin/jest",
"--runInBand", "--runInBand"
"--no-cache",
"--watchAll=false"
], ],
"cwd": "${workspaceRoot}",
"protocol": "inspector",
"console": "integratedTerminal", "console": "integratedTerminal",
"internalConsoleOptions": "neverOpen", "internalConsoleOptions": "neverOpen",
"env": { "port": 9229
"CI": "true"
},
"disableOptimisticBPs": true
} }
] ]
} }
+59
View File
@@ -0,0 +1,59 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "tsc",
"problemMatcher": [],
"label": "npm: tsc",
"detail": "tsc -w",
"presentation": {
"reveal": "always",
"panel": "shared"
},
"runOptions": {
"runOn": "folderOpen"
},
"group": "test"
},
{
"type": "npm",
"script": "test",
"problemMatcher": [],
"label": "npm: test",
"detail": "test",
"presentation": {
"reveal": "always",
"panel": "shared"
},
"runOptions": {
"runOn": "folderOpen"
},
"group": "test",
},
{
"type": "npm",
"script": "storybook",
"problemMatcher": [],
"label": "npm: storybook",
"detail": "start-storybook -p 6006 -s public",
"promptOnClose": true
},
{
"type": "npm",
"script": "build",
"problemMatcher": [],
"label": "npm: build",
"detail": "react-scripts build",
"group": "build"
},
{
"type": "npm",
"script": "start",
"problemMatcher": [],
"label": "npm: start",
"detail": "react-scripts start",
"promptOnClose": true
},
]
}
+30 -13
View File
@@ -4,22 +4,34 @@
"private": true, "private": true,
"homepage": ".", "homepage": ".",
"dependencies": { "dependencies": {
"@types/jest": "^26.0.15", "@emotion/react": "^11.9.0",
"@types/node": "^12.0.0", "@emotion/styled": "^11.8.1",
"@types/react": "^17.0.0", "@mui/icons-material": "^5.8.3",
"@types/react-dom": "^17.0.0", "@mui/material": "^5.8.0",
"@mui/styles": "^5.8.0",
"@types/jest": "^27.5.1",
"@types/node": "^17.0.36",
"@types/react": "^18.0.9",
"@types/react-dom": "^18.0.5",
"@types/ws": "^8.5.3",
"@uiw/react-codemirror": "^4.7.0", "@uiw/react-codemirror": "^4.7.0",
"autosuggest-highlight": "^3.2.1",
"home-assistant-js-websocket": "^7.1.0",
"jss": "^10.8.2", "jss": "^10.8.2",
"react": "^17.0.2", "notistack": "^2.0.5",
"react-dom": "^17.0.2", "react": "^18.1.0",
"react-cookie": "^4.1.1",
"react-dom": "^18.1.0",
"react-flow-renderer": "^10.1.2", "react-flow-renderer": "^10.1.2",
"react-imask": "^6.4.2",
"react-jss": "^10.8.2", "react-jss": "^10.8.2",
"react-router-dom": "6", "react-router-dom": "6",
"react-scripts": "4.0.3", "react-scripts": "5.0.1",
"superstruct": "^0.15.4", "superstruct": "^0.15.4",
"theming": "^3.3.0", "theming": "^3.3.0",
"typescript": "^4.1.2", "typescript": "^4.1.2",
"web-vitals": "^1.0.1", "web-vitals": "^2.1.4",
"ws": "^8.7.0",
"yarn": "^1.22.17" "yarn": "^1.22.17"
}, },
"scripts": { "scripts": {
@@ -67,16 +79,21 @@
"@storybook/addon-essentials": "^6.4.22", "@storybook/addon-essentials": "^6.4.22",
"@storybook/addon-links": "^6.4.22", "@storybook/addon-links": "^6.4.22",
"@storybook/addon-queryparams": "^6.2.9", "@storybook/addon-queryparams": "^6.2.9",
"@storybook/builder-webpack5": "^6.5.6",
"@storybook/manager-webpack5": "^6.5.6",
"@storybook/node-logger": "^6.4.22", "@storybook/node-logger": "^6.4.22",
"@storybook/preset-create-react-app": "^3.2.0", "@storybook/preset-create-react-app": "^4.1.1",
"@storybook/react": "^6.4.22", "@storybook/react": "^6.4.22",
"@testing-library/jest-dom": "^5.11.4", "@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0", "@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^12.1.10", "@testing-library/user-event": "^14.2.0",
"@types/autosuggest-highlight": "^3.2.0",
"@types/chroma-js": "^2.1.3", "@types/chroma-js": "^2.1.3",
"@types/js-yaml": "^4.0.5", "@types/js-yaml": "^4.0.5",
"jest-environment-jsdom": "^27.5.1", "jest-environment-jsdom": "^28.1.0",
"ts-node": "^10.4.0" "ts-node": "^10.8.0",
"webpack": "^5.72.1",
"webpack-dev-server": "^4.9.0"
}, },
"moduleDirectories": [ "moduleDirectories": [
"node_modules", "node_modules",
+9 -5
View File
@@ -3,17 +3,21 @@ import { Routes, Route, BrowserRouter } from "react-router-dom";
import { AutomationRoute } from 'routes/automation'; import { AutomationRoute } from 'routes/automation';
import { useConnectedApiService } from 'apiService'; import { useConnectedApiService } from 'apiService';
import { ErrorBoundary } from 'components/ErrorBoundary'; import { ErrorBoundary } from 'components/ErrorBoundary';
import { CookiesProvider } from "react-cookie";
function App() { function App() {
const api = useConnectedApiService(); const api = useConnectedApiService();
return ( return (
<div className="app"> <div className="app">
<ErrorBoundary> <ErrorBoundary>
<BrowserRouter> <CookiesProvider>
<Routes> <BrowserRouter>
<Route path="*" element={<AutomationRoute api={api} />} /> <Routes>
</Routes> <Route path="*" element={<AutomationRoute api={api} />} />
</BrowserRouter> </Routes>
</BrowserRouter>
</CookiesProvider>
</ErrorBoundary> </ErrorBoundary>
</div> </div>
); );
+6 -3
View File
@@ -10,13 +10,16 @@ export const makeRemoteAPI = (baseURL: string): API => ({
data = {} data = {}
}) { }) {
try { try {
const reply = await fetch(baseURL + path, { const payload: RequestInit = {
method, method,
headers: { headers: {
"Content-Type": "application/json" "Content-Type": "application/json"
}, },
body: JSON.stringify(data), };
}); if (method !== 'GET') {
payload["body"] = JSON.stringify(data);
}
const reply = await fetch(baseURL + path, payload);
let response: APIResponse<any>; let response: APIResponse<any>;
if (reply.status === 200) { if (reply.status === 200) {
response = { response = {
+11 -7
View File
@@ -4,14 +4,18 @@ import { makeRemoteAPI } from "./base";
import { useAPIService } from './core'; import { useAPIService } from './core';
import { useMockAPI } from "./mock"; import { useMockAPI } from "./mock";
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i); const locationPrefixWeb = window.location.pathname.match(/(\/.+\/)web/i);
const baseURL = new URL(
process.env.NODE_ENV === 'development' ?
`http://${window.location.hostname}:8000` :
window.location.origin + (!locationPrefixWeb ? '' : locationPrefixWeb[1])
);
export const wsURL = baseURL + "socket"
export const remoteAutoAPI = makeRemoteAPI(
baseURL + "automations"
);
export const useConnectedApiService = () => useAPIService( export const useConnectedApiService = () => useAPIService(
makeAutomationAPI(makeRemoteAPI( makeAutomationAPI(remoteAutoAPI)
process.env.NODE_ENV === 'development' ?
"http://localhost:8000/automations" :
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
))
); );
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService( export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
makeAutomationAPI(useMockAPI(initialAutos)) makeAutomationAPI(useMockAPI(initialAutos))
+1 -1
View File
@@ -15,7 +15,7 @@ export const useMockAPI = (
method = "POST", method = "POST",
data = {} data = {}
}) { }) {
console.debug("[[mockCall]]", method, path, data); // console.debug("[[mockCall]]", method, path, data);
if (path === AUTOMTAION_LIST) { if (path === AUTOMTAION_LIST) {
return { return {
ok: true, ok: true,
+1 -1
View File
@@ -7,7 +7,7 @@ export interface ListParams {
} }
export type APIRequest<D> = { export type APIRequest<D> = {
path: string; path: string;
method?: "POST" | "DELETE", method?: "POST" | "DELETE" | "GET",
data?: D; data?: D;
}; };
@@ -34,6 +34,13 @@
border-radius: 5px; border-radius: 5px;
} }
.automation-editor--info-box--tag-list {
max-height: 30vh;
overflow-y: scroll;
padding-left: 0.25em;
padding-right: 0.25em;
}
.automation-editor--info-box--tags>h1 { .automation-editor--info-box--tags>h1 {
font-size: 1.5em; font-size: 1.5em;
} }
@@ -49,6 +56,7 @@
.automation-editor--info-box--tag>div { .automation-editor--info-box--tag>div {
margin: 0; margin: 0;
flex: 1;
} }
.automation-editor--info-box--tag>div>input { .automation-editor--info-box--tag>div>input {
@@ -56,29 +64,11 @@
padding: 1em 0.25em 0.2em 0.25em; padding: 1em 0.25em 0.2em 0.25em;
} }
.automation-editor--info-box--tag>button { .automation-editor--info-box--tag--trash, .automation-editor--info-box--tag--add {
height: 1.25em; height: 2em;
width: 1.25em; width: 2em;
font-size: 1em; font-size: 1em;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.automation-editor--info-box--tag--error {
width: 100%;
display: flex;
justify-content: center;
padding: 0;
}
.automation-editor--info-box--tag--error.hide {
height: 0;
opacity: 0;
display: none;
}
.automation-editor--info-box--tag--error.show {
height: fit-content;
opacity: 1;
}
@@ -1,19 +1,29 @@
import { ComponentMeta, ComponentStory } from "@storybook/react"; import { ComponentMeta, ComponentStory } from "@storybook/react";
import { makeTagDB } from "components/AutomationList/TagDB";
import { Page } from "components/Page";
import { useState } from "react"; import { useState } from "react";
import { AutoInfoBox } from "./AutoInfoBox"; import { AutoInfoBox } from "./AutoInfoBox";
import { defaultAutomation } from 'utils/defaults';
export default { export default {
title: 'App/AutomationList/Editor/InfoBox', title: 'App/AutomationList/Editor/InfoBox',
component: AutoInfoBox, component: AutoInfoBox,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
tagDB: makeTagDB([
defaultAutomation("test")
])
}
} as ComponentMeta<typeof AutoInfoBox>; } as ComponentMeta<typeof AutoInfoBox>;
export const NoTags: ComponentStory<typeof AutoInfoBox> = args => { export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
const [[metadata, tags], setState] = useState([args.metadata, args.tags]) const [[metadata, tags], setState] = useState([args.metadata, args.tags])
return ( return (
<div className="page"> <Page>
<AutoInfoBox <AutoInfoBox
{...args}
className="" className=""
metadata={metadata} metadata={metadata}
tags={tags} tags={tags}
@@ -22,7 +32,7 @@ export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
setState([m, t]) setState([m, t])
}} }}
/> />
</div> </Page>
) )
} }
NoTags.args = { NoTags.args = {
@@ -2,16 +2,19 @@ import "./AutoInfoBox.css";
import { AutomationMetadata } from "types/automations"; import { AutomationMetadata } from "types/automations";
import { InputList } from "components/Inputs/InputList"; import { InputList } from "components/Inputs/InputList";
import InputText from "components/Inputs/InputText"; import InputText from "components/Inputs/InputText";
import InputTextArea from "components/Inputs/InputTextArea"; import { FC, ReactNode, useRef, useState } from 'react';
import { FC, useRef, useState } from 'react';
import { AddIcon, TrashIcon } from "components/Icons"; import { AddIcon, TrashIcon } from "components/Icons";
import { Button } from "components/Inputs/Button"; import { Button } from "components/Inputs/Button";
import InputAutoText from "components/Inputs/InputAutoText";
import { TagDB } from "components/AutomationList/TagDB";
interface Props { interface Props {
className: string; className: string;
metadata: AutomationMetadata; metadata: AutomationMetadata;
tags: Array<[string, string]>; tags: Array<[string, string]>;
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void; onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
tagDB: TagDB;
children?: ReactNode;
} }
export const AutoInfoBox: FC<Props> = ({ export const AutoInfoBox: FC<Props> = ({
metadata, metadata,
@@ -19,6 +22,7 @@ export const AutoInfoBox: FC<Props> = ({
onUpdate, onUpdate,
className, className,
children, children,
tagDB,
}) => { }) => {
// state // state
const [newTag, setNewTag] = useState<[string, string]>(["", ""]) const [newTag, setNewTag] = useState<[string, string]>(["", ""])
@@ -26,6 +30,7 @@ export const AutoInfoBox: FC<Props> = ({
const errorTimeoutId = useRef(-1); const errorTimeoutId = useRef(-1);
// aliases // aliases
const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n));
const setError = (index: number | 'new', msg: string) => { const setError = (index: number | 'new', msg: string) => {
_setError([index, msg]) _setError([index, msg])
if (errorTimeoutId.current >= 0) { if (errorTimeoutId.current >= 0) {
@@ -69,7 +74,9 @@ export const AutoInfoBox: FC<Props> = ({
if (error) { if (error) {
return setError('new', error) return setError('new', error)
} }
onUpdate(metadata, tags.concat([newTag])); onUpdate(metadata, tags.concat([
newTag.map(x => x.trim()) as [string, string]
]));
setNewTag(['', '']); setNewTag(['', '']);
} }
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [ const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [
@@ -81,7 +88,7 @@ export const AutoInfoBox: FC<Props> = ({
<div className="automation-editor--info-box-inner"> <div className="automation-editor--info-box-inner">
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} /> <InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} />
<InputText label="Name" value={metadata.alias ?? ""} onChange={onUpdateMetadata('alias')} /> <InputText label="Name" value={metadata.alias ?? ""} onChange={onUpdateMetadata('alias')} />
<InputTextArea label="Description" value={metadata.description ?? ""} onChange={onUpdateMetadata('description')} /> <InputText multiline label="Description" value={metadata.description ?? ""} onChange={onUpdateMetadata('description')} />
<InputList <InputList
label="Mode" label="Mode"
current={metadata.mode} current={metadata.mode}
@@ -95,22 +102,42 @@ export const AutoInfoBox: FC<Props> = ({
/> />
<div className="automation-editor--info-box--tags"> <div className="automation-editor--info-box--tags">
<h1>Tags</h1> <h1>Tags</h1>
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag"> <div className="automation-editor--info-box--tag-list">
<Button onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button> {tags.map(([tagName, tagValue], tagIndex) => <div key={tagIndex} className="automation-editor--info-box--tag">
<InputText value={tagName} label="Name" onChange={v => updateTagName(v, tagIndex)} /> <InputAutoText
<InputText value={tagValue} label="Tag" onChange={v => onUpdateTags(v, tagIndex)} /> value={tagName}
<span className={["automation-editor--info-box--tag--error", (errorIndex === tagIndex) ? "show" : "hide"].join(" ")}> label="Name"
{error} onChange={v => updateTagName(v, tagIndex)}
</span> options={foundNewTagNames}
</div>)} error={errorIndex === tagIndex ? error : undefined}
/>
<InputAutoText
value={tagValue}
label="Tag"
onChange={v => onUpdateTags(v, tagIndex)}
options={tagDB.getTagValues(tagName)}
error={errorIndex === tagIndex ? error : undefined}
/>
<Button className="automation-editor--info-box--tag--trash" onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button>
</div>)}
</div>
<hr /> <hr />
<div className="automation-editor--info-box--tag"> <div className="automation-editor--info-box--tag">
<InputText value={newTag[0]} label="Name" onChange={v => setNewTag([v, newTag[1]])} onEnter={addNewTag} /> <InputAutoText
<InputText value={newTag[1]} label="Tag" onChange={v => setNewTag([newTag[0], v])} onEnter={addNewTag} /> value={newTag[0]}
<Button onClick={addNewTag} ><AddIcon /></Button> label="Name"
<span className={["automation-editor--info-box--tag--error", (errorIndex === 'new') ? "show" : "hide"].join(" ")}> onChange={v => setNewTag([v, newTag[1]])}
{error} options={foundNewTagNames}
</span> error={errorIndex === 'new' ? error : undefined}
/>
<InputAutoText
value={newTag[1]}
label="Tag"
onChange={v => setNewTag([newTag[0], v])}
options={tagDB.getTagValues(newTag[0])}
error={errorIndex === 'new' ? error : undefined}
/>
<Button className="automation-editor--info-box--tag--add" onClick={addNewTag} ><AddIcon /></Button>
</div> </div>
</div> </div>
</div> </div>
@@ -1,5 +1,6 @@
.automation-editor { .automation-editor {
display: flex; display: flex;
position: relative;
flex-direction: row; flex-direction: row;
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -27,13 +28,9 @@
.automation-editor--flow-wrapper--toolbar { .automation-editor--flow-wrapper--toolbar {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
gap: 0.25em;
justify-content: flex-end; justify-content: flex-end;
} margin-top: 0.25em;
.automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
height: 0;
opacity: 0;
overflow: hidden;
} }
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * { .automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
@@ -75,3 +72,25 @@
transform: rotate(180deg); transform: rotate(180deg);
z-index: 2; z-index: 2;
} }
.automation-editor.loading .mock-list {
position: absolute;
left: 0;
width: 40%;
height: 100%;
}
.automation-editor.loading .mock-graph {
position: absolute;
left: 40%;
width: 60%;
height: 100%;
}
.automation-editor .linear-loader {
position: absolute;
top: 0;
left: 0;
width: 100%;
}
@@ -3,6 +3,8 @@ import { ComponentMeta, ComponentStory } from '@storybook/react';
import { AutomationEditor } from './index'; import { AutomationEditor } from './index';
import { useState } from 'react'; import { useState } from 'react';
import * as dgconst from 'components/DAGFlow/constants'; import * as dgconst from 'components/DAGFlow/constants';
import { Page } from "components/Page";
import { makeTagDB } from "components/AutomationList/TagDB";
export default { export default {
@@ -10,21 +12,22 @@ export default {
component: AutomationEditor, component: AutomationEditor,
parameters: { actions: { argTypesRegex: '^on.*' } }, parameters: { actions: { argTypesRegex: '^on.*' } },
args: { args: {
dims: dgconst.DEFAULT_DIMS dims: dgconst.DEFAULT_DIMS,
} }
} as ComponentMeta<typeof AutomationEditor> } as ComponentMeta<typeof AutomationEditor>
const Template: ComponentStory<typeof AutomationEditor> = args => { const Template: ComponentStory<typeof AutomationEditor> = args => {
const [state, setState] = useState(args.automation) const [state, setState] = useState(args.automation)
return <div className="page"> return <Page>
<AutomationEditor <AutomationEditor
{...args} {...args}
tagDB={makeTagDB(state ? [state] : [])}
automation={state} automation={state}
onUpdate={s => { onUpdate={s => {
window.setTimeout(() => setState(s), 3000) window.setTimeout(() => setState(s), 3000)
}} }}
/> />
</div> </Page>
} }
export const Loading = Template.bind({}); export const Loading = Template.bind({});
@@ -1,6 +1,7 @@
import "./index.css"; import "./index.css";
import Icon from '@mui/material/Icon';
import { ArrowIcon, CheckMarkIcon } from "components/Icons"; import { ArrowIcon, CheckMarkIcon } from "components/Icons";
import { FC, useState } from "react"; import { FC, useEffect, useState } from "react";
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
import { AutoInfoBox } from "./AutoInfoBox"; import { AutoInfoBox } from "./AutoInfoBox";
import { ButtonIcon } from "components/Icons/ButtonIcons"; import { ButtonIcon } from "components/Icons/ButtonIcons";
@@ -10,16 +11,21 @@ import { SafeDAGAutomationFlow } from "components/DAGFlow/safe";
import { DAGAutomationFlowDims } from "components/DAGFlow/types"; import { DAGAutomationFlowDims } from "components/DAGFlow/types";
import { MiniFailure } from 'types/validators/helper'; import { MiniFailure } from 'types/validators/helper';
import InputYaml from "components/Inputs/InputYaml"; import InputYaml from "components/Inputs/InputYaml";
import { TagDB } from "components/AutomationList/TagDB";
import Skeleton from "@mui/material/Skeleton";
import LinearProgress from "@mui/material/LinearProgress";
interface Props { interface Props {
automation?: AutomationData; automation?: AutomationData;
dims: DAGAutomationFlowDims; dims: DAGAutomationFlowDims;
onUpdate: (auto: AutomationData) => void; onUpdate: (auto: AutomationData) => void;
tagDB: TagDB;
} }
export const AutomationEditor: FC<Props> = ({ export const AutomationEditor: FC<Props> = ({
dims, dims,
automation: propsAutos, automation: propsAutos,
onUpdate: propsOnUpdate, onUpdate: propsOnUpdate,
tagDB,
}) => { }) => {
// state // state
const { const {
@@ -32,13 +38,22 @@ export const AutomationEditor: FC<Props> = ({
save, save,
saveAndUpdate, saveAndUpdate,
} = useAutomatioEditorState(propsAutos, propsOnUpdate); } = useAutomatioEditorState(propsAutos, propsOnUpdate);
const [closeInfo, setCloseInfo] = useState(false); const [closeInfo, setCloseInfo] = useState(false);
const [flipped, setFlipped] = useState(dims.flipped);
// effect
useEffect(() => {
if (dims.flipped !== flipped) {
setFlipped(dims.flipped)
}
}, [dims.flipped])
// render // render
if (state.status === 'loading') { if (state.status === 'loading') {
return <div className="automation-editor loading"> return <div className="automation-editor loading">
Loading... <LinearProgress className="linear-loader" />
<Skeleton className="mock-list" variant="rectangular" />
<Skeleton className="mock-graph" variant="rectangular" />
</div> </div>
} }
if (state.status === 'invalid') { if (state.status === 'invalid') {
@@ -50,21 +65,31 @@ export const AutomationEditor: FC<Props> = ({
/> />
} }
return <div className="automation-editor"> return <div className="automation-editor">
{state.status === 'saving' && <LinearProgress className="linear-loader" />}
<AutoInfoBox <AutoInfoBox
className={closeInfo ? "hide" : "show"} className={closeInfo ? "hide" : "show"}
metadata={state.data.metadata} metadata={state.data.metadata}
tags={state.data.tags} tags={state.data.tags}
onUpdate={updateMetadata} onUpdate={updateMetadata}
tagDB={tagDB}
> >
<ButtonIcon <ButtonIcon
className="automation-editor--info-box--icon" className="automation-editor--info-box--icon"
onClick={() => setCloseInfo(!closeInfo)} onClick={() => setCloseInfo(!closeInfo)}
title={closeInfo ? "Show Metadata" : "Hide Metadata"} title={closeInfo ? "Show Metadata" : "Hide Metadata"}
>{ArrowIcon}</ButtonIcon> Icon={ArrowIcon}
/>
</AutoInfoBox> </AutoInfoBox>
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}> <div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
<div className="automation-editor--flow-wrapper--toolbar"> <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 <Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"} className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save} onClick={save}
@@ -81,7 +106,10 @@ export const AutomationEditor: FC<Props> = ({
onSequenceUpdate={updateSequence} onSequenceUpdate={updateSequence}
onTriggerUpdate={updateTrigger} onTriggerUpdate={updateTrigger}
onConditionUpdate={updateCondition} onConditionUpdate={updateCondition}
dims={dims} dims={{
...dims,
flipped,
}}
/> />
</div> </div>
</div> </div>
@@ -6,7 +6,7 @@ import { MiniFailure } from '../../types/validators/helper';
export type EditorData = ReturnType<typeof genEditorData>; export type EditorData = ReturnType<typeof genEditorData>;
export type EditorState = { export type EditorState = {
status: 'unchanged' | 'changed', status: 'unchanged' | 'changed' | 'saving',
data: EditorData data: EditorData
} | { } | {
status: 'loading' status: 'loading'
@@ -43,7 +43,8 @@ export const useAutomatioEditorState = (
}), {}) }), {})
}; };
update({ update({
status: "loading", status: "saving",
data,
}) })
onSave(cleanData); onSave(cleanData);
} }
@@ -2,8 +2,9 @@ import "styles/root.css";
import { ComponentMeta, ComponentStory } from "@storybook/react"; import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react"; import { useState } from "react";
import { AutomationList } from "."; import { AutomationList } from ".";
import { createMockAuto } from "utils/mocks"; import { bigMockAutoList } from "utils/mocks";
import * as dgconst from 'components/DAGFlow/constants'; import * as dgconst from 'components/DAGFlow/constants';
import { Page } from "components/Page";
export default { export default {
title: 'App/AutomationList', title: 'App/AutomationList',
@@ -17,7 +18,7 @@ export default {
const Template: ComponentStory<typeof AutomationList> = args => { const Template: ComponentStory<typeof AutomationList> = args => {
const [autos, setAutos] = useState(args.automations) const [autos, setAutos] = useState(args.automations)
return <div className="page"> return <Page>
<AutomationList {...args} automations={autos} <AutomationList {...args} automations={autos}
onAdd={a => { onAdd={a => {
args.onAdd(a); args.onAdd(a);
@@ -39,7 +40,7 @@ const Template: ComponentStory<typeof AutomationList> = args => {
]); ]);
}} }}
/> />
</div> </Page>
} }
export const EmptyStart = Template.bind({}) export const EmptyStart = Template.bind({})
@@ -51,457 +52,7 @@ EmptyStart.args = {
export const FewAutos = Template.bind({}) export const FewAutos = Template.bind({})
FewAutos.args = { FewAutos.args = {
...FewAutos.args, ...FewAutos.args,
automations: [ automations: bigMockAutoList,
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
createMockAuto({ "Type": "Climate" }),
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
createMockAuto({ "Room": "Office", "Type": "Lights" }),
createMockAuto({ "Room": "Office" }),
createMockAuto(),
{
"metadata": {
"id": "1649947692702",
"alias": "Bed Remote",
"description": "",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_on",
"id": "turn_on"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_off",
"id": "turn_off"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_up",
"id": "dim_up"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_down",
"id": "dim_down"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_double_press",
"subtype": "turn_on",
"id": "up_dbclk"
}
],
"condition": [],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "turn_off"
}
],
"sequence": [
{
"type": "turn_off",
"device_id": "asdasdasdasdas",
"entity_id": "light.bulb_ari_lamp",
"domain": "light"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "turn_on"
}
],
"sequence": [
{
"service": "light.turn_on",
"data": {
"color_temp": 153,
"brightness_pct": 100
},
"target": {
"device_id": "asdasdasdasdas"
}
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "dim_up"
}
],
"sequence": [
{
"device_id": "asdasdasdasdas",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_increase"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "dim_down"
}
],
"sequence": [
{
"device_id": "asdasdasdasdas",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_decrease"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "up_dbclk"
}
],
"sequence": [
{
"service": "light.turn_on",
"data": {
"color_temp": 500,
"brightness_pct": 100
},
"target": {
"device_id": "asdasdasdasdas"
}
}
]
}
],
"default": []
}
],
"tags": {
"Type": "Remote",
"Room": "Bedroom"
}
},
{
"metadata": {
"id": "1641617168123",
"alias": "Ensure On",
"description": "",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"platform": "device",
"type": "turned_off",
"device_id": "tasdasdasdasdasdasda",
"entity_id": "switch.power_washer",
"domain": "switch"
},
{
"platform": "device",
"type": "turned_off",
"device_id": "dasdasdasdasdas",
"entity_id": "switch.plug_living_room_tv",
"domain": "switch"
}
],
"condition": [],
"sequence": [
{
"type": "turn_on",
"device_id": "tasdasdasdasdasdasda",
"entity_id": "switch.power_washer",
"domain": "switch"
},
{
"type": "turn_on",
"device_id": "dasdasdasdasdas",
"entity_id": "switch.plug_living_room_tv",
"domain": "switch"
}
],
"tags": {}
},
{
"metadata": {
"id": "1649726828269",
"alias": "Climate Heat Mode Settings",
"description": "Ensures that the climate is always in sync with the house settings",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"platform": "state",
"entity_id": "climate.main_floor",
"id": "main"
},
{
"platform": "state",
"entity_id": "climate.second_floor",
"id": "second"
},
{
"platform": "state",
"entity_id": "input_boolean.thermostats_house_is_heating",
"id": "setting"
}
],
"condition": [],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "setting"
}
],
"sequence": [
{
"service": "climate.turn_off",
"data": {},
"target": {
"device_id": [
"d88dcfe82bc9a1c0f2b77b871848155e",
"ef2d47fdeef19f8984b85f92f2597f73"
]
}
}
]
},
{
"conditions": [
{
"condition": "state",
"entity_id": "input_boolean.thermostats_house_is_heating",
"state": "on"
}
],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "and",
"conditions": [
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'heat' }}"
},
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'off' }}"
}
]
}
],
"sequence": [
{
"service": "climate.set_hvac_mode",
"data": {
"hvac_mode": "heat"
},
"target": {
"entity_id": "{{ trigger.entity_id }}"
}
}
]
}
]
}
]
}
],
"default": [
{
"choose": [
{
"conditions": [
{
"condition": "and",
"conditions": [
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'cool' }}"
},
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'off' }}"
}
]
}
],
"sequence": [
{
"service": "climate.set_hvac_mode",
"data": {
"hvac_mode": "cool"
},
"target": {
"entity_id": "{{ trigger.entity_id }}"
}
}
]
}
]
}
]
}
],
"tags": {}
},
{
"metadata": {
"id": "1628024070687",
"alias": "Baby Light Setting",
"description": "Configures max/min light settings for the baby ",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"platform": "time",
"at": "21:00:00",
"id": "night"
},
{
"platform": "time",
"at": "07:30:00",
"id": "day"
}
],
"condition": [],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "night"
}
],
"sequence": [
{
"service": "zwave_js.set_config_parameter",
"data": {
"parameter": "5",
"value": "15"
}
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "day"
}
],
"sequence": [
{
"service": "zwave_js.set_config_parameter",
"data": {
"parameter": "5",
"value": 100
}
}
]
}
],
"default": []
}
],
"tags": {}
},
{
"metadata": {
"id": "alarmanlage_an",
"alias": "alarmanlage_an (Uhrzeit)",
"mode": "single"
},
tags: {},
"trigger": [
{
"entity_id": "sensor.time",
"platform": "state",
"to": "23:30"
}
],
"condition": [
{
"condition": "or",
"conditions": [
{
"condition": "state",
"entity_id": "person.simon",
"state": "home"
},
{
"condition": "state",
"entity_id": "person.leni",
"state": "home"
}
]
}
],
"sequence": [
{
"service": "alarm_control_panel.alarm_arm_night",
"target": {
"entity_id": [
"alarm_control_panel.alarmo"
]
},
"data": {
"code": "xxx"
}
},
{
"service": "alarm_control_panel.alarm_arm_away",
"data": {},
"target": {
"entity_id": "alarm_control_panel.blink_home"
}
}
],
}
],
} }
@@ -589,3 +140,41 @@ BadAutmations.args = {
} }
], ],
} }
export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = args => {
const [autos, setAutos] = useState(args.automations)
return <Page>
<AutomationList {...args} automations={autos}
onAdd={a => {
window.setTimeout(() => {
args.onAdd(a);
setAutos([...autos, a]);
}, 10000)
}}
onRemove={i => {
window.setTimeout(() => {
args.onRemove(i);
setAutos([
...autos.slice(0, i),
...autos.slice(i + 1),
]);
}, 10000)
}}
onUpdate={(i, a) => {
window.setTimeout(() => {
args.onUpdate(i, a);
setAutos([
...autos.slice(0, i),
a,
...autos.slice(i + 1),
]);
}, 10000)
}}
/>
</Page>
}
FewAutosWithSlowLoader.args = {
...FewAutosWithSlowLoader.args,
automations: bigMockAutoList,
}
@@ -5,7 +5,8 @@
} }
.automation-list-box--body { .automation-list-box--body {
overflow: auto; overflow-y: auto;
overflow-x: hidden;
height: 100%; height: 100%;
flex: 1; flex: 1;
user-select: none; user-select: none;
@@ -24,7 +25,15 @@
padding-bottom: 0.5em; padding-bottom: 0.5em;
border-width: 1px; border-width: 1px;
border-bottom-style: solid; border-bottom-style: solid;
border-color: white; border-color: var(--primary-accent);
}
.automation-list-box--body--group.other {
border-color: var(--green);
}
.automation-list-box--body--group.other>b {
color: var(--change);
} }
.automation-list-box--body--group>.automation-list-box--body--group { .automation-list-box--body--group>.automation-list-box--body--group {
@@ -40,7 +49,8 @@
padding: 0.1em; padding: 0.1em;
} }
.automation-list-box--body--group>b:hover { .automation-list-box--body--group>b:hover,
.automation-list-box--body--group.selected>b {
background-color: var(--secondary-accent); background-color: var(--secondary-accent);
color: var(--secondary); color: var(--secondary);
} }
@@ -2,6 +2,8 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react"; import { useState } from "react";
import { AutomationListBox } from "./AutomationListBox"; import { AutomationListBox } from "./AutomationListBox";
import { createMockAuto } from "utils/mocks"; import { createMockAuto } from "utils/mocks";
import { Page } from "components/Page";
import { CookiesProvider } from "react-cookie";
export default { export default {
title: 'App/AutomationList/Box', title: 'App/AutomationList/Box',
@@ -14,12 +16,14 @@ export default {
const Template: ComponentStory<typeof AutomationListBox> = args => { const Template: ComponentStory<typeof AutomationListBox> = args => {
const [selected, setSelected] = useState(args.selected) const [selected, setSelected] = useState(args.selected)
return <div className="page"> return <Page>
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => { <CookiesProvider>
setSelected(i) <AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
args.onSelectAutomation(i) setSelected(i)
}} /> args.onSelectAutomation(i)
</div> }} />
</CookiesProvider>
</Page>
} }
export const EmptyStart = Template.bind({}) export const EmptyStart = Template.bind({})
@@ -1,88 +1,18 @@
import { groupAutomations, getTagList } from './AutomationListBox'; import { getTagList } from './AutomationListBox';
import { AutomationData } from 'types/automations/index';
import { createMockAuto } from 'utils/mocks'; import { createMockAuto } from 'utils/mocks';
test('group automations', () => { // const makeDummy = (id: string, tags: Record<string, string>) => ({
const automations: AutomationData[] = [ // condition: [],
{ // metadata: {
condition: [], // id,
metadata: { // alias: '',
id: '1', // description: '',
alias: '', // mode: 'single',
description: '', // },
mode: 'single', // tags,
}, // sequence: [],
tags: { // trigger: [],
"Room": 'Living Room', // })
"Type": 'Lights'
},
sequence: [],
trigger: [],
},
{
condition: [],
metadata: {
id: '2',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Living Room',
"Type": 'Climate'
},
sequence: [],
trigger: [],
},
{
condition: [],
metadata: {
id: '3',
alias: '',
description: '',
mode: 'single',
},
tags: {
"Room": 'Kitchen',
"Type": 'Climate'
},
sequence: [],
trigger: [],
},
];
expect(groupAutomations(automations, [0, 1], ['Room', "Type"])).toStrictEqual({
"Living Room": {
"Lights": [0],
"Climate": [1],
},
"Kitchen": {
"Climate": [2],
}
})
expect(groupAutomations(automations, [1, 0], ['Room', "Type"])).toStrictEqual({
"Lights": {
"Living Room": [0],
},
"Climate": {
"Living Room": [1],
"Kitchen": [2]
}
})
expect(groupAutomations(automations, [1], ['Room', "Type"])).toStrictEqual({
"Lights": [0],
"Climate": [1, 2]
})
expect(groupAutomations(automations, [0], ['Room', "Type"])).toStrictEqual({
"Living Room": [0, 1],
"Kitchen": [2]
})
expect(groupAutomations(automations, [], ['Room', "Type"])).toStrictEqual([
0, 1, 2
])
});
test('getTagList', () => { test('getTagList', () => {
expect(getTagList([ expect(getTagList([
@@ -1,10 +1,12 @@
import "./AutomationListBox.css"; import "./AutomationListBox.css";
import { FC, useState } from 'react'; import { FC, useState } from 'react';
import { AutomationData, AutomationMetadata } from "types/automations"; import { AutomationData } from "types/automations";
import InputMultiSelect from "components/Inputs/InputMultiSelect"; import InputMultiSelect from "components/Inputs/InputMultiSelect";
import InputText from "components/Inputs/InputText"; import InputText from "components/Inputs/InputText";
import { Button } from "components/Inputs/Button"; import { Button } from "components/Inputs/Button";
import { TrashIcon } from "components/Icons"; import { makeGrouping } from "./automationGrouper";
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
import { useCookies } from "react-cookie";
export type Props = { export type Props = {
@@ -15,6 +17,34 @@ export type Props = {
onAdd: () => void; onAdd: () => void;
} }
const useAutomationListBoxState = () => {
const [cookies, setCookies, _] = useCookies(['albSearchText', 'albSelected']);
let initialSelected = [];
try {
initialSelected = JSON.parse(cookies.albSelected)
if (!Array.isArray(initialSelected)) {
initialSelected = [initialSelected]
}
initialSelected = initialSelected.map(Number)
// eslint-disable-next-line
} catch (_) { }
const [searchText, setSearchText] = useState(cookies.albSearchText ?? "");
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>(initialSelected);
return {
searchText,
setSearchText(v: string) {
setSearchText(v)
setCookies('albSearchText', v)
},
setSelectedTagIdx(n: number[]) {
setSelectedTagIdx(n)
setCookies('albSelected', JSON.stringify(n))
},
selectedTagIdx,
}
}
export const AutomationListBox: FC<Props> = ({ export const AutomationListBox: FC<Props> = ({
automations, automations,
selected, selected,
@@ -24,10 +54,18 @@ export const AutomationListBox: FC<Props> = ({
}) => { }) => {
const tags = getTagList(automations); const tags = getTagList(automations);
const [searchText, setSearchText] = useState(''); const {
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]); searchText,
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags); setSearchText,
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selectedTagIdx, tags); selectedTagIdx,
setSelectedTagIdx,
} = useAutomationListBoxState();
const filteredAutomations = filterAutomations(automations, searchText.toLowerCase(), selectedTagIdx, tags);
const grouping = makeGrouping(
filteredAutomations.map(([a, _]) => a),
selectedTagIdx.map(i => tags[i]),
selected,
)
return <div className="automation-list-box"> return <div className="automation-list-box">
<div className="automation-list-box--nav"> <div className="automation-list-box--nav">
@@ -45,7 +83,15 @@ export const AutomationListBox: FC<Props> = ({
/> />
</div> </div>
<div className="automation-list-box--body"> <div className="automation-list-box--body">
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove, selected)} <AutomationListBoxGroup
events={{
onSelectAutomation,
onRemove
}}
autos={filteredAutomations}
grouping={grouping}
selectedAutomationIdx={selected}
/>
</div> </div>
<div className="automation-list-box--bottom"> <div className="automation-list-box--bottom">
<Button onClick={onAdd}>Add</Button> <Button onClick={onAdd}>Add</Button>
@@ -78,134 +124,5 @@ const filterAutomations = (autos: AutomationData[], searchText: string, selected
return false return false
} }
} }
if (selected.length > 0) {
for (const i of selected) {
if (!a.tags[tags[i]]) {
return false
}
}
}
return true return true
}) })
export const groupAutomations = (
autos: AutomationData[],
selected: number[],
tags: string[],
) => {
if (selected.length === 0) {
return autos.map((_, i) => i);
}
const out: any = {};
for (let ai = 0; ai < autos.length; ai++) {
const a = autos[ai];
let where = out;
let tag: string = '';
let lastKey: string | null = null;
for (const i of selected) {
tag = tags[i];
if (lastKey !== null) {
where = where[lastKey]
}
if (!where[a.tags[tag]]) {
where[a.tags[tag]] = {}
}
lastKey = a.tags[tag]
}
if (lastKey !== null) {
if (!where[lastKey] || !Array.isArray(where[lastKey])) {
where[lastKey] = []
}
where[lastKey].push(ai)
}
}
return out;
}
const convertGroupsToItems = (
groups: any,
autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void,
selected: number,
) => {
if (Array.isArray(groups)) {
return groups.map(i => {
const [auto, autoIndex] = autos[i];
let title = "BadAuto<<Missing Metadata>>"
if (auto.metadata) {
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`
}
return <div
key={i}
className={["automation-list-box--body--item", selected === autoIndex ? 'selected' : ''].join(' ')}
title={title}
onClick={() => onSelectAutomation(autoIndex)}
>
<MetadataBox metadata={auto.metadata} tags={auto.tags} />
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
</div>
})
} else {
return Object.keys(groups).map(groupName => {
return <AutomationListBoxGroup
key={groupName}
groupName={groupName}
groups={groups[groupName]}
autos={autos}
onSelectAutomation={onSelectAutomation}
onRemove={onRemove}
selected={selected}
/>
})
}
}
export const MetadataBox: FC<{
metadata: AutomationMetadata,
tags: Record<string, string>,
}> = (auto) => {
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
if (auto.metadata) {
title = <>
<b>{String(auto.metadata.alias ?? "").slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
<span>{String(auto.metadata.description ?? "").slice(0, 25)}</span>
</>
}
return <div
className="automation-list-box--body--item--title"
>
{title}
<div
className="automation-list-box--body--item--tags"
>
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
<b>{tagName}:</b> {auto.tags[tagName]}
</span>)}
</div>
</div>
}
const AutomationListBoxGroup: FC<{
groupName: string,
groups: any,
autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void;
selected: number,
}> = ({
groupName,
groups,
autos,
onSelectAutomation,
onRemove,
selected,
}) => {
const [open, setOpen] = useState(false);
return <div className="automation-list-box--body--group">
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove, selected)}
</div>
}
@@ -0,0 +1,141 @@
import { TrashIcon } from "components/Icons";
import { Button } from "components/Inputs/Button";
import { MetadataBox } from "./AutomationMetadataBox";
import { AutomationData } from "types/automations";
import { AutomationGrouping } from "./automationGrouper";
import { FC, useState } from "react";
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} />
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
</div>
}
@@ -0,0 +1,27 @@
import { FC } from "react"
import { AutomationMetadata } from "types/automations"
export const MetadataBox: FC<{
metadata: AutomationMetadata,
tags: Record<string, string>,
}> = (auto) => {
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
if (auto.metadata) {
title = <>
<b>{String(auto.metadata.alias ?? "").slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
<span>{String(auto.metadata.description ?? "").slice(0, 25)}</span>
</>
}
return <div
className="automation-list-box--body--item--title"
>
{title}
<div
className="automation-list-box--body--item--tags"
>
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
<b>{tagName}:</b> {auto.tags[tagName]}
</span>)}
</div>
</div>
}
@@ -3,6 +3,7 @@ import { ConnectedAutomationList } from ".";
import { createMockAuto } from "utils/mocks"; import { createMockAuto } from "utils/mocks";
import { useMockApiService } from "apiService"; import { useMockApiService } from "apiService";
import { DEFAULT_DIMS } from 'components/DAGFlow/constants'; import { DEFAULT_DIMS } from 'components/DAGFlow/constants';
import { Page } from "components/Page";
export default { export default {
title: 'App/AutomationList/Connected', title: 'App/AutomationList/Connected',
@@ -17,12 +18,12 @@ export default {
const Template: ComponentStory<any> = args => { const Template: ComponentStory<any> = args => {
const api = useMockApiService(args.initialAutomations); const api = useMockApiService(args.initialAutomations);
return <div className="page"> return <Page>
<ConnectedAutomationList <ConnectedAutomationList
{...args} {...args}
api={api} api={api}
/> />
</div> </Page>
} }
export const EmptyStart = Template.bind({}) export const EmptyStart = Template.bind({})
@@ -44,3 +45,20 @@ FewAutos.args = {
createMockAuto(), createMockAuto(),
], ],
} }
export const Loading: ComponentStory<any> = args => {
const api = useMockApiService(args.initialAutomations);
return <Page>
<ConnectedAutomationList
{...args}
api={{
...api,
state: {
"automations": {
"ready": false
}
}
}}
/>
</Page>
}
@@ -0,0 +1,24 @@
import { AutomationData } from "types/automations";
export type TagDB = ReturnType<typeof makeTagDB>;
export const makeTagDB = (automations: AutomationData[]) => {
const allTags: Record<string, Set<string>> = {};
automations.forEach(({ tags }) =>
Object.keys(tags).forEach(tagName => {
const tagValue = tags[tagName];
if (!allTags[tagName]) {
allTags[tagName] = new Set()
}
allTags[tagName].add(tagValue);
})
);
const allTagNames = Object.keys(allTags);
return {
getTagNames(myTags: string[]): string[] {
return allTagNames.filter(n => !myTags.includes(n)).sort()
},
getTagValues(tagName: string): string[] {
return allTags[tagName] ? Array.from(allTags[tagName].values()).sort() : [];
}
}
}
@@ -0,0 +1,72 @@
import { makeGrouping } from "./automationGrouper";
import { AutomationData } from 'types/automations/index';
import { bigMockAutoList, createMockAuto } from 'utils/mocks';
const automations: AutomationData[] = [
createMockAuto({
"Room": 'Living Room',
"Type": 'Lights'
}),
createMockAuto({
"Room": 'Living Room',
"Type": 'Climate'
}),
createMockAuto({
"Room": 'Kitchen',
"Type": 'Climate'
}),
createMockAuto({
"Type": 'Climate'
}),
createMockAuto({
"Room": 'Living Room'
}),
createMockAuto({}),
];
test('no grouping', () => {
const grouped = makeGrouping(automations, [], 0);
expect(grouped.top).toStrictEqual([0])
expect(grouped.getAutomations(0)).toStrictEqual([0, 1, 2, 3, 4, 5])
});
test('1 grouping', () => {
const grouped = makeGrouping(automations, ["Room"], 0);
expect(grouped.top).toHaveLength(3);
expect(grouped.getAutomations(0)).toStrictEqual([0, 1, 4])
expect(grouped.getAutomations(1)).toStrictEqual([2])
expect(grouped.getAutomations(2)).toStrictEqual([3, 5])
});
test('2 groupings', () => {
const grouped = makeGrouping(automations, ["Room", "Type"], 0);
expect(grouped.top).toHaveLength(3);
expect(grouped.getAutomations(grouped.top[0])).toHaveLength(0)
expect(grouped.getSubGroups(grouped.top[0])).toHaveLength(3)
expect(grouped.getAutomations(grouped.top[1])).toHaveLength(0)
expect(grouped.getSubGroups(grouped.top[1])).toHaveLength(1)
expect(grouped.getAutomations(grouped.top[2])).toHaveLength(2)
expect(grouped.getSubGroups(grouped.top[2])).toHaveLength(0)
});
test('bigAutoList groupings has not duplicate ids', () => {
const grouped = makeGrouping(bigMockAutoList, ['Room', "Remote"], 0);
const flattenAndCount = (gid: number): Record<number, number[]> => {
const subgroups = grouped.getSubGroups(gid);
if (subgroups.length > 0) {
return flattenAndConsolidate(subgroups)
} else {
return grouped.getAutomations(gid).reduce((sum: Record<number, number[]>, b) => {
sum[b] = (sum[b] ?? []).concat(gid)
return sum
}, {})
}
}
const flattenAndConsolidate = (gids: number[]): Record<number, number[]> => gids.map(flattenAndCount).reduce((a, b) => {
for (const k of Object.keys(b).map(Number)) {
a[k] = (a[k] ?? []).concat(b[k])
}
return a
}, {})
const countedAutos = flattenAndConsolidate(grouped.top)
for (const key of Object.keys(countedAutos).map(Number)) {
expect(countedAutos[key]).toHaveLength(1)
}
})
@@ -0,0 +1,130 @@
import { AutomationData } from "types/automations";
const makeGrouper = () => {
const groupIdNames: string[] = []
const groupSubGroups: Array<Set<number>> = []
const groupAutomations: number[][] = []
const groupData: Array<{
name: string;
selected: boolean;
isOther: boolean;
isTop: boolean;
}> = [];
const topGroups: number[] = [];
return {
groupIdNames,
groupSubGroups,
groupAutomations,
groupData,
topGroups,
addNew(groupId: string, groupName: string, theChosenOne: boolean, isTopLevel: boolean, isOther: boolean = false): number {
groupIdNames.push(groupId);
groupSubGroups.push(new Set());
groupAutomations.push([]);
groupData.push({
name: groupName,
selected: theChosenOne,
isTop: isTopLevel,
isOther
})
const groupIdx = groupIdNames.length - 1;
if (isTopLevel) {
topGroups.push(groupIdx);
}
return groupIdx;
},
updateGroup(
groupIdx: number,
update: {
isChosen: boolean,
lastGroupIdx: number | null,
autoIdx: number | null,
}
) {
if (update.isChosen) {
groupData[groupIdx].selected = true;
}
if (update.lastGroupIdx !== null) {
groupSubGroups[update.lastGroupIdx].add(groupIdx);
}
if (update.autoIdx !== null) {
groupAutomations[groupIdx].push(update.autoIdx)
}
}
}
}
export type AutomationGrouping = ReturnType<typeof makeGrouping>;
export const makeGrouping = (
autos: AutomationData[],
selectedTags: string[],
selectedAutomationIdx: number,
) => {
const grouper = makeGrouper();
if (selectedTags.length === 0) {
grouper.addNew("$", "", selectedAutomationIdx >= 0, true, true)
grouper.groupAutomations = [autos.map((_, i) => i)];
} else {
autos.forEach((auto, autoIdx) => {
const theChosenOne = selectedAutomationIdx === autoIdx;
let lastGroupIdx: number | null = null;
let lastGroupId: string = "$";
for (let ti = 0; ti < selectedTags.length; ti++) {
const isTopLevel = ti === 0;
const selTag = selectedTags[ti];
if (selTag in auto.tags) {
const groupName = auto.tags[selTag];
const groupId = `${lastGroupId}>${selTag}:${groupName}`;
let groupIdx = grouper.groupIdNames.indexOf(groupId);
if (groupIdx < 0) {
groupIdx = grouper.addNew(groupId, groupName, theChosenOne, isTopLevel);
}
grouper.updateGroup(groupIdx, {
isChosen: theChosenOne,
lastGroupIdx,
autoIdx: ti === selectedTags.length - 1 ? autoIdx : null,
})
lastGroupIdx = groupIdx;
lastGroupId = groupId;
} else {
const groupId = `${lastGroupId}>${selTag}:$`;
let groupIdx = grouper.groupIdNames.indexOf(groupId);
if (groupIdx < 0) {
groupIdx = grouper.addNew(groupId, "", theChosenOne, isTopLevel, true);
}
grouper.updateGroup(groupIdx, {
isChosen: theChosenOne,
lastGroupIdx,
autoIdx,
})
break
}
}
});
}
const sortGroupIds = (groupIds: number[]) => groupIds.sort((a, b) => {
const adata = grouper.groupData[a];
const bdata = grouper.groupData[b];
if (adata.isOther) {
return 1
} else {
return adata.name > bdata.name ? -1 : 1
}
})
return {
top: sortGroupIds(grouper.topGroups),
getSubGroups(groupIdx: number) {
return sortGroupIds(Array.from(grouper.groupSubGroups[groupIdx].values()))
},
getAutomations(groupIdx: number) {
return grouper.groupAutomations[groupIdx]
},
getData(groupIdx: number) {
return grouper.groupData[groupIdx]
}
}
}
@@ -18,6 +18,25 @@
flex: 1; flex: 1;
} }
/* Loading state */
.automation-list--root.loading {
width: 100%;
height: 100%;
flex-direction: column;
}
.automation-list--root.loading>* {
width: 100%;
}
.automation-list--root.loading .automation-list--circle-loader {
width: 100%;
height: 100%;
justify-content: center;
align-items: center;
display: flex;
}
/* list children: on hide */ /* list children: on hide */
.automation-list--list.hide>.automation-list-box { .automation-list--list.hide>.automation-list-box {
width: 0; width: 0;
@@ -68,3 +68,11 @@
background-color: var(--green-opaque); background-color: var(--green-opaque);
z-index: 30; z-index: 30;
} }
.automation-list--root.mobile .automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
height: 0;
opacity: 0;
overflow: hidden;
}
+43 -8
View File
@@ -1,7 +1,7 @@
import "./index.css"; import "./index.css";
import "./index.mobile.css"; import "./index.mobile.css";
import { AutomationEditor } from "components/AutomationEditor"; import { AutomationEditor } from "components/AutomationEditor";
import { FC, useState } from "react"; import { FC, ReactNode, useState } from "react";
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
import { defaultAutomation } from 'utils/defaults'; import { defaultAutomation } from 'utils/defaults';
import { ArrowIcon } from "components/Icons"; import { ArrowIcon } from "components/Icons";
@@ -10,6 +10,10 @@ import { ApiService } from "apiService/core";
import { AutomationListBox } from "./AutomationListBox"; import { AutomationListBox } from "./AutomationListBox";
import { DAGAutomationFlowDims } from 'components/DAGFlow/types'; import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
import useWindowSize from "utils/useWindowSize"; import useWindowSize from "utils/useWindowSize";
import { makeTagDB } from "./TagDB";
import LinearProgress from "@mui/material/LinearProgress";
import CircularProgress from "@mui/material/CircularProgress";
import { useCookies } from 'react-cookie';
interface AutomationListParams { interface AutomationListParams {
@@ -18,6 +22,29 @@ interface AutomationListParams {
onAdd: (auto: AutomationData) => void; onAdd: (auto: AutomationData) => void;
onRemove: (i: number) => void; onRemove: (i: number) => void;
dims: DAGAutomationFlowDims; dims: DAGAutomationFlowDims;
children?: ReactNode;
}
export const useAutomationListState = () => {
const [cookies, setCookies, _] = useCookies(['alCurrent']);
let initialCurrent = 0;
try {
initialCurrent = Number(cookies.alCurrent ?? '0');
// eslint-disable-next-line
} catch (_) { }
const [hideList, setHideList] = useState(false);
const [current, setCurrent] = useState(initialCurrent);
return {
hideList,
setHideList,
current,
setCurrent(i: number) {
setCurrent(i)
setCookies('alCurrent', String(i))
}
}
} }
export const AutomationList: FC<AutomationListParams> = ({ export const AutomationList: FC<AutomationListParams> = ({
@@ -29,11 +56,11 @@ export const AutomationList: FC<AutomationListParams> = ({
children, children,
}) => { }) => {
// state // state
const [hideList, setHideList] = useState(false); const { hideList, setHideList, current, setCurrent } = useAutomationListState();
const [current, setCurrent] = useState(0);
const { isMobile } = useWindowSize(); const { isMobile } = useWindowSize();
// alias // alias
const currentAuto = automations.length > 0 ? automations[current] : null; const currentAuto = automations.length > 0 ? automations[current] : null;
const tagDB = makeTagDB(automations);
// render // render
return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}> return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}>
<div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}> <div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}>
@@ -55,15 +82,18 @@ export const AutomationList: FC<AutomationListParams> = ({
<ButtonIcon <ButtonIcon
onClick={() => setHideList(!hideList)} onClick={() => setHideList(!hideList)}
className="automation-list--list-hide" className="automation-list--list-hide"
> Icon={ArrowIcon}
{ArrowIcon} />
</ButtonIcon>
</div> </div>
<div className="automation-list--viewer"> <div className="automation-list--viewer">
{currentAuto ? <AutomationEditor {currentAuto ? <AutomationEditor
automation={currentAuto} automation={currentAuto}
onUpdate={a => onUpdate(current, a)} onUpdate={a => onUpdate(current, a)}
dims={dims} dims={{
...dims,
flipped: isMobile
}}
tagDB={tagDB}
/> : <></>} /> : <></>}
</div> </div>
{children} {children}
@@ -85,7 +115,12 @@ export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
dims dims
}) => { }) => {
if (!automations.ready) { if (!automations.ready) {
return <span>Loading...</span> return <div className="automation-list--root loading">
<LinearProgress />
<div className="automation-list--circle-loader">
<CircularProgress />
</div>
</div>
} }
if (!automations.ok) { if (!automations.ok) {
return <span>Error {automations.error}</span> return <span>Error {automations.error}</span>
@@ -2,6 +2,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react"; import { useState } from "react";
import { ConditionEditor } from "."; import { ConditionEditor } from ".";
import { AutomationCondition } from 'types/automations/conditions'; import { AutomationCondition } from 'types/automations/conditions';
import { Page } from "components/Page";
export default { export default {
title: 'ConditionEditor', title: 'ConditionEditor',
@@ -40,12 +41,12 @@ export const Basic: ComponentStory<typeof ConditionEditor> = args => {
] ]
}) })
return ( return (
<div className="page"> <Page>
<ConditionEditor <ConditionEditor
onUpdate={setState} onUpdate={setState}
onDelete={() => { }} onDelete={() => { }}
condition={state} condition={state}
/> />
</div> </Page>
) )
} }
@@ -8,6 +8,8 @@ import InputYaml from "components/Inputs/InputYaml";
import { getEditor } from "./editorRender"; import { getEditor } from "./editorRender";
import { useStyles } from "./style"; import { useStyles } from "./style";
import { getViewer } from "./viewRender"; import { getViewer } from "./viewRender";
import useWindowSize from "utils/useWindowSize";
import { useHA } from "haService";
@@ -31,6 +33,8 @@ export const ConditionNode: FC<{
// state // state
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode); const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
const [yamlMode, setYamlMode] = useState(false); const [yamlMode, setYamlMode] = useState(false);
const { isMobile } = useWindowSize();
const { namer } = useHA();
// alias // alias
const effectiveDM = internalDisplayMode || yamlMode; const effectiveDM = internalDisplayMode || yamlMode;
// effect // effect
@@ -62,7 +66,7 @@ export const ConditionNode: FC<{
let childrenConditions: JSX.Element; let childrenConditions: JSX.Element;
if (effectiveDM) { if (effectiveDM) {
const Viewer = getViewer(condition); const Viewer = getViewer(condition);
childrenConditions = <Viewer condition={condition} onChange={onUpdate} /> childrenConditions = <Viewer condition={condition} onChange={onUpdate} namer={namer} />
} else { } else {
const Editor = getEditor(condition); const Editor = getEditor(condition);
childrenConditions = <Editor condition={condition} onChange={onUpdate} /> childrenConditions = <Editor condition={condition} onChange={onUpdate} />
@@ -76,52 +80,56 @@ export const ConditionNode: FC<{
} else if (condition.condition === 'or') { } else if (condition.condition === 'or') {
hasChildren = true hasChildren = true
} }
const { classes } = useStyles({ hasChildren }); const { classes } = useStyles({ hasChildren, isMobile });
// components // components
const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) => const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) =>
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button> <button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
return <div className={classes.root}> return <div className={classes.root}>
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />} <>
<div className={classes.title}> {(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
<InputList <div className={classes.title}>
label="" <InputList
className={classes.titleText} label=""
current={condition.condition} className={classes.titleText}
options={[ current={condition.condition}
'or', 'not', 'and', options={[
'template', 'or', 'not', 'and',
'numeric_state', 'template',
'state', 'numeric_state',
'time', 'state',
'trigger', 'time',
'zone', 'trigger',
]} 'zone',
onChange={(n: any) => onUpdate({ ]}
...getConditionDefaultValues(n), onChange={(n: any) => onUpdate({
...condition, ...getConditionDefaultValues(n),
condition: n, ...condition,
} as any)} condition: n,
/> } as any)}
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}> />
{yamlMode ? 'visual' : 'yaml'} {effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
</button>} {yamlMode ? 'visual' : 'yaml'}
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}> </button>}
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />} {!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
</button>} {effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
</div> </button>}
<div className={classes.children}> </div>
{yamlMode && <InputYaml <div className={classes.children}>
label="" {yamlMode && <InputYaml
value={condition} label=""
onChange={update => onUpdate(update as any)} value={condition}
/>} onChange={update => onUpdate(update as any)}
{!yamlMode && childrenConditions} />}
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}> <div className={classes.conditionWrap}>
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button> {!yamlMode && childrenConditions}
</div>} </div>
</div> {!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
{children({ classes })} <button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
</div>}
</div>
{children({ classes })}
</>
</div> </div>
} }
@@ -1,13 +1,12 @@
import { FC } from "react"; import { FC } from "react";
import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions'; import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions';
import { getDescriptionFromAutomationNode } from "utils/formatting";
import InputNumber from "components/Inputs/InputNumber"; import InputNumber from "components/Inputs/InputNumber";
import InputText from "components/Inputs/InputText"; import InputText from "components/Inputs/InputText";
import InputTextArea from "components/Inputs/InputTextArea"; import { InputEntity } from "components/Inputs/InputEntities";
import { InputEntity } from "components/Inputs/InputTextBubble";
import { ConditionNode } from "./ConditionNode"; import { ConditionNode } from "./ConditionNode";
import { genUpdateMethods } from "./nestedUpdater"; import { genUpdateMethods } from "./nestedUpdater";
import InputTime from "components/Inputs/InputTime"; import { InputTime } from "components/Inputs/InputTime";
import InputYaml from "components/Inputs/InputYaml";
interface Editor<C extends AutomationCondition> extends FC<{ interface Editor<C extends AutomationCondition> extends FC<{
@@ -45,16 +44,12 @@ export const TemplateEditor: Editor<TemplateCondition> = ({
onChange, onChange,
condition, condition,
}) => { }) => {
return <div> return <>
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({ <InputYaml label="Template" value={condition.value_template} onChange={value_template => onChange({
...condition,
alias
})} />
<InputTextArea label="Template" value={condition.value_template} onChange={value_template => onChange({
...condition, ...condition,
value_template value_template
})} resizable /> })} />
</div> </>
} }
@@ -62,13 +57,10 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
onChange, onChange,
condition, condition,
}) => { }) => {
return <div> return <>
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
alias
})} />
<InputEntity <InputEntity
value={condition.entity_id} value={condition.entity_id}
multiple
onChange={entity_id => onChange({ onChange={entity_id => onChange({
...condition, ...condition,
entity_id entity_id
@@ -94,11 +86,11 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
below: below ? String(below) : undefined, below: below ? String(below) : undefined,
})} })}
/> />
<InputTextArea label="Template" value={condition.value_template ?? ""} onChange={value_template => onChange({ <InputYaml label="Template" value={condition.value_template ?? ""} onChange={value_template => onChange({
...condition, ...condition,
value_template value_template
})} resizable /> })} />
</div> </>
} }
@@ -126,13 +118,10 @@ export const StateEditor: Editor<StateCondition> = ({
onChange, onChange,
condition, condition,
}) => { }) => {
return <div> return <>
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
alias
})} />
<InputEntity <InputEntity
value={condition.entity_id} value={condition.entity_id}
multiple
onChange={entity_id => onChange({ onChange={entity_id => onChange({
...condition, ...condition,
entity_id entity_id
@@ -158,18 +147,14 @@ export const StateEditor: Editor<StateCondition> = ({
for: _for, for: _for,
})} })}
/> />
</div> </>
} }
export const TimeEditor: Editor<TimeCondition> = ({ export const TimeEditor: Editor<TimeCondition> = ({
onChange, onChange,
condition, condition,
}) => { }) => {
return <div> return <>
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
alias
})} />
<InputTime <InputTime
label="After" label="After"
value={condition.after} value={condition.after}
@@ -187,40 +172,33 @@ export const TimeEditor: Editor<TimeCondition> = ({
})} })}
/> />
<b>Weekday not support for no, use yaml for now</b> {condition.weekday} <b>Weekday not support for no, use yaml for now</b> {condition.weekday}
</div> </>
} }
export const TriggerEditor: Editor<TriggerCondition> = ({ export const TriggerEditor: Editor<TriggerCondition> = ({
onChange, onChange,
condition, condition,
}) => { }) => {
return <div> return <>
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
alias
})} />
<InputText label="Trigger ID" value={condition.id} onChange={id => onChange({ <InputText label="Trigger ID" value={condition.id} onChange={id => onChange({
...condition, ...condition,
id id
})} /> })} />
</div> </>
} }
export const ZoneEditor: Editor<ZoneCondition> = ({ export const ZoneEditor: Editor<ZoneCondition> = ({
onChange, onChange,
condition, condition,
}) => { }) => {
return <div> return <>
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
...condition,
alias
})} />
<InputText label="Zone" value={condition.zone} onChange={zone => onChange({ <InputText label="Zone" value={condition.zone} onChange={zone => onChange({
...condition, ...condition,
zone zone
})} /> })} />
<InputEntity <InputEntity
value={condition.entity_id} value={condition.entity_id}
multiple
onChange={entity_id => onChange({ onChange={entity_id => onChange({
...condition, ...condition,
entity_id entity_id
@@ -234,5 +212,5 @@ export const ZoneEditor: Editor<ZoneCondition> = ({
state, state,
})} })}
/> />
</div> </>
} }
@@ -1,4 +1,5 @@
import { ComponentMeta, ComponentStory } from "@storybook/react"; import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react"; import { useState } from "react";
import { AutomationCondition } from "types/automations/conditions"; import { AutomationCondition } from "types/automations/conditions";
@@ -14,14 +15,14 @@ export default {
const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }) => { const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }) => {
const [data, setData] = useState(condition); const [data, setData] = useState(condition);
return <div className="page"> return <Page>
<ConditionEditor {...args} <ConditionEditor {...args}
condition={data} condition={data}
onUpdate={data => { onUpdate={data => {
setData(data) setData(data)
}} }}
/> />
</div> </Page>
} }
export const TemplateViewer = Template.bind({}) export const TemplateViewer = Template.bind({})
+11 -6
View File
@@ -2,7 +2,8 @@ import { Styles } from "jss";
import { createAppUseStyles } from "styles/theme"; import { createAppUseStyles } from "styles/theme";
export const useStyles = createAppUseStyles<{ export const useStyles = createAppUseStyles<{
hasChildren: boolean hasChildren: boolean,
isMobile: boolean,
}>(theme => { }>(theme => {
const deleteBtn: Styles = { const deleteBtn: Styles = {
borderRadius: '10px', borderRadius: '10px',
@@ -20,12 +21,12 @@ export const useStyles = createAppUseStyles<{
} }
} }
return { return {
root: ({ hasChildren }) => ({ root: ({ hasChildren, isMobile }) => ({
background: theme.primary, background: theme.primary,
padding: 0, padding: 0,
position: 'relative', position: 'relative',
display: 'flex', display: 'flex',
flexDirection: hasChildren ? 'column' : 'row', flexDirection: isMobile ? 'column' : hasChildren ? 'column' : 'row',
}), }),
title: ({ hasChildren }) => ({ title: ({ hasChildren }) => ({
display: 'flex', display: 'flex',
@@ -42,8 +43,8 @@ export const useStyles = createAppUseStyles<{
borderTopRightRadius: 0, borderTopRightRadius: 0,
borderBottomRightRadius: 0, borderBottomRightRadius: 0,
borderBottomLeftRadius: hasChildren ? 0 : 10, borderBottomLeftRadius: hasChildren ? 0 : 10,
padding: 10, minWidth: '10em',
minWidth: 30, maxWidth: '30em',
textOverflow: 'ellipsis', textOverflow: 'ellipsis',
textAlign: 'center', textAlign: 'center',
cursor: 'pointer', cursor: 'pointer',
@@ -86,6 +87,9 @@ export const useStyles = createAppUseStyles<{
}), }),
icon: {}, icon: {},
deleteBtn, deleteBtn,
conditionWrap: {
overflow: 'auto',
},
children: ({ hasChildren }) => ({ children: ({ hasChildren }) => ({
flex: 1, flex: 1,
paddingLeft: hasChildren ? 50 : 10, paddingLeft: hasChildren ? 50 : 10,
@@ -96,7 +100,8 @@ export const useStyles = createAppUseStyles<{
border: `1px solid ${theme.secondaryAccent}`, border: `1px solid ${theme.secondaryAccent}`,
borderBottomRightRadius: hasChildren ? 10 : 0, borderBottomRightRadius: hasChildren ? 10 : 0,
borderBottomLeftRadius: hasChildren ? 10 : 0, borderBottomLeftRadius: hasChildren ? 10 : 0,
minHeight: hasChildren ? undefined : '100%' minHeight: hasChildren ? undefined : '100%',
overflow: 'scroll'
}), }),
addBtnContainer: { addBtnContainer: {
display: 'flex', display: 'flex',
@@ -1,12 +1,13 @@
import { FC } from "react"; import { FC } from "react";
import { AutomationCondition, LogicCondition } from "types/automations/conditions"; import { AutomationCondition, LogicCondition } from "types/automations/conditions";
import { getDescriptionFromAutomationNode } from "utils/formatting"; import { getDescriptionFromAutomationNode, Namer } from "utils/formatting";
import { ConditionNode } from "./ConditionNode"; import { ConditionNode } from "./ConditionNode";
import { genUpdateMethods } from "./nestedUpdater"; import { genUpdateMethods } from "./nestedUpdater";
interface Viewer<C extends AutomationCondition> extends FC<{ interface Viewer<C extends AutomationCondition> extends FC<{
condition: C; condition: C;
namer: Namer;
onChange: (condition: C) => void; onChange: (condition: C) => void;
}> { } }> { }
@@ -23,9 +24,10 @@ export const getViewer = (condition: AutomationCondition): Viewer<any> => {
export const GenericViewer: Viewer<AutomationCondition> = ({ export const GenericViewer: Viewer<AutomationCondition> = ({
condition, condition,
namer,
}) => { }) => {
return <> return <>
{getDescriptionFromAutomationNode(condition)} {getDescriptionFromAutomationNode(condition, namer)}
</> </>
} }
+4 -2
View File
@@ -12,6 +12,7 @@ export interface DAGCircleProps {
backgroundColor?: string; backgroundColor?: string;
disableSource?: boolean; disableSource?: boolean;
disableTarget?: boolean; disableTarget?: boolean;
flipped: boolean;
} }
export const makeFlowCircle = ( export const makeFlowCircle = (
circleId: string, circleId: string,
@@ -32,6 +33,7 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
backgroundColor, backgroundColor,
disableSource = false, disableSource = false,
disableTarget = false, disableTarget = false,
flipped,
} }
}) => { }) => {
const { classes } = useCircleStyles({ const { classes } = useCircleStyles({
@@ -41,8 +43,8 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
backgroundColor, backgroundColor,
}); });
return <> return <>
{!disableSource && <Handle type="source" position={Position.Right} />} {!disableSource && <Handle type="source" position={flipped ? Position.Bottom : Position.Right} />}
{!disableTarget && <Handle type="target" position={Position.Left} />} {!disableTarget && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<div className={classes.root}> <div className={classes.root}>
{ {
onAdd ? onAdd ?
@@ -7,6 +7,7 @@ import * as dgconst from "components/DAGFlow/constants";
import ReactFlow, { Controls } from 'react-flow-renderer'; import ReactFlow, { Controls } from 'react-flow-renderer';
import { DAGErrorNode } from "./DAGErrorNode"; import { DAGErrorNode } from "./DAGErrorNode";
import { convertToFlowNode } from "./helpers"; import { convertToFlowNode } from "./helpers";
import { Page } from "components/Page";
export default { export default {
@@ -29,7 +30,7 @@ export const Examples: ComponentStory<typeof DAGErrorNode> = args => {
"y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i "y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i
} }
})); }));
return <div className="page"> return <Page>
<ReactFlow <ReactFlow
defaultNodes={nodes} defaultNodes={nodes}
nodeTypes={{ nodeTypes={{
@@ -42,5 +43,5 @@ export const Examples: ComponentStory<typeof DAGErrorNode> = args => {
> >
<Controls /> <Controls />
</ReactFlow> </ReactFlow>
</div> </Page>
} }
@@ -3,21 +3,21 @@ import { Handle, Position } from 'react-flow-renderer';
import { FC } from 'react'; import { FC } from 'react';
import { InfoIcon, PencilIcon } from 'components/Icons'; import { InfoIcon, PencilIcon } from 'components/Icons';
export interface DAGErrorNodeProps { export interface DAGErrorNodeProps {
height: number; height: number;
width: number; width: number;
flipped: boolean;
hasInput?: boolean; hasInput?: boolean;
error?: any, error?: any,
onEdit: () => void; onEdit: () => void;
} }
export const DAGErrorNode: FC<DAGErrorNodeProps> = ({ export const DAGErrorNode: FC<DAGErrorNodeProps> = ({
height, width, hasInput, error, onEdit height, width, hasInput, error, onEdit, flipped
}) => { }) => {
// render // render
return <> return <>
{hasInput && <Handle type="target" position={Position.Left} />} {hasInput && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<Handle type="source" position={Position.Right} /> <Handle type="source" position={flipped ? Position.Bottom : Position.Right} />
<div className={["dagnode-error"].join(' ')} style={{ <div className={["dagnode-error"].join(' ')} style={{
height, height,
width, width,
@@ -8,6 +8,7 @@ import * as dgconst from "components/DAGFlow/constants";
import ReactFlow, { Controls } from 'react-flow-renderer'; import ReactFlow, { Controls } from 'react-flow-renderer';
import { DAGNode } from "./DAGNode"; import { DAGNode } from "./DAGNode";
import { convertToFlowNode } from "./helpers"; import { convertToFlowNode } from "./helpers";
import { Page } from "components/Page";
export default { export default {
@@ -30,7 +31,7 @@ export const Colors: ComponentStory<typeof DAGNode> = args => {
"type": "mynode", "type": "mynode",
"position": { "x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i, "y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i } "position": { "x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i, "y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i }
})); }));
return <div className="page"> return <Page>
<ReactFlow <ReactFlow
defaultNodes={nodes} defaultNodes={nodes}
nodeTypes={{ nodeTypes={{
@@ -43,5 +44,5 @@ export const Colors: ComponentStory<typeof DAGNode> = args => {
> >
<Controls /> <Controls />
</ReactFlow> </ReactFlow>
</div> </Page>
} }
+4 -2
View File
@@ -14,6 +14,7 @@ export interface DAGNodeProps {
label: string; label: string;
hasInput?: boolean; hasInput?: boolean;
accentBackground?: boolean; accentBackground?: boolean;
flipped: boolean;
} }
export const DAGNode: FC<DAGNodeProps> = ({ export const DAGNode: FC<DAGNodeProps> = ({
label, label,
@@ -24,6 +25,7 @@ export const DAGNode: FC<DAGNodeProps> = ({
color, color,
hasInput = false, hasInput = false,
accentBackground = false, accentBackground = false,
flipped,
}) => { }) => {
const { classes, theme } = useNodeStyles({ const { classes, theme } = useNodeStyles({
color, color,
@@ -32,8 +34,8 @@ export const DAGNode: FC<DAGNodeProps> = ({
accentBackground, accentBackground,
}); });
return <> return <>
{hasInput && <Handle type="target" position={Position.Left} />} {hasInput && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
<Handle type="source" position={Position.Right} /> <Handle type="source" position={flipped ? Position.Bottom : Position.Right} />
<div className={classes.root}> <div className={classes.root}>
<div className={classes.inner}> <div className={classes.inner}>
<div className={classes.leftEdge} onClick={onXClick}> <div className={classes.leftEdge} onClick={onXClick}>
@@ -19,4 +19,5 @@ export const DEFAULT_DIMS = {
x: PADDING, x: PADDING,
y: PADDING, y: PADDING,
}, },
flipped: false,
} as DAGAutomationFlowDims } as DAGAutomationFlowDims
+9 -10
View File
@@ -1,19 +1,22 @@
import { makeFlowCircle } from "./DAGCircle" import { DAGCircleProps, makeFlowCircle } from "./DAGCircle"
import { DAGAutomationFlowDims } from "./types" import { DAGAutomationFlowDims } from "./types"
import { XYPosition } from 'react-flow-renderer'; import { Node, XYPosition } from 'react-flow-renderer';
import { DAGNodeProps } from "./DAGNode";
export const makeAddButton = ( export const makeAddButton = (
id: string, id: string,
position: XYPosition, position: XYPosition,
{ {
circleSize, circleSize,
flipped,
}: DAGAutomationFlowDims, }: DAGAutomationFlowDims,
onAdd: () => void, onAdd: () => void,
disableTarget: boolean = true, disableTarget: boolean = true,
) => makeFlowCircle( ): Node<DAGCircleProps> => makeFlowCircle(
id, id,
position, position,
{ {
flipped,
size: circleSize, size: circleSize,
onAdd, onAdd,
disableSource: true, disableSource: true,
@@ -25,22 +28,17 @@ export const makeConditionPoint = (
id: string, id: string,
position: XYPosition, position: XYPosition,
{ {
padding,
conditionWidth, conditionWidth,
conditionHeight, conditionHeight,
nodeWidth, flipped,
nodeHeight,
circleSize,
distanceFactor,
}: DAGAutomationFlowDims, }: DAGAutomationFlowDims,
totalConditions: number, totalConditions: number,
onEditClick: () => void, onEditClick: () => void,
) => ({ ): Node<DAGNodeProps> => ({
id, id,
type: 'dagnode', type: 'dagnode',
position, position,
data: { data: {
size: circleSize,
color: 'lblue', color: 'lblue',
accentBackground: true, accentBackground: true,
label: `${totalConditions} Condition${totalConditions !== 1 ? 's' : ''}`, label: `${totalConditions} Condition${totalConditions !== 1 ? 's' : ''}`,
@@ -48,5 +46,6 @@ export const makeConditionPoint = (
width: conditionWidth, width: conditionWidth,
hasInput: true, hasInput: true,
onEditClick, onEditClick,
flipped,
} }
}) })
@@ -5,6 +5,7 @@ import { ComponentMeta, ComponentStory } from '@storybook/react';
import { DAGAutomationFlow } from '.'; import { DAGAutomationFlow } from '.';
import { useState } from 'react'; import { useState } from 'react';
import * as dgconst from "components/DAGFlow/constants"; import * as dgconst from "components/DAGFlow/constants";
import { Page } from "components/Page";
export default { export default {
@@ -22,7 +23,7 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
sequence: args.sequence, sequence: args.sequence,
condition: args.condition, condition: args.condition,
}) })
return <div className="page"> return <Page>
<DAGAutomationFlow <DAGAutomationFlow
{...args} {...args}
{...state} {...state}
@@ -32,7 +33,7 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
onSequenceUpdate={sequence => setState({ ...state, sequence })} onSequenceUpdate={sequence => setState({ ...state, sequence })}
onConditionUpdate={condition => setState({ ...state, condition })} onConditionUpdate={condition => setState({ ...state, condition })}
/> />
</div> </Page>
} }
export const Simple = Template.bind({}) export const Simple = Template.bind({})
@@ -91,7 +92,10 @@ Complex.args = {
{ {
"platform": "homeassistant", "platform": "homeassistant",
"event": "start", "event": "start",
} },
{
"bad": "node"
} as any
], ],
sequence: [ sequence: [
{ {
@@ -119,6 +123,9 @@ Complex.args = {
"media_content_type": "SPOTIFY" "media_content_type": "SPOTIFY"
} }
}, },
{
"alias": "Bad Node",
},
{ {
"choose": [ "choose": [
{ {
@@ -231,3 +238,26 @@ Errors.args = {
} as any } as any
] ]
} }
export const ComplexFlipped = Complex.bind({})
ComplexFlipped.args = {
...Complex.args,
dims: {
...dgconst.DEFAULT_DIMS,
...Complex.args.dims,
flipped: true,
}
}
export const SimpleFlipped = Simple.bind({})
SimpleFlipped.args = {
...Simple.args,
dims: {
...dgconst.DEFAULT_DIMS,
...Complex.args.dims,
flipped: true,
}
}
+27 -4
View File
@@ -16,6 +16,7 @@ import { AutomationCondition } from "types/automations/conditions";
import { makeConditionPoint } from "./flowDataMods"; import { makeConditionPoint } from "./flowDataMods";
import { convertToFlowNode } from "./helpers"; import { convertToFlowNode } from "./helpers";
import { DAGErrorNode } from "./DAGErrorNode"; import { DAGErrorNode } from "./DAGErrorNode";
import { useHA } from "haService";
const nodeTypes = { const nodeTypes = {
'dagnode': convertToFlowNode(DAGNode), 'dagnode': convertToFlowNode(DAGNode),
@@ -57,7 +58,7 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
}) => { }) => {
// state // state
const [modalState, setModalState] = useState<ModalState | null>(null); const [modalState, setModalState] = useState<ModalState | null>(null);
const { namer, } = useHA();
// modal // modal
let modalBody = <></> let modalBody = <></>
if (modalState) { if (modalState) {
@@ -66,7 +67,10 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
node={modalState.node} node={modalState.node}
isErrored={modalState.isError} isErrored={modalState.isError}
onClose={() => setModalState(null)} onClose={() => setModalState(null)}
onSave={n => { modalState.update(n as any); setModalState(null); }} onSave={n => {
modalState.update(n as any);
setModalState(null);
}}
allowedTypes={modalState.allowedTypes} allowedTypes={modalState.allowedTypes}
saveBtnCreateText={modalState.saveBtnCreateText} saveBtnCreateText={modalState.saveBtnCreateText}
/> />
@@ -81,7 +85,11 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
} }
// convert automation to flow data // convert automation to flow data
const condPoint = makeConditionPoint('c', { const condPoint = makeConditionPoint(
'c', dims.flipped ? {
y: dims.padding.y + dims.nodeHeight * dims.distanceFactor,
x: dims.padding.x + dims.nodeWidth * 0.25
} : {
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor, x: dims.padding.x + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y + dims.nodeHeight * 0.25 y: dims.padding.y + dims.nodeHeight * 0.25
}, dims, condition.length, makeOnEditAutomationConditions( }, dims, condition.length, makeOnEditAutomationConditions(
@@ -94,6 +102,7 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
edges: [], edges: [],
} }
triggerToFlow(flowData, trigger, condPoint.id, dims, { triggerToFlow(flowData, trigger, condPoint.id, dims, {
namer,
onAdd: () => onTriggerUpdate([ onAdd: () => onTriggerUpdate([
...trigger, { ...trigger, {
platform: 'event', platform: 'event',
@@ -120,13 +129,27 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
sequence, sequence,
condPoint.id, condPoint.id,
{ {
...dims, padding: { ...dims, padding: dims.flipped ? {
y: condPoint.position.y - dims.nodeHeight - dims.conditionHeight,
x: dims.padding.x,
} : {
x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth, x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth,
y: dims.padding.y, y: dims.padding.y,
} }
}, },
namer,
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState), 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 // render
return <> return <>
<Modal open={!!modalState}> <Modal open={!!modalState}>
@@ -1,6 +1,6 @@
import { AutomationSequenceNode } from 'types/automations'; import { AutomationSequenceNode } from 'types/automations';
import { DAGAutomationFlowDims, FlowData } from './types'; import { DAGAutomationFlowDims, FlowData } from './types';
import { getDescriptionFromAutomationNode } from 'utils/formatting'; import { getDescriptionFromAutomationNode, Namer } from 'utils/formatting';
import { XYPosition } from 'react-flow-renderer'; import { XYPosition } from 'react-flow-renderer';
import { ChooseAction } from 'types/automations/actions'; import { ChooseAction } from 'types/automations/actions';
import { makeFlowCircle } from './DAGCircle'; import { makeFlowCircle } from './DAGCircle';
@@ -14,6 +14,7 @@ export const sequenceToFlow = (
sequence: AutomationSequenceNode[], sequence: AutomationSequenceNode[],
fromPoint: string, fromPoint: string,
dims: DAGAutomationFlowDims, dims: DAGAutomationFlowDims,
namer: Namer,
updater: SequenceUpdater, updater: SequenceUpdater,
prefix: string = "", prefix: string = "",
) => { ) => {
@@ -25,12 +26,18 @@ export const sequenceToFlow = (
const nodeId = `${prefix}n-${i}`; const nodeId = `${prefix}n-${i}`;
let position: XYPosition; let position: XYPosition;
if (lasPos) { if (lasPos) {
position = { position = dims.flipped ? {
y: lasPos.y + dims.nodeHeight * dims.distanceFactor,
x: dims.padding.x
} : {
x: lasPos.x + dims.nodeWidth * dims.distanceFactor, x: lasPos.x + dims.nodeWidth * dims.distanceFactor,
y: dims.padding.y y: dims.padding.y
} }
} else { } else {
position = { 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), x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2),
y: dims.padding.y y: dims.padding.y
}; };
@@ -39,7 +46,7 @@ export const sequenceToFlow = (
if (getNodeType(node) === 'action') { if (getNodeType(node) === 'action') {
if ('choose' in node) { if ('choose' in node) {
try { try {
const out = addChooseNode(node, position, nodeId, dims, updater, i); const out = addChooseNode(node, position, nodeId, dims, namer, updater, i);
position = out.lastPos position = out.lastPos
flowData = mergeFlowDatas(flowData, out.flowData); flowData = mergeFlowDatas(flowData, out.flowData);
} catch (err) { } catch (err) {
@@ -49,13 +56,15 @@ export const sequenceToFlow = (
} else { } else {
addSingleNode(flowData, node, position, nodeId, dims, { addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node), onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i) onXClick: () => updater.removeNode(i),
namer,
}); });
} }
} else { } else {
addSingleNode(flowData, node, position, nodeId, dims, { addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node), onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i) onXClick: () => updater.removeNode(i),
namer,
}); });
} }
@@ -67,7 +76,14 @@ export const sequenceToFlow = (
// add button // add button
const addCircle = makeAddButton( const addCircle = makeAddButton(
`${prefix}-+`, `${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: ( x: (
lasPos === null ? lasPos === null ?
dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) : dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) :
@@ -104,22 +120,25 @@ const addSingleNode = (
position: XYPosition, position: XYPosition,
nodeId: string, nodeId: string,
{ {
flipped,
nodeHeight, nodeHeight,
nodeWidth, nodeWidth,
}: DAGAutomationFlowDims, }: DAGAutomationFlowDims,
opts: { opts: {
onEditClick: () => void; onEditClick: () => void;
onXClick: () => void; onXClick: () => void;
namer: Namer;
} }
) => flowData.nodes.push({ ) => flowData.nodes.push({
id: nodeId, id: nodeId,
type: 'dagnode', type: 'dagnode',
data: { data: {
label: getDescriptionFromAutomationNode(node), label: getDescriptionFromAutomationNode(node, opts.namer),
height: nodeHeight, height: nodeHeight,
width: nodeWidth, width: nodeWidth,
color: getNodeType(node) === 'action' ? 'green' : 'blue', color: getNodeType(node) === 'action' ? 'green' : 'blue',
hasInput: true, hasInput: true,
flipped,
...opts, ...opts,
}, },
position, position,
@@ -156,6 +175,7 @@ const addChooseNode = (
position: XYPosition, position: XYPosition,
nodeId: string, nodeId: string,
dims: DAGAutomationFlowDims, dims: DAGAutomationFlowDims,
namer: Namer,
updater: SequenceUpdater, updater: SequenceUpdater,
i: number, i: number,
) => { ) => {
@@ -166,16 +186,21 @@ const addChooseNode = (
addSingleNode(flowData, node, position, nodeId, dims, { addSingleNode(flowData, node, position, nodeId, dims, {
onEditClick: updater.makeOnModalOpenForNode(i, node), onEditClick: updater.makeOnModalOpenForNode(i, node),
onXClick: () => updater.removeNode(i), onXClick: () => updater.removeNode(i),
namer,
}); });
let lastPos: XYPosition = position; let lastPos: XYPosition = position;
// conditions // conditions
node.choose.forEach(({ sequence, conditions }, j) => { node.choose.forEach(({ sequence, conditions }, j) => {
const sequenceId = `${nodeId}.${j}`; const sequenceId = `${nodeId}.${j}`;
// edit/delete circle // edit/delete circle
const circle = makeFlowCircle(`${sequenceId}>delete`, { const circle = makeFlowCircle(`${sequenceId}>delete`, dims.flipped ? {
y: position.y + dims.nodeHeight * dims.distanceFactor,
x: lastPos.x + dims.nodeWidth * dims.distanceFactor,
} : {
x: position.x + dims.nodeWidth * dims.distanceFactor, x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor, y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
}, { }, {
flipped: dims.flipped,
size: dims.circleSize, size: dims.circleSize,
onRemove: createOnRemoveForChooseNode( onRemove: createOnRemoveForChooseNode(
node, node,
@@ -187,7 +212,10 @@ const addChooseNode = (
addEdge(flowData, nodeId, circle.id, true) addEdge(flowData, nodeId, circle.id, true)
const condNode = makeConditionPoint( const condNode = makeConditionPoint(
`${sequenceId}>cond`, `${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, x: circle.position.x + dims.circleSize * dims.distanceFactor,
y: circle.position.y + dims.circleSize / 8, y: circle.position.y + dims.circleSize / 8,
}, },
@@ -201,15 +229,24 @@ const addChooseNode = (
// actual sub sequence // actual sub sequence
const lastPoint = sequenceToFlow(flowData, sequence, condNode.id, { const lastPoint = sequenceToFlow(flowData, sequence, condNode.id, {
...dims, ...dims,
padding: { padding: dims.flipped ? {
y: condNode.position.y - dims.nodeHeight * dims.distanceFactor,
x: condNode.position.x - dims.conditionHeight / 2,
} : {
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth), x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
y: condNode.position.y - dims.conditionHeight / 2, y: condNode.position.y - dims.conditionHeight / 2,
}, },
}, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`); }, namer, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`);
if (lastPoint.position) { if (lastPoint.position) {
lastPos = xyApply(lastPos, lastPoint.position, Math.max) lastPos = xyApply(lastPos, lastPoint.position, Math.max)
} else { } else {
lastPos = xyApply(lastPos, { x: lastPos.x, y: lastPos.y + dims.nodeHeight * dims.distanceFactor }, Math.max) 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; const totalChildren = node.choose.length;
@@ -217,7 +254,10 @@ const addChooseNode = (
// add button // add button
const addCirlce = makeAddButton( const addCirlce = makeAddButton(
`${nodeId}>add`, `${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, x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor, y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
}, },
@@ -238,19 +278,25 @@ const addChooseNode = (
addEdge(flowData, nodeId, addCirlce.id, true) addEdge(flowData, nodeId, addCirlce.id, true)
// else // else
const elseCircle = makeFlowCircle(`${nodeId}>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, x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2, y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2,
}, { size: dims.circleSize }) }, { size: dims.circleSize, flipped: dims.flipped })
flowData.nodes.push(elseCircle) flowData.nodes.push(elseCircle)
addEdge(flowData, nodeId, elseCircle.id, true) addEdge(flowData, nodeId, elseCircle.id, true)
const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, { const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, {
...dims, ...dims,
padding: { padding: dims.flipped ? {
y: position.y,
x: elseCircle.position.x - 1.4 * dims.circleSize,
} : {
x: position.x - dims.nodeWidth, x: position.x - dims.nodeWidth,
y: elseCircle.position.y - dims.circleSize / 4, y: elseCircle.position.y - dims.circleSize / 4,
}, },
}, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`) }, namer, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`)
if (lastPoint.position) { if (lastPoint.position) {
lastPos = xyApply(lastPos, lastPoint.position, Math.max) lastPos = xyApply(lastPos, lastPoint.position, Math.max)
} else { } else {
@@ -16,6 +16,8 @@ export const triggerToFlow = (
nodeWidth, nodeWidth,
padding, padding,
conditionHeight, conditionHeight,
circleSize,
flipped,
} = dims; } = dims;
// convert all triggers to dag nodes // convert all triggers to dag nodes
trigger.forEach((t, i) => { trigger.forEach((t, i) => {
@@ -24,14 +26,21 @@ export const triggerToFlow = (
id: flowId, id: flowId,
type: 'dagnode', type: 'dagnode',
data: { data: {
label: getDescriptionFromAutomationNode(t), label: getDescriptionFromAutomationNode(t, opts.namer),
height: nodeHeight, height: nodeHeight,
width: nodeWidth, width: nodeWidth,
flipped,
color: 'red', color: 'red',
onEditClick: () => opts.onEdit(i), onEditClick: () => opts.onEdit(i),
onXClick: () => opts.onDelete(i), onXClick: () => opts.onDelete(i),
}, },
position: { x: padding.x, y: padding.y + nodeHeight * distanceFactor * i } position: flipped ? {
y: padding.y,
x: padding.x + nodeWidth * distanceFactor * i
} : {
x: padding.x,
y: padding.y + nodeHeight * distanceFactor * i
}
}) })
flowData.edges.push({ flowData.edges.push({
id: `e(${flowId})-(${toPoint})`, id: `e(${flowId})-(${toPoint})`,
@@ -43,7 +52,10 @@ export const triggerToFlow = (
// create a 'add button' // create a 'add button'
flowData.nodes.push(makeAddButton( flowData.nodes.push(makeAddButton(
'trigger-add', 'trigger-add',
{ flipped ? {
y: padding.y + circleSize / 4,
x: padding.x + nodeWidth * distanceFactor * trigger.length,
} : {
x: padding.x + nodeWidth * 0.4, x: padding.x + nodeWidth * 0.4,
y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length, y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length,
}, },
+3
View File
@@ -5,6 +5,7 @@ import { DAGNodeProps } from './DAGNode';
import { AutomationTrigger } from 'types/automations/triggers'; import { AutomationTrigger } from 'types/automations/triggers';
import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types'; import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
import { DAGErrorNodeProps } from './DAGErrorNode'; import { DAGErrorNodeProps } from './DAGErrorNode';
import { Namer } from 'utils/formatting';
export type DAGAutomationFlowDims = { export type DAGAutomationFlowDims = {
@@ -15,6 +16,7 @@ export type DAGAutomationFlowDims = {
conditionHeight: number; conditionHeight: number;
circleSize: number; circleSize: number;
distanceFactor: number; distanceFactor: number;
flipped: boolean;
} }
export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | DAGErrorNodeProps | any>; export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | DAGErrorNodeProps | any>;
@@ -27,6 +29,7 @@ export type TriggerMakerOptions = {
onAdd: () => void, onAdd: () => void,
onEdit: (i: number) => void, onEdit: (i: number) => void,
onDelete: (i: number) => void, onDelete: (i: number) => void,
namer: Namer,
} }
export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = ( export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = (
@@ -40,8 +40,8 @@ test("sequence updater updates nodes", () => {
mock.updater.updateNode(0, { mock.updater.updateNode(0, {
...mock.state[0], ...mock.state[0],
alias: "Hello" alias: "Hello"
}) } as any)
expect(mock.state[0].alias).toBe("Hello") expect((mock.state[0] as any).alias).toBe("Hello")
}) })
test('update conditions for node', () => { test('update conditions for node', () => {
const mock = mockSequenceUpdater([ const mock = mockSequenceUpdater([
+13 -9
View File
@@ -27,19 +27,23 @@ export const makeSequenceUpdater = (
choose: [], choose: [],
default: [], default: [],
}, },
update: n => onChange([ update: n => {
...sequence, onChange([
n, ...sequence,
]), n,
])
},
allowedTypes: ['action', 'condition'] allowedTypes: ['action', 'condition']
}) })
}, },
updateNode(i: number, node: AutomationSequenceNode) { updateNode(i: number, node: AutomationSequenceNode) {
return onChange([ if (JSON.stringify(node) !== JSON.stringify(sequence[i])) {
...sequence.slice(0, i), return onChange([
node, ...sequence.slice(0, i),
...sequence.slice(i + 1), node,
]) ...sequence.slice(i + 1),
])
}
}, },
updateChooseActionData(i: number, data: ChooseAction) { updateChooseActionData(i: number, data: ChooseAction) {
const node = sequence[i] as ChooseAction; const node = sequence[i] as ChooseAction;
@@ -1,6 +1,7 @@
import React, { FC } from "react"; import React, { FC } from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react'; import { ComponentMeta, ComponentStory } from '@storybook/react';
import { ErrorBoundary } from "."; import { ErrorBoundary } from ".";
import { Page } from "components/Page";
export default { export default {
@@ -15,20 +16,20 @@ export const ErrorThrown: ComponentStory<typeof ErrorBoundary> = args => {
const BadComponent: FC = () => { const BadComponent: FC = () => {
throw new Error("!!!") throw new Error("!!!")
} }
return <div className="page"> return <Page>
<ErrorBoundary> <ErrorBoundary>
<BadComponent /> <BadComponent />
</ErrorBoundary> </ErrorBoundary>
</div> </Page>
} }
export const NoError: ComponentStory<typeof ErrorBoundary> = args => { export const NoError: ComponentStory<typeof ErrorBoundary> = args => {
const GoodComponent: FC = () => { const GoodComponent: FC = () => {
return <span>All Good.</span> return <span>All Good.</span>
} }
return <div className="page"> return <Page>
<ErrorBoundary> <ErrorBoundary>
<GoodComponent /> <GoodComponent />
</ErrorBoundary> </ErrorBoundary>
</div> </Page>
} }
@@ -1,5 +1,5 @@
import "./index.css"; import "./index.css";
import { Component, ErrorInfo } from "react"; import { Component, ErrorInfo, ReactNode } from "react";
type State = { type State = {
hasError: false; hasError: false;
@@ -8,7 +8,9 @@ type State = {
error: any, error: any,
errorInfo?: ErrorInfo, errorInfo?: ErrorInfo,
} }
export class ErrorBoundary extends Component<{}, State> { export class ErrorBoundary extends Component<{
children: ReactNode
}, State> {
state: State = { state: State = {
hasError: false hasError: false
@@ -39,6 +41,8 @@ export class ErrorBoundary extends Component<{}, State> {
</div> </div>
} }
return this.props.children; return <>
{this.props.children}
</>;
} }
} }
+3 -3
View File
@@ -5,7 +5,7 @@ import { createAppUseStyles } from 'styles/theme';
export interface ButtonIconStyleProps { export interface ButtonIconStyleProps {
} }
export interface ButtonIconProps extends IconBaseProps, ButtonIconStyleProps { export interface ButtonIconProps extends IconBaseProps, ButtonIconStyleProps {
children: FC<IconBaseProps>; Icon: FC<IconBaseProps>;
} }
const useButtonIconStyles = createAppUseStyles(theme => ({ const useButtonIconStyles = createAppUseStyles(theme => ({
buttonIcon: { buttonIcon: {
@@ -22,9 +22,9 @@ const useButtonIconStyles = createAppUseStyles(theme => ({
export const ButtonIcon: FC<ButtonIconProps> = ({ export const ButtonIcon: FC<ButtonIconProps> = ({
children: Child, Icon,
className, className,
...props ...props
}) => <Child }) => <Icon
className={`${useButtonIconStyles({}).classes.buttonIcon} ${className}`} {...props} className={`${useButtonIconStyles({}).classes.buttonIcon} ${className}`} {...props}
/> />
@@ -3,6 +3,7 @@ import { ComponentStory } from "@storybook/react";
import { IconBase } from "./base"; import { IconBase } from "./base";
import { PencilIcon, CheckMarkIcon, TrashIcon, InfoIcon, ArrowIcon, AddIcon, ZoomIcon, GearIcon } from "."; import { PencilIcon, CheckMarkIcon, TrashIcon, InfoIcon, ArrowIcon, AddIcon, ZoomIcon, GearIcon } from ".";
import { ButtonIcon } from "./ButtonIcons"; import { ButtonIcon } from "./ButtonIcons";
import { Page } from "components/Page";
export default { export default {
title: 'Icons', title: 'Icons',
@@ -12,7 +13,7 @@ export default {
export const IconList: ComponentStory<typeof IconBase> = (args) => { export const IconList: ComponentStory<typeof IconBase> = (args) => {
return <div className="page"> return <Page>
<PencilIcon {...args} /> <PencilIcon {...args} />
<CheckMarkIcon {...args} /> <CheckMarkIcon {...args} />
<AddIcon {...args} /> <AddIcon {...args} />
@@ -20,7 +21,7 @@ export const IconList: ComponentStory<typeof IconBase> = (args) => {
<InfoIcon {...args} /> <InfoIcon {...args} />
<ZoomIcon {...args} /> <ZoomIcon {...args} />
<GearIcon {...args} /> <GearIcon {...args} />
</div> </Page>
} }
IconList.args = { IconList.args = {
size: 2, size: 2,
@@ -30,9 +31,9 @@ IconList.args = {
export const ButtonIconExample: ComponentStory<typeof IconBase> = (args) => { export const ButtonIconExample: ComponentStory<typeof IconBase> = (args) => {
return <div className="page"> return <Page>
<ButtonIcon {...args}>{ArrowIcon}</ButtonIcon> <ButtonIcon {...args} Icon={ArrowIcon} />
</div> </Page>
} }
ButtonIconExample.args = { ButtonIconExample.args = {
size: 2, size: 2,
@@ -0,0 +1,35 @@
.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;
max-width: 100%;
overflow: auto;
}
@@ -0,0 +1,152 @@
import "./InputAutoComplete.css";
import { FC } from "react";
import { Option } from 'haService';
import Autocomplete from '@mui/material/Autocomplete';
import TextField from '@mui/material/TextField';
import Chip from '@mui/material/Chip';
import { Badge } from "@mui/material";
import { SearchItem } from "./extras";
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;
} & ({
value: string | null;
multiple?: false;
onChange: (v: string | null) => void;
} | {
value: string | string[];
multiple: true;
onChange: (v: string[]) => void;
})
export const InputAutoComplete: FC<InputAutoCompleteProps<any>> = props => {
// 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.sort((a, b) => {
return props.getID(a) > props.getID(b) ? 1 : -1;
});
// processing of errors
let 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"
multiple={true}
freeSolo
value={value}
options={options}
onChange={onChange}
getOptionLabel={props.getLabel}
filterOptions={(opts, s) => {
const searchTerm = s.inputValue.toLocaleLowerCase().trim();
if (!searchTerm) {
return opts;
}
return opts.map(opt => {
let similarityScore = 0;
const eid = props.getID(opt);
if (eid.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length)
}
const name = props.getLabel(opt);
if (name.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length)
}
return {
label: name,
id: eid,
domain: (typeof opt === 'string') ? '' : opt.domain,
similarityScore
}
}).filter(opt => opt.similarityScore > 0).sort((a, b) => {
return (a.similarityScore > b.similarityScore) ? 1 : -1
})
}}
groupBy={props.groupBy}
renderOption={(listProps, option, { inputValue }) => {
const label = props.getLabel(option);
const id = props.getID(option);
return <SearchItem
listProps={listProps}
id={id}
label={label}
searchTerm={inputValue}
/>
}}
renderInput={params => <TextField
{...params}
variant="filled"
label={props.label ?? "Entity ID"}
helperText={helperText}
error={error}
/>}
renderTags={(tagValue, getTagProps) => {
const inner = <div className="input-autocomplete--tags">
{tagValue.map((option, index) => {
const label = props.getLabel(option);
const id = props.getID(option);
const tagProps = getTagProps({ index });
tagProps.className += ' input-autocomplete--chip'
return (
<Chip
size="medium"
label={<>
{(id === label) ? <span>{label}</span> : <b>{label}</b>}
{(id !== label) && <small>{id}</small>}
</>}
{...tagProps}
/>
)
})}
</div>
if (props.multiple) {
return <Badge badgeContent={tagValue.length} color="info">
{inner}
</Badge>
} else {
return inner
}
}
}
/>
}
@@ -0,0 +1,40 @@
import TextField from "@mui/material/TextField";
import Autocomplete from "@mui/material/Autocomplete";
export interface InputAutoTextProps {
label: string;
value: string;
options?: string[];
error?: string;
onChange: (v: string) => void;
}
export default function InputAutoText({
value = "",
label,
options = [],
onChange,
error,
}: InputAutoTextProps) {
return <Autocomplete
freeSolo
value={value}
options={options}
onChange={(_e, v) => onChange(
v === null ? "" : v
)}
renderInput={params => <TextField
{...params}
variant="filled"
label={label}
error={error !== undefined}
helperText={error}
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 { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react"; import { useState } from "react";
import InputBoolean from "./InputBoolean"; import InputBoolean from "./InputBoolean";
@@ -12,12 +13,12 @@ export default {
const Template: ComponentStory<typeof InputBoolean> = args => { const Template: ComponentStory<typeof InputBoolean> = args => {
const [state, onChange] = useState(args.value) const [state, onChange] = useState(args.value)
return <div className="page"> return <Page>
<InputBoolean {...args} value={state} onChange={v => { <InputBoolean {...args} value={state} onChange={v => {
args.onChange(v) args.onChange(v)
onChange(v) onChange(v)
}} /> }} />
</div> </Page>
} }
export const SimpleText = Template.bind({}) export const SimpleText = Template.bind({})
@@ -1,19 +1,22 @@
import "./InputBoolean.css"; import Checkbox from "@mui/material/Checkbox";
import FormGroup from '@mui/material/FormGroup';
import FormControlLabel from '@mui/material/FormControlLabel';
export interface Props { export interface Props {
label: string; label: string;
value: boolean; value: boolean;
onChange: (v: boolean) => void; onChange: (v: boolean) => void;
disabled?: boolean; disabled?: boolean;
className?: string;
} }
export default function InputBoolean({ export default function InputBoolean({
label, label,
value = false, value = false,
onChange, onChange,
disabled = false, disabled = false,
className,
}: Props) { }: Props) {
return <div className={["input-boolean", disabled ? 'disabled' : ''].join(' ')} onClick={() => onChange(!value)}> return <FormGroup className={className}>
<input type="checkbox" checked={value} onChange={() => { }} disabled={disabled} /> <FormControlLabel disabled={disabled} control={<Checkbox checked={value} onChange={() => onChange(!value)} />} label={label} />
<label>{label}</label> </FormGroup>
</div>
} }
@@ -0,0 +1,148 @@
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 IconButton from "@mui/material/IconButton"
import { AutomationTime, AutomationTimeObject } from "types/automations/common";
import { convertAutomationTimeToTimeObject, convertObjectToAutomationTimeString, milisecondsToObject } from "utils/time";
import { convertStringToAutomationTimeObject, convertAutomationTimeToTimeString } from 'utils/time';
import { prettyName } from "utils/formatting";
import FormControl from "@mui/material/FormControl";
import InputLabel from '@mui/material/InputLabel';
import Input from "@mui/material/Input";
import FormHelperText from '@mui/material/FormHelperText';
// 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)
}
}
}, [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)}
/>
)}
<IconButton onClick={() => setDisabled(!disabled)}>
{disabled ? <EditIcon /> : <CloseIcon />}
</IconButton>
</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,18 @@
import { FC } from "react";
import { useHADeviceRegistry } from 'haService';
import { InputAutoComplete, InputAutoCompletePropsBase } from './InputAutoComplete';
export type InputDeviceProps = InputAutoCompletePropsBase & { multiple?: false };
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()}
/>
}
@@ -0,0 +1,22 @@
import { FC } from "react";
import { useHAEntities } from 'haService';
import { InputAutoComplete, InputAutoCompletePropsBase } from './InputAutoComplete';
import { prettyName } from "utils/formatting";
export type InputEntityProps = InputAutoCompletePropsBase & {
restrictToDomain?: string[],
}
export const InputEntity: FC<InputEntityProps> = props => {
// state
const entities = useHAEntities();
return <InputAutoComplete
{...props}
validateOption={v => entities.validateOptions(v, props.restrictToDomain)}
options={entities.getOptions(props.restrictToDomain)}
getID={entities.getID}
getLabel={entities.getLabel}
groupBy={opt => (typeof opt !== 'string') ? prettyName(opt.domain) : ''}
/>
}
@@ -0,0 +1,84 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react";
import { InputEntity } from "./InputEntities";
export default {
title: 'Inputs/InputEntity',
component: InputEntity,
parameters: { actions: { argTypesRegex: '^on.*' } },
argTypes: {}
} as ComponentMeta<typeof InputEntity>;
const Template: ComponentStory<typeof InputEntity> = args => {
const [value, setValue] = useState(args.value)
return <Page>
<div style={{
maxWidth: 200
}}>
<InputEntity {...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.bathroom'
} as any
export const Many = Template.bind({})
Many.args = {
...Many.args,
multiple: true,
value: ['sensor.bathroom', 'person.ari']
} as any
export const ManyEmpty = Template.bind({})
ManyEmpty.args = {
...ManyEmpty.args,
multiple: true,
value: []
} as any
export const ManyButGotSingle = Template.bind({})
ManyButGotSingle.args = {
...ManyButGotSingle.args,
multiple: true,
value: 'sensor.bathroom'
} as any
export const InvalidDomain = Template.bind({})
InvalidDomain.args = {
...InvalidDomain.args,
multiple: true,
value: 'sensor.bathroom',
restrictToDomain: ['zone'],
} as any
export const InvalidManyDomain = Template.bind({})
InvalidManyDomain.args = {
...InvalidManyDomain.args,
multiple: true,
value: 'sensor.bathroom',
restrictToDomain: ['zone', 'switch'],
} as any
export const InvalidLots = Template.bind({})
InvalidLots.args = {
...InvalidLots.args,
multiple: true,
value: ['person.ari', 'sensor.bathroom', 'binary_sensor.ping_tv', 'device_tracker.phone'],
restrictToDomain: ['zone', 'switch'],
} as any
@@ -1,4 +1,5 @@
import { ComponentMeta, ComponentStory } from "@storybook/react"; import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState, useEffect } from 'react'; import { useState, useEffect } from 'react';
import { InputList } from "./InputList"; import { InputList } from "./InputList";
@@ -18,9 +19,9 @@ const Template: ComponentStory<typeof InputList> = args => {
setValue(args.current) setValue(args.current)
} }
}, [args.current]) }, [args.current])
return <div className="page"> return <Page>
<InputList {...args} current={value} onChange={setValue} /> <InputList {...args} current={value} onChange={setValue} />
</div> </Page>
} }
export const SimpleText = Template.bind({}) export const SimpleText = Template.bind({})
+42 -32
View File
@@ -1,44 +1,54 @@
import { FC } from "react"; import { FC } from "react";
import InputWrapper from "./InputWrapper"; import FormHelperText from '@mui/material/FormHelperText';
import { useInputListStyles } from "./styles"; import InputLabel from '@mui/material/InputLabel';
import MenuItem from '@mui/material/MenuItem';
import FormControl from '@mui/material/FormControl';
import Select from '@mui/material/Select';
import { prettyName } from "utils/formatting";
export interface Props<T extends string> { export interface Props<T extends string> {
current: T; current: T;
options: readonly T[]; options: readonly T[];
onChange: (n: T) => void; onChange: (n: T) => void;
label: string;
id?: string; id?: string;
className?: string; className?: string;
label: string; prettyOptionLabels?: boolean;
} }
export const InputList: FC<Props<any>> = ({ export function InputList<T extends string>({
current, options, onChange, label, current,
...selattr options,
}) => { onChange,
const invalidCurrent = !options.includes(current); label,
const { classes } = useInputListStyles({ id,
invalidCurrent className,
}); prettyOptionLabels,
return <InputWrapper label={label} labelSize={'small'} noMargin error={invalidCurrent ? "Invalid Selection" : undefined}> }: Props<T>) {
<select const invalidCurrent = current && !options.includes(current);
title={invalidCurrent ? "Invalid Selection" : ""} return <FormControl className={className} variant="filled" sx={{ marginRight: "0.25em", minWidth: `${label.length * 0.75}em` }}>
className={classes.input} <InputLabel>{label}</InputLabel>
{...selattr} value={current} <Select
onChange={e => { autoWidth
e.preventDefault(); id={id}
if (e.currentTarget.id === 'invalid') { value={current}
onChange(options[0]) onChange={(e) => {
} else { onChange(e.target.value as T)
onChange(e.currentTarget.value as any);
}
}} }}
label={label}
variant="filled"
placeholder={label}
error={invalidCurrent}
> >
{options.map((t, i) => <option id={String(i)} key={i} value={t}>{t}</option>)} {options.map((t, i) => (
{invalidCurrent ? <option <MenuItem
id={'invalid'} key={i}
value={current} value={t}
style={{ display: 'none' }} >
>!{current}!</option> : <></>} {prettyOptionLabels ? prettyName(t) : t}
</select> </MenuItem>
</InputWrapper> ))}
</Select>
<FormHelperText>{invalidCurrent ? `'${current}' is not a valid selection` : ''}</FormHelperText>
</FormControl>
} }
@@ -1,4 +1,5 @@
import { ComponentMeta, ComponentStory } from "@storybook/react"; import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import InputMultiSelect from "./InputMultiSelect"; import InputMultiSelect from "./InputMultiSelect";
@@ -18,12 +19,12 @@ const Template: ComponentStory<typeof InputMultiSelect> = args => {
setValue(args.selected); setValue(args.selected);
}, [args.selected]) }, [args.selected])
return <div className="page"> return <Page>
<InputMultiSelect {...args} onChange={a => { <InputMultiSelect {...args} onChange={a => {
setValue(a); setValue(a);
args.onChange(a); args.onChange(a);
}} options={args.options} selected={value} /> }} options={args.options} selected={value} />
</div> </Page>
} }
export const Simple = Template.bind({}) export const Simple = Template.bind({})
@@ -1,4 +1,5 @@
import { ComponentMeta, ComponentStory } from "@storybook/react"; import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react"; import { useState } from "react";
import InputNumber from "./InputNumber"; import InputNumber from "./InputNumber";
@@ -18,14 +19,14 @@ export default {
export const NullStart: ComponentStory<typeof InputNumber> = args => { export const NullStart: ComponentStory<typeof InputNumber> = args => {
const [value, setValue] = useState<number | undefined>(undefined) const [value, setValue] = useState<number | undefined>(undefined)
return <div className="page"> return <Page>
<InputNumber {...args} value={value} onChange={setValue} /> <InputNumber {...args} value={value} onChange={setValue} />
</div> </Page>
} }
export const SomeStuffAtStart: ComponentStory<typeof InputNumber> = args => { export const SomeStuffAtStart: ComponentStory<typeof InputNumber> = args => {
const [value, setValue] = useState<number | undefined>(10) const [value, setValue] = useState<number | undefined>(10)
return <div className="page"> return <Page>
<InputNumber {...args} value={value} onChange={setValue} /> <InputNumber {...args} value={value} onChange={setValue} />
</div> </Page>
} }
+25 -26
View File
@@ -1,6 +1,8 @@
// import { useState } from "react"; import Close from "@mui/icons-material/Close";
import InputWrapper from "./InputWrapper"; import TextField from "@mui/material/TextField";
import { useInputNumberStyles } from "./styles"; import IconButton from "@mui/material/IconButton";
import InputAdornment from "@mui/material/InputAdornment";
import Edit from "@mui/icons-material/Edit";
export interface Props { export interface Props {
label: string; label: string;
@@ -18,27 +20,24 @@ export default function InputNumber({
className = "", className = "",
min, max, step, min, max, step,
}: Props) { }: Props) {
const { classes } = useInputNumberStyles({}); const disabled = (value === undefined) || (value === null);
return <InputWrapper className={className} label={label} labelSize={value !== undefined ? 'small' : 'normal'}> return <TextField
<input variant="filled"
className={classes.input} label={label}
type="number" value={value}
value={value ?? ""} defaultValue={value}
onChange={e => { onChange={e => onChange(Number(e.target.value ?? 0))}
e.preventDefault(); disabled={disabled}
let v = Number(e.target.value); className={className}
if (max) { InputProps={{
v = Math.min(v, max) endAdornment: <InputAdornment position="end">
} <IconButton onClick={() => onChange(disabled ? 0 : undefined)}>
if (min) { {disabled ? <Edit /> : <Close />}
v = Math.max(v, min) </IconButton>
} </InputAdornment>,
onChange(v) inputProps: {
}} min, max, type: 'number'
step={step} }
min={min} }}
max={max} />
/>
{value && <button className={classes.deleteIcon} onClick={() => onChange(undefined)}>X</button>}
</InputWrapper>
} }
Loaded 100 of 177 files, more files were not shown because too many files have changed in this diff. Show more